diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js index fb6c12308a..ce5371013c 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js @@ -308,6 +308,10 @@ const tasksType = { CONDITIONS: { desc: 'CONDITIONS', color: '#E46F13' + }, + SWITCH: { + desc: 'SWITCH', + color: '#E46F13' } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss index 08f2feccbe..00dfb0001e 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss @@ -113,6 +113,9 @@ .icos-CONDITIONS { background: url("../img/toolbar_CONDITIONS.png") no-repeat 50% 50%; } + .icos-SWITCH{ + background: url("../img/toolbar_SWITCH.png") no-repeat 50% 50%; + } .toolbar { width: 60px; height: 100%; diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue index 7dfcbc62bb..4da2673579 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue @@ -95,7 +95,7 @@ - +
{{$t('Delay execution time')}}
@@ -258,6 +258,13 @@ :backfill-item="backfillItem" :pre-node="nodeData.preNode"> + +
+ +
{{$t('condition')}}
+
+ +
+
+ + {{$t('Branch flow')}} + + + + + + + + + + + +
+
+
+
+ +
{{$t('Branch flow')}}
+
+ + + +
+
+
+ + + + diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SWITCH.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SWITCH.png new file mode 100644 index 0000000000..c3066632f5 Binary files /dev/null and b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SWITCH.png differ diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index 3be86735f4..2dbdd21ad0 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -695,5 +695,7 @@ export default { 'The workflow canvas is abnormal and cannot be saved, please recreate': 'The workflow canvas is abnormal and cannot be saved, please recreate', Info: 'Info', 'Datasource userName': 'owner', - 'Resource userName': 'owner' + 'Resource userName': 'owner', + condition: 'condition', + 'The condition content cannot be empty': 'The condition content cannot be empty' } diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index 07803e8e89..3174c132b5 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -694,5 +694,7 @@ export default { 'The workflow canvas is abnormal and cannot be saved, please recreate': '该工作流画布异常,无法保存,请重新创建', Info: '提示', 'Datasource userName': '所属用户', - 'Resource userName': '所属用户' + 'Resource userName': '所属用户', + condition: '条件', + 'The condition content cannot be empty': '条件内容不能为空' }