From ce1330660cd00eb09fe910b54cf45cd9786525b3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 11 四月 2023 21:06:35 +0800
Subject: [PATCH] 2023-04-11
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 1ea9109..57db645 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -587,6 +587,18 @@
} else if (activeKey === 'setting') {
this.settingForm.handleConfirm().then(res => {
let _verify = {...verify, ...res}
+
+ if (res.dataType !== 'custom') {
+ delete _verify.tableName
+ delete _verify.dataresource
+ delete _verify.queryType
+ delete _verify.primaryKey
+ delete _verify.defaultSql
+ delete _verify.order
+
+ _verify.scripts = []
+ }
+
this.setState({
verify: _verify
}, () => {
@@ -1037,7 +1049,23 @@
}
updateDataType = (val) => {
- this.setState({verify: {...this.state.verify, dataType: val}})
+ const { config } = this.props
+
+ let verify = {...this.state.verify, dataType: val}
+ if (val === 'custom' && config.setting) {
+ verify.tableName = verify.tableName || config.setting.tableName || ''
+ verify.dataresource = verify.dataresource || config.setting.dataresource || ''
+ verify.queryType = verify.queryType || config.setting.queryType || ''
+ verify.primaryKey = verify.primaryKey || config.setting.primaryKey || ''
+ verify.defaultSql = verify.defaultSql || config.setting.execute || ''
+ verify.order = verify.order || config.setting.order || ''
+
+ if (verify.scripts.length === 0 && config.scripts && config.scripts.length > 0) {
+ verify.scripts = fromJS(config.scripts).toJS()
+ }
+ }
+
+ this.setState({verify: verify})
}
render() {
--
Gitblit v1.8.0