|
|
@@ -185,9 +185,9 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
|
|
|
const commaReg = /^,/;//逗号
|
|
|
const operatorReg = /^ (\+|-|\*|%|\/) /;//加减乘除
|
|
|
// const wordReg = /^[\u4e00-\u9fa5\w0-9'"-]+/;//文本
|
|
|
- const wordReg = /^[\u4e00-\u9fa5\{\}\w\\.0-9'"-]+/;//文本
|
|
|
+ // const wordReg = /^[\u4e00-\u9fa5\{\}\w\\.0-9'"-]+/;//文本
|
|
|
const sxReg = /^[|]/; // 匹配字符串开头竖线
|
|
|
-
|
|
|
+ const wordReg = /^[±\u4e00-\u9fa5\{\}\w\\.0-9'"-]+/; // 新增±符号到文本匹配正则
|
|
|
// const logicalReg = /^(>=|<=|>|<|=|&&)/;//逻辑符号
|
|
|
const logicalReg = /^(>=|<=|>|<|=|&&|\|)/;
|
|
|
|