From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 18:37:36 +0800
Subject: [PATCH] 2023-08-27

---
 src/tabviews/custom/components/table/normal-table/index.jsx |  778 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 415 insertions(+), 363 deletions(-)

diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index ca20ae8..63b75d4 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -4,7 +4,6 @@
 import { notification, Collapse, Modal } from 'antd'
 
 import Api from '@/api'
-import Utils from '@/utils/utils.js'
 import UtilsDM from '@/utils/utils-datamanage.js'
 import asyncComponent from '@/utils/asyncComponent'
 import MKEmitter from '@/utils/events.js'
@@ -21,9 +20,7 @@
 
 class NormalTable extends Component {
   static propTpyes = {
-    data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
-    config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
-    mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
+    config: PropTypes.object
   }
 
   state = {
@@ -32,7 +29,6 @@
     config: {},           // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
     actions: null,        // 鎸夐挳闆�
     columns: null,        // 鏄剧ず鍒�
-    arr_field: '',        // 鏌ヨ瀛楁闆�
     setting: null,        // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
     data: [],             // 鍒楄〃鏁版嵁闆�
     selectedData: [],     // 宸查�夎〃鏍兼暟鎹�
@@ -52,11 +48,10 @@
    * 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
    */
   UNSAFE_componentWillMount () {
-    const { data, initdata } = this.props
-    let _config = fromJS(this.props.config).toJS()
-    let _data = null
-    let _sync = _config.setting.sync === 'true'
+    const { config } = this.props
 
+    let _config = fromJS(config).toJS()
+    let _data = null
     let BID = ''
     let BData = ''
 
@@ -85,51 +80,58 @@
       setting.orisel = true
     }
 
-    if (_sync && data) {
-      _data = data[_config.dataName] || []
-      _sync = false
-    } else if (_sync && initdata) {
-      _data = initdata || []
-      _sync = false
-    }
+    if (_config.setting.sync === 'true') {
+      _config.setting.onload = 'false'
 
-    if (_data) {
-      this.loaded = true
-      _data = _data.map((item, index) => {
-        item.key = index
-        item.$$uuid = item[_config.setting.primaryKey] || ''
-        item.$$key = '' + item.key + item.$$uuid
-        item.$$BID = BID || ''
-        item.$$BData = BData || ''
-        item.$Index = index + 1 + ''
-
-        if (_config.absFields) {
-          _config.absFields.forEach(f => {
-            if (!isNaN(item[f])) {
-              item[f] = Math.abs(item[f])
-            }
-          })
+      if (window.GLOB.SyncData.has(_config.dataName)) {
+        _data = window.GLOB.SyncData.get(_config.dataName) || []
+  
+        if (_config.$cache) {
+          Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS(), BID)
         }
-
-        if (setting.controlField) {
-          if (setting.controlVal.includes(item[setting.controlField] + '')) {
-            item.$disabled = true
+  
+        _config.setting.sync = 'false'
+  
+        _data = _data.map((item, index) => {
+          item.key = index
+          item.$$uuid = item[_config.setting.primaryKey] || ''
+          item.$$key = '' + item.key + item.$$uuid
+          item.$$BID = BID || ''
+          item.$$BData = BData || ''
+          item.$Index = index + 1 + ''
+  
+          if (_config.absFields) {
+            _config.absFields.forEach(f => {
+              if (!isNaN(item[f])) {
+                item[f] = Math.abs(item[f])
+              }
+            })
+          }
+  
+          if (setting.controlField) {
+            if (setting.controlVal.includes(item[setting.controlField] + '')) {
+              item.$disabled = true
+            }
+          }
+  
+          return item
+        })
+  
+        if (setting.selected !== 'false' && _data.length > 0) {
+          setTimeout(() => {
+            MKEmitter.emit('mkCheckTopLine', _config.uuid, '', setting.selected)
+          }, 200)
+          if (setting.selected === 'init') {
+            setting.selected = 'false'
           }
         }
-
-        return item
-      })
-
-      if (setting.selected !== 'false' && _data && _data.length > 0) {
-        setTimeout(() => {
-          MKEmitter.emit('mkCheckTopLine', _config.uuid, '', setting.selected)
-        }, 200)
-        if (setting.selected === 'init') {
-          setting.selected = 'false'
-        }
+  
+        this.loaded = true
+  
+        window.GLOB.SyncData.delete(_config.dataName)
       }
     }
-
+    
     if (_config.wrap.collapse === 'true') {
       _config.wrap.title = _config.wrap.title || ' '
     }
@@ -141,24 +143,204 @@
       BID: BID || '',
       BData: BData || '',
       title: _config.wrap.title,
-      sync: _sync,
       data: _data,
       config: _config,
       setting: setting,
       actions: _config.action,
       columns: _config.cols,
-      arr_field: _config.columns.map(col => col.field).join(','),
-      search: Utils.initMainSearch(_config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
-    }, () => {
-      if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
-        setTimeout(() => {
-          this.loadmaindata()
-          this.getStatFieldsValue()
-        }, _config.setting.delay || 0)
-      } else if (_config.setting.onload === 'true') {
-        this.getStatFieldsValue()
-      }
+      search: _config.$searches
     })
+  }
+
+  shouldComponentUpdate (nextProps, nextState) {
+    return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+  }
+
+  componentDidMount () {
+    const { config } = this.state
+
+    MKEmitter.addListener('reloadData', this.reloadData)
+    MKEmitter.addListener('refreshLineData', this.refreshLineData)
+    MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+    MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+    MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+
+    if (config.setting.useMSearch) {
+      MKEmitter.addListener('searchRefresh', this.searchRefresh)
+    }
+
+    if (config.setting.sync === 'true') {
+      MKEmitter.addListener('transferSyncData', this.transferSyncData)
+    }
+
+    if (config.timer) {
+      this.timer = new TimerTask()
+      this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
+        this.setState({
+          pageIndex: 1
+        }, () => {
+          this.loadmaindata(true, 'true', '', 'timer')
+        })
+      })
+    }
+
+    this.initExec()
+  }
+
+  /**
+   * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
+   */
+  componentWillUnmount () {
+    this.setState = () => {
+      return
+    }
+    MKEmitter.removeListener('reloadData', this.reloadData)
+    MKEmitter.removeListener('searchRefresh', this.searchRefresh)
+    MKEmitter.removeListener('refreshLineData', this.refreshLineData)
+    MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+    MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+    MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+    MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+
+    this.timer && this.timer.stop()
+  }
+
+  initExec = () => {
+    const { config, setting, BID } = this.state
+
+    if (config.$cache) {
+      if (config.$time && !setting.laypage) {
+        if (!this.loaded) {
+          Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+            if (!res.valid && config.setting.onload === 'true') {
+              setTimeout(() => {
+                this.loadmaindata(false, 'true', '', 'init')
+              }, config.setting.delay || 0)
+            }
+  
+            if (!res.data || this.loaded) return
+
+            this.setState({data: res.data.map((item, index) => {
+              item.key = index
+              item.$$uuid = item[config.setting.primaryKey] || ''
+              item.$$key = '' + item.key + item.$$uuid
+              item.$Index = index + 1 + ''
+    
+              if (config.absFields) {
+                config.absFields.forEach(f => {
+                  if (!isNaN(item[f])) {
+                    item[f] = Math.abs(item[f])
+                  }
+                })
+              }
+    
+              if (setting.controlField) {
+                if (setting.controlVal.includes(item[setting.controlField] + '')) {
+                  item.$disabled = true
+                }
+              }
+              
+              return item
+            })})
+          })
+        }
+      } else {
+        if (!this.loaded) {
+          Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+            if (!res.data || this.loaded) return
+    
+            this.setState({data: res.data.map((item, index) => {
+              item.key = index
+              item.$$uuid = item[config.setting.primaryKey] || ''
+              item.$$key = '' + item.key + item.$$uuid
+              item.$Index = index + 1 + ''
+    
+              if (config.absFields) {
+                config.absFields.forEach(f => {
+                  if (!isNaN(item[f])) {
+                    item[f] = Math.abs(item[f])
+                  }
+                })
+              }
+    
+              if (setting.controlField) {
+                if (setting.controlVal.includes(item[setting.controlField] + '')) {
+                  item.$disabled = true
+                }
+              }
+              
+              return item
+            })})
+          })
+        }
+
+        if (config.setting.onload === 'true') {
+          setTimeout(() => {
+            this.loadmaindata(false, 'true', '', 'init')
+          }, config.setting.delay || 0)
+        }
+      }
+    } else if (config.setting.onload === 'true') {
+      setTimeout(() => {
+        this.loadmaindata()
+      }, config.setting.delay || 0)
+    }
+  }
+
+  transferSyncData = (syncId) => {
+    const { config } = this.state
+
+    if (config.$syncId !== syncId) return
+
+    const { setting, BID, BData } = this.state
+
+    let _data = window.GLOB.SyncData.get(config.dataName) || []
+
+    if (config.$cache) {
+      Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
+    }
+
+    _data = _data.map((item, index) => {
+      item.key = index
+      item.$$uuid = item[config.setting.primaryKey] || ''
+      item.$$key = '' + item.key + item.$$uuid
+      item.$$BID = BID || ''
+      item.$$BData = BData || ''
+      item.$Index = index + 1 + ''
+
+      if (config.absFields) {
+        config.absFields.forEach(f => {
+          if (!isNaN(item[f])) {
+            item[f] = Math.abs(item[f])
+          }
+        })
+      }
+
+      if (setting.controlField) {
+        if (setting.controlVal.includes(item[setting.controlField] + '')) {
+          item.$disabled = true
+        }
+      }
+      
+      return item
+    })
+
+    if (setting.selected !== 'false' && _data.length > 0) {
+      setTimeout(() => {
+        MKEmitter.emit('mkCheckTopLine', config.uuid, '', setting.selected)
+      }, 200)
+      if (setting.selected === 'init') {
+        this.setState({setting: {...setting, selected: 'false'}})
+      }
+    }
+
+    this.loaded = true
+
+    this.setState({data: _data})
+
+    window.GLOB.SyncData.delete(config.dataName)
+
+    MKEmitter.removeListener('transferSyncData', this.transferSyncData)
   }
 
   /**
@@ -167,8 +349,7 @@
    * @param { String }  repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
    */
   async loadmaindata (reset, repage, id, type) {
-    const { mainSearch } = this.props
-    const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+    const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
 
     if (setting.supModule && !BID && setting.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
       this.setState({
@@ -188,17 +369,17 @@
     }
 
     let searches = fromJS(search).toJS()
-    if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
-      let keys = searches.map(item => item.key.toLowerCase())
+    if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+      let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+      let keys = config.$s_keys || []
       mainSearch.forEach(item => {
-        if (!keys.includes(item.key.toLowerCase())) {
-          searches.push(item)
-        }
+        if (keys.includes(item.key.toLowerCase())) return
+
+        searches.push(item)
       })
     }
 
-    let requireFields = searches.filter(item => item.required && item.value === '')
-    if (requireFields.length > 0) {
+    if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
       return
     }
 
@@ -209,13 +390,13 @@
     }
 
     let _orderBy = orderBy || setting.order
-    let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
+    let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
       this.loaded = true
-      if (config.$cache && pageIndex === 1 && config.setting.onload !== 'false') {
-        Api.writeCacheConfig(config.uuid, result.data || '')
+      if (config.$cache && type === 'init') {
+        Api.writeCacheConfig(config.uuid, result.data || [], BID)
       }
 
       if (repage === 'false' && result.data && result.data.length === 0 && result.total > 0 && pageIndex > 1) {
@@ -281,10 +462,15 @@
         return item
       })
 
+      let total = result.total || 0
+      if (config.setting.custompage && data.length) {
+        total = data[data.length - 1].mk_total || 0
+      }
+
       this.setState({
         data: data,
         selectedData: [],
-        total: result.total,
+        total: total,
         loading: false
       })
 
@@ -294,17 +480,32 @@
           this.timer && this.timer.stop()
         }
       }
+
+      if (result.message) {
+        if (result.ErrCode === 'Y') {
+          Modal.success({
+            title: result.message
+          })
+        } else if (result.ErrCode === 'S') {
+          notification.success({
+            top: 92,
+            message: result.message,
+            duration: 2
+          })
+        }
+      }
     } else {
       this.setState({
         loading: false
       })
       this.timer && this.timer.stop()
       
+      if (!result.message) return
       if (result.ErrCode === 'N') {
         Modal.error({
           title: result.message,
         })
-      } else {
+      } else if (result.ErrCode !== '-2') {
         notification.error({
           top: 92,
           message: result.message,
@@ -318,16 +519,21 @@
    * @description 鑾峰彇鍗曡鏁版嵁
    */ 
   async loadmainLinedata (id) {
-    const { mainSearch } = this.props
-    const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+    const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+
+    if (config.forbidLine) {
+      this.reloadtable()
+      return
+    }
 
     let searches = fromJS(search).toJS()
-    if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
-      let keys = searches.map(item => item.key.toLowerCase())
+    if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+      let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+      let keys = config.$s_keys || []
       mainSearch.forEach(item => {
-        if (!keys.includes(item.key.toLowerCase())) {
-          searches.push(item)
-        }
+        if (keys.includes(item.key.toLowerCase())) return
+
+        searches.push(item)
       })
     }
 
@@ -336,35 +542,27 @@
     })
 
     let _orderBy = orderBy || setting.order
-    let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
+    let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID, id)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
-      if (!result.data || !result.data[0]) {
-        this.setState({
-          loading: false
-        })
-
-        return
-      }
-
       let data = fromJS(this.state.data).toJS()
       let selectedData = fromJS(this.state.selectedData).toJS()
 
-      let _data = result.data[0]
-      _data.$$uuid = _data[setting.primaryKey] || ''
-      _data.$$BID = BID || ''
-      _data.$$BData = BData || ''
-
-      if (config.absFields) {
-        config.absFields.forEach(f => {
-          if (!isNaN(_data[f])) {
-            _data[f] = Math.abs(_data[f])
-          }
-        })
-      }
-
-      try {
+      if (result.data && result.data[0]) {
+        let _data = result.data[0]
+        _data.$$uuid = _data[setting.primaryKey] || ''
+        _data.$$BID = BID || ''
+        _data.$$BData = BData || ''
+  
+        if (config.absFields) {
+          config.absFields.forEach(f => {
+            if (!isNaN(_data[f])) {
+              _data[f] = Math.abs(_data[f])
+            }
+          })
+        }
+  
         data = data.map(item => {
           if (item.$$uuid === _data.$$uuid) {
             _data.key = item.key
@@ -375,23 +573,61 @@
             return item
           }
         })
+
+        if (!_data.$Index) {
+          this.setState({
+            loading: false
+          })
+          return
+        }
+
         selectedData = selectedData.map(item => {
           if (_data.$$uuid === item.$$uuid) {
             return _data
           }
           return item
         })
-      } catch (e) {
-        console.warn('鏁版嵁鏌ヨ閿欒')
+
+        if (selectedData.length && _data.$$uuid === selectedData[selectedData.length - 1].$$uuid) {
+          MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
+        }
+  
+        this.setState({
+          data,
+          selectedData,
+          loading: false
+        })
+
+        if (config.setting.$hasSyncModule) {
+          MKEmitter.emit('syncBalconyData', config.uuid, selectedData, data.length === selectedData.length)
+        }
+      } else {
+        let index = data.findIndex(item => item.$$uuid === id)
+
+        if (index === -1) {
+          this.setState({
+            loading: false
+          })
+          return
+        }
+
+        data = data.filter(item => item.$$uuid !== id)
+        data = data.map((item, i) => {
+          item.key = i
+          item.$$key = '' + item.key + item.$$uuid
+
+          return item
+        })
+
+        this.setState({
+          data: data,
+          loading: false
+        })
+
+        setTimeout(() => {
+          MKEmitter.emit('resetTable', config.uuid, 'delete', index)
+        }, 20)
       }
-
-      MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
-
-      this.setState({
-        data,
-        selectedData,
-        loading: false
-      })
     } else {
       this.setState({
         loading: false
@@ -405,72 +641,6 @@
   }
 
   /**
-   * @description 鑾峰彇鍚堣瀛楁鍊�
-   */
-  getStatFieldsValue = () => {
-    const { mainSearch } = this.props
-    const { setting, config, search, BID, orderBy } = this.state
-
-    if (setting.supModule && !BID && setting.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
-      this.setState({
-        statFValue: []
-      })
-      return
-    }
-
-    if (config.statFields.length === 0 || setting.interType !== 'system' || !setting.dataresource) return
-
-    let searches = fromJS(search).toJS()
-    if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
-      let keys = searches.map(item => item.key.toLowerCase())
-      mainSearch.forEach(item => {
-        if (!keys.includes(item.key.toLowerCase())) {
-          searches.push(item)
-        }
-      })
-    }
-    let requireFields = searches.filter(item => item.required && item.value === '')
-    if (requireFields.length > 0) {
-      return
-    }
-
-    let _orderBy = orderBy || setting.order
-    let param = UtilsDM.getStatQueryDataParams(setting, config.statFields, searches, _orderBy, BID)
-
-    Api.genericInterface(param).then(res => {
-      if (res.status) {
-        let _data = res.data[0]
-        let values = []
-
-        if (_data) {
-          config.statFields.forEach(item => {
-            if (_data[item.field] || _data[item.field] === 0) {
-              let val = +_data[item.field]
-              if (isNaN(val)) {
-                val = 0
-              }
-              val = val.toFixed(item.decimal)
-              values.push({label: item.label, value: val})
-            }
-          })
-        }
-        this.setState({
-          statFValue: values
-        })
-      } else {
-        this.setState({
-          statFValue: []
-        })
-        notification.error({
-          top: 92,
-          message: res.message,
-          duration: 10
-        })
-      }
-    })
-  }
-
-  /**
    * @description 鎼滅储鏉′欢鏀瑰彉鏃讹紝閲嶇疆琛ㄦ牸鏁版嵁
    * 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
    */
@@ -480,7 +650,6 @@
       search: searches
     }, () => {
       this.loadmaindata(true, 'true')
-      this.getStatFieldsValue()
     })
   }
 
@@ -514,11 +683,9 @@
         pageIndex: 1
       }, () => {
         this.loadmaindata(true, 'true', id)
-        this.getStatFieldsValue()
       })
     } else {
       this.loadmaindata(true, 'false', id)
-      this.getStatFieldsValue()
     }
   }
 
@@ -526,26 +693,24 @@
    * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
    */
   queryModuleParam = (menuId, callback) => {
-    const { mainSearch } = this.props
-    const { arr_field, config, orderBy, search, setting} = this.state
+    const { config, orderBy, search, setting} = this.state
 
     if (config.uuid !== menuId) return
 
     let searches = search ? fromJS(search).toJS() : []
-    if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
-      let keys = searches.map(item => item.key.toLowerCase())
+    if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+      let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+      let keys = config.$s_keys || []
       mainSearch.forEach(item => {
-        if (!keys.includes(item.key.toLowerCase())) {
-          searches.push(item)
-        }
+        if (keys.includes(item.key.toLowerCase())) return
+
+        searches.push(item)
       })
     }
 
     callback({
-      arr_field: arr_field,
       orderBy: orderBy || setting.order,
-      search: searches,
-      menuName: config.name
+      search: searches
     })
   }
 
@@ -573,7 +738,6 @@
         BData: data
       }, () => {
         this.loadmaindata(true, 'true')
-        this.getStatFieldsValue()
       })
     }
   }
@@ -600,131 +764,40 @@
     } else {
       this.reloadtable(btn, id)
     }
-
-    if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
-      btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
-    }
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    const { sync, config, setting, BID, BData } = this.state
+  refreshLineData = (menuId, btn, uuid, count) => {
+    const { config } = this.state
 
-    if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
-      let _data = []
-      if (nextProps.data && nextProps.data[config.dataName]) {
-        _data = nextProps.data[config.dataName] || []
-        _data = _data.map((item, index) => {
-          item.key = index
-          item.$$uuid = item[config.setting.primaryKey] || ''
-          item.$$key = '' + item.key + item.$$uuid
-          item.$$BID = BID || ''
-          item.$$BData = BData || ''
-          item.$Index = index + 1 + ''
-
-          if (config.absFields) {
-            config.absFields.forEach(f => {
-              if (!isNaN(item[f])) {
-                item[f] = Math.abs(item[f])
-              }
-            })
-          }
-
-          if (setting.controlField) {
-            if (setting.controlVal.includes(item[setting.controlField] + '')) {
-              item.$disabled = true
-            }
-          }
-          
-          return item
-        })
-
-        if (setting.selected !== 'false' && _data && _data.length > 0) {
-          setTimeout(() => {
-            MKEmitter.emit('mkCheckTopLine', config.uuid, '', setting.selected)
-          }, 200)
-          if (setting.selected === 'init') {
-            this.setState({setting: {...setting, selected: 'false'}})
-          }
-        }
+    if (config.uuid !== menuId) return
+    
+    let _data = fromJS(this.state.data).toJS().map(item => {
+      if (item.$$uuid === uuid) {
+        item[btn.field] = count
       }
+      return item
+    })
+    let _selectedData = fromJS(this.state.selectedData).toJS().map(item => {
+      if (item.$$uuid === uuid) {
+        item[btn.field] = count
+      }
+      return item
+    })
 
-      this.loaded = true
-
-      this.setState({sync: false, data: _data})
-    } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
-      this.setState({pageIndex: 1}, () => {
-        this.reloadtable()
-      })
-    }
+    this.setState({
+      data: _data,
+      selectedData: _selectedData
+    })
   }
 
-  shouldComponentUpdate (nextProps, nextState) {
-    return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
-  }
+  searchRefresh = (searchId) => {
+    const { config } = this.state
 
-  componentDidMount () {
-    const { config, setting } = this.state
-
-    MKEmitter.addListener('reloadData', this.reloadData)
-    MKEmitter.addListener('resetSelectLine', this.resetParentParam)
-    MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
-    MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
-
-    if (config.timer) {
-      this.timer = new TimerTask()
-      this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
-        this.setState({
-          pageIndex: 1
-        }, () => {
-          this.loadmaindata(true, 'true', '', 'timer')
-          this.getStatFieldsValue()
-        })
-      })
-    }
-
-    if (config.$cache && !this.loaded) {
-      Api.getLCacheConfig(config.uuid).then(res => {
-        if (!res || this.loaded) return
-
-        this.setState({data: res.map((item, index) => {
-          item.key = index
-          item.$$uuid = item[config.setting.primaryKey] || ''
-          item.$$key = '' + item.key + item.$$uuid
-          item.$Index = index + 1 + ''
-
-          if (config.absFields) {
-            config.absFields.forEach(f => {
-              if (!isNaN(item[f])) {
-                item[f] = Math.abs(item[f])
-              }
-            })
-          }
-
-          if (setting.controlField) {
-            if (setting.controlVal.includes(item[setting.controlField] + '')) {
-              item.$disabled = true
-            }
-          }
-          
-          return item
-        })})
-      })
-    }
-  }
-
-  /**
-   * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
-   */
-  componentWillUnmount () {
-    this.setState = () => {
-      return
-    }
-    MKEmitter.removeListener('reloadData', this.reloadData)
-    MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
-    MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
-    MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
-
-    this.timer && this.timer.stop()
+    if (config.$searchId !== searchId) return
+    
+    this.setState({pageIndex: 1}, () => {
+      this.reloadtable()
+    })
   }
 
   render() {
@@ -735,65 +808,44 @@
       style.display = 'none'
     }
 
+    let content = <>
+      {config.search && config.search.length ?
+        <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
+      }
+      {actions.length > 0 ? <MainAction
+        BID={BID}
+        setting={setting}
+        actions={actions}
+        BData={BData}
+        columns={config.columns}
+        selectedData={selectedData}
+      /> : <div className="mk-action-space" style={{height: '25px'}}></div>}
+      <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
+        <MainTable
+          setting={setting}
+          columns={columns}
+          MenuID={config.uuid}
+          data={this.state.data}
+          fields={config.columns}
+          total={this.state.total}
+          lineMarks={config.lineMarks}
+          loading={this.state.loading}
+          refreshdata={this.refreshbytable}
+          statFValue={this.state.statFValue}
+          chgSelectData={(selects) => this.setState({selectedData: selects})}
+        />
+      </div>
+    </>
+
     return (
       <div className="custom-normal-table" id={'anchor' + config.uuid} style={style}>
         {config.wrap.collapse === 'true' ? <Collapse bordered={false} defaultActiveKey="1" expandIconPosition="right">
           <Panel forceRender={true} header={<NormalHeader config={config}/>} key="1">
-            {config.search && config.search.length ?
-              <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
-            }
-            {actions.length > 0 ? <MainAction
-              BID={BID}
-              setting={setting}
-              actions={actions}
-              BData={BData}
-              columns={config.columns}
-              selectedData={selectedData}
-            /> : <div className="mk-action-space" style={{height: '25px'}}></div>}
-            <div className="main-table-box">
-              <MainTable
-                setting={setting}
-                columns={columns}
-                MenuID={config.uuid}
-                data={data}
-                fields={config.columns}
-                total={this.state.total}
-                lineMarks={config.lineMarks}
-                loading={this.state.loading}
-                refreshdata={this.refreshbytable}
-                statFValue={this.state.statFValue}
-                chgSelectData={(selects) => this.setState({selectedData: selects})}
-              />
-            </div>
+            {content}
           </Panel>
         </Collapse> : <>
           <NormalHeader config={config}/>
-          {config.search && config.search.length ?
-            <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
-          }
-          {actions.length > 0 ? <MainAction
-            BID={BID}
-            setting={setting}
-            actions={actions}
-            BData={BData}
-            columns={config.columns}
-            selectedData={selectedData}
-          /> : <div className="mk-action-space" style={{height: '25px'}}></div>}
-          <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
-            <MainTable
-              setting={setting}
-              columns={columns}
-              MenuID={config.uuid}
-              data={this.state.data}
-              fields={config.columns}
-              total={this.state.total}
-              lineMarks={config.lineMarks}
-              loading={this.state.loading}
-              refreshdata={this.refreshbytable}
-              statFValue={this.state.statFValue}
-              chgSelectData={(selects) => this.setState({selectedData: selects})}
-            />
-          </div>
+          {content}
         </>}
       </div>
     )

--
Gitblit v1.8.0