Browse Source

小数位限制修改

laiguoran 4 years ago
parent
commit
8525c8b19c
1 changed files with 4 additions and 4 deletions
  1. 4 4
      app/public/js/material_exponent.js

+ 4 - 4
app/public/js/material_exponent.js

@@ -158,8 +158,8 @@ $(document).ready(() => {
                         return;
                     }
                     const num = parseFloat(validText);
-                    if (validText !== null && (num < 0 || num > 100 || !/^\d+(\.\d{1,3})?$/.test(num))) {
-                        toastr.error('请输入0~100范围内并且小于3位小数的浮点数');
+                    if (validText !== null && (num < 0 || !/^(\d{1,10}|\d{1,7}\.\d{1,3})?$/.test(num))) {
+                        toastr.error('请输入10位以内有效数字并且小于3位小数的浮点数');
                         SpreadJsObj.reLoadRowData(info.sheet, info.row);
                         return;
                     }
@@ -232,7 +232,7 @@ $(document).ready(() => {
             const hint = {
                 cellError: {type: 'error', msg: '粘贴内容超出了表格范围'},
                 numberExpr: {type: 'error', msg: '不能粘贴其它非数字类型字符'},
-                numberCan: {type: 'error', msg: '请粘贴0~100范围内并且小于3位小数的浮点数'},
+                numberCan: {type: 'error', msg: '请粘贴10位以内有效数字并且小于3位小数的浮点数'},
                 numberCan2: {type: 'error', msg: '请粘贴0~1范围内并且小于3位小数的浮点数'},
                 weightNumberCan: {type: 'error', msg: '粘贴的加权系数总和不能大于1'},
             };
@@ -282,7 +282,7 @@ $(document).ready(() => {
                             continue;
                         }
                         const num = parseFloat(validText);
-                        if (validText !== null && (num < 0 || num > 100 || !/^\d+(\.\d{1,3})?$/.test(num))) {
+                        if (validText !== null && (num < 0 || !/^(\d{1,10}|\d{1,7}\.\d{1,3})?$/.test(num))) {
                             toastMessageUniq(getPasteHint(hint.numberCan, hintRow));
                             bPaste = false;
                             continue;