Browse Source

enhance form verify (#5696)

2.0.7-release
kyoty 4 years ago committed by GitHub
parent
commit
3d8d1ebe67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
  3. 2
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  4. 2
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

4
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')}`) this.$message.warning(`${i18n.$t('Please enter group name')}`)
return false return false
} }
if (this.alertInstanceIds) {
this.$message.warning(`${i18n.$t('Select Alarm plugin instance')}`)
return false
}
return true return true
}, },
_submit () { _submit () {

4
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')}`) this.$message.warning(`${i18n.$t('Please enter group name')}`)
return false return false
} }
if (!this.pluginDefineId) {
this.$message.warning(`${i18n.$t('Select Alarm plugin')}`)
return false
}
return true return true
}, },
// Select plugin // Select plugin

2
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@ -231,10 +231,12 @@ export default {
'Alarm instance name': 'Alarm instance name', 'Alarm instance name': 'Alarm instance name',
'Alarm plugin name': 'Alarm plugin name', 'Alarm plugin name': 'Alarm plugin name',
'Select plugin': 'Select plugin', 'Select plugin': 'Select plugin',
'Select Alarm plugin': 'Please select an Alarm plugin',
'Please enter group name': 'Please enter group name', 'Please enter group name': 'Please enter group name',
'Instance parameter exception': 'Instance parameter exception', 'Instance parameter exception': 'Instance parameter exception',
'Group Type': 'Group Type', 'Group Type': 'Group Type',
'Alarm plugin instance': 'Alarm plugin instance', 'Alarm plugin instance': 'Alarm plugin instance',
'Select Alarm plugin instance': 'Please select an Alarm plugin instance',
Remarks: 'Remarks', Remarks: 'Remarks',
SMS: 'SMS', SMS: 'SMS',
'Managing Users': 'Managing Users', 'Managing Users': 'Managing Users',

2
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.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 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': '请选择告警插件实例',
Remarks: '备注', Remarks: '备注',
SMS: '短信', SMS: '短信',
'Managing Users': '管理用户', 'Managing Users': '管理用户',

Loading…
Cancel
Save