From 20002830babe5d3a84c74f43a7df1f303a375cf7 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 16 Nov 2023 11:27:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20=20=20-=20[=E5=85=B3=E8=81=94]=20#[1025343039700992?=
 =?UTF-8?q?]=E5=AD=90=E8=A1=A8=E5=8D=95=EF=BC=8C=E5=9C=A8=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E9=A2=84=E8=A7=88=EF=BC=8C=E5=86=85=E5=AE=B9=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=AD=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1025343039700992?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/component/formsubassembly.vue        | 131 +++++++++++++-----
 1 file changed, 99 insertions(+), 32 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
index bc2051e72..d35ae75ae 100644
--- a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
+++ b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
@@ -1,24 +1,35 @@
 <template>
   <div v-if="subFormData">
-    <div v-if="!disabled && !readonly && config.isCanAdd">
-      <Button v-if="mode ==='read' || mode==='readSubform'" @click="addFormData">添加</Button>
-    </div>
-    <div>
-      <div v-for="(item,index) in formDataList" :key="index" class="sheet-list">
-        <Divider v-if="formDataList.length > 1" orientation="start" class="subForm-label"><div class="text-title">{{ label }}</div></Divider>
-        <TsSheet
-          ref="sheet"
-          :mode="mode==='edit'||mode==='editSubform'?'editSubform':'readSubform'"
-          :value="subFormData"
-          :data="item"
-          :disabled="disabled"
-          :readonly="readonly"
-          isFormSubassembly
-          @setValue="(val)=>{updateValue(val, item, index)}"
-        ></TsSheet>
-        <div v-if="!disabled && !readonly && config.isCanAdd">
-          <div v-if="(mode ==='read'|| mode==='readSubform') && formDataList.length>1" class="tsfont-close-o text-action del-icon" @click="delSheet(index)"></div>
+    <div class="sheet-main">
+      <div><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">
+            <div>
+              <span class="pr-xs">#{{ index+1 }}</span>
+              <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 class="pl-sm" :class="!item.isHide?'tsfont-down':'tsfont-up'" @click="toggleshow(item)"></span>
+            </div>
+          </div>
+          <div v-show="!item.isHide" class="subForm-detail border-color">
+            <TsSheet
+              ref="sheet"
+              :mode="mode==='edit'||mode==='editSubform'?'editSubform':'readSubform'"
+              :value="subFormData"
+              :data="item"
+              :disabled="disabled"
+              :readonly="readonly"
+              isFormSubassembly
+              @setValue="(val)=>{updateValue(val, item, index)}"
+            ></TsSheet>
+          </div>
         </div>
+      </div> 
+      <div v-if="!disabled && !readonly && config.isCanAdd && mode ==='read' || mode==='readSubform'">
+        <Button type="primary" ghost @click="addFormData">{{ $t('dialog.title.addtarget',{'target': label }) }}</Button>
       </div>
     </div>
   </div>
@@ -38,7 +49,8 @@ export default {
     return {
       formDataList: [],
       subFormData: null,
-      label: ''
+      label: '',
+      isShow: true
     };
   },
   beforeCreate() {},
@@ -98,10 +110,23 @@ export default {
     delSheet(index) {
       this.formDataList.splice(index, 1);
       this.setValue(this.formDataList); 
+    },
+    toggleshow(item) {
+      this.$set(item, 'isHide', !item.isHide);
     }
   },
   filter: {},
-  computed: {},
+  computed: {
+    getFormDataHeight() {
+      return (list) => {
+        let height = 100;
+        if (list.length > 0 && this.disabled || this.readonly || !this.config || !this.config.isCanAdd || (this.mode !== 'read' && this.mode !== 'readSubform')) {
+          height = 100 * (1 - 1 / (list.length * 2));
+        }
+        return height + '%';
+      };
+    }
+  },
   watch: {
     formItem: {
       handler(val) {
@@ -117,21 +142,63 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.sheet-list {
-  position: relative;
-  .subForm-label {
-    border-collapse: separate;
+.sheet-main {
+  .label {
+    display: inline-block;
+    height: 26px;
+    line-height: 26px;
+    border-radius: 13px;
+    padding: 0 6px;
+    font-size: 12px;
+    color: #fff;
   }
-  &:hover {
-    .del-icon {
-      display: block;
+  .sheet-detail{
+    position: relative;
+    padding-left: 44px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    &::before{
+        position: absolute;
+        content: "";
+        top: 0px;
+        bottom: -10px;
+        left: 20px;
+        border-left: 1px dashed;
+        border-color: inherit;
+        height:  var(--height);
     }
   }
-  .del-icon {
-    display: none;
-    position: absolute;
-    right: 0;
-    top: 0;
+  .sheet-list {
+    position: relative;
+    &:not(:last-child){
+      margin-bottom: 10px;
+    }
+    &::before {
+      position: absolute;
+      content: " ";
+      top: 50%;
+      left: -24px;
+      right: 100%;
+      border-top: 1px dashed;
+      border-color: inherit;
+    }
+    .subForm-label {
+      padding: 6px;
+      display: flex;
+      justify-content: space-between;
+    }
+    &:hover {
+      .del-icon {
+        display: inline-block;
+      }
+    }
+    .del-icon {
+      display: none;
+    }
+    .subForm-detail {
+      padding: 16px;
+      border-top: 1px solid;
+    }
   }
 }
 </style>
-- 
Gitee


From 5c30f39ad86e3eef6aaf4e212ba2eb59832f4e28 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 16 Nov 2023 14:10:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/component/formsubassembly.vue        | 23 +++++++++++++++----
 .../components/nodesetting/action-setting.vue |  3 +--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
index d35ae75ae..04fed4516 100644
--- a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
+++ b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
@@ -28,8 +28,13 @@
           </div>
         </div>
       </div> 
-      <div v-if="!disabled && !readonly && config.isCanAdd && mode ==='read' || mode==='readSubform'">
-        <Button type="primary" ghost @click="addFormData">{{ $t('dialog.title.addtarget',{'target': label }) }}</Button>
+      <div v-if="!disabled && !readonly && config.isCanAdd">
+        <Button
+          v-if="mode ==='read' || mode==='readSubform'"
+          type="primary"
+          ghost
+          @click="addFormData"
+        >{{ $t('dialog.title.addtarget',{'target': label }) }}</Button>
       </div>
     </div>
   </div>
@@ -74,6 +79,12 @@ export default {
           value = JSON.parse(value);
         }
         if (value instanceof Array && value.length > 0) {
+          value.forEach(item => {
+            //默认展开
+            if (item.hasOwnProperty('isHide')) {
+              this.$set(item, 'isHide', false);
+            }
+          });
           this.formDataList.push(...value);
         }
       } else { 
@@ -92,12 +103,14 @@ export default {
       const errorList = [];
       const sheet = this.$refs['sheet'];
       let isValid = true;
-      Array.from(sheet).forEach(async s => {
-        let errorData = await s.validData();
+      let list = Array.from(sheet);
+      for (let i in list) {
+        let errorData = await list[i].validData();
         if (!this.$utils.isEmpty(errorData)) {
+          this.$set(this.formDataList[i], 'isHide', false);
           isValid = false;
         }
-      });
+      }
       if (!isValid) {
         errorList.push({uuid: this.formItem.uuid, error: this.formItem.label + '校验失败'});
       }
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/action-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/action-setting.vue
index 23562933f..9d2aa3421 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/action-setting.vue
+++ b/src/views/pages/process/flow/flowedit/components/nodesetting/action-setting.vue
@@ -151,7 +151,6 @@ export default {
       this.paraConditionList = [];
       this.$api.process.process.processParamList(data).then(res => {
         if (res.Status == 'OK') {
-          let defaultParamConditionList = res.Return;
           this.$set(this, 'paraConditionList', res.Return || []);
         }
       });
@@ -256,7 +255,7 @@ export default {
     },
     'formConfig.uuid': {
       handler: function(val, oldval) {
-        this.getParaConditionList(val.uuid);
+        this.getParaConditionList(val);
       },
       deep: true,
       immediate: true
-- 
Gitee


From 45c581648caee0fe24823683f0e5530057872d01 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 16 Nov 2023 14:12:56 +0800
Subject: [PATCH 3/3] commit

---
 .../plugins/TsSheet/form/component/formsubassembly.vue         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
index 04fed4516..a894d6c26 100644
--- a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
+++ b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
@@ -54,8 +54,7 @@ export default {
     return {
       formDataList: [],
       subFormData: null,
-      label: '',
-      isShow: true
+      label: ''
     };
   },
   beforeCreate() {},
-- 
Gitee