From f5bd390a04ffb1f67bae96a168a65bef2849fbe9 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 14 Apr 2025 18:25:41 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91-=E5=9C=BA=E6=99=AF=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E8=A1=A8=E5=8D=95=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=89=BE=E5=9B=9E=20=20-=20[=E5=85=B3=E8=81=94]=20#[1305875329?=
 =?UTF-8?q?810432]=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91-=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=BB=84=E4=BB=B6=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=89=BE=E5=9B=9E=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1305?=
 =?UTF-8?q?875329810432?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/child-form-item.vue          | 7 ++++++-
 .../plugins/TsSheet/form/component/formcollapse.vue        | 1 +
 src/resources/plugins/TsSheet/form/component/formtab.vue   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/resources/plugins/TsSheet/child-form-item.vue b/src/resources/plugins/TsSheet/child-form-item.vue
index 57921e2d..d245e94b 100644
--- a/src/resources/plugins/TsSheet/child-form-item.vue
+++ b/src/resources/plugins/TsSheet/child-form-item.vue
@@ -14,7 +14,7 @@
       <span class="anthor-top-right" :class="{ 'text-info': formItem._selected, 'text-grey': formItem._hovered }">◼</span>
       <span class="anthor-bottom-left" :class="{ 'text-info': formItem._selected, 'text-grey': formItem._hovered }">◼</span>
       <span class="anthor-bottom-right" :class="{ 'text-info': formItem._selected, 'text-grey': formItem._hovered }">◼</span>
-      <span v-if="formItem._selected && !disabled" class="remove-btn tsfont-trash-o text-href" @mousedown.stop="removeFormItem"></span>
+      <span v-if="formItem._selected && !disabled && !disabledDelete" class="remove-btn tsfont-trash-o text-href" @mousedown.stop="removeFormItem"></span>
     </div>
     <FormItem
       :ref="'formitem_' + formItem.uuid"
@@ -65,6 +65,11 @@ export default {
       // 是否需要label
       type: Boolean,
       default: false
+    },
+    disabledDelete: {
+      // 是否禁用删除
+      type: Boolean,
+      default: false
     }
   },
   data() {
diff --git a/src/resources/plugins/TsSheet/form/component/formcollapse.vue b/src/resources/plugins/TsSheet/form/component/formcollapse.vue
index 4f2381ac..5c8ad1c9 100644
--- a/src/resources/plugins/TsSheet/form/component/formcollapse.vue
+++ b/src/resources/plugins/TsSheet/form/component/formcollapse.vue
@@ -28,6 +28,7 @@
                 :disabled="disabled"
                 :readonly="readonly"
                 :externalData="externalData"
+                :disabledDelete="formItem.hasOwnProperty('inherit')"
                 @resize="$emit('resize')"
                 @emit="
                   val => {
diff --git a/src/resources/plugins/TsSheet/form/component/formtab.vue b/src/resources/plugins/TsSheet/form/component/formtab.vue
index 09d19bbe..33855e90 100644
--- a/src/resources/plugins/TsSheet/form/component/formtab.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtab.vue
@@ -36,6 +36,7 @@
                 :isClearSpecifiedAttr="isClearSpecifiedAttr"
                 :externalData="externalData"
                 :needLabel="config.isShowComponentNameInTab"
+                :disabledDelete="formItem.hasOwnProperty('inherit')"
                 @resize="$emit('resize')"
                 @emit="
                   val => {
-- 
Gitee