Sfoglia il codice sorgente

兼容方法名中有数字

gangyj 2 anni fa
parent
commit
c2409d41a3
2 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 2 2
      src/views/formula/edit.vue
  2. 1 1
      src/views/formula/formulaStringToArray.js

+ 2 - 2
src/views/formula/edit.vue

@@ -477,7 +477,7 @@ export default {
     },
     fromcurNode:{
       type:Object,
-      default:{}
+      default:() => ({})
     }
   },
   data() {
@@ -531,7 +531,7 @@ export default {
 
       symbolReg:/(\+|-|\*|\/)(.+)/,
       operatorReg : /^\+|-|\*|%/,//加减乘除
-      startFCRegExp : /^FC\.([a-zA-Z]+)\(/,// 匹配开始的FC.xxx(
+      startFCRegExp : /^FC\.([a-zA-Z0-9]+)\(/,// 匹配开始的FC.xxx(
 
       componentMap:{
         '日期偏移':'date-deviation',

+ 1 - 1
src/views/formula/formulaStringToArray.js

@@ -173,7 +173,7 @@ function getRootElement(children,rootObj){
 export const formulaStringToArray = (text,elemap,formulaMap) => {
 
   // 匹配开始的FC.xxx(
-  const startFCRegExp = /^FC\.([a-zA-Z]+)\(/;
+  const startFCRegExp = /^FC\.([a-zA-Z0-9]+)\(/;
   const startBracketsReg = /^\(/;//左括号
   const endBracketsReg = /^\)/;//右括号
   const elementReg = /^E\[(.[^\]]+_.[^\]]+)\]/;//元素