Merge remote-tracking branch 'origin/master'

wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/StorInvTaskProperties.vue

@@ -24,7 +24,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item v-if="formData.category === 'class' || formData.category === 'expression'" label="表达式" prop="skipExpression">
+      <el-form-item v-if="formData.category === 'class' || formData.category === 'expression'" label="表达式"
+                    prop="skipExpression">
         <el-input v-model="formData.skipExpression"></el-input>
       </el-form-item>
       <el-form-item v-else-if="formData.category === 'mapping'" label="表达式" prop="skipExpression">
@@ -51,7 +52,15 @@
         </el-select>
       </el-form-item>
       <el-form-item label="数据来源" prop="sourceData">
-        <el-input v-model="formData.sourceData"></el-input>
+        <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="documentation">
         <el-input v-model="formData.documentation"></el-input>
@@ -88,6 +97,7 @@ export default {
     this.getTypes()
     this.getTaskTypes()
     this.getStrategyList()
+    this.getAllNodeIds()
   },
   data() {
     return {
@@ -95,6 +105,7 @@ export default {
       formTypes: [],
       taskTypes: [],
       strategyList: [],
+      nodeIds: [],
       formData: {
         id: '',
         name: '',
@@ -138,6 +149,17 @@ export default {
         }
       });
     },
+    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
+    },
     generateUniqueId() {
       return `id_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
     },