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

src/components/Table/ListPage.js

@@ -60,7 +60,6 @@ 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
@@ -88,7 +87,6 @@ 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,7 +79,6 @@ 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 组件不共享搜索条件

src/feui/search/index.js

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

src/models/listPage.js

@@ -22,8 +22,11 @@ export default {
       return ret
     },
     *getTableData ({ payload, url, onComplete }, { call, put }) {
+      console.log('执行前',appService.getTableData)
       const ret = yield call(appService.getTableData, { payload, url })
+      console.log('执行后')
       if (typeof onComplete === 'function') {
+        console.log('执行后',ret)
         onComplete(ret)
       }
       return ret