From 0c84df247914f893ef5e41d57a422e10a2dc814c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 十一月 2021 17:02:06 +0800
Subject: [PATCH] 2021-11-12
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 244 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 211 insertions(+), 33 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index 5390f44..ee2421e 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -1,34 +1,36 @@
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, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { QuestionCircleOutlined, EditOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import { chartColors } from '@/utils/option.js'
-import { getBarOrLineChartOptionForm } from './formconfig'
+import { getBaseForm, getOptionForm } from './formconfig'
import asyncComponent from '@/utils/asyncComponent'
import ColorSketch from '@/mob/colorsketch'
import './index.scss'
const { TabPane } = Tabs
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
+const NormalForm = asyncComponent(() => import('@/menu/components/share/normalform'))
class LineChartDrawerForm extends Component {
static propTpyes = {
- MenuType: PropTypes.any,
dict: PropTypes.object,
plot: PropTypes.object,
- sysRoles: PropTypes.array,
config: PropTypes.object,
plotchange: PropTypes.func
}
state = {
view: 'normal',
+ ramp: 'false',
visible: false,
datatype: '',
plot: null,
formlist: null,
+ baseFormlist: null,
fieldName: null,
colorColumns: [
{
@@ -43,6 +45,34 @@
inputType: 'color',
editable: true,
width: '40%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ ],
+ rampColorColumns: [
+ {
+ title: '鎸囨爣',
+ dataIndex: 'label',
+ editable: false,
+ width: '20%'
+ },
+ {
+ title: '棰滆壊1',
+ dataIndex: 'color',
+ inputType: 'color',
+ editable: true,
+ width: '30%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ {
+ title: '棰滆壊2',
+ dataIndex: 'color1',
+ inputType: 'color',
+ editable: true,
+ width: '30%',
render: (text, record) => {
return (<div style={{width: '80px', height: '23px', background: text}}></div>)
}
@@ -67,19 +97,48 @@
}
},
],
+ rampStatColorColumns: [
+ {
+ title: '鎸囨爣',
+ dataIndex: 'type',
+ inputType: 'input',
+ editable: true,
+ width: '20%'
+ },
+ {
+ title: '棰滆壊1',
+ dataIndex: 'color',
+ inputType: 'color',
+ editable: true,
+ width: '30%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ {
+ title: '棰滆壊2',
+ dataIndex: 'color1',
+ inputType: 'color',
+ editable: true,
+ width: '30%',
+ render: (text, record) => {
+ return (<div style={{width: '80px', height: '23px', background: text}}></div>)
+ }
+ },
+ ],
cusColumns: [
{
title: '鎸囨爣',
dataIndex: 'name',
editable: false,
- width: '20%'
+ width: '14%'
},
{
title: '褰㈢姸',
dataIndex: 'shape',
inputType: 'cascader',
editable: true,
- width: '20%',
+ width: '12%',
render: (text, record) => {
return text.join(' / ').replace('line', '鎶樼嚎').replace('bar', '鏌卞舰')
},
@@ -117,7 +176,7 @@
dataIndex: 'axis',
inputType: 'select',
editable: true,
- width: '20%',
+ width: '12%',
options: [
{ value: 'true', text: '鏄剧ず'},
{ value: 'false', text: '闅愯棌'}
@@ -132,7 +191,7 @@
dataIndex: 'label',
inputType: 'select',
editable: true,
- width: '20%',
+ width: '12%',
options: [
{ value: 'true', text: '鏄剧ず'},
{ value: 'false', text: '闅愯棌'}
@@ -142,11 +201,42 @@
return trans[text] || '闅愯棌'
}
},
+ {
+ title: '鏍囬',
+ dataIndex: 'title',
+ inputType: 'select',
+ editable: true,
+ width: '12%',
+ options: [
+ { value: 'true', text: '鏄剧ず'},
+ { value: 'false', text: '闅愯棌'}
+ ],
+ render: (text, record) => {
+ let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
+ return trans[text] || '鏄剧ず'
+ }
+ },
+ {
+ title: '鏈�灏忓��',
+ dataIndex: 'min',
+ inputType: 'number',
+ editable: true,
+ required: false,
+ width: '12%'
+ },
+ {
+ title: '鏈�澶у��',
+ dataIndex: 'max',
+ inputType: 'number',
+ editable: true,
+ required: false,
+ width: '12%'
+ },
]
}
showDrawer = () => {
- const { config, sysRoles, MenuType } = this.props
+ const { config } = this.props
let fieldName = {}
config.columns.forEach(col => {
@@ -163,10 +253,12 @@
this.setState({
visible: true,
view: 'normal',
+ ramp: config.plot.ramp || 'false',
datatype: config.plot.datatype || 'query',
fieldName: fieldName,
plot: fromJS(config.plot).toJS(),
- formlist: getBarOrLineChartOptionForm(config.plot, config.columns, sysRoles, MenuType)
+ baseFormlist: getBaseForm(config.plot),
+ formlist: getOptionForm(config.plot, config.columns)
})
}
@@ -180,7 +272,7 @@
formlist: formlist.map(item => {
if (['Yaxis'].includes(item.key)) {
item.hidden = val === 'statistics'
- } else if (['InfoType', 'InfoValue', 'InfoDefNumber'].includes(item.key)) {
+ } else if (['InfoType', 'InfoValue'].includes(item.key)) {
item.hidden = val !== 'statistics'
}
return item
@@ -206,7 +298,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -218,7 +310,7 @@
message: this.props.dict['form.required.input'] + item.label + '!'
}
]
- })(<Input placeholder="" autoComplete="off" disabled={item.readonly}/>)}
+ })(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.onSubmit}/>)}
</Form.Item>
</Col>
)
@@ -227,7 +319,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -239,7 +331,7 @@
message: this.props.dict['form.required.input'] + item.label + '!'
}
]
- })(<InputNumber min={item.min} max={item.max} precision={item.decimal} />)}
+ })(<InputNumber min={item.min} max={item.max} precision={item.decimal} onPressEnter={this.onSubmit}/>)}
</Form.Item>
</Col>
)
@@ -248,7 +340,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -263,8 +355,8 @@
})(
<Select mode={item.multi ? 'multiple' : ''}>
{item.options.map((option, index) =>
- <Select.Option key={index} value={option.field}>
- {option.label}
+ <Select.Option key={index} value={option.field || option.value}>
+ {option.label || option.text}
</Select.Option>
)}
</Select>
@@ -277,7 +369,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -290,7 +382,7 @@
}
]
})(
- <Radio.Group disabled={item.readonly} onChange={(e) => this.radioChange(e, item.key)}>
+ <Radio.Group style={{whiteSpace: 'nowrap'}} disabled={item.readonly} onChange={(e) => this.radioChange(e, item.key)}>
{item.options.map(option => {
return (
<Radio key={option.value} value={option.value}>{option.text}</Radio>
@@ -306,14 +398,14 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
{getFieldDecorator(item.key, {
initialValue: item.initVal
})(
- <ColorSketch />
+ <ColorSketch allowClear={item.allowClear} />
)}
</Form.Item>
</Col>
@@ -330,6 +422,35 @@
this.setState({plot: {...plot, enabled: val}})
}
+ mutilBarChange = (e) => {
+ const { plot } = this.state
+ let val = e.target.value
+
+ this.setState({plot: {...plot, mutilBar: val}})
+ }
+
+ rampChange = (e) => {
+ const { plot } = this.state
+ let val = e.target.value
+ let colors = plot.colors || []
+
+ if (val === 'true') {
+ colors = colors.map(item => {
+ item.color1 = item.color1 || item.color
+ return item
+ })
+ }
+
+ this.setState({plot: {...plot, colors, ramp: val}, ramp: val})
+ }
+
+ rampDirectionChange = (e) => {
+ const { plot } = this.state
+ let val = e.target.value
+
+ this.setState({plot: {...plot, rampDirection: val}})
+ }
+
onSubmit = () => {
const { config } = this.props
const { plot, view } = this.state
@@ -341,8 +462,10 @@
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
}
@@ -357,6 +480,17 @@
this.props.plotchange({...config, plot: _plot})
}
+ })
+ } else if (view === 'base') {
+ this.baseRef.handleConfirm().then(res => {
+ let _plot = {...plot, ...res}
+
+ this.setState({
+ plot: _plot,
+ visible: false
+ })
+
+ this.props.plotchange({...config, plot: _plot})
})
} else {
this.setState({
@@ -397,7 +531,8 @@
name: labels[item] || item,
axis: i === 0 ? 'true' : 'false',
label: 'false',
- shape: _plot.chartType === 'bar' ? ['bar', 'rect'] : ['line', 'smooth']
+ title: 'true',
+ shape: _plot.chartType === 'bar' && i === 0 ? ['bar', 'rect'] : ['line', 'smooth']
}
})
}
@@ -411,7 +546,8 @@
uuid: Utils.getuuid(),
type: item,
label: labels[item] || item,
- color: chartColors[i % limit]
+ color: chartColors[i % limit],
+ color1: chartColors[i % limit]
}
})
}
@@ -423,6 +559,13 @@
view: tab
})
}
+ })
+ } else if (view === 'base') {
+ this.baseRef.handleConfirm().then(res => {
+ this.setState({
+ plot: {...plot, ...res},
+ view: tab
+ })
})
} else {
this.setState({
@@ -438,7 +581,8 @@
plot.colors.push({
uuid: Utils.getuuid(),
type: `鎸囨爣${plot.colors.length}`,
- color: 'rgb(91, 143, 249)'
+ color: 'rgb(91, 143, 249)',
+ color1: 'rgb(91, 143, 249)'
})
this.setState({plot})
@@ -457,7 +601,7 @@
}
render() {
- const { view, visible, datatype, plot, colorColumns, statColorColumns, cusColumns } = this.state
+ const { view, visible, datatype, plot, ramp, colorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -471,28 +615,51 @@
return (
<div className="line-chart-drawer-form">
- <Icon type="edit" onClick={this.showDrawer} />
+ <EditOutlined title="缂栬緫" onClick={this.showDrawer}/>
<Modal
wrapClassName="popview-modal menu-chart-edit-modal"
title="鍥捐〃缂栬緫"
visible={visible}
- width={850}
+ width={950}
maskClosable={false}
onOk={this.onSubmit}
onCancel={() => { this.setState({ visible: false }) }}
destroyOnClose
>
<Tabs activeKey={view} className="menu-chart-edit-box" onChange={this.changeTab}>
- <TabPane tab="鍩虹璁剧疆" key="normal">
+ <TabPane tab="缁勪欢璁剧疆" key="base">
+ <NormalForm dict={this.props.dict} formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
+ </TabPane>
+ <TabPane tab="鍥捐〃璁剧疆" key="normal">
<Form {...formItemLayout}>
<Row gutter={16}>{this.getFields()}</Row>
</Form>
</TabPane>
{plot ? <TabPane tab="棰滆壊璁剧疆" key="color">
<div>
+ <Col span={8} style={{height: '40px', top: '-5px', zIndex: 1}}>
+ <Form {...formItemLayout}>
+ <Form.Item label="娓愬彉鑹�" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.ramp || 'false'} onChange={this.rampChange}>
+ <Radio value="false">涓嶄娇鐢�</Radio>
+ <Radio value="true">浣跨敤</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col>
+ {plot.chartType === 'line' ? <Col span={8} style={{height: '40px', top: '-5px', zIndex: 1}}>
+ <Form {...formItemLayout}>
+ <Form.Item label="娓愬彉鏂瑰悜" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.rampDirection || 'horizontal'} onChange={this.rampDirectionChange}>
+ <Radio value="horizontal">姘村钩</Radio>
+ <Radio value="vertical">鍨傜洿</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col> : null}
{datatype === 'statistics' ? <Button className="color-add mk-green" onClick={this.addColor}>{this.props.dict['model.add']}</Button> : null}
- {datatype === 'statistics' ? <EditTable data={plot.colors || []} columns={statColorColumns} onChange={this.changeColor}/> : null}
- {datatype !== 'statistics' ? <EditTable actions={['edit']} data={plot.colors || []} columns={colorColumns} onChange={this.changeColor}/> : null}
+ {datatype === 'statistics' ? <EditTable actions={['edit', 'move', 'del']} data={plot.colors || []} columns={ramp ==='true' ? rampStatColorColumns : statColorColumns} onChange={this.changeColor}/> : null}
+ {datatype !== 'statistics' ? <EditTable actions={['edit']} data={plot.colors || []} columns={ramp ==='true' ? rampColorColumns : colorColumns} onChange={this.changeColor}/> : null}
</div>
</TabPane> : null}
{plot ? <TabPane tab="鑷畾涔夎缃�" disabled={datatype === 'statistics'} key="custom">
@@ -506,8 +673,19 @@
</Form.Item>
</Form>
</Col>
- <Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浣跨敤鑷畾涔夎缃椂锛屾樉绀虹殑鍧愭爣杞寸涓�涓湪宸︿晶锛岀浜屼釜鍦ㄥ彸渚э紝澶氫綑鐨勪笉鐢熸晥锛涙煴褰㈠浘鍙彲浠ユ坊鍔犱竴涓紙璁剧疆澶氫釜鏃讹紝绗竴涓敓鏁堬級銆�</Col>
- <EditTable actions={['edit', 'up', 'down']} data={plot.customs || []} columns={cusColumns} onChange={this.changeCustom}/>
+ <Col span={12}>
+ <Form {...formItemLayout}>
+ <Form.Item label="澶氭煴鎺掑垪" style={{marginBottom: 10}}>
+ <Radio.Group value={plot.mutilBar || 'dodge'} onChange={this.mutilBarChange}>
+ <Radio value="dodge">鍒嗙粍</Radio>
+ <Radio value="stack">鍫嗗彔</Radio>
+ <Radio value="overlap">閲嶅彔</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Form>
+ </Col>
+ <Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浣跨敤鑷畾涔夎缃椂锛屾樉绀虹殑鍧愭爣杞寸涓�涓湪宸︿晶锛岀浜屼釜鍦ㄥ彸渚э紝澶氫綑鐨勪笉鐢熸晥銆�</Col>
+ <EditTable actions={['edit', 'move']} data={plot.customs || []} columns={cusColumns} onChange={this.changeCustom}/>
</TabPane> : null}
</Tabs>
</Modal>
--
Gitblit v1.8.0