From 74e6af017b41e7b80a9cb131a44e31c32874f3c2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 七月 2023 16:12:18 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/base-table/columns/editColumn/index.jsx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/editColumn/index.jsx b/src/menu/components/table/base-table/columns/editColumn/index.jsx
index 95e9bf5..7318054 100644
--- a/src/menu/components/table/base-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/index.jsx
@@ -416,7 +416,7 @@
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
// eslint-disable-next-line
- if (values.type === 'formula' && values.eval !== 'false' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
+ if (values.type === 'formula' && values.eval === 'true' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
let cols = []
fields.forEach(col => {
if (/^(Int|Decimal)/ig.test(col.datatype)) {
--
Gitblit v1.8.0