From 0844cf7a0de1b38ff9649e7958adbfffe1b3532d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 九月 2023 10:09:48 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/carousel/cardItem/index.jsx | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/cardItem/index.jsx b/src/tabviews/custom/components/carousel/cardItem/index.jsx
index e502391..1ed6197 100644
--- a/src/tabviews/custom/components/carousel/cardItem/index.jsx
+++ b/src/tabviews/custom/components/carousel/cardItem/index.jsx
@@ -16,10 +16,6 @@
data: PropTypes.object,
}
- state = {
- card: null, // 鍗＄墖淇℃伅锛屽寘鎷鍙嶉潰
- }
-
/**
* @description 鎼滅储鏉′欢鍒濆鍖�
*/
@@ -45,29 +41,34 @@
if (!card.setting.click || data.$disabled) return
- if (card.setting.click === 'menu' && card.setting.MenuID) {
- let menu = {
- MenuID: card.setting.MenuID,
- MenuName: card.setting.MenuName,
- MenuNo: card.setting.MenuNo,
- type: card.setting.tabType
+ if (card.setting.click === 'menu') {
+ let menuId = card.setting.menu.slice(-1)[0]
+ let menu = null
+
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (card.setting.MenuID) {
+ menu = {
+ MenuID: card.setting.MenuID,
+ MenuName: card.setting.MenuName,
+ type: card.setting.tabType
+ }
}
- let newtab = {
- ...menu,
- param: {}
- }
+ if (!menu) return
+
+ menu.param = {}
if (card.setting.joint === 'true') {
- newtab.param.$BID = data.$$uuid || ''
+ menu.param.$BID = data.$$uuid || ''
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
+ menu.param[key] = data[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
} else if (card.setting.click === 'link') {
let src = card.setting.linkurl
--
Gitblit v1.8.0