Merge branch 'master' into develop

This commit is contained in:
383514580 2019-11-20 20:28:29 +08:00
commit 586ba742de

View File

@ -103,6 +103,11 @@ module.exports = [
rule: /(?:^[-]?[1-9]\d{0,2}(?:$|(?:,\d{3})*(?:$|(\.\d{1,2}$))))|(?:(?:^[0](\.\d{1,2})?)|(?:^[-][0]\.\d{1,2}))$/,
examples: [100, -0.99, 3, 234.32, -1, 900, 235.09]
},
{
title: '数字千分位分隔符',
rule: /^(\-|\+)?\d+(\.\d+)?$/,
examples: [11100, -103232.99, 3666, 2334.32]
},
{
title: '数字/货币金额 (只支持正数、不支持校验千分位分隔符)',
rule: /(?:^[1-9]([0-9]+)?(?:\.[0-9]{1,2})?$)|(?:^(?:0){1}$)|(?:^[0-9]\.[0-9](?:[0-9])?$)/,