From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21
---
src/tabviews/custom/components/chart/antv-dashboard/index.jsx | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
index bbda7f1..25aae9e 100644
--- a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Chart, registerShape } from '@antv/g2'
-import { Spin, notification } from 'antd'
+import { Spin, notification, Modal } from 'antd'
import { DownloadOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -107,7 +107,13 @@
}
}
- _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 + 30
+
+ if (_config.plot.title) {
+ _config.style.minHeight = _config.style.minHeight + 45
+ }
this.setState({
config: _config,
@@ -155,7 +161,7 @@
this.setState({sync: false, data: _data}, () => {
this.handleData()
})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
@@ -278,11 +284,18 @@
loading: false
})
this.timer && this.timer.stop()
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
+ })
+ } else {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
}
}
@@ -327,7 +340,7 @@
const chart = new Chart({
container: chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 30,
+ height: plot.height
})
chart.data(data)
@@ -436,7 +449,7 @@
const chart = new Chart({
container: chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 30,
+ height: plot.height,
padding: [0, 0, 0, 0],
})
chart.data([_data])
@@ -620,7 +633,7 @@
</div> : null
}
<NormalHeader config={config} />
- <div className="canvas-wrap" ref={ref => this.wrap = ref}>
+ <div className="canvas-wrap">
{config.plot.download === 'enable' && this.state.chart ? <DownloadOutlined onClick={this.downloadImage} className="system-color download"/> : null}
<div className="canvas" id={this.state.chartId}></div>
</div>
--
Gitblit v1.8.0