From 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:37:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index bc0cd42..4f56e58 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -372,8 +372,8 @@
} else {
this.loadData(id)
}
- } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', supModule, BID)
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
+ MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
} else if (!btn || btn.resetPageIndex !== 'false') {
this.setState({
pageIndex: 1
@@ -1058,17 +1058,13 @@
if (!menu) return
- menu.param = {}
+ menu.param = {$BID: item.$$uuid || ''}
- if (card.setting.joint === 'true') {
- menu.param.$BID = item.$$uuid || ''
-
- Object.keys(item).forEach(key => {
- if (/^\$/.test(key)) return
- if (key === 'children') return
- menu.param[key] = item[key]
- })
- }
+ Object.keys(item).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ menu.param[key] = item[key]
+ })
MKEmitter.emit('modifyTabs', menu, true)
}
--
Gitblit v1.8.0