From 2bccb9ec7bdefe23292a22bc153463cfa1479a49 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:25:42 +0800
Subject: [PATCH] 2024-06-21

---
 src/tabviews/custom/components/card/data-card/index.jsx |   89 +++++++++++++++++++++++++-------------------
 1 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index d6e2c0f..b442a83 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -42,12 +42,11 @@
     precards: [],
     nextcards: [],
     selected: 'false',
-    supNodes: [],
-    supComs: null,
     pickup: false
   }
 
   loaded = false
+  supModules = []
 
   UNSAFE_componentWillMount () {
     const { config } = this.props
@@ -124,11 +123,6 @@
       _config.wrap.selected = 'false'
     }
 
-    let supComs = null
-    if (_config.wrap.supType === 'multi') {
-      supComs = _config.supNodes.map(item => item.componentId)
-    }
-
     _config.wrap.selStyle = _config.wrap.selStyle || 'active'
     _config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
     _config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
@@ -194,10 +188,26 @@
       }
     }
 
+    if (_config.wrap.zHeight) {
+      if (_config.wrap.zHeight <= 100) {
+        if (_config.wrap.zHeight < 0) {
+          _config.wrap.zHeight = `calc(100vh - ${-_config.wrap.zHeight}px)`
+        } else {
+          _config.wrap.zHeight = _config.wrap.zHeight + 'vh'
+        }
+      }
+
+      if (_config.style) {
+        delete _config.style.height
+      }
+      _config.wrap.layout += ' fix-height'
+    } else {
+      _config.wrap.zHeight = 'none'
+    }
+
     this.setState({
       pageSize: _config.setting.pageSize || 10,
       pageOptions,
-      supComs,
       selected,
       precards,
       nextcards,
@@ -412,14 +422,14 @@
    * @param {*} btn        // 鎵ц鐨勬寜閽�
    */
   refreshByButtonResult = (menuId, position, btn, id = '', lines) => {
-    const { config, BID, supComs, supNodes } = this.state
+    const { config, BID } = this.state
 
     if (config.uuid !== menuId) return
 
-    if (supComs) {
-      if (position === 'mainline' || position === 'popclose') { // 涓昏〃鍒锋柊锛屽幓闄ゅ悓姝ュ埛鏂扮粍浠�
-        let supNode = supNodes[supNodes.length - 1]
-        supComs.forEach((item, i) => {
+    if (config.supNodes) {
+      if (['mainline', 'maingrid', 'popclose'].includes(position)) {
+        let supNode = this.supModules[this.supModules.length - 1]
+        config.supNodes.forEach((item, i) => {
           setTimeout(() => {
             if (supNode && supNode.key === item) {
               MKEmitter.emit('reloadData', item, supNode.value)
@@ -454,8 +464,8 @@
         } else {
           this.loadData(id)
         }
-      } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
-        MKEmitter.emit('reloadData', supModule, BID)
+      } else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
+        MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
       } else if (!btn || btn.resetPageIndex !== 'false') {
         this.setState({
           pageIndex: 1
@@ -606,7 +616,7 @@
       MKEmitter.emit('resetSelectLine', config.uuid, last ? last.$$uuid : '', last)
       MKEmitter.emit('syncBalconyData', config.uuid, items, data.length > 0 && data.length === keys.length)
       if (items.length === 0) {
-        message.warning('鏈幏鍙栧埌鏁版嵁锛�')
+        message.warning(window.GLOB.dict['no_data'] || '鏈幏鍙栧埌鏁版嵁锛�')
       }
     } else {
       this.setState({
@@ -678,28 +688,26 @@
   }
 
   resetParentParam = (MenuID, id, data) => {
-    const { config, supComs } = this.state
+    const { config } = this.state
 
-    if (supComs) {
-      if (!supComs.includes(MenuID)) return
-      let supNodes = this.state.supNodes.filter(item => item.key !== MenuID)
+    if (config.supNodes) {
+      if (!config.supNodes.includes(MenuID)) return
+      this.supModules = this.supModules.filter(item => item.key !== MenuID)
       let bid = ''
       let _data = null
 
       if (id) {
-        supNodes.push({key: MenuID, value: id, data})
+        this.supModules.push({key: MenuID, value: id, data})
       }
-      if (supNodes.length > 0) {
-        bid = supNodes[supNodes.length - 1].value
-        _data = supNodes[supNodes.length - 1].data
+      if (this.supModules.length > 0) {
+        bid = this.supModules[this.supModules.length - 1].value
+        _data = this.supModules[this.supModules.length - 1].data
       }
 
       if (bid !== this.state.BID || bid !== '') {
-        this.setState({ BID: bid, BData: _data, pageIndex: 1, supNodes }, () => {
+        this.setState({ BID: bid, BData: _data, pageIndex: 1 }, () => {
           this.loadData()
         })
-      } else {
-        this.setState({ supNodes })
       }
     } else {
       if (!config.setting.supModule || config.setting.supModule !== MenuID) return
@@ -755,13 +763,13 @@
         loading: false
       })
       
-      if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
-        this.prevCheck(id)
-      } else {
-        MKEmitter.emit('resetSelectLine', config.uuid, '', '')
-        if (config.setting.$hasSyncModule) {
-          MKEmitter.emit('syncBalconyData', config.uuid, [], false)
-        }
+      MKEmitter.emit('resetSelectLine', config.uuid, '', '')
+      if (config.setting.$hasSyncModule) {
+        MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+      }
+      if (config.$hasTopModule) {
+        window.GLOB.CacheData.set(config.uuid + 'tb', { $$empty: true, $$uuid: '' })
+        MKEmitter.emit('mkPublicData', config.uuid + 'tb', { $$empty: true, $$uuid: '' })
       }
       return
     }
@@ -864,6 +872,11 @@
         pickup: false,
         loading: false
       })
+
+      if (config.$hasTopModule) {
+        window.GLOB.CacheData.set(config.uuid + 'tb', data[0] || { $$empty: true, $$uuid: '' })
+        MKEmitter.emit('mkPublicData', config.uuid + 'tb', data[0] || { $$empty: true, $$uuid: '' })
+      }
 
       if (config.timer && config.clearField && result.data && result.data[0]) {
         let vals = (config.clearValue || '').split(',')
@@ -1209,10 +1222,10 @@
             selectedData={selectedData}
           /> : null
         }
-        {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /></div> : null}
+        {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren={window.GLOB.dict['open'] || '寮�'} unCheckedChildren={window.GLOB.dict['shut'] || '鍏�'} checked={pickup} onChange={this.pickupChange} /></div> : null}
         <div className={`data-zoom ${config.wrap.wrapClass}`}>
           {switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
-          <Row className={'card-row-list ' + config.wrap.layout}>
+          <Row className={'card-row-list ' + config.wrap.layout} style={{maxHeight: config.wrap.zHeight}}>
             {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}>
@@ -1258,8 +1271,8 @@
           {switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
         </div>
         {config.$empty && data.length === 0 ? <Empty description={false}/> : null}
-        {config.wrap.pagestyle === 'page' ? <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.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
+        {config.wrap.pagestyle === 'page' ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} ${window.GLOB.dict['of'] || '鍏�'} ${total} ${window.GLOB.dict['items'] || '鏉�'}` : `${total} ${window.GLOB.dict['items'] || '鏉�'}`} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
+        {config.wrap.pagestyle === 'more' && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>{window.GLOB.dict['view_more'] || '鏌ョ湅鏇村'}<DownOutlined/></div> : null}
       </div>
     )
   }

--
Gitblit v1.8.0