CzRger 2 weeks ago
parent
commit
3571512238
1 changed files with 11 additions and 2 deletions
  1. 11 2
      src/views/workflow/instance/component/params-textarea/version-2.vue

+ 11 - 2
src/views/workflow/instance/component/params-textarea/version-2.vue

@@ -127,6 +127,7 @@ import paramValue from '@/views/workflow/instance/component/params-textarea/para
 import { useWorkflowStore } from '@/stores'
 import { Search } from '@element-plus/icons-vue'
 import varsItem from '@/views/workflow/instance/component/vars/vars-item.vue'
+import { VarsSource } from '@/views/workflow/types'
 
 const WorkflowStore = useWorkflowStore()
 const emit = defineEmits(['update:modelValue'])
@@ -184,7 +185,11 @@ watch(
       const map = new Map()
       all.forEach((p) => {
         p.options.forEach((v) => {
-          map.set(`${v.nodeId}.${v.key}`, v)
+          if (v.source === VarsSource.Root) {
+            map.set(`${v.key}`, v)
+          } else {
+            map.set(`${v.nodeId}.${v.key}`, v)
+          }
         })
       })
       state.optionsMap = map
@@ -340,7 +345,11 @@ const initVarsDom = (vars) => {
   const dom = document.createElement('div')
   if (vars) {
     dom.setAttribute('contenteditable', 'false')
-    dom.setAttribute('sign', `{{#${vars.nodeId}.${vars.key}#}}`)
+    if (vars.source === VarsSource.Root) {
+      dom.setAttribute('sign', `{{#${vars.key}#}}`)
+    } else {
+      dom.setAttribute('sign', `{{#${vars.nodeId}.${vars.key}#}}`)
+    }
     dom.className = 'vars-dom inline-block'
     const app = createApp(paramValue, {
       vars,