test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-04 13:17:50 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

[fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers

Browse Source
This commit is contained in:
break60 2020-10-09 15:42:47 +08:00
parent d946717fcb
commit cad4420242
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
View File

@ -30,7 +30,7 @@
:disabled="item ? true : false"
v-model="tenantCode"
maxlength="60"
:placeholder="$t('Please enter name')">
:placeholder="$t('Please enter tenant code')">
</x-input>
</template>
</m-list-box-f>
@ -41,7 +41,7 @@
type="input"
v-model="tenantName"
maxlength="60"
:placeholder="$t('Please enter name')"
:placeholder="$t('Please enter tenant Name')"
autocomplete="off">
</x-input>
</template>
@ -88,7 +88,7 @@
store,
queueList: [],
queueId: '',
tenantCode: '',
tenantCode: null,
tenantName: '',
description: '',
}
@ -133,17 +133,20 @@
},
_verification () {
let isEn = /^[0-9a-zA-Z_.-]{1,}$/
let isNumber = /^\d+$/
let isComb =/^[0-9a-zA-Z]*$/g
if (!this.tenantCode.replace(/\s*/g,"")) {
this.$message.warning(`${i18n.$t('Please enter the tenant code in English')}`)
if(!isComb.test(this.tenantCode)) {
this.$message.warning(`${i18n.$t('The tenant code. Only letters or a combination of letters and numbers are allowed')}`)
return false
}
if (!isEn.test(this.tenantCode) || _.startsWith(this.tenantCode, '_', 0) || _.startsWith(this.tenantCode, '.', 0)) {
this.$message.warning(`${i18n.$t('Please enter tenant code in English')}`)
if(isNumber.test(this.tenantCode)) {
this.$message.warning(`${i18n.$t('The tenant code. Only letters or a combination of letters and numbers are allowed')}`)
return false
}
if (!this.tenantName.replace(/\s*/g,"")) {
this.$message.warning(`${i18n.$t('Please enter name')}`)
this.$message.warning(`${i18n.$t('Please enter tenant Name')}`)
return false
}
return true

6
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
View File

@ -173,8 +173,10 @@ export default {
'Tenant Name': 'Tenant Name',
Queue: 'Queue',
'Please select a queue': 'default is tenant association queue',
'Please enter the tenant code in English': 'Please enter the tenant code in English',
'Please enter tenant code in English': 'Please enter tenant code in English',
'Please enter tenant code': 'Please enter tenant code',
'Please enter tenant Name': 'Please enter tenant Name',
'The tenant code. Only letters or a combination of letters and numbers are allowed': 'The tenant code. Only letters or a combination of letters and numbers are allowed',
'The tenant code cannot be all numbers': 'The tenant code cannot be all numbers',
'Edit User': 'Edit User',
Tenant: 'Tenant',
Email: 'Email',

4
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
View File

@ -177,7 +177,9 @@ export default {
'Tenant Name': '租户名称',
Queue: '队列',
'Please enter the tenant code in English': '请输入租户编码只允许英文',
'Please enter tenant code in English': '请输入英文租户编码',
'Please enter tenant code': '请输入租户编码',
'Please enter tenant Name': '请输入租户名称',
'The tenant code. Only letters or a combination of letters and numbers are allowed': '租户编码只允许字母或字母与数字组合',
'Edit User': '编辑用户',
Tenant: '租户',
Email: '邮件',