From 41accaed7b2260f9033701f048b5b65b01a6369d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 十一月 2023 15:42:19 +0800
Subject: [PATCH] 2023-11-21
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 854 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 631 insertions(+), 223 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index db034f3..b6ddf6e 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { Modal, Form, Row, Col, Select, Radio, notification, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { QuestionCircleOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import { chartColors } from '@/utils/option.js'
@@ -16,14 +17,14 @@
class LineChartDrawerForm extends Component {
static propTpyes = {
- dict: PropTypes.object,
plot: PropTypes.object,
config: PropTypes.object,
plotchange: PropTypes.func
}
state = {
- view: 'normal',
+ view: 'base',
+ ramp: 'false',
visible: false,
datatype: '',
plot: null,
@@ -48,6 +49,46 @@
}
},
],
+ 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: '鎸囨爣',
@@ -67,19 +108,300 @@
}
},
],
- cusColumns: [
+ 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 = () => {
+ const { config } = this.props
+
+ let fieldName = {}
+ config.columns.forEach(col => {
+ if (col.field) {
+ fieldName[col.field] = col.label
+ }
+ })
+
+ let plot = fromJS(config.plot).toJS()
+
+ if (plot.correction) {
+ delete plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
+ plot.barSize = 35
+ }
+
+ 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'
+ }
+ })
+ }
+
+ plot.zoomYaxis = plot.zoomYaxis || 'default'
+
+ this.setState({
+ visible: true,
+ view: 'base',
+ ramp: plot.ramp || 'false',
+ datatype: plot.datatype || 'query',
+ fieldName: fieldName,
+ plot: plot,
+ baseFormlist: getBaseForm(plot, config.columns),
+ formlist: getOptionForm(plot, config.columns),
+ cusColumns: this.getCusColumns(plot.zoomYaxis)
+ })
+ }
+
+ radioChange = (e, key) => {
+ const { formlist } = this.state
+ let val = e.target.value
+
+ if (key === 'datatype') {
+ this.setState({
+ datatype: val,
+ formlist: fromJS(formlist).toJS().map(item => {
+ if (['Yaxis'].includes(item.key)) {
+ item.hidden = val === 'statistics'
+ } else if (['InfoType', 'InfoValue'].includes(item.key)) {
+ item.hidden = val !== 'statistics'
+ }
+ return item
+ })
+ })
+ } else if (key === 'label') {
+ this.setState({formlist: fromJS(formlist).toJS().map(cell => {
+ if (!['labelColor', 'labelValue'].includes(cell.key)) return cell
+
+ if (cell.key === 'labelColor') {
+ if (val !== 'true') {
+ cell.hidden = true
+ } else {
+ cell.hidden = false
+ }
+ } else {
+ if (val === 'false') {
+ cell.hidden = true
+ } else {
+ cell.hidden = false
+ }
+ }
+
+ return cell
+ })})
+ }
+ }
+
+ getFields() {
+ const { formlist } = this.state
+ const { getFieldDecorator } = this.props.form
+ const fields = []
+
+ if (!formlist) {
+ return fields
+ }
+
+ 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}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal,
+ rules: [
+ {
+ required: !!item.required,
+ message: '璇疯緭鍏�' + item.label + '!'
+ }
+ ]
+ })(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.onSubmit}/>)}
+ </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}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal,
+ rules: [
+ {
+ required: !!item.required,
+ message: '璇疯緭鍏�' + item.label + '!'
+ }
+ ]
+ })(<InputNumber min={item.min} max={item.max} precision={item.decimal} onPressEnter={this.onSubmit}/>)}
+ </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}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal,
+ rules: [
+ {
+ required: !!item.required,
+ message: '璇烽�夋嫨' + item.label + '!'
+ }
+ ]
+ })(
+ <Select mode={item.multi ? 'multiple' : ''}>
+ {item.options.map((option, index) =>
+ <Select.Option key={index} value={option.field || option.value}>
+ {option.label || option.text}
+ </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}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal,
+ rules: [
+ {
+ required: !!item.required,
+ message: '璇烽�夋嫨' + item.label + '!'
+ }
+ ]
+ })(
+ <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>
+ )
+ })}
+ </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}>
+ <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
+ }
+
+ enabledChange = (e) => {
+ const { plot } = this.state
+ let val = e.target.value
+
+ this.setState({plot: {...plot, enabled: val}})
+ }
+
+ zoomChange = (e) => {
+ const { plot } = this.state
+ let val = e.target.value
+
+ this.setState({plot: {...plot, zoomYaxis: val}, cusColumns: this.getCusColumns(val)})
+ }
+
+ getCusColumns = (zoomYaxis) => {
+ let cusColumns = [
{
title: '鎸囨爣',
dataIndex: 'name',
editable: false,
- width: '20%'
+ width: '12%'
},
{
title: '褰㈢姸',
dataIndex: 'shape',
inputType: 'cascader',
editable: true,
- width: '20%',
+ width: '12%',
render: (text, record) => {
return text.join(' / ').replace('line', '鎶樼嚎').replace('bar', '鏌卞舰')
},
@@ -117,7 +439,7 @@
dataIndex: 'axis',
inputType: 'select',
editable: true,
- width: '20%',
+ width: '12%',
options: [
{ value: 'true', text: '鏄剧ず'},
{ value: 'false', text: '闅愯棌'}
@@ -132,203 +454,107 @@
dataIndex: 'label',
inputType: 'select',
editable: true,
- width: '20%',
+ width: '12%',
options: [
{ value: 'true', text: '鏄剧ず'},
{ value: 'false', text: '闅愯棌'}
],
render: (text, record) => {
let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
- return trans[text] || '闅愯棌'
+ return trans[text] || ''
}
},
+ {
+ title: '鏍囬',
+ dataIndex: 'title',
+ inputType: 'select',
+ editable: true,
+ required: false,
+ width: '12%',
+ options: [
+ { value: 'true', text: '鏄剧ず'},
+ { value: 'false', text: '闅愯棌'}
+ ],
+ render: (text, record) => {
+ 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%'
+ },
]
- }
- showDrawer = () => {
- const { config } = this.props
-
- let fieldName = {}
- config.columns.forEach(col => {
- if (col.field) {
- fieldName[col.field] = col.label
- }
- })
-
- if (config.plot.correction) {
- delete config.plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
- config.plot.barSize = 35
- }
-
- this.setState({
- visible: true,
- view: 'normal',
- datatype: config.plot.datatype || 'query',
- fieldName: fieldName,
- plot: fromJS(config.plot).toJS(),
- baseFormlist: getBaseForm(config.plot),
- formlist: getOptionForm(config.plot, config.columns)
- })
- }
-
- radioChange = (e, key) => {
- const { formlist } = this.state
- let val = e.target.value
-
- if (key === 'datatype') {
- this.setState({
- datatype: val,
- 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'
- }
- return item
- })
+ if (zoomYaxis !== 'custom') {
+ cusColumns.pop()
+ cusColumns.pop()
+ cusColumns.forEach(item => {
+ item.width = '16%'
})
}
+
+ return cusColumns
}
- getFields() {
- const { formlist } = this.state
- const { getFieldDecorator } = this.props.form
- const fields = []
-
- if (!formlist) {
- return fields
- }
-
- 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} onPressEnter={this.onSubmit}/>)}
- </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} onPressEnter={this.onSubmit}/>)}
- </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.value}>
- {option.label || option.text}
- </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>
- )
- }
- })
- return fields
- }
-
- enabledChange = (e) => {
+ mutilBarChange = (e) => {
const { plot } = this.state
let val = e.target.value
- this.setState({plot: {...plot, enabled: val}})
+ 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 = () => {
@@ -340,17 +566,39 @@
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
- }
-
if (values.datatype !== plot.datatype) {
_plot.colors = null
+ }
+ if (values.datatype === 'statistics') {
+ _plot.enabled = 'false'
+ _plot.customs = []
+ delete _plot.Yaxis
+ } else if (!is(fromJS(values.Yaxis), fromJS(plot.Yaxis || []))) {
+ // _plot.enabled = 'false'
+ // _plot.colors = null
+
+ 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: 'false',
+ title: 'true',
+ shape: _plot.chartType === 'bar' && i === 0 ? ['bar', 'rect'] : ['line', 'smooth']
+ }
+ })
}
this.setState({
@@ -364,6 +612,40 @@
} else if (view === 'base') {
this.baseRef.handleConfirm().then(res => {
let _plot = {...plot, ...res}
+
+ if (res.click === 'menu') {
+ delete _plot.menus
+ } else if (res.click === 'menus') {
+ delete _plot.menu
+ } else {
+ delete _plot.menus
+ delete _plot.menu
+ }
+
+ delete _plot.MenuID
+ delete _plot.MenuName
+ delete _plot.MenuNo
+ delete _plot.tabType
+
+ if (_plot.click === 'menu' && sessionStorage.getItem('appType') === '' && _plot.menu) {
+ let list = null
+ try {
+ list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+ } catch (e) {
+ list = []
+ }
+
+ let id = _plot.menu[_plot.menu.length - 1]
+
+ list.forEach(item => {
+ if (item.MenuID === id) {
+ _plot.MenuID = id
+ _plot.MenuName = item.MenuName
+ _plot.MenuNo = item.MenuNo
+ _plot.tabType = item.type
+ }
+ })
+ }
this.setState({
plot: _plot,
@@ -389,33 +671,42 @@
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)) {
+ if (values.datatype !== plot.datatype) {
+ _plot.colors = null
+ }
+ if (values.datatype === 'statistics') {
+ _plot.enabled = 'false'
+ _plot.customs = []
+ delete _plot.Yaxis
+ } else if (!is(fromJS(values.Yaxis), fromJS(plot.Yaxis || []))) {
+ // _plot.enabled = 'false'
+ // _plot.colors = null
+
+ 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: 'false',
+ label: _plot.label === 'false' ? 'false' : true,
+ title: 'true',
shape: _plot.chartType === 'bar' && i === 0 ? ['bar', 'rect'] : ['line', 'smooth']
}
})
}
- if (values.datatype !== plot.datatype || !_plot.colors) {
+
+ if (!_plot.colors) {
_plot.colors = []
if (_plot.datatype === 'query') {
let limit = chartColors.length
@@ -425,7 +716,8 @@
uuid: Utils.getuuid(),
type: item,
label: labels[item] || item,
- color: chartColors[i % limit]
+ color: chartColors[i % limit],
+ color1: chartColors[i % limit]
}
})
}
@@ -440,8 +732,57 @@
})
} else if (view === 'base') {
this.baseRef.handleConfirm().then(res => {
+ let _plot = {...plot, ...res}
+
+ if (res.click === 'menu') {
+ delete _plot.menus
+ } else if (res.click === 'menus') {
+ delete _plot.menu
+ } else {
+ delete _plot.menus
+ delete _plot.menu
+ }
+
+ delete _plot.MenuID
+ delete _plot.MenuName
+ delete _plot.MenuNo
+ delete _plot.tabType
+
+ if (_plot.click === 'menu' && sessionStorage.getItem('appType') === '' && _plot.menu) {
+ let list = null
+ try {
+ list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+ } catch (e) {
+ list = []
+ }
+
+ let id = _plot.menu[_plot.menu.length - 1]
+
+ list.forEach(item => {
+ if (item.MenuID === id) {
+ _plot.MenuID = id
+ _plot.MenuName = item.MenuName
+ _plot.MenuNo = item.MenuNo
+ _plot.tabType = item.type
+ }
+ })
+ }
+
+ 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, ...res},
+ plot: _plot,
view: tab
})
})
@@ -459,6 +800,19 @@
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)'
})
@@ -471,6 +825,12 @@
this.setState({plot: {...plot, colors}})
}
+ changebarColor = (colors) => {
+ const { plot } = this.state
+
+ this.setState({plot: {...plot, barcolors: colors}})
+ }
+
changeCustom = (customs) => {
const { plot } = this.state
@@ -478,7 +838,8 @@
}
render() {
- const { view, visible, datatype, plot, colorColumns, statColorColumns, cusColumns, baseFormlist } = this.state
+ const { config } = this.props
+ const { view, visible, datatype, plot, ramp, colorColumns, barColorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -492,20 +853,20 @@
return (
<div className="line-chart-drawer-form">
- <Icon type="edit" title="缂栬緫" 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={1100}
maskClosable={false}
onOk={this.onSubmit}
onCancel={() => { this.setState({ visible: false }) }}
destroyOnClose
>
+ {config.name ? <div className="mk-com-name">{config.name} - 缂栬緫</div> : null}
<Tabs activeKey={view} className="menu-chart-edit-box" onChange={this.changeTab}>
<TabPane tab="缁勪欢璁剧疆" key="base">
- <NormalForm dict={this.props.dict} formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
+ <NormalForm formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
</TabPane>
<TabPane tab="鍥捐〃璁剧疆" key="normal">
<Form {...formItemLayout}>
@@ -514,13 +875,38 @@
</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 actions={['edit', 'move', 'del']} data={plot.colors || []} columns={statColorColumns} onChange={this.changeColor}/> : null}
- {datatype !== 'statistics' ? <EditTable actions={['edit']} data={plot.colors || []} columns={colorColumns} onChange={this.changeColor}/> : null}
+ <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}>娣诲姞</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}
+ {plot.chartType === 'bar' && plot.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 === 'statistics'} key="custom">
- <Col span={12}>
+ {plot ? <TabPane tab="鑷畾涔夊浘褰㈣缃�" disabled={datatype === 'statistics'} key="custom">
+ <Col span={8}>
<Form {...formItemLayout}>
<Form.Item label="鏄惁鍚敤" style={{marginBottom: 10}}>
<Radio.Group value={plot.enabled || 'false'} onChange={this.enabledChange}>
@@ -530,8 +916,30 @@
</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}/>
+ <Col span={8}>
+ <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 span={8}>
+ <Form {...formItemLayout}>
+ <Form.Item label="Y杞村尯闂�" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.zoomYaxis} onChange={this.zoomChange}>
+ <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>
--
Gitblit v1.8.0