Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415

escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

@@ -34,7 +34,7 @@
       </div>
       <div class="content" style="padding-bottom: 10px;" v-if="checkedTimeout">
         <span>
-          <x-input v-model="timeout" style="width: 128px;" maxlength="9">
+          <x-input v-model="timeout" style="width: 160px;" maxlength="9">
             <span slot="append">{{$t('Minute')}}</span>
           </x-input>
         </span>

escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue

@@ -114,12 +114,13 @@
         })
       },
       _verification () {
-        let isEn = /^\w+$/
+        let isEn = /^[0-9a-zA-Z_.-]{1,}$/
+
         if (!this.tenantCode) {
           this.$message.warning(`${i18n.$t('Please enter the tenant code in English')}`)
           return false
         }
-        if (!isEn.test(this.tenantCode) || this.tenantCode.split('')[0] === '_') {
+        if (!isEn.test(this.tenantCode) || _.startsWith(this.tenantCode, '_', 0) || _.startsWith(this.tenantCode, '.', 0)) {
           this.$message.warning(`${i18n.$t('Please enter tenant code in English')}`)
           return false
         }

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

@@ -448,5 +448,5 @@ export default {
   'Max used connections': 'Max used connections',
   'Threads running connections': 'Threads running connections',
   'Worker group': 'Worker group',
-  'Please enter a positive integer greater than 0': 'Please enter a positive integer greater than 0',
+  'Please enter a positive integer greater than 0': 'Please enter a positive integer greater than 0'
 }

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

@@ -448,5 +448,5 @@ export default {
   'Max used connections': '同时使用连接最大数',
   'Threads running connections': '数据库当前活跃连接数',
   'Worker group': 'Worker分组',
-  'Please enter a positive integer greater than 0': '请输入大于 0 的正整数',
+  'Please enter a positive integer greater than 0': '请输入大于 0 的正整数'
 }