From 14b6d196d85da48d9e988832b7f5209b8fa092a4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 29 七月 2023 15:03:10 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/utils.jsx | 46 ++++++++++++++++++----------------------------
1 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index d4d1a6c..e1efa0b 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -127,37 +127,27 @@
}
})
+ _regoptions.push({
+ reg: new RegExp('@orderBy@', 'ig'),
+ }, {
+ reg: new RegExp('@UserName@', 'ig'),
+ }, {
+ reg: new RegExp('@FullName@', 'ig'),
+ }, {
+ reg: new RegExp('@pageSize@', 'ig'),
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ })
+
+ _regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, '0')
+ _customScript = _customScript.replace(item.reg, '0')
+ })
+
let _search = defSearch
- if (_dataresource) {
- _regoptions.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, '0')
- })
-
+ if (setting.queryType === 'statistics') {
_search = ''
- }
-
- let originscript = _customScript
-
- if (_customScript) {
- _regoptions.push({
- reg: new RegExp('@orderBy@', 'ig'),
- }, {
- reg: new RegExp('@UserName@', 'ig'),
- }, {
- reg: new RegExp('@FullName@', 'ig'),
- })
- if (setting.laypage === 'true') {
- _regoptions.push({
- reg: new RegExp('@pageSize@', 'ig'),
- }, {
- reg: new RegExp('@pageIndex@', 'ig'),
- })
- }
- _regoptions.forEach(item => {
- _customScript = _customScript.replace(item.reg, '0')
- originscript = originscript.replace(item.reg, '0')
- })
}
let sumSql = ''
--
Gitblit v1.8.0