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