From 9cf5fc474d2159aad973e3208fbef670f325307f Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 25 十一月 2020 17:57:41 +0800 Subject: [PATCH] 2020-11-25 --- src/menu/components/chart/antv-pie/chartcompile/index.jsx | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/menu/components/chart/antv-pie/chartcompile/index.jsx b/src/menu/components/chart/antv-pie/chartcompile/index.jsx index e54f4a5..7678833 100644 --- a/src/menu/components/chart/antv-pie/chartcompile/index.jsx +++ b/src/menu/components/chart/antv-pie/chartcompile/index.jsx @@ -4,8 +4,7 @@ import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd' import Utils from '@/utils/utils.js' -import { getOptionForm } from './formconfig' -import { getBaseForm } from '../../antv-bar/chartcompile/formconfig' +import { getBaseForm, getOptionForm } from './formconfig' import asyncComponent from '@/utils/asyncComponent' import ColorSketch from '@/mob/colorsketch' import './index.scss' @@ -17,7 +16,7 @@ class LineChartDrawerForm extends Component { static propTpyes = { - MenuType: PropTypes.any, + menu: PropTypes.any, dict: PropTypes.object, plot: PropTypes.object, config: PropTypes.object, @@ -52,13 +51,13 @@ } showDrawer = () => { - const { config, MenuType } = this.props + const { config, menu } = this.props this.setState({ visible: true, view: 'normal', plot: fromJS(config.plot).toJS(), - baseFormlist: getBaseForm(config.plot, MenuType), + baseFormlist: getBaseForm(config.plot, menu.MenuType, menu.fstMenuList), formlist: getOptionForm(config.plot, config.columns) }) } -- Gitblit v1.8.0