From e6b6b8656a4a4ed560876645b26ec13c2c2a5158 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 28 Jun 2024 16:41:46 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=89=A7=E8=A1=8C=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PropertySetting/ExecuteFlowProperties.vue | 66 +++++++++++++++----
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/ExecuteFlowProperties.vue b/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/ExecuteFlowProperties.vue
index 967138fa..568f7703 100644
--- a/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/ExecuteFlowProperties.vue
+++ b/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/ExecuteFlowProperties.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form label-width="80px" :rules="rules" ref="formRef" :model="formData">
+    <el-form label-width="100px" :rules="rules" ref="formRef" :model="formData">
       <el-form-item label="id" prop="id">
         <el-input v-model="formData.id" disabled></el-input>
       </el-form-item>
@@ -14,22 +14,36 @@
           inactive-color="#ff4949">
         </el-switch>
       </el-form-item>
-      <el-form-item label="任务类型" prop="category">
-        <el-select clearable v-model="formData.category" placeholder="请选择" style="width: 370px;">
+      <el-form-item label="跳过表达式" prop="skipExpression">
+        <el-input v-model="formData.skipExpression"></el-input>
+      </el-form-item>
+      <el-form-item label="数据源类型" prop="dataSource">
+        <el-select v-model="formData.dataSource" placeholder="请选择" style="width: 370px;">
+          <!-- 下拉框选项 -->
           <el-option
-            v-for="item in taskTypes"
-            v-if="item.value === 'class'"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
+            v-for="option in sources"
+            :key="option.value"
+            :label="option.label"
+            :value="option.value">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item v-if="formData.category === 'class'" label="表达式" prop="skipExpression">
-        <el-input v-model="formData.skipExpression"></el-input>
+      <el-form-item label="数据来源" prop="sourceData">
+        <el-select v-model="formData.sourceData" placeholder="请选择" style="width: 370px;">
+          <!-- 下拉框选项 -->
+          <el-option
+            v-for="option in nodeIds"
+            :key="option.id"
+            :label="option.name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="配置参数" prop="auxParam">
+        <el-input v-model="formData.auxParam" type="textarea"></el-input>
       </el-form-item>
       <el-form-item label="描述" prop="documentation">
-        <el-input v-model="formData.documentation"></el-input>
+        <el-input v-model="formData.documentation" type="textarea"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit">保存</el-button>
@@ -62,6 +76,8 @@ export default {
     }
     this.getTaskTypes()
     this.getStrategyList()
+    this.getAllNodeIds()
+
   },
   data() {
     return {
@@ -73,8 +89,23 @@ export default {
         name: '',
         category: '',
         documentation: '',
-        passNode: true
+        passNode: true,
+        sourceData: '',
+        auxParam: '',
+        skipExpression: '',
+        dataSource: ''
       },
+      sources:[
+        {
+          value: '0',
+          label: '实时数据库'
+        },
+        {
+          value: '1',
+          label: '节点数据'
+        }
+      ],
+      nodeIds: [],
       rules: {
         id: [
           {required: true, message: 'ID不能为空', trigger: 'blur'}
@@ -113,6 +144,17 @@ export default {
         this.taskTypes = res
       })
     },
+    getAllNodeIds() {
+      const {id} = this.$props.nodeData;
+      const allNodeIds = this.$props.lf.getGraphData().nodes;
+      const customObjects = allNodeIds
+        .filter(node => node.id !== id)
+        .map(node => ({
+          id: node.id,
+          name: node.properties.name,
+        }));
+      this.nodeIds = customObjects
+    },
     getStrategyList() {
       curdActDeModel.getStrategyList().then(res => {
         this.strategyList = res