|
@@ -183,7 +183,10 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
|
|
|
const paramReg = /^WP\[(.[^\]]+)\]/;//节点参数
|
|
const paramReg = /^WP\[(.[^\]]+)\]/;//节点参数
|
|
|
const commaReg = /^,/;//逗号
|
|
const commaReg = /^,/;//逗号
|
|
|
const operatorReg = /^ (\+|-|\*|%|\/) /;//加减乘除
|
|
const operatorReg = /^ (\+|-|\*|%|\/) /;//加减乘除
|
|
|
- const wordReg = /^[\u4e00-\u9fa5\w0-9'"-]+/;//文本
|
|
|
|
|
|
|
+ // const wordReg = /^[\u4e00-\u9fa5\w0-9'"-]+/;//文本
|
|
|
|
|
+ const wordReg = /^[\u4e00-\u9fa5\w\\.0-9'"-]+/;//文本
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
const logicalReg = /^(>=|<=|>|<|=|&&)/;//逻辑符号
|
|
const logicalReg = /^(>=|<=|>|<|=|&&)/;//逻辑符号
|
|
|
|
|
|
|
|
let elementMap = JSON.parse(elemap);//元素字典
|
|
let elementMap = JSON.parse(elemap);//元素字典
|
|
@@ -409,6 +412,7 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
|
|
|
|
|
|
|
|
strIndex += word.length?word.length:2;//索引移动
|
|
strIndex += word.length?word.length:2;//索引移动
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
else{
|
|
else{
|
|
|
console.log('匹配不到：',nuText)
|
|
console.log('匹配不到：',nuText)
|
|
|
//匹配不到
|
|
//匹配不到
|
