From 5902ba5c3ff85efc78c95364196cd6ab5d2d1601 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 11 十月 2020 12:21:17 +0800
Subject: [PATCH] 2020-10-11
---
src/menu/datasource/verifycard/index.jsx | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 99a1ff7..e1b3e56 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -122,12 +122,16 @@
}
UNSAFE_componentWillMount() {
- const { config } = this.props
+ const { config, mainSearch } = this.props
+
+ let search = config.search || []
+ search = [...search, ...mainSearch]
this.setState({
columns: fromJS(config.columns).toJS(),
setting: fromJS(config.setting).toJS(),
- scripts: fromJS(config.scripts).toJS()
+ scripts: fromJS(config.scripts).toJS(),
+ searches: search
})
this.getsysScript()
@@ -410,8 +414,7 @@
}
sqlverify = (resolve, reject, change = false, testScripts) => {
- const { config } = this.props
- const { columns, setting, scripts } = this.state
+ const { columns, setting, scripts, searches } = this.state
let _scripts = scripts.filter(item => item.status !== 'false')
@@ -431,7 +434,7 @@
if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let param = {
func: 's_debug_sql',
- LText: SettingUtils.getDebugSql(setting, _scripts, columns, config.search)
+ LText: SettingUtils.getDebugSql(setting, _scripts, columns, searches)
}
param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -469,7 +472,7 @@
render() {
const { menu, config } = this.props
- const { columns, setting, scripts, colColumns, scriptsColumns, activeKey, loading } = this.state
+ const { columns, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches } = this.state
return (
<div id="model-verify-card-box-tab">
@@ -510,7 +513,7 @@
<TabPane tab="鑷畾涔夎剼鏈�" key="scripts">
<CustomScriptsForm
setting={setting}
- searches={config.search}
+ searches={searches}
initsql={this.state.initsql}
dict={this.props.dict}
customScripts={scripts}
--
Gitblit v1.8.0