From 10c86c1fab41f01c7bf7fcb9d2f8b624142f6a54 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 13 九月 2022 14:42:33 +0800 Subject: [PATCH] Merge branch 'develop' --- src/menu/components/chart/antv-scatter/chartcompile/index.jsx | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/menu/components/chart/antv-scatter/chartcompile/index.jsx b/src/menu/components/chart/antv-scatter/chartcompile/index.jsx index 5a82c37..d618b15 100644 --- a/src/menu/components/chart/antv-scatter/chartcompile/index.jsx +++ b/src/menu/components/chart/antv-scatter/chartcompile/index.jsx @@ -228,6 +228,7 @@ } render() { + const { config } = this.props const { view, visible, baseFormlist } = this.state const formItemLayout = { labelCol: { @@ -244,8 +245,7 @@ <div className="line-chart-drawer-form"> <EditOutlined title="缂栬緫" onClick={this.showDrawer} /> <Modal - wrapClassName="popview-modal menu-chart-edit-modal" - title="鏁g偣鍥剧紪杈�" + wrapClassName="mk-pop-modal" visible={visible} width={850} maskClosable={false} @@ -253,6 +253,7 @@ onCancel={() => { this.setState({ visible: false }) }} destroyOnClose > + {config.name ? <div className="mk-com-name">{config.name} - 缂栬緫</div> : null} <Tabs activeKey={view} className="menu-chart-edit-box" onChange={this.changeTab}> <TabPane tab="缁勪欢璁剧疆" key="base"> <NormalForm dict={this.props.dict} formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/> -- Gitblit v1.8.0