diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts index e0feaa5ec1..147c400c67 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts @@ -564,7 +564,10 @@ const project = { positive_integer: 'Please enter a positive integer greater than 0', prop_empty: 'prop is empty', prop_repeat: 'prop is repeat', - node_not_created: 'Failed to save node not created' + node_not_created: 'Failed to save node not created', + copy_name: 'Copy Name', + view_variables: 'View Variables', + startup_parameter: 'Startup Parameter' }, node: { current_node_settings: 'Current node settings', diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts index d11fedaf90..ca952c21c7 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts @@ -562,7 +562,10 @@ const project = { positive_integer: '请输入大于 0 的正整数', prop_empty: '自定义参数prop不能为空', prop_repeat: 'prop中有重复', - node_not_created: '未创建节点保存失败' + node_not_created: '未创建节点保存失败', + copy_name: '复制名称', + view_variables: '查看变量', + startup_parameter: '启动参数' }, node: { current_node_settings: '当前节点设置', diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-toolbar.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-toolbar.tsx index 63ad0ad2f8..bab2f3d1f2 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-toolbar.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-toolbar.tsx @@ -162,84 +162,113 @@ export default defineComponent({ Styles[themeStore.darkTheme ? 'toolbar-dark' : 'toolbar-light'] ]} > -
- - {props.definition?.processDefinition?.name || + + {route.name === 'workflow-instance-detail' + ? props.instance?.name + : props.definition?.processDefinition?.name || t('project.dag.create')} - - {props.definition?.processDefinition?.name && ( - copy(props.definition?.processDefinition?.name)} - class={Styles['toolbar-btn']} - > - - - - - )} + + {props.definition?.processDefinition?.name && ( + ( + { + const name = + route.name === 'workflow-instance-detail' + ? props.instance?.name + : props.definition?.processDefinition?.name + copy(name) + }} + class={Styles['toolbar-btn']} + > + + + + + ), + default: () => t('project.dag.copy_name') + }} + > + )} +
{route.name === 'workflow-instance-detail' && ( <> - - {{ + ( - - (paramPopoverRef.value = !paramPopoverRef.value) - } - class={Styles['toolbar-btn']} + - - - - - ), - header: () => ( - - {t('project.workflow.parameters_variables')} - + {{ + trigger: () => ( + + (paramPopoverRef.value = !paramPopoverRef.value) + } + class={Styles['toolbar-btn']} + > + + + + + ), + header: () => ( + + {t('project.workflow.parameters_variables')} + + ), + default: () => + }} + ), - default: () => + default: () => t('project.dag.view_variables') }} - - - - {{ + > + ( - - (startupPopoverRef.value = !startupPopoverRef.value) - } - class={Styles['toolbar-btn']} + - - - - - ), - header: () => ( - - {t('project.workflow.startup_parameter')} - + {{ + trigger: () => ( + + (startupPopoverRef.value = + !startupPopoverRef.value) + } + class={Styles['toolbar-btn']} + > + + + + + ), + header: () => ( + + {t('project.workflow.startup_parameter')} + + ), + default: () => ( + + ) + }} + ), - default: () => ( - - ) + default: () => t('project.dag.startup_parameter') }} - + > )}
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag.module.scss b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag.module.scss index b4b39516e3..59df30e4b7 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag.module.scss +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag.module.scss @@ -75,6 +75,7 @@ $bgLight: #ffffff; .workflow-name { font-size: 14px; + font-weight: 700; } .toolbar-btn { @@ -228,6 +229,12 @@ $bgLight: #ffffff; z-index: 9; } +.toolbar-left-part { + display: flex; + align-items: center; + flex: 1; +} + .toolbar-right-part { display: flex; align-items: center; diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/detail/index.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/detail/index.tsx index 55be0b7835..bbf19ba7ba 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/detail/index.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/detail/index.tsx @@ -59,7 +59,7 @@ export default defineComponent({ ]} >