From e41a64966b7832baffe96c21d1ea77ef6adb2905 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 十月 2021 18:31:55 +0800
Subject: [PATCH] 2021-10-14
---
src/menu/components/chart/chart-custom/chartcompile/index.jsx | 623 ++------------------------------------------------------
1 files changed, 23 insertions(+), 600 deletions(-)
diff --git a/src/menu/components/chart/chart-custom/chartcompile/index.jsx b/src/menu/components/chart/chart-custom/chartcompile/index.jsx
index 3f31823..e59b022 100644
--- a/src/menu/components/chart/chart-custom/chartcompile/index.jsx
+++ b/src/menu/components/chart/chart-custom/chartcompile/index.jsx
@@ -1,20 +1,17 @@
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 { fromJS } from 'immutable'
+import { Modal, Form, Icon, Tabs } from 'antd'
-import Utils from '@/utils/utils.js'
-import { chartColors } from '@/utils/option.js'
-import { getBaseForm, getOptionForm } from './formconfig'
+import { getBaseForm } 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 CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
-class LineChartDrawerForm extends Component {
+class CustomChartDrawerForm extends Component {
static propTpyes = {
dict: PropTypes.object,
plot: PropTypes.object,
@@ -23,464 +20,28 @@
}
state = {
- view: 'normal',
- ramp: 'false',
+ view: 'base',
visible: false,
- datatype: '',
plot: null,
- formlist: null,
baseFormlist: null,
- fieldName: null,
- colorColumns: [
- {
- title: '鎸囨爣',
- dataIndex: 'label',
- editable: false,
- width: '40%'
- },
- {
- title: '棰滆壊',
- dataIndex: 'color',
- 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>)
- }
- },
- ],
- statColorColumns: [
- {
- title: '鎸囨爣',
- dataIndex: 'type',
- inputType: 'input',
- editable: true,
- width: '40%'
- },
- {
- title: '棰滆壊',
- dataIndex: 'color',
- inputType: 'color',
- editable: true,
- width: '40%',
- render: (text, record) => {
- return (<div style={{width: '80px', height: '23px', background: text}}></div>)
- }
- },
- ],
- 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: '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,
- 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 } = this.props
- let fieldName = {}
- config.columns.forEach(col => {
- if (col.field) {
- fieldName[col.field] = col.label
- }
- })
-
- if (config.plot.correction) {
- delete config.plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
- config.plot.barSize = 35
- }
-
this.setState({
visible: true,
- view: 'normal',
- ramp: config.plot.ramp || 'false',
- datatype: config.plot.datatype || 'query',
- fieldName: fieldName,
+ view: 'base',
plot: fromJS(config.plot).toJS(),
baseFormlist: getBaseForm(config.plot),
- formlist: getOptionForm(config.plot, config.columns)
})
- }
-
- radioChange = (e, key) => {
- const { formlist } = this.state
- let val = e.target.value
-
- if (key === 'datatype') {
- this.setState({
- datatype: val,
- formlist: formlist.map(item => {
- if (['Yaxis'].includes(item.key)) {
- item.hidden = val === 'statistics'
- } else if (['InfoType', 'InfoValue'].includes(item.key)) {
- item.hidden = val !== 'statistics'
- }
- return item
- })
- })
- }
- }
-
- 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}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal,
- rules: [
- {
- required: !!item.required,
- message: this.props.dict['form.required.input'] + 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}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal,
- rules: [
- {
- required: !!item.required,
- message: this.props.dict['form.required.input'] + 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}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal,
- rules: [
- {
- required: !!item.required,
- message: this.props.dict['form.required.select'] + 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}>
- <Icon type="question-circle" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal,
- rules: [
- {
- required: !!item.required,
- message: this.props.dict['form.required.select'] + 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}>
- <Icon type="question-circle" />
- {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
- })
- }
-
- 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
- if (view === 'normal') {
- this.props.form.validateFieldsAndScroll((err, values) => {
- 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
- }
-
- this.setState({
- plot: _plot,
- visible: false
- })
-
- this.props.plotchange({...config, plot: _plot})
- }
- })
- } else if (view === 'base') {
+ if (view === 'base') {
this.baseRef.handleConfirm().then(res => {
let _plot = {...plot, ...res}
@@ -500,66 +61,9 @@
}
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}
-
- 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)) {
- _plot.customs = _plot.Yaxis.map((item, i) => {
- 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 (values.datatype !== plot.datatype || !_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
- })
- }
- })
- } else if (view === 'base') {
+ if (view === 'base') {
this.baseRef.handleConfirm().then(res => {
this.setState({
plot: {...plot, ...res},
@@ -573,50 +77,22 @@
}
}
- addColor = () => {
- let plot = fromJS(this.state.plot).toJS()
- plot.colors = plot.colors || []
+ onChange = (val) => {
+ const { plot } = this.state
- plot.colors.push({
- uuid: Utils.getuuid(),
- type: `鎸囨爣${plot.colors.length}`,
- color: 'rgb(91, 143, 249)',
- color1: 'rgb(91, 143, 249)'
+ this.setState({
+ plot: {...plot, script: val},
})
-
- this.setState({plot})
- }
-
- changeColor = (colors) => {
- const { plot } = this.state
-
- this.setState({plot: {...plot, colors}})
- }
-
- changeCustom = (customs) => {
- const { plot } = this.state
-
- this.setState({plot: {...plot, customs}})
}
render() {
- const { view, visible, datatype, plot, ramp, colorColumns, rampColorColumns, statColorColumns, rampStatColorColumns, cusColumns, baseFormlist } = this.state
- const formItemLayout = {
- labelCol: {
- xs: { span: 24 },
- sm: { span: 6 }
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 18 }
- }
- }
+ const { view, visible, baseFormlist, plot } = this.state
return (
- <div className="line-chart-drawer-form">
- <Icon type="edit" title="缂栬緫" onClick={this.showDrawer} />
+ <>
+ <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫" onClick={this.showDrawer} />
<Modal
- wrapClassName="popview-modal menu-chart-edit-modal"
+ wrapClassName="popview-modal custom-chart-edit-modal"
title="鍥捐〃缂栬緫"
visible={visible}
width={950}
@@ -625,72 +101,19 @@
onCancel={() => { this.setState({ visible: false }) }}
destroyOnClose
>
- <Tabs activeKey={view} className="menu-chart-edit-box" onChange={this.changeTab}>
+ <Tabs activeKey={view} onChange={this.changeTab}>
<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 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">
- <Col span={12}>
- <Form {...formItemLayout}>
- <Form.Item label="鏄惁鍚敤" style={{marginBottom: 10}}>
- <Radio.Group value={plot.enabled || 'false'} onChange={this.enabledChange}>
- <Radio value="true">鏄�</Radio>
- <Radio value="false">鍚�</Radio>
- </Radio.Group>
- </Form.Item>
- </Form>
- </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}/>
+ {plot ? <TabPane tab="JS" key="JS">
+ {plot.chartType === 'antv' ? <div>鍏ュ弬锛欳hart銆� DataSet銆� wrap锛坉om鑺傜偣锛夈�乨ata銆� config</div> : <div>鍏ュ弬锛歟charts銆� DataSet銆� wrap锛坉om鑺傜偣锛夈�� data銆� config</div>}
+ <CodeMirror mode="text/javascript" theme="cobalt" value={plot.script} onChange={this.onChange} />
</TabPane> : null}
</Tabs>
</Modal>
- </div>
+ </>
);
}
}
-export default Form.create()(LineChartDrawerForm)
\ No newline at end of file
+export default Form.create()(CustomChartDrawerForm)
\ No newline at end of file
--
Gitblit v1.8.0