From d3272e82652361e5e9bd045925222ef042b6731f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十一月 2020 18:15:15 +0800
Subject: [PATCH] 2020-11-18
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 472 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 224 insertions(+), 248 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index 169aff2..5390f44 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -1,14 +1,17 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { fromJS } from 'immutable'
-import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Cascader, Tabs } from 'antd'
+import { is, fromJS } from 'immutable'
+import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import Utils from '@/utils/utils.js'
+import { chartColors } from '@/utils/option.js'
import { getBarOrLineChartOptionForm } from './formconfig'
-import { minkeColorSystem, colorTransform } from '@/utils/option.js'
+import asyncComponent from '@/utils/asyncComponent'
import ColorSketch from '@/mob/colorsketch'
import './index.scss'
const { TabPane } = Tabs
+const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
class LineChartDrawerForm extends Component {
static propTpyes = {
@@ -23,47 +26,122 @@
state = {
view: 'normal',
visible: false,
- disabled: true,
+ datatype: '',
plot: null,
formlist: null,
fieldName: null,
- colorOptions: fromJS(minkeColorSystem).toJS().map(option => {
- option.children = option.children.map(cell => {
- let _cell = {}
- _cell.label = <div className={'background ' + cell.value}>{cell.value}</div>
- _cell.value = colorTransform[cell.value]
-
- return _cell
- })
- return option
- }),
- shapeOptions: [
+ colorColumns: [
{
- value: 'line',
- label: '鎶樼嚎',
- children: [
- { value: 'smooth', label: 'smooth' },
- { value: 'line', label: 'line' },
- { value: 'dot', label: 'dot' },
- { value: 'dash', label: 'dash' },
- { value: 'hv', label: 'hv' },
- { value: 'vh', label: 'vh' },
- { value: 'hvh', label: 'hvh' },
- { value: 'vhv', label: 'vhv' }
+ title: '鎸囨爣',
+ dataIndex: 'label',
+ editable: false,
+ width: '40%'
+ },
+ {
+ title: '棰滆壊',
+ dataIndex: 'color',
+ inputType: 'color',
+ editable: true,
+ width: '40%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ ],
+ statColorColumns: [
+ {
+ title: '鎸囨爣',
+ dataIndex: 'type',
+ inputType: 'input',
+ editable: true,
+ width: '40%'
+ },
+ {
+ title: '棰滆壊',
+ dataIndex: 'color',
+ inputType: 'color',
+ editable: true,
+ width: '40%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ ],
+ cusColumns: [
+ {
+ title: '鎸囨爣',
+ dataIndex: 'name',
+ editable: false,
+ width: '20%'
+ },
+ {
+ title: '褰㈢姸',
+ dataIndex: 'shape',
+ inputType: 'cascader',
+ editable: true,
+ width: '20%',
+ render: (text, record) => {
+ return text.join(' / ').replace('line', '鎶樼嚎').replace('bar', '鏌卞舰')
+ },
+ options: [
+ {
+ value: 'line',
+ label: '鎶樼嚎',
+ children: [
+ { value: 'smooth', label: 'smooth' },
+ { value: 'line', label: 'line' },
+ { value: 'dot', label: 'dot' },
+ { value: 'dash', label: 'dash' },
+ { value: 'hv', label: 'hv' },
+ { value: 'vh', label: 'vh' },
+ { value: 'hvh', label: 'hvh' },
+ { value: 'vhv', label: 'vhv' }
+ ]
+ },
+ {
+ value: 'bar',
+ label: '鏌卞舰',
+ children: [
+ { value: 'rect', label: 'rect' },
+ { value: 'hollow-rect', label: 'hollow-rect' },
+ { value: 'line', label: 'line' },
+ { value: 'tick', label: 'tick' },
+ { value: 'funnel', label: 'funnel' },
+ { value: 'pyramid', label: 'pyramid' }
+ ],
+ }
]
},
{
- value: 'bar',
- label: '鏌卞舰',
- children: [
- { value: 'rect', label: 'rect' },
- { value: 'hollow-rect', label: 'hollow-rect' },
- { value: 'line', label: 'line' },
- { value: 'tick', label: 'tick' },
- { value: 'funnel', label: 'funnel' },
- { value: 'pyramid', label: 'pyramid' }
+ title: '鍧愭爣杞�',
+ dataIndex: 'axis',
+ inputType: 'select',
+ editable: true,
+ width: '20%',
+ options: [
+ { value: 'true', text: '鏄剧ず'},
+ { value: 'false', text: '闅愯棌'}
],
- }
+ render: (text, record) => {
+ let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
+ return trans[text] || '闅愯棌'
+ }
+ },
+ {
+ title: '鏍囨敞',
+ dataIndex: 'label',
+ inputType: 'select',
+ editable: true,
+ width: '20%',
+ options: [
+ { value: 'true', text: '鏄剧ず'},
+ { value: 'false', text: '闅愯棌'}
+ ],
+ render: (text, record) => {
+ let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
+ return trans[text] || '闅愯棌'
+ }
+ },
]
}
@@ -85,7 +163,7 @@
this.setState({
visible: true,
view: 'normal',
- disabled: config.plot.datatype === 'statistics',
+ datatype: config.plot.datatype || 'query',
fieldName: fieldName,
plot: fromJS(config.plot).toJS(),
formlist: getBarOrLineChartOptionForm(config.plot, config.columns, sysRoles, MenuType)
@@ -98,7 +176,7 @@
if (key === 'datatype') {
this.setState({
- disabled: val === 'statistics',
+ datatype: val,
formlist: formlist.map(item => {
if (['Yaxis'].includes(item.key)) {
item.hidden = val === 'statistics'
@@ -245,142 +323,33 @@
return fields
}
- getCustomFields = () => {
- const { getFieldDecorator } = this.props.form
- const { plot, fieldName, enabled, colorOptions, shapeOptions } = this.state
- const fields = []
-
- if (!plot.customs) return null
-
- fields.push(<Col span={12} key="enabled">
- <Form.Item label="鏄惁鍚敤" style={{marginBottom: 10}}>
- {getFieldDecorator('enabled', {
- initialValue: plot.enabled || 'false'
- })(
- <Radio.Group onChange={this.enabledChange}>
- <Radio value="true">鏄�</Radio>
- <Radio value="false">鍚�</Radio>
- </Radio.Group>
- )}
- </Form.Item>
- </Col>)
-
- plot.customs.forEach((item, i) => {
- fields.push(<Col span={24} key={'field' + i}>
- <p className="field-title">{fieldName[item.field]}</p>
- </Col>)
- fields.push(<Col span={12} key={'shape' + i}>
- <Form.Item label="褰㈢姸">
- {getFieldDecorator(item.field + '$shape', {
- initialValue: item.$shape,
- rules: [
- {
- required: enabled === 'true',
- message: this.props.dict['form.required.select'] + '褰㈢姸!'
- }
- ]
- })(
- <Cascader
- disabled={enabled === 'false'}
- options={shapeOptions}
- placeholder=""
- displayRender={(label, selectedOptions) => selectedOptions[0] ? selectedOptions[0].label + ' / ' + selectedOptions[1].value : ''}
- />
- )}
- </Form.Item>
- </Col>)
- fields.push(<Col span={12} key={'color' + i}>
- <Form.Item label="棰滆壊">
- {getFieldDecorator(item.field + '$color', {
- initialValue: item.$color,
- rules: [
- {
- required: enabled === 'true',
- message: this.props.dict['form.required.select'] + '棰滆壊!'
- }
- ]
- })(
- <Cascader
- disabled={enabled === 'false'}
- options={colorOptions}
- placeholder=""
- getPopupContainer={() => document.getElementById('chart-custom-drawer-form')}
- displayRender={(label, selectedOptions) => selectedOptions[0] ? <div style={{background: selectedOptions[1].value, width: '20px', height: '20px'}}></div> : ''}
- />
- )}
- </Form.Item>
- </Col>)
- fields.push(<Col span={12} key={'axis' + i}>
- <Form.Item label="鍧愭爣杞�">
- {getFieldDecorator(item.field + '$axis', {
- initialValue: item.axis
- })(
- <Radio.Group disabled={enabled === 'false'} onChange={this.axisChange}>
- <Radio value="left">宸︿晶</Radio>
- <Radio value="right">鍙充晶</Radio>
- <Radio value="unset">涓嶆樉绀�</Radio>
- </Radio.Group>
- )}
- </Form.Item>
- </Col>)
- fields.push(<Col span={12} key={'label' + i}>
- <Form.Item label="鏍囨敞-鍊�">
- {getFieldDecorator(item.field + '$label', {
- initialValue: item.label
- })(
- <Radio.Group disabled={enabled === 'false'}>
- <Radio value="true">鏄剧ず</Radio>
- <Radio value="false">闅愯棌</Radio>
- </Radio.Group>
- )}
- </Form.Item>
- </Col>)
- })
-
- return fields
- }
-
- axisChange = (e) => {
+ enabledChange = (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})
+ this.setState({plot: {...plot, enabled: val}})
}
onSubmit = () => {
const { config } = this.props
- const { plot, view, datatype } = this.state
+ const { plot, view } = this.state
- if (view !== 'custom') {
+ if (view === 'normal') {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
let _plot = {...plot, ...values}
- if (datatype === 'query') {
- if (_plot.enabled === 'true') {
- if (_plot.customs.map(_cell => _cell.field).sort().toString() !== _plot.Yaxis.sort().toString()) {
- _plot.customs = null
- _plot.enabled = 'false'
- }
- }
- } else {
- _plot.customs = null
+ if (values.datatype === 'statistics' || values.datatype !== plot.datatype) {
_plot.enabled = 'false'
+ } else if (!values.Yaxis || !plot.Yaxis || !is(fromJS(values.Yaxis), fromJS(plot.Yaxis))) {
+ _plot.enabled = 'false'
+ _plot.colors = null
}
-
+
+ if (values.datatype !== plot.datatype) {
+ _plot.colors = null
+ }
+
this.setState({
plot: _plot,
visible: false
@@ -390,114 +359,105 @@
}
})
} else {
- this.props.form.validateFieldsAndScroll((err, values) => {
- if (!err) {
- let _plot = {...plot, enabled: values.enabled}
-
- if (_plot.enabled === 'true') {
- _plot.customs = _plot.Yaxis.map(field => {
- let _item = {field: field}
-
- _item.$shape = values[field + '$shape']
- _item.chartType = _item.$shape[0]
- _item.shape = _item.$shape[1]
-
- _item.$color = values[field + '$color']
- _item.color = _item.$color[1]
-
- _item.axis = values[field + '$axis']
-
- _item.label = values[field + '$label']
-
- return _item
- })
- } else {
- _plot.customs = null
- }
-
- this.setState({
- plot: _plot,
- visible: false
- })
-
- this.props.plotchange(_plot)
- }
+ this.setState({
+ visible: false
})
+ this.props.plotchange({...config, plot})
}
}
changeTab = (tab) => {
const { config } = this.props
- const { plot } = this.state
+ const { plot, view } = this.state
- if (tab === 'custom') {
+ if (view === 'normal') {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
let _plot = {...plot, ...values}
- if (_plot.enabled !== 'true' || _plot.customs.map(_cell => _cell.field).sort().toString() !== _plot.Yaxis.sort().toString()) {
+ if (values.datatype === 'statistics' || values.datatype !== plot.datatype) {
_plot.enabled = 'false'
- _plot.customs = _plot.Yaxis.map((field, i) => {
- let _item = {field: field}
- _item.$shape = [_plot.chartType, _plot.shape]
- _item.$color = []
- _item.axis = i === 0 ? 'left' : 'unset'
- _item.label = _plot.label
-
- return _item
+ _plot.customs = []
+ } else if (!values.Yaxis || !plot.Yaxis || !is(fromJS(values.Yaxis), fromJS(plot.Yaxis))) {
+ _plot.enabled = 'false'
+ _plot.customs = []
+ _plot.colors = null
+ }
+
+ let labels = {}
+ config.columns.forEach(col => {
+ labels[col.field] = col.label
+ })
+
+ if (values.datatype !== 'statistics' && (!_plot.customs || _plot.customs.length === 0)) {
+ _plot.customs = _plot.Yaxis.map((item, i) => {
+ return {
+ uuid: Utils.getuuid(),
+ type: item,
+ name: labels[item] || item,
+ axis: i === 0 ? 'true' : 'false',
+ label: 'false',
+ shape: _plot.chartType === 'bar' ? ['bar', 'rect'] : ['line', 'smooth']
+ }
})
}
-
+ if (values.datatype !== plot.datatype || !_plot.colors) {
+ _plot.colors = []
+ if (_plot.datatype === 'query') {
+ let limit = chartColors.length
+
+ _plot.colors = _plot.Yaxis.map((item, i) => {
+ return {
+ uuid: Utils.getuuid(),
+ type: item,
+ label: labels[item] || item,
+ color: chartColors[i % limit]
+ }
+ })
+ }
+ }
+
this.setState({
- enabled: _plot.enabled || 'false',
+ datatype: _plot.datatype,
plot: _plot,
view: tab
})
}
})
} else {
- this.props.form.validateFieldsAndScroll((err, values) => {
- if (!err) {
- let _values = {enabled: values.enabled}
-
- if (values.enabled === 'true') {
- let _customs = []
- plot.Yaxis.forEach(field => {
- let _item = {field: field}
-
- _item.$shape = values[field + '$shape']
- _item.chartType = _item.$shape[0]
- _item.shape = _item.$shape[1]
-
- _item.$color = values[field + '$color']
- _item.color = _item.$color[1]
-
- _item.axis = values[field + '$axis']
- _item.label = values[field + '$label']
-
- _customs.push(_item)
- })
-
- _values.customs = _customs
- } else {
- _values.customs = null
- }
-
- let _plot = {...plot, ..._values}
-
- this.setState({
- plot: _plot,
- view: tab,
- formlist: getBarOrLineChartOptionForm(_plot, config.columns)
- })
- }
+ this.setState({
+ view: tab
})
}
+ }
+ addColor = () => {
+ let plot = fromJS(this.state.plot).toJS()
+ plot.colors = plot.colors || []
+
+ plot.colors.push({
+ uuid: Utils.getuuid(),
+ type: `鎸囨爣${plot.colors.length}`,
+ color: 'rgb(91, 143, 249)'
+ })
+
+ this.setState({plot})
+ }
+
+ changeColor = (colors) => {
+ const { plot } = this.state
+
+ this.setState({plot: {...plot, colors}})
+ }
+
+ changeCustom = (customs) => {
+ const { plot } = this.state
+
+ this.setState({plot: {...plot, customs}})
}
render() {
- const { view, visible, disabled } = this.state
+ const { view, visible, datatype, plot, colorColumns, statColorColumns, cusColumns } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -524,15 +484,31 @@
>
<Tabs activeKey={view} className="menu-chart-edit-box" onChange={this.changeTab}>
<TabPane tab="鍩虹璁剧疆" key="normal">
- {view === 'normal' ? <Form {...formItemLayout}>
+ <Form {...formItemLayout}>
<Row gutter={16}>{this.getFields()}</Row>
- </Form> : null}
+ </Form>
</TabPane>
- <TabPane tab="鑷畾涔夎缃�" disabled={disabled} key="custom">
- {view === 'custom' ? <Form {...formItemLayout}>
- <Row gutter={16}>{this.getCustomFields()}</Row>
- </Form> : null}
- </TabPane>
+ {plot ? <TabPane tab="棰滆壊璁剧疆" key="color">
+ <div>
+ {datatype === 'statistics' ? <Button className="color-add mk-green" onClick={this.addColor}>{this.props.dict['model.add']}</Button> : null}
+ {datatype === 'statistics' ? <EditTable data={plot.colors || []} columns={statColorColumns} onChange={this.changeColor}/> : null}
+ {datatype !== 'statistics' ? <EditTable actions={['edit']} data={plot.colors || []} columns={colorColumns} onChange={this.changeColor}/> : null}
+ </div>
+ </TabPane> : null}
+ {plot ? <TabPane tab="鑷畾涔夎缃�" disabled={datatype === 'statistics'} key="custom">
+ <Col span={12}>
+ <Form {...formItemLayout}>
+ <Form.Item label="鏄惁鍚敤" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.enabled || 'false'} onChange={this.enabledChange}>
+ <Radio value="true">鏄�</Radio>
+ <Radio value="false">鍚�</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col>
+ <Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浣跨敤鑷畾涔夎缃椂锛屾樉绀虹殑鍧愭爣杞寸涓�涓湪宸︿晶锛岀浜屼釜鍦ㄥ彸渚э紝澶氫綑鐨勪笉鐢熸晥锛涙煴褰㈠浘鍙彲浠ユ坊鍔犱竴涓紙璁剧疆澶氫釜鏃讹紝绗竴涓敓鏁堬級銆�</Col>
+ <EditTable actions={['edit', 'up', 'down']} data={plot.customs || []} columns={cusColumns} onChange={this.changeCustom}/>
+ </TabPane> : null}
</Tabs>
</Modal>
</div>
--
Gitblit v1.8.0