From 5ff23c882da8bd2dca0848ae1a97d23f6bfecd9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 六月 2021 23:10:07 +0800
Subject: [PATCH] 2021-06-27
---
src/tabviews/custom/components/share/tabtransfer/index.jsx | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index 555b730..39b3caa 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -72,7 +72,7 @@
if (!item.format) return
if (item.dataName && (!item.pageable || (item.pageable && !item.setting.laypage)) && item.setting.onload === 'true' && item.setting.sync === 'true') {
- if (isEmpty && item.setting.useMSearch === 'true') {
+ if (isEmpty && item.setting.useMSearch) {
item.setting.sync = 'false'
item.setting.onload = 'false'
} else {
@@ -87,7 +87,7 @@
item.setting.sync = 'false'
item.setting.onload = 'false'
} else {
- if (item.setting.useMSearch === 'true') {
+ if (item.setting.useMSearch) {
let keys = searchlist.map(item => item.key)
_mainSearch.forEach(item => {
if (!keys.includes(item.key)) {
@@ -147,6 +147,13 @@
})
}
+ _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
+ _customScript = _customScript.replace(/@select\$|\$select@/ig, '')
+ _dataresource = _dataresource.replace(/\$sum@/ig, '/*')
+ _dataresource = _dataresource.replace(/@sum\$/ig, '*/')
+ _customScript = _customScript.replace(/\$sum@/ig, '/*')
+ _customScript = _customScript.replace(/@sum\$/ig, '*/')
+
let _search = ''
if (setting.queryType !== 'statistics' && _dataresource) {
_search = Utils.joinMainSearchkey(searchlist)
--
Gitblit v1.8.0