|
@@ -174,12 +174,13 @@ function getRootElement(children,rootObj){
|
|
|
}
|
|
|
|
|
|
export const formulaStringToArray = (text,elemap,formulaMap) => {
|
|
|
-
|
|
|
+debugger
|
|
|
// 匹配开始的FC.xxx(
|
|
|
const startFCRegExp = /^FC\.([a-zA-Z0-9]+)\(/;
|
|
|
const startBracketsReg = /^\(/;//左括号
|
|
|
const endBracketsReg = /^\)/;//右括号
|
|
|
- const elementReg = /^E\[(.[^\]]+_.[^\]]+)\]/;//元素
|
|
|
+ //const elementReg = /^E\[(.[^\]]+_.[^\]]+)\]/;//元素
|
|
|
+ const elementReg = /^E\[([^\]]+)\]/;//元素
|
|
|
const paramReg = /^WP\[(.[^\]]+)\]/;//节点参数
|
|
|
const commaReg = /^,/;//逗号
|
|
|
const operatorReg = /^ (\+|-|\*|%|\/) /;//加减乘除
|