From 9a3853424ba66f411e99e1954ba596fcc1d1a370 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Fri, 5 Feb 2021 11:27:19 +0800
Subject: [PATCH 1/7] Improvement/UI no #3725 (#4316)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 工作流定义，工作流实例，任务实例的编号设置为id

* Change the no to taskinstance, processinstance, processdefinition id
---
 .../pages/projects/pages/definition/pages/list/_source/list.vue | 2 +-
 .../pages/projects/pages/instance/pages/list/_source/list.vue   | 2 +-
 .../home/pages/projects/pages/taskInstance/_source/list.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index 32612213ac..e148119b98 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -19,7 +19,7 @@
     <div class="table-box">
       <el-table :data="list" size="mini" style="width: 100%" @selection-change="_arrDelChange">
         <el-table-column type="selection" width="50" :selectable="selectable"></el-table-column>
-        <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
+        <el-table-column prop="id" :label="$t('#')" width="50"></el-table-column>
         <el-table-column :label="$t('Process Name')" min-width="200">
           <template slot-scope="scope">
             <el-popover trigger="hover" placement="top">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index 01b7574689..cc0e51345a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -19,7 +19,7 @@
     <div class="table-box">
       <el-table class="fixed" :data="list" size="mini" style="width: 100%" @selection-change="_arrDelChange">
         <el-table-column type="selection" width="50"></el-table-column>
-        <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
+        <el-table-column prop="id" :label="$t('#')" width="50"></el-table-column>
         <el-table-column :label="$t('Process Name')" min-width="200">
           <template slot-scope="scope">
             <el-popover trigger="hover" placement="top">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
index 75ec49d6bd..8aa387afc6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
@@ -18,7 +18,7 @@
   <div class="list-model">
     <div class="table-box">
       <el-table :data="list" size="mini" style="width: 100%">
-        <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
+        <el-table-column prop="id" :label="$t('#')" width="50"></el-table-column>
         <el-table-column prop="name" :label="$t('Name')"></el-table-column>
         <el-table-column :label="$t('Process Instance')" min-width="200">
           <template slot-scope="scope">

From e3902bf340c23a1dea4065b832dee8ad99244307 Mon Sep 17 00:00:00 2001
From: lisen <Ylisen10@163.com>
Date: Fri, 5 Feb 2021 11:33:00 +0800
Subject: [PATCH 2/7] [Fix-4640][UI] Fixed a 404 error when the project name
 contains "http" (#4688)

this closes #4640  #4672
---
 dolphinscheduler-ui/src/js/module/io/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/module/io/index.js b/dolphinscheduler-ui/src/js/module/io/index.js
index d1b6a1af62..2d7894828a 100644
--- a/dolphinscheduler-ui/src/js/module/io/index.js
+++ b/dolphinscheduler-ui/src/js/module/io/index.js
@@ -22,7 +22,7 @@ const apiPrefix = '/dolphinscheduler'
 const reSlashPrefix = /^\/+/
 
 const resolveURL = (url) => {
-  if (url.indexOf('http') !== -1) {
+  if (url.indexOf('http') === 0) {
     return url
   }
   if (url.charAt(0) !== '/') {

From 24ddd4f7076256342cab1509afd3487cd4e423d9 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Fri, 5 Feb 2021 11:52:11 +0800
Subject: [PATCH 3/7] [Improvement][UI] Improve parameter (#4673)

---
 .../dag/_source/formModel/tasks/flink.vue     | 38 +++++----
 .../pages/dag/_source/formModel/tasks/mr.vue  | 16 ++--
 .../dag/_source/formModel/tasks/spark.vue     | 78 +++++++++++--------
 .../src/js/module/i18n/locale/en_US.js        | 34 ++++----
 .../src/js/module/i18n/locale/zh_CN.js        | 44 +++++------
 5 files changed, 118 insertions(+), 92 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 1fe8ca9137..d0dfdf6d97 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
@@ -35,7 +35,7 @@
     </m-list-box>
 
     <m-list-box v-if="programType !== 'PYTHON'">
-      <div slot="text">{{$t('Main class')}}</div>
+      <div slot="text">{{$t('Main Class')}}</div>
       <div slot="content">
         <el-input
           :disabled="isDetails"
@@ -47,7 +47,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main jar package')}}</div>
+      <div slot="text">{{$t('Main Jar Package')}}</div>
       <div slot="content">
         <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main jar package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
@@ -137,7 +137,7 @@
       </div>
     </m-list-4-box>
     <m-list-box>
-      <div slot="text">{{$t('Command-line parameters')}}</div>
+      <div slot="text">{{$t('Main Arguments')}}</div>
       <div slot="content">
         <el-input
                 :autosize="{minRows:2}"
@@ -145,12 +145,12 @@
                 type="textarea"
                 size="small"
                 v-model="mainArgs"
-                :placeholder="$t('Please enter Command-line parameters')">
+                :placeholder="$t('Please enter main arguments')">
         </el-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Other parameters')}}</div>
+      <div slot="text">{{$t('Option Parameters')}}</div>
       <div slot="content">
         <el-input
                 :disabled="isDetails"
@@ -158,7 +158,7 @@
                 type="textarea"
                 size="small"
                 v-model="others"
-                :placeholder="$t('Please enter other parameters')">
+                :placeholder="$t('Please enter option parameters')">
         </el-input>
       </div>
     </m-list-box>
@@ -213,19 +213,19 @@
         cacheResourceList: [],
         // Custom function
         localParams: [],
-        // Driver Number of cores
+        // Slot number
         slot: 1,
-        // Driver Number of memory
+        // TaskManager mumber
         taskManager: '2',
-        // jobManager Memory
+        // JobManager memory
         jobManagerMemory: '1G',
-        // taskManager Memory
+        // TaskManager memory
         taskManagerMemory: '2G',
-        // Flink Job Name
+        // Flink app name
         appName: '',
-        // Command line argument
+        // Main arguments
         mainArgs: '',
-        // Other parameters
+        // Option parameters
         others: '',
         // Program type
         programType: 'SCALA',
@@ -310,11 +310,21 @@
           return false
         }
 
-        if (!_.isNumber(parseInt(this.taskManagerMemory))) {
+        if (!Number.isInteger(parseInt(this.taskManagerMemory))) {
           this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`)
           return false
         }
 
+        if (!Number.isInteger(parseInt(this.slot))) {
+          this.$message.warning(`${i18n.$t('Please enter Slot number')}`)
+          return false
+        }
+
+        if (this.flinkVersion === '<1.10' && !Number.isInteger(parseInt(this.taskManager))) {
+          this.$message.warning(`${i18n.$t('Please enter TaskManager number')}`)
+          return false
+        }
+
         // noRes
         if (this.noRes.length > 0) {
           this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
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 356eefd65a..adef5989e0 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
@@ -30,7 +30,7 @@
       </div>
     </m-list-box>
     <m-list-box v-if="programType !== 'PYTHON'">
-      <div slot="text">{{$t('Main class')}}</div>
+      <div slot="text">{{$t('Main Class')}}</div>
       <div slot="content">
         <el-input
                 :disabled="isDetails"
@@ -42,7 +42,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main jar package')}}</div>
+      <div slot="text">{{$t('Main Jar Package')}}</div>
       <div slot="content">
         <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails"  :placeholder="$t('Please enter main jar package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
@@ -50,7 +50,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Command-line parameters')}}</div>
+      <div slot="text">{{$t('Main Arguments')}}</div>
       <div slot="content">
         <el-input
                 :autosize="{minRows:2}"
@@ -58,12 +58,12 @@
                 type="textarea"
                 size="small"
                 v-model="mainArgs"
-                :placeholder="$t('Please enter Command-line parameters')">
+                :placeholder="$t('Please enter main arguments')">
         </el-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Other parameters')}}</div>
+      <div slot="text">{{$t('Option Parameters')}}</div>
       <div slot="content">
         <el-input
                 :disabled="isDetails"
@@ -71,7 +71,7 @@
                 type="textarea"
                 size="small"
                 v-model="others"
-                :placeholder="$t('Please enter other parameters')">
+                :placeholder="$t('Please enter option parameters')">
         </el-input>
       </div>
     </m-list-box>
@@ -122,9 +122,9 @@
         cacheResourceList: [],
         // Custom parameter
         localParams: [],
-        // Command line argument
+        // Main arguments
         mainArgs: '',
-        // Other parameters
+        // Option parameters
         others: '',
         // Program type
         programType: 'JAVA',
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 efeb7e9e36..a2192399a5 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
@@ -51,7 +51,7 @@
       </div>
     </m-list-box>
     <m-list-box v-if="programType !== 'PYTHON'">
-      <div slot="text">{{$t('Main class')}}</div>
+      <div slot="text">{{$t('Main Class')}}</div>
       <div slot="content">
         <el-input
             :disabled="isDetails"
@@ -63,7 +63,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main jar package')}}</div>
+      <div slot="text">{{$t('Main Jar Package')}}</div>
       <div slot="content">
         <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main jar package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
@@ -81,7 +81,7 @@
       </div>
     </m-list-box>
     <m-list-4-box>
-      <div slot="text">{{$t('Driver cores')}}</div>
+      <div slot="text">{{$t('Driver Cores')}}</div>
       <div slot="content">
         <el-input
           :disabled="isDetails"
@@ -91,7 +91,7 @@
           :placeholder="$t('Please enter Driver cores')">
         </el-input>
       </div>
-      <div slot="text-2">{{$t('Driver memory')}}</div>
+      <div slot="text-2">{{$t('Driver Memory')}}</div>
       <div slot="content-2">
         <el-input
           :disabled="isDetails"
@@ -113,7 +113,7 @@
           :placeholder="$t('Please enter Executor number')">
         </el-input>
       </div>
-      <div slot="text-2">{{$t('Executor memory')}}</div>
+      <div slot="text-2">{{$t('Executor Memory')}}</div>
       <div slot="content-2">
         <el-input
           :disabled="isDetails"
@@ -125,7 +125,7 @@
       </div>
     </m-list-4-box>
     <m-list-4-box>
-      <div slot="text">{{$t('Executor cores')}}</div>
+      <div slot="text">{{$t('Executor Cores')}}</div>
       <div slot="content">
         <el-input
           :disabled="isDetails"
@@ -137,7 +137,7 @@
       </div>
     </m-list-4-box>
     <m-list-box>
-      <div slot="text">{{$t('Command-line parameters')}}</div>
+      <div slot="text">{{$t('Main Arguments')}}</div>
       <div slot="content">
         <el-input
             :autosize="{minRows:2}"
@@ -145,12 +145,12 @@
             type="textarea"
             size="small"
             v-model="mainArgs"
-            :placeholder="$t('Please enter Command-line parameters')">
+            :placeholder="$t('Please enter main arguments')">
         </el-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Other parameters')}}</div>
+      <div slot="text">{{$t('Option Parameters')}}</div>
       <div slot="content">
         <el-input
             :disabled="isDetails"
@@ -158,7 +158,7 @@
             type="textarea"
             size="small"
             v-model="others"
-            :placeholder="$t('Please enter other parameters')">
+            :placeholder="$t('Please enter option parameters')">
         </el-input>
       </div>
     </m-list-box>
@@ -213,19 +213,19 @@
         cacheResourceList: [],
         // Custom function
         localParams: [],
-        // Driver Number of cores
+        // Driver cores
         driverCores: 1,
-        // Driver Number of memory
+        // Driver memory
         driverMemory: '512M',
-        // Executor Number
+        // Executor number
         numExecutors: 2,
-        // Executor Number of memory
+        // Executor memory
         executorMemory: '2G',
-        // Executor Number of cores
+        // Executor cores
         executorCores: 2,
-        // Command line argument
+        // Main arguments
         mainArgs: '',
-        // Other parameters
+        // Option parameters
         others: '',
         // Program type
         programType: 'SCALA',
@@ -367,24 +367,33 @@
           return false
         }
 
-        if (!this.numExecutors) {
-          this.$message.warning(`${i18n.$t('Please enter Executor number')}`)
+        if (!this.driverCores) {
+          this.$message.warning(`${i18n.$t('Please enter Driver cores')}`)
           return false
         }
 
-        // noRes
-        if (this.noRes.length > 0) {
-          this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
+        if (!Number.isInteger(parseInt(this.driverCores))) {
+          this.$message.warning(`${i18n.$t('Core number should be positive integer')}`)
           return false
         }
 
-        if (!Number.isInteger(parseInt(this.numExecutors))) {
-          this.$message.warning(`${i18n.$t('The Executor Number should be a positive integer')}`)
+        if (!this.driverMemory) {
+          this.$message.warning(`${i18n.$t('Please enter Driver memory')}`)
           return false
         }
 
-        if (!this.executorMemory) {
-          this.$message.warning(`${i18n.$t('Please enter Executor memory')}`)
+        if (!Number.isInteger(parseInt(this.driverMemory))) {
+          this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`)
+          return false
+        }
+
+        if (!this.executorCores) {
+          this.$message.warning(`${i18n.$t('Please enter Executor cores')}`)
+          return false
+        }
+
+        if (!Number.isInteger(parseInt(this.executorCores))) {
+          this.$message.warning(`${i18n.$t('Core number should be positive integer')}`)
           return false
         }
 
@@ -393,20 +402,27 @@
           return false
         }
 
-        if (!_.isNumber(parseInt(this.executorMemory))) {
+        if (!Number.isInteger(parseInt(this.executorMemory))) {
           this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`)
           return false
         }
 
-        if (!this.executorCores) {
-          this.$message.warning(`${i18n.$t('Please enter Executor cores')}`)
+        if (!this.numExecutors) {
+          this.$message.warning(`${i18n.$t('Please enter Executor number')}`)
           return false
         }
 
-        if (!Number.isInteger(parseInt(this.executorCores))) {
-          this.$message.warning(`${i18n.$t('Core number should be positive integer')}`)
+        if (!Number.isInteger(parseInt(this.numExecutors))) {
+          this.$message.warning(`${i18n.$t('The Executor number should be a positive integer')}`)
+          return false
+        }
+
+        // noRes
+        if (this.noRes.length > 0) {
+          this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
           return false
         }
+
         // localParams Subcomponent verification
         if (!this.$refs.refLocalParams._verifProp()) {
           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 cb330e9fd8..adbcfda238 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -86,14 +86,14 @@ export default {
   'Please choose': 'Please choose',
   'Please enter a positive integer': 'Please enter a positive integer',
   'Program Type': 'Program Type',
-  'Main class': 'Main class',
-  'Main jar package': 'Main jar package',
+  'Main Class': 'Main Class',
+  'Main Jar Package': 'Main Jar Package',
   'Please enter main jar package': 'Please enter main jar package',
   'Please enter main class': 'Please enter main class',
-  'Command-line parameters': 'Command-line parameters',
-  'Please enter Command-line parameters': 'Please enter Command-line parameters',
-  'Other parameters': 'Other parameters',
-  'Please enter other parameters': 'Please enter other parameters',
+  'Main Arguments': 'Main Arguments',
+  'Please enter main arguments': 'Please enter main arguments',
+  'Option Parameters': 'Option Parameters',
+  'Please enter option parameters': 'Please enter option parameters',
   Resources: 'Resources',
   'Custom Parameters': 'Custom Parameters',
   'Custom template': 'Custom template',
@@ -103,23 +103,29 @@ export default {
   Script: 'Script',
   'Please enter script(required)': 'Please enter script(required)',
   'Deploy Mode': 'Deploy Mode',
-  'Driver cores': 'Driver cores',
+  'Driver Cores': 'Driver Cores',
   'Please enter Driver cores': 'Please enter Driver cores',
-  'Driver memory': 'Driver memory',
+  'Driver Memory': 'Driver Memory',
   'Please enter Driver memory': 'Please enter Driver memory',
   'Executor Number': 'Executor Number',
   'Please enter Executor number': 'Please enter Executor number',
-  'Executor memory': 'Executor memory',
+  'The Executor number should be a positive integer': 'The Executor number should be a positive integer',
+  'Executor Memory': 'Executor Memory',
   'Please enter Executor memory': 'Please enter Executor memory',
-  'Executor cores': 'Executor cores',
+  'Executor Cores': 'Executor Cores',
   'Please enter Executor cores': 'Please enter Executor cores',
-  'The Executor Number should be a positive integer': 'The Executor Number should be a positive integer',
   'Memory should be a positive integer': 'Memory should be a positive integer',
   'Core number should be positive integer': 'Core number should be positive integer',
+  'Flink Version': 'Flink Version',
+  'JobManager Memory': 'JobManager Memory',
   'Please enter JobManager memory': 'Please enter JobManager memory',
+  'TaskManager Memory': 'TaskManager Memory',
   'Please enter TaskManager memory': 'Please enter TaskManager memory',
+  'Slot Number': 'Slot Number',
   'Please enter Slot number': 'Please enter Slot number',
+  'TaskManager Number': 'TaskManager Number',
   'Please enter TaskManager number': 'Please enter TaskManager number',
+  'App Name': 'App Name',
   'Please enter app name(optional)': 'Please enter app name(optional)',
   'SQL Type': 'SQL Type',
   Title: 'Title',
@@ -543,12 +549,6 @@ export default {
   'Next five execution times': 'Next five execution times',
   'Execute time': 'Execute time',
   'Complement range': 'Complement range',
-  'Flink Version': 'Flink Version',
-  'Slot Number': 'Slot Number',
-  'TaskManager Number': 'TaskManager Number',
-  'JobManager Memory': 'JobManager Memory',
-  'TaskManager Memory': 'TaskManager Memory',
-  'App Name': 'App Name',
   'Http Url': 'Http Url',
   'Http Method': 'Http Method',
   'Http Parameters': 'Http 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 d957a6a0cc..440f38c0ff 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -86,14 +86,14 @@ export default {
   'Please choose': '请选择',
   'Please enter a positive integer': '请输入正整数',
   'Program Type': '程序类型',
-  'Main class': '主函数的class',
-  'Main jar package': '主jar包',
-  'Please enter main jar package': '请选择主jar包',
-  'Please enter main class': '请填写主函数的class',
-  'Command-line parameters': '命令行参数',
-  'Please enter Command-line parameters': '请输入命令行参数',
-  'Other parameters': '其他参数',
-  'Please enter other parameters': '请输入其他参数',
+  'Main Class': '主函数的Class',
+  'Main Jar Package': '主Jar包',
+  'Please enter main jar package': '请选择主Jar包',
+  'Please enter main class': '请填写主函数的Class',
+  'Main Arguments': '主程序参数',
+  'Please enter main arguments': '请输入主程序参数',
+  'Option Parameters': '选项参数',
+  'Please enter option parameters': '请输入选项参数',
   Resources: '资源',
   'Custom Parameters': '自定义参数',
   'Custom template': '自定义模版',
@@ -103,23 +103,29 @@ export default {
   Script: '脚本',
   'Please enter script(required)': '请输入脚本(必填)',
   'Deploy Mode': '部署方式',
-  'Driver cores': 'Driver内核数',
-  'Please enter Driver cores': '请输入Driver内核数',
-  'Driver memory': 'Driver内存数',
+  'Driver Cores': 'Driver核心数',
+  'Please enter Driver cores': '请输入Driver核心数',
+  'Driver Memory': 'Driver内存数',
   'Please enter Driver memory': '请输入Driver内存数',
   'Executor Number': 'Executor数量',
   'Please enter Executor number': '请输入Executor数量',
-  'Executor memory': 'Executor内存数',
+  'The Executor number should be a positive integer': 'Executor数量为正整数',
+  'Executor Memory': 'Executor内存数',
   'Please enter Executor memory': '请输入Executor内存数',
-  'Executor cores': 'Executor内核数',
-  'Please enter Executor cores': '请输入Executor内核数',
-  'The Executor Number should be a positive integer': 'Executor数量为正整数',
+  'Executor Cores': 'Executor核心数',
+  'Please enter Executor cores': '请输入Executor核心数',
   'Memory should be a positive integer': '内存数为数字',
-  'Core number should be positive integer': '内核数为正整数',
+  'Core number should be positive integer': '核心数为正整数',
+  'Flink Version': 'Flink版本',
+  'JobManager Memory': 'JobManager内存数',
   'Please enter JobManager memory': '请输入JobManager内存数',
+  'TaskManager Memory': 'TaskManager内存数',
   'Please enter TaskManager memory': '请输入TaskManager内存数',
+  'Slot Number': 'Slot数量',
   'Please enter Slot number': '请输入Slot数量',
+  'TaskManager Number': 'TaskManager数量',
   'Please enter TaskManager number': '请输入TaskManager数量',
+  'App Name': '任务名称',
   'Please enter app name(optional)': '请输入任务名称(选填)',
   'SQL Type': 'sql类型',
   Title: '主题',
@@ -543,12 +549,6 @@ export default {
   'Next five execution times': '接下来五次执行时间',
   'Execute time': '执行时间',
   'Complement range': '补数范围',
-  'Flink Version': 'Flink版本',
-  'Slot Number': 'Slot数量',
-  'TaskManager Number': 'TaskManager数量',
-  'JobManager Memory': 'JobManager内存数',
-  'TaskManager Memory': 'TaskManager内存数',
-  'App Name': '任务名称',
   'Http Url': '请求地址',
   'Http Method': '请求类型',
   'Http Parameters': '请求参数',

From 143fca1b61c7050e7ea26d5358c61d229ef2bba9 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Fri, 5 Feb 2021 11:55:39 +0800
Subject: [PATCH 4/7] [dev][cherry-pick-4660][ui]Fix too many resources to
 display (#4664)

---
 .../src/js/module/components/transfer/resource.vue    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
index d7df3fa79c..959142cb4f 100644
--- a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
+++ b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
@@ -24,10 +24,10 @@
                 <el-button size="mini" value="udfResource" @click="_ckUDf">{{$t('UDF resources')}}</el-button>
             </el-button-group>
         </div>
-        <treeselect v-show="checkedValue=='fileResource'" v-model="selectFileSource" :multiple="true"  maxHeight="200" :options="fileList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
+        <treeselect v-show="checkedValue=='fileResource'" v-model="selectFileSource" :multiple="true"  maxHeight="260" :options="fileList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
-        <treeselect v-show="checkedValue=='udfResource'" v-model="selectUdfSource" :multiple="true" maxHeight="200" :options="udfList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
+        <treeselect v-show="checkedValue=='udfResource'" v-model="selectUdfSource" :multiple="true" maxHeight="260" :options="udfList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -302,4 +302,11 @@
       float: left;
     }
   }
+  .vue-treeselect__menu {
+    max-height: 200px!important;
+  }
+  .vue-treeselect__multi-value {
+    max-height: 260px!important;
+    overflow-y: auto!important;
+  }
 </style>

From 03c7e1f368e1fc995155140b2b4d3960b4475c96 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Fri, 5 Feb 2021 14:09:02 +0800
Subject: [PATCH 5/7] [Fix][UDF] Fix udf jar path not exist when fs.defaultFS
 starts with file:/// (#4692)

---
 .../org/apache/dolphinscheduler/server/utils/UDFUtils.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java
index 1bc79ab94e..71234f5539 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java
@@ -73,13 +73,11 @@ public class UDFUtils {
         String resourceFullName;
         Set<Map.Entry<UdfFunc,String>> entries = udfFuncTenantCodeMap.entrySet();
         for (Map.Entry<UdfFunc,String> entry:entries){
+            String prefixPath = defaultFS.startsWith("file://") ? "file://" : defaultFS;
             String uploadPath = HadoopUtils.getHdfsUdfDir(entry.getValue());
-            if (!uploadPath.startsWith("hdfs:")) {
-                uploadPath = defaultFS + uploadPath;
-            }
             resourceFullName = entry.getKey().getResourceName();
             resourceFullName = resourceFullName.startsWith("/") ? resourceFullName : String.format("/%s",resourceFullName);
-            sqls.add(String.format("add jar %s%s", uploadPath, resourceFullName));
+            sqls.add(String.format("add jar %s%s%s", prefixPath, uploadPath, resourceFullName));
         }
 
     }

From 369ff6fd0367d619630c5ba985b29a64f222dfe3 Mon Sep 17 00:00:00 2001
From: Yibo-Liu <812072237@qq.com>
Date: Fri, 5 Feb 2021 21:47:10 +0800
Subject: [PATCH 6/7] first PR (#4699)

---
 .../server/master/runner/MasterTaskExecThread.java            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
index 1ed2aaabf9..e22462c60a 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
@@ -52,7 +52,9 @@ public class MasterTaskExecThread extends MasterBaseTaskExecThread {
      */
     private TaskInstanceCacheManager taskInstanceCacheManager;
 
-
+    /**
+     *  netty executor manager
+     */
     private NettyExecutorManager nettyExecutorManager;
 
 

From 773909efe2fd2f2a6c8aceab923565f7c60f7d5e Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Fri, 5 Feb 2021 22:17:51 +0800
Subject: [PATCH 7/7] [Improvement][Common] Add more resource suffix (#4683)

---
 .../main/java/org/apache/dolphinscheduler/common/Constants.java | 2 +-
 dolphinscheduler-common/src/main/resources/common.properties    | 2 +-
 .../conf/home/pages/resource/pages/file/pages/_source/common.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index f0c7c40c49..1252311b97 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -146,7 +146,7 @@ public final class Constants {
      */
     public static final String RESOURCE_VIEW_SUFFIXS = "resource.view.suffixs";
 
-    public static final String RESOURCE_VIEW_SUFFIXS_DEFAULT_VALUE = "txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties";
+    public static final String RESOURCE_VIEW_SUFFIXS_DEFAULT_VALUE = "txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js";
 
     /**
      * development.state
diff --git a/dolphinscheduler-common/src/main/resources/common.properties b/dolphinscheduler-common/src/main/resources/common.properties
index 1ff62a20c3..ed9a02739d 100644
--- a/dolphinscheduler-common/src/main/resources/common.properties
+++ b/dolphinscheduler-common/src/main/resources/common.properties
@@ -37,7 +37,7 @@ login.user.keytab.username=hdfs-mycluster@ESZ.COM
 login.user.keytab.path=/opt/hdfs.headless.keytab
 
 #resource.view.suffixs
-#resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties
+#resource.view.suffixs=txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js
 
 # if resource.storage.type=HDFS, the user need to have permission to create directories under the HDFS root path
 hdfs.root.user=hdfs
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
index 8ddb75fed3..9bc68af081 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
@@ -18,6 +18,6 @@
 /**
  * Create file type
  */
-const filtTypeArr = ['txt', 'log', 'sh', 'bat', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties', 'json', 'yml', 'yaml', 'ini', 'js', 'css', 'html']
+const filtTypeArr = ['txt', 'log', 'sh', 'bat', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties', 'json', 'yml', 'yaml', 'ini', 'js']
 
 export { filtTypeArr }