fix: the logo is show in the settings has no effect. close #214 (#216)

* fix: the logo is show in the settings has no effect. close #214

* chore: Recordable 泛型参数设定默认值

* feat(AppConfig):  设置为左侧菜单混合模式,设定logo为打开

* refactor(AppConfig): 增加预处理config方法

apps/admin/src/layout/components/logo.vue

@@ -1,8 +1,10 @@
 <script lang="ts" setup>
+import { computed, unref } from 'vue';
 import { useRouter } from 'vue-router'
 import { BASIC_HOME_PATH } from '@vben/constants'
 import { createNamespace, getGlobalConfig } from '@vben/utils'
 import logo from '@/assets/images/logo.png'
+import { useRootSetting } from '@vben/hooks'
 
 const { bem } = createNamespace('app-logo')
 
@@ -21,19 +23,20 @@ const props = defineProps({
 const { push } = useRouter()
 const { title } = getGlobalConfig(import.meta.env)
 
+const { getShowLogo } = useRootSetting();
+
+const getIsShowLogo = computed(() => unref(getShowLogo));
+
+
 function goHome() {
   push(props.homePath)
 }
 </script>
 
 <template>
-  <div :class="bem()" @click="goHome">
+  <div v-if="getIsShowLogo" :class="bem()" @click="goHome">
     <img :src="logo" alt="logo" />
-    <div
-      class="ml-2 truncate md:opacity-100"
-      :class="bem('title')"
-      v-show="showTitle"
-    >
+    <div class="ml-2 truncate md:opacity-100" :class="bem('title')" v-show="showTitle">
       {{ title }}
     </div>
   </div>

packages/hooks/src/config/useAppConfig.ts

@@ -1,6 +1,6 @@
 import { storeToRefs, useAppConfig as appConfigStore } from '@vben/stores'
 import { DefineAppConfigOptions } from '@vben/types'
-import { HandlerSettingEnum } from '@vben/constants'
+import { HandlerSettingEnum, NavBarModeEnum } from '@vben/constants'
 import { _merge } from '@vben/utils'
 import { computed, reactive, unref } from 'vue'
 import { useClipboard, _omit } from '@vben/utils'
@@ -13,10 +13,21 @@ export const useAppConfig = () => {
 
   const setAppConfig = (configs: DeepPartial<DefineAppConfigOptions>) => {
     useAppConfigStore.$patch((state) => {
-      _merge(state, configs)
+      _merge(state, preDealConfig(configs))
     })
   }
 
+  function preDealConfig(configs: DeepPartial<DefineAppConfigOptions>) {
+    if (
+      configs.navBarMode &&
+      configs.navBarMode === NavBarModeEnum.MIX_SIDEBAR
+    ) {
+      configs.logo = { show: true, visible: true }
+    }
+
+    return configs
+  }
+
   function toggleOpenSettingDrawer() {
     useAppConfigStore.setOpenSettingDrawer(!unref(openSettingDrawer))
   }

packages/types/src/global.ts

@@ -27,7 +27,7 @@ declare global {
     ReturnType<T>
   >
   type Nullable<T> = T | null
-  type Recordable<T> = Record<string, T>
+  type Recordable<T = any> = Record<string, T>
   type TimeoutHandle = ReturnType<typeof setTimeout>
   type IntervalHandle = ReturnType<typeof setInterval>
   type DeepPartial<T> = {