From 7200675af94c5c7b3b70dd754d94d6d149650699 Mon Sep 17 00:00:00 2001 From: dengbf Date: Fri, 8 Dec 2023 17:51:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20=E6=8A=BD?= =?UTF-8?q?=E7=A6=BB=E8=A1=A8=E5=8D=95=E5=AD=90=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/TsSheet.vue | 2 +- .../plugins/TsSheet/form-item-config.vue | 38 ++- src/resources/plugins/TsSheet/form-item.vue | 54 +++-- .../form/component/formsubassembly.vue | 217 ------------------ .../plugins/TsSheet/form/component/index.js | 7 +- .../form/config/formsubassembly-conf.vue | 65 ------ .../plugins/TsSheet/form/config/index.js | 4 +- .../TsSheet/form/define/formsubassembly.js | 23 -- .../plugins/TsSheet/form/formitem-list.js | 5 +- 9 files changed, 66 insertions(+), 349 deletions(-) delete mode 100644 src/resources/plugins/TsSheet/form/component/formsubassembly.vue delete mode 100644 src/resources/plugins/TsSheet/form/config/formsubassembly-conf.vue delete mode 100644 src/resources/plugins/TsSheet/form/define/formsubassembly.js diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue index ab79a65d..2e8c35a9 100644 --- a/src/resources/plugins/TsSheet/TsSheet.vue +++ b/src/resources/plugins/TsSheet/TsSheet.vue @@ -116,7 +116,7 @@ ref="tableContainer" :class="{ editmode: mode === 'edit' }" style="position:relative;overflow:auto;width:100%" - :style="{ height: mode === 'edit' || mode === 'editSubform' ?containerHeight:'100%' }" + :style="{ height: mode === 'edit'?containerHeight:mode === 'editSubform' ?'auto':'100%' }" @scroll=" event => { scrollContainer(event); diff --git a/src/resources/plugins/TsSheet/form-item-config.vue b/src/resources/plugins/TsSheet/form-item-config.vue index 0a77aede..3c91c822 100644 --- a/src/resources/plugins/TsSheet/form-item-config.vue +++ b/src/resources/plugins/TsSheet/form-item-config.vue @@ -20,17 +20,24 @@ diff --git a/src/resources/plugins/TsSheet/form-item.vue b/src/resources/plugins/TsSheet/form-item.vue index 46d6db46..09abe8d9 100644 --- a/src/resources/plugins/TsSheet/form-item.vue +++ b/src/resources/plugins/TsSheet/form-item.vue @@ -69,7 +69,7 @@ @resize="$emit('resize')" @select="selectFormItem" > -
该组件是商业版专供
+
{{ $t('page.commercialcomponent') }}