From e74172327574b514f7ca497226593b76f04cbdde Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 7 Feb 2025 16:16:31 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=B5=8B=E5=80=BC=EF=BC=9Akey=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E6=97=B6=EF=BC=8C=E4=BD=9C=E4=B8=BA=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/TsSheet.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue
index d4d113c0..002d9d3b 100644
--- a/src/resources/plugins/TsSheet/TsSheet.vue
+++ b/src/resources/plugins/TsSheet/TsSheet.vue
@@ -2426,14 +2426,12 @@ export default {
           //将后台的数据格式转换回原始的数据格式
           this.formData = {};
           val.forEach(element => {
-            if (element.attributeUuid) {
+            const item = this.formItemList.find(d => d.key && element.key && d.key === element.key);
+            if (element.key && item) {
+              this.$set(this.formData, item.uuid, element.dataList);
+            } else if (element.attributeUuid && this.formItemList.find(item => item.uuid === element.attributeUuid)) {
               this.$set(this.formData, element.attributeUuid, element.dataList);
-            } else if (element.key) {
-              const item = this.formItemList.find(d => d.key && d.key === element.key);
-              if (item) {
-                this.$set(this.formData, item.uuid, element.dataList);
-              }
-            }
+            } 
           });
         } else if (val && val instanceof Object) {
           //这里一定要检查formData和data是否一样，如果一样的情况下还继续复制对象，在@setValue中设置TsSheet的data对象的情况下，会导致死循环。
-- 
Gitee