From 8a0b3081ecacbb844ea639ccc53ffd2c151cec1e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 三月 2021 02:13:53 +0800
Subject: [PATCH] 2021-03-28
---
src/tabviews/commontable/index.jsx | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 4b8dad6..12d7f02 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -179,12 +179,8 @@
// 瀛楁鏉冮檺榛戝悕鍗�
config.search = config.search.map(item => {
item.oriInitval = item.initval
- if (['text', 'select', 'link'].includes(item.type) && param) {
- if (param.searchkey === item.field) {
- item.initval = param.searchval
- } else if (param.data && param.data[item.field]) {
- item.initval = param.data[item.field]
- }
+ if (['text', 'select', 'link'].includes(item.type) && param && param.$searchkey === item.field) {
+ item.initval = param.$searchval
}
if (!item.blacklist || item.blacklist.length === 0) return item
@@ -211,6 +207,7 @@
config.setting.laypage = config.setting.laypage !== 'false' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
config.setting.execute = config.setting.default !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
config.setting.customScript = '' // 鑷畾涔夎剼鏈�
+ config.setting.dataresource = config.setting.dataresource || ''
if (config.setting.interType === 'system' || (config.setting.interType === 'custom' && config.setting.requestMode === 'system')) {
if (config.setting.scripts && config.setting.scripts.length > 0) {
@@ -226,8 +223,6 @@
if (!config.setting.execute) { // 榛樿sql 涓嶆墽琛屾椂 缃┖
config.setting.dataresource = ''
- } else {
- config.setting.dataresource = config.setting.dataresource || ''
}
if (/\s/.test(config.setting.dataresource)) {
config.setting.dataresource = '(' + config.setting.dataresource + ') tb'
@@ -241,6 +236,15 @@
} else {
config.setting.dataresource = config.setting.dataresource.replace(/@\$|\$@/ig, '')
config.setting.customScript = config.setting.customScript.replace(/@\$|\$@/ig, '')
+ }
+ if (config.urlFields) {
+ let _param = param || {}
+ config.urlFields.forEach(field => {
+ let reg = new RegExp('@' + field + '@', 'ig')
+ let val = `'${_param[field] || ''}'`
+ config.setting.dataresource = config.setting.dataresource.replace(reg, val)
+ config.setting.customScript = config.setting.customScript.replace(reg, val)
+ })
}
}
@@ -361,7 +365,7 @@
actions: _actions,
columns: _columns,
arr_field: _arrField.join(','),
- BID: param && param.BID ? param.BID : '',
+ BID: param && param.$BID ? param.$BID : '',
search: Utils.initMainSearch(config.search), // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
hasReqFields
}, () => {
@@ -997,14 +1001,6 @@
if (selectTab && selectTab.MenuID === this.props.MenuID) {
this.setShortcut()
}
- } else if (nextProps.param && !is(fromJS(this.props.param), fromJS(nextProps.param))) {
- let search = this.state.search.map(item => {
- if (item.type === 'text' && item.key === nextProps.param.searchkey) {
- item.value = nextProps.param.searchval
- }
- return item
- })
- this.refreshbysearch(search)
}
}
--
Gitblit v1.8.0