From 9282e645d0205f85bf0d424a0b2f5c42c2aae1d9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 21 五月 2025 11:40:32 +0800
Subject: [PATCH] 2025-05-21

---
 src/tabviews/custom/components/card/data-card/index.jsx |  918 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 560 insertions(+), 358 deletions(-)

diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 165d46c..8861386 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -1,11 +1,10 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Spin, Empty, notification, message, Row, Col, Pagination, Modal } from 'antd'
+import { Spin, Empty, message, Row, Col, Pagination, Switch, notification } from 'antd'
 import { DownOutlined } from '@ant-design/icons'
 
 import Api from '@/api'
-import Utils from '@/utils/utils.js'
 import UtilsDM from '@/utils/utils-datamanage.js'
 import preImg from '@/assets/img/prev.png'
 import nextImg from '@/assets/img/next.png'
@@ -21,9 +20,7 @@
 
 class DataCard extends Component {
   static propTpyes = {
-    data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
-    config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
-    mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
+    config: PropTypes.object
   }
 
   state = {
@@ -35,27 +32,26 @@
     pageSize: 10,
     orderBy: '',
     pageOptions: [],
-    activeKey: '',             // 閫変腑鍗�
-    selectKeys: [],            // 澶氶�夋椂閫変腑鍗$墖
-    selectedData: [],          // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
-    loading: false,            // 鏁版嵁鍔犺浇鐘舵��
-    sync: false,               // 鏄惁缁熶竴璇锋眰鏁版嵁
-    card: null,                // 鍗$墖璁剧疆
-    data: null,                // 鏁版嵁
-    total: null,
+    activeKey: '',
+    selectKeys: [],
+    selectedData: [],
+    loading: false,
+    card: null,
+    data: [],
+    total: 0,
     precards: [],
     nextcards: [],
     selected: 'false',
-    supNodes: [],
-    supComs: null
+    pickup: false
   }
 
   loaded = false
+  supModules = []
 
   UNSAFE_componentWillMount () {
-    const { data, initdata } = this.props
-    let _config = fromJS(this.props.config).toJS()
+    const { config } = this.props
 
+    let _config = fromJS(config).toJS()
     let BID = ''
     let BData = ''
 
@@ -95,6 +91,14 @@
         }
       }
 
+      if (item.style.clear === 'left') {
+        item.wStyle = {clear: 'left'}
+      } else if (item.style.clear === 'right') {
+        item.wStyle = {float: 'right'}
+      }
+
+      delete item.style.clear
+
       if (item.$cardType !== 'extendCard') {
         _card = item
       } else if (!_card) {
@@ -111,17 +115,6 @@
     })
 
     _config.subcards = null
-    
-    let _data = null
-    let _sync = _config.setting.sync === 'true'
-
-    if (_sync && data) {
-      _data = data[_config.dataName] || []
-      _sync = false
-    } else if (_sync && initdata) {
-      _data = initdata || []
-      _sync = false
-    }
 
     let selected = 'false'
     if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init' || _config.wrap.selected === 'sign') {
@@ -130,45 +123,18 @@
       _config.wrap.selected = 'false'
     }
 
-    if (_data) {
-      _data = _data.map((item, index) => {
-        item.key = index
-        item.$$uuid = item[_config.setting.primaryKey] || ''
-        item.$$BID = BID || ''
-        item.$$BData = BData || ''
-        item.$Index = index + 1 + ''
-
-        if (_config.wrap.controlField) {
-          if (_config.wrap.controlVal.includes(item[_config.wrap.controlField] + '')) {
-            item.$disabled = true
-          }
-        }
-        return item
-      })
-
-      if (selected !== 'false') {
-        setTimeout(() => {
-          this.checkTopLine()
-        }, 200)
-        if (selected === 'init') {
-          selected = 'false'
-        }
-      }
-    }
-
-    let supComs = null
-    if (_config.wrap.supType === 'multi') {
-      supComs = _config.supNodes.map(item => item.componentId)
-    }
-
-    _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+    _config.wrap.selStyle = _config.wrap.selStyle || 'none'
     _config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
     _config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
     _config.wrap.layout = (_config.wrap.layout || 'grid') + '-layout float-' + (_config.wrap.cardFloat || 'left')
 
-    _config.wrap.wrapClass =  `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale}`
+    _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale} ${config.wrap.hover === 'true' ? 'mk-hover' : ''} ${config.wrap.empSign === 'hidden' ? 'mk-empty-hide' : ''}`
 
-    this.loaded = _data !== null
+    if (_config.wrap.shifting === 'true') {
+      _config.wrap.shifting = 'shifting'
+    } else {
+      _config.wrap.shifting = ''
+    }
 
     let pageOptions = ['10', '25', '50', '100', '500', '1000']
 
@@ -182,29 +148,81 @@
         pageOptions.push(size)
         pageOptions = pageOptions.sort((a, b) => a - b)
       }
+
+      if (_config.wrap.maxPageSize) {
+        pageOptions = pageOptions.filter(item => item <= _config.wrap.maxPageSize)
+      }
+    }
+
+    let _data = []
+    if (_config.setting.sync === 'true') {
+      _config.setting.onload = 'false'
+
+      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)
+        }
+  
+        _config.setting.sync = 'false'
+  
+        _data = _data.map((item, index) => {
+          item.key = index
+          item.$$uuid = item[_config.setting.primaryKey] || ''
+          item.$$BID = BID || ''
+          item.$$BData = BData || ''
+          item.$Index = index + 1 + ''
+  
+          if (_config.wrap.controlField) {
+            if (_config.wrap.controlVal.includes(item[_config.wrap.controlField] + '')) {
+              item.$disabled = true
+            }
+          }
+          return item
+        })
+  
+        this.loaded = true
+  
+        window.GLOB.SyncData.delete(_config.dataName)
+      }
+    } else if (_config.setting.supModule && !BID && _config.wrap.supKey !== 'false') {
+      _config.setting.onload = 'false'
+    }
+
+    if (_config.wrap.zHeight) {
+      _config.wrap.zoomStyle = {}
+      if (_config.wrap.zHeight <= 100) {
+        if (_config.wrap.zHeight < 0) {
+          _config.wrap.zoomStyle.maxHeight = `calc(100vh - ${-_config.wrap.zHeight}px)`
+          _config.wrap.zoomStyle.minHeight = '100px'
+        } else {
+          _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'vh'
+        }
+      } else {
+        _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'px'
+      }
+
+      if (_config.style) {
+        delete _config.style.height
+      }
+      _config.wrap.layout += ' fix-height'
+    } else {
+      _config.wrap.zoomStyle = null
     }
 
     this.setState({
       pageSize: _config.setting.pageSize || 10,
       pageOptions,
-      supComs,
       selected,
       precards,
       nextcards,
-      sync: _sync,
       data: _data,
       BID: BID || '',
       BData: BData || '',
       config: _config,
       card: _card,
-      search: Utils.initMainSearch(_config.search),
-      arr_field: _config.columns.map(col => col.field).join(','),
-    }, () => {
-      if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
-        setTimeout(() => {
-          this.loadData()
-        }, _config.setting.delay || 0)
-      }
+      search: _config.$searches
     })
   }
 
@@ -213,10 +231,18 @@
 
     MKEmitter.addListener('reloadData', this.reloadData)
     MKEmitter.addListener('mkCheckAll', this.mkCheckAll)
+    MKEmitter.addListener('refreshLineData', this.refreshLineData)
     MKEmitter.addListener('resetSelectLine', this.resetParentParam)
     MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
-    MKEmitter.addListener('refreshLineData', this.refreshLineData)
     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()
@@ -229,73 +255,13 @@
       })
     }
 
-    if (config.$cache && !this.loaded) {
-      Api.getLCacheConfig(config.uuid).then(res => {
-        if (!res || this.loaded) return
-        let _data = res.map((item, index) => {
-          item.key = index
-          item.$$uuid = item[config.setting.primaryKey] || ''
-          item.$Index = index + 1 + ''
+    this.initExec()
 
-          if (config.wrap.controlField) {
-            if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
-              item.$disabled = true
-            }
-          }
-
-          return item
-        })
-
-        this.setState({data: _data})
-      })
-    }
+    this.autoExec()
   }
 
   shouldComponentUpdate (nextProps, nextState) {
     return !is(fromJS(this.state), fromJS(nextState))
-  }
-
-  UNSAFE_componentWillReceiveProps (nextProps) {
-    const { sync, config, BID, BData, selected } = 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.$$BID = BID || ''
-          item.$$BData = BData || ''
-          item.$Index = index + 1 + ''
-
-          if (config.wrap.controlField) {
-            if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
-              item.$disabled = true
-            }
-          }
-
-          return item
-        })
-
-        if (selected !== 'false') {
-          setTimeout(() => {
-            this.checkTopLine()
-          }, 200)
-          if (selected === 'init') {
-            this.setState({selected: 'false'})
-          }
-        }
-      }
-
-      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.loadData()
-      })
-    }
   }
 
   componentWillUnmount () {
@@ -304,12 +270,153 @@
     }
     MKEmitter.removeListener('reloadData', this.reloadData)
     MKEmitter.removeListener('mkCheckAll', this.mkCheckAll)
-    MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
-    MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+    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, BID } = this.state
+
+    this.loaded && this.prevCheck()
+
+    if (config.$cache) {
+      if (config.$time && !config.setting.laypage) {
+        if (!this.loaded) {
+          Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+            if (!res.valid && config.setting.onload === 'true') {
+              setTimeout(() => {
+                this.loadData('', 'init')
+              }, config.setting.delay || 0)
+            }
+
+            if (!res.data || this.loaded) return
+
+            let _data = res.data.map((item, index) => {
+              item.key = index
+              item.$$uuid = item[config.setting.primaryKey] || ''
+              item.$Index = index + 1 + ''
+    
+              if (config.wrap.controlField) {
+                if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
+                  item.$disabled = true
+                }
+              }
+    
+              return item
+            })
+    
+            this.setState({data: _data}, () => {
+              this.prevCheck()
+            })
+          })
+        }
+      } else {
+        if (!this.loaded) {
+          Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+            if (!res.data || this.loaded) return
+    
+            let _data = res.data.map((item, index) => {
+              item.key = index
+              item.$$uuid = item[config.setting.primaryKey] || ''
+              item.$Index = index + 1 + ''
+    
+              if (config.wrap.controlField) {
+                if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
+                  item.$disabled = true
+                }
+              }
+    
+              return item
+            })
+    
+            this.setState({data: _data})
+          })
+        }
+
+        if (config.setting.onload === 'true') {
+          setTimeout(() => {
+            this.loadData('', 'init')
+          }, config.setting.delay || 0)
+        }
+      }
+    } else if (config.setting.onload === 'true') {
+      setTimeout(() => {
+        this.loadData()
+      }, config.setting.delay || 0)
+    }
+  }
+
+  autoExec = (times) => {
+    const { config } = this.state
+
+    if (!config.wrap.autoExec) return
+
+    let btn = document.getElementById('button' + config.wrap.autoExec)
+
+    this.autoTimer && clearTimeout(this.autoTimer)
+
+    if (btn) {
+      MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [])
+    } else if (!times || times < 20) {
+      times = times ? times + 1 : 1
+      this.autoTimer = setTimeout(() => {
+        this.autoExec(times)
+      }, 1000)
+    }
+  }
+
+  transferSyncData = (syncId) => {
+    const { config } = this.state
+
+    if (config.$syncId !== syncId) return
+
+    const { 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.$$BID = BID || ''
+      item.$$BData = BData || ''
+      item.$Index = index + 1 + ''
+
+      if (config.wrap.controlField) {
+        if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
+          item.$disabled = true
+        }
+      }
+
+      return item
+    })
+
+    this.prevCheck()
+
+    this.loaded = true
+
+    this.setState({data: _data})
+
+    window.GLOB.SyncData.delete(config.dataName)
+
+    MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+  }
+
+  searchRefresh = (searchId) => {
+    const { config } = this.state
+
+    if (config.$searchId !== searchId) return
+    
+    this.reloadIndex()
   }
 
   /**
@@ -319,14 +426,15 @@
    * @param {*} btn        // 鎵ц鐨勬寜閽�
    */
   refreshByButtonResult = (menuId, position, btn, id = '', lines) => {
-    const { config, BID, supComs, supNodes } = this.state
+    const { config, BID } = this.state
 
     if (config.uuid !== menuId) return
 
-    if (supComs) {
-      if (position === 'mainline' || position === 'popclose') { // 涓昏〃鍒锋柊锛屽幓闄ゅ悓姝ュ埛鏂扮粍浠�
-        let supNode = supNodes[supNodes.length - 1]
-        supComs.forEach((item, i) => {
+    let _id = config.wrap.selected === 'always' ? id : ''
+    if (config.supNodes) {
+      if (['mainline', 'maingrid', 'popclose'].includes(position)) {
+        let supNode = this.supModules[this.supModules.length - 1]
+        config.supNodes.forEach((item, i) => {
           setTimeout(() => {
             if (supNode && supNode.key === item) {
               MKEmitter.emit('reloadData', item, supNode.value)
@@ -336,41 +444,41 @@
           }, i * 10)
         })
       } else {
-        if (position === 'line') {
+        if (position === 'line' || position === 'line_grid') {
           if (lines && lines.length === 1) {
-            this.loadLinedata(lines[0].$$uuid)
+            if (config.forbidLine) {
+              this.loadData(lines[0].$$uuid, 'repage')
+            } else {
+              this.loadLinedata(lines[0].$$uuid, position)
+            }
           } else {
-            this.loadData(id)
+            this.loadData(_id, 'repage')
           }
-        } else if (!btn || btn.resetPageIndex !== 'false') {
-          this.setState({
-            pageIndex: 1
-          }, () => {
-            this.loadData(id)
-          })
+        } else if (btn.resetPageIndex !== 'false') {
+          this.reloadIndex()
         } else {
-          this.loadData(id)
+          this.loadData(_id, 'repage')
         }
       }
     } else {
       let supModule = config.setting.supModule
 
-      if (position === 'line') {
+      if (position === 'line' || position === 'line_grid') {
         if (lines && lines.length === 1) {
-          this.loadLinedata(lines[0].$$uuid)
+          if (config.forbidLine) {
+            this.loadData(lines[0].$$uuid, 'repage')
+          } else {
+            this.loadLinedata(lines[0].$$uuid, position)
+          }
         } else {
-          this.loadData(id)
+          this.loadData(_id, 'repage')
         }
-      } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
-        MKEmitter.emit('reloadData', supModule, BID)
-      } else if (!btn || btn.resetPageIndex !== 'false') {
-        this.setState({
-          pageIndex: 1
-        }, () => {
-          this.loadData(id)
-        })
+      } else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
+        MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
+      } else if (btn.resetPageIndex !== 'false') {
+        this.reloadIndex()
       } else {
-        this.loadData(id)
+        this.loadData(_id, 'repage')
       }
     }
   }
@@ -392,59 +500,61 @@
     })
   }
 
-  checkTopLine = (id) => {
-    const { config, data, selected } = this.state
+  reloadIndex = () => {
+    this.setState({
+      pageIndex: 1
+    }, () => {
+      this.loadData()
+    })
+  }
 
-    if (!data || data.length === 0) {
-      this.setState({
-        activeKey: '',
-        selectKeys: [],
-        selectedData: []
-      })
-  
-      MKEmitter.emit('resetSelectLine', config.uuid, '', '')
-      if (config.setting.$hasSyncModule) {
-        MKEmitter.emit('syncBalconyData', config.uuid, [], false)
-      }
-      return
+  prevCheck = (id) => {
+    const { selected } = this.state
+
+    if (selected === 'false' && !id) return
+
+    setTimeout(() => {
+      this.checkTopLine(id, selected)
+    }, 10)
+
+    if (selected === 'init') {
+      this.setState({selected: 'false'})
     }
+  }
 
-    if (selected === 'sign') {
-      let index = ''
-      let keys = []
-      let items = []
-      let last = ''
-      data.forEach((item, i) => {
-        if (!item.$disabled && item.selected === 'true') {
-          items.push(item)
-          keys.push(i)
-          index = i
-          last = item
+  checkTopLine = (id, selected) => {
+    const { config, data } = this.state
+
+    let index = -1
+    let keys = []
+    let items = []
+
+    if (data.length > 0) {
+      if (id) {
+        index = data.findIndex(item => item.$$uuid === id && !item.$disabled)
+      }
+  
+      if (index !== -1) {
+        keys = [index]
+        items = [data[index]]
+      } else if (selected === 'sign') {
+        data.forEach((item, i) => {
+          if (!item.$disabled && item.selected === 'true') {
+            items.push(item)
+            keys.push(i)
+            index = i
+          }
+        })
+      } else if (selected !== 'false') {
+        if (!data[0].$disabled) {
+          index = 0
+          keys = [index]
+          items = [data[index]]
         }
-      })
-
-      this.setState({
-        activeKey: index,
-        selectKeys: keys,
-        selectedData: items
-      })
-  
-      MKEmitter.emit('resetSelectLine', config.uuid, last ? last.$$uuid : '', last)
-      if (config.setting.$hasSyncModule) {
-        MKEmitter.emit('syncBalconyData', config.uuid, items, data.length === keys.length)
-      }
-      return
-    }
-
-    let index = 0
-    if (id) {
-      index = data.findIndex(item => item.$$uuid === id)
-      if (index === -1) {
-        index = 0
       }
     }
 
-    if (data[index].$disabled) {
+    if (index === -1) {
       this.setState({
         activeKey: '',
         selectKeys: [],
@@ -457,16 +567,18 @@
       }
       return
     }
+
+    let item = items[items.length - 1]
 
     this.setState({
       activeKey: index,
-      selectKeys: [index],
-      selectedData: [data[index]]
+      selectKeys: keys,
+      selectedData: items
     })
 
-    MKEmitter.emit('resetSelectLine', config.uuid, data[index].$$uuid, data[index])
+    MKEmitter.emit('resetSelectLine', config.uuid, item.$$uuid, item)
     if (config.setting.$hasSyncModule) {
-      MKEmitter.emit('syncBalconyData', config.uuid, [data[index]], data.length === 1)
+      MKEmitter.emit('syncBalconyData', config.uuid, items, data.length === keys.length)
     }
   }
 
@@ -499,7 +611,7 @@
       MKEmitter.emit('resetSelectLine', config.uuid, last ? last.$$uuid : '', last)
       MKEmitter.emit('syncBalconyData', config.uuid, items, data.length > 0 && data.length === keys.length)
       if (items.length === 0) {
-        message.warning('鏈幏鍙栧埌鏁版嵁锛�')
+        message.warning(window.GLOB.dict['no_data'] || '鏈幏鍙栧埌鏁版嵁锛�')
       }
     } else {
       this.setState({
@@ -517,7 +629,7 @@
     const { config, data, selectedData } = this.state
 
     if (config.wrap.cardType !== 'checkbox') return
-    if (!data || data.length === 0) return
+    if (data.length === 0) return
     
     if (selectedData.length === 0 || selectedData.length < data.length) {
       let index = ''
@@ -564,41 +676,43 @@
     if (config.uuid !== menuId) return
 
     if (!id) {
-      this.loadData()
+      this.reloadIndex()
+    } else if (config.forbidLine) {
+      this.loadData(id, 'repage')
     } else {
       this.loadLinedata(id)
     }
   }
 
   resetParentParam = (MenuID, id, data) => {
-    const { config, supComs } = this.state
+    const { config } = this.state
 
-    if (supComs) {
-      if (!supComs.includes(MenuID)) return
-      let supNodes = this.state.supNodes.filter(item => item.key !== MenuID)
+    if (config.supNodes) {
+      if (!config.supNodes.includes(MenuID)) return
+      this.supModules = this.supModules.filter(item => item.key !== MenuID)
       let bid = ''
       let _data = null
 
       if (id) {
-        supNodes.push({key: MenuID, value: id, data})
+        this.supModules.push({key: MenuID, value: id, data})
       }
-      if (supNodes.length > 0) {
-        bid = supNodes[supNodes.length - 1].value
-        _data = supNodes[supNodes.length - 1].data
+      if (this.supModules.length > 0) {
+        bid = this.supModules[this.supModules.length - 1].value
+        _data = this.supModules[this.supModules.length - 1].data
       }
 
       if (bid !== this.state.BID || bid !== '') {
-        this.setState({ BID: bid, BData: _data, pageIndex: 1, supNodes }, () => {
+        this.setState({ BID: bid, BData: _data, pageIndex: 1 }, () => {
           this.loadData()
         })
-      } else {
-        this.setState({ supNodes })
       }
     } else {
       if (!config.setting.supModule || config.setting.supModule !== MenuID) return
       if (id !== this.state.BID || id !== '') {
         this.setState({ BID: id, BData: data, pageIndex: 1 }, () => {
-          this.loadData()
+          if (!config.checkBid) {
+            this.loadData()
+          }
         })
       }
     }
@@ -608,35 +722,33 @@
    * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
    */
   queryModuleParam = (menuId, callback) => {
-    const { mainSearch } = this.props
-    const { arr_field, config, search, orderBy } = this.state
+    const { config, search, orderBy } = 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())
+    let searches = fromJS(search).toJS()
+    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 ||config.setting.order || '',
-      search: searches,
-      menuName: config.name
+      orderBy: orderBy || config.setting.order || '',
+      search: searches
     })
   }
 
   async loadData (id, type) {
-    const { mainSearch } = this.props
-    const { config, arr_field, pageIndex, pageSize, search, BID, BData, selected, orderBy } = this.state
+    const { config, pageIndex, pageSize, search, BID, BData, selected, orderBy } = this.state
 
     if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
       this.loaded = true
+      this.requestId = ''
 
       this.setState({
         activeKey: '',
@@ -648,34 +760,29 @@
         loading: false
       })
       
-      if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
-        setTimeout(() => {
-          this.checkTopLine(id)
-        }, 200)
-        if (selected === 'init') {
-          this.setState({selected: 'false'})
-        }
-      } else {
-        MKEmitter.emit('resetSelectLine', config.uuid, '', '')
-        if (config.setting.$hasSyncModule) {
-          MKEmitter.emit('syncBalconyData', config.uuid, [], false)
-        }
+      MKEmitter.emit('resetSelectLine', config.uuid, '', '')
+      if (config.setting.$hasSyncModule) {
+        MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+      }
+      if (config.$hasTopModule) {
+        window.GLOB.CacheData.set(config.uuid + 'tb', { $$empty: true, $$uuid: '' })
+        MKEmitter.emit('mkPublicData', config.uuid + 'tb', { $$empty: true, $$uuid: '' })
       }
       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)
       })
     }
 
-    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
     }
 
@@ -686,27 +793,31 @@
     }
 
     let _orderBy = orderBy || config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
+    let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, pageSize, BID)
 
-    let result = await Api.genericInterface(param)
+    this.requestId = config.uuid + new Date().getTime()
+
+    let result = await Api.genericInterface(param, '', '', this.requestId)
     if (result.status) {
+      if (result.$requestId && this.requestId !== result.$requestId) return
+
+      if (type === 'repage' && result.data.length === 0 && pageIndex > 1) {
+        this.reloadIndex()
+        return
+      }
+
       let start = 1
       if (config.setting.laypage) {
         start = pageSize * (pageIndex - 1) + 1
       }
 
       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 (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
-        setTimeout(() => {
-          this.checkTopLine(id)
-        }, 200)
-        if (selected === 'init') {
-          this.setState({selected: 'false'})
-        }
+      if (selected !== 'false' || id) {
+        this.prevCheck(id)
       } else {
         MKEmitter.emit('resetSelectLine', config.uuid, '', '')
         if (config.setting.$hasSyncModule) {
@@ -749,14 +860,25 @@
         })
       }
 
+      let total = result.total || 0
+      if (config.setting.custompage && data.length) {
+        total = data[data.length - 1].mk_total || 0
+      }
+
       this.setState({
         activeKey: '',
         selectKeys: [],
         selectedData: [],
         data: data,
-        total: result.total,
+        total: total,
+        pickup: false,
         loading: false
       })
+
+      if (config.$hasTopModule) {
+        window.GLOB.CacheData.set(config.uuid + 'tb', data[0] || { $$empty: true, $$uuid: '' })
+        MKEmitter.emit('mkPublicData', config.uuid + 'tb', data[0] || { $$empty: true, $$uuid: '' })
+      }
 
       if (config.timer && config.clearField && result.data && result.data[0]) {
         let vals = (config.clearValue || '').split(',')
@@ -764,54 +886,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
-          })
-        }
-      }
+
+      UtilsDM.querySuccess(result)
     } else {
       this.setState({
         loading: false
       })
       this.timer && this.timer.stop()
 
-      if (!result.message) return
-      if (result.ErrCode === 'N') {
-        Modal.error({
-          title: result.message,
-        })
-      } else if (result.ErrCode !== '-2') {
-        notification.error({
-          top: 92,
-          message: result.message,
-          duration: 10
-        })
-      }
+      UtilsDM.queryFail(result)
     }
   }
 
   /**
    * @description 鑾峰彇鍗曡鏁版嵁
    */ 
-  async loadLinedata (id) {
-    const { mainSearch } = this.props
-    const { config, arr_field, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
+  async loadLinedata (id, position) {
+    const { config, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
 
     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)
       })
     }
 
@@ -820,47 +920,121 @@
     })
 
     let _orderBy = orderBy || config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
+    let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, pageSize, BID, id)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
-      let data = fromJS(this.state.data).toJS()
-      if (result.data && result.data[0]) {
-        let _data = result.data[0]
-
-        try {
-          data = data.map(item => {
-            if (item[config.setting.primaryKey] === _data[config.setting.primaryKey]) {
-              _data.key = item.key
-              _data.$$uuid = _data[config.setting.primaryKey] || ''
-              _data.$$BID = BID || ''
-              _data.$$BData = BData || ''
-              _data.$Index = item.$Index
-              return _data
-            } else {
-              return item
-            }
-          })
-        } catch (e) {
-          console.warn('鏁版嵁鏌ヨ閿欒')
-        }
-
-        MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
+      if (position === 'line_grid' && (!result.data || !result.data[0])) {
+        this.reloadIndex()
+        return
       }
 
-      this.setState({
-        data: data,
-        loading: false
-      })
+      let data = fromJS(this.state.data).toJS()
+      let selectedData = fromJS(this.state.selectedData).toJS()
+      let selectKeys = fromJS(this.state.selectKeys).toJS()
+      let activeKey = this.state.activeKey
+
+      if (result.data && result.data[0]) {
+        let _data = result.data[0]
+        _data.$$uuid = _data[config.setting.primaryKey] || ''
+        _data.$$BID = BID || ''
+        _data.$$BData = BData || ''
+
+        if (config.wrap.controlField) {
+          if (config.wrap.controlVal.includes(_data[config.wrap.controlField] + '')) {
+            _data.$disabled = true
+          }
+        }
+
+        data = data.map(item => {
+          if (item.$$uuid === _data.$$uuid) {
+            _data.key = item.key
+            _data.$Index = item.$Index
+            return _data
+          }
+          return item
+        })
+
+        if (!_data.$Index) {
+          this.setState({
+            loading: false
+          })
+          return
+        }
+
+        selectedData = selectedData.map(item => {
+          if (item.$$uuid === _data.$$uuid) {
+            return _data
+          }
+          return item
+        })
+
+        this.setState({
+          data: data,
+          selectedData: selectedData,
+          loading: false
+        })
+
+        if (_data.key === activeKey) {
+          MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
+        }
+        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
+          return item
+        })
+        
+        let trans = activeKey === index
+        let _item = null
+        
+        if (config.wrap.cardType) {
+          selectKeys = selectKeys.filter(key => key !== index)
+          selectKeys = selectKeys.map(key => key > index ? key - 1 : key)
+
+          selectedData = selectKeys.map(key => data[key]).filter(Boolean)
+
+          activeKey = selectKeys.length ? selectKeys[selectKeys.length - 1] : ''
+
+          if (trans && selectedData.length) {
+            _item = selectedData[selectedData.length - 1]
+          }
+        }
+
+        this.setState({
+          data: data,
+          activeKey: activeKey,
+          selectKeys: selectKeys,
+          selectedData: selectedData,
+          loading: false
+        })
+
+        if (trans) {
+          MKEmitter.emit('resetSelectLine', config.uuid, (_item ? _item.$$uuid : ''), _item)
+        }
+
+        if (config.setting.$hasSyncModule) {
+          MKEmitter.emit('syncBalconyData', config.uuid, selectedData, data.length === selectedData.length)
+        }
+      }
     } else {
       this.setState({
         loading: false
       })
-      notification.error({
-        top: 92,
-        message: result.message,
-        duration: 10
-      })
+      
+      UtilsDM.queryFail(result)
     }
   }
 
@@ -912,6 +1086,20 @@
   }
 
   refreshSearch = (list) => {
+    const { config, BID } = this.state
+
+    if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') {
+      notification.warning({
+        top: 92,
+        message: config.setting.supModTip || window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+        duration: 5
+      })
+      this.setState({
+        search: list
+      })
+      return
+    }
+
     this.setState({
       search: list,
       pageIndex: 1
@@ -959,6 +1147,7 @@
       if (activeKey === index) return
 
       _selectedData = [item]
+      _selectKeys = [index]
       _activeKey = index
     }
 
@@ -982,14 +1171,22 @@
     })
   }
 
-  render() {
-    const { config, precards, nextcards, loading, data, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys } = this.state
+  pickupChange = () => {
+    this.setState({
+      pickup: !this.state.pickup
+    })
+  }
 
-    if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
+  render() {
+    const { config, precards, nextcards, loading, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, pickup } = this.state
+
+    let data = this.state.data
+
+    if (config.wrap.empty === 'hidden' && data.length === 0) return null
 
     let _total = 0
     let switchable = false
-    if (config.wrap.pagestyle === 'switch' && total > pageSize && data) {
+    if (config.wrap.pagestyle === 'switch' && total > pageSize) {
       _total = pageSize * pageIndex
       switchable = true
     }
@@ -999,7 +1196,7 @@
     if (config.$extend) {
       extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
       
-      if (data && data[0]) {
+      if (data[0]) {
         if (selectedData[0]) {
           extendData = {...extendData, ...selectedData[0]}
         } else {
@@ -1015,11 +1212,15 @@
       }
     }
 
+    if (pickup) {
+      data = data.filter(item => selectKeys.includes(item.key))
+    }
+
     return (
-      <div className="custom-data-card-box" id={'anchor' + config.uuid} style={config.style}>
+      <div className={'custom-data-card-box ' + config.wrap.shifting} id={'anchor' + config.uuid} style={config.style}>
         {loading ?
           <div className="loading-mask">
-            {data ? <div className="ant-spin-blur"></div> : null}
+            {data.length ? <div className="ant-spin-blur"></div> : null}
             <Spin />
           </div> : null
         }
@@ -1034,11 +1235,12 @@
             selectedData={selectedData}
           /> : null
         }
+        {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren={window.GLOB.dict['open'] || '寮�'} unCheckedChildren={window.GLOB.dict['shut'] || '鍏�'} checked={pickup} onChange={this.pickupChange} /></div> : null}
         <div className={`data-zoom ${config.wrap.wrapClass}`}>
           {switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
-          <Row className={'card-row-list ' + config.wrap.layout}>
+          <Row className={'card-row-list ' + config.wrap.layout} style={config.wrap.zoomStyle}>
             {precards.map((item, index) => (
-              <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
+              <Col key={'pre' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
                 {item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
                   {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
                 </TableHeader> : <CardItem card={item} cards={config} data={extendData}>
@@ -1046,31 +1248,31 @@
                 </CardItem>}
               </Col>
             ))}
-            {data && data.map((item, index) => {
+            {data.map((item, index) => {
               let className = 'mk-card '
               if (config.wrap.parity === 'true') {
                 if (index % 2 === 1) {
-                  className += 'mk-parity-bg '
+                  className += 'mk-even-line '
                 }
               }
               if (item.$disabled) {
                 className = 'mk-disabled'
-              } else if (activeKey === index) {
+              } else if (activeKey === item.key) {
                 className += 'active'
-              } else if (selectKeys.indexOf(index) > -1) {
+              } else if (selectKeys.indexOf(item.key) > -1) {
                 className += 'selected'
               }
 
               return (
-                <Col className={className} key={index} span={card.setting.width}>
-                  <CardItem card={card} cards={config} data={item} onClick={() => {this.changeCard(index, item)}}>
+                <Col className={className} key={index} style={card.wStyle} span={card.setting.width}>
+                  <CardItem card={card} cards={config} data={item} onClick={() => {this.changeCard(item.key, item)}}>
                     <span className="circle-select"></span>
                   </CardItem>
                 </Col>
               )
             })}
             {nextcards.map((item, index) => (
-              <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
+              <Col key={'next' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
                 {item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
                   {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
                 </TableHeader> : <CardItem card={item} cards={config} data={extendData}>
@@ -1081,9 +1283,9 @@
           </Row>
           {switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
         </div>
-        {config.$empty && (!data || data.length === 0) ? <Empty description={false}/> : null}
-        {config.wrap.pagestyle === 'page' && data ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
-        {config.wrap.pagestyle === 'more' && data && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
+        {config.$empty && data.length === 0 ? <Empty description={false}/> : null}
+        {config.wrap.pagestyle === 'page' ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} ${window.GLOB.dict['of'] || '鍏�'} ${total} ${window.GLOB.dict['items'] || '鏉�'}` : `${total} ${window.GLOB.dict['items'] || '鏉�'}`} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
+        {config.wrap.pagestyle === 'more' && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>{window.GLOB.dict['view_more'] || '鏌ョ湅鏇村'}<DownOutlined/></div> : null}
       </div>
     )
   }

--
Gitblit v1.8.0