From 81d25dbaed04523ee97183e200b86d4dafb02479 Mon Sep 17 00:00:00 2001 From: songlh Date: Mon, 17 Jun 2024 14:41:24 +0800 Subject: [PATCH] fix: issue #538 --- cmdb-ui/src/components/RegexSelect/constants.js | 8 ++++---- cmdb-ui/src/lang/en.js | 2 +- cmdb-ui/src/lang/zh.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmdb-ui/src/components/RegexSelect/constants.js b/cmdb-ui/src/components/RegexSelect/constants.js index 56d1a95..49d6567 100644 --- a/cmdb-ui/src/components/RegexSelect/constants.js +++ b/cmdb-ui/src/components/RegexSelect/constants.js @@ -10,10 +10,10 @@ export const regList = () => { { id: 'landline', label: i18n.t('regexSelect.landline'), value: '^(?:(?:\\d{3}-)?\\d{8}|^(?:\\d{4}-)?\\d{7,8})(?:-\\d+)?$', message: '请输入正确座机' }, { id: 'zipCode', label: i18n.t('regexSelect.zipCode'), value: '^(0[1-7]|1[0-356]|2[0-7]|3[0-6]|4[0-7]|5[1-7]|6[1-7]|7[0-5]|8[013-6])\\d{4}$', message: '请输入正确邮政编码' }, { id: 'IDCard', label: i18n.t('regexSelect.IDCard'), value: '(^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$)|(^[1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}$)', message: '请输入正确身份证号' }, - { id: 'ip', label: i18n.t('regexSelect.ip'), value: '^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$', message: '请输入正确IP地址' }, - { id: 'email', label: i18n.t('regexSelect.email'), value: '^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\.\\w+([-.]\\w+)*$', message: '请输入正确邮箱' }, - { id: 'link', label: i18n.t('regexSelect.link'), value: '^(https:\/\/www\.|http:\/\/www\.|https:\/\/|http:\/\/)?[a-zA-Z0-9]{2,}(\.[a-zA-Z0-9]{2,})(\.[a-zA-Z0-9]{2,})?$', message: '请输入链接' }, - { id: 'monetaryAmount', label: i18n.t('regexSelect.monetaryAmount'), value: '^-?\\d+(,\\d{3})*(\.\\d{1,2})?$', message: '请输入货币金额' }, + { id: 'ip', label: i18n.t('regexSelect.ip'), value: '^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$', message: '请输入正确IP地址' }, + { id: 'email', label: i18n.t('regexSelect.email'), value: '^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$', message: '请输入正确邮箱' }, + { id: 'link', label: i18n.t('regexSelect.link'), value: '^(https:\/\/www\\.|http:\/\/www\\.|https:\/\/|http:\/\/)?[a-zA-Z0-9]{2,}(\\.[a-zA-Z0-9]{2,})(\\.[a-zA-Z0-9]{2,})?$', message: '请输入链接' }, + { id: 'monetaryAmount', label: i18n.t('regexSelect.monetaryAmount'), value: '^-?\\d+(,\\d{3})*(\\.\\d{1,2})?$', message: '请输入货币金额' }, { id: 'custom', label: i18n.t('regexSelect.custom'), value: '', message: '' } ] } diff --git a/cmdb-ui/src/lang/en.js b/cmdb-ui/src/lang/en.js index 7663723..1ef092d 100644 --- a/cmdb-ui/src/lang/en.js +++ b/cmdb-ui/src/lang/en.js @@ -160,7 +160,7 @@ export default { landline: 'landline', zipCode: 'zip code', IDCard: 'ID card', - ip: 'IP', + ip: 'IPv4', email: 'email', link: 'link', monetaryAmount: 'monetary amount', diff --git a/cmdb-ui/src/lang/zh.js b/cmdb-ui/src/lang/zh.js index 253d788..35dd460 100644 --- a/cmdb-ui/src/lang/zh.js +++ b/cmdb-ui/src/lang/zh.js @@ -160,7 +160,7 @@ export default { landline: '座机', zipCode: '邮政编码', IDCard: '身份证号', - ip: 'IP地址', + ip: 'IPv4地址', email: '邮箱', link: '链接', monetaryAmount: '货币金额',