diff --git a/src/resources/plugins/TsForm/TsValidtor.js b/src/resources/plugins/TsForm/TsValidtor.js index cef7a5cf4a7c512bf35383b86feb61ed592fafba..1c8ca14724556a64b18fde021bb36d48f740e05c 100755 --- a/src/resources/plugins/TsForm/TsValidtor.js +++ b/src/resources/plugins/TsForm/TsValidtor.js @@ -102,6 +102,19 @@ let validtor = { trigger: 'change', message: $t('message.pleaseentertruetarget', {target: $t('page.ipaddress')}) }, + domainOrIP: { + validator: function(rule, value) { + // 校验域名或者IP是否合法 + if (!utils.isEmpty(value)) { + const hostRegex = /^((([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,})|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.|$)){4})$/; + return hostRegex.test(value); + } else { + return true; + } + }, + trigger: 'change', + message: $t('message.pleaseentertruetarget', {target: $t('page.domain') + $t('page.or') + 'IP'}) + }, ipAndPort: { validator: function(rule, value) { let hasComma = value.indexOf('\n'); // 逗号 diff --git a/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue b/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue index ee69e1ea50772648c3fbfd7252db9becbd1c7867..1e807248fc6c922ee4e432c88334617d215770b1 100644 --- a/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue +++ b/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue @@ -75,7 +75,7 @@ export default { name: 'ip', type: 'text', label: 'IP', - validateList: ['ip'] + validateList: ['domainOrIP'] }, { name: 'port', @@ -130,7 +130,7 @@ export default { const attrObj = res.Return || {}; const validMap = { name: ['name-special'], - ip: ['ip'], + ip: ['domainOrIP'], port: ['port'] }; this.formList.forEach((item) => {