From fa381753ef2a2b25b1c0722549ac17e333da79be Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 22:50:54 +0800
Subject: [PATCH] 2022-09-06
---
src/templates/sharecomponent/settingcomponent/index.jsx | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/index.jsx b/src/templates/sharecomponent/settingcomponent/index.jsx
index 51f4216..ca098d1 100644
--- a/src/templates/sharecomponent/settingcomponent/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/index.jsx
@@ -7,7 +7,7 @@
import Utils, { FuncUtils } from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
-
+import MKEmitter from '@/utils/events.js'
import SettingForm from './settingform'
import CreateFunc from '@/templates/zshare/createfunc'
import CreateInterface from '@/templates/zshare/createinterface'
@@ -51,6 +51,8 @@
search: _search,
menu: menu
})
+
+ MKEmitter.emit('modalStatus', '鏁版嵁婧�')
}
/**
@@ -63,7 +65,7 @@
loading: true
})
this.settingRef.handleConfirm().then(setting => {
- let res = this.resetSetting(setting)
+ let res = this.resetSetting(setting, config.setting)
this.setState({
visible: false,
loading: false
@@ -72,6 +74,8 @@
res.columnfixed = res.columnfixed === 'true'
this.props.updatesetting({...config, setting: res})
+
+ MKEmitter.emit('modalStatus', false)
}, () => {
this.setState({
loading: false
@@ -87,7 +91,7 @@
const { menu } = this.state
this.settingRef.handleConfirm('loading').then(setting => {
- let res = this.resetSetting(setting)
+ let res = this.resetSetting(setting, config.setting)
let _config = {...config, setting: res}
let newLText = Utils.formatOptions(FuncUtils.getTableFunc(setting, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
let DelText = Utils.formatOptions(FuncUtils.dropfunc(setting.innerFunc)) // 鍒犻櫎瀛樺偍杩囩▼sql
@@ -104,7 +108,7 @@
const { menu } = this.state
this.settingRef.handleConfirm('loading').then(setting => {
- let res = this.resetSetting(setting)
+ let res = this.resetSetting(setting, config.setting)
let _config = {...config, setting: res}
let _menu = {
type: config.Template === 'CommonTable' ? 'main' : 'subtable',
@@ -117,9 +121,16 @@
})
}
- resetSetting = (s) => {
+ resetSetting = (s, ori) => {
let setting = fromJS(s).toJS()
let maxScript = 0
+
+ setting.show = ori.show || 'true'
+ setting.advanceType = ori.advanceType || 'modal'
+ setting.advanceWidth = ori.advanceWidth || 1000
+ setting.drawerPlacement = ori.drawerPlacement || 'right'
+ setting.searchRatio = ori.searchRatio || 6
+ setting.searchLwidth = ori.searchLwidth !== undefined ? ori.searchLwidth : 33.3
if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
window.GLOB.funcs.forEach(m => {
@@ -175,15 +186,15 @@
{/* 璁剧疆鍏ㄥ眬閰嶇疆鍙婂垪琛ㄦ暟鎹簮 */}
<Modal
wrapClassName="model-table-setting-verify-modal"
- title={dict['model.edit']}
+ title="鏁版嵁婧愰厤缃�"
visible={visible}
width={900}
maskClosable={false}
- onCancel={() => { this.setState({ visible: false, loading: false })}}
+ onCancel={() => { MKEmitter.emit('modalStatus', false); this.setState({ visible: false, loading: false })}}
footer={[
record && record.interType === 'system' ? <CreateInterface key="interface" loading={this.state.interloading} dict={dict} ref="tableCreatInterface" trigger={this.tableCreatInterface}/> : null,
record && record.interType === 'inner' ? <CreateFunc key="create" dict={dict} ref="funcCreatComponent" trigger={this.tableCreatFunc}/> : null,
- <Button key="cancel" onClick={() => { this.setState({ visible: false, loading: false }) }}>{this.state.dict['model.cancel']}</Button>,
+ <Button key="cancel" onClick={() => { MKEmitter.emit('modalStatus', false); this.setState({ visible: false, loading: false }) }}>{this.state.dict['model.cancel']}</Button>,
<Button key="confirm" type="primary" loading={this.state.loading} onClick={this.settingSave}>{this.state.dict['model.confirm']}</Button>
]}
destroyOnClose
--
Gitblit v1.8.0