This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 1621d0a [Feature-6423][TIS] Rename tis to pigeon (#6427)
1621d0a is described below
commit 1621d0a5c319a1dce14d0d74ac9c65940bf8354e
Author: jixiang <[email protected]>
AuthorDate: Thu Sep 30 18:30:26 2021 +0800
[Feature-6423][TIS] Rename tis to pigeon (#6427)
Co-authored-by: jixiang <[email protected]>
---
.../js/conf/home/pages/dag/_source/canvas/taskbar.scss | 14 ++++----------
.../src/js/conf/home/pages/dag/_source/config.js | 4 ++--
.../conf/home/pages/dag/_source/formModel/formModel.vue | 12 ++++++------
.../dag/_source/formModel/tasks/{tis.vue => pigeon.vue} | 4 ++--
.../home/pages/dag/_source/images/task-icos/pigeon.png | Bin 0 -> 1192 bytes
.../pages/dag/_source/images/task-icos/pigeon_hover.png | Bin 0 -> 1167 bytes
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 2 ++
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 4 ++--
8 files changed, 18 insertions(+), 22 deletions(-)
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 efabbed..9f1c6ee 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 96479f8..a5695c2 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 e58d665..06f7fe6 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"
>
</m-datax>
- <m-tis
- v-if="nodeData.taskType === 'TIS'"
+ <m-pigeon
+ v-if="nodeData.taskType === 'PIGEON'"
@on-params="_onParams"
@on-cache-params="_onCacheParams"
:backfill-item="backfillItem"
- ref="TIS">
- </m-tis>
+ ref="PIGEON">
+ </m-pigeon>
<m-sqoop
v-if="nodeData.taskType === 'SQOOP'"
@on-params="_onParams"
@@ -437,7 +437,7 @@
import mDependent from './tasks/dependent'
import mHttp from './tasks/http'
import mDatax from './tasks/datax'
- import mTis from './tasks/tis'
+ import mPigeon from './tasks/pigeon'
import mConditions from './tasks/conditions'
import mSwitch from './tasks/switch.vue'
import mSqoop from './tasks/sqoop'
@@ -976,7 +976,7 @@
mDependent,
mHttp,
mDatax,
- mTis,
+ mPigeon,
mSqoop,
mConditions,
mSwitch,
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/tis.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pigeon.vue
old mode 100755
new mode 100644
similarity index 98%
rename from
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/tis.vue
rename to
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pigeon.vue
index 96f3a29..195024d
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/tis.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pigeon.vue
@@ -23,7 +23,7 @@
type="input"
size="small"
v-model="targetJobName"
- :placeholder="$t('Please enter TIS DataX job name')">
+ :placeholder="$t('Please enter Pigeon job name')">
</el-input>
</div>
</m-list-box>
@@ -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 0000000..6fe21d2
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 0000000..d9d651b
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 ac2dd88..f2164e2 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 f8f5753..82330ee 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: '限流(字节数)',
