fix: title not shown when sidebar is not collapsed (#98)

* fix: title not shown when sidebar is not collapsed * update Logo type * Update bridge.ts
vbenjs · Sep 11, 2023 · ab77d5e · ab77d5e
1 parent 953811b
commit ab77d5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/hooks/src/config/useAppConfig.ts b/packages/hooks/src/config/useAppConfig.ts
@@ -8,7 +8,8 @@ import { useClipboard, _omit } from '@vben/utils'
 export const useAppConfig = () => {
   const useAppConfigStore = appConfigStore()
   const appConfigOptions = storeToRefs(useAppConfigStore)
-  const { openSettingDrawer, sidebar, menu, isMixSidebar } = appConfigOptions
+  const { openSettingDrawer, sidebar, menu, isMixSidebar, isSidebar } =
+    appConfigOptions
 
   const setAppConfig = (configs: DeepPartial<DefineAppConfigOptions>) => {
     useAppConfigStore.$patch((state) => {
@@ -54,7 +55,7 @@ export const useAppConfig = () => {
     useAppConfigStore.$reset()
   }
   const getCollapsedShowTitle = computed<boolean>(() => {
-    if (unref(isMixSidebar)) {
+    if (unref(isMixSidebar) || unref(isSidebar)) {
       return !unref(sidebar).collapsed
     }
     return unref(menu).collapsedShowTitle && unref(sidebar).collapsed

diff --git a/packages/layouts/bridge.ts b/packages/layouts/bridge.ts
@@ -1,4 +1,4 @@
-import { VNode } from 'vue'
+import { DefineComponent } from 'vue'
 import { RouteLocationNormalized } from 'vue-router'
 import {
   useRootSetting,
@@ -11,6 +11,9 @@ import {
   useAppConfig,
 } from '@vben/hooks'
 
+type LogoComponent = DefineComponent<{
+  showTitle?: boolean
+}>
 export interface ContextOptions {
   useAppConfig: typeof useAppConfig
   useRootSetting: typeof useRootSetting
@@ -38,7 +41,7 @@ export interface ContextOptions {
   getChildrenMenus: (parentPath: string) => Promise<any>
   getAllParentPath: (menu, path) => string[]
   siteSetting: Record<string, string>
-  Logo: VNode | null
+  Logo: Nullable<LogoComponent>
 }
 
 export let context: ContextOptions = {