From 79943222ed0edc6bd35ab2858c5eda2bc3246f66 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 二月 2022 15:03:45 +0800
Subject: [PATCH] 2022-02-28
---
src/tabviews/custom/components/chart/antv-scatter/index.jsx | 142 ++++++++++++++++++++++++++++++-----------------
1 files changed, 91 insertions(+), 51 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-scatter/index.jsx b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
index 516a6a1..f5a5c3f 100644
--- a/src/tabviews/custom/components/chart/antv-scatter/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
@@ -3,18 +3,19 @@
import { is, fromJS } from 'immutable'
import { Chart } from '@antv/g2'
import { Spin, Empty, notification } from 'antd'
+import { DownloadOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
import Utils from '@/utils/utils.js'
-import asyncComponent from './asyncButtonComponent'
+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 ExcelOutButton = asyncComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
-const ExcelInButton = asyncComponent(() => import('@/tabviews/zshare/actionList/excelInbutton'))
+const ExcelOutButton = asyncBtnComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
+const ExcelInButton = asyncBtnComponent(() => import('@/tabviews/zshare/actionList/excelInbutton'))
class ScatterChart extends Component {
static propTpyes = {
@@ -35,6 +36,7 @@
plot: null, // 鍥捐〃璁剧疆
data: null, // 鏁版嵁
search: null, // 鎼滅储鏉′欢
+ chart: null
}
UNSAFE_componentWillMount () {
@@ -51,13 +53,7 @@
_sync = false
}
- if (config.plot.title || config.search.length > 0) {
- _config.plot.height = _config.plot.height - 80
- } else {
- _config.plot.height = _config.plot.height - 30
- }
-
- _config.style.height = config.plot.height
+ _config.style.height = config.plot.height || 400
this.setState({
config: _config,
@@ -70,7 +66,9 @@
search: Utils.initMainSearch(config.search),
}, () => {
if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
- this.loadData()
+ setTimeout(() => {
+ this.loadData()
+ }, _config.setting.delay || 0)
} else if (config.setting.sync === 'true' && _data) {
this.handleData()
}
@@ -92,12 +90,10 @@
this.setState({sync: false, data: _data, empty: !_data,}, () => {
this.handleData()
})
- } else if (nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- if (config.setting.syncRefresh === 'true') {
- this.setState({}, () => {
- this.loadData()
- })
- }
+ } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ this.setState({}, () => {
+ this.loadData()
+ })
}
}
@@ -108,7 +104,7 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
- MKEmitter.addListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
this.handleTimer()
}
@@ -123,7 +119,7 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
- MKEmitter.removeListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -132,16 +128,7 @@
if (!config.timer) return
- const _change = {
- '15s': 15000,
- '30s': 30000,
- '1min': 60000,
- '5min': 300000,
- '10min': 600000,
- '15min': 900000,
- '30min': 1800000,
- '1hour': 3600000
- }
+ const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
@@ -220,7 +207,7 @@
const { config } = this.state
if (!config.setting.supModule || config.setting.supModule !== MenuID) return
- if (id !== this.state.BID) {
+ if (id !== this.state.BID || id !== '') {
this.setState({ BID: id }, () => {
this.loadData()
})
@@ -230,14 +217,14 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- getexceloutparam = (menuId, btnId) => {
+ queryModuleParam = (menuId, btnId) => {
const { mainSearch } = this.props
const { arr_field, config, search } = this.state
if (config.uuid !== menuId) return
let searches = search ? fromJS(search).toJS() : []
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
let keys = searches.map(item => item.key.toLowerCase())
mainSearch.forEach(item => {
if (!keys.includes(item.key.toLowerCase())) {
@@ -246,7 +233,7 @@
})
}
- MKEmitter.emit('execExcelout', config.uuid, btnId, {
+ MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
arr_field: arr_field,
orderBy: config.setting.order || '',
search: searches,
@@ -272,7 +259,7 @@
}
let searches = search ? fromJS(search).toJS() : []
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
let keys = searches.map(item => item.key)
mainSearch.forEach(item => {
if (!keys.includes(item.key)) {
@@ -281,11 +268,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
}
@@ -300,11 +284,18 @@
let result = await Api.genericInterface(param)
if (result.status) {
+ let reset = true
+
+ if (hastimer && is(fromJS(result.data), fromJS(this.state.data))) {
+ reset = false
+ }
+
this.setState({
data: result.data,
empty: false,
loading: false
}, () => {
+ if (!reset) return
this.handleData()
})
} else {
@@ -332,14 +323,14 @@
}
/**
- * @description 鎶樼嚎鍥炬覆鏌�
+ * @description 鏁ｇ偣鍥炬覆鏌�
*/
scatterrender = () => {
const { plot, data, chartId } = this.state
const chart = new Chart({
container: chartId,
autoFit: true,
- height: plot.height
+ height: this.wrap.offsetHeight - 25
})
chart.data(data);
@@ -355,13 +346,18 @@
itemName: { style: { fill: plot.color } }
})
- chart.tooltip({
- showTitle: false,
- showCrosshairs: true,
- crosshairs: {
- type: 'xy',
- }
- })
+ if (plot.tooltip !== 'true') {
+ chart.tooltip(false)
+ } else {
+ chart.tooltip({
+ showTitle: false,
+ showCrosshairs: true,
+ crosshairs: {
+ type: 'xy',
+ }
+ })
+ }
+
chart
.point()
.position(`${plot.Xaxis}*${plot.Yaxis}`)
@@ -376,14 +372,57 @@
.style({
fillOpacity: 0.85
})
- chart.interaction('legend-highlight');
+ if (plot.interaction && plot.interaction.length) {
+ plot.interaction.forEach(t => {
+ chart.interaction(t)
+ })
+ }
chart.render()
+
+ this.setState({chart})
}
refreshSearch = (list) => {
this.setState({search: list}, () => {
this.loadData()
})
+ }
+
+ downloadImage = () => {
+ const { chart, config } = this.state
+ const link = document.createElement('a');
+ const filename = `${config.name}${moment().format('YYYY-MM-DD HH_mm_ss')}.png`;
+ const canvas = chart.getCanvas();
+ canvas.get('timeline').stopAllAnimations();
+
+ setTimeout(() => {
+ const canvas = chart.getCanvas();
+ const canvasDom = canvas.get('el');
+ const dataURL = canvasDom.toDataURL('image/png');
+
+ if (window.Blob && window.URL) {
+ const arr = dataURL.split(',');
+ const mime = arr[0].match(/:(.*?);/)[1];
+ const bstr = atob(arr[1]);
+ let n = bstr.length;
+ const u8arr = new Uint8Array(n);
+ while (n--) {
+ u8arr[n] = bstr.charCodeAt(n);
+ }
+ const blobObj = new Blob([u8arr], { type: mime });
+ if (window.navigator.msSaveBlob) {
+ window.navigator.msSaveBlob(blobObj, filename);
+ } else {
+ link.addEventListener('click', () => {
+ link.download = filename;
+ link.href = window.URL.createObjectURL(blobObj);
+ });
+ }
+ }
+ const e = document.createEvent('MouseEvents');
+ e.initEvent('click', false, false);
+ link.dispatchEvent(e);
+ }, 16);
}
render() {
@@ -398,8 +437,9 @@
</div> : null
}
<NormalHeader config={config} BID={BID} menuType={this.props.menuType} refresh={this.refreshSearch} />
- <div className="canvas-wrap">
- <div className="chart-action">
+ <div className="canvas-wrap" ref={ref => this.wrap = ref}>
+ {config.plot.download === 'enable' && this.state.chart && !empty ? <DownloadOutlined onClick={this.downloadImage} className="system-color download"/> : null}
+ <div className={'chart-action' + (config.plot.download === 'enable' ? ' downable' : '')}>
{config.action.map(item => {
if (item.OpenType === 'excelOut') {
return (
--
Gitblit v1.8.0