From eb31b84962c192de57abbb473cb4733a09bf4363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 五月 2020 18:09:40 +0800
Subject: [PATCH] 2020-05-14
---
src/tabviews/managetable/index.jsx | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/managetable/index.jsx b/src/tabviews/managetable/index.jsx
index a36a849..278fa94 100644
--- a/src/tabviews/managetable/index.jsx
+++ b/src/tabviews/managetable/index.jsx
@@ -249,6 +249,13 @@
arr_field: _option.field
}
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ param.LText = param.LText.replace(/\$@/ig, '/*')
+ param.LText = param.LText.replace(/@\$/ig, '*/')
+ } else {
+ param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ }
+
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -365,10 +372,14 @@
let _search = Utils.formatCustomMainSearch(search)
let param = {
- PageIndex: pageIndex,
- PageSize: pageSize,
OrderCol: orderBy || setting.order,
+ dataM: this.props.dataManager ? 'Y' : '',
..._search
+ }
+
+ if (setting.laypage !== 'false') {
+ param.PageIndex = pageIndex
+ param.PageSize = pageSize
}
if (setting.interType === 'inner') {
@@ -412,7 +423,8 @@
obj_name: 'data',
arr_field: arr_field,
custom_script: setting.customScript || '',
- default_sql: setting.default || 'true'
+ default_sql: setting.default || 'true',
+ dataM: this.props.dataManager ? 'Y' : ''
}
let _orderBy = orderBy || setting.order
@@ -420,6 +432,16 @@
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
+ }
+
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ _dataresource = _dataresource.replace(/\$@/ig, '/*')
+ _dataresource = _dataresource.replace(/@\$/ig, '*/')
+ param.custom_script = param.custom_script.replace(/\$@/ig, '/*')
+ param.custom_script = param.custom_script.replace(/@\$/ig, '*/')
+ } else {
+ _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
+ param.custom_script = param.custom_script.replace(/@\$|\$@/ig, '')
}
let regoptions = null
@@ -896,6 +918,7 @@
dict={this.state.dict}
triggerBtn={triggerBtn}
MenuID={this.props.MenuID}
+ dataManager={this.props.dataManager}
logcolumns={this.state.logcolumns}
ContainerId={this.state.ContainerId}
refreshdata={this.refreshbyaction}
@@ -916,6 +939,7 @@
menuType="HS"
tableId="mainTable"
pickup={pickup}
+ config={config}
setting={setting}
columns={columns}
dict={this.state.dict}
@@ -1037,6 +1061,7 @@
return {
tabviews: state.tabviews,
refreshTab: state.refreshTab,
+ dataManager: state.dataManager,
permAction: state.permAction
}
}
--
Gitblit v1.8.0