From 74914cf36e30e103ca5e64ec85bf223b3e89c40a Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Sat, 17 Oct 2020 12:32:40 +0800
Subject: [PATCH] [#3931][ui]Field name optimization for spark, flink, and mr

---
 .../conf/home/pages/dag/_source/formModel/tasks/flink.vue | 6 +++---
 .../js/conf/home/pages/dag/_source/formModel/tasks/mr.vue | 8 ++++----
 .../conf/home/pages/dag/_source/formModel/tasks/spark.vue | 6 +++---
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js    | 4 ++--
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js    | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
index dca5adec8..36549311e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
@@ -47,9 +47,9 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main jar package')}}</div>
+      <div slot="text">{{$t('Main package')}}</div>
       <div slot="content">
-        <treeselect v-model="mainJar" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main jar package')">
+        <treeselect v-model="mainJar" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -276,7 +276,7 @@
 
 
         if (!this.mainJar) {
-          this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
+          this.$message.warning(`${i18n.$t('Please enter main package')}`)
           return false
         }
 
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
index f9e67a835..530db52c6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
@@ -42,9 +42,9 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main jar package')}}</div>
+      <div slot="text">{{$t('Main package')}}</div>
       <div slot="content">
-        <treeselect v-model="mainJar" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails"  :placeholder="$t('Please enter main jar package')">
+        <treeselect v-model="mainJar" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails"  :placeholder="$t('Please enter main package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -114,7 +114,7 @@
         mainClass: '',
         // Master jar package
         mainJar: null,
-        // Main jar package (List)
+        // Main package (List)
         mainJarLists: [],
         mainJarList: [],
         jarList: [],
@@ -269,7 +269,7 @@
         }
 
         if (!this.mainJar) {
-          this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
+          this.$message.warning(`${i18n.$t('Please enter main package')}`)
           return false
         }
 
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
index b678a7232..4a88bd176 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
@@ -62,9 +62,9 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main jar package')}}</div>
+      <div slot="text">{{$t('Main package')}}</div>
       <div slot="content">
-        <treeselect v-model="mainJar" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main jar package')">
+        <treeselect v-model="mainJar" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -390,7 +390,7 @@
         }
 
         if (!this.mainJar) {
-          this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
+          this.$message.warning(`${i18n.$t('Please enter main package')}`)
           return false
         }
 
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 6aab2e939..79eab5ec0 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -82,8 +82,8 @@ export default {
   'Please enter a positive integer': 'Please enter a positive integer',
   'Program Type': 'Program Type',
   'Main class': 'Main class',
-  'Main jar package': 'Main jar package',
-  'Please enter main jar package': 'Please enter main jar package',
+  'Main package': 'Main package',
+  'Please enter main package': 'Please enter main package',
   'Command-line parameters': 'Command-line parameters',
   'Please enter Command-line parameters': 'Please enter Command-line parameters',
   'Other parameters': 'Other parameters',
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 3f783d08f..eebc6862e 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -82,8 +82,8 @@ export default {
   'Please enter a positive integer': '请输入正整数',
   'Program Type': '程序类型',
   'Main class': '主函数的class',
-  'Main jar package': '主jar包',
-  'Please enter main jar package': '请选择主jar包',
+  'Main package': '主程序包',
+  'Please enter main package': '请选择主程序包',
   'Command-line parameters': '命令行参数',
   'Please enter Command-line parameters': '请输入命令行参数',
   'Other parameters': '其他参数',
-- 
GitLab