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/formtab/index.jsx | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx
index b4d2558..f185a68 100644
--- a/src/tabviews/formtab/index.jsx
+++ b/src/tabviews/formtab/index.jsx
@@ -205,6 +205,13 @@
obj_name: 'data',
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)
@@ -390,13 +397,24 @@
func: 'sPC_Get_TableData',
obj_name: 'data',
arr_field: arr_field,
- ID: primaryId
+ ID: primaryId,
+ dataM: this.props.dataManager ? 'Y' : ''
}
let _dataresource = setting.dataresource
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, '')
}
if (!/@ID@/ig.test(_dataresource)) {
@@ -419,7 +437,9 @@
getCustomParam = () => {
const { setting, primaryId } = this.state
- let param = {}
+ let param = {
+ dataM: this.props.dataManager ? 'Y' : ''
+ }
if (setting.interType === 'inner') {
param.func = setting.innerFunc
@@ -705,6 +725,7 @@
tabviews: state.tabviews,
refreshTab: state.refreshTab,
permAction: state.permAction,
+ dataManager: state.dataManager,
permRoles: state.permRoles
}
}
--
Gitblit v1.8.0