From 0c1a33a33b45fc3265cb7fef20beb48407cd6c98 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 八月 2023 14:54:06 +0800
Subject: [PATCH] 2023-08-24

---
 src/tabviews/custom/components/card/prop-card/index.jsx |  573 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 403 insertions(+), 170 deletions(-)

diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index a639f5f..f114efa 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -1,14 +1,13 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Spin, notification, Col, Row } from 'antd'
-import moment from 'moment'
+import { Spin, notification, Col, Row, Modal } from 'antd'
 
 import Api from '@/api'
-import Utils from '@/utils/utils.js'
 import UtilsDM from '@/utils/utils-datamanage.js'
 import asyncComponent from '@/utils/asyncComponent'
 import MKEmitter from '@/utils/events.js'
+import TimerTask from '@/utils/timer-task.js'
 import './index.scss'
 
 const CardItem = asyncComponent(() => import('../cardItem'))
@@ -16,11 +15,7 @@
 
 class PropCard extends Component {
   static propTpyes = {
-    BID: PropTypes.any,              // 鐖剁骇Id
-    data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
-    config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
-    mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
-    menuType: PropTypes.any,         // 鑿滃崟绫诲瀷
+    config: PropTypes.object
   }
 
   state = {
@@ -28,37 +23,55 @@
     config: null,              // 鍥捐〃閰嶇疆淇℃伅
     loading: false,            // 鏁版嵁鍔犺浇鐘舵��
     activeKey: '',             // 閫変腑鏁版嵁
-    sync: false,               // 鏄惁缁熶竴璇锋眰鏁版嵁
     data: {},                  // 鏁版嵁
-    timer: null,               // 瀹氭椂鍣ㄦ椂闂撮棿闅�
     BData: '',
     selected: 'false',
   }
 
+  loaded = false
+  autoTimer = null
+
   UNSAFE_componentWillMount () {
-    const { data, initdata, BID, BData } = this.props
-    let _config = fromJS(this.props.config).toJS()
-    let _cols = new Map()
+    const { config } = this.props
 
+    let _config = fromJS(config).toJS()
     let _data = { $$empty: true }
-    let _sync = false
-    
-    if (_config.wrap.datatype !== 'static') {
-      _sync = _config.setting.sync === 'true'
+    let BID = ''
+    let BData = ''
 
-      if (_sync && data) {
-        _data = data[_config.dataName] || {$$empty: true}
-        if (Array.isArray(_data)) {
-          _data = _data[0] || {$$empty: true}
+    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 || ''
+    }
+
+    if (_config.wrap.datatype === 'dynamic') {
+      _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+
+      if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
+        _data = window.GLOB.SyncData.get(_config.dataName) || []
+
+        if (_config.$cache) {
+          Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS(), BID)
         }
-        _sync = false
-      } else if (_sync && initdata) {
-        _data = initdata || {$$empty: true}
-        if (Array.isArray(_data)) {
-          _data = _data[0] || {$$empty: true}
-        }
-        _sync = false
+
+        _config.setting.sync = 'false'
+
+        _data = _data[0] || {$$empty: true}
+
+        this.loaded = true
+
+        window.GLOB.SyncData.delete(_config.dataName)
       }
+    } else if (_config.wrap.datatype === 'public' && window.GLOB.CacheData.has(_config.wrap.publicId)) {
+      _data = window.GLOB.CacheData.get(_config.wrap.publicId)
+      _data = fromJS(_data).toJS()
+      this.loaded = true
+    } else if (_config.wrap.datatype === 'static') {
+      this.loaded = true
     }
 
     _data.$$BID = BID || ''
@@ -67,12 +80,6 @@
       _data.$$uuid = _data[_config.setting.primaryKey] || ''
     }
 
-    _config.columns.forEach(item => {
-      if (item.type !== 'number') return
-      _cols.set(item.field, item)
-    })
-
-    let _width = 0
     _config.subcards.forEach(card => {
       if (card.setting.click === 'button' && !card.setting.linkbtn) {
         card.elements.forEach(ele => {
@@ -84,29 +91,15 @@
           card.setting.click = ''
         }
       }
-      _width += card.setting.width
-      card.elements = card.elements.map(item => {
-        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.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
-          item.decimal = _cols.get(item.field).decimal || 0
-        }
-        return item
-      })
-    })
 
-    let offset = 0
-    if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left' && _width < 24) {
-      offset = 24 - _width
-      if (_config.wrap.cardFloat === 'center') {
-        offset = Math.floor(offset / 2)
+      if (card.style.clear === 'left') {
+        card.wStyle = {clear: 'left'}
+      } else if (card.style.clear === 'right') {
+        card.wStyle = {float: 'right'}
       }
-      _config.subcards[0].offset = offset
-    }
+
+      delete card.style.clear
+    })
 
     let selected = _config.wrap.selected || 'false'
 
@@ -114,34 +107,48 @@
     _config.wrap.priKeyType = _config.wrap.priKeyType || 'static'
     _config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
 
-    _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.layout || 'grid'}-layout float-${_config.wrap.cardFloat || 'left'}`
+
+    if (_config.wrap.display === 'hidden') {
+      _config.style.display = 'none'
+    }
 
     this.setState({
       selected,
-      sync: _sync,
       data: _data,
       BID: BID || '',
       BData: BData || '',
-      config: _config,
-      arr_field: _config.columns.map(col => col.field).join(','),
-    }, () => {
-      if (_config.wrap.datatype !== 'static' && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
-        setTimeout(() => {
-          this.loadData()
-        }, _config.setting.delay || 0)
-      } else if ((!_sync || _config.wrap.priKeyType === 'static') && selected !== 'false') {
-        setTimeout(() => {
-          this.checkTopLine()
-        }, 200)
-      }
+      config: _config
     })
   }
 
   componentDidMount () {
+    const { config } = this.state
+
     MKEmitter.addListener('reloadData', this.reloadData)
+    MKEmitter.addListener('refreshLineData', this.refreshLineData)
     MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+    MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
     MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
-    this.handleTimer()
+
+    if (config.setting.useMSearch) {
+      MKEmitter.addListener('searchRefresh', this.searchRefresh)
+    }
+
+    if (config.setting.sync === 'true') {
+      MKEmitter.addListener('transferSyncData', this.transferSyncData)
+    }
+
+    if (config.wrap.datatype === 'public') {
+      MKEmitter.addListener('mkPublicData', this.mkPublicData)
+    }
+
+    if (config.timer && config.wrap.datatype === 'dynamic') {
+      this.timer = new TimerTask()
+      this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {this.loadData('timer')})
+    }
+
+    this.initExec()
   }
 
   shouldComponentUpdate (nextProps, nextState) {
@@ -149,45 +156,239 @@
   }
 
   componentWillUnmount () {
-    clearTimeout(this.timer)
     this.setState = () => {
       return
     }
     MKEmitter.removeListener('reloadData', this.reloadData)
+    MKEmitter.removeListener('mkPublicData', this.mkPublicData)
+    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()
   }
 
-  /**
-   * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
-   */
-  UNSAFE_componentWillReceiveProps (nextProps) {
-    const { sync, config, BID, BData, selected } = this.state
+  initExec = () => {
+    const { config, selected, data, BID } = this.state
 
-    if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
-      let _data = { $$empty: true }
-      if (nextProps.data && nextProps.data[config.dataName]) {
-        _data = nextProps.data[config.dataName]
-        if (Array.isArray(_data)) {
-          _data = _data[0] || {$$empty: true}
+    if (config.wrap.datatype === 'dynamic') {
+      if (config.$cache) {
+        if (config.$time) {
+          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[0] || {$$empty: true}
+              _data.$$uuid = _data[config.setting.primaryKey] || ''
+      
+              this.setState({data: _data}, () => {
+                if (selected !== 'false') {
+                  this.checkTopLine()
+                }
+              })
+            })
+          } else {
+            if (config.wrap.goback === 'true' && data.$$empty) {
+              this.timer && this.timer.stop()
+    
+              MKEmitter.emit('closeTabView', config.$pageId)
+            } else {
+              if (selected !== 'false') {
+                this.checkTopLine()
+              } else {
+                this.transferLine()
+              }
+              this.autoExec()
+            }
+          }
+        } else {
+          if (!this.loaded) {
+            Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+              if (!res.data || this.loaded) return
+      
+              let _data = res.data[0] || {$$empty: true}
+              _data.$$uuid = _data[config.setting.primaryKey] || ''
+      
+              this.setState({data: _data})
+            })
+          }
+  
+          if (config.setting.onload === 'true') {
+            setTimeout(() => {
+              this.loadData('init')
+            }, config.setting.delay || 0)
+          } else if (this.loaded) {
+            if (config.wrap.goback === 'true' && data.$$empty) {
+              this.timer && this.timer.stop()
+    
+              MKEmitter.emit('closeTabView', config.$pageId)
+            } else {
+              if (selected !== 'false') {
+                this.checkTopLine()
+              } else {
+                this.transferLine()
+              }
+              this.autoExec()
+            }
+          }
+        }
+      } else if (config.setting.onload === 'true') {
+        setTimeout(() => {
+          this.loadData()
+        }, config.setting.delay || 0)
+      } else if (this.loaded) {
+        if (config.wrap.goback === 'true' && data.$$empty) {
+          this.timer && this.timer.stop()
+
+          MKEmitter.emit('closeTabView', config.$pageId)
+        } else {
+          if (selected !== 'false') {
+            this.checkTopLine()
+          } else {
+            this.transferLine()
+          }
+          this.autoExec()
         }
       }
+    } else if (config.wrap.datatype === 'public') {
+      if (this.loaded) {
+        if (config.wrap.goback === 'true' && data.$$empty) {
+          this.timer && this.timer.stop()
+  
+          MKEmitter.emit('closeTabView', config.$pageId)
+        } else {
+          if (selected !== 'false') {
+            this.checkTopLine()
+          } else if (data.$$uuid) {
+            this.transferLine()
+          }
+          this.autoExec()
+        }
+      }
+    } else {
+      if (selected !== 'false') {
+        this.checkTopLine()
+      }
+
+      if (config.$cache && config.$time && config.wrap.autoExec) {
+        Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+          if (res.valid) return
+          
+          this.autoExec()
+          
+          Api.writeCacheConfig(config.uuid, [], BID)
+        })
+      } else {
+        this.autoExec()
+      }
+    }
+  }
+
+  transferSyncData = (syncId) => {
+    const { config } = this.state
+
+    if (config.$syncId !== syncId) return
+
+    const { BID, BData, selected } = this.state
+
+    let _data = window.GLOB.SyncData.get(config.dataName) || []
+
+    if (config.$cache) {
+      Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
+    }
+
+    _data = _data[0] || {$$empty: true}
+
+    _data.$$BID = BID || ''
+    _data.$$BData = BData || ''
+    _data.$$uuid = _data[config.setting.primaryKey] || ''
+
+    this.loaded = true
+
+    this.setState({data: _data}, () => {
+      if (config.wrap.goback === 'true' && _data.$$empty) {
+        this.timer && this.timer.stop()
+
+        MKEmitter.emit('closeTabView', config.$pageId)
+      } else {
+        if (selected !== 'false') {
+          this.checkTopLine()
+        } else if (_data.$$uuid) {
+          this.transferLine()
+        }
+        this.autoExec()
+      }
+    })
+
+    window.GLOB.SyncData.delete(config.dataName)
+
+    MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+  }
+
+  searchRefresh = (searchId) => {
+    const { config } = this.state
+
+    if (config.$searchId !== searchId) return
+    
+    this.setState({}, () => {
+      this.loadData()
+    })
+  }
+
+  mkPublicData = (publicId, data) => {
+    const { config, selected, BID, BData } = this.state
+
+    if (config.wrap.datatype === 'public' && config.wrap.publicId === publicId) {
+      let _data = fromJS(data).toJS()
 
       _data.$$BID = BID || ''
       _data.$$BData = BData || ''
       _data.$$uuid = _data[config.setting.primaryKey] || ''
 
-      this.setState({sync: false, data: _data}, () => {
-        if (config.wrap.priKeyType !== 'static' && selected !== 'false') {
-          setTimeout(() => {
+      this.loaded = true
+
+      this.setState({data: _data}, () => {
+        if (config.wrap.goback === 'true' && _data.$$empty) {
+          this.timer && this.timer.stop()
+
+          MKEmitter.emit('closeTabView', config.$pageId)
+        } else {
+          if (selected !== 'false') {
             this.checkTopLine()
-          }, 200)
+          } else {
+            this.transferLine()
+          }
+          this.autoExec()
         }
       })
-    } else if ( config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
-      this.setState({}, () => {
-        this.loadData()
-      })
+    }
+  }
+
+  autoExec = (times) => {
+    const { config, data } = this.state
+
+    if (!config.wrap.autoExec) return
+
+    let btn = document.getElementById('button' + config.wrap.autoExec)
+
+    clearTimeout(this.autoTimer)
+
+    if (btn) {
+      MKEmitter.emit('triggerBtnId', config.wrap.autoExec, data.$$empty ? [] : [data])
+    } else if (!times || times < 20) {
+      times = times ? times + 1 : 1
+      this.autoTimer = setTimeout(() => {
+        this.autoExec(times)
+      }, 1000)
     }
   }
 
@@ -209,54 +410,12 @@
     MKEmitter.emit('resetSelectLine', config.uuid, primaryId, data)
   }
 
-  handleTimer = () => {
-    const { config } = this.state
+  transferLine = () => {
+    const { config, data } = this.state
 
-    if (!config.timer) return
+    if (config.wrap.cardType) return
 
-    const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
-
-    let timer = _change[config.timer]
-
-    if (!timer) return
-
-    let _param = {
-      func: 's_get_timers_role',
-      LText: `select '${window.GLOB.appkey || ''}','${config.uuid}'`,
-      timer_type: config.timer,
-      component_id: config.uuid
-    }
-    
-    _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')          // 鏃堕棿鎴�
-    _param.LText = Utils.formatOptions(_param.LText)                   // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
-    _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)   // md5瀵嗛挜
-
-    Api.getSystemConfig(_param).then(result => {
-      if (!result.status) {
-        notification.warning({
-          top: 92,
-          message: result.message,
-          duration: 5
-        })
-        return
-      } else if (result.run_type) {
-        this.setState({timer})
-        this.timer = setTimeout(() => {
-          this.timerTask()
-        }, timer)
-      }
-    })
-  }
-
-  timerTask = () => {
-    const { timer } = this.state
-    if (!timer) return
-    
-    this.loadData(true)
-
-    this.timer = setTimeout(() => {
-      this.timerTask()
-    }, timer)
+    MKEmitter.emit('resetSelectLine', config.uuid, data.$$uuid || '', data)
   }
 
   /**
@@ -270,29 +429,55 @@
 
     if (config.uuid !== menuId) return
 
-    this.loadData()                                                            // 鏁版嵁鍒锋柊
-
-    if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
-      MKEmitter.emit('reloadData', btn.syncComponentId)                        // 鍚岀骇鏍囩鍒锋柊
+    if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+      MKEmitter.emit('reloadData', config.setting.supModule, BID)
+    } else {
+      this.loadData('', btn)
     }
+  }
 
-    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'))
-      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()
+    _data[btn.field] = count
+
+    this.setState({
+      data: _data
+    })
   }
 
   resetParentParam = (MenuID, id, data) => {
     const { config } = this.state
 
     if (!config.setting.supModule || config.setting.supModule !== MenuID) return
+    
     if (id !== this.state.BID || id !== '') {
       this.setState({ BID: id, BData: data }, () => {
         this.loadData()
       })
     }
+  }
+
+  /**
+   * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+   */
+  queryModuleParam = (menuId, callback) => {
+    const { config } = this.state
+
+    if (config.uuid !== menuId) return
+
+    let searches = []
+    if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+      searches = window.GLOB.SearchBox.get(config.$searchId) || []
+    }
+
+    callback({
+      orderBy: '',
+      search: searches
+    })
   }
 
   reloadData = (menuId) => {
@@ -303,41 +488,57 @@
     this.loadData()
   }
 
-  async loadData (hastimer) {
-    const { mainSearch, menuType } = this.props
-    const { config, arr_field, BID, BData, selected } = this.state
+  async loadData (type, btn) {
+    const { config, BID, BData, selected } = this.state
 
+    if (config.wrap.datatype === 'public') {
+      MKEmitter.emit('reloadData', config.wrap.publicId)
+      return
+    }
+    
     if (config.wrap.datatype === 'static') {
       this.setState({
         data: {$$BID: BID || '', $$BData: BData, $$empty: true},
       })
+
+      if (!btn) {
+        this.autoExec()
+      }
       return
     } else if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
       this.setState({
         data: {$$BID: BID || '', $$BData: BData, $$empty: true},
       })
+      this.loaded = true
       return
     }
 
-    let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+    let searches = []
+    if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+      searches = window.GLOB.SearchBox.get(config.$searchId) || []
+    }
 
-    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
     }
 
-    if (!hastimer) {
+    if (type !== 'timer') {
       this.setState({
         loading: true
       })
     }
 
     let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID, menuType)
+    let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, 1, 1, BID)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
       let _data = {}
+
+      this.loaded = true
+      if (config.$cache && type === 'init') {
+        Api.writeCacheConfig(config.uuid, result.data || [], BID)
+      }
 
       if (!result.data || !result.data[0]) {
         _data.$$empty = true
@@ -353,27 +554,59 @@
         data: _data,
         loading: false
       }, () => {
-        if (config.wrap.priKeyType !== 'static' && selected !== 'false') {
-          this.checkTopLine()
+        if (config.wrap.goback === 'true' && _data.$$empty) {
+          this.timer && this.timer.stop()
+
+          MKEmitter.emit('closeTabView', config.$pageId)
+        } else {
+          if (selected !== 'false') {
+            this.checkTopLine()
+          } else {
+            this.transferLine()
+          }
+          if (!btn) {
+            this.autoExec()
+          }
         }
       })
 
-      if (config.timer && config.clearField) {
+      if (config.timer && config.clearField && result.data && result.data[0]) {
         let vals = (config.clearValue || '').split(',')
-        if (vals.includes(_data[config.clearField])) {
-          clearTimeout(this.timer)
+        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,
-        timer: null
+        loading: false
       })
-      notification.error({
-        top: 92,
-        message: result.message,
-        duration: 10
-      })
+      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
+        })
+      }
     }
   }
 
@@ -402,7 +635,7 @@
     if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
 
     return (
-      <div className="custom-prop-card-box" style={config.style}>
+      <div className="custom-prop-card-box" id={'anchor' + config.uuid} style={config.style}>
         {loading ?
           <div className="loading-mask">
             <div className="ant-spin-blur"></div>
@@ -412,14 +645,14 @@
         <NormalHeader config={config}/>
         <Row className={`card-row-list data-zoom ${config.wrap.wrapClass}`}>
           {config.subcards.map((item, index) => {
-            let className = item.setting.click ? 'mk-card pointer ' : 'mk-card '
+            let className = 'mk-card '
             if (activeKey === index) {
               className += 'active'
             }
 
             return (
-              <Col className={className} key={index} span={item.setting.width || 6} offset={item.offset || 0} onClick={() => {this.changeCard(index, item)}}>
-                <CardItem card={item} cards={config} data={data}/>
+              <Col className={className} key={index} style={item.wStyle} span={item.setting.width || 6} offset={item.offset || 0}>
+                <CardItem card={item} cards={config} data={data} onClick={() => {this.changeCard(index, item)}}/>
               </Col>
             )
           })}

--
Gitblit v1.8.0