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/card/cardItem/index.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardItem/index.jsx b/src/tabviews/custom/components/card/cardItem/index.jsx
index a5a6694..6ba7e42 100644
--- a/src/tabviews/custom/components/card/cardItem/index.jsx
+++ b/src/tabviews/custom/components/card/cardItem/index.jsx
@@ -44,7 +44,7 @@
openView = () => {
const { card, data, cards } = this.props
- if (!card.setting.click) return
+ if (!card.setting.click || data.$disabled) return
if (card.setting.click === 'menus' && cards.subtype === 'datacard' && card.$cardType !== 'extendCard') {
let menu = null
@@ -135,11 +135,11 @@
window.open(src)
} else if (card.setting.click === 'button' && card.setting.clickType !== 'multi' && card.setting.linkbtn) {
if (data.$$type === 'extendCard') {
- MKEmitter.emit('triggerBtnId', card.setting.linkbtn, [])
+ MKEmitter.emit('triggerBtnId', card.setting.linkbtn, data.$$selectedData || [])
} else 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])
}
}
}
@@ -147,15 +147,15 @@
doubleClick = () => {
const { card, data, cards } = this.props
- if (card.setting.click !== 'button' || card.setting.clickType !== 'multi') return
+ if (card.setting.click !== 'button' || card.setting.clickType !== 'multi' || data.$disabled) return
if (card.setting.linkbtn) {
if (data.$$type === 'extendCard') {
- MKEmitter.emit('triggerBtnId', card.setting.linkbtn, [])
+ MKEmitter.emit('triggerBtnId', card.setting.linkbtn, data.$$selectedData || [])
} else 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