From 6e106eb13ce404d9955d6c9045d21050d3e08294 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 20 十一月 2020 11:19:36 +0800
Subject: [PATCH] 2020-11-20
---
src/menu/components/chart/antv-pie/chartcompile/index.jsx | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/menu/components/chart/antv-pie/chartcompile/index.jsx b/src/menu/components/chart/antv-pie/chartcompile/index.jsx
index 7107522..790cfc2 100644
--- a/src/menu/components/chart/antv-pie/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-pie/chartcompile/index.jsx
@@ -4,7 +4,8 @@
import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
import Utils from '@/utils/utils.js'
-import { getPieChartOptionForm } from './formconfig'
+import { getOptionForm } from './formconfig'
+import { getBaseForm } from '../../antv-bar/chartcompile/formconfig'
import asyncComponent from '@/utils/asyncComponent'
import ColorSketch from '@/mob/colorsketch'
import './index.scss'
@@ -12,6 +13,7 @@
const { TabPane } = Tabs
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
+const NormalForm = asyncComponent(() => import('@/menu/components/share/normalform'))
class LineChartDrawerForm extends Component {
static propTpyes = {
@@ -27,6 +29,7 @@
visible: false,
plot: null,
formlist: null,
+ baseFormlist: null,
view: 'normal',
colorColumns: [
{
@@ -56,7 +59,8 @@
visible: true,
view: 'normal',
plot: fromJS(config.plot).toJS(),
- formlist: getPieChartOptionForm(config.plot, config.columns, sysRoles, MenuType)
+ baseFormlist: getBaseForm(config.plot, sysRoles, MenuType),
+ formlist: getOptionForm(config.plot, config.columns)
})
}
@@ -216,26 +220,6 @@
return fields
}
- axisChange = (e) => {
- const { plot } = this.state
- let val = e.target.value
- let fieldvalue = {}
-
- plot.customs.forEach(item => {
- if (this.props.form.getFieldValue(item.field + '$axis') === val) {
- fieldvalue[item.field + '$axis'] = 'unset'
- }
- })
-
- this.props.form.setFieldsValue(fieldvalue)
- }
-
- enabledChange = (e) => {
- let val = e.target.value
-
- this.setState({enabled: val})
- }
-
onSubmit = () => {
const { config } = this.props
const { plot, view } = this.state
@@ -253,6 +237,17 @@
this.props.plotchange({...config, plot: _plot})
}
})
+ } else if (view === 'base') {
+ this.baseRef.handleConfirm().then(res => {
+ let _plot = {...plot, ...res}
+
+ this.setState({
+ plot: _plot,
+ visible: false
+ })
+
+ this.props.plotchange({...config, plot: _plot})
+ })
} else {
this.setState({
visible: false
@@ -263,9 +258,9 @@
}
changeTab = (tab) => {
- const { plot } = this.state
+ const { plot, view } = this.state
- if (tab === 'color') {
+ if (view === 'normal') {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
let _plot = {...plot, ...values}
@@ -275,6 +270,15 @@
view: tab
})
}
+ })
+ } else if (view === 'base') {
+ this.baseRef.handleConfirm().then(res => {
+ let _plot = {...plot, ...res}
+
+ this.setState({
+ plot: _plot,
+ view: tab
+ })
})
} else {
this.setState({
@@ -303,7 +307,7 @@
}
render() {
- const { visible, plot, colorColumns, view } = this.state
+ const { visible, plot, colorColumns, view, baseFormlist } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -329,7 +333,10 @@
destroyOnClose
>
<Tabs activeKey={view} className="menu-chart-edit-box" onChange={this.changeTab}>
- <TabPane tab="鍩虹璁剧疆" key="normal">
+ <TabPane tab="缁勪欢璁剧疆" key="base">
+ <NormalForm dict={this.props.dict} formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
+ </TabPane>
+ <TabPane tab="鍥捐〃璁剧疆" key="normal">
<Form {...formItemLayout}>
<Row gutter={16}>{this.getFields()}</Row>
</Form>
--
Gitblit v1.8.0