From ec34c759ec6e147bec3dee3eb71f9b4e42dc234c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 16 十月 2023 15:36:23 +0800
Subject: [PATCH] !52 fix 优化表格列的显示与隐藏小组件不显示tip和浏览器告警 Merge pull request !52 from bestrevens/ts
---
src/layout/components/Sidebar/index.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index fff3736..fc290b1 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -4,7 +4,7 @@
<el-scrollbar :class="sideTheme" wrap-class="scrollbar-wrapper">
<transition :enter-active-class="proxy?.animate.menuSearchAnimate.enter" mode="out-in">
<el-menu
- :default-active="activeMenu as string"
+ :default-active="activeMenu"
:collapse="isCollapse"
:background-color="bgColor"
:text-color="textColor"
@@ -27,6 +27,7 @@
import useAppStore from '@/store/modules/app'
import useSettingsStore from '@/store/modules/settings'
import usePermissionStore from '@/store/modules/permission'
+import { RouteOption } from "vue-router";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
@@ -34,7 +35,7 @@
const settingsStore = useSettingsStore()
const permissionStore = usePermissionStore()
-const sidebarRouters = computed(() => permissionStore.sidebarRouters);
+const sidebarRouters = computed<RouteOption[]>(() => permissionStore.sidebarRouters);
const showLogo = computed(() => settingsStore.sidebarLogo);
const sideTheme = computed(() => settingsStore.sideTheme);
const theme = computed(() => settingsStore.theme);
--
Gitblit v1.9.3