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 | 309 +++++++++++++++++++++++++++++----------------------
1 files changed, 177 insertions(+), 132 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index 4604d38..b6ddf6e 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -137,133 +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: '鐧惧垎姣�'},
- { 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%'
- },
- ]
+ cusColumns: []
}
showDrawer = () => {
@@ -302,6 +176,18 @@
}
}
+ 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',
@@ -310,7 +196,8 @@
fieldName: fieldName,
plot: plot,
baseFormlist: getBaseForm(plot, config.columns),
- formlist: getOptionForm(plot, config.columns)
+ formlist: getOptionForm(plot, config.columns),
+ cusColumns: this.getCusColumns(plot.zoomYaxis)
})
}
@@ -494,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
@@ -540,8 +574,8 @@
_plot.customs = []
delete _plot.Yaxis
} else if (!is(fromJS(values.Yaxis), fromJS(plot.Yaxis || []))) {
- _plot.enabled = 'false'
- _plot.colors = null
+ // _plot.enabled = 'false'
+ // _plot.colors = null
let labels = {}
config.columns.forEach(col => {
@@ -872,7 +906,7 @@
</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}>
@@ -882,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}>
@@ -893,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