From dc258e4600bea2fba1e25054d163a2f4b1326a85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 10:23:38 +0800
Subject: [PATCH] 2023-08-08

---
 src/tabviews/custom/components/card/double-data-card/index.jsx |  728 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 479 insertions(+), 249 deletions(-)

diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index 3599a92..4ae9acd 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -5,23 +5,20 @@
 import { DownOutlined, UpOutlined, PlusSquareOutlined, MinusSquareOutlined } 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'
 import MKEmitter from '@/utils/events.js'
 import TimerTask from '@/utils/timer-task.js'
 import asyncComponent from '@/utils/asyncComponent'
 import './index.scss'
 
 const CardItem = asyncComponent(() => import('../cardItem'))
+const TableHeader = asyncComponent(() => import('../tableHeader'))
 const MainAction = asyncComponent(() => import('@/tabviews/zshare/actionList'))
 const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
 
 class DoubleDataCard extends Component {
   static propTpyes = {
     config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
-    mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
   }
 
   state = {
@@ -30,6 +27,9 @@
     config: null,              // 鍥捐〃閰嶇疆淇℃伅
     search: null,              // 鎼滅储鏉′欢
     pageIndex: 1,              // 椤电爜
+    pageSize: 10,
+    orderBy: '',
+    pageOptions: [],
     activeKey: '',             // 閫変腑鍗�
     selectKeys: [],            // 澶氶�夋椂閫変腑鍗$墖
     selectedData: [],          // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
@@ -76,6 +76,9 @@
       }
     }
 
+    _config.$extend = false
+    _config.$empty = true
+
     _config.subcards.forEach(item => {
       if (item.setting.click === 'button' && !item.setting.linkbtn) {
         item.elements.forEach(ele => {
@@ -88,19 +91,31 @@
         }
       }
 
+      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) {
+        _config.$extend = true
+        if (item.setting.width !== 24) {
+          _config.$empty = false
+        }
         precards.push(item)
       } else {
+        _config.$extend = true
+        _config.$empty = false
         nextcards.push(item)
       }
     })
 
     _config.subcards = null
     
-    let _data = null
-
     let selected = 'false'
     if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init' || _config.wrap.selected === 'sign') {
       selected = _config.wrap.selected
@@ -112,8 +127,6 @@
     _config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
 
     _config.wrap.wrapClass =  `${_config.wrap.selStyle} ${_config.wrap.cardType || ''}`
-
-    this.loaded = _data !== null
 
     let wrapStyle = null
     let subcard = fromJS(_card).toJS()
@@ -127,21 +140,48 @@
     subcard.setting = subcard.backSetting
 
     if (_card.setting.position === 'inner') {
-      wrapStyle = {}
+      wrapStyle = {backgroundColor: '#ffffff'}
       Object.keys(_card.style).forEach(key => {
-        if (!/^(margin|border|box)/.test(key)) return
+        if (!/^(margin|border|box|backgroundColor)/.test(key)) return
         wrapStyle[key] = _card.style[key]
         delete _card.style[key]
       })
     }
 
     _config.setting.sub_field = subconfig.columns.map(col => col.field).join(',')
+    let pageOptions = ['10', '25', '50', '100', '500', '1000']
+
+    if (!_config.setting.laypage) {
+      _config.wrap.pagestyle = 'none'
+    }
+
+    if (_config.wrap.pagestyle === 'page') {
+      let size = (_config.setting.pageSize || 10) + ''
+      if (!pageOptions.includes(size)) {
+        pageOptions.push(size)
+        pageOptions = pageOptions.sort((a, b) => a - b)
+      }
+    }
+
+    if (_config.wrap.zHeight) {
+      _config.wrap.zHeight = _config.wrap.zHeight <= 100 ? _config.wrap.zHeight + 'vh' : _config.wrap.zHeight
+    }
+
+    if (_config.wrap.zHeight || _config.wrap.minWidth) {
+      _config.wrap.zoomStyle = {
+        border: `1px solid ${_config.wrap.zBColor || 'transparent'}`,
+        height: _config.wrap.zHeight || 'auto'
+      }
+    } else {
+      _config.wrap.zoomStyle = null
+    }
 
     this.setState({
+      pageSize: _config.setting.pageSize || 10,
+      pageOptions,
       selected,
       precards,
       nextcards,
-      data: _data,
       BID: BID || '',
       BData: BData || '',
       config: _config,
@@ -149,14 +189,8 @@
       subconfig: subconfig,
       wrapStyle: wrapStyle,
       card: _card,
-      search: Utils.initMainSearch(_config.search),
-      arr_field: _config.columns.map(col => col.field).join(','),
-    }, () => {
-      if (_config.setting.onload === 'true') {
-        setTimeout(() => {
-          this.loadData()
-        }, _config.setting.delay || 0)
-      }
+      search: _config.$searches,
+      arr_field: _config.columns.map(col => col.field).join(',')
     })
   }
 
@@ -164,10 +198,15 @@
     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.timer) {
       this.timer = new TimerTask()
       this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
@@ -179,43 +218,8 @@
       })
     }
 
-    if (config.$cache && !this.loaded) {
-      Api.getLCacheConfig(config.uuid).then(res => {
-        if (!res || this.loaded) return
-        let _data = res.map((item, index) => {
-          if (item[config.setting.subdata]) {
-            let _children = item[config.setting.subdata]
-
-            delete item[config.setting.subdata]
-
-            item.children = _children.map((cell, i) => {
-              cell.key = i
-              cell.$$uuid = cell[config.setting.subKey] || ''
-              cell.$$BID = item[config.setting.primaryKey] || ''
-              cell.$$BData = {...item}
-              cell.$Index = i + 1 + ''
-
-              return cell
-            })
-          } else {
-            item.children = []
-          }
-
-          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') {
+      this.initExec()
     }
   }
 
@@ -223,21 +227,13 @@
     return !is(fromJS(this.state), fromJS(nextState))
   }
 
-  UNSAFE_componentWillReceiveProps (nextProps) {
-    const { config } = this.state
-
-    if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
-      this.setState({pageIndex: 1}, () => {
-        this.loadData()
-      })
-    }
-  }
-
   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('queryModuleParam', this.queryModuleParam)
     MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -245,11 +241,91 @@
     this.timer && this.timer.stop()
   }
 
+  initExec = () => {
+    const { config } = this.state
+
+    if (config.$cache) {
+      let getData = (res) => {
+        return res.map((item, index) => {
+          let children = []
+
+          if (item[config.setting.subdata]) {
+            let _children = item[config.setting.subdata]
+
+            delete item[config.setting.subdata]
+
+            _children.forEach((cell, i) => {
+              cell.key = i
+              cell.$$uuid = cell[config.setting.subKey] || ''
+              cell.$$parentId = item[config.setting.primaryKey] || ''
+              cell.$$BID = item[config.setting.primaryKey] || ''
+              cell.$$BData = {...item}
+              cell.$Index = i + 1 + ''
+
+              if (cell.$$uuid) {
+                children.push(cell)
+              }
+            })
+          }
+
+          item.children = children
+
+          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
+        })
+      }
+      
+      if (config.$time && !config.setting.laypage) {
+        Api.getLCacheConfig(config.uuid, config.$time).then(res => {
+          if (!res.valid) {
+            setTimeout(() => {
+              this.loadData()
+            }, config.setting.delay || 0)
+          }
+
+          if (!res.data) return
+  
+          this.setState({data: getData(res.data)})
+        })
+      } else {
+        Api.getLCacheConfig(config.uuid, 0).then(res => {
+          if (!res.data || this.loaded) return
+  
+          this.setState({data: getData(res.data)})
+        })
+
+        setTimeout(() => {
+          this.loadData()
+        }, config.setting.delay || 0)
+      }
+    } else {
+      setTimeout(() => {
+        this.loadData()
+      }, config.setting.delay || 0)
+    }
+  }
+
+  searchRefresh = (searchId) => {
+    const { config } = this.state
+
+    if (config.$searchId !== searchId) return
+    
+    this.setState({pageIndex: 1}, () => {
+      this.loadData()
+    })
+  }
+
   /**
    * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
-   * @param {*} menuId     // 鑿滃崟Id
-   * @param {*} position   // 鍒锋柊浣嶇疆
-   * @param {*} btn        // 鎵ц鐨勬寜閽�
    */
   refreshByButtonResult = (menuId, position, btn, id = '', lines) => {
     const { config, BID } = this.state
@@ -260,7 +336,7 @@
 
     if (position === 'line') {
       if (lines && lines.length === 1) {
-        this.loadLinedata(lines[0].$$uuid)
+        this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid)
       } else {
         this.loadData(id)
       }
@@ -275,10 +351,28 @@
     } else {
       this.loadData(id)
     }
+  }
 
-    if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
-      btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
-    }
+  refreshLineData = (menuId, btn, uuid, count) => {
+    const { config, data } = this.state
+
+    if (config.uuid !== menuId) return
+    
+    let _data = fromJS(data).toJS().map(item => {
+      if (item.$$uuid === uuid) {
+        item[btn.field] = count
+      }
+      item.children.forEach(cell => {
+        if (cell.$$uuid === uuid) {
+          cell[btn.field] = count
+        }
+      })
+      return item
+    })
+
+    this.setState({
+      data: _data
+    })
   }
 
   checkTopLine = (id) => {
@@ -366,6 +460,7 @@
   checkAll = () => {
     const { config, data, selectedData } = this.state
 
+    if (config.wrap.cardType !== 'checkbox') return
     if (!data || data.length === 0) return
     
     if (selectedData.length === 0 || selectedData.length < data.length) {
@@ -428,32 +523,31 @@
    * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
    */
   queryModuleParam = (menuId, callback) => {
-    const { mainSearch } = this.props
-    const { arr_field, config, search } = this.state
+    const { arr_field, 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())
+    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: config.setting.order || '',
+      orderBy: orderBy || config.setting.order || '',
       search: searches,
       menuName: config.name
     })
   }
 
   async loadData (id, type) {
-    const { mainSearch } = this.props
-    const { config, arr_field, pageIndex, search, BID, BData, selected, card } = this.state
+    const { config, arr_field, pageIndex, pageSize, search, BID, BData, selected, card, orderBy } = this.state
 
     if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
       this.loaded = true
@@ -472,7 +566,7 @@
       if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
         setTimeout(() => {
           this.checkTopLine(id)
-        }, 200)
+        }, 10)
         if (selected === 'init') {
           this.setState({selected: 'false'})
         }
@@ -483,17 +577,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
     }
 
@@ -503,25 +597,25 @@
       })
     }
 
-    let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID)
+    let _orderBy = orderBy || config.setting.order || ''
+    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
       let start = 1
       if (config.setting.laypage) {
-        start = config.setting.pageSize * (pageIndex - 1) + 1
+        start = pageSize * (pageIndex - 1) + 1
       }
 
       this.loaded = true
       if (config.$cache && pageIndex === 1 && config.setting.onload !== 'false') {
-        Api.writeCacheConfig(config.uuid, result.data || '')
+        Api.writeCacheConfig(config.uuid, result.data || [])
       }
 
       if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
         setTimeout(() => {
           this.checkTopLine(id)
-        }, 200)
+        }, 10)
         if (selected === 'init') {
           this.setState({selected: 'false'})
         }
@@ -536,20 +630,25 @@
         let _data = (this.state.data || []).concat(result.data || [])
         data = _data.map((item, index) => {
           if (item[config.setting.subdata]) {
+            let children = []
             let _children = item[config.setting.subdata]
 
             delete item[config.setting.subdata]
-
-            item.children = _children.map((cell, i) => {
+            
+            _children.forEach((cell, i) => {
               cell.key = i
               cell.$$uuid = cell[config.setting.subKey] || ''
+              cell.$$parentId = item[config.setting.primaryKey] || ''
               cell.$$BID = item[config.setting.primaryKey] || ''
               cell.$$BData = {...item}
               cell.$Index = i + 1 + ''
 
-              return cell
+              if (cell.$$uuid) {
+                children.push(cell)
+              }
             })
-          } else {
+            item.children = children
+          } else if (!item.children) {
             item.children = []
           }
 
@@ -560,7 +659,7 @@
           item.$Index = index + 1 + ''
 
           if (config.wrap.controlField) {
-            if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+            if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
               item.$disabled = true
             }
           }
@@ -569,23 +668,28 @@
         })
       } else {
         data = result.data.map((item, index) => {
+          let children = []
+
           if (item[config.setting.subdata]) {
             let _children = item[config.setting.subdata]
 
             delete item[config.setting.subdata]
 
-            item.children = _children.map((cell, i) => {
+            _children.forEach((cell, i) => {
               cell.key = i
               cell.$$uuid = cell[config.setting.subKey] || ''
+              cell.$$parentId = item[config.setting.primaryKey] || ''
               cell.$$BID = item[config.setting.primaryKey] || ''
               cell.$$BData = {...item}
               cell.$Index = i + 1 + ''
 
-              return cell
+              if (cell.$$uuid) {
+                children.push(cell)
+              }
             })
-          } else {
-            item.children = []
           }
+
+          item.children = children
 
           item.key = index
           item.$$uuid = item[config.setting.primaryKey] || ''
@@ -594,7 +698,7 @@
           item.$Index = index + start + ''
 
           if (config.wrap.controlField) {
-            if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+            if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
               item.$disabled = true
             }
           }
@@ -608,25 +712,52 @@
         opens = []
       }
 
+      let total = result.total || 0
+      if (config.setting.custompage && data.length) {
+        total = data[data.length - 1].mk_total || 0
+      }
+
       this.setState({
         activeKey: '',
         selectKeys: [],
         opens: opens,
         selectedData: [],
         data: data,
-        total: result.total,
+        total: total,
         loading: false
       })
+
+      if (config.timer && config.clearField && result.data && result.data[0]) {
+        let vals = (config.clearValue || '').split(',')
+        if (vals.includes(result.data[0][config.clearField])) {
+          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,
@@ -640,16 +771,16 @@
    * @description 鑾峰彇鍗曡鏁版嵁
    */ 
   async loadLinedata (id) {
-    const { mainSearch } = this.props
-    const { config, arr_field, pageIndex, search, BID, BData } = this.state
+    const { config, arr_field, 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)
       })
     }
 
@@ -657,57 +788,121 @@
       loading: true
     })
 
-    let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, id)
+    let _orderBy = orderBy || config.setting.order || ''
+    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
       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 || ''
 
-        try {
-          data = data.map(item => {
-            if (item[config.setting.primaryKey] === _data[config.setting.primaryKey]) {
-              if (_data[config.setting.subdata]) {
-                let _children = _data[config.setting.subdata]
+        data = data.map(item => {
+          if (item.$$uuid === _data.$$uuid) {
+            let children = []
 
-                delete _data[config.setting.subdata]
+            if (_data[config.setting.subdata]) {
+              let _children = _data[config.setting.subdata]
 
-                _data.children = _children.map((cell, i) => {
-                  cell.key = i
-                  cell.$$uuid = cell[config.setting.subKey] || ''
-                  cell.$$BID = _data[config.setting.primaryKey] || ''
-                  cell.$$BData = {..._data}
-                  cell.$Index = i + 1 + ''
+              delete _data[config.setting.subdata]
 
-                  return cell
-                })
-              } else {
-                _data.children = []
-              }
+              _children.forEach((cell, i) => {
+                cell.key = i
+                cell.$$uuid = cell[config.setting.subKey] || ''
+                cell.$$parentId = _data[config.setting.primaryKey] || ''
+                cell.$$BID = _data[config.setting.primaryKey] || ''
+                cell.$$BData = {..._data}
+                cell.$Index = i + 1 + ''
 
-              _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
+                if (cell.$$uuid) {
+                  children.push(cell)
+                }
+              })
             }
+
+            _data.children = children
+            _data.key = item.key
+            _data.$Index = item.$Index
+            return _data
+          } else {
+            return item
+          }
+        })
+
+        if (!_data.$Index) {
+          this.setState({
+            loading: false
           })
-        } catch (e) {
-          console.warn('鏁版嵁鏌ヨ閿欒')
+          return
         }
 
-        MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
-      }
+        selectedData = selectedData.map(item => {
+          if (item.$$uuid === _data.$$uuid) {
+            return _data
+          }
+          return item
+        })
 
-      this.setState({
-        data: data,
-        loading: false
-      })
+        this.setState({
+          data: data,
+          selectedData: selectedData,
+          loading: false
+        })
+
+        if (_data.key === activeKey) {
+          MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
+        }
+      } 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)
+        }
+      }
     } else {
       this.setState({
         loading: false
@@ -721,9 +916,9 @@
   }
 
   loadMore = () => {
-    const { total, pageIndex, loading, config } = this.state
+    const { total, pageIndex, pageSize, loading } = this.state
 
-    if (loading || config.setting.pageSize * pageIndex >= total) {
+    if (loading || pageSize * pageIndex >= total) {
       return
     }
 
@@ -731,31 +926,6 @@
       pageIndex: pageIndex + 1
     }, () => {
       this.loadData('', 'plus')
-    })
-  }
-
-  prevPage = () => {
-    const { pageIndex } = this.state
-
-    if (pageIndex === 1) return
-
-    this.setState({
-      pageIndex: pageIndex - 1
-    }, () => {
-      this.loadData()
-    })
-  }
-
-  nextPage = () => {
-    const { config, pageIndex, total } = this.state
-    let _total = config.setting.pageSize * pageIndex
-
-    if (_total >= total) return
-
-    this.setState({
-      pageIndex: pageIndex + 1
-    }, () => {
-      this.loadData()
     })
   }
 
@@ -771,6 +941,15 @@
     this.setState({
       search: list,
       pageIndex: 1
+    }, () => {
+      this.loadData()
+    })
+  }
+
+  pageSizeChange = (current, size) => {
+    this.setState({
+      pageIndex: current,
+      pageSize: size
     }, () => {
       this.loadData()
     })
@@ -814,6 +993,7 @@
       if (activeKey === index) return
 
       _selectedData = [item]
+      _selectKeys = [index]
       _activeKey = index
     }
 
@@ -840,6 +1020,43 @@
     }
   }
 
+  changeSubCard = (item) => {
+    const { subcard, card } = this.state
+
+    if (subcard.setting.click || card.setting.position !== 'inner' || card.setting.click !== 'menu') return
+    
+    let menuId = card.setting.MenuID || card.setting.menu.slice(-1)[0]
+    let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+
+    if (!menu && card.setting.MenuName && card.setting.tabType) {
+      menu = {
+        MenuID: menuId,
+        MenuName: card.setting.MenuName,
+        MenuNo: card.setting.MenuNo || '',
+        type: card.setting.tabType
+      }
+    }
+
+    if (!menu) return
+
+    let newtab = {
+      ...menu,
+      param: {}
+    }
+
+    if (card.setting.joint === 'true') {
+      newtab.param.$BID = item.$$uuid || ''
+      
+      Object.keys(item).forEach(key => {
+        if (/^\$/.test(key)) return
+        if (key === 'children') return
+        newtab.param[key] = item[key]
+      })
+    }
+
+    MKEmitter.emit('modifyTabs', newtab, true)
+  }
+
   onDoubleClick = (i, subClass) => {
     const { opens, card } = this.state
 
@@ -852,22 +1069,31 @@
     }
   }
 
+  refreshByHeader = (sorter) => {
+    this.setState({
+      orderBy: sorter || ''
+    }, () => {
+      this.loadData()
+    })
+  }
+
   render() {
-    const { config, precards, nextcards, loading, data, pageIndex, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
+    const { config, precards, nextcards, loading, data, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
 
     if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
 
-    let _total = 0
-    let switchable = false
-    if (config.wrap.pagestyle === 'switch' && config.pageable && config.setting.laypage && total > config.setting.pageSize && data) {
-      _total = config.setting.pageSize * pageIndex
-      switchable = true
-    }
+    let extendData = null
 
-    let extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
-
-    if (data && data[0]) {
-      extendData = {...extendData, ...data[0]}
+    if (config.$extend) {
+      extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
+      
+      if (data && data[0]) {
+        if (selectedData[0]) {
+          extendData = {...extendData, ...selectedData[0]}
+        } else {
+          extendData = {...extendData, ...data[0]}
+        }
+      }
     }
 
     let checkAll = ''
@@ -902,69 +1128,73 @@
             selectedData={selectedData}
           /> : 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 '}>
-            {precards.map((item, index) => (
-              <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
-                <CardItem card={item} cards={config} data={extendData}>
-                  {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
-                </CardItem>
-              </Col>
-            ))}
-            {data && data.map((item, index) => {
-              let className = 'card-item-wrap mk-card ' + mainBox
-              let subClass = 'mk-unfold'
-              let unfold = true
-
-              if (item.$disabled) {
-                className = 'mk-disabled ' + mainBox
-              } else if (activeKey === index) {
-                className += 'active'
-              } else if (selectKeys.indexOf(index) > -1) {
-                className += 'selected'
-              }
-
-              if (card.setting.display !== 'default') {
-                if (item.children.length === 0) {
-                  subClass = 'mk-disabled'
-                  unfold = false
-                } else {
-                  subClass = opens.indexOf(index) > -1 ? 'mk-unfold' : 'mk-collapse'
-                  unfold = opens.indexOf(index) > -1
-                }
-              }
-
-              return (
-                <Col key={index} span={card.setting.width}>
-                  <div className={className} style={wrapStyle}>
-                    <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(index, subClass)} onClick={() => {this.changeCard(index, item, subClass)}}>
-                      <span className="circle-select"></span>
-                      {card.setting.controlIcon === 'left' ? (!unfold ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : <MinusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/>) : null}
-                      {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : null}
-                    </CardItem>
-                    <div className={'sub-card-wrap ' + subClass + (config.wrap.parity === 'true' ? ' mk-parity-bg' : '')}>
-                      {item.children.map((cell, index) => <Col key={'sub' + index} span={subcard.setting.width || 24}>
-                        <CardItem card={subcard} cards={subconfig} data={cell} />
-                      </Col>)}
-                    </div>
-                  </div>
+        <div className={config.wrap.zoomStyle ? 'data-zoom-box' : ''} style={config.wrap.zoomStyle}>
+          <div className={`data-zoom ${config.wrap.wrapClass}`} style={config.wrap.minWidth ? {minWidth: config.wrap.minWidth} : null}>
+            <Row className={'card-row-list '}>
+              {precards.map((item, index) => (
+                <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}>
+                    {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
+                  </CardItem>}
                 </Col>
-              )
-            })}
-            {nextcards.map((item, index) => (
-              <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
-                <CardItem card={item} cards={config} data={extendData}>
-                  {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
-                </CardItem>
-              </Col>
-            ))}
-          </Row>
-          {switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
-          {precards.length === 0 && nextcards.length === 0 && (!data || data.length === 0) ? <Empty description={false}/> : null}
+              ))}
+              {data && data.map((item, index) => {
+                let className = 'card-item-wrap mk-card ' + mainBox
+                let subClass = 'mk-unfold'
+                let unfold = true
+
+                if (item.$disabled) {
+                  className = 'card-item-wrap mk-disabled ' + mainBox
+                } else if (activeKey === index) {
+                  className += 'active'
+                } else if (selectKeys.indexOf(index) > -1) {
+                  className += 'selected'
+                }
+
+                if (card.setting.display !== 'default') {
+                  if (item.children.length === 0) {
+                    subClass = 'mk-disabled'
+                    unfold = false
+                  } else {
+                    subClass = opens.indexOf(index) > -1 ? 'mk-unfold' : 'mk-collapse'
+                    unfold = opens.indexOf(index) > -1
+                  }
+                }
+
+                return (
+                  <Col key={index} span={card.setting.width} style={card.wStyle}>
+                    <div className={className} style={wrapStyle}>
+                      <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(index, subClass)} onClick={() => {this.changeCard(index, item, subClass)}}>
+                        <span className="circle-select"></span>
+                        {card.setting.controlIcon === 'left' ? (!unfold ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : <MinusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/>) : null}
+                        {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : null}
+                      </CardItem>
+                      <div className={'sub-card-wrap ' + subClass + (config.wrap.parity === 'true' ? ' mk-parity-bg' : '')} onClick={() => this.changeSubCard(item)}>
+                        {item.children.map((cell, index) => <Col key={'sub' + index} span={subcard.setting.width || 24}>
+                          <CardItem card={subcard} cards={subconfig} data={cell} />
+                        </Col>)}
+                      </div>
+                    </div>
+                  </Col>
+                )
+              })}
+              {nextcards.map((item, index) => (
+                <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}>
+                    {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
+                  </CardItem>}
+                </Col>
+              ))}
+            </Row>
+          </div>
+          {config.$empty && (!data || data.length === 0) ? <Empty description={false}/> : null}
         </div>
-        {config.wrap.pagestyle === 'page' && config.setting.laypage && data ? <Pagination size="small" total={total} showTotal={t => `鍏� ${t} 鏉} pageSize={config.setting.pageSize} onChange={this.changePageIndex} current={pageIndex}/> : null}
-        {config.wrap.pagestyle === 'more' && config.setting.laypage && data && data.length > 0 ? <div className={'mk-more' + (config.setting.pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : 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}
       </div>
     )
   }

--
Gitblit v1.8.0