From 99e15722e8237a7816b29305f8dd6ead220d758e Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 1 Mar 2024 17:02:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E7=BC=96=E8=BE=91-=E6=94=B9=E5=8F=98=E7=BB=A7?=
 =?UTF-8?q?=E6=89=BF=E5=85=B3=E7=B3=BB=E6=97=B6=E6=9B=B4=E6=96=B0=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form-scene-edit.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/resources/plugins/TsSheet/form-scene-edit.vue b/src/resources/plugins/TsSheet/form-scene-edit.vue
index 5b6e5e68..52c2e5a7 100644
--- a/src/resources/plugins/TsSheet/form-scene-edit.vue
+++ b/src/resources/plugins/TsSheet/form-scene-edit.vue
@@ -494,6 +494,11 @@ export default {
       this.currentFormItem = null;
       this.$nextTick(() => {
         this.currentFormItem = this.$utils.deepClone(config);
+        this.formData.formConfig.tableList.forEach(d => {
+          if (d.component && d.component.uuid == uuid) {
+            this.$set(d, 'component', this.currentFormItem);
+          }
+        });
       });
     },
     saveForm(type) {
-- 
Gitee


From 475c7ceb908603c599ff4d3b7cf0ffe858809866 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 1 Mar 2024 17:04:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E8=A1=A8=E5=8D=95=E5=9C=BA=E6=99=AF=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8D=A1=E7=BB=84=E4=BB=B6=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=8F=AA=E8=AF=BB=EF=BC=8C=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=AA=E8=AF=BB=E7=9A=84=E6=95=88=E6=9E=9C=20=20=20?=
 =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[1102226519457792]=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91-=E8=A1=A8=E5=8D=95=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E7=9A=84=E9=80=89=E9=A1=B9=E5=8D=A1=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E7=BB=A7=E6=89=BF=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8D=A1=E4=B8=8B=E7=9A=84=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=8D=E7=84=B6=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1102226519457792?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/form/component/formtab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formtab.vue b/src/resources/plugins/TsSheet/form/component/formtab.vue
index f8a378c4..7276e594 100644
--- a/src/resources/plugins/TsSheet/form/component/formtab.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtab.vue
@@ -30,7 +30,7 @@
                 :formData="formData"
                 :formItemList="formItemList"
                 :mode="mode"
-                :disabled="disabled || !!formItem.hasOwnProperty('inherit')"
+                :disabled="disabled"
                 :readonly="readonly"
                 @resize="$emit('resize')"
                 @emit="
-- 
Gitee