From 5f91852f0c06b94d03d94a2a7ac9783e28b64451 Mon Sep 17 00:00:00 2001 From: Fine Date: Wed, 20 Dec 2023 17:18:08 +0800 Subject: [PATCH] fix: update --- src/views/dashboard/controls/Tab.vue | 3 +-- src/views/dashboard/panel/Layout.vue | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/dashboard/controls/Tab.vue b/src/views/dashboard/controls/Tab.vue index 61bd1fa2..2460defb 100644 --- a/src/views/dashboard/controls/Tab.vue +++ b/src/views/dashboard/controls/Tab.vue @@ -166,7 +166,6 @@ limitations under the License. --> queryExpressions(); function clickTabs(e: Event, idx: number) { - console.log(idx); e.stopPropagation(); activeTabIndex.value = idx; dashboardStore.activeGridItem(props.data.i); @@ -272,7 +271,7 @@ limitations under the License. --> } dashboardStore.setConfigs(tabsProps); - if ((props.data.children || [])[activeTabIndex.value]?.enable === false) { + if (((props.data.children || [])[activeTabIndex.value] || {}).enable === false) { const index = (props.data.children || []).findIndex((tab: any) => tab.enable !== false) || 0; const items = ((props.data.children || [])[index] || {}).children; dashboardStore.setCurrentTabItems(items || []); diff --git a/src/views/dashboard/panel/Layout.vue b/src/views/dashboard/panel/Layout.vue index be1af136..b12b18b0 100644 --- a/src/views/dashboard/panel/Layout.vue +++ b/src/views/dashboard/panel/Layout.vue @@ -60,8 +60,9 @@ limitations under the License. --> dashboardStore.selectWidget(item); if ( item.type === "Tab" && - (event.target as HTMLDivElement)?.className !== "tab-layout" && - (event.target as HTMLDivElement)?.classList[2] !== "icon-tool" + !["operations", "tab-layout"].includes((event.target as HTMLDivElement)?.className) && + (event.target as HTMLDivElement)?.classList[2] !== "icon-tool" && + (event.target as HTMLDivElement)?.nodeName !== "use" ) { dashboardStore.setActiveTabIndex(0); }