From 565ff777ab93d3691921eb3f7bac5fce5f8fc12a Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 7 Dec 2023 10:07:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=88=A0=E9=99=A4=E8=B0=83=E6=95=B4=20=20=20?=
 =?UTF-8?q?=20-=20[=E5=85=B3=E8=81=94]=20#[1040415640223744]=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8A=E6=8A=A5-=E5=AD=90=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=9D=A1=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=88=A0=E9=99=A4=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1040415640223?=
 =?UTF-8?q?744?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/TsSheet/form/component/formsubassembly.vue   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
index d39f27b1..4e51828a 100644
--- a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
+++ b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
@@ -1,7 +1,8 @@
 <template>
   <div v-if="subFormData">
-    <div class="sheet-main">
-      <div><span class="label bg-primary">{{ label }}</span></div>
+    <div v-if="readonly && !formDataList.length">-</div>
+    <div v-else class="sheet-main">
+      <div class="text-left"><span class="label bg-primary">{{ label }}</span></div>
       <div class="sheet-detail border-color" :style="{ '--height': getFormDataHeight(formDataList) }">
         <div v-for="(item,index) in formDataList" :key="index" class="sheet-list border-base radius-md border-color">
           <div orientation="start" class="subForm-label">
@@ -10,7 +11,7 @@
               <span>{{ label }}</span>
             </div>
             <div class="">
-              <span v-if="!disabled && !readonly && config.isCanAdd && (mode ==='read'|| mode==='readSubform') && formDataList.length>1" class="tsfont-trash-o text-action del-icon" @click="delSheet(index)"></span>
+              <span v-if="!disabled && !readonly && config.isCanAdd && (mode ==='read'|| mode==='readSubform')" class="tsfont-trash-o text-action del-icon" @click="delSheet(index)"></span>
               <span class="pl-sm" :class="!item.isHide?'tsfont-down':'tsfont-up'" @click="toggleshow(item)"></span>
             </div>
           </div>
@@ -101,7 +102,7 @@ export default {
       const errorList = [];
       const sheet = this.$refs['sheet'];
       let isValid = true;
-      let list = Array.from(sheet);
+      let list = sheet && Array.from(sheet) || [];
       for (let i in list) {
         let errorData = await list[i].validData();
         if (!this.$utils.isEmpty(errorData)) {
-- 
Gitee


From 658b0019589ca3b8abaf6d052a9deb1196e41433 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 7 Dec 2023 11:17:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91-=E8=A1=8C=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/mixins/formMixins.js                           | 2 +-
 src/resources/plugins/TsForm/TsFormSelect.vue                | 2 +-
 .../plugins/TsSheet/form/config/common/condition-group.vue   | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/resources/mixins/formMixins.js b/src/resources/mixins/formMixins.js
index a2be9bc9..ff0b5406 100644
--- a/src/resources/mixins/formMixins.js
+++ b/src/resources/mixins/formMixins.js
@@ -234,7 +234,7 @@ export default {
       }
       return className;
     },
-    handleCurrentValue(currentValue) {
+    handleCurrentValue() {
       let value;
       return currentValue => {
         if (this.multiple || this.$options.name == 'TsFormCheckbox') {
diff --git a/src/resources/plugins/TsForm/TsFormSelect.vue b/src/resources/plugins/TsForm/TsFormSelect.vue
index d9dbf316..0322ed5b 100755
--- a/src/resources/plugins/TsForm/TsFormSelect.vue
+++ b/src/resources/plugins/TsForm/TsFormSelect.vue
@@ -1078,7 +1078,7 @@ export default {
       if (index < 0) {
         //选中
         this.multiple ? this.selectedList.push(item) : (this.selectedList = [item]);
-        this.multiple && value ? this.currentValue.push(value) : (this.currentValue = value);
+        this.multiple && !this.$utils.isEmpty(value) ? this.currentValue.push(value) : (this.currentValue = value);
       } else if (this.isRequired && !this.multiple) {
         //取消选中  如果必填且单选，则不能取消选中
         return;
diff --git a/src/resources/plugins/TsSheet/form/config/common/condition-group.vue b/src/resources/plugins/TsSheet/form/config/common/condition-group.vue
index 313827db..a1ef4107 100644
--- a/src/resources/plugins/TsSheet/form/config/common/condition-group.vue
+++ b/src/resources/plugins/TsSheet/form/config/common/condition-group.vue
@@ -149,7 +149,8 @@ export default {
           text: this.$t('page.or'),
           value: 'or'
         }
-      ]
+      ],
+      filterComponentList: ['formtableselector', 'formtableinputer', 'formsubassembly'] //过滤不参与规则的组件
     };
   },
   beforeCreate() {},
@@ -318,7 +319,7 @@ export default {
   filter: {},
   computed: {
     hasValueFormItemList() {
-      return this.formItemList.filter(d => d.hasValue && (!this.formItem || (this.formItem && d.uuid != this.formItem.uuid)));
+      return this.formItemList.filter(d => d.hasValue && (!this.formItem || (this.formItem && d.uuid != this.formItem.uuid)) && !this.filterComponentList.includes(d.handler));
     },
     isNeedAttrValue() {
       return condition => {
-- 
Gitee