From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/index.jsx | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 507b1ed..23ae166 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -39,6 +39,7 @@
defaultsql: '', // 榛樿Sql
defaultSearch: '',
systemScripts: [],
+ median: {},
visible: false,
pvisible: false,
reload: false,
@@ -197,6 +198,7 @@
scripts,
columns: config.columns ? fromJS(config.columns).toJS() : [],
setting: _setting,
+ median: _setting,
searches: search,
defaultSearch: _search
})
@@ -781,6 +783,7 @@
return col
}),
setting: res.data.setting,
+ median: res.data.setting,
reload: true,
pvisible: false
}, () => {
@@ -793,6 +796,7 @@
return col
}),
setting: res.data.setting,
+ median: res.data.setting,
reload: true,
pvisible: false
}, () => {
@@ -834,7 +838,7 @@
render() {
const { config } = this.props
- const { columns, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue } = this.state
+ const { columns, median, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue } = this.state
return (
<div className="model-data-source-wrap">
@@ -853,6 +857,7 @@
columns={columns}
setting={setting}
scripts={scripts}
+ updateStatus={(res) => this.setState({median: {...res}})}
wrappedComponentRef={(inst) => this.settingForm = inst}
/> : null}
</TabPane>
@@ -876,7 +881,7 @@
鑷畾涔夎剼鏈�
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
</span>
- } key="scripts" id="mk-scripts-tabpane">
+ } key="scripts" disabled={median.interType !== 'system'} id="mk-scripts-tabpane">
{scripts.length ? <BorderOutlined className="full-scripts" onClick={() => {
if (this.scriptsForm && (this.scriptsForm.state.editItem || (this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))))) {
notification.warning({
--
Gitblit v1.8.0