From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 1063 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 640 insertions(+), 423 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index e7295d0..ca696d2 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -1,68 +1,141 @@
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 { Modal, Form, Col, Radio, notification, Tabs, Button } from 'antd'
+import { EditOutlined, PlusOutlined } from '@ant-design/icons'
-import { getBarOrLineChartOptionForm } from './formconfig'
-import { minkeColorSystem, colorTransform } from '@/utils/option.js'
-import ColorSketch from '@/mob/colorsketch'
+import Utils from '@/utils/utils.js'
+import { chartColors } from '@/utils/option.js'
+import { getBaseForm, getOptionForm } from './formconfig'
+import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
const { TabPane } = Tabs
+const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
+const ModalForm = asyncComponent(() => import('@/components/normalform/modalform'))
class LineChartDrawerForm extends Component {
static propTpyes = {
- dict: PropTypes.object,
plot: PropTypes.object,
config: PropTypes.object,
plotchange: PropTypes.func
}
state = {
- view: 'normal',
+ view: 'base',
visible: false,
- disabled: true,
+ datatype: '',
plot: null,
formlist: 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%'
},
{
- 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: 'color',
+ inputType: 'color',
+ editable: true,
+ width: '40%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ ],
+ barColorColumns: [
+ {
+ title: '棰滆壊',
+ dataIndex: 'color',
+ inputType: 'color',
+ editable: true,
+ width: '70%',
+ 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: []
}
showDrawer = () => {
@@ -75,422 +148,502 @@
}
})
- this.setState({
- visible: true,
- view: 'normal',
- disabled: config.plot.datatype === 'statistics',
- fieldName: fieldName,
- plot: fromJS(config.plot).toJS(),
- formlist: getBarOrLineChartOptionForm(config.plot, config.columns, config.setting)
- })
- }
+ let plot = fromJS(config.plot).toJS()
- radioChange = (e, key) => {
- const { formlist } = this.state
- let val = e.target.value
-
- if (key === 'datatype') {
- this.setState({
- disabled: val === 'statistics',
- formlist: formlist.map(item => {
- if (['Yaxis'].includes(item.key)) {
- item.hidden = val === 'statistics'
- } else if (['InfoType', 'InfoValue', 'InfoDefNumber'].includes(item.key)) {
- item.hidden = val !== 'statistics'
+ if (plot.datatype !== 'statistics') {
+ if (plot.colors) {
+ plot.colors = plot.colors.map(item => {
+ if (fieldName[item.type]) {
+ item.label = fieldName[item.type]
}
return item
})
+ }
+ if (plot.customs) {
+ plot.customs = plot.customs.map(item => {
+ if (fieldName[item.type]) {
+ item.name = fieldName[item.type]
+ }
+ return item
+ })
+ }
+ }
+
+ if (!plot.zoomYaxis && plot.customs) {
+ plot.customs.forEach(item => {
+ if (item.min || item.min === 0) {
+ plot.zoomYaxis = 'custom'
+ } else if (item.max || item.max === 0) {
+ plot.zoomYaxis = 'custom'
+ }
})
}
- }
- getFields() {
- const { formlist } = this.state
- const { getFieldDecorator } = this.props.form
- const fields = []
+ plot.zoomYaxis = plot.zoomYaxis || 'default'
- if (!formlist) {
- return fields
+ let datatype = plot.datatype || 'query'
+ if (plot.enabled === 'true') {
+ datatype = 'custom'
}
- formlist.forEach((item, index) => {
- if (item.hidden || item.forbid) return
-
- if (item.type === 'text') {
- fields.push(
- <Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal,
- rules: [
- {
- required: !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
- }
- ]
- })(<Input placeholder="" autoComplete="off" disabled={item.readonly}/>)}
- </Form.Item>
- </Col>
- )
- } else if (item.type === 'number') {
- fields.push(
- <Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal,
- rules: [
- {
- required: !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
- }
- ]
- })(<InputNumber min={item.min} max={item.max} precision={item.decimal} />)}
- </Form.Item>
- </Col>
- )
- } else if (item.type === 'select') { // 涓嬫媺
- fields.push(
- <Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal,
- rules: [
- {
- required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
- }
- ]
- })(
- <Select mode={item.multi ? 'multiple' : ''}>
- {item.options.map((option, index) =>
- <Select.Option key={index} value={option.field}>
- {option.label}
- </Select.Option>
- )}
- </Select>
- )}
- </Form.Item>
- </Col>
- )
- } else if (item.type === 'radio') {
- fields.push(
- <Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal,
- rules: [
- {
- required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
- }
- ]
- })(
- <Radio.Group 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>
- )
- })}
- </Radio.Group>
- )}
- </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}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal
- })(
- <ColorSketch />
- )}
- </Form.Item>
- </Col>
- )
- }
+ this.setState({
+ visible: true,
+ view: 'base',
+ datatype: datatype,
+ fieldName: fieldName,
+ plot: plot,
+ baseFormlist: getBaseForm(plot, config.columns),
+ formlist: getOptionForm(plot, config.columns),
+ cusColumns: this.getCusColumns(plot.zoomYaxis)
})
- 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'
- }
- })
+ optionChange = (val, key) => {
+ let _plot = {...this.state.plot, [key]: val}
- this.props.form.setFieldsValue(fieldvalue)
+ if (key === 'ramp' && val === 'true') {
+ _plot.colors = _plot.colors || []
+ _plot.colors = _plot.colors.map(item => {
+ item.color1 = item.color1 || item.color
+ return item
+ })
+ }
+
+ this.setState({plot: _plot}, () => {
+ if (key === 'zoomYaxis') {
+ this.setState({cusColumns: this.getCusColumns(val)})
+ }
+ })
}
- enabledChange = (e) => {
- let val = e.target.value
+ getCusColumns = (zoomYaxis) => {
+ let cusColumns = [
+ {
+ title: '鎸囨爣',
+ dataIndex: 'name',
+ editable: false,
+ width: '12%'
+ },
+ {
+ 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锛堥噾瀛楀锛�' }
+ ],
+ }
+ ]
+ },
+ {
+ 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,
+ required: false,
+ width: '12%',
+ options: [
+ { value: 'true', text: '鏄剧ず'},
+ { value: 'false', text: '闅愯棌'}
+ ],
+ render: (text, record) => {
+ if (record.axis !== 'true') return ''
+ let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
+ return trans[text] || ''
+ }
+ },
+ {
+ title: '鏄剧ず锛堝��/%锛�',
+ dataIndex: 'show',
+ inputType: 'select',
+ editable: true,
+ required: false,
+ width: '12%',
+ options: [
+ { value: 'value', text: '鏁板��'},
+ { value: 'percent', text: '鐧惧垎姣�'},
+ { value: 'thdSeparator', text: '鍗冨垎浣�'}
+ ],
+ render: (text, record) => {
+ let trans = {value: '鏁板��', percent: '鐧惧垎姣�', thdSeparator: '鍗冨垎浣�'}
+ return trans[text] || '鏁板��'
+ }
+ },
+ {
+ title: '鏈�灏忓��',
+ dataIndex: 'min',
+ inputType: 'number',
+ editable: true,
+ max: 9999999999,
+ required: false,
+ width: '12%'
+ },
+ {
+ title: '鏈�澶у��',
+ dataIndex: 'max',
+ inputType: 'number',
+ editable: true,
+ max: 9999999999,
+ required: false,
+ width: '12%'
+ },
+ ]
- this.setState({enabled: val})
+ if (zoomYaxis !== 'custom') {
+ cusColumns.pop()
+ cusColumns.pop()
+ cusColumns.forEach(item => {
+ item.width = '16%'
+ })
+ }
+
+ return cusColumns
}
onSubmit = () => {
const { config } = this.props
- const { plot, view, datatype } = this.state
+ const { plot, view } = this.state
- if (view !== 'custom') {
- this.props.form.validateFieldsAndScroll((err, values) => {
- if (!err) {
- let _plot = {...plot, ...values}
+ if (view === 'normal') {
+ this.normalRef.handleConfirm().then(values => {
+ 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({...config, plot: _plot})
+ if (_plot.datatype === 'custom') {
+ _plot.datatype = 'query'
+ _plot.enabled = 'true'
+ _plot.show = 'value'
+ } else {
+ _plot.enabled = 'false'
}
+
+ if (_plot.datatype !== plot.datatype) {
+ _plot.colors = null
+ }
+
+ this.resetPlot(_plot)
+
+ 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.resetBase(_plot)
+
+ this.setState({
+ plot: _plot,
+ visible: false
+ })
+
+ this.props.plotchange({...config, plot: _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)
- }
+ 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') {
- this.props.form.validateFieldsAndScroll((err, values) => {
- if (!err) {
- let _plot = {...plot, ...values}
+ if (view === 'normal') {
+ this.normalRef.handleConfirm().then(values => {
+ let _plot = {...plot, ...values}
- if (_plot.enabled !== 'true' || _plot.customs.map(_cell => _cell.field).sort().toString() !== _plot.Yaxis.sort().toString()) {
- _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
- })
- }
-
- this.setState({
- enabled: _plot.enabled || 'false',
- plot: _plot,
- view: tab
- })
+ if (_plot.datatype === 'custom') {
+ _plot.datatype = 'query'
+ _plot.enabled = 'true'
+ _plot.show = 'value'
+ } else {
+ _plot.enabled = 'false'
}
+
+ if (_plot.datatype !== plot.datatype) {
+ _plot.colors = null
+ }
+
+ this.resetPlot(_plot)
+
+ this.setState({
+ plot: _plot,
+ view: tab
+ })
+ })
+ } else if (view === 'base') {
+ this.baseRef.handleConfirm().then(res => {
+ let _plot = {...plot, ...res}
+
+ this.resetBase(_plot)
+
+ if (!plot.Xaxis && (tab === 'color' || tab === 'custom')) {
+ this.setState({
+ plot: _plot,
+ view: 'normal'
+ })
+ notification.warning({
+ top: 92,
+ message: '璇锋坊鍔犲浘琛ㄨ缃��',
+ duration: 3
+ })
+ return
+ }
+
+ this.setState({
+ plot: _plot,
+ view: tab
+ })
})
} else {
- this.props.form.validateFieldsAndScroll((err, values) => {
- if (!err) {
- let _values = {enabled: values.enabled}
+ this.setState({
+ view: tab
+ })
+ }
+ }
- if (values.enabled === 'true') {
- let _customs = []
- plot.Yaxis.forEach(field => {
- let _item = {field: field}
+ resetBase = (_plot) => {
+ if (_plot.click === 'menu') {
+ delete _plot.menus
+ delete _plot.menuType
+ } else if (_plot.click === 'menus') {
+ delete _plot.menu
+ } else {
+ delete _plot.menus
+ delete _plot.menu
+ delete _plot.menuType
+ }
- _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]
+ delete _plot.MenuID
+ delete _plot.MenuName
+ delete _plot.MenuNo
+ delete _plot.tabType
- _item.axis = values[field + '$axis']
- _item.label = values[field + '$label']
-
- _customs.push(_item)
- })
+ if (_plot.click === 'menu' && sessionStorage.getItem('appType') === '' && _plot.menu) {
+ let list = null
+ try {
+ list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+ } catch (e) {
+ list = []
+ }
- _values.customs = _customs
- } else {
- _values.customs = null
- }
+ let id = _plot.menu[_plot.menu.length - 1]
- let _plot = {...plot, ..._values}
-
- this.setState({
- plot: _plot,
- view: tab,
- formlist: getBarOrLineChartOptionForm(_plot, config.columns)
- })
+ list.forEach(item => {
+ if (item.MenuID === id) {
+ _plot.MenuID = id
+ _plot.MenuName = item.MenuName
+ _plot.MenuNo = item.MenuNo
+ _plot.tabType = item.type
}
})
}
+ }
+ resetPlot = (_plot) => {
+ const { config } = this.props
+
+ if (_plot.chartType === 'bar') {
+ _plot.transpose = _plot.shape === 'barChart' ? 'true' : 'false'
+ _plot.coordinate = _plot.shape === 'roseChart' ? 'polar' : 'angle'
+ if (_plot.shape === 'barChart' || _plot.shape === 'roseChart') {
+ _plot.shape = 'rect'
+ }
+ }
+
+ if (_plot.axis) {
+ _plot.grid = _plot.axis.includes('grid') ? 'show' : 'hidden'
+ _plot.x_line = _plot.axis.includes('x_line') ? 'show' : 'hidden'
+ _plot.y_line = _plot.axis.includes('y_line') ? 'show' : 'hidden'
+ _plot.tick = _plot.axis.includes('tick') ? 'show' : 'hidden'
+
+ delete _plot.axis
+ }
+
+ if (_plot.tickVals) {
+ _plot.x_label = _plot.tickVals.includes('x_label') ? 'show' : 'hidden'
+ _plot.y_label = _plot.tickVals.includes('y_label') ? 'show' : 'hidden'
+
+ delete _plot.tickVals
+ }
+
+ if (_plot.datatype === 'statistics') {
+ _plot.enabled = 'false'
+ _plot.customs = []
+ _plot.colors = _plot.colors || []
+ delete _plot.Yaxis
+ } else if (_plot.Yaxis) {
+ delete _plot.InfoType
+ delete _plot.InfoValue
+
+ let yaxis = JSON.parse(JSON.stringify(_plot.Yaxis))
+ let caxis = _plot.customs ? _plot.customs.map(m => m.type) : []
+ yaxis.sort()
+ caxis.sort()
+
+ if (JSON.stringify(yaxis) !== JSON.stringify(caxis)) {
+ let labels = {}
+ config.columns.forEach(col => {
+ labels[col.field] = col.label
+ })
+
+ let cus = {}
+ _plot.customs && _plot.customs.forEach(m => {
+ cus[m.type] = m
+ })
+ _plot.customs = _plot.Yaxis.map((item, i) => {
+ if (cus[item]) return cus[item]
+
+ return {
+ uuid: Utils.getuuid(),
+ type: item,
+ name: labels[item] || item,
+ axis: i === 0 ? 'true' : 'false',
+ label: _plot.label === 'false' ? 'false' : true,
+ show: 'value',
+ title: 'false',
+ shape: _plot.chartType === 'bar' && i === 0 ? ['bar', 'rect'] : ['line', 'smooth']
+ }
+ })
+
+ let cusColor = {}
+ let limit = chartColors.length
+
+ _plot.colors && _plot.colors.forEach(m => {
+ cusColor[m.type] = m
+ })
+ _plot.colors = _plot.Yaxis.map((item, i) => {
+ if (cusColor[item]) return cusColor[item]
+
+ return {
+ uuid: Utils.getuuid(),
+ type: item,
+ label: labels[item] || item,
+ color: chartColors[i % limit],
+ color1: chartColors[i % limit]
+ }
+ })
+ }
+ }
+ }
+
+ transVals = (values, key) => {
+ if (key !== 'datatype') return
+
+ this.setState({
+ datatype: values.datatype
+ })
+ }
+
+ 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})
+ }
+
+ addbarColor = () => {
+ let plot = fromJS(this.state.plot).toJS()
+ plot.barcolors = plot.barcolors || []
+
+ plot.barcolors.push({
+ uuid: Utils.getuuid(),
+ color: 'rgb(91, 143, 249)'
+ })
+
+ this.setState({plot})
+ }
+
+ changeColor = (colors) => {
+ const { plot } = this.state
+
+ this.setState({plot: {...plot, colors}})
+ }
+
+ changebarColor = (colors) => {
+ const { plot } = this.state
+
+ this.setState({plot: {...plot, barcolors: colors}})
+ }
+
+ changeCustom = (customs) => {
+ const { plot } = this.state
+
+ this.setState({plot: {...plot, customs}})
}
render() {
- const { view, visible, disabled } = this.state
+ const { config } = this.props
+ const { view, visible, datatype, plot, colorColumns, barColorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist, formlist } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -504,28 +657,92 @@
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="鍥捐〃缂栬緫"
+ wrapClassName="mk-pop-modal"
visible={visible}
- width={850}
+ width={1200}
maskClosable={false}
onOk={this.onSubmit}
onCancel={() => { this.setState({ visible: false }) }}
destroyOnClose
>
- <Tabs activeKey={view} className="menu-chart-edit-box" onChange={this.changeTab}>
- <TabPane tab="鍩虹璁剧疆" key="normal">
- {view === 'normal' ? <Form {...formItemLayout}>
- <Row gutter={16}>{this.getFields()}</Row>
- </Form> : null}
+ {config.name ? <div className="mk-com-name">{config.name} - 缂栬緫</div> : null}
+ <Tabs activeKey={view} className="menu-chart-line-edit-box" onChange={this.changeTab}>
+ <TabPane tab="缁勪欢璁剧疆" key="base">
+ <ModalForm formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
</TabPane>
- <TabPane tab="鑷畾涔夎缃�" disabled={disabled} key="custom">
- {view === 'custom' ? <Form {...formItemLayout}>
- <Row gutter={16}>{this.getCustomFields()}</Row>
- </Form> : null}
+ <TabPane tab="鍥捐〃璁剧疆" key="normal">
+ <ModalForm formlist={formlist} inputSubmit={this.onSubmit} transVals={this.transVals} wrappedComponentRef={(inst) => this.normalRef = inst}/>
</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={(e) => this.optionChange(e.target.value, 'ramp')}>
+ <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={(e) => this.optionChange(e.target.value, 'rampDirection')}>
+ <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}>娣诲姞</Button> : null}
+ {datatype === 'statistics' ? <EditTable actions={['edit', 'move', 'del']} data={plot.colors || []} columns={plot.ramp ==='true' ? rampStatColorColumns : statColorColumns} onChange={this.changeColor}/> : null}
+ {datatype !== 'statistics' ? <EditTable actions={['edit']} data={plot.colors || []} columns={plot.ramp ==='true' ? rampColorColumns : colorColumns} onChange={this.changeColor}/> : null}
+ {plot.chartType === 'bar' && datatype === 'query' ? <div className="mk-bar-colors">
+ <p>鏌卞舰棰滆壊锛氬彲鏍规嵁鏌卞浘搴忓彿璁剧疆棰滆壊銆傛敞锛氬鏍规煴鍥炬椂鏃犳晥銆�</p>
+ <div className="bar-color-add"><PlusOutlined onClick={this.addbarColor}/></div>
+ <EditTable actions={['edit', 'move', 'del']} data={plot.barcolors || []} columns={barColorColumns} onChange={this.changebarColor}/>
+ </div> : null}
+ </div>
+ </TabPane> : null}
+ {plot ? <TabPane tab="鑷畾涔夊浘褰㈣缃�" disabled={datatype !== 'custom'} key="custom">
+ {/* <Col span={8}>
+ <Form {...formItemLayout}>
+ <Form.Item label="鏄惁鍚敤" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.enabled || 'false'} onChange={(e) => this.optionChange(e.target.value, 'enabled')}>
+ <Radio value="true">鏄�</Radio>
+ <Radio value="false">鍚�</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col> */}
+ {/* <Col span={8}>
+ <Form {...formItemLayout}>
+ <Form.Item label="澶氭煴鎺掑垪" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.mutilBar || 'dodge'} onChange={(e) => this.optionChange(e.target.value, 'mutilBar')}>
+ <Radio value="dodge">鍒嗙粍</Radio>
+ <Radio value="stack">鍫嗗彔</Radio>
+ <Radio value="overlap">閲嶅彔</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col> */}
+ <Col span={8}>
+ <Form {...formItemLayout}>
+ <Form.Item label="Y杞村尯闂�" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.zoomYaxis} onChange={(e) => this.optionChange(e.target.value, 'zoomYaxis')}>
+ <Radio value="default">榛樿</Radio>
+ <Radio value="custom">鑷畾涔�</Radio>
+ <Radio value="adjust">鑷�傚簲</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col>
+ <Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浣跨敤鑷畾涔夎缃椂锛屾樉绀虹殑鍧愭爣杞寸涓�涓湪宸︿晶锛岀浜屼釜鍦ㄥ彸渚э紝澶氫綑鐨勪笉鐢熸晥銆�</Col>
+ <EditTable indexShow={false} actions={['edit', 'move']} data={plot.customs || []} columns={cusColumns} onChange={this.changeCustom}/>
+ </TabPane> : null}
</Tabs>
</Modal>
</div>
--
Gitblit v1.8.0