From a975aa770d1f5d0ae133f0e87a28b5d6b94734ef Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 五月 2024 11:16:42 +0800
Subject: [PATCH] 2024-05-09

---
 src/tabviews/custom/components/card/data-card/index.jsx |   53 ++++++++++++++++++++---------------------------------
 1 files changed, 20 insertions(+), 33 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..1dca646 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' : ''
@@ -197,7 +191,6 @@
     this.setState({
       pageSize: _config.setting.pageSize || 10,
       pageOptions,
-      supComs,
       selected,
       precards,
       nextcards,
@@ -412,14 +405,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 +447,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
@@ -678,28 +671,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 +746,9 @@
         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)
       }
       return
     }

--
Gitblit v1.8.0