From c5b925431860e7d4194bfe550e86866b11e4f7a4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 八月 2023 11:40:42 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/utils/utils-datamanage.js | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index a5cb08d..ecd38da 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -11,7 +11,6 @@
* @param {Number} pageIndex 椤电爜
* @param {Number} pageSize 姣忛〉鏁伴噺
* @param {String} BID 涓婄骇ID
- * @return {Object} param
*/
static getQueryDataParams (setting, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, id, year) {
let param = null
@@ -446,13 +445,6 @@
_customScript = _customScript.replace(item.reg, item.value)
})
- // _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)
@@ -495,8 +487,7 @@
primaryKey: setting.primaryKey || '',
foreign_key: '',
sql: _dataresource,
- script: _customScript,
- // transaction: setting.transaction === 'true'
+ script: _customScript
}
}
--
Gitblit v1.8.0