From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/chart/antv-scatter/index.jsx | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/chart/antv-scatter/index.jsx b/src/menu/components/chart/antv-scatter/index.jsx
index 8c1a624..bfaf069 100644
--- a/src/menu/components/chart/antv-scatter/index.jsx
+++ b/src/menu/components/chart/antv-scatter/index.jsx
@@ -239,6 +239,9 @@
if (card.errors.length === 0) {
card.$tables = getTables(card)
}
+
+ delete card.$c_ds
+ delete card.$c_ac
if (!card.plot.Xaxis) {
card.errors.push({ level: 0, detail: '鍧愭爣杞村皻鏈缃紒'})
@@ -278,12 +281,12 @@
plusSearch = (uuid, search, type) => {
const { card } = this.state
- if (card.uuid !== uuid || type !== 'simple') return
+ if (card.uuid !== uuid || (type !== 'simple' && type !== 'replace')) return
search.uuid = Utils.getuuid()
search.focus = true
- MKEmitter.emit('addSearch', card.uuid, search)
+ MKEmitter.emit('addSearch', card.uuid, search, type === 'replace' ? 'replace' : '')
}
addButton = () => {
@@ -350,7 +353,7 @@
{appType !== 'mob' ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch}/> : null}
{appType !== 'mob' ? <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton}/> : null}
<ChartCompileForm config={card} plotchange={this.updateComponent}/>
- <CopyComponent type="line" card={card}/>
+ <CopyComponent type="scatter" card={card}/>
<PasteComponent config={card} options={['action', 'search']} updateConfig={this.updateComponent}/>
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<ClockComponent config={card} updateConfig={this.updateComponent}/>
--
Gitblit v1.8.0