From 6efa88f0f250baae6ffc98111b6ba8172264129d Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 28 Feb 2024 16:35:40 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91-=E5=AE=9A=E6=97=B6=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=A1=A8=E5=8D=95=E5=9C=BA=E6=99=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20=20=20-=20[=E5=85=B3=E8=81=94]=20#[1099916556861440?=
 =?UTF-8?q?]=E6=B5=81=E7=A8=8B=E7=BC=96=E8=BE=91-=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E8=A1=A8=E5=8D=95=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E9=85=8D=E7=BD=AE=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1099916556861?=
 =?UTF-8?q?440?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flowedit/components/autoexec-node.vue     |  2 +-
 .../flowedit/components/automatic-node.vue    |  2 +-
 .../flowedit/components/changecreate-node.vue |  2 +-
 .../flowedit/components/changehandle-node.vue |  2 +-
 .../flow/flowedit/components/event-node.vue   |  2 +-
 .../nodesetting/formscene-setting.vue         |  3 +-
 .../flowedit/components/omnipotent-node.vue   |  2 +-
 .../flow/flowedit/components/timer-node.vue   | 40 +++++++++++--------
 8 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/views/pages/process/flow/flowedit/components/autoexec-node.vue b/src/views/pages/process/flow/flowedit/components/autoexec-node.vue
index 748f3aa2..1e9d9c14 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec-node.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec-node.vue
@@ -17,7 +17,7 @@
   <div class="autoexecNode">
     <!-- 表单场景 -->
     <FormsceneSetting
-      v-model="configData.stepConfig"
+      :value="configData.stepConfig"
       :formConfig="formConfig"
       :toSetting="toSetting"
       @updateScene="updateScene"
diff --git a/src/views/pages/process/flow/flowedit/components/automatic-node.vue b/src/views/pages/process/flow/flowedit/components/automatic-node.vue
index 54d6022c..0e68eab8 100644
--- a/src/views/pages/process/flow/flowedit/components/automatic-node.vue
+++ b/src/views/pages/process/flow/flowedit/components/automatic-node.vue
@@ -3,7 +3,7 @@
     <Loading :loading-show="loadingShow" type="fix"></Loading>
     <!-- 表单场景 -->
     <FormsceneSetting
-      v-model="configData.stepConfig"
+      :value="configData.stepConfig"
       :formConfig="formConfig"
       :toSetting="toSetting"
       @updateScene="updateScene"
diff --git a/src/views/pages/process/flow/flowedit/components/changecreate-node.vue b/src/views/pages/process/flow/flowedit/components/changecreate-node.vue
index 2681fc80..656c1d1d 100644
--- a/src/views/pages/process/flow/flowedit/components/changecreate-node.vue
+++ b/src/views/pages/process/flow/flowedit/components/changecreate-node.vue
@@ -2,7 +2,7 @@
   <div class="changecreateNode">
     <!-- 表单场景 -->
     <FormsceneSetting
-      v-model="configData.stepConfig"
+      :value="configData.stepConfig"
       :formConfig="formConfig"
       :toSetting="toSetting"
       @updateScene="updateScene"
diff --git a/src/views/pages/process/flow/flowedit/components/changehandle-node.vue b/src/views/pages/process/flow/flowedit/components/changehandle-node.vue
index 4b183a3f..94590a3d 100644
--- a/src/views/pages/process/flow/flowedit/components/changehandle-node.vue
+++ b/src/views/pages/process/flow/flowedit/components/changehandle-node.vue
@@ -2,7 +2,7 @@
   <div class="changehandleNode">
     <!-- 表单场景 -->
     <FormsceneSetting
-      v-model="configData.stepConfig"
+      :value="configData.stepConfig"
       :formConfig="formConfig"
       :toSetting="toSetting"
       @updateScene="updateScene"
diff --git a/src/views/pages/process/flow/flowedit/components/event-node.vue b/src/views/pages/process/flow/flowedit/components/event-node.vue
index 7d7fb10b..f6a9e9c2 100644
--- a/src/views/pages/process/flow/flowedit/components/event-node.vue
+++ b/src/views/pages/process/flow/flowedit/components/event-node.vue
@@ -2,7 +2,7 @@
   <div class="eventaqNode">
     <!-- 表单场景 -->
     <FormsceneSetting
-      v-model="configData.stepConfig"
+      :value="configData.stepConfig"
       :formConfig="formConfig"
       :toSetting="toSetting"
       @updateScene="updateScene"
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue
index 7e895a32..ab03ee38 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue
+++ b/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue
@@ -176,7 +176,8 @@ export default {
     value: {
       handler(val) {
         this.formSceneUuid = (val && val.formSceneUuid) ? val.formSceneUuid : '';
-      }
+      },
+      deep: true
     }
   }
 };
diff --git a/src/views/pages/process/flow/flowedit/components/omnipotent-node.vue b/src/views/pages/process/flow/flowedit/components/omnipotent-node.vue
index 226f0bca..14c62b29 100644
--- a/src/views/pages/process/flow/flowedit/components/omnipotent-node.vue
+++ b/src/views/pages/process/flow/flowedit/components/omnipotent-node.vue
@@ -2,7 +2,7 @@
   <div class="omnipotentNode">
     <!-- 表单场景 -->
     <FormsceneSetting
-      v-model="configData.stepConfig"
+      :value="configData.stepConfig"
       :formConfig="formConfig"
       :toSetting="toSetting"
       :nodeConfig="nodeConfig"
diff --git a/src/views/pages/process/flow/flowedit/components/timer-node.vue b/src/views/pages/process/flow/flowedit/components/timer-node.vue
index 6fb9c78d..452a0b40 100644
--- a/src/views/pages/process/flow/flowedit/components/timer-node.vue
+++ b/src/views/pages/process/flow/flowedit/components/timer-node.vue
@@ -15,23 +15,28 @@
  */
 <template>
   <div class="timerNode">
-    <Loading :loading-show="loadingShow" type="fix"></Loading>
+    <!-- 表单场景 -->
+    <FormsceneSetting
+      :value="configData.stepConfig"
+      :formConfig="formConfig"
+      :toSetting="toSetting"
+      :nodeConfig="nodeConfig"
+      @updateScene="updateScene"
+    ></FormsceneSetting>
     <div class="permission-list require-label text-grey">
       {{ $t('term.process.circulationtime') }}
     </div>
     <div class="permission-list">
-      <template>
-        <TsFormSelect
-          ref="timerAttributeUuid"
-          v-model="timerConfig.attributeUuid"
-          :dataList="formDataList"
-          :validateList="validateList"
-          border="border"
-          textName="label"
-          valueName="uuid"
-          :firstSelect="false"
-        ></TsFormSelect>
-      </template>
+      <TsFormSelect
+        ref="timerAttributeUuid"
+        v-model="timerConfig.attributeUuid"
+        :dataList="formDataList"
+        :validateList="validateList"
+        border="border"
+        textName="label"
+        valueName="uuid"
+        :firstSelect="false"
+      ></TsFormSelect>
       <div class="fz10 tsfont-info-o text-tip tip-time">{{ $t('term.process.circulationtimetip') }}</div>
     </div>
     <!-- 初步处理人 -->
@@ -55,6 +60,7 @@ import {store} from '../floweditState.js';
 export default {
   name: 'Timer',
   components: {
+    FormsceneSetting: resolve => require(['./nodesetting/formscene-setting'], resolve), // 表单场景
     TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
     AssignSetting
   },
@@ -66,8 +72,8 @@ export default {
   data() {
     let _this = this;
     return {
-      loadingShow: true,
       formUuid: _this.formConfig && _this.formConfig.uuid ? _this.formConfig.uuid : '', //表单id
+      configData: {stepConfig: {}}, //当前节点数据
       timerConfig: {
         type: 'form', //选择类型（暂时只有表单类型）
         value: '', //自定义的默认值
@@ -82,6 +88,7 @@ export default {
   created() {},
   beforeMount() {},
   mounted() {
+    this.keyList = ['workerPolicyConfig'];//stepConfig 需要包含的数据
     this.getNodeSetting();
   },
   beforeUpdate() {},
@@ -93,13 +100,13 @@ export default {
   methods: {
     getNodeSetting() {
       let defaultData = this.nodeConfig.stepConfig || {};
+      let config = this.configData = this.$utils.deepClone(this.nodeConfig);
+      this.initNodeData(config, this.keyList);//初始化数据
       if (!this.$utils.isEmptyObj(defaultData)) {
         Object.keys(defaultData).forEach(key => {
           this.timerConfig[key] = defaultData[key];
         });
-        this.workerPolicyConfig = defaultData.workerPolicyConfig;
       }
-      this.loadingShow = false;
     },
     saveNodeData() {
       let stepConfig = Object.assign({}, this.timerConfig);
@@ -107,6 +114,7 @@ export default {
       if (this.$refs.assignData) {
         stepConfig.workerPolicyConfig = this.$refs.assignData.saveAssignData();
       } 
+      stepConfig['formSceneUuid'] = this.configData.stepConfig.formSceneUuid || '';
       return stepConfig;
     },
     nodeValid(href) {
-- 
Gitee