From 79e738d704f8acb75e8f36914a8da7a705bf351f Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 23 Apr 2022 16:11:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/validatorRulesTemplate/core.ftl | 99 +++++++++---------- .../vue/modules/${entityName}Form.vuei | 2 +- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl index ba233e33..38e4fc58 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl @@ -1,58 +1,57 @@ <#include "../utils.ftl"> <#if po.isShow == 'Y' && poHasCheck(po)> <#if po.fieldName != 'id'> - ${po.fieldName}: [ + ${po.fieldName}: [ <#assign fieldValidType = po.fieldValidType!''> <#-- 非空校验 --> - <#if po.nullable == 'N' || fieldValidType == '*'> - { required: true, message: '请输入${po.filedComment}!'}, - <#elseif fieldValidType!=''> - { required: false}, - + <#if po.nullable == 'N' || fieldValidType == '*'> + { required: true, message: '请输入${po.filedComment}!'}, + <#elseif fieldValidType!=''> + { required: false}, + <#-- 唯一校验 --> - <#if fieldValidType == 'only'> - { validator: (rule, value, callback) => validateDuplicateValue(<#if sub?default("")?trim?length gt 1>'${sub.tableName}'<#else>'${tableName}', '${po.fieldDbName}', value, this.model.id, callback)}, - <#-- 6到16位数字 --> - <#elseif fieldValidType == 'n6-16'> - { pattern: /^\d{6,16}$/, message: '请输入6到16位数字!'}, - <#-- 6到16位任意字符 --> - <#elseif fieldValidType == '*6-16'> - { pattern: /^.{6,16}$/, message: '请输入6到16位任意字符!'}, - <#-- 6到18位字符串 --> - <#elseif fieldValidType == 's6-18'> - { pattern: /^.{6,18}$/, message: '请输入6到18位任意字符!'}, - <#-- 网址 --> - <#elseif fieldValidType == 'url'> - { pattern: /^((ht|f)tps?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\/~+#]*[\w\-@?^=%&\/~+#])?$/, message: '请输入正确的网址!'}, - <#-- 电子邮件 --> - <#elseif fieldValidType == 'e'> - { pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'}, - <#-- 手机号码 --> - <#elseif fieldValidType == 'm'> - { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, - <#-- 邮政编码 --> - <#elseif fieldValidType == 'p'> - { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'}, - <#-- 字母 --> - <#elseif fieldValidType == 's'> - { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'}, - <#-- 数字 --> - <#elseif fieldValidType == 'n'> - { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'}, - <#-- 整数 --> - <#elseif fieldValidType == 'z'> - { pattern: /^-?\d+$/, message: '请输入整数!'}, - <#-- 金额 --> - <#elseif fieldValidType == 'money'> - { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'}, - <#-- 正则校验 --> - <#elseif fieldValidType != '' && fieldValidType != '*'> - { pattern: '${fieldValidType}', message: '不符合校验规则!'}, - <#-- 无校验 --> - <#else> - <#t> + <#if fieldValidType == 'only'> + { validator: (rule, value, callback) => validateDuplicateValue(<#if sub?default("")?trim?length gt 1>'${sub.tableName}'<#else>'${tableName}', '${po.fieldDbName}', value, this.model.id, callback)}, + <#-- 6到16位数字 --> + <#elseif fieldValidType == 'n6-16'> + { pattern: /^\d{6,16}$/, message: '请输入6到16位数字!'}, + <#-- 6到16位任意字符 --> + <#elseif fieldValidType == '*6-16'> + { pattern: /^.{6,16}$/, message: '请输入6到16位任意字符!'}, + <#-- 6到18位字符串 --> + <#elseif fieldValidType == 's6-18'> + { pattern: /^.{6,18}$/, message: '请输入6到18位任意字符!'}, + <#-- 网址 --> + <#elseif fieldValidType == 'url'> + { pattern: /^((ht|f)tps?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\/~+#]*[\w\-@?^=%&\/~+#])?$/, message: '请输入正确的网址!'}, + <#-- 电子邮件 --> + <#elseif fieldValidType == 'e'> + { pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'}, + <#-- 手机号码 --> + <#elseif fieldValidType == 'm'> + { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, + <#-- 邮政编码 --> + <#elseif fieldValidType == 'p'> + { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'}, + <#-- 字母 --> + <#elseif fieldValidType == 's'> + { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'}, + <#-- 数字 --> + <#elseif fieldValidType == 'n'> + { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'}, + <#-- 整数 --> + <#elseif fieldValidType == 'z'> + { pattern: /^-?\d+$/, message: '请输入整数!'}, + <#-- 金额 --> + <#elseif fieldValidType == 'money'> + { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'}, + <#-- 正则校验 --> + <#elseif fieldValidType != '' && fieldValidType != '*'> + { pattern: '${fieldValidType}', message: '不符合校验规则!'}, + <#-- 无校验 --> + <#else> + <#t> + + ], - ] - }, - \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei index 5ea45c5e..cc487c61 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei @@ -152,7 +152,7 @@ return { model:{ <#include "/common/init/initValue.ftl"> - }, + }, labelCol: { xs: { span: 24 }, sm: { span: 5 },