Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

src/baseComponents/TableBaseComponent/index.js

@@ -422,6 +422,7 @@ class TableBaseComponent extends ComponentBase {
   实际加载表数据
    */
   doLoadTableData = (loadParamJson, tableCode, onComplete, onLoadData) => {
+    console.log('调用查询实际过程', 6)
     const payloadJson = this.getLoadTableDataParams(loadParamJson, tableCode)
     if (!payloadJson) return
 
@@ -430,6 +431,7 @@ class TableBaseComponent extends ComponentBase {
     }
     const tableConfig = this.getTableConfig({ tableCode });
     const { api } = tableConfig ? tableConfig : {};
+    console.log('调用查询实际过程', 7, api)
 
     this.props.dispatch({
       type: 'listPage/getTableData',

src/components/Table/ListPage.js

@@ -60,6 +60,7 @@ class ListPage extends React.Component {
 
   loadData = (params) => {
     if (this.state.loadDataFunc) {
+       console.log('调用查询中间过程', 5)
       if (!this.state.loadDataFunc.length) {
         this.directSearchStop = true
         this.directSearchParams = params
@@ -87,6 +88,7 @@ class ListPage extends React.Component {
       loadDataFunc: data
     }, () => {
       if (!this.props.preventDefaultSearch || this.directSearchStop) {
+        console.log('调用查询中间过程', 4)
         this.refOfSearch && this.refOfSearch.handleSearch()
       }
     })

src/feui/search/AdvanceSearch.js

@@ -79,6 +79,7 @@ class AdvanceSearch extends Component {
     const { search, dispatch } = this.props
     let stopSelfChangeSearch = false
     let stopSelfExtraSearch = false
+    console.log('共享搜索条件', this.shareKey)
     if (this.shareKey) {
       const instances = search.shareIns[this.shareKey] || []
       // 同一 filterList 组里面的 Search 组件不共享搜索条件
@@ -297,7 +298,7 @@ class AdvanceSearch extends Component {
    */
   handleSearch = (self = true) => {
     if (this.setShareIns(self)) return
-
+    console.log('调用查询开始', 1)
     const { onSearch } = this.props
     onSearch instanceof Function && onSearch()
   }

src/feui/search/index.js

@@ -161,6 +161,7 @@ class Search extends React.Component {
     if (errorLabel) return
 
     const { onSearch } = this.props
+    console.log('调用查询中间过程', 2)
     onSearch instanceof Function && onSearch(rule)
     return rule
   }