From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 62 ++++++++-----------------------
1 files changed, 16 insertions(+), 46 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index 75a01b7..ae2dfce 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -3,7 +3,7 @@
import { is, fromJS } from 'immutable'
import { Chart } from '@antv/g2'
import DataSet from '@antv/data-set'
-import { Spin, Empty, notification, Modal } from 'antd'
+import { Spin, Empty } from 'antd'
import { DownloadOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -548,8 +548,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()
}
@@ -662,37 +662,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)
}
}
@@ -1870,17 +1848,13 @@
MenuName: menu.MenuName,
MenuNo: menu.MenuNo || '',
type: menu.tabType,
- param: {}
+ param: {$BID: data.$$uuid || ''}
}
- if (plot.joint === 'true') {
- newtab.param.$BID = data.$$uuid || ''
-
- Object.keys(data).forEach(key => {
- if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
- })
- }
+ Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ newtab.param[key] = data[key]
+ })
MKEmitter.emit('modifyTabs', newtab, true)
} else if (plot.click === 'menu') {
@@ -1899,16 +1873,12 @@
if (!menu) return
- menu.param = {}
+ menu.param = {$BID: data.$$uuid || ''}
- if (plot.joint === 'true') {
- menu.param.$BID = data.$$uuid || ''
-
- Object.keys(data).forEach(key => {
- if (/^\$/.test(key)) return
- menu.param[key] = data[key]
- })
- }
+ Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ menu.param[key] = data[key]
+ })
MKEmitter.emit('modifyTabs', menu, true)
} else {
--
Gitblit v1.8.0