|
@@ -174,7 +174,7 @@ function getRootElement(children,rootObj){
|
|
}
|
|
}
|
|
|
|
|
|
export const formulaStringToArray = (text,elemap,formulaMap) => {
|
|
export const formulaStringToArray = (text,elemap,formulaMap) => {
|
|
-debugger
|
|
|
|
|
|
+// debugger
|
|
// 匹配开始的FC.xxx(
|
|
// 匹配开始的FC.xxx(
|
|
const startFCRegExp = /^FC\.([a-zA-Z0-9]+)\(/;
|
|
const startFCRegExp = /^FC\.([a-zA-Z0-9]+)\(/;
|
|
const startBracketsReg = /^\(/;//左括号
|
|
const startBracketsReg = /^\(/;//左括号
|
|
@@ -300,7 +300,7 @@ debugger
|
|
}
|
|
}
|
|
|
|
|
|
let content =contentStack[contentStack.length - 1];
|
|
let content =contentStack[contentStack.length - 1];
|
|
- if(!!content){
|
|
|
|
|
|
+ if(content){
|
|
content.children.push(obj);
|
|
content.children.push(obj);
|
|
}else{
|
|
}else{
|
|
//如果没有,那就是在最上层
|
|
//如果没有,那就是在最上层
|