From b59a321435b48626ab268d48df841923f86f1451 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 17:51:40 +0800
Subject: [PATCH] 2022-08-19

---
 src/tabviews/custom/components/card/data-card/index.jsx |  542 ++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 342 insertions(+), 200 deletions(-)

diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 943a158..0d24ab6 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -1,8 +1,8 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { connect } from 'react-redux'
 import { Spin, Empty, notification, message, Row, Col, Pagination } from 'antd'
+import { DownOutlined } from '@ant-design/icons'
 
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
@@ -11,7 +11,6 @@
 import nextImg from '@/assets/img/next.png'
 import MKEmitter from '@/utils/events.js'
 import asyncComponent from '@/utils/asyncComponent'
-import { modifyTabview } from '@/store/action'
 import './index.scss'
 
 const CardItem = asyncComponent(() => import('../cardItem'))
@@ -20,11 +19,9 @@
 
 class DataCard extends Component {
   static propTpyes = {
-    BID: PropTypes.any,              // 鐖剁骇Id
     data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
     config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
     mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
-    menuType: PropTypes.any,         // 鑿滃崟绫诲瀷
   }
 
   state = {
@@ -43,23 +40,49 @@
     total: null,
     precards: [],
     nextcards: [],
+    selected: 'false',
+    supNodes: [],
+    supComs: null
   }
 
   UNSAFE_componentWillMount () {
-    const { data, initdata, BID } = this.props
+    const { data, initdata } = this.props
     let _config = fromJS(this.props.config).toJS()
+
+    let BID = ''
+    let BData = ''
+
+    if (_config.setting.supModule) {
+      BData = window.GLOB.CacheData.get(_config.setting.supModule)
+    } else {
+      BData = window.GLOB.CacheData.get(_config.$pageId)
+    }
+    if (BData) {
+      BID = BData.$BID || ''
+    }
 
     let _card = null
     let precards = []
     let nextcards = []
 
+    if (_config.wrap.controlField) {
+      if (_config.wrap.controlVal) {
+        _config.wrap.controlVal = _config.wrap.controlVal.split(',')
+      } else {
+        _config.wrap.controlVal = ['']
+      }
+    }
+
     _config.subcards.forEach(item => {
-      item.setting.$click = ''
-      if (item.setting.click === 'button') {
-        if (item.elements.filter(ele => ele.eleType === 'button').length < 2) {
-          item.setting.$click = ' trigger-button'
+      if (item.setting.click === 'button' && !item.setting.linkbtn) {
+        item.elements.forEach(ele => {
+          if (ele.eleType === 'button') {
+            item.setting.linkbtn = ele.uuid
+          }
+        })
+        if (!item.setting.linkbtn) {
+          item.setting.click = ''
         }
-        item.setting.click = ''
       }
 
       if (item.$cardType !== 'extendCard') {
@@ -86,18 +109,11 @@
       _sync = false
     }
 
-    if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left') {
-      let _width = 0
-      precards.forEach(card => {
-        _width += card.setting.width
-      })
-      nextcards.forEach(card => {
-        _width += card.setting.width
-      })
-      
-      _config.$offset = _width
+    let selected = 'false'
+    if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init') {
+      selected = _config.wrap.selected
     } else {
-      _config.wrap.cardFloat = null
+      _config.wrap.selected = 'false'
     }
 
     if (_data) {
@@ -105,41 +121,75 @@
         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'
+        }
+      }
     }
 
     _config.columns.forEach(item => {
+      if (item.type !== 'number') return
       _cols.set(item.field, item)
     })
 
     _card.elements = _card.elements.map(item => {
-      if (item.field && _cols.has(item.field)) {
-        item.col = _cols.get(item.field)
+      if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+        item.decimal = _cols.get(item.field).decimal || 0
       }
       return item
     })
     _card.backElements = _card.backElements.map(item => {
-      if (item.field && _cols.has(item.field)) {
-        item.col = _cols.get(item.field)
+      if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+        item.decimal = _cols.get(item.field).decimal || 0
       }
       return item
     })
 
+    let supComs = null
+    if (_config.wrap.supType === 'multi') {
+      supComs = _config.supNodes.map(item => item.componentId)
+    }
+
+    _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+    _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}`
+
     this.setState({
+      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') {
-        this.loadData()
+        setTimeout(() => {
+          this.loadData()
+        }, _config.setting.delay || 0)
       }
     })
   }
@@ -157,21 +207,37 @@
   }
 
   UNSAFE_componentWillReceiveProps (nextProps) {
-    const { sync, config, BID } = this.state
+    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 + ''
 
-      _data = _data.map((item, index) => {
-        item.key = index
-        item.$$uuid = item[config.setting.primaryKey] || ''
-        item.$$BID = BID || ''
-        item.$Index = index + 1 + ''
-        return item
-      })
+          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.setState({sync: false, data: _data})
     } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
@@ -198,30 +264,101 @@
    * @param {*} position   // 鍒锋柊浣嶇疆
    * @param {*} btn        // 鎵ц鐨勬寜閽�
    */
-  refreshByButtonResult = (menuId, position, btn) => {
-    const { config, BID } = this.state
+  refreshByButtonResult = (menuId, position, btn, id = '', lines) => {
+    const { config, BID, supComs, supNodes } = this.state
 
     if (config.uuid !== menuId) return
 
-    if (!btn || btn.resetPageIndex !== 'false') {
-      this.setState({
-        pageIndex: 1
-      }, () => {
-        this.loadData()
-      })
+    if (supComs) {
+      if (position === 'mainline' || position === 'popclose') { // 涓昏〃鍒锋柊锛屽幓闄ゅ悓姝ュ埛鏂扮粍浠�
+        let supNode = supNodes[supNodes.length - 1]
+        supComs.forEach((item, i) => {
+          setTimeout(() => {
+            if (supNode && supNode.key === item) {
+              MKEmitter.emit('reloadData', item, supNode.value)
+            } else {
+              MKEmitter.emit('reloadData', item)
+            }
+          }, i * 10)
+        })
+      } else {
+        if (position === 'line') {
+          if (lines && lines.length === 1) {
+            this.loadLinedata(lines[0].$$uuid)
+          } else {
+            this.loadData(id)
+          }
+        } else if (!btn || btn.resetPageIndex !== 'false') {
+          this.setState({
+            pageIndex: 1
+          }, () => {
+            this.loadData(id)
+          })
+        } else {
+          this.loadData(id)
+        }
+      }
     } else {
-      this.loadData()
+      let supModule = config.setting.supModule
+
+      if (position === 'line') {
+        if (lines && lines.length === 1) {
+          this.loadLinedata(lines[0].$$uuid)
+        } else {
+          this.loadData(id)
+        }
+      } 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 {
+        this.loadData(id)
+      }
     }
 
-    if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
-      MKEmitter.emit('reloadData', btn.syncComponentId)                        // 鍚岀骇鏍囩鍒锋柊
-    }
-
-    if (position === 'mainline' && config.setting.supModule) {                 // 涓昏〃琛屽埛鏂�
-      MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
-    } else if (position === 'popclose') {                                      // 鏍囩鍏抽棴鍒锋柊
-      config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
+    if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
       btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
+    }
+  }
+
+  checkTopLine = (id) => {
+    const { config, data } = this.state
+
+    let index = 0
+    if (id && data) {
+      index = data.findIndex(item => item.$$uuid === id)
+      if (index === -1) {
+        index = 0
+      }
+    }
+
+    if (!data || data.length === 0 || data[index].$disabled) {
+      this.setState({
+        activeKey: '',
+        selectKeys: [],
+        selectedData: []
+      })
+  
+      MKEmitter.emit('resetSelectLine', config.uuid, '', '')
+      if (config.setting.$hasSyncModule) {
+        MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+      }
+      return
+    }
+
+    this.setState({
+      activeKey: index,
+      selectKeys: [index],
+      selectedData: [data[index]]
+    })
+
+    MKEmitter.emit('resetSelectLine', config.uuid, data[index].$$uuid, data[index])
+    if (config.setting.$hasSyncModule) {
+      MKEmitter.emit('syncBalconyData', config.uuid, [data[index]], data.length === 1)
     }
   }
 
@@ -258,7 +395,6 @@
     const { config } = this.state
 
     if (config.uuid !== menuId) return
-    if (id === 'empty') return
 
     if (!id) {
       this.loadData()
@@ -268,20 +404,43 @@
   }
 
   resetParentParam = (MenuID, id, data) => {
-    const { config } = this.state
+    const { config, supComs } = this.state
 
-    if (!config.setting.supModule || config.setting.supModule !== MenuID) return
-    if (id !== this.state.BID) {
-      this.setState({ BID: id, BData: data, pageIndex: 1 }, () => {
-        this.loadData()
-      })
+    if (supComs) {
+      if (!supComs.includes(MenuID)) return
+      let supNodes = this.state.supNodes.filter(item => item.key !== MenuID)
+      let bid = ''
+      let _data = null
+
+      if (id) {
+        supNodes.push({key: MenuID, value: id, data})
+      }
+      if (supNodes.length > 0) {
+        bid = supNodes[supNodes.length - 1].value
+        _data = supNodes[supNodes.length - 1].data
+      }
+
+      if (bid !== this.state.BID || bid !== '') {
+        this.setState({ BID: bid, BData: _data, pageIndex: 1, supNodes }, () => {
+          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()
+        })
+      }
     }
   }
 
   /**
    * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
    */
-  queryModuleParam = (menuId, btnId) => {
+  queryModuleParam = (menuId, callback) => {
     const { mainSearch } = this.props
     const { arr_field, config, search } = this.state
 
@@ -297,7 +456,7 @@
       })
     }
 
-    MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+    callback({
       arr_field: arr_field,
       orderBy: config.setting.order || '',
       search: searches,
@@ -305,11 +464,11 @@
     })
   }
 
-  async loadData () {
-    const { mainSearch, menuType } = this.props
-    const { config, arr_field, pageIndex, search, BID, BData } = this.state
+  async loadData (id, type) {
+    const { mainSearch } = this.props
+    const { config, arr_field, pageIndex, search, BID, BData, selected } = this.state
 
-    if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
+    if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
       this.setState({
         activeKey: '',
         selectKeys: [],
@@ -319,9 +478,19 @@
         total: 0,
         loading: false
       })
-      MKEmitter.emit('resetSelectLine', config.uuid, '', '')
-      if (config.setting.$hasSyncModule) {
-        MKEmitter.emit('syncBalconyData', config.uuid, [], 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)
+        }
       }
       return
     }
@@ -346,7 +515,7 @@
     })
 
     let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, menuType)
+    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
@@ -355,25 +524,63 @@
         start = config.setting.pageSize * (pageIndex - 1) + 1
       }
 
-      this.setState({
-        activeKey: '',
-        selectKeys: [],
-        selectedData: [],
-        data: result.data.map((item, index) => {
+      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)
+        }
+      }
+
+      let data = []
+
+      if (type === 'plus') {
+        let _data = (this.state.data || []).concat(result.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
+        })
+      } else {
+        data = result.data.map((item, index) => {
           item.key = index
           item.$$uuid = item[config.setting.primaryKey] || ''
           item.$$BID = BID || ''
           item.$$BData = BData || ''
           item.$Index = index + start + ''
+
+          if (config.wrap.controlField) {
+            if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+              item.$disabled = true
+            }
+          }
           return item
-        }),
+        })
+      }
+
+      this.setState({
+        activeKey: '',
+        selectKeys: [],
+        selectedData: [],
+        data: data,
         total: result.total,
         loading: false
       })
-      MKEmitter.emit('resetSelectLine', config.uuid, '', '')
-      if (config.setting.$hasSyncModule) {
-        MKEmitter.emit('syncBalconyData', config.uuid, [], false)
-      }
     } else {
       this.setState({
         loading: false
@@ -390,7 +597,7 @@
    * @description 鑾峰彇鍗曡鏁版嵁
    */ 
   async loadLinedata (id) {
-    const { mainSearch, menuType } = this.props
+    const { mainSearch } = this.props
     const { config, arr_field, pageIndex, search, BID, BData } = this.state
 
     let searches = fromJS(search).toJS()
@@ -408,7 +615,7 @@
     })
 
     let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, menuType, id)
+    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, id)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
@@ -422,16 +629,18 @@
               _data.key = item.key
               _data.$$uuid = _data[config.setting.primaryKey] || ''
               _data.$$BID = BID || ''
-              item.$$BData = BData || ''
+              _data.$$BData = BData || ''
               _data.$Index = item.$Index
               return _data
             } else {
               return item
             }
           })
-        } catch {
+        } catch (e) {
           console.warn('鏁版嵁鏌ヨ閿欒')
         }
+
+        MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
       }
 
       this.setState({
@@ -448,6 +657,20 @@
         duration: 10
       })
     }
+  }
+
+  loadMore = () => {
+    const { total, pageIndex, loading, config } = this.state
+
+    if (loading || config.setting.pageSize * pageIndex >= total) {
+      return
+    }
+
+    this.setState({
+      pageIndex: pageIndex + 1
+    }, () => {
+      this.loadData('', 'plus')
+    })
   }
 
   prevPage = () => {
@@ -495,9 +718,8 @@
   changeCard = (index, item) => {
     const { config, selectKeys, selectedData, activeKey, data } = this.state
 
-    this.openView(item)
-
     if (!config.wrap.cardType) return
+    if (item.$disabled) return
     
     let _selectKeys = []
     let _selectedData = []
@@ -508,12 +730,12 @@
         _selectKeys = selectKeys.filter(key => key !== index)
         _selectedData = selectedData.filter(cell => cell.key !== index)
         _activeKey = _selectKeys.slice(-1)[0]
-        _item = selectedData.slice(-1)[0] || ''
+        _item = _selectedData.slice(-1)[0] || ''
       } else if (selectKeys.indexOf(index) > -1) {
         _selectKeys = selectKeys.filter(key => key !== index)
         _selectedData = selectedData.filter(cell => cell.key !== index)
         _activeKey = activeKey
-        _item = selectedData.filter(cell => cell.key === activeKey)[0] || ''
+        _item = _selectedData.filter(cell => cell.key === activeKey)[0] || ''
       } else {
         _selectKeys = [...selectKeys, index]
         _selectedData = [...selectedData, item]
@@ -538,85 +760,10 @@
     }
   }
 
-  openView = (item) => {
-    const { card } = this.state
-
-    if (card.setting.click === 'menu') {
-      let menu = null
-
-      if (card.setting.menu && card.setting.menu.length > 0) {
-        let menu_id = card.setting.menu.slice(-1)[0]
-        menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || ''
-      }
-
-      if (!menu) {
-        notification.warning({
-          top: 92,
-          message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
-          duration: 5
-        })
-        return
-      }
-
-      let newtab = {
-        ...menu,
-        selected: true,
-        param: {}
-      }
-
-      if (card.setting.joint === 'true') {
-        newtab.param.$BID = item.$$uuid
-      }
-
-      if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
-        this.props.modifyTabview([newtab])
-      } else {
-        let tabs = this.props.tabviews.filter((tab, i) => {
-          tab.selected = false
-          return tab.MenuID !== newtab.MenuID
-        })
-
-        if (this.props.tabviews.length > tabs.length) {
-          this.props.modifyTabview(fromJS(tabs).toJS())
-        }
-
-        this.setState({}, () => {
-          tabs.push(newtab)
-          this.props.modifyTabview(tabs)
-        })
-      }
-    } else if (card.setting.click === 'link') {
-      let src = card.setting.linkurl
-
-      if (src.indexOf('paramsmain/') > -1) {
-        try {
-          let _url = src.split('paramsmain/')[0] + 'paramsmain/'
-          let _param = JSON.parse(window.decodeURIComponent(window.atob(src.split('paramsmain/')[1])))
-
-          _param.UserID = sessionStorage.getItem('UserID')
-          _param.LoginUID = sessionStorage.getItem('LoginUID')
-          _param.User_Name = sessionStorage.getItem('User_Name')
-          _param.param = { BID: item.$$uuid }
-          src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
-        } catch {
-          console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�')
-        }
-      } else if (card.setting.joint === 'true') {
-        let con = '?'
-
-        if (/\?/ig.test(src)) {
-          con = '&'
-        }
-
-        src = src + `${con}id=${item.$$uuid}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
-      }
-
-      window.open(src)
-    }
-  }
-
   render() {
     const { config, precards, nextcards, loading, data, pageIndex, total, card, activeKey, BID, BData, selectedData, selectKeys } = this.state
+
+    if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
 
     let _total = 0
     let switchable = false
@@ -624,27 +771,22 @@
       _total = config.setting.pageSize * pageIndex
       switchable = true
     }
-    let offset = 0
 
-    if (config.wrap.cardFloat) {
-      let length = data ? data.length : 0
-      if (card.setting.width * length + config.$offset < 24) {
-        offset = 24 - card.setting.width * length - config.$offset
-        if (config.wrap.cardFloat === 'center') {
-          offset = Math.floor(offset / 2)
-        }
-      }
+    let extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
+
+    if (data && data[0]) {
+      extendData = {...extendData, ...data[0]}
     }
 
     return (
-      <div className="custom-data-card-box" style={config.style}>
+      <div className="custom-data-card-box" id={'anchor' + config.uuid} style={config.style}>
         {loading ?
           <div className="loading-mask">
             {data ? <div className="ant-spin-blur"></div> : null}
             <Spin />
           </div> : null
         }
-        <NormalHeader config={config} BID={BID} menuType={this.props.menuType} refresh={this.refreshSearch} />
+        <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
         {config.action && config.action.length > 0 ?
           <MainAction
             BID={BID}
@@ -655,46 +797,46 @@
             selectedData={selectedData}
           /> : null
         }
-        <div className={`data-zoom ${config.wrap.cardType || ''} ${config.wrap.scale || ''}`}>
+        <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">
-            {offset ? <Col span={offset} style={{height: '10px'}}> </Col> : null}
+          <Row className={'card-row-list ' + config.wrap.layout}>
             {precards.map((item, index) => (
-              <Col key={'pre' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}>
-                <CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/>
+              <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
+                <CardItem card={item} cards={config} data={extendData}/>
               </Col>
             ))}
-            {data && data.map((item, index) => (
-              <Col className={(activeKey === index ? ' active' : (selectKeys.indexOf(index) > -1 ? ' selected' : '')) + (card.setting.$click ? ' pointer' : '') + card.setting.$click} key={index} span={card.setting.width} onClick={() => {this.changeCard(index, item)}}>
-                <CardItem card={card} cards={config} data={item}/>
-              </Col>
-            ))}
+            {data && data.map((item, index) => {
+              let className = card.setting.click ? 'mk-card pointer ' : 'mk-card '
+              if (item.$disabled) {
+                className = 'mk-disabled'
+              } else if (activeKey === index) {
+                className += 'active'
+              } else if (selectKeys.indexOf(index) > -1) {
+                className += 'selected'
+              }
+
+              return (
+                <Col className={className} key={index} span={card.setting.width} onClick={() => {this.changeCard(index, item)}}>
+                  <CardItem card={card} cards={config} data={item}/>
+                </Col>
+              )
+            })}
             {nextcards.map((item, index) => (
-              <Col key={'next' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}>
-                <CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/>
+              <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
+                <CardItem card={item} cards={config} data={extendData}/>
               </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}
         </div>
-        {config.wrap.pagestyle !== 'switch' && 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 === '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}
       </div>
     )
   }
 }
 
-const mapStateToProps = (state) => {
-  return {
-    permMenus: state.permMenus,
-    tabviews: state.tabviews,
-  }
-}
 
-const mapDispatchToProps = (dispatch) => {
-  return {
-    modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
-  }
-}
 
-export default connect(mapStateToProps, mapDispatchToProps)(DataCard)
\ No newline at end of file
+export default DataCard
\ No newline at end of file

--
Gitblit v1.8.0