diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss index efabbedad4..9f1c6ee329 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss @@ -93,8 +93,8 @@ &.icos-datax { background-image: url("../images/task-icos/datax.png"); } - &.icos-tis { - background-image: url("../images/task-icos/tis.png"); + &.icos-pigeon { + background-image: url("../images/task-icos/pigeon.png"); } &.icos-sqoop { background-image: url("../images/task-icos/sqoop.png"); @@ -111,9 +111,6 @@ &.icos-switch { background-image: url("../images/task-icos/switch.png"); } - &.icos-tis { - background-image: url("../images/task-icos/tis.png"); - } } span { @@ -156,8 +153,8 @@ &.icos-datax { background-image: url("../images/task-icos/datax_hover.png"); } - &.icos-tis { - background-image: url("../images/task-icos/tis_hover.png"); + &.icos-pigeon { + background-image: url("../images/task-icos/pigeon_hover.png"); } &.icos-sqoop { background-image: url("../images/task-icos/sqoop_hover.png"); @@ -174,9 +171,6 @@ &.icos-switch { background-image: url("../images/task-icos/switch_hover.png"); } - &.icos-tis { - background-image: url("../images/task-icos/tis_hover.png"); - } } } } 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 96479f846d..a5695c2d08 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 @@ -297,8 +297,8 @@ const tasksType = { desc: 'DataX', color: '#1fc747' }, - TIS: { - desc: 'TIS', + PIGEON: { + desc: 'PIGEON', color: '#1fc747' }, SQOOP: { 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 e58d665849..06f7fe6662 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 @@ -353,13 +353,13 @@ :backfill-item="backfillItem" > - - + ref="PIGEON"> + + :placeholder="$t('Please enter Pigeon job name')"> @@ -35,7 +35,7 @@ import disabledState from '@/module/mixin/disabledState' export default { - name: 'tis', + name: 'pigeon', data () { return { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon.png new file mode 100644 index 0000000000..6fe21d2b1e Binary files /dev/null and b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon.png differ diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon_hover.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon_hover.png new file mode 100644 index 0000000000..d9d651bf5d Binary files /dev/null and b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon_hover.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 ac2dd887db..f2164e2974 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -586,6 +586,8 @@ export default { 'Spark Version': 'Spark Version', TargetDataBase: 'target database', TargetTable: 'target table', + TargetJobName: 'target job name', + 'Please enter Pigeon job name': 'Please enter Pigeon job name', 'Please enter the table of target': 'Please enter the table of target', 'Please enter a Target Table(required)': 'Please enter a Target Table(required)', SpeedByte: 'speed(byte count)', 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 f8f5753121..82330ee015 100644 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -585,8 +585,8 @@ export default { 'Spark Version': 'Spark版本', TargetDataBase: '目标库', TargetTable: '目标表', - TargetJobName: 'TIS目标任务名', - 'Please enter TIS DataX job name': '请输入TIS DataX任务名', + TargetJobName: '目标任务名', + 'Please enter Pigeon job name': '请输入Pigeon任务名', 'Please enter the table of target': '请输入目标表名', 'Please enter a Target Table(required)': '请输入目标表(必填)', SpeedByte: '限流(字节数)',