Merge pull request #2852 from break60/dev-1.3.0

mr resource display and create user username length cannot be less th…

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

@@ -78,7 +78,7 @@
     <m-list-box>
       <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
-        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please select resources')">
+        <treeselect  v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :disabled="isDetails" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@@ -53,11 +53,11 @@
             <span>{{$t('fault-tolerant sign')}}</span>
           </th>
           <th scope="col" style="min-width: 135px">
-            <span>{{$t('host')}}</span>
+            <span>{{$t('Executor')}}</span>
           </th>
-          <th scope="col" style="min-width: 60px">
+          <th scope="col" style="min-width: 100px">
-            <div style="width: 60px">
+            <div style="width: 100px">
-              <span>{{$t('Executor')}}</span>
+              <span>{{$t('host')}}</span>
             </div>
           </th>
           <th scope="col" style="min-width: 210px">
@@ -92,11 +92,11 @@
           <td width="70"><span>{{item.runTimes}}</span></td>
           <td><span>{{item.recovery}}</span></td>
           <td>
-            <span v-if="item.host">{{item.host}}</span>
+            <span v-if="item.executorName">{{item.executorName}}</span>
             <span v-else>-</span>
           </td>
           <td>
-            <span style="word-break: break-all" v-if="item.executorName">{{item.executorName}}</span>
+            <span v-if="item.host" style="word-break: break-all">{{item.host}}</span>
             <span v-else>-</span>
           </td>
           <td style="z-index: inherit;">

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@@ -152,8 +152,13 @@
         let regPhone = /^1(3|4|5|6|7|8)\d{9}$/; // eslint-disable-line
 
         let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、0-9A-Za-z]{6,22}$/;
-
+        
+        let userNameLength = this.userName.length
         // user name
+        if (userNameLength<3 || userNameLength>39) {
+          this.$message.warning(`${i18n.$t('User name length is between 3 and 39')}`)
+          return false
+        }
         if (!this.userName.replace(/\s*/g,"")) {
           this.$message.warning(`${i18n.$t('Please enter user name')}`)
           return false

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

@@ -594,5 +594,6 @@ export default {
   'Unauthorized or deleted resources': 'Unauthorized or deleted resources',
   'Please delete all non-existent resources': 'Please delete all non-existent resources',
   'The Worker group no longer exists, please select the correct Worker group!': 'The Worker group no longer exists, please select the correct Worker group!',
-  'Please confirm whether the workflow has been saved before downloading': 'Please confirm whether the workflow has been saved before downloading'
+  'Please confirm whether the workflow has been saved before downloading': 'Please confirm whether the workflow has been saved before downloading',
+  'User name length is between 3 and 39': 'User name length is between 3 and 39'
 }

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

@@ -594,5 +594,6 @@ export default {
   'Unauthorized or deleted resources': '未授权或已删除资源',
   'Please delete all non-existent resources': '请删除所有未授权或已删除资源',
   'The Worker group no longer exists, please select the correct Worker group!': '该Worker分组已经不存在，请选择正确的Worker分组！',
-  'Please confirm whether the workflow has been saved before downloading': '下载前请确定工作流是否已保存'
+  'Please confirm whether the workflow has been saved before downloading': '下载前请确定工作流是否已保存',
+  'User name length is between 3 and 39': '用户名长度在3～39之间'
 }