From cb9ade2afd2a367ad767bc605ab7086c695dd010 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 15:53:32 +0800
Subject: [PATCH] 2022-12-09
---
src/tabviews/custom/components/carousel/cardItem/index.jsx | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/cardItem/index.jsx b/src/tabviews/custom/components/carousel/cardItem/index.jsx
index b5711fc..e502391 100644
--- a/src/tabviews/custom/components/carousel/cardItem/index.jsx
+++ b/src/tabviews/custom/components/carousel/cardItem/index.jsx
@@ -43,6 +43,8 @@
openView = () => {
const { card, data, cards } = this.props
+ if (!card.setting.click || data.$disabled) return
+
if (card.setting.click === 'menu' && card.setting.MenuID) {
let menu = {
MenuID: card.setting.MenuID,
@@ -58,13 +60,14 @@
if (card.setting.joint === 'true') {
newtab.param.$BID = data.$$uuid || ''
+
+ Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ newtab.param[key] = data[key]
+ })
}
- if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
- MKEmitter.emit('modifyTabs', newtab, 'replace')
- } else {
- MKEmitter.emit('modifyTabs', newtab, 'plus', true)
- }
+ MKEmitter.emit('modifyTabs', newtab, true)
} else if (card.setting.click === 'link') {
let src = card.setting.linkurl
@@ -83,7 +86,7 @@
if (cards.subtype === 'datacard') {
MKEmitter.emit('triggerBtnId', card.setting.linkbtn, [data], 'linkbtn')
} else {
- MKEmitter.emit('triggerBtnId', card.setting.linkbtn, [data])
+ MKEmitter.emit('triggerBtnId', card.setting.linkbtn, data.$$empty ? [] : [data])
}
}
}
--
Gitblit v1.8.0