提交 af570bd0 authored 作者: tb53863844's avatar tb53863844

开发

上级 5d6bbb8a
...@@ -62,6 +62,7 @@ export default class ZdyTable extends Component { ...@@ -62,6 +62,7 @@ export default class ZdyTable extends Component {
...this.state, ...this.state,
...this.props, ...this.props,
formConfig: { ...this.state.formConfig, style: this.props.style }, isReady: true, formConfig: { ...this.state.formConfig, style: this.props.style }, isReady: true,
viewMode:this.props.currentFormKey&&this.props.data&&this.props.datas[this.props.currentFormKey]?this.props.datas[this.props.currentFormKey].viewMode:null
}); });
}); });
...@@ -408,6 +409,7 @@ export default class ZdyTable extends Component { ...@@ -408,6 +409,7 @@ export default class ZdyTable extends Component {
...this.state, ...this.state,
...nextProps, ...nextProps,
isReady: true, isReady: true,
viewMode:nextProps.currentFormKey&&nextProps.datas&&nextProps.datas[nextProps.currentFormKey]?nextProps.datas[nextProps.currentFormKey].viewMode:null,
formConfig: { ...this.state.formConfig, style: nextProps.style }, formConfig: { ...this.state.formConfig, style: nextProps.style },
}, () => this.initExcel({ datas: nextProps.datas, trees: nextProps.trees })); }, () => this.initExcel({ datas: nextProps.datas, trees: nextProps.trees }));
return; return;
...@@ -636,7 +638,6 @@ export default class ZdyTable extends Component { ...@@ -636,7 +638,6 @@ export default class ZdyTable extends Component {
formId, formId,
viewMode viewMode
} = this.state; } = this.state;
const getx = this.props.get
const { const {
border, border,
obj, obj,
...@@ -658,7 +659,7 @@ export default class ZdyTable extends Component { ...@@ -658,7 +659,7 @@ export default class ZdyTable extends Component {
} = this.props; } = this.props;
let get; let get;
if(viewMode!=null&&viewMode!=""){ if(viewMode!=null&&viewMode!=""){
get= isMobile get= viewMode
}else{ }else{
get = this.props.get get = this.props.get
} }
......
...@@ -218,7 +218,7 @@ class TreeList extends React.Component { ...@@ -218,7 +218,7 @@ class TreeList extends React.Component {
dispatch({ dispatch({
type: 'formList/tree', type: 'formList/tree',
payload: { ...values,ctgFilterSql:isFirst?null:ctgFilterSql, parentIdName: treeParentIdName, dataObjId: this.state.objId }, payload: { ...values,ctgFilterSql:ctgFilterSql, parentIdName: treeParentIdName, dataObjId: this.state.objId },
callback: callback, callback: callback,
}); });
}; };
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论