From 9562302551481662b07efb41bea8c600564c368d Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 27 Dec 2023 16:14:15 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E7=9F=A9=E9=98=B5?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=B1=BB=E5=9E=8B=E7=9F=A9=E9=98=B5=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=BC=82=E5=B8=B8=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1055738674249728]=E7=9F=A9=E9=98=B5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=A1=B9?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9F=A9=E9=98=B5=E6=97=B6=EF=BC=8C=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=B1=9E=E6=80=A7=E4=B8=8B=E6=8B=89=E6=A1=86=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=BC=82=E5=B8=B8=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1055738674249?=
 =?UTF-8?q?728?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsForm/TsFormSelect.vue    |  2 +-
 .../pages/framework/matrix/matrix-overview.vue   | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/resources/plugins/TsForm/TsFormSelect.vue b/src/resources/plugins/TsForm/TsFormSelect.vue
index effc57e4e..3f475b7bf 100755
--- a/src/resources/plugins/TsForm/TsFormSelect.vue
+++ b/src/resources/plugins/TsForm/TsFormSelect.vue
@@ -1028,7 +1028,7 @@ export default {
         if (this.isCustomValue) {
           toValue = this.$utils.deepClone(this.selectedList);
         } else {
-          toValue = this.currentValue.concat([]);
+          toValue = [...(this.currentValue || {})];
         }
       } else if (this.isCustomValue) {
         isSame = this.$utils.isSame(this.value, this.currentValue);
diff --git a/src/views/pages/framework/matrix/matrix-overview.vue b/src/views/pages/framework/matrix/matrix-overview.vue
index 50e5e4d8b..934c755e6 100644
--- a/src/views/pages/framework/matrix/matrix-overview.vue
+++ b/src/views/pages/framework/matrix/matrix-overview.vue
@@ -580,17 +580,15 @@ export default {
         .getMatrixAttributeByUuid(data)
         .then(res => {
           if (res.Status == 'OK') {
-            let resData = res.Return.tbodyList;
-            let newData = [];
-            resData.forEach(v => {
-              newData.push({text: v.name, value: v.label});
+            let tbodyList = res.Return.tbodyList || [];
+            let dataList = [];
+            tbodyList.forEach(v => {
+              if (v.label && v.name) {
+                dataList.push({text: v.name, value: v.label});
+              }
             });
-            // console.log(resData);
-            this.addAtrixForm.showAttributeLabelList.dataList = newData;
-            // console.log(this.addAtrixForm);
+            this.addAtrixForm.showAttributeLabelList.dataList = dataList;
           }
-        })
-        .catch(error => {
         });
     },
     setFile: function(fileList) {
-- 
Gitee