|
@@ -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);
|