From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 02 八月 2022 11:42:43 +0800 Subject: [PATCH] Merge branch 'develop' --- src/menu/datasource/index.jsx | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/menu/datasource/index.jsx b/src/menu/datasource/index.jsx index f405cf1..fe889ab 100644 --- a/src/menu/datasource/index.jsx +++ b/src/menu/datasource/index.jsx @@ -7,6 +7,7 @@ import zhCN from '@/locales/zh-CN/model.js' import enUS from '@/locales/en-US/model.js' import VerifyCard from './verifycard' +import MKEmitter from '@/utils/events.js' import './index.scss' class DataSource extends Component { @@ -137,6 +138,8 @@ visible: true, mainSearch: search }) + + MKEmitter.emit('modalStatus', '鏁版嵁婧�') } verifySubmit = () => { @@ -188,6 +191,8 @@ this.setState({loading: false, visible: false}) this.props.updateConfig({...config, ...res}) + + MKEmitter.emit('modalStatus', false) }, () => { this.setState({loading: false}) }) @@ -202,14 +207,14 @@ <SettingOutlined title="鏁版嵁婧�" onClick={() => this.editDataSource()} /> <Modal wrapClassName="popview-modal" - title={'鏁版嵁婧愰厤缃�'} + title="鏁版嵁婧愰厤缃�" visible={visible} width={'75vw'} maskClosable={false} okText={dict['model.submit']} onOk={this.verifySubmit} confirmLoading={loading} - onCancel={() => { this.setState({ visible: false }) }} + onCancel={() => { MKEmitter.emit('modalStatus', false);this.setState({ visible: false }) }} destroyOnClose > <VerifyCard -- Gitblit v1.8.0