From a5324c6b867c4ed2414d357148b288c1f0ee7455 Mon Sep 17 00:00:00 2001 From: dengbf Date: Tue, 15 Jul 2025 17:21:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?-[=E5=85=B3=E8=81=94]=20#[1465989923831808]?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91-=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6=E4=B8=AD=EF=BC=8C=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E9=97=B4=E7=9A=84=E8=81=94=E5=8A=A8=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=94=9F=E6=95=88=20http://192.168.0.96:8090/demo/rdm.html#/bu?= =?UTF-8?q?g-detail/939050947543040/939050947543057/1465989923831808?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/plugins/TsSheet/form-item.vue | 9 +++++---- src/resources/plugins/TsSheet/form/reaction/disable.js | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue index 57439642..e529ed2b 100644 --- a/src/resources/plugins/TsSheet/form-item.vue +++ b/src/resources/plugins/TsSheet/form-item.vue @@ -63,7 +63,7 @@ :mode="mode" :filter="filter" :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly" - :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled" + :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled || currentItemDisabled" :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false" :formData="formData" :readonlyTextIsHighlight="readonlyTextIsHighlight" @@ -91,7 +91,7 @@ :mode="mode" :filter="filter" :readonly="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isReadOnly : false) || readonly" - :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled" + :disabled="(mode != 'defaultvalue' && mode != 'condition' ? formItem.config && formItem.config.isDisabled : false) || disabled || currentItemDisabled" :required="mode != 'defaultvalue' ? formItem.config && formItem.config.isRequired : false" :formData="formData" :readonlyTextIsHighlight="readonlyTextIsHighlight" @@ -120,7 +120,7 @@ :mode="mode" :filter="filter" :readonly="(mode != 'defaultvalue' ? formItem.config && formItem.config.isReadOnly : false) || readonly" - :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled" + :disabled="(mode != 'defaultvalue' ? formItem.config && formItem.config.isDisabled : false) || disabled || currentItemDisabled" :readonlyTextIsHighlight="readonlyTextIsHighlight" :isClearSpecifiedAttr="isClearSpecifiedAttr" :externalData="externalData" @@ -242,7 +242,8 @@ export default { REACTION: REACTION, //联动规则 isShowErrorMessage: true, currentItemHide: false, //当前组件是否隐藏 - reactionFormItemUuidMap: {} //规格内需要的表单组件值 + reactionFormItemUuidMap: {}, //规格内需要的表单组件值 + currentItemDisabled: false //当前组件是否禁用(针对表格组件嵌套子组件) }; }, beforeCreate() {}, diff --git a/src/resources/plugins/TsSheet/form/reaction/disable.js b/src/resources/plugins/TsSheet/form/reaction/disable.js index dd7507da..17eee0bb 100644 --- a/src/resources/plugins/TsSheet/form/reaction/disable.js +++ b/src/resources/plugins/TsSheet/form/reaction/disable.js @@ -2,8 +2,10 @@ export default ({ overrideConfig, result, view }) => { if (!overrideConfig.isDisabled) { if (result) { view.$set(view.formItem.config, 'isDisabled', true); + view.currentItemDisabled = true; } else { view.$set(view.formItem.config, 'isDisabled', false); + view.currentItemDisabled = false; } view.addExecuteCount('disable'); } -- Gitee From dc67485673189d248aecc143f8aa7d4f99ae346c Mon Sep 17 00:00:00 2001 From: dengbf Date: Tue, 15 Jul 2025 18:03:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[14659899238318?= =?UTF-8?q?08]=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91-=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6=E4=B8=AD=EF=BC=8C=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E9=97=B4=E7=9A=84=E8=81=94=E5=8A=A8=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=94=9F=E6=95=88=20http://192.168.0.96:8090/demo/rdm.html#/bu?= =?UTF-8?q?g-detail/939050947543040/939050947543057/1465989923831808?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/plugins/TsSheet/form-item.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue index e529ed2b..c6fcbad9 100644 --- a/src/resources/plugins/TsSheet/form-item.vue +++ b/src/resources/plugins/TsSheet/form-item.vue @@ -727,6 +727,9 @@ export default { this.$emit('updateHiddenComponentList', val, this.formItem.uuid); } }); + this.$nextTick(() => { + this.isFirstLoad = false; + }); } }, immediate: true -- Gitee