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/settingcomponent/index.jsx | 133 +++++++++++++++++++------------------------- 1 files changed, 58 insertions(+), 75 deletions(-) diff --git a/src/templates/sharecomponent/settingcomponent/index.jsx b/src/templates/sharecomponent/settingcomponent/index.jsx index 85be0a7..8657cbe 100644 --- a/src/templates/sharecomponent/settingcomponent/index.jsx +++ b/src/templates/sharecomponent/settingcomponent/index.jsx @@ -4,11 +4,7 @@ import { Modal, Button } from 'antd' import { SettingOutlined } from '@ant-design/icons' -import Utils, { FuncUtils } from '@/utils/utils.js' -import MKEmitter from '@/utils/events.js' import SettingForm from './settingform' -import CreateFunc from '@/templates/zshare/createfunc' -import CreateInterface from '@/templates/zshare/createinterface' // import './index.scss' @@ -48,8 +44,6 @@ search: _search, menu: menu }) - - MKEmitter.emit('modalStatus', '鏁版嵁婧�') } /** @@ -67,11 +61,8 @@ visible: false, loading: false }) - res.actionfixed = res.actionfixed === 'true' this.props.updatesetting({...config, setting: res}) - - MKEmitter.emit('modalStatus', false) }, () => { this.setState({ loading: false @@ -79,47 +70,30 @@ }) } - /** - * @description 鍒涘缓琛ㄦ牸瀛樺偍杩囩▼ - */ - tableCreatFunc = () => { - const { config } = this.props - const { menu } = this.state + // /** + // * @description 鍒涘缓琛ㄦ牸鎺ュ彛锛堣鍑猴級 + // */ + // tableCreatInterface = () => { + // const { config } = this.props + // const { menu } = this.state - this.settingRef.handleConfirm('loading').then(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 + // this.settingRef.handleConfirm('loading').then(setting => { + // let res = this.resetSetting(setting, config.setting) + // let _config = {...config, setting: res} + // let _menu = { + // type: config.Template === 'CommonTable' ? 'main' : 'subtable', + // MenuID: menu.MenuID, + // menuName: menu.MenuName, + // menuNo: menu.MenuNo + // } - this.refs.funcCreatComponent.exec(setting.innerFunc, newLText, DelText) - }) - } - - /** - * @description 鍒涘缓琛ㄦ牸鎺ュ彛锛堣鍑猴級 - */ - tableCreatInterface = () => { - const { config } = this.props - const { menu } = this.state - - this.settingRef.handleConfirm('loading').then(setting => { - let res = this.resetSetting(setting, config.setting) - let _config = {...config, setting: res} - let _menu = { - type: config.Template === 'CommonTable' ? 'main' : 'subtable', - MenuID: menu.MenuID, - menuName: menu.MenuName, - menuNo: menu.MenuNo - } - - this.refs.tableCreatInterface.triggerOutInterface(_menu, _config) - }) - } + // this.refs.tableCreatInterface.triggerOutInterface(_menu, _config) + // }) + // } resetSetting = (s, ori) => { let setting = fromJS(s).toJS() - let maxScript = 0 + // let maxScript = 0 setting.show = ori.show || 'true' setting.advanceType = ori.advanceType || 'modal' @@ -127,34 +101,45 @@ setting.drawerPlacement = ori.drawerPlacement || 'right' setting.searchRatio = ori.searchRatio || 6 setting.searchLwidth = ori.searchLwidth !== undefined ? ori.searchLwidth : 33.3 + setting.resetContrl = ori.resetContrl || 'init' - if (window.GLOB.funcs && window.GLOB.funcs.length > 0) { - window.GLOB.funcs.forEach(m => { - let reg = new RegExp('\\$ex@' + m.func_code + '@ex\\$', 'ig') - setting.scripts.forEach(item => { - item.sql = item.sql.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') + // setting.scripts.forEach(item => { + // item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) - if (item.status === 'false') return + // if (item.status === 'false') return - if (/exec\s/ig.test(item.sql)) { - maxScript = 1000 - } else if (item.sql.length > maxScript) { - maxScript = item.sql.length - } - }) - setting.preScripts.forEach(item => { - item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) - }) - setting.cbScripts.forEach(item => { - item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) - }) - if (setting.dataresource) { - setting.dataresource = setting.dataresource.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) - } - }) - } + // if (/exec\s/ig.test(item.sql)) { + // maxScript = 1000 + // } else if (item.sql.length > maxScript) { + // maxScript = item.sql.length + // } + // }) + // setting.preScripts.forEach(item => { + // item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) + // }) + // setting.cbScripts.forEach(item => { + // item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) + // }) + // if (setting.dataresource) { + // setting.dataresource = setting.dataresource.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`) + // } + // }) + // } else { + // setting.scripts.forEach(item => { + // if (item.status === 'false') return - setting.maxScript = maxScript + // if (/exec\s/ig.test(item.sql)) { + // maxScript = 1000 + // } else if (item.sql.length > maxScript) { + // maxScript = item.sql.length + // } + // }) + // } + + // setting.maxScript = maxScript return setting } @@ -174,7 +159,7 @@ render() { const { config } = this.props - const { visible, search, menu, record } = this.state + const { visible, search, menu } = this.state return ( <> @@ -185,11 +170,9 @@ visible={visible} width={'75vw'} maskClosable={false} - onCancel={() => { MKEmitter.emit('modalStatus', false); this.setState({ visible: false, loading: false })}} + onCancel={() => { this.setState({ visible: false, loading: false })}} footer={[ - record && record.interType === 'system' ? <CreateInterface key="interface" loading={this.state.interloading} ref="tableCreatInterface" trigger={this.tableCreatInterface}/> : null, - record && record.interType === 'inner' ? <CreateFunc key="create" ref="funcCreatComponent" trigger={this.tableCreatFunc}/> : null, - <Button key="cancel" onClick={() => { MKEmitter.emit('modalStatus', false); this.setState({ visible: false, loading: false }) }}>鍙栨秷</Button>, + <Button key="cancel" onClick={() => { this.setState({ visible: false, loading: false }) }}>鍙栨秷</Button>, <Button key="confirm" type="primary" loading={this.state.loading} onClick={this.settingSave}>纭畾</Button> ]} destroyOnClose @@ -198,7 +181,7 @@ menu={menu} config={config} search={search} - updRecord={(record) => this.setState({record: fromJS(record).toJS()})} + updRecord={() => {}} wrappedComponentRef={(inst) => this.settingRef = inst} /> </Modal> -- Gitblit v1.8.0