From 0c84df247914f893ef5e41d57a422e10a2dc814c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 十一月 2021 17:02:06 +0800
Subject: [PATCH] 2021-11-12
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 757 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 460 insertions(+), 297 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index e40a2ed..ee2421e 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -1,13 +1,19 @@
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, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { QuestionCircleOutlined, EditOutlined } from '@ant-design/icons'
-import { getBarOrLineChartOptionForm } from './formconfig'
-import { minkeColorSystem, colorTransform } from '@/utils/option.js'
+import Utils from '@/utils/utils.js'
+import { chartColors } from '@/utils/option.js'
+import { getBaseForm, getOptionForm } from './formconfig'
+import asyncComponent from '@/utils/asyncComponent'
+import ColorSketch from '@/mob/colorsketch'
import './index.scss'
const { TabPane } = Tabs
+const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
+const NormalForm = asyncComponent(() => import('@/menu/components/share/normalform'))
class LineChartDrawerForm extends Component {
static propTpyes = {
@@ -19,49 +25,213 @@
state = {
view: 'normal',
+ ramp: 'false',
visible: false,
- disabled: true,
+ datatype: '',
plot: null,
formlist: null,
- datatype: null,
+ baseFormlist: 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>)
+ }
+ },
+ ],
+ rampColorColumns: [
+ {
+ title: '鎸囨爣',
+ dataIndex: 'label',
+ editable: false,
+ width: '20%'
+ },
+ {
+ title: '棰滆壊1',
+ dataIndex: 'color',
+ inputType: 'color',
+ editable: true,
+ width: '30%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ {
+ title: '棰滆壊2',
+ dataIndex: 'color1',
+ inputType: 'color',
+ editable: true,
+ width: '30%',
+ 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>)
+ }
+ },
+ ],
+ rampStatColorColumns: [
+ {
+ title: '鎸囨爣',
+ dataIndex: 'type',
+ inputType: 'input',
+ editable: true,
+ width: '20%'
+ },
+ {
+ title: '棰滆壊1',
+ dataIndex: 'color',
+ inputType: 'color',
+ editable: true,
+ width: '30%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ {
+ title: '棰滆壊2',
+ dataIndex: 'color1',
+ inputType: 'color',
+ editable: true,
+ width: '30%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ ],
+ cusColumns: [
+ {
+ title: '鎸囨爣',
+ dataIndex: 'name',
+ editable: false,
+ width: '14%'
+ },
+ {
+ title: '褰㈢姸',
+ dataIndex: 'shape',
+ inputType: 'cascader',
+ editable: true,
+ width: '12%',
+ 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: '12%',
+ 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: '12%',
+ options: [
+ { value: 'true', text: '鏄剧ず'},
+ { value: 'false', text: '闅愯棌'}
+ ],
+ render: (text, record) => {
+ let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
+ return trans[text] || '闅愯棌'
+ }
+ },
+ {
+ title: '鏍囬',
+ dataIndex: 'title',
+ inputType: 'select',
+ editable: true,
+ width: '12%',
+ options: [
+ { value: 'true', text: '鏄剧ず'},
+ { value: 'false', text: '闅愯棌'}
+ ],
+ render: (text, record) => {
+ let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
+ return trans[text] || '鏄剧ず'
+ }
+ },
+ {
+ title: '鏈�灏忓��',
+ dataIndex: 'min',
+ inputType: 'number',
+ editable: true,
+ required: false,
+ width: '12%'
+ },
+ {
+ title: '鏈�澶у��',
+ dataIndex: 'max',
+ inputType: 'number',
+ editable: true,
+ required: false,
+ width: '12%'
+ },
]
}
@@ -75,12 +245,20 @@
}
})
+ if (config.plot.correction) {
+ delete config.plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
+ config.plot.barSize = 35
+ }
+
this.setState({
visible: true,
view: 'normal',
+ ramp: config.plot.ramp || 'false',
+ datatype: config.plot.datatype || 'query',
fieldName: fieldName,
plot: fromJS(config.plot).toJS(),
- formlist: getBarOrLineChartOptionForm(config.plot, config.columns, config.setting)
+ baseFormlist: getBaseForm(config.plot),
+ formlist: getOptionForm(config.plot, config.columns)
})
}
@@ -94,7 +272,7 @@
formlist: formlist.map(item => {
if (['Yaxis'].includes(item.key)) {
item.hidden = val === 'statistics'
- } else if (['InfoType', 'InfoValue', 'InfoDefNumber'].includes(item.key)) {
+ } else if (['InfoType', 'InfoValue'].includes(item.key)) {
item.hidden = val !== 'statistics'
}
return item
@@ -120,7 +298,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -132,7 +310,7 @@
message: this.props.dict['form.required.input'] + item.label + '!'
}
]
- })(<Input placeholder="" autoComplete="off" disabled={item.readonly}/>)}
+ })(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.onSubmit}/>)}
</Form.Item>
</Col>
)
@@ -141,7 +319,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -153,7 +331,7 @@
message: this.props.dict['form.required.input'] + item.label + '!'
}
]
- })(<InputNumber min={item.min} max={item.max} precision={item.decimal} />)}
+ })(<InputNumber min={item.min} max={item.max} precision={item.decimal} onPressEnter={this.onSubmit}/>)}
</Form.Item>
</Col>
)
@@ -162,7 +340,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -177,8 +355,8 @@
})(
<Select mode={item.multi ? 'multiple' : ''}>
{item.options.map((option, index) =>
- <Select.Option key={index} value={option.field}>
- {option.label}
+ <Select.Option key={index} value={option.field || option.value}>
+ {option.label || option.text}
</Select.Option>
)}
</Select>
@@ -191,7 +369,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -204,7 +382,7 @@
}
]
})(
- <Radio.Group disabled={item.readonly} onChange={(e) => this.radioChange(e, item.key)}>
+ <Radio.Group style={{whiteSpace: 'nowrap'}} disabled={item.readonly} onChange={(e) => this.radioChange(e, item.key)}>
{item.options.map(option => {
return (
<Radio key={option.value} value={option.value}>{option.text}</Radio>
@@ -215,268 +393,215 @@
</Form.Item>
</Col>
)
+ } else if (item.type === 'color') {
+ fields.push(
+ <Col span={12} key={index}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal
+ })(
+ <ColorSketch allowClear={item.allowClear} />
+ )}
+ </Form.Item>
+ </Col>
+ )
}
})
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) => {
- 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) => {
+ const { plot } = this.state
let val = e.target.value
- this.setState({enabled: val})
+ this.setState({plot: {...plot, enabled: val}})
+ }
+
+ mutilBarChange = (e) => {
+ const { plot } = this.state
+ let val = e.target.value
+
+ this.setState({plot: {...plot, mutilBar: val}})
+ }
+
+ rampChange = (e) => {
+ const { plot } = this.state
+ let val = e.target.value
+ let colors = plot.colors || []
+
+ if (val === 'true') {
+ colors = colors.map(item => {
+ item.color1 = item.color1 || item.color
+ return item
+ })
+ }
+
+ this.setState({plot: {...plot, colors, ramp: val}, ramp: val})
+ }
+
+ rampDirectionChange = (e) => {
+ const { plot } = this.state
+ let val = e.target.value
+
+ this.setState({plot: {...plot, rampDirection: val}})
}
onSubmit = () => {
- const { plot, view, datatype } = this.state
-
- if (view !== 'custom') {
- 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
- _plot.enabled = 'false'
- }
-
- this.setState({
- plot: _plot,
- visible: false
- })
-
- this.props.plotchange(_plot)
- }
- })
- } 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)
- }
- })
- }
- }
-
- changeView = () => {
const { config } = this.props
const { plot, view } = this.state
- let _view = view === 'normal' ? 'custom' : 'normal'
- if (_view === '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
+ }
+
+ if (values.datatype !== plot.datatype) {
+ _plot.colors = null
+ }
+
+ this.setState({
+ plot: _plot,
+ visible: false
+ })
+
+ 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
+ })
+ this.props.plotchange({...config, plot})
+ }
+ }
+
+ changeTab = (tab) => {
+ const { config } = this.props
+ const { plot, view } = this.state
+
+ if (view === 'normal') {
+ this.props.form.validateFieldsAndScroll((err, values) => {
+ if (!err) {
+ let _plot = {...plot, ...values}
+
+ if (values.datatype === 'statistics' || values.datatype !== plot.datatype) {
+ _plot.enabled = 'false'
+ _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',
+ title: 'true',
+ shape: _plot.chartType === 'bar' && i === 0 ? ['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],
+ color1: chartColors[i % limit]
+ }
+ })
+ }
+ }
+
this.setState({
- enabled: _plot.enabled || 'false',
+ datatype: _plot.datatype,
plot: _plot,
- view: _view
+ view: tab
})
}
})
+ } else if (view === 'base') {
+ this.baseRef.handleConfirm().then(res => {
+ this.setState({
+ plot: {...plot, ...res},
+ 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: _view,
- formlist: getBarOrLineChartOptionForm(_plot, config.columns)
- })
- }
+ this.setState({
+ view: tab
})
}
}
- changeTab = () => {
+ 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)',
+ color1: '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 { dict } = this.props
- const { view, visible, disabled } = this.state
+ const { view, visible, datatype, plot, ramp, colorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -490,41 +615,79 @@
return (
<div className="line-chart-drawer-form">
- <Icon type="edit" onClick={this.showDrawer} />
+ <EditOutlined title="缂栬緫" onClick={this.showDrawer}/>
<Modal
wrapClassName="popview-modal menu-chart-edit-modal"
title="鍥捐〃缂栬緫"
visible={visible}
- width={850}
+ width={950}
maskClosable={false}
- okText={dict['model.submit']}
- cancelText={dict['model.cancel']}
- onOk={this.verifySubmit}
+ onOk={this.onSubmit}
onCancel={() => { this.setState({ visible: false }) }}
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>
</TabPane>
- <TabPane tab="瀛楁闆�" disabled={disabled} key="custom">
-
- </TabPane>
+ {plot ? <TabPane tab="棰滆壊璁剧疆" key="color">
+ <div>
+ <Col span={8} style={{height: '40px', top: '-5px', zIndex: 1}}>
+ <Form {...formItemLayout}>
+ <Form.Item label="娓愬彉鑹�" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.ramp || 'false'} onChange={this.rampChange}>
+ <Radio value="false">涓嶄娇鐢�</Radio>
+ <Radio value="true">浣跨敤</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col>
+ {plot.chartType === 'line' ? <Col span={8} style={{height: '40px', top: '-5px', zIndex: 1}}>
+ <Form {...formItemLayout}>
+ <Form.Item label="娓愬彉鏂瑰悜" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.rampDirection || 'horizontal'} onChange={this.rampDirectionChange}>
+ <Radio value="horizontal">姘村钩</Radio>
+ <Radio value="vertical">鍨傜洿</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col> : null}
+ {datatype === 'statistics' ? <Button className="color-add mk-green" onClick={this.addColor}>{this.props.dict['model.add']}</Button> : null}
+ {datatype === 'statistics' ? <EditTable actions={['edit', 'move', 'del']} data={plot.colors || []} columns={ramp ==='true' ? rampStatColorColumns : statColorColumns} onChange={this.changeColor}/> : null}
+ {datatype !== 'statistics' ? <EditTable actions={['edit']} data={plot.colors || []} columns={ramp ==='true' ? rampColorColumns : 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 span={12}>
+ <Form {...formItemLayout}>
+ <Form.Item label="澶氭煴鎺掑垪" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.mutilBar || 'dodge'} onChange={this.mutilBarChange}>
+ <Radio value="dodge">鍒嗙粍</Radio>
+ <Radio value="stack">鍫嗗彔</Radio>
+ <Radio value="overlap">閲嶅彔</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col>
+ <Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浣跨敤鑷畾涔夎缃椂锛屾樉绀虹殑鍧愭爣杞寸涓�涓湪宸︿晶锛岀浜屼釜鍦ㄥ彸渚э紝澶氫綑鐨勪笉鐢熸晥銆�</Col>
+ <EditTable actions={['edit', 'move']} data={plot.customs || []} columns={cusColumns} onChange={this.changeCustom}/>
+ </TabPane> : null}
</Tabs>
- {/* {view !== 'custom' ? <Form {...formItemLayout} className="base-setting">
- <Row gutter={16}>{this.getFields()}</Row>
- {datatype === 'query' ? <Row gutter={16}>
- <Button onClick={this.changeView} style={{border: 0, boxShadow: 'unset',float: 'right', color: '#1890ff', marginRight: 12, cursor: 'pointer'}}>鑷畾涔夎缃�<Icon style={{marginLeft: 5}} type="right" /></Button>
- </Row> : null}
- </Form> : null}
- {view === 'custom' ? <Form {...formItemLayout} id="chart-custom-drawer-form" className="mingke-table">
- <Row gutter={16} style={{minHeight: 'calc(100vh - 180px)'}}>{this.getCustomFields()}</Row>
- <Row gutter={16}>
- <Button onClick={this.changeView} style={{border: 0, boxShadow: 'unset', color: '#1890ff', marginRight: 12, cursor: 'pointer'}}><Icon style={{marginRight: 5}} type="left" />鍩烘湰璁剧疆</Button>
- </Row>
- </Form> : null} */}
</Modal>
</div>
);
--
Gitblit v1.8.0