Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

one_stop_public/libs/formList/index.js

@@ -149,9 +149,9 @@ const CreateForm = Form.create()(props => {
   );
 });
 
-@connect(({ formList, loading }) => ({
-  formList,
-  loading: loading.models.formList,
+@connect(({ formList,DataColumn,DataObj, loading }) => ({
+  formList,DataColumn,DataObj,
+  loading: loading.models.formList||loading.models.DataColumn||loading.models.DataObj,
 }))
 @Form.create()
 class FormList extends React.Component {
@@ -429,11 +429,14 @@ class FormList extends React.Component {
       // 表头筛选逻辑
       Array.isArray(this.props.value.columns) &&
         this.props.value.columns.map(item => {
-          cacheList.push({
-            label: item.title,
-            value: item.dataIndex,
-          });
-          cacheChecked.push(item.dataIndex);
+          if(item.dataIndex!=null){
+            cacheList.push({
+              label: item.title,
+              value: item.dataIndex,
+            });
+            cacheChecked.push(item.dataIndex);
+          }
+       
         });
       this.checkList = cacheList;
 
@@ -503,11 +506,13 @@ class FormList extends React.Component {
             let cacheChecked = [];
             // 表头筛选逻辑
             datas.map(item => {
+              if(item.name!=null){
               cacheList.push({
                 label: item.title,
                 value: item.name,
               });
               cacheChecked.push(item.name);
+             }
             });
             this.checkList = cacheList;
             this.setState({

one_stop_public/tableCompon/index.jsx

@@ -803,7 +803,7 @@ export default class tableCom extends Component {
       reqUrls[url] = { params: params };
       isChange = true;
     }
-
+    console.log(isChange)
     if (!isChange) {
       if (callback) {
         const data = reqUrls[url].data;