Browse Source

修复bug

ellisran 17 hours atrás
parent
commit
88298c7d81
1 changed files with 8 additions and 4 deletions
  1. 8 4
      app/public/js/material_exponent.js

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

@@ -310,7 +310,8 @@ $(document).ready(() => {
                         SpreadJsObj.reLoadRowData(info.sheet, info.row);
                         return;
                     } else if (validText !== null) {
-                        const reg = new RegExp("^(\\d{1,10}\\.\\d{1,"+ materialExponentDecimal.up +"})?$");
+                        const up = Number(materialExponentDecimal.up);
+                        const reg = new RegExp(up > 0 ? `^(\\d{1,10}\\.\\d{1,${up}})?$` : `^(\\d{1,10})?$`);
                         if(!Number.isInteger(num) && !reg.test(num)) {
                             toastr.warning('已保留' + materialExponentDecimal.up + '位小数');
                         } else if (validText.toString().length > 11) {
@@ -328,7 +329,8 @@ $(document).ready(() => {
                         return;
                     }
                     let num = parseFloat(validText);
-                    const reg = new RegExp("^\\d+(\\.\\d{1,"+ materialExponentDecimal.qty +"})?$");
+                    const qty = Number(materialExponentDecimal.qty);
+                    const reg = new RegExp(qty > 0 ? `^\\d+(\\.\\d{1,${qty}})?$` : `^\\d+$`);
                     if (validText !== null && (num < 0 || num >= 1)) {
                         toastr.error('请输入0~1范围内并且小于' + materialExponentDecimal.qty +'位小数的浮点数');
                         SpreadJsObj.reLoadRowData(info.sheet, info.row);
@@ -526,7 +528,8 @@ $(document).ready(() => {
                             bPaste = false;
                             continue;
                         } else if (validText !== null) {
-                            const reg = new RegExp("^(\\d{1,10}\\.\\d{1,"+ materialExponentDecimal.up +"})?$");
+                            const up = Number(materialExponentDecimal.up);
+                            const reg = new RegExp(up > 0 ? `^(\\d{1,10}\\.\\d{1,${up}})?$` : `^(\\d{1,10})?$`);
                             if(!Number.isInteger(num) && !reg.test(num)) {
                                 toastMessageUniq(getPasteHint(hint.numberCanUp, hintRow));
                             } else if (validText.toString().length > 11) {
@@ -544,7 +547,8 @@ $(document).ready(() => {
                             continue;
                         }
                         let num = parseFloat(validText);
-                        const reg = new RegExp("^\\d+(\\.\\d{1,"+ materialExponentDecimal.qty +"})?$");
+                        const qty = Number(materialExponentDecimal.qty);
+                        const reg = new RegExp(qty > 0 ? `^\\d+(?:\\.\\d{1,${qty}})?$` : `^\\d+$`);
                         if (validText !== null && (num < 0 || num >= 1)) {
                             toastMessageUniq(getPasteHint(hint.numberCan2, hintRow));
                             bPaste = false;