From ed7d889f7d9dfca77fd7f055ad8d6ec6ad85ae91 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 七月 2022 18:28:13 +0800
Subject: [PATCH] 2022-07-20
---
src/templates/sharecomponent/settingcomponent/index.jsx | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/index.jsx b/src/templates/sharecomponent/settingcomponent/index.jsx
index 75e4571..ca098d1 100644
--- a/src/templates/sharecomponent/settingcomponent/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/index.jsx
@@ -65,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
@@ -91,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
@@ -108,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',
@@ -121,10 +121,17 @@
})
}
- 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 => {
let reg = new RegExp('\\$ex@' + m.func_code + '@ex\\$', 'ig')
--
Gitblit v1.8.0