cal express bugfix #367

myliang · Sep 13, 2020 · cbbfdc3 · cbbfdc3
1 parent c2d97d9
commit cbbfdc3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/core/cell.js b/src/core/cell.js
@@ -88,7 +88,7 @@ const infixExprToSuffixExpr = (src) => {
           operatorStack.push(subStrs.join(''));
         } else {
           // priority: */ > +-
-          // console.log(operatorStack, c, stack);
+          // console.log('xxxx:', operatorStack, c, stack);
           if (operatorStack.length > 0 && (c === '+' || c === '-')) {
             let top = operatorStack[operatorStack.length - 1];
             if (top !== '(') stack.push(operatorStack.pop());
@@ -99,6 +99,9 @@ const infixExprToSuffixExpr = (src) => {
                 else break;
               }
             }
+          } else if (operatorStack.length > 0) {
+            const top = operatorStack[operatorStack.length - 1];
+            if (top === '*' || top === '/') stack.push(operatorStack.pop());
           }
           operatorStack.push(c);
         }

diff --git a/src/core/helper.js b/src/core/helper.js
@@ -127,6 +127,8 @@ export function numberCalc(type, a1, a2) {
     ret = num1 * num2;
   } else if (type === '/') {
     ret = num1 / num2;
+    if (digits(ret) > 5) return ret.toFixed(2);
+    return ret;
   }
   return ret.toFixed(Math.max(al1, al2));
 }