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 | 488 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 317 insertions(+), 171 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index b2d1d56..b6ddf6e 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -1,8 +1,8 @@
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 } from '@ant-design/icons'
+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'
@@ -17,14 +17,13 @@
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: '',
@@ -45,6 +44,18 @@
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>)
}
@@ -126,130 +137,7 @@
}
},
],
- 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' }
- ],
- }
- ]
- },
- {
- 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) => {
- 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: '鐧惧垎姣�'}
- ],
- render: (text, record) => {
- let trans = {'value': '鏁板��', 'percent': '鐧惧垎姣�'}
- 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%'
- },
- ]
+ cusColumns: []
}
showDrawer = () => {
@@ -262,20 +150,54 @@
}
})
- if (config.plot.correction) {
- delete config.plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
- config.plot.barSize = 35
+ 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: 'normal',
- ramp: config.plot.ramp || 'false',
- datatype: config.plot.datatype || 'query',
+ view: 'base',
+ ramp: plot.ramp || 'false',
+ datatype: plot.datatype || 'query',
fieldName: fieldName,
- plot: fromJS(config.plot).toJS(),
- baseFormlist: getBaseForm(config.plot, config.columns),
- formlist: getOptionForm(config.plot, config.columns)
+ plot: plot,
+ baseFormlist: getBaseForm(plot, config.columns),
+ formlist: getOptionForm(plot, config.columns),
+ cusColumns: this.getCusColumns(plot.zoomYaxis)
})
}
@@ -344,7 +266,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
}
]
})(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.onSubmit}/>)}
@@ -365,7 +287,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
}
]
})(<InputNumber min={item.min} max={item.max} precision={item.decimal} onPressEnter={this.onSubmit}/>)}
@@ -386,7 +308,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
@@ -415,7 +337,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
@@ -459,6 +381,153 @@
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: '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) => {
+ 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%'
+ },
+ ]
+
+ if (zoomYaxis !== 'custom') {
+ cusColumns.pop()
+ cusColumns.pop()
+ cusColumns.forEach(item => {
+ item.width = '16%'
+ })
+ }
+
+ return cusColumns
+ }
+
mutilBarChange = (e) => {
const { plot } = this.state
let val = e.target.value
@@ -497,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({
@@ -580,34 +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
@@ -669,6 +768,19 @@
})
}
+ 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
@@ -695,10 +807,28 @@
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) => {
@@ -709,7 +839,7 @@
render() {
const { config } = this.props
- const { view, visible, datatype, plot, ramp, colorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist } = this.state
+ const { view, visible, datatype, plot, ramp, colorColumns, barColorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -725,18 +855,18 @@
<div className="line-chart-drawer-form">
<EditOutlined title="缂栬緫" onClick={this.showDrawer}/>
<Modal
- wrapClassName="popview-modal menu-chart-edit-modal"
- title={config.type === 'bar' ? '鏌辩姸鍥剧紪杈�' : '鎶樼嚎鍥剧紪杈�'}
+ wrapClassName="mk-pop-modal"
visible={visible}
- width={1000}
+ 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}>
@@ -765,13 +895,18 @@
</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' ? <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}>
@@ -781,7 +916,7 @@
</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}>
@@ -792,6 +927,17 @@
</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}
--
Gitblit v1.8.0