From a6be5cfd9c6fb084af584b77f79100fe32b385c1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 30 十一月 2023 16:20:54 +0800
Subject: [PATCH] 2023-11-30
---
src/menu/components/chart/antv-dashboard/chartcompile/index.jsx | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx b/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx
index 1bc8301..71f4cc1 100644
--- a/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-dashboard/chartcompile/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Modal, Form, Row, Col, Select, Radio, Tooltip, Input, InputNumber, Tabs, Button } from 'antd'
+import { Modal, Form, Row, Col, Select, Radio, Tooltip, Input, InputNumber, notification, Tabs, Button } from 'antd'
import { QuestionCircleOutlined, EditOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
@@ -17,7 +17,6 @@
class LineChartDrawerForm extends Component {
static propTpyes = {
- dict: PropTypes.object,
plot: PropTypes.object,
config: PropTypes.object,
plotchange: PropTypes.func
@@ -28,7 +27,7 @@
plot: null,
formlist: null,
baseFormlist: null,
- view: 'normal',
+ view: 'base',
colorColumns: [
{
title: '鎸囨爣',
@@ -55,7 +54,7 @@
this.setState({
visible: true,
- view: 'normal',
+ view: 'base',
plot: fromJS(config.plot).toJS(),
baseFormlist: getBaseForm(config.plot),
formlist: config.subtype === 'ratioboard' ? getRadioOptionForm(config.plot, config.columns) : getOptionForm(config.plot, config.columns)
@@ -88,7 +87,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
}
]
})(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.onSubmit}/>)}
@@ -109,7 +108,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
}
]
})(<InputNumber min={item.min} max={item.max} precision={item.decimal} onPressEnter={this.onSubmit}/>)}
@@ -130,7 +129,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
@@ -159,7 +158,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
@@ -251,6 +250,18 @@
this.baseRef.handleConfirm().then(res => {
let _plot = {...plot, ...res}
+ if (!plot.valueField && tab === 'color') {
+ this.setState({
+ plot: _plot,
+ view: 'normal'
+ })
+ notification.warning({
+ top: 92,
+ message: '璇锋坊鍔犲浘琛ㄨ缃��',
+ duration: 3
+ })
+ return
+ }
this.setState({
plot: _plot,
view: tab
@@ -311,7 +322,7 @@
{config.name ? <div className="mk-com-name">{config.name} - 缂栬緫</div> : null}
<Tabs activeKey={view} className="menu-chart-edit-box" onChange={this.changeTab}>
<TabPane tab="缁勪欢璁剧疆" key="base">
- <NormalForm dict={this.props.dict} formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
+ <NormalForm formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
</TabPane>
<TabPane tab="鍥捐〃璁剧疆" key="normal">
<Form {...formItemLayout}>
@@ -320,7 +331,7 @@
</TabPane>
{plot ? <TabPane tab="棰滆壊璁剧疆" key="color">
<div>
- <Button className="color-add mk-green" onClick={this.addColor}>{this.props.dict['model.add']}</Button>
+ <Button className="color-add mk-green" onClick={this.addColor}>娣诲姞</Button>
<EditTable actions={['edit', 'move', 'del']} data={plot.colors || []} columns={colorColumns} onChange={this.changeColor}/>
</div>
</TabPane> : null}
--
Gitblit v1.8.0