From 186034280175091a3e68c85346048fb22ce5e6e0 Mon Sep 17 00:00:00 2001 From: Li Kui <90845831+likui628@users.noreply.github.com> Date: Sat, 9 Sep 2023 15:15:50 +0800 Subject: [PATCH] fix: setting button not show --- packages/hooks/src/setting/useRootSetting.ts | 20 ++++++++-------- packages/layouts/bridge.ts | 24 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/hooks/src/setting/useRootSetting.ts b/packages/hooks/src/setting/useRootSetting.ts index 3e41eb13..9ad6f86c 100644 --- a/packages/hooks/src/setting/useRootSetting.ts +++ b/packages/hooks/src/setting/useRootSetting.ts @@ -14,21 +14,21 @@ export function useRootSetting() { () => appStore.transition.value.openPageLoading, ) - const getOpenKeepAlive = computed(() => appStore.openKeepAlive) + const getOpenKeepAlive = computed(() => appStore.openKeepAlive.value) const getSettingButtonPosition = computed( - () => appStore.settingButtonPosition, + () => appStore.settingButtonPosition.value, ) - const getCanEmbedIFramePage = computed(() => appStore.canEmbedIFramePage) + const getCanEmbedIFramePage = computed(() => appStore.canEmbedIFramePage.value) - const getPermissionMode = computed(() => appStore.permissionMode) + const getPermissionMode = computed(() => appStore.permissionMode.value) const getShowLogo = computed(() => appStore.logo.value.show) const getContentMode = computed(() => appStore.content.value.mode) - const getUseOpenBackTop = computed(() => appStore.useOpenBackTop) + const getUseOpenBackTop = computed(() => appStore.useOpenBackTop.value) const getShowSettingButton = computed(() => appStore.header.value.showSetting) @@ -36,7 +36,7 @@ export function useRootSetting() { const getShowBreadCrumb = computed(() => appStore.header.value.showBreadCrumb) - const getThemeColor = computed(() => appStore.themeColor) + const getThemeColor = computed(() => appStore.themeColor.value) const getShowBreadCrumbIcon = computed( () => appStore.header.value.showBreadCrumbIcon, @@ -44,13 +44,13 @@ export function useRootSetting() { const getFullContent = computed(() => appStore.content.value.fullScreen) - const getColorWeak = computed(() => appStore.colorWeak) + const getColorWeak = computed(() => appStore.colorWeak.value) - const getGrayMode = computed(() => appStore.grayMode) + const getGrayMode = computed(() => appStore.grayMode.value) - const getLockTime = computed(() => appStore.lockTime) + const getLockTime = computed(() => appStore.lockTime.value) - const getShowDarkModeToggle = computed(() => appStore.showThemeModeToggle) + const getShowDarkModeToggle = computed(() => appStore.showThemeModeToggle.value) const getLayoutContentMode = computed(() => appStore.content.value.mode === ContentLayoutEnum.FULL diff --git a/packages/layouts/bridge.ts b/packages/layouts/bridge.ts index 7bbc18fb..c50c24a3 100644 --- a/packages/layouts/bridge.ts +++ b/packages/layouts/bridge.ts @@ -11,17 +11,17 @@ import { } from '@vben/hooks' export interface ContextOptions { - useRootSetting: () => typeof useRootSetting + useRootSetting: typeof useRootSetting useAppStore: () => unknown useConfigStore: () => unknown - useHeaderSetting: () => typeof useHeaderSetting - useTabs: () => typeof useTabs + useHeaderSetting: typeof useHeaderSetting + useTabs: typeof useTabs useUserStore: () => unknown useAppInject: () => unknown - useMenuSetting: () => typeof useMenuSetting - useMultipleTabSetting: () => typeof useMultipleTabSetting + useMenuSetting: typeof useMenuSetting + useMultipleTabSetting: typeof useMultipleTabSetting useMultipleTabStore: () => unknown - useTransitionSetting: () => typeof useTransitionSetting + useTransitionSetting: typeof useTransitionSetting useLockStore: () => unknown useLockScreen: () => unknown listenerRouteChange: ( @@ -40,14 +40,14 @@ export interface ContextOptions { } export let context: ContextOptions = { - useRootSetting: () => useRootSetting, + useRootSetting, useAppStore: () => undefined, useConfigStore: () => undefined, useUserStore: () => undefined, - useHeaderSetting: () => useHeaderSetting, - useMenuSetting: () => useMenuSetting, - useMultipleTabSetting: () => useMultipleTabSetting, - useTransitionSetting: () => useTransitionSetting, + useHeaderSetting, + useMenuSetting, + useMultipleTabSetting, + useTransitionSetting, useLockStore: () => undefined, useLockScreen: () => undefined, useAppInject: () => undefined, @@ -55,7 +55,7 @@ export let context: ContextOptions = { listenerRouteChange: (listenerRouteChange: (route) => void, immediate?) => true, usePromise: (fn: Function, config) => undefined, - useTabs: () => useTabs, + useTabs, useDesign: useDesign, getMenus: async () => ({}), getCurrentParentPath: async (currentPath: string) => ({}),