kaifa

one_stop_public/Table/index.jsx

@@ -101,6 +101,7 @@ export default class ZdyTable extends Component {
             datas: obj.datas,
             width: this.props.table ? obj.datas[val.formKey].width : xxx.width,
             isBorder: this.props.table ? obj.datas[val.formKey].isBorder : xxx.isBorder,
+            viewMode: this.props.table ? obj.datas[val.formKey].viewMode : xxx.viewMode,
             isRowCol: this.props.table ? obj.datas[val.formKey].isRowCol : xxx.isRowCol,
             mapData,
             currentFormKey: fk,
@@ -162,6 +163,7 @@ export default class ZdyTable extends Component {
             currentFormTitle: this.getCurrentFormTitle(obj, obj.init),
             width: xxx.width,
             isBorder: xxx.isBorder,
+            viewMode: xxx.viewMode,
             isRowCol: xxx.isRowCol,
             mapData,
             sqlData,
@@ -234,6 +236,8 @@ export default class ZdyTable extends Component {
           width: this.props.table ? obj.datas[val.taskFormKey].width : xxx.width,
           isBorder: this.props.table ? obj.datas[val.taskFormKey].isBorder : xxx.isBorder,
           isRowCol: this.props.table ? obj.datas[val.taskFormKey].isRowCol : xxx.isRowCol,
+          viewMode: this.props.table ? obj.datas[val.taskFormKey]. viewMode : xxx.viewMode,
+         
           items: this.props.table ? obj.datas[val.taskFormKey].items : xxx.items,
           isReady: true,
           init: { ...this.state.init, ...(val.isSecond ? this.props.obj : {}) },
@@ -630,10 +634,11 @@ export default class ZdyTable extends Component {
       formConfig,
       formCode,
       formId,
+      viewMode
     } = this.state;
+    const getx = this.props.get
     const {
       border,
-      get,
       obj,
       index,
       fatherCode,
@@ -651,6 +656,12 @@ export default class ZdyTable extends Component {
       isPreview,
       trees,
     } = this.props;
+    let get;
+    if(viewMode!=null&&viewMode!=""){
+      get= isMobile
+    }else{
+      get = this.props.get
+    }
     let style = {};
     if (formConfig.style != null) {
       try {

one_stop_public/libs/formList/TreeList.js

@@ -206,7 +206,7 @@ class TreeList extends React.Component {
       });
     }
   };
-  getList = (values, callback) => {
+  getList = (values, callback,isFirst) => {
     const {
       dispatch,
       json: { treeParentIdName,ctgFilterSql},
@@ -215,10 +215,10 @@ class TreeList extends React.Component {
     if (!values) {
       values = this.state.formValues;
     }
-
+     
     dispatch({
       type: 'formList/tree',
-      payload: { ...values,ctgFilterSql:ctgFilterSql, parentIdName: treeParentIdName, dataObjId: this.state.objId },
+      payload: { ...values,ctgFilterSql:isFirst?null:ctgFilterSql, parentIdName: treeParentIdName, dataObjId: this.state.objId },
       callback: callback,
     });
   };
@@ -1033,7 +1033,7 @@ class TreeList extends React.Component {
           treeData: [...this.state.treeData],
         });
         resolve();
-      });
+      },true);
     });
   };