From 73a5124745890650d0fc91234bdbaa66d9bcbc6a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 六月 2021 17:52:01 +0800
Subject: [PATCH] 2021-06-09
---
src/menu/components/chart/antv-dashboard/chartcompile/index.jsx | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx b/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx
index 051a639..76effa8 100644
--- a/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx
@@ -4,7 +4,7 @@
import { Modal, Form, Row, Col, Select, Icon, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
import Utils from '@/utils/utils.js'
-import { getBaseForm, getOptionForm } from './formconfig'
+import { getBaseForm, getOptionForm, getRadioOptionForm } from './formconfig'
import asyncComponent from '@/utils/asyncComponent'
import ColorSketch from '@/mob/colorsketch'
import './index.scss'
@@ -32,7 +32,7 @@
{
title: '鎸囨爣',
dataIndex: 'tick',
- inputType: 'number',
+ inputType: this.props.config.subtype === 'ratioboard' ? 'text' : 'number',
editable: true,
width: '40%'
},
@@ -57,30 +57,8 @@
view: 'normal',
plot: fromJS(config.plot).toJS(),
baseFormlist: getBaseForm(config.plot),
- formlist: getOptionForm(config.plot, config.columns)
+ formlist: config.subtype === 'ratioboard' ? getRadioOptionForm(config.plot, config.columns) : getOptionForm(config.plot, config.columns)
})
- }
-
- radioChange = (e, key) => {
- const { formlist } = this.state
- let val = e.target.value
-
- if (key === 'shape') {
- this.setState({
- formlist: formlist.map(item => {
- if (item.key === 'innerRadius') {
- item.hidden = val === 'pie'
- }
- return item
- })
- }, () => {
- if (val === 'ring') {
- this.props.form.setFieldsValue({innerRadius: 50})
- } else if (val === 'nightingale') {
- this.props.form.setFieldsValue({innerRadius: 0})
- }
- })
- }
}
getFields() {
@@ -184,7 +162,7 @@
}
]
})(
- <Radio.Group disabled={item.readonly} onChange={(e) => this.radioChange(e, item.key)}>
+ <Radio.Group disabled={item.readonly}>
{item.options.map(option => {
return (
<Radio key={option.value} value={option.value}>{option.text}</Radio>
@@ -197,7 +175,7 @@
)
} else if (item.type === 'color') {
fields.push(
- <Col span={12} key={index}>
+ <Col span={12} key={index} className="color-col">
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
<Icon type="question-circle" />
--
Gitblit v1.8.0