From 9a70ba712b55063b617154f64cd57c8696a7a90f Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Sat, 11 May 2024 20:39:12 +0800
Subject: [PATCH] =?UTF-8?q?-[=E5=8A=9F=E8=83=BD]=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E6=B6=88=E8=B4=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flowedit/components/autoexec-node.vue     |  1 +
 .../nodesetting/autoexec-setting.vue          | 10 +++++--
 .../nodesetting/autoexec/autoexec-config.vue  |  5 +---
 .../autoexec/config-list-dialog.vue           | 29 +++++++++++++++++--
 4 files changed, 36 insertions(+), 9 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 d25c4f9e..908541f7 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec-node.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec-node.vue
@@ -56,6 +56,7 @@
       :defaultAutoexecConfig="autoexecConfig"
       :allPrevNodes="allPrevNodes"
       :uuid="uuid"
+      :formUuid="formUuid"
     ></AutoexecSetting>
     <!-- 初步处理人 -->
     <div v-if="!isStart">
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec-setting.vue
index 31f56a3a..077b106c 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec-setting.vue
+++ b/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec-setting.vue
@@ -53,7 +53,12 @@
         {{ $t('form.validate.leastonetarget', {'target': $t('term.autoexec.job')}) }}
       </div>
     </div>
-    <ConfigListDialog v-if="isShow" :list="autoexecConfig.configList" @close="closeConfigList"></ConfigListDialog>
+    <ConfigListDialog
+      v-if="isShow"
+      :formUuid="formUuid"
+      :list="autoexecConfig.configList"
+      @close="closeConfigList"
+    ></ConfigListDialog>
   </div>
 </template>
 <script>
@@ -69,7 +74,8 @@ export default {
   props: {
     defaultAutoexecConfig: Object,
     allPrevNodes: Array, //所有前置节点，用于判断是否是开始节点
-    uuid: String //节点uuid
+    uuid: String, //节点uuid
+    formUuid: String
   },
   data() {
     return {
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/autoexec-config.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/autoexec-config.vue
index 428d9dcc..10bf0c8a 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/autoexec-config.vue
+++ b/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/autoexec-config.vue
@@ -121,7 +121,6 @@
   </div>
 </template>
 <script>
-import {store} from '@/views/pages/process/flow/flowedit/floweditState.js';
 export default {
   name: '',
   components: {
@@ -133,6 +132,7 @@ export default {
     Singlejobpolicy: resolve => require(['./joppolicy/singlejobpolicy.vue'], resolve)
   },
   props: {
+    allFormitemList: Array,
     config: Object
   },
   data() {
@@ -386,9 +386,6 @@ export default {
   },
   filter: {},
   computed: {
-    allFormitemList() {
-      return store.allFormitemList;
-    },
     autoexecParamsList() {
       let dataList = [];
       if (this.autoexecConfig.executeParamList && this.autoexecConfig.executeParamList.length) {
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/config-list-dialog.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/config-list-dialog.vue
index 2df1525e..6117253f 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/config-list-dialog.vue
+++ b/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/config-list-dialog.vue
@@ -20,7 +20,12 @@
             </div>
           </div>
           <div v-show="item.isShow" class="autoexec-content border-color padding">
-            <AutoexecConfig ref="autoexecConfig" :config="item" @update="(config)=>{setConfig(item, config,index)}"></AutoexecConfig>
+            <AutoexecConfig
+              ref="autoexecConfig"
+              :allFormitemList="allFormitemList"
+              :config="item"
+              @update="(config)=>{setConfig(item, config,index)}"
+            ></AutoexecConfig>
           </div>
         </div>
       </div>
@@ -38,19 +43,22 @@ export default {
     AutoexecConfig: resolve => require(['./autoexec-config.vue'], resolve)
   },
   props: {
+    formUuid: String,
     list: Array
   },
   data() {
     return {
       loadingShow: true,
       configList: [],
-      isValid: true
+      isValid: true,
+      allFormitemList: []
     };
   },
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() {
+  async mounted() {
+    await this.getFormItemList();
     this.init();
   },
   beforeUpdate() {},
@@ -71,6 +79,21 @@ export default {
       }
       this.loadingShow = false;
     },
+    getFormItemList() {
+      if (!this.formUuid) {
+        this.allFormitemList = [];
+        return;
+      }
+      let data = {
+        formUuid: this.formUuid,
+        tag: 'common'
+      };
+      return this.$api.framework.form.getFormItemList(data).then(res => {
+        if (res.Status == 'OK') {
+          this.allFormitemList = res.Return || [];
+        }
+      });
+    },
     addAutoexecList() {
       let config = {
         autoexecCombopId: null,
-- 
Gitee