From 78eed586f6a0d15162c89878c53a301e7b142a8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 十月 2022 00:07:06 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/chart/antv-bar/index.jsx | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/index.jsx b/src/menu/components/chart/antv-bar/index.jsx
index acd5cc0..ca91e00 100644
--- a/src/menu/components/chart/antv-bar/index.jsx
+++ b/src/menu/components/chart/antv-bar/index.jsx
@@ -9,7 +9,7 @@
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle } from '@/utils/utils-custom.js'
+import { resetStyle, getTables } from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
import { chartColors } from '@/utils/option.js'
import zhCN from '@/locales/zh-CN/model.js'
@@ -18,7 +18,6 @@
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
const ChartCompileForm = asyncIconComponent(() => import('./chartcompile'))
-// const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
@@ -91,7 +90,6 @@
search: [],
action: [],
plot: _plot,
- btnlog: [],
}
if (card.config) {
@@ -1228,7 +1226,6 @@
card.width = card.plot.width
card.name = card.plot.name
- card.btnlog = []
card.errors = []
let columns = card.columns.map(c => c.field)
@@ -1243,6 +1240,10 @@
card.errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
} else if (!card.setting.supModule) {
card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
+ }
+
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
}
if (!card.plot.Xaxis) {
@@ -1345,30 +1346,6 @@
this.updateComponent(_card)
}
- // handleLog = (type, logs, item) => {
- // let card = fromJS(this.state.card).toJS()
-
- // if (type === 'revert') {
- // card.action = card.action ? [...card.action, item] : [item]
- // card.btnlog = logs
-
- // this.updateComponent(card)
- // notification.success({
- // top: 92,
- // message: '鎭㈠鎴愬姛锛�',
- // duration: 2
- // })
- // } else {
- // card.btnlog = logs
- // this.updateComponent(card)
- // notification.success({
- // top: 92,
- // message: '娓呴櫎鎴愬姛锛�',
- // duration: 2
- // })
- // }
- // }
-
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
@@ -1390,7 +1367,6 @@
<CopyComponent type="line" card={card}/>
<PasteComponent config={card} options={['action', 'search']} updateConfig={this.updateComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- {/* <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} /> */}
<ClockComponent config={card} updateConfig={this.updateComponent}/>
<UserComponent config={card}/>
<DeleteOutlined className="close" title="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
--
Gitblit v1.8.0