From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/tabviews/custom/components/chart/antv-scatter/index.jsx | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-scatter/index.jsx b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
index 620023d..a085d4e 100644
--- a/src/tabviews/custom/components/chart/antv-scatter/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
@@ -7,13 +7,14 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
-import asyncComponent from '@/utils/asyncComponent'
+// import asyncComponent from '@/utils/asyncComponent'
import asyncBtnComponent from './asyncButtonComponent'
import UtilsDM from '@/utils/utils-datamanage.js'
import MKEmitter from '@/utils/events.js'
+import NormalHeader from '@/tabviews/custom/components/share/normalheader'
import './index.scss'
-const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
+// const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
const ExcelOutButton = asyncBtnComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
const ExcelInButton = asyncBtnComponent(() => import('@/tabviews/zshare/actionList/excelInbutton'))
@@ -52,14 +53,7 @@
_sync = false
}
- let height = config.plot.height || 400
- if (config.plot.title || config.search.length > 0) {
- _config.plot.height = height - 70
- } else {
- _config.plot.height = height - 25
- }
-
- _config.style.height = height
+ _config.style.height = config.plot.height || 400
this.setState({
config: _config,
@@ -272,11 +266,8 @@
})
}
- let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0))
+ let requireFields = searches.filter(item => item.required && item.value === '')
if (requireFields.length > 0) {
- this.setState({
- loading: false
- })
return
}
@@ -330,7 +321,7 @@
const chart = new Chart({
container: chartId,
autoFit: true,
- height: plot.height
+ height: this.wrap.offsetHeight - 25
})
chart.data(data);
@@ -398,7 +389,7 @@
</div> : null
}
<NormalHeader config={config} BID={BID} menuType={this.props.menuType} refresh={this.refreshSearch} />
- <div className="canvas-wrap">
+ <div className="canvas-wrap" ref={ref => this.wrap = ref}>
<div className="chart-action">
{config.action.map(item => {
if (item.OpenType === 'excelOut') {
@@ -424,7 +415,7 @@
}
})}
</div>
- <div className={'canvas' + (empty ? ' empty' : '')} style={{height: config.plot.height + 25}} id={this.state.chartId}></div>
+ <div className={'canvas' + (empty ? ' empty' : '')} id={this.state.chartId}></div>
</div>
{empty ? <Empty description={false}/> : null}
</div>
--
Gitblit v1.8.0