From 58826d6f4eab9f8c9acf9fa8696f60039c645cfe Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 20 八月 2024 18:18:00 +0800 Subject: [PATCH] 2024-08-20 --- src/templates/sharecomponent/treesettingcomponent/index.jsx | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/templates/sharecomponent/treesettingcomponent/index.jsx b/src/templates/sharecomponent/treesettingcomponent/index.jsx index 867f295..51faa23 100644 --- a/src/templates/sharecomponent/treesettingcomponent/index.jsx +++ b/src/templates/sharecomponent/treesettingcomponent/index.jsx @@ -4,7 +4,6 @@ import { SettingOutlined } from '@ant-design/icons' import SettingForm from './settingform' -import MKEmitter from '@/utils/events.js' import './index.scss' @@ -32,7 +31,6 @@ visible: true, menu: menu }) - MKEmitter.emit('modalStatus', '鏁版嵁婧�') } /** @@ -45,17 +43,17 @@ loading: true }) this.settingRef.handleConfirm().then(res => { - if (window.GLOB.funcs && window.GLOB.funcs.length > 0) { - window.GLOB.funcs.forEach(m => { - let reg = new RegExp('\\$ex@' + m.func_code + '@ex\\$', 'ig') - res.scripts.forEach(item => { - item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) - }) - if (res.dataresource) { - res.dataresource = res.dataresource.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) - } - }) - } + // if (window.GLOB.funcs && window.GLOB.funcs.length > 0) { + // window.GLOB.funcs.forEach(m => { + // let reg = new RegExp('\\$ex@' + m.func_code + '@ex\\$', 'ig') + // res.scripts.forEach(item => { + // item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) + // }) + // if (res.dataresource) { + // res.dataresource = res.dataresource.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) + // } + // }) + // } this.setState({ visible: false, loading: false @@ -69,8 +67,6 @@ res.searchLwidth = config.setting.searchLwidth !== undefined ? config.setting.searchLwidth : 33.3 this.props.updatesetting({...config, setting: res}) - - MKEmitter.emit('modalStatus', false) }, () => { this.setState({ loading: false @@ -100,7 +96,7 @@ visible={visible} width={'75vw'} maskClosable={false} - onCancel={() => { MKEmitter.emit('modalStatus', false); this.setState({ visible: false })}} + onCancel={() => { this.setState({ visible: false })}} confirmLoading={loading} onOk={this.settingSave} destroyOnClose -- Gitblit v1.8.0