From 010fdcf8abd58bde5c1106db8ed8448effc75b4b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 二月 2025 16:37:46 +0800
Subject: [PATCH] 2025-02-25
---
src/menu/components/chart/chart-custom/index.jsx | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/src/menu/components/chart/chart-custom/index.jsx b/src/menu/components/chart/chart-custom/index.jsx
index d601ba4..22f45f6 100644
--- a/src/menu/components/chart/chart-custom/index.jsx
+++ b/src/menu/components/chart/chart-custom/index.jsx
@@ -4,13 +4,12 @@
import { Popover, notification } from 'antd'
import { ToolOutlined, DeleteOutlined, FontColorsOutlined, PlusCircleOutlined } from '@ant-design/icons'
import { Chart } from '@antv/g2'
-import DataSet from '@antv/data-set'
import * as echarts from 'echarts'
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle, getTables, getHeight } from '@/utils/utils-custom.js'
+import { resetStyle, getTables, getHeight, checkComponent } from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
import './index.scss'
@@ -137,8 +136,8 @@
if (card.plot.chartType === 'antv') {
try {
// eslint-disable-next-line
- let func = new Function('Chart', 'DataSet', 'wrap', 'data', 'config', card.plot.script)
- func(Chart, DataSet, this.wrap, [], card)
+ let func = new Function('Chart', 'chartId', 'data', 'config', card.plot.script)
+ func(Chart, card.uuid + 'canvas', [], card)
} catch (e) {
console.warn(e)
@@ -151,8 +150,8 @@
} else if (card.plot.chartType === 'echarts') {
try {
// eslint-disable-next-line
- let func = new Function('echarts', 'DataSet', 'wrap', 'data', 'config', card.plot.script)
- func(echarts, DataSet, this.wrap, [], card)
+ let func = new Function('echarts', 'chartId', 'data', 'config', card.plot.script)
+ func(echarts, card.uuid + 'canvas', [], card)
} catch (e) {
console.warn(e)
@@ -183,25 +182,15 @@
card.width = card.plot.width
card.name = card.plot.name
- card.errors = []
- let columns = card.columns.map(c => c.field)
-
- if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
- card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
- } else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
- card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
- } else if (!card.setting.primaryKey) {
- card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
- } else if (!columns.includes(card.setting.primaryKey)) {
- card.errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
- } else if (!card.setting.supModule) {
- card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
- }
+ card.$c_ds = true
+ card.errors = checkComponent(card)
if (card.errors.length === 0) {
card.$tables = getTables(card)
}
+
+ delete card.$c_ds
this.setState({
card: card
@@ -263,7 +252,7 @@
<div className="mk-popover-control">
{appType !== 'mob' ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch}/> : null}
<ChartCompileForm config={card} plotchange={this.updateComponent}/>
- <CopyComponent type="line" card={card}/>
+ <CopyComponent type="chart" card={card}/>
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<ClockComponent config={card} updateConfig={this.updateComponent}/>
<DeleteOutlined className="close" title="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
@@ -274,7 +263,7 @@
</Popover>
<NormalHeader config={card} updateComponent={this.updateComponent}/>
<div className="canvas-wrap" style={{height: card.plot.height}}>
- <div className="canvas" id={card.uuid + 'canvas'} style={{height: getHeight(card.plot.height)}} ref={ref => this.wrap = ref}></div>
+ <div className="canvas" id={card.uuid + 'canvas'} style={{height: getHeight(card.plot.height)}}></div>
</div>
<div className="component-name">
<div className="center">
--
Gitblit v1.8.0