|
@@ -1539,9 +1539,9 @@ let cbAnalyzer = {
|
|
|
if (!this.arithmeticLegal(exp)) {
|
|
|
throw "表达式含有无效字符";
|
|
|
}
|
|
|
- if (!this.baseLegal(cbTools.getFigure(node), exp)) {
|
|
|
- throw "清单基数不合法";
|
|
|
- }
|
|
|
+ // if (!this.baseLegal(cbTools.getFigure(node), exp)) {
|
|
|
+ // throw "清单基数不合法";
|
|
|
+ // }
|
|
|
if (!this.fLegal(calcBase.project.mainTree.items, exp)) {
|
|
|
throw "行引用不合法";
|
|
|
}
|
|
@@ -1771,6 +1771,7 @@ let cbParser = {
|
|
|
exps[i].compileExp = "$CBC.base('" + exps[i].orgExp + "')";
|
|
|
let regStr = exps[i].orgExp.replace(/\(/g, "\\(");
|
|
|
regStr = regStr.replace(/\)/g, "\\)");
|
|
|
+ regStr = regStr.replace(/\+/g, "\\+");
|
|
|
v = v.replace(new RegExp(regStr, "g"), exps[i].compileExp);
|
|
|
}
|
|
|
//去{}
|