From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/carousel/cardItem/index.jsx | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/cardItem/index.jsx b/src/tabviews/custom/components/carousel/cardItem/index.jsx
index b5711fc..ad41768 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,
@@ -83,7 +85,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