From ab1e44e9e41bb22c57fc28be6dee7844eb1a797b Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Mon, 16 Oct 2023 10:37:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/js/mixins/commonMixins.js        | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/data-room-ui/packages/js/mixins/commonMixins.js b/data-room-ui/packages/js/mixins/commonMixins.js
index b713c862..8f63d0c3 100644
--- a/data-room-ui/packages/js/mixins/commonMixins.js
+++ b/data-room-ui/packages/js/mixins/commonMixins.js
@@ -61,27 +61,23 @@ export default {
     },
     // 跟当前组件计算表达式关联的组件的数据集合
     currentDataset () {
-      // ['RiTkJGDa','PEKwsHbf']this.config.expressionCodes
-      const newDataset = this.config.expressionCodes?.map(code => {
-        return this.dataset[code]
+      const newDataset = {}
+      this.config.expressionCodes?.forEach(code => {
+        if (this.dataset[code]) {
+          newDataset[code] = this.dataset[code]
+        }
       })
-      if (newDataset?.some(item => !item)) {
-        return null
-      } else {
-        return newDataset
-      }
+      return newDataset
     },
     // 跟当前组件计算表达式关联的组件的数据集合
     currentComputedDatas () {
-      // ['RiTkJGDa','PEKwsHbf']this.config.expressionCodes
-      const newDataset = this.config.expressionCodes?.map(code => {
-        return this.computedDatas[code]
+      const newDataset = {}
+      this.config.expressionCodes?.forEach(code => {
+        if (this.computedDatas[code]) {
+          newDataset[code] = this.computedDatas[code]
+        }
       })
-      if (newDataset?.some(item => !item)) {
-        return null
-      } else {
-        return newDataset
-      }
+      return newDataset
     },
     // 组件数据加载时的背景颜色
     loadingBackground () {