瀏覽代碼

修复表达式%问题

ellisran 1 年之前
父節點
當前提交
334468781c
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      app/public/js/change_information_set.js
  2. 1 1
      app/public/js/material_checklist.js
  3. 1 1
      app/public/js/material_list.js

+ 1 - 1
app/public/js/change_information_set.js

@@ -872,7 +872,7 @@ $(document).ready(() => {
                     const [valid, msg] = this._checkExprValid(expr);
                     const [valid, msg] = this._checkExprValid(expr);
                     if (!valid) return [valid, msg];
                     if (!valid) return [valid, msg];
                     data.expr = expr;
                     data.expr = expr;
-                    data.quantity = ZhCalc.calcExpr.calcExprStrRpn(expr);
+                    data.quantity = ZhCalc.calcExpr.calcExprStrRpn(expr.replace('%', '/100'));
                     // const ce = new CalcEvalMin();
                     // const ce = new CalcEvalMin();
                     // data.quantity = ce.eval(expr);
                     // data.quantity = ce.eval(expr);
                     // console.log(data.quantity);
                     // console.log(data.quantity);

+ 1 - 1
app/public/js/material_checklist.js

@@ -875,7 +875,7 @@ $(document).ready(() => {
                         const [valid, msg] = this._checkExprValid(expr);
                         const [valid, msg] = this._checkExprValid(expr);
                         if (!valid) return [valid, msg];
                         if (!valid) return [valid, msg];
                         data.expr = expr;
                         data.expr = expr;
-                        data.quantity = ZhCalc.calcExpr.calcExprStrRpn(expr);
+                        data.quantity = ZhCalc.calcExpr.calcExprStrRpn(expr.replace('%', '/100'));
                     }
                     }
                 } else {
                 } else {
                     data.quantity = 0;
                     data.quantity = 0;

+ 1 - 1
app/public/js/material_list.js

@@ -1518,7 +1518,7 @@ $(document).ready(() => {
                         const [valid, msg] = this._checkExprValid(expr);
                         const [valid, msg] = this._checkExprValid(expr);
                         if (!valid) return [valid, msg];
                         if (!valid) return [valid, msg];
                         data.expr = expr;
                         data.expr = expr;
-                        data.quantity = ZhCalc.calcExpr.calcExprStrRpn(expr);
+                        data.quantity = ZhCalc.calcExpr.calcExprStrRpn(expr.replace('%', '/100'));
                         // const ce = new CalcEvalMin();
                         // const ce = new CalcEvalMin();
                         // data.quantity = ce.eval(expr);
                         // data.quantity = ce.eval(expr);
                         // console.log(data.quantity);
                         // console.log(data.quantity);