From 67a36fa06aa691efd60be965431d206d5be7b6b2 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Thu, 24 Oct 2019 18:07:05 +0800 Subject: [PATCH] Remove blank character during verification (#1097) * Dependency workflow add dependency correction value * Download workflow instance map width adjustment and change "desc" field to "description" * The third-party library that builds the dependency is recommended to be placed in 'devDependencies' * Tree chart and Gantt chart style modification * The workflow instance can be deleted only when its status is success, failure, stop and pause. * change desc to description * Maximum width of tooltip is set to 500px, note the copyright number of login page * Delete copyright number * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page * repair * Repair security center module prompt * Remove blank character during verification * Remove blank character during verification --- .../home/pages/security/pages/queue/_source/createQueue.vue | 4 ++-- .../pages/security/pages/tenement/_source/createTenement.vue | 4 ++-- .../home/pages/security/pages/users/_source/createUser.vue | 2 +- .../security/pages/warningGroups/_source/createWarning.vue | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue index 659cec4b87..46be94c4f9 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue @@ -117,11 +117,11 @@ } }, _verification () { - if (!this.queueName) { + if (!this.queueName.replace(/\s*/g,"")) { this.$message.warning(`${i18n.$t('Please enter name')}`) return false } - if (!this.queue) { + if (!this.queue.replace(/\s*/g,"")) { this.$message.warning(`${i18n.$t('Please enter queue value')}`) return false } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue index 9f39b5eb01..4847af8827 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue @@ -132,7 +132,7 @@ _verification () { let isEn = /^[0-9a-zA-Z_.-]{1,}$/ - if (!this.tenantCode) { + if (!this.tenantCode.replace(/\s*/g,"")) { this.$message.warning(`${i18n.$t('Please enter the tenant code in English')}`) return false } @@ -140,7 +140,7 @@ this.$message.warning(`${i18n.$t('Please enter tenant code in English')}`) return false } - if (!this.tenantName) { + if (!this.tenantName.replace(/\s*/g,"")) { this.$message.warning(`${i18n.$t('Please enter name')}`) return false } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue index 2166385ad0..43e8319216 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue @@ -154,7 +154,7 @@ let regPhone = /^1(3|4|5|6|7|8)\d{9}$/; // eslint-disable-line // user name - if (!this.userName) { + if (!this.userName.replace(/\s*/g,"")) { this.$message.warning(`${i18n.$t('Please enter user name')}`) return false } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue index f9ea2e617a..c2ca85e970 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue @@ -101,7 +101,7 @@ }, _verification () { // group name - if (!this.groupName) { + if (!this.groupName.replace(/\s*/g,"")) { this.$message.warning(`${i18n.$t('Please enter group name')}`) return false }