From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/tabviews/custom/components/card/cardItem/index.jsx | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardItem/index.jsx b/src/tabviews/custom/components/card/cardItem/index.jsx
index 92777c5..c378930 100644
--- a/src/tabviews/custom/components/card/cardItem/index.jsx
+++ b/src/tabviews/custom/components/card/cardItem/index.jsx
@@ -40,14 +40,16 @@
}
}
- openView = () => {
+ openView = (e) => {
const { card, data, cards, onClick } = this.props
onClick && onClick()
if (!card.setting.click || data.$disabled) return
- if (card.setting.click === 'menus' && cards.subtype === 'datacard' && card.$cardType !== 'extendCard') {
+ e.stopPropagation()
+
+ if (card.setting.click === 'menus') {
let menu = null
if (card.menus && card.menus.length > 0) {
@@ -57,14 +59,7 @@
menu = m
})
}
- if (!menu || !menu.MenuID) {
- notification.warning({
- top: 92,
- message: '鏈煡璇㈠埌鑿滃崟淇℃伅锛�',
- duration: 5
- })
- return
- }
+ if (!menu) return
let newtab = {
MenuID: menu.MenuID,
@@ -79,12 +74,13 @@
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
+ if (key === 'children') return
newtab.param[key] = data[key]
})
}
MKEmitter.emit('modifyTabs', newtab, true)
- } else if (card.setting.click === 'menu' && card.setting.menu) {
+ } else if (card.setting.click === 'menu') {
let menuId = card.setting.MenuID || card.setting.menu.slice(-1)[0]
let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
@@ -116,6 +112,7 @@
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
+ if (key === 'children') return
newtab.param[key] = data[key]
})
}
--
Gitblit v1.8.0