From fb3ec146a9e1444ece749d0bcf232a554e933fb0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:56:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 137 ++++++++++++++++++++++++++++++++-------------
1 files changed, 96 insertions(+), 41 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index f68c91e..b60fc7f 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -20,7 +20,8 @@
dict: PropTypes.object, // 瀛楀吀椤�
menu: PropTypes.object, // 鑿滃崟淇℃伅
config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
- search: PropTypes.array // 鎼滅储鏉′欢
+ search: PropTypes.array, // 鎼滅储鏉′欢
+ updRecord: PropTypes.func
}
state = {
@@ -85,7 +86,7 @@
status.requestMode = status.requestMode || 'system'
status.procMode = status.procMode || 'script'
status.callbackType = status.callbackType || 'script'
- let regoptions = Utils.getRegOptions(search)
+ let regoptions = this.getRegOptions(search)
if (config.urlFields && config.urlFields.length > 0) {
config.urlFields.forEach(field => {
@@ -126,6 +127,62 @@
cbScripts: _cbScripts,
status
})
+ }
+
+ componentDidMount () {
+ this.props.updRecord(this.state.status)
+ }
+
+ getRegOptions = (searches) => {
+ if (!searches || searches.length === 0) return []
+
+ let options = []
+ let fieldmap = new Map()
+ searches.forEach(search => {
+ let item = {
+ key: search.field,
+ value: '0'
+ }
+
+ if (fieldmap.has(item.key)) {
+ item.key = item.key + '1'
+ }
+
+ fieldmap.set(item.key, true)
+
+ if (search.type === 'group') {
+ options.push({
+ key: search.field,
+ value: '0'
+ })
+ options.push({
+ key: search.datefield,
+ value: '0'
+ })
+ options.push({
+ key: search.datefield + '1',
+ value: '0'
+ })
+ options.push(item)
+ } else if (['datemonth', 'dateweek', 'daterange'].includes(search.type)) {
+ options.push(item)
+ options.push({
+ key: item.key + '1',
+ value: '0'
+ })
+ } else if (search.type === 'text' || search.type === 'select') {
+ item.key.split(',').forEach(field => {
+ let cell = JSON.parse(JSON.stringify(item))
+ cell.key = field
+
+ options.push(cell)
+ })
+ } else {
+ options.push(item)
+ }
+ })
+
+ return options
}
/**
@@ -205,26 +262,6 @@
if (activeKey === 'setting') {
return new Promise((resolve, reject) => {
this.settingForm.handleConfirm().then(res => {
- if (trigger === 'func' && res.interType !== 'inner') {
- notification.warning({
- top: 92,
- message: '浣跨敤鍐呴儴鎺ュ彛锛屾墠鍙互鍒涘缓瀛樺偍杩囩▼锛�',
- duration: 5
- })
- this.setState({loading: false})
- reject()
- return
- } else if (trigger === 'interface' && res.interType !== 'system') {
- notification.warning({
- top: 92,
- message: '浣跨敤绯荤粺鎺ュ彛鏃讹紝鎵嶅彲浠ュ垱寤烘帴鍙ｏ紒',
- duration: 5
- })
- this.setState({loading: false})
- reject()
- return
- }
-
this.setState({
setting: res
}, () => {
@@ -243,23 +280,13 @@
})
} else if (activeKey === 'scripts') {
return new Promise((resolve, reject) => {
- if (trigger === 'func' && setting.interType !== 'inner') {
- notification.warning({
- top: 92,
- message: '浣跨敤鍐呴儴鎺ュ彛锛屾墠鍙互鍒涘缓瀛樺偍杩囩▼锛�',
- duration: 5
- })
+ this.sqlverify(() => {
+ this.setState({loading: false})
+ resolve({...setting, scripts, preScripts, cbScripts})
+ }, () => {
this.setState({loading: false})
reject()
- } else {
- this.sqlverify(() => {
- this.setState({loading: false})
- resolve({...setting, scripts, preScripts, cbScripts})
- }, () => {
- this.setState({loading: false})
- reject()
- }, 'submit')
- }
+ }, 'submit')
})
} else {
this.setState({loading: false})
@@ -289,18 +316,44 @@
} else if (type === 'scripts' && _scripts.length === 0) {
_resolve()
} else { // type 涓� submit 銆� verify 锛屼互鍙婂叾浠栭渶瑕侀獙璇佺殑鍦烘櫙
+ let r = SettingUtils.getDebugSql(setting, _scripts, arr_field, regoptions, search)
let param = {
func: 's_debug_sql',
exec_type: 'y',
- LText: SettingUtils.getDebugSql(setting, _scripts, arr_field, regoptions, search)
+ LText: r.sql
}
param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
+
+ let sumParam = null
+ if (r.sumSql) {
+ sumParam = {
+ func: 's_debug_sql',
+ exec_type: 'y',
+ LText: r.sumSql
+ }
+ sumParam.LText = Utils.formatOptions(sumParam.LText)
+ sumParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ sumParam.secretkey = Utils.encrypt('', sumParam.timestamp)
+ }
Api.getLocalConfig(param).then(result => {
if (result.status) {
- _resolve()
+ if (sumParam) {
+ Api.getLocalConfig(sumParam).then(res => {
+ if (res.status) {
+ _resolve()
+ } else {
+ _reject()
+ Modal.error({
+ title: res.message
+ })
+ }
+ })
+ } else {
+ _resolve()
+ }
} else {
_reject()
Modal.error({
@@ -441,7 +494,9 @@
}
updateStatus = (status) => {
- this.setState({status: {...this.state.status, ...status}})
+ let _status = {...this.state.status, ...status}
+ this.setState({status: _status})
+ this.props.updRecord(_status)
}
render() {
@@ -451,7 +506,7 @@
return (
<div className="model-table-setting-form-box" id="model-setting-form-body">
{loading && <Spin size="large" />}
- <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.changeTab}>
+ <Tabs activeKey={activeKey} onChange={this.changeTab}>
<TabPane tab="鏁版嵁婧�" key="setting">
<DataSource
menu={menu}
--
Gitblit v1.8.0