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-bar-line/index.jsx | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 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 38923d3..ae2dfce 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -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()
}
@@ -1848,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') {
@@ -1877,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