From cb9ade2afd2a367ad767bc605ab7086c695dd010 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 09 十二月 2022 15:53:32 +0800 Subject: [PATCH] 2022-12-09 --- src/menu/components/chart/chart-custom/chartcompile/index.jsx | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/menu/components/chart/chart-custom/chartcompile/index.jsx b/src/menu/components/chart/chart-custom/chartcompile/index.jsx index 1ac9de4..5ab0fa2 100644 --- a/src/menu/components/chart/chart-custom/chartcompile/index.jsx +++ b/src/menu/components/chart/chart-custom/chartcompile/index.jsx @@ -1,12 +1,12 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { fromJS } from 'immutable' -import { Modal, Form, Tabs } from 'antd' +import { Modal, Tabs } from 'antd' import { EditOutlined } from '@ant-design/icons' import { getBaseForm } from './formconfig' import asyncComponent from '@/utils/asyncComponent' -import './index.scss' +// import './index.scss' const { TabPane } = Tabs const NormalForm = asyncComponent(() => import('@/menu/components/share/normalform')) @@ -14,7 +14,6 @@ class CustomChartDrawerForm extends Component { static propTpyes = { - dict: PropTypes.object, plot: PropTypes.object, config: PropTypes.object, plotchange: PropTypes.func @@ -87,14 +86,14 @@ } render() { + const { config } = this.props const { view, visible, baseFormlist, plot } = this.state return ( <> <EditOutlined style={{color: '#1890ff'}} title="缂栬緫" onClick={this.showDrawer} /> <Modal - wrapClassName="popview-modal custom-chart-edit-modal" - title="鑷畾涔夊浘琛ㄧ紪杈�" + wrapClassName="mk-pop-modal" visible={visible} width={950} maskClosable={false} @@ -102,9 +101,10 @@ onCancel={() => { this.setState({ visible: false }) }} destroyOnClose > + {config.name ? <div className="mk-com-name">{config.name} - 缂栬緫</div> : null} <Tabs activeKey={view} onChange={this.changeTab}> <TabPane tab="缁勪欢璁剧疆" key="base"> - <NormalForm dict={this.props.dict} formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/> + <NormalForm formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/> </TabPane> {plot ? <TabPane tab="JS" key="JS"> {plot.chartType === 'antv' ? <div>鍏ュ弬锛欳hart銆� DataSet銆� wrap锛坉om鑺傜偣锛夈�乨ata銆� config</div> : <div>鍏ュ弬锛歟charts銆� DataSet銆� wrap锛坉om鑺傜偣锛夈�� data銆� config</div>} @@ -117,4 +117,4 @@ } } -export default Form.create()(CustomChartDrawerForm) \ No newline at end of file +export default CustomChartDrawerForm \ No newline at end of file -- Gitblit v1.8.0