From 0eb129a9beddbb86ae74d7106a8e60823206b8d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 十二月 2023 11:29:15 +0800
Subject: [PATCH] 2023-12-14
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 757 ++++++++++++++++++++++-----------------------------------
1 files changed, 294 insertions(+), 463 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index f0bfcc6..8b6a146 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -1,19 +1,18 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { is, fromJS } from 'immutable'
-import { Modal, Form, Row, Col, Select, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
-import { QuestionCircleOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons'
+import { fromJS } from 'immutable'
+import { Modal, Form, Col, Radio, notification, Tabs, Button } from 'antd'
+import { EditOutlined, PlusOutlined } from '@ant-design/icons'
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'))
+const ModalForm = asyncComponent(() => import('@/components/normalform/modalform'))
class LineChartDrawerForm extends Component {
static propTpyes = {
@@ -23,8 +22,7 @@
}
state = {
- view: 'normal',
- ramp: 'false',
+ view: 'base',
visible: false,
datatype: '',
plot: null,
@@ -137,12 +135,89 @@
}
},
],
- cusColumns: [
+ 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.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',
+ datatype: plot.datatype || 'query',
+ fieldName: fieldName,
+ plot: plot,
+ baseFormlist: getBaseForm(plot, config.columns),
+ formlist: getOptionForm(plot, config.columns),
+ cusColumns: this.getCusColumns(plot.zoomYaxis)
+ })
+ }
+
+ optionChange = (val, key) => {
+ let _plot = {...this.state.plot, [key]: val}
+
+ 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)})
+ }
+ })
+ }
+
+ getCusColumns = (zoomYaxis) => {
+ let cusColumns = [
{
title: '鎸囨爣',
dataIndex: 'name',
editable: false,
- width: '14%'
+ width: '12%'
},
{
title: '褰㈢姸',
@@ -158,26 +233,26 @@
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: '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: '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锛堥噾瀛楀锛�' }
],
}
]
@@ -209,7 +284,7 @@
],
render: (text, record) => {
let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
- return trans[text] || '闅愯棌'
+ return trans[text] || ''
}
},
{
@@ -237,10 +312,11 @@
width: '12%',
options: [
{ value: 'value', text: '鏁板��'},
- { value: 'percent', text: '鐧惧垎姣�'}
+ { value: 'percent', text: '鐧惧垎姣�'},
+ { value: 'thdSeparator', text: '鍗冨垎浣�'}
],
render: (text, record) => {
- let trans = {'value': '鏁板��', 'percent': '鐧惧垎姣�'}
+ let trans = {value: '鏁板��', percent: '鐧惧垎姣�', thdSeparator: '鍗冨垎浣�'}
return trans[text] || ''
}
},
@@ -249,6 +325,7 @@
dataIndex: 'min',
inputType: 'number',
editable: true,
+ max: 9999999999,
required: false,
width: '12%'
},
@@ -257,267 +334,21 @@
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
- }
- })
-
- 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
- })
- }
- }
-
- this.setState({
- visible: true,
- view: 'normal',
- ramp: plot.ramp || 'false',
- datatype: plot.datatype || 'query',
- fieldName: fieldName,
- plot: plot,
- baseFormlist: getBaseForm(plot, config.columns),
- formlist: getOptionForm(plot, config.columns)
- })
- }
-
- 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}})
- }
-
- 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
+ if (zoomYaxis !== 'custom') {
+ cusColumns.pop()
+ cusColumns.pop()
+ cusColumns.forEach(item => {
+ item.width = '16%'
})
}
- 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}})
+ return cusColumns
}
onSubmit = () => {
@@ -525,90 +356,26 @@
const { plot, view } = this.state
if (view === 'normal') {
- this.props.form.validateFieldsAndScroll((err, values) => {
- if (!err) {
- let _plot = {...plot, ...values}
+ this.normalRef.handleConfirm().then(values => {
+ let _plot = {...plot, ...values}
- 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({
- plot: _plot,
- visible: false
- })
-
- this.props.plotchange({...config, plot: _plot})
+ 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}
- 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.resetBase(_plot)
this.setState({
plot: _plot,
@@ -626,109 +393,40 @@
}
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}
+ this.normalRef.handleConfirm().then(values => {
+ let _plot = {...plot, ...values}
- let labels = {}
- config.columns.forEach(col => {
- labels[col.field] = col.label
- })
-
- 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',
- title: 'true',
- shape: _plot.chartType === 'bar' && i === 0 ? ['bar', 'rect'] : ['line', 'smooth']
- }
- })
- }
-
- if (!_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({
- datatype: _plot.datatype,
- plot: _plot,
- view: tab
- })
+ 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}
- if (res.click === 'menu') {
- delete _plot.menus
- } else if (res.click === 'menus') {
- delete _plot.menu
- } else {
- delete _plot.menus
- delete _plot.menu
- }
+ this.resetBase(_plot)
- 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({
@@ -741,6 +439,130 @@
view: tab
})
}
+ }
+
+ 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
+ }
+
+ 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
+ }
+ })
+ }
+ }
+
+ resetPlot = (_plot) => {
+ const { config } = this.props
+
+ 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,
+ title: 'true',
+ 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 = () => {
@@ -789,7 +611,7 @@
render() {
const { config } = this.props
- const { view, visible, datatype, plot, ramp, colorColumns, barColorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist } = this.state
+ const { view, visible, datatype, plot, colorColumns, barColorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist, formlist } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -807,28 +629,26 @@
<Modal
wrapClassName="mk-pop-modal"
visible={visible}
- width={1000}
+ width={1200}
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}>
+ <Tabs activeKey={view} className="menu-chart-line-edit-box" onChange={this.changeTab}>
<TabPane tab="缁勪欢璁剧疆" key="base">
- <NormalForm formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
+ <ModalForm formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
</TabPane>
<TabPane tab="鍥捐〃璁剧疆" key="normal">
- <Form {...formItemLayout}>
- <Row gutter={16}>{this.getFields()}</Row>
- </Form>
+ <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={this.rampChange}>
+ <Radio.Group value={plot.ramp || 'false'} onChange={(e) => this.optionChange(e.target.value, 'ramp')}>
<Radio value="false">涓嶄娇鐢�</Radio>
<Radio value="true">浣跨敤</Radio>
</Radio.Group>
@@ -838,7 +658,7 @@
{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.Group value={plot.rampDirection || 'horizontal'} onChange={(e) => this.optionChange(e.target.value, 'rampDirection')}>
<Radio value="horizontal">姘村钩</Radio>
<Radio value="vertical">鍨傜洿</Radio>
</Radio.Group>
@@ -846,30 +666,30 @@
</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}
+ {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' && plot.datatype === 'query' ? <div className="mk-bar-colors">
- <p>鏌卞舰棰滆壊锛氬彲鏍规嵁鏌卞浘搴忓彿璁剧疆棰滆壊锛堣璁剧疆鏌卞舰瀹藉害锛夈�傛敞锛氫娇鐢ㄨ嚜瀹氫箟鍥惧舰璁剧疆鎴栧鏍规煴鍥炬椂鏃犳晥銆�</p>
+ <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}>
+ <Col span={8}>
<Form {...formItemLayout}>
<Form.Item label="鏄惁鍚敤" style={{marginBottom: 10}}>
- <Radio.Group value={plot.enabled || 'false'} onChange={this.enabledChange}>
+ <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={12}>
+ <Col span={8}>
<Form {...formItemLayout}>
<Form.Item label="澶氭煴鎺掑垪" style={{marginBottom: 10}}>
- <Radio.Group value={plot.mutilBar || 'dodge'} onChange={this.mutilBarChange}>
+ <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>
@@ -877,6 +697,17 @@
</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}
--
Gitblit v1.8.0