开啊

one_stop_public/Table/index.jsx

@@ -259,7 +259,7 @@ export default class ZdyTable extends Component {
 
   }
 
-  importExcel = (res) => {
+  importExcel = (res,callback) => {
 
     const { datas, trees } = this.configs;
     const sheets = res.sheets;
@@ -324,8 +324,14 @@ export default class ZdyTable extends Component {
       };
 
     }
-    this.initExcel({ datas, trees }, () => this.setState({ isChange: !this.state.isChange }));
-    console.log('公式导入excel成功');
+    this.initExcel({ datas, trees }, () =>{
+      this.setState({ isChange: !this.state.isChange },()=>{
+        if(callback)callback();
+        });
+  
+        console.log('公式导入excel成功');
+    })
+    
 
   };
 

one_stop_public/libs/formList/index.js

@@ -640,7 +640,7 @@ class FormList extends React.Component {
     }
   };
   sqlBs16 = Base16Encode(this.props.sql);
-  getPage = (params, values, callPage) => {
+  getPage = (params, values, callPage,pageNo) => {
 
     if (this.columns == null || this.columns.length == 0) {
       return;
@@ -651,7 +651,7 @@ class FormList extends React.Component {
     if (params == null) {
 
       params = {
-        pageNo: pagination.current ? pagination.current : 1,
+        pageNo: pageNo!=null?pageNo: pagination.current ? pagination.current : 1,
         pageSize: pagination.pageSize ? pagination.pageSize : this.props.pageSize || 10,
         query: JSON.stringify(values != null ? values : this.state.formValues),
       };
@@ -848,7 +848,7 @@ class FormList extends React.Component {
         pageSize: this.props.pageSize || 10,
         query: JSON.stringify(values),
       };
-      this.getPage(params, values);
+      this.getPage(params, values,1);
     });
   };