From 0e76431e5bc06a60c8103b39aa3b26f05bb2b810 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 十一月 2022 16:38:02 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/carousel/cardItem/index.jsx | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/cardItem/index.jsx b/src/tabviews/custom/components/carousel/cardItem/index.jsx
index ad41768..e502391 100644
--- a/src/tabviews/custom/components/carousel/cardItem/index.jsx
+++ b/src/tabviews/custom/components/carousel/cardItem/index.jsx
@@ -60,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
--
Gitblit v1.8.0