Browse Source

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


Co-authored-by: jixiang <jixiang@cmss.chinamobile.com>
jixiang 3 years ago
parent
commit
1621d0a5c3

+ 4 - 10
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");
-            }
           }
         }
       }

+ 2 - 2
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: {

+ 6 - 6
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,

+ 2 - 2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/tis.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 {

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


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


+ 2 - 0
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)',

+ 2 - 2
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: '限流(字节数)',