Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/material_list.js

@@ -97,7 +97,6 @@ $(document).ready(() => {
     TipCellType.prototype.getHitInfo = function (x, y, cellStyle, cellRect, context) {
         return { x: x, y: y, row: context.row, col: context.col, cellRect: cellRect, sheetArea: context.sheetArea, sheet: context.sheet };
     };
-    console.log('hello');
     TipCellType.prototype.processMouseEnter = function (hitInfo){
         if (!this._toolTipElement) {
             var div = document.createElement("div");
@@ -850,10 +849,10 @@ $(document).ready(() => {
                         const [valid, msg] = this._checkExprValid(expr);
                         if (!valid) return [valid, msg];
                         data.expr = expr;
-                        // data.quantity = ZhCalc.calcExpr(expr);
-                        const ce = new CalcEvalMin();
-                        data.quantity = ce.eval(expr);
-                        console.log(data.quantity);
+                        data.quantity = ZhCalc.calcExpr.calcExprStrRpn(expr);
+                        // const ce = new CalcEvalMin();
+                        // data.quantity = ce.eval(expr);
+                        // console.log(data.quantity);
                     }
                 } else {
                     data.quantity = 0;

config/web.js

@@ -552,7 +552,9 @@ const JsFiles = {
                 mergeFile: 'material_exponent',
             },
             list: {
-                files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js', '/public/js/calc/calcEval.min.js'],
+                files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js',
+                    // '/public/js/calc/calcEval.min.js'
+                ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
                     '/public/js/div_resizer.js',