From 5ec0f02101cb4255c6398856bbf17a2a0b2c9a7e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 十一月 2022 17:33:55 +0800
Subject: [PATCH] 2022-11-14
---
src/tabviews/custom/components/chart/antv-pie/index.jsx | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-pie/index.jsx b/src/tabviews/custom/components/chart/antv-pie/index.jsx
index fbff45d..f00c137 100644
--- a/src/tabviews/custom/components/chart/antv-pie/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-pie/index.jsx
@@ -64,7 +64,9 @@
_sync = false
}
- _config.style.height = config.plot.height || 400
+ _config.plot.height = Utils.getHeight(_config.plot.height)
+ _config.style.height = 'auto'
+ _config.style.minHeight = _config.plot.height
let decimal = 0
_config.columns.forEach(col => {
@@ -378,14 +380,15 @@
return
}
- let sign = item[plot.type] + item[plot.Xaxis]
+ item.$type = item[plot.type]
+ let sign = item.$type + item[plot.Xaxis]
if (!_mdata.has(sign)) {
let _sort = sort
- if (map.has(item.type)) {
- _sort = map.get(item.type)
+ if (map.has(item.$type)) {
+ _sort = map.get(item.$type)
} else {
- map.set(item.type, _sort)
+ map.set(item.$type, _sort)
sort++
}
@@ -421,14 +424,15 @@
return
}
- let sign = item[plot.type] + item[plot.Xaxis]
+ item.$type = item[plot.type]
+ let sign = item.$type + item[plot.Xaxis]
if (!_mdata.has(sign)) {
let _sort = sort
- if (map.has(item.type)) {
- _sort = map.get(item.type)
+ if (map.has(item.$type)) {
+ _sort = map.get(item.$type)
} else {
- map.set(item.type, _sort)
+ map.set(item.$type, _sort)
sort++
}
@@ -463,11 +467,13 @@
}
}
+ item.$type = item[plot.type]
+
let _sort = sort
- if (map.has(item.type)) {
- _sort = map.get(item.type)
+ if (map.has(item.$type)) {
+ _sort = map.get(item.$type)
} else {
- map.set(item.type, _sort)
+ map.set(item.$type, _sort)
sort++
}
@@ -535,7 +541,7 @@
const chart = new Chart({
container: chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 30,
+ height: plot.height,
padding: 0,
})
@@ -731,7 +737,7 @@
const chart = new Chart({
container: chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 30
+ height: plot.height
})
if (plot.shape !== 'nightingale' && plot.show !== 'value') {
@@ -1039,7 +1045,7 @@
</div> : null
}
<NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
- <div className="canvas-wrap" ref={ref => this.wrap = ref}>
+ <div className="canvas-wrap">
{config.plot.download === 'enable' && this.state.chart && !empty ? <DownloadOutlined onClick={this.downloadImage} className="system-color download"/> : null}
<div className={'canvas' + (empty ? ' empty' : '')} id={this.state.chartId}></div>
</div>
--
Gitblit v1.8.0