+
+
@@ -154,7 +155,8 @@
projectId: this.id,
startDate: '',
endDate: ''
- }
+ },
+ msg: ''
}
},
props: {
@@ -297,7 +299,7 @@
this.isLoading = false
}, 800)
}).catch(e => {
- console.log(e)
+ this.msg = e.msg || 'error'
this.isLoading = false
})
}
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
index f8523bd100..cb022f0025 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
@@ -114,12 +114,12 @@
})
},
_verification () {
- let isEn = /^[A-Za-z]+$/
+ let isEn = /^\w+$/
if (!this.tenantCode) {
this.$message.warning(`${i18n.$t('Please enter the tenant code in English')}`)
return false
}
- if (!isEn.test(this.tenantCode)) {
+ if (!isEn.test(this.tenantCode) || this.tenantCode.split('')[0] === '_') {
this.$message.warning(`${i18n.$t('Please enter tenant code in English')}`)
return false
}
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
index 4e57c0e7bd..44c4f19b2a 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
@@ -127,7 +127,7 @@
_verification () {
let regEmail = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line
// Mobile phone number regular
- let regPhone = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/; // eslint-disable-line
+ let regPhone = /^1(3|4|5|6|7|8)\d{9}$/; // eslint-disable-line
// user name
if (!this.userName) {