From 3875da845b8fae679bd784d1246101a5fb1b61b5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 15 三月 2023 16:33:20 +0800
Subject: [PATCH] 2023-03-15

---
 src/tabviews/custom/components/card/double-data-card/index.jsx |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 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..a752b91 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -183,22 +183,24 @@
       Api.getLCacheConfig(config.uuid).then(res => {
         if (!res || this.loaded) return
         let _data = res.map((item, index) => {
+          item.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.$$BID = item[config.setting.primaryKey] || ''
               cell.$$BData = {...item}
               cell.$Index = i + 1 + ''
 
-              return cell
+              if (cell.$$uuid) {
+                item.children.push(cell)
+              }
             })
-          } else {
-            item.children = []
           }
 
           item.key = index
@@ -535,22 +537,24 @@
       if (type === 'plus') {
         let _data = (this.state.data || []).concat(result.data || [])
         data = _data.map((item, index) => {
+          item.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.$$BID = item[config.setting.primaryKey] || ''
               cell.$$BData = {...item}
               cell.$Index = i + 1 + ''
 
-              return cell
+              if (cell.$$uuid) {
+                item.children.push(cell)
+              }
             })
-          } else {
-            item.children = []
           }
 
           item.key = index
@@ -569,24 +573,25 @@
         })
       } else {
         data = result.data.map((item, index) => {
+          item.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.$$BID = item[config.setting.primaryKey] || ''
               cell.$$BData = {...item}
               cell.$Index = i + 1 + ''
 
-              return cell
+              if (cell.$$uuid) {
+                item.children.push(cell)
+              }
             })
-          } else {
-            item.children = []
           }
-
           item.key = index
           item.$$uuid = item[config.setting.primaryKey] || ''
           item.$$BID = BID || ''
@@ -669,22 +674,24 @@
         try {
           data = data.map(item => {
             if (item[config.setting.primaryKey] === _data[config.setting.primaryKey]) {
+              _data.children = []
+
               if (_data[config.setting.subdata]) {
                 let _children = _data[config.setting.subdata]
 
                 delete _data[config.setting.subdata]
 
-                _data.children = _children.map((cell, i) => {
+                _children.forEach((cell, i) => {
                   cell.key = i
                   cell.$$uuid = cell[config.setting.subKey] || ''
                   cell.$$BID = _data[config.setting.primaryKey] || ''
                   cell.$$BData = {..._data}
                   cell.$Index = i + 1 + ''
 
-                  return cell
+                  if (cell.$$uuid) {
+                    _data.children.push(cell)
+                  }
                 })
-              } else {
-                _data.children = []
               }
 
               _data.key = item.key

--
Gitblit v1.8.0