Browse Source

[Feature-6423][TIS] Rename tis to pigeon (#6427)

Co-authored-by: jixiang <jixiang@cmss.chinamobile.com>
2.0.7-release
jixiang 3 years ago committed by GitHub
parent
commit
1621d0a5c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
  3. 12
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  4. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pigeon.vue
  5. BIN
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon.png
  6. BIN
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon_hover.png
  7. 2
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  8. 4
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

14
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss

@ -93,8 +93,8 @@
&.icos-datax { &.icos-datax {
background-image: url("../images/task-icos/datax.png"); background-image: url("../images/task-icos/datax.png");
} }
&.icos-tis { &.icos-pigeon {
background-image: url("../images/task-icos/tis.png"); background-image: url("../images/task-icos/pigeon.png");
} }
&.icos-sqoop { &.icos-sqoop {
background-image: url("../images/task-icos/sqoop.png"); background-image: url("../images/task-icos/sqoop.png");
@ -111,9 +111,6 @@
&.icos-switch { &.icos-switch {
background-image: url("../images/task-icos/switch.png"); background-image: url("../images/task-icos/switch.png");
} }
&.icos-tis {
background-image: url("../images/task-icos/tis.png");
}
} }
span { span {
@ -156,8 +153,8 @@
&.icos-datax { &.icos-datax {
background-image: url("../images/task-icos/datax_hover.png"); background-image: url("../images/task-icos/datax_hover.png");
} }
&.icos-tis { &.icos-pigeon {
background-image: url("../images/task-icos/tis_hover.png"); background-image: url("../images/task-icos/pigeon_hover.png");
} }
&.icos-sqoop { &.icos-sqoop {
background-image: url("../images/task-icos/sqoop_hover.png"); background-image: url("../images/task-icos/sqoop_hover.png");
@ -174,9 +171,6 @@
&.icos-switch { &.icos-switch {
background-image: url("../images/task-icos/switch_hover.png"); background-image: url("../images/task-icos/switch_hover.png");
} }
&.icos-tis {
background-image: url("../images/task-icos/tis_hover.png");
}
} }
} }
} }

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js

@ -297,8 +297,8 @@ const tasksType = {
desc: 'DataX', desc: 'DataX',
color: '#1fc747' color: '#1fc747'
}, },
TIS: { PIGEON: {
desc: 'TIS', desc: 'PIGEON',
color: '#1fc747' color: '#1fc747'
}, },
SQOOP: { SQOOP: {

12
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@ -353,13 +353,13 @@
:backfill-item="backfillItem" :backfill-item="backfillItem"
> >
</m-datax> </m-datax>
<m-tis <m-pigeon
v-if="nodeData.taskType === 'TIS'" v-if="nodeData.taskType === 'PIGEON'"
@on-params="_onParams" @on-params="_onParams"
@on-cache-params="_onCacheParams" @on-cache-params="_onCacheParams"
:backfill-item="backfillItem" :backfill-item="backfillItem"
ref="TIS"> ref="PIGEON">
</m-tis> </m-pigeon>
<m-sqoop <m-sqoop
v-if="nodeData.taskType === 'SQOOP'" v-if="nodeData.taskType === 'SQOOP'"
@on-params="_onParams" @on-params="_onParams"
@ -437,7 +437,7 @@
import mDependent from './tasks/dependent' import mDependent from './tasks/dependent'
import mHttp from './tasks/http' import mHttp from './tasks/http'
import mDatax from './tasks/datax' import mDatax from './tasks/datax'
import mTis from './tasks/tis' import mPigeon from './tasks/pigeon'
import mConditions from './tasks/conditions' import mConditions from './tasks/conditions'
import mSwitch from './tasks/switch.vue' import mSwitch from './tasks/switch.vue'
import mSqoop from './tasks/sqoop' import mSqoop from './tasks/sqoop'
@ -976,7 +976,7 @@
mDependent, mDependent,
mHttp, mHttp,
mDatax, mDatax,
mTis, mPigeon,
mSqoop, mSqoop,
mConditions, mConditions,
mSwitch, mSwitch,

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/tis.vue → dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pigeon.vue

@ -23,7 +23,7 @@
type="input" type="input"
size="small" size="small"
v-model="targetJobName" v-model="targetJobName"
:placeholder="$t('Please enter TIS DataX job name')"> :placeholder="$t('Please enter Pigeon job name')">
</el-input> </el-input>
</div> </div>
</m-list-box> </m-list-box>
@ -35,7 +35,7 @@
import disabledState from '@/module/mixin/disabledState' import disabledState from '@/module/mixin/disabledState'
export default { export default {
name: 'tis', name: 'pigeon',
data () { data () {
return { return {

BIN
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/pigeon_hover.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

2
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@ -586,6 +586,8 @@ export default {
'Spark Version': 'Spark Version', 'Spark Version': 'Spark Version',
TargetDataBase: 'target database', TargetDataBase: 'target database',
TargetTable: 'target table', 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 the table of target': 'Please enter the table of target',
'Please enter a Target Table(required)': 'Please enter a Target Table(required)', 'Please enter a Target Table(required)': 'Please enter a Target Table(required)',
SpeedByte: 'speed(byte count)', SpeedByte: 'speed(byte count)',

4
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@ -585,8 +585,8 @@ export default {
'Spark Version': 'Spark版本', 'Spark Version': 'Spark版本',
TargetDataBase: '目标库', TargetDataBase: '目标库',
TargetTable: '目标表', TargetTable: '目标表',
TargetJobName: 'TIS目标任务名', TargetJobName: '目标任务名',
'Please enter TIS DataX job name': '请输入TIS DataX任务名', 'Please enter Pigeon job name': '请输入Pigeon任务名',
'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: '限流(字节数)', SpeedByte: '限流(字节数)',

Loading…
Cancel
Save