提交 568c1eea 编写于 作者: tao.wu's avatar tao.wu

no message

上级 938eafb1
...@@ -13,13 +13,16 @@ let checkNeedRule = (val) => { ...@@ -13,13 +13,16 @@ let checkNeedRule = (val) => {
export const checkRange = (rule, value, callback) => { export const checkRange = (rule, value, callback) => {
let min,max; let min,max;
let val = parseFloat(value); let val = parseFloat(value);
const res = new RegExp(/^[1-9]\d*$/g);
rangeJson.forEach((item)=>{ rangeJson.forEach((item)=>{
if(item.field == rule.field){ if(item.field == rule.field){
min = item.min; min = item.min;
max = item.max; max = item.max;
} }
}) })
if(((val >= min) && (val <= max)) || checkNeedRule(val)){ const ruless = ( (val >= min) && (val <= max) && res.test(value) )
if(ruless || checkNeedRule(val)){
callback() callback()
}else{ }else{
callback(new Error(`输入范围${min}~${max}`)) callback(new Error(`输入范围${min}~${max}`))
...@@ -44,7 +47,6 @@ export const checkIsInteger = (rule, value, callback) => { ...@@ -44,7 +47,6 @@ export const checkIsInteger = (rule, value, callback) => {
// const val = Number.parseInt(value); // const val = Number.parseInt(value);
// const num = /^[0-9]*[1-9][0-9]*$/.test(value); // const num = /^[0-9]*[1-9][0-9]*$/.test(value);
if(num || checkNeedRule(val)){ if(num || checkNeedRule(val)){
callback() callback()
}else{ }else{
......
...@@ -16,7 +16,7 @@ export default ($this) => { ...@@ -16,7 +16,7 @@ export default ($this) => {
type: 'number', type: 'number',
labmsg: '', labmsg: '',
slots: [{name: '支/日', type: 'append'}], slots: [{name: '支/日', type: 'append'}],
rules: [{ required: true, message: '请输入日吸烟量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }] rules: [{ required: true, message: '请输入日吸烟量', trigger: ['submit','change','blur'] },{ validator: checkRange , trigger: ['submit','change','blur'] },{ validator: checkIsInteger , trigger: ['submit','change','blur'] }]
}, },
{ {
formType: 'input', formType: 'input',
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册