From 891e8aaad3b2ce6980fd44d1cf49192dca1c3c66 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 十一月 2022 14:30:30 +0800
Subject: [PATCH] 2022-11-23
---
src/tabviews/custom/components/card/table-card/index.jsx | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/card/table-card/index.jsx b/src/tabviews/custom/components/card/table-card/index.jsx
index 189b3a3..50e2162 100644
--- a/src/tabviews/custom/components/card/table-card/index.jsx
+++ b/src/tabviews/custom/components/card/table-card/index.jsx
@@ -355,12 +355,12 @@
openView = (card, data) => {
if (card.setting.click === 'menu' && card.setting.menu) {
- let menuId = card.setting.MenuID || card.setting.menu.slice(-1)[0]
+ let menuId = card.setting.menu.slice(-1)[0]
let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
- if (!menu && card.setting.MenuName && card.setting.tabType) {
+ if (!menu && card.setting.MenuName && card.setting.MenuID) {
menu = {
- MenuID: menuId,
+ MenuID: card.setting.MenuID,
MenuName: card.setting.MenuName,
MenuNo: card.setting.MenuNo || '',
type: card.setting.tabType
@@ -383,13 +383,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