Jelajahi Sumber

元素识别正则调整

yangyj 1 tahun lalu
induk
melakukan
f518809e26

+ 1 - 0
src/views/formula/formulaArrayToString.js

@@ -118,6 +118,7 @@ function isFormulaItem(ele){
 //   return fcText;
 // }
 function transformArguments(children,curEle,eleMap){
+  debugger
   let fcReg = /(FC\.\S+\()(.+)\)/;
   let fcText = '';
   for (let i = (children.length-1); i >= 0; i--) {

+ 3 - 2
src/views/formula/formulaStringToArray.js

@@ -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 = /^ (\+|-|\*|%|\/) /;//加减乘除