From 783ab4e467c95e26f7f031151507bd7ad8333a63 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 九月 2023 17:34:47 +0800
Subject: [PATCH] 2023-09-08
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 22 ++++++++++------------
1 files changed, 10 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 53048cb..d803a09 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -1033,36 +1033,34 @@
if (subcard.setting.click || card.setting.position !== 'inner' || card.setting.click !== 'menu') return
- let menuId = card.setting.MenuID || card.setting.menu.slice(-1)[0]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menuId = card.setting.menu.slice(-1)[0]
+ let menu = null
- if (!menu && card.setting.MenuName && card.setting.tabType) {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (card.setting.MenuID) {
menu = {
- MenuID: menuId,
+ MenuID: card.setting.MenuID,
MenuName: card.setting.MenuName,
- MenuNo: card.setting.MenuNo || '',
type: card.setting.tabType
}
}
if (!menu) return
- let newtab = {
- ...menu,
- param: {}
- }
+ menu.param = {}
if (card.setting.joint === 'true') {
- newtab.param.$BID = item.$$uuid || ''
+ menu.param.$BID = item.$$uuid || ''
Object.keys(item).forEach(key => {
if (/^\$/.test(key)) return
if (key === 'children') return
- newtab.param[key] = item[key]
+ menu.param[key] = item[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
}
onDoubleClick = (i, subClass) => {
--
Gitblit v1.8.0