diff --git a/packages/hooks/src/config/useAppConfig.ts b/packages/hooks/src/config/useAppConfig.ts index 47a6c658..cde308fa 100644 --- 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) => { useAppConfigStore.$patch((state) => { @@ -54,7 +55,7 @@ export const useAppConfig = () => { useAppConfigStore.$reset() } const getCollapsedShowTitle = computed(() => { - 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 index 941ba9f2..bfa02b94 100644 --- 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 getAllParentPath: (menu, path) => string[] siteSetting: Record - Logo: VNode | null + Logo: Nullable } export let context: ContextOptions = {