From 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:38:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/chart/antv-scatter/index.jsx | 91 ++++++++++++++++-----------------------------
1 files changed, 32 insertions(+), 59 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-scatter/index.jsx b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
index 5eeef74..6526bdb 100644
--- a/src/tabviews/custom/components/chart/antv-scatter/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Chart } from '@antv/g2'
-import { Spin, Empty, notification, Modal } from 'antd'
+import { Spin, Empty } from 'antd'
import { DownloadOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -68,7 +68,7 @@
this.data = window.GLOB.SyncData.get(_config.dataName) || []
if (_config.$cache) {
- Api.writeCacheConfig(_config.uuid, fromJS(this.data).toJS())
+ Api.writeCacheConfig(_config.uuid, fromJS(this.data).toJS(), BID)
}
_config.setting.sync = 'false'
@@ -83,7 +83,6 @@
config: _config,
BID: BID || '',
empty: this.data.length === 0,
- arr_field: _config.columns.map(col => col.field).join(','),
plot: _config.plot,
search: _config.$searches
})
@@ -112,7 +111,7 @@
if (config.timer) {
this.timer = new TimerTask()
this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
- this.loadData(true)
+ this.loadData('timer')
})
}
@@ -137,43 +136,43 @@
}
initExec = () => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.$cache) {
if (config.$time) {
if (!this.loaded) {
- Api.getLCacheConfig(config.uuid, config.$time).then(res => {
- if (!res && config.setting.onload === 'true') {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (!res.valid && config.setting.onload === 'true') {
setTimeout(() => {
- this.loadData()
+ this.loadData('init')
}, config.setting.delay || 0)
}
- if (!res || this.loaded) return
+ if (!res.data || this.loaded) return
- this.data = res
+ this.data = res.data
this.handleData()
- this.setState({empty: res.length === 0})
+ this.setState({empty: res.data.length === 0})
})
} else {
this.handleData()
}
} else {
if (!this.loaded) {
- Api.getLCacheConfig(config.uuid, 0).then(res => {
- if (!res || this.loaded) return
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
- this.data = res
+ this.data = res.data
this.handleData()
- this.setState({empty: res.length === 0})
+ this.setState({empty: res.data.length === 0})
})
}
if (config.setting.onload === 'true') {
setTimeout(() => {
- this.loadData()
+ this.loadData('init')
}, config.setting.delay || 0)
} else if (this.loaded) {
this.handleData()
@@ -189,20 +188,18 @@
}
transferSyncData = (syncId) => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.$syncId !== syncId) return
let _data = window.GLOB.SyncData.get(config.dataName) || []
if (config.$cache) {
- Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
}
- if (!is(fromJS(this.data), fromJS(_data))) {
- this.data = _data
- this.handleData()
- }
+ this.data = _data
+ this.handleData()
this.setState({empty: _data.length === 0})
@@ -234,8 +231,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
@@ -264,7 +261,7 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { arr_field, config, search } = this.state
+ const { config, search } = this.state
if (config.uuid !== menuId) return
@@ -280,18 +277,16 @@
}
callback({
- arr_field: arr_field,
orderBy: config.setting.order || '',
- search: searches,
- menuName: config.name
+ search: searches
})
}
/**
* @description 鏁版嵁鍔犺浇
*/
- async loadData (hastimer) {
- const { config, arr_field, BID, search } = this.state
+ async loadData (type) {
+ const { config, BID, search } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({ empty: true })
@@ -320,19 +315,19 @@
return
}
- if (!hastimer) {
+ if (type !== 'timer') {
this.setState({
loading: true
})
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, '', '', BID)
let result = await Api.genericInterface(param)
if (result.status) {
- if (config.$cache && config.setting.onload !== 'false') {
- Api.writeCacheConfig(config.uuid, result.data || [])
+ if (config.$cache && type === 'init') {
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
this.loaded = true
@@ -352,37 +347,15 @@
this.timer && this.timer.stop()
}
}
- if (result.message) {
- if (result.ErrCode === 'Y') {
- Modal.success({
- title: result.message
- })
- } else if (result.ErrCode === 'S') {
- notification.success({
- top: 92,
- message: result.message,
- duration: 2
- })
- }
- }
+
+ UtilsDM.querySuccess(result)
} else {
this.setState({
loading: false
})
this.timer && this.timer.stop()
- if (!result.message) return
- if (result.ErrCode === 'N') {
- Modal.error({
- title: result.message,
- })
- } else if (result.ErrCode !== '-2') {
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
- }
+ UtilsDM.queryFail(result)
}
}
--
Gitblit v1.8.0