From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 181 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 167 insertions(+), 14 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..3f31823 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -24,6 +24,7 @@
state = {
view: 'normal',
+ ramp: 'false',
visible: false,
datatype: '',
plot: null,
@@ -48,6 +49,34 @@
}
},
],
+ 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 +96,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 +175,7 @@
dataIndex: 'axis',
inputType: 'select',
editable: true,
- width: '20%',
+ width: '12%',
options: [
{ value: 'true', text: '鏄剧ず'},
{ value: 'false', text: '闅愯棌'}
@@ -132,7 +190,7 @@
dataIndex: 'label',
inputType: 'select',
editable: true,
- width: '20%',
+ width: '12%',
options: [
{ value: 'true', text: '鏄剧ず'},
{ value: 'false', text: '闅愯棌'}
@@ -141,6 +199,37 @@
let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
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%'
},
]
}
@@ -163,6 +252,7 @@
this.setState({
visible: true,
view: 'normal',
+ ramp: config.plot.ramp || 'false',
datatype: config.plot.datatype || 'query',
fieldName: fieldName,
plot: fromJS(config.plot).toJS(),
@@ -181,7 +271,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
@@ -291,7 +381,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>
@@ -314,7 +404,7 @@
{getFieldDecorator(item.key, {
initialValue: item.initVal
})(
- <ColorSketch />
+ <ColorSketch allowClear={item.allowClear} />
)}
</Form.Item>
</Col>
@@ -329,6 +419,35 @@
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
+ })
+ }
+
+ 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 = () => {
@@ -411,6 +530,7 @@
name: labels[item] || item,
axis: i === 0 ? 'true' : 'false',
label: 'false',
+ title: 'true',
shape: _plot.chartType === 'bar' && i === 0 ? ['bar', 'rect'] : ['line', 'smooth']
}
})
@@ -425,7 +545,8 @@
uuid: Utils.getuuid(),
type: item,
label: labels[item] || item,
- color: chartColors[i % limit]
+ color: chartColors[i % limit],
+ color1: chartColors[i % limit]
}
})
}
@@ -459,7 +580,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})
@@ -478,7 +600,7 @@
}
render() {
- const { view, visible, datatype, plot, colorColumns, statColorColumns, cusColumns, baseFormlist } = this.state
+ const { view, visible, datatype, plot, ramp, colorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -497,7 +619,7 @@
wrapClassName="popview-modal menu-chart-edit-modal"
title="鍥捐〃缂栬緫"
visible={visible}
- width={850}
+ width={950}
maskClosable={false}
onOk={this.onSubmit}
onCancel={() => { this.setState({ visible: false }) }}
@@ -514,9 +636,29 @@
</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 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}
+ {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">
@@ -530,7 +672,18 @@
</Form.Item>
</Form>
</Col>
- <Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浣跨敤鑷畾涔夎缃椂锛屾樉绀虹殑鍧愭爣杞寸涓�涓湪宸︿晶锛岀浜屼釜鍦ㄥ彸渚э紝澶氫綑鐨勪笉鐢熸晥锛涙煴褰㈠浘鍙彲浠ユ坊鍔犱竴涓紙璁剧疆澶氫釜鏃讹紝绗竴涓敓鏁堬級銆�</Col>
+ <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>
--
Gitblit v1.8.0