Browse Source

feat: 工程量表达式中,允许输入“{、}”,花括号内的内容不参与计算

zhangweicheng 4 years ago
parent
commit
36e0efaccb
1 changed files with 2 additions and 0 deletions
  1. 2 0
      web/building_saas/main/js/views/quantity_edit_view.js

+ 2 - 0
web/building_saas/main/js/views/quantity_edit_view.js

@@ -179,6 +179,8 @@ let quantityEditObj = {
         }
         }
         try {
         try {
             let value = undefined;
             let value = undefined;
+            //2021-1-14 工程量表达式中,允许输入“{、}”,花括号内的内容不参与计算,用户输入备注。如:“QDL*0.23{厚度}”、“10{长度}*5.8{宽度}”。
+            evalString = replaceAll("\{[^\}]*\}","",evalString);//[^\}] 表示匹配非}
             if(evalString&&evalString!=""){
             if(evalString&&evalString!=""){
                 let exp = new Expression('');
                 let exp = new Expression('');
                 exp.Expression(evalString);
                 exp.Expression(evalString);