diff --git a/src/views/simulation/creation/components/flow.ts b/src/views/simulation/creation/components/flow.ts index d6bcb4a0..461e7c71 100644 --- a/src/views/simulation/creation/components/flow.ts +++ b/src/views/simulation/creation/components/flow.ts @@ -243,19 +243,19 @@ const formatNodeAndEdge = (edgeArr: any[], nodeArr: any[]) => { formatItem['extensionElements']['executeConfig'].executeType = 'exportWordScript'; } - formatItem.type = formatItem['extensionElements']['executeConfig'].type; - // if (node.nodeTypeValue === FLOW_APP_TYPE.HPC) { - // // HPC节点异步回调为true - // // formatItem.asyncCallback = true; - // // formatItem.waitUser = node.exeMethod === 'serviceTask'; - // // HPC节点type为serviceTask - // formatItem.type = 'serviceTask'; - // } else { - // // 非HPC节点异步回调为false - // // formatItem.asyncCallback = false; - // // 非HPC节点type为userTask - // formatItem.type = 'userTask'; - // } + // formatItem.type = formatItem['extensionElements']['executeConfig'].type; + if (node.nodeTypeValue === FLOW_APP_TYPE.HPC) { + // HPC节点异步回调为true + // formatItem.asyncCallback = true; + // formatItem.waitUser = node.exeMethod === 'serviceTask'; + // HPC节点type为serviceTask + formatItem.type = 'serviceTask'; + } else { + // 非HPC节点异步回调为false + // formatItem.asyncCallback = false; + // 非HPC节点type为userTask + formatItem.type = 'userTask'; + } if (node.nodeTypeValue === FLOW_APP_TYPE.SCRIPT_NODE) { formatItem.type = 'serviceTask'; diff --git a/src/views/simulation/creation/components/pageConfig/formConfig.ts b/src/views/simulation/creation/components/pageConfig/formConfig.ts index b606cb2c..05b439d6 100644 --- a/src/views/simulation/creation/components/pageConfig/formConfig.ts +++ b/src/views/simulation/creation/components/pageConfig/formConfig.ts @@ -531,7 +531,6 @@ export const selectComponents = [ // }, { label: '上传', - englishLabel: null, tag: 'el-upload', tagIcon: 'upload', @@ -597,11 +596,12 @@ export const selectComponents = [ ]; export const layoutComponents = [ { - layout: 'rowFormItem', englishLabel: null, + tag: 'el-input', + tagIcon: 'row', type: 'default', - tagType: 'VIEW', + tagType: 'INPUT', justify: 'start', align: 'top', label: '行容器', diff --git a/src/views/task/execution/components/runDetailPage/runPagecomponent/flow/runFlowPage.vue b/src/views/task/execution/components/runDetailPage/runPagecomponent/flow/runFlowPage.vue index 6cba720a..378816ea 100644 --- a/src/views/task/execution/components/runDetailPage/runPagecomponent/flow/runFlowPage.vue +++ b/src/views/task/execution/components/runDetailPage/runPagecomponent/flow/runFlowPage.vue @@ -165,6 +165,7 @@ const initGraph = async () => { autoResize: true, // 画布的最小最大缩放级别 scaling: { min: 0.5, max: 3 }, + mousewheel: true, // grid: true, // width: 800, // height: 800,