You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/06/27 11:03:24 UTC
[dolphinscheduler] branch dev updated: enhance form verify (#5696)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 3d8d1eb enhance form verify (#5696)
3d8d1eb is described below
commit 3d8d1ebe67cc3331ff5fda649675b5c61a04df5f
Author: kyoty <ec...@gmail.com>
AuthorDate: Sun Jun 27 19:03:18 2021 +0800
enhance form verify (#5696)
---
.../home/pages/security/pages/warningGroups/_source/createWarning.vue | 4 ++++
.../security/pages/warningInstance/_source/createWarningInstance.vue | 4 ++++
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 2 ++
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 2 ++
4 files changed, 12 insertions(+)
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 2896093..a2edec8 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
@@ -109,6 +109,10 @@
this.$message.warning(`${i18n.$t('Please enter group name')}`)
return false
}
+ if (this.alertInstanceIds) {
+ this.$message.warning(`${i18n.$t('Select Alarm plugin instance')}`)
+ return false
+ }
return true
},
_submit () {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
index 07c9faa..6e09918e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
@@ -111,6 +111,10 @@
this.$message.warning(`${i18n.$t('Please enter group name')}`)
return false
}
+ if (!this.pluginDefineId) {
+ this.$message.warning(`${i18n.$t('Select Alarm plugin')}`)
+ return false
+ }
return true
},
// Select plugin
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 19b40ad8..65db8c9 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -231,10 +231,12 @@ export default {
'Alarm instance name': 'Alarm instance name',
'Alarm plugin name': 'Alarm plugin name',
'Select plugin': 'Select plugin',
+ 'Select Alarm plugin': 'Please select an Alarm plugin',
'Please enter group name': 'Please enter group name',
'Instance parameter exception': 'Instance parameter exception',
'Group Type': 'Group Type',
'Alarm plugin instance': 'Alarm plugin instance',
+ 'Select Alarm plugin instance': 'Please select an Alarm plugin instance',
Remarks: 'Remarks',
SMS: 'SMS',
'Managing Users': 'Managing Users',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index f35c485..1a6def2 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -231,10 +231,12 @@ export default {
'Alarm instance name': '告警实例名称',
'Alarm plugin name': '告警插件名称',
'Select plugin': '选择插件',
+ 'Select Alarm plugin': '请选择告警插件',
'Please enter group name': '请输入组名称',
'Instance parameter exception': '实例参数异常',
'Group Type': '组类型',
'Alarm plugin instance': '告警插件实例',
+ 'Select Alarm plugin instance': '请选择告警插件实例',
Remarks: '备注',
SMS: '短信',
'Managing Users': '管理用户',