From 738c7b6030e64e35cd19831d95ca39b6496cc852 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 14 九月 2024 12:03:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-datamanage.js | 2 +-
src/menu/datasource/verifycard/settingform/index.jsx | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 7bacde9..7e5f409 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -441,6 +441,10 @@
{
required: true,
message: '璇疯緭鍏ラ粯璁ゆ帓搴�!'
+ },
+ {
+ pattern: /^[^'+]+$/,
+ message: '鎺掑簭涓笉鍙娇鐢╘'涓�+'
}
]
})(<Input placeholder={'ID asc, UID desc'} autoComplete="off" />)}
@@ -667,7 +671,7 @@
rules: [
{
required: true,
- message: '璇疯緭鍏ラ粯璁ゆ帓搴�!'
+ message: '璇疯緭鍏ュ瓙琛ㄥ瓧娈�!'
}
]
})(<Input placeholder={''} autoComplete="off" />)}
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 7944666..5b0c6e2 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -12,7 +12,7 @@
if (setting.dataresource) {
searchKeys = []
- if (search.length) {
+ if (search.length && setting.queryType !== 'statistics') {
searchKeys = Utils.getSearchkeys(search)
}
--
Gitblit v1.8.0