日常版本更新

Fixes bug 新增顶部混合菜单
Fixes bug
2026-02-04 21:52:27 +08:00 · 2021-08-06 17:10:54 +08:00 · 2021-08-06 17:06:33 +08:00 · 2021-08-05 21:38:32 +08:00
21 changed files with 622 additions and 68 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,16 @@
-# 1.5.1 (2021-08-07)
+# 1.5.2 (2021-08-06)
+### 🐛 Bug Fixes
+- 修复已知bug
+
+- ### ✨ Features
+- 新增 `混合菜单模式`
+- 新增 `根路由`
+- 新增 `关于` 根路由示例页面
+- 文档同步更新，组件和示例
+
+
+
+# 1.5.1 (2021-08-05)
 ### 🐛 Bug Fixes
 - 修复windows系统获取项目换行符问题
 - 修复表格分页计算问题 [@Chika99](https://github.com/Chika99)
@@ -6,8 +18,6 @@
 - 依赖 dayjs 移除，用date-fns，和UI框架底层保持一致
 - 修复已知bug 

-
-
 - ### ✨ Features
 - 新增 `baseForm` 组件，和`基础`，`useForm`使用方式
 - 新增 `baseModal`，组件，和 `useForm`使用方式  
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "naive-ui-admin",
-  "version": "1.5.1",
+  "version": "1.5.2",
  "author": {
    "name": "Ahjung",
    "email": "735878602@qq.com",
--- a/src/assets/images/nav-horizontal-mix.svg
+++ b/src/assets/images/nav-horizontal-mix.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="52px" height="45px" viewBox="0 0 52 45" enable-background="new 0 0 52 45" xml:space="preserve">  <image id="image0" width="52" height="45" x="0" y="0"
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAAtCAMAAADWf7iKAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAAdVBMVEX///8AAABkbnc9RVY7
+QE9fY3GIiJZjbHk9QFOCi5QAAAA9QlZfZHMAAAA4QFEAAADt7/Lf5OTt7/KChoYAAADu8PTf3+Nw
+c3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyNUkyOEn////w8vWhURXFAAAAI3RS
+TlMAAE/2/uZJUP45AvfkBP4F9LrwPwP0vUkOAREsNjk0JwYHCLrjEiIAAAABYktHRACIBR1IAAAA
+CXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH5QgGAhE5kB5L+gAAAIZJREFUSMft1rsSgjAQhWEW
+FTUYIopKlPui7/+IZqFhbMxmhm7//qvPiaKgAOIN+rbdJQCE9qO3cR2OhFTKMYgn5ZDmGcy0Q4aJ
+0AhaoPdPnz8JEiRIkKCV0DkE5YQ0D12uBQ01B93uj9LSJdDPV1V71rRlMf0Iq7p+8Kw3aj4fAJYR
+TCigL0lMJ5P4y7LRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIxLTA4LTA2VDAyOjE3OjU2KzAwOjAw
+Kbo8/wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMS0wOC0wNlQwMjoxNzo1NiswMDowMFjnhEMAAAAA
+SUVORK5CYII=" />
+</svg>
--- a/src/components/Modal/src/hooks/useModal.ts
+++ b/src/components/Modal/src/hooks/useModal.ts
@@ -1,12 +1,12 @@
 import { ref, onUnmounted, unref, getCurrentInstance, watch } from 'vue';
 import { isProdMode } from '@/utils/env';
-import { UseModalReturnType, ModalMethods } from './type';
+import { ReturnMethods } from '../type';
 import { getDynamicProps } from '@/utils';
-export function useModal(props?: Props): UseModalReturnType {
-  const modal = ref<Nullable<ModalMethods>>(null);
+export function useModal(props): (((modalMethod: ReturnMethods) => any) | ReturnMethods)[] {
+  const modal = ref<Nullable<ReturnMethods>>(null);
  const loaded = ref<Nullable<boolean>>(false);

-  function register(modalMethod: ModalMethods) {
+  function register(modalMethod: ReturnMethods) {
    if (!getCurrentInstance()) {
      throw new Error('useModal() can only be used inside setup() or functional components!');
    }
@@ -21,6 +21,7 @@ export function useModal(props?: Props): UseModalReturnType {
    watch(
      () => props,
      () => {
+        // @ts-ignore
        const { setProps } = modal.value;
        props && setProps(getDynamicProps(props));
      },
@@ -34,13 +35,13 @@ export function useModal(props?: Props): UseModalReturnType {
  const getInstance = () => {
    const instance = unref(modal);
    if (!instance) {
-      error('useModal instance is undefined!');
+      console.error('useModal instance is undefined!');
    }
    return instance;
  };

  const methods: ReturnMethods = {
-    setProps: (props: Partial<ModalProps>): void => {
+    setProps: (props): void => {
      getInstance()?.setProps(props);
    },
    openModal: () => {
@@ -49,8 +50,8 @@ export function useModal(props?: Props): UseModalReturnType {
    closeModal: () => {
      getInstance()?.closeModal();
    },
-    setSubLoading: () => {
-      getInstance()?.setSubLoading();
+    setSubLoading: (status) => {
+      getInstance()?.setSubLoading(status);
    },
  };
  return [register, methods];
--- a/src/components/Modal/src/type/index.ts
+++ b/src/components/Modal/src/type/index.ts
@@ -1,12 +1,9 @@
-export interface ModalProps {
-  subBtuText?: string;
-}
-
 /**
 * @description: 弹窗对外暴露的方法
 */
-export interface ModalMethods {
-  setProps: (props: Partial<ModalProps>) => void;
+export interface ReturnMethods {
+  setProps: (props) => void;
  openModal: () => void;
  closeModal: () => void;
+  setSubLoading: (status) => void;
 }
--- a/src/layout/components/Header/ProjectSetting.vue
+++ b/src/layout/components/Header/ProjectSetting.vue
@@ -46,7 +46,11 @@
          <div class="drawer-setting-item-style align-items-top">
            <n-tooltip placement="top">
              <template #trigger>
-                <img src="~@/assets/images/nav-theme-dark.svg" @click="togNavMode('vertical')" />
+                <img
+                  src="~@/assets/images/nav-theme-dark.svg"
+                  @click="togNavMode('vertical')"
+                  alt="左侧菜单模式"
+                />
              </template>
              <span>左侧菜单模式</span>
            </n-tooltip>
@@ -56,12 +60,30 @@
          <div class="drawer-setting-item-style">
            <n-tooltip placement="top">
              <template #trigger>
-                <img src="~@/assets/images/nav-horizontal.svg" @click="togNavMode('horizontal')" />
+                <img
+                  src="~@/assets/images/nav-horizontal.svg"
+                  alt="顶部菜单模式"
+                  @click="togNavMode('horizontal')"
+                />
              </template>
              <span>顶部菜单模式</span>
            </n-tooltip>
            <n-badge dot color="#19be6b" v-show="settingStore.navMode === 'horizontal'" />
          </div>
+
+          <div class="drawer-setting-item-style">
+            <n-tooltip placement="top">
+              <template #trigger>
+                <img
+                  src="~@/assets/images/nav-horizontal-mix.svg"
+                  @click="togNavMode('horizontal-mix')"
+                  alt="顶部菜单混合模式"
+                />
+              </template>
+              <span>顶部菜单混合模式</span>
+            </n-tooltip>
+            <n-badge dot color="#19be6b" v-show="settingStore.navMode === 'horizontal-mix'" />
+          </div>
        </div>

        <n-divider title-placement="center">导航栏风格</n-divider>
@@ -70,7 +92,11 @@
          <div class="drawer-setting-item-style align-items-top">
            <n-tooltip placement="top">
              <template #trigger>
-                <img src="~@/assets/images/nav-theme-dark.svg" @click="togNavTheme('dark')" />
+                <img
+                  src="~@/assets/images/nav-theme-dark.svg"
+                  alt="暗色侧边栏"
+                  @click="togNavTheme('dark')"
+                />
              </template>
              <span>暗色侧边栏</span>
            </n-tooltip>
@@ -80,7 +106,11 @@
          <div class="drawer-setting-item-style">
            <n-tooltip placement="top">
              <template #trigger>
-                <img src="~@/assets/images/nav-theme-light.svg" @click="togNavTheme('light')" />
+                <img
+                  src="~@/assets/images/nav-theme-light.svg"
+                  alt="白色侧边栏"
+                  @click="togNavTheme('light')"
+                />
              </template>
              <span>白色侧边栏</span>
            </n-tooltip>
@@ -95,6 +125,7 @@
                <img
                  src="~@/assets/images/header-theme-dark.svg"
                  @click="togNavTheme('header-dark')"
+                  alt="暗色顶栏"
                />
              </template>
              <span>暗色顶栏</span>
@@ -105,6 +136,16 @@

        <n-divider title-placement="center">界面功能</n-divider>

+        <div class="drawer-setting-item">
+          <div class="drawer-setting-item-title"> 分割菜单 </div>
+          <div class="drawer-setting-item-action">
+            <n-switch
+              :disabled="settingStore.navMode === 'horizontal-mix' ? false : true"
+              v-model:value="settingStore.menuSetting.mixMenu"
+            />
+          </div>
+        </div>
+
        <div class="drawer-setting-item">
          <div class="drawer-setting-item-title"> 固定顶栏 </div>
          <div class="drawer-setting-item-action">
@@ -312,6 +353,7 @@
    .justify-center {
      justify-content: center;
    }
+
    .dark-switch .n-switch {
      ::v-deep(.n-switch__rail) {
        background-color: #000e1c;
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -1,8 +1,16 @@
 <template>
  <div class="layout-header">
    <!--顶部菜单-->
-    <div class="layout-header-left" v-if="navMode === 'horizontal'">
-      <AsideMenu v-model:collapsed="collapsed" :inverted="getInverted" mode="horizontal" />
+    <div
+      class="layout-header-left"
+      v-if="navMode === 'horizontal' || (navMode === 'horizontal-mix' && mixMenu)"
+    >
+      <AsideMenu
+        v-model:collapsed="collapsed"
+        v-model:location="getMenuLocation"
+        :inverted="getInverted"
+        mode="horizontal"
+      />
    </div>
    <!--左侧菜单-->
    <div class="layout-header-left" v-else>
@@ -161,6 +169,10 @@
        return ['light', 'header-dark'].includes(navTheme) ? props.inverted : !props.inverted;
      });

+      const mixMenu = computed(() => {
+        return unref(getMenuSetting).mixMenu;
+      });
+
      const getChangeStyle = computed(() => {
        const { collapsed } = props;
        const { minMenuWidth, menuWidth }: any = unref(getMenuSetting);
@@ -170,6 +182,10 @@
        };
      });

+      const getMenuLocation = computed(() => {
+        return 'header';
+      });
+
      const router = useRouter();
      const route = useRoute();

@@ -314,6 +330,8 @@
        drawerSetting,
        openSetting,
        getInverted,
+        getMenuLocation,
+        mixMenu,
      };
    },
  });
@@ -330,11 +348,6 @@
    transition: all 0.2s ease-in-out;
    width: 100%;
    z-index: 11;
-    //color: #fff;
-
-    //.n-icon {
-    //  color: #fff
-    //}

    &-left {
      display: flex;
@@ -344,10 +357,6 @@
        color: #515a6e;
      }

-      ::v-deep(.n-breadcrumb .n-breadcrumb-item:last-child .n-breadcrumb-item__link) {
-        color: #fff;
-      }
-
      .n-breadcrumb {
        display: inline-block;
      }
--- a/src/layout/components/Menu/index.vue
+++ b/src/layout/components/Menu/index.vue
@@ -8,17 +8,17 @@
    :collapsed-icon-size="20"
    :indent="24"
    :expanded-keys="openKeys"
-    v-model:value="selectedKeys"
+    :value="getSelectedKeys"
    @update:value="clickMenuItem"
    @update:expanded-keys="menuExpanded"
  />
 </template>

 <script lang="ts">
-  import { defineComponent, reactive, computed, watch, toRefs, unref } from 'vue';
+  import { defineComponent, ref, onMounted, reactive, computed, watch, toRefs, unref } from 'vue';
  import { useRoute, useRouter } from 'vue-router';
  import { useAsyncRouteStore } from '@/store/modules/asyncRoute';
-  import { generatorMenu } from '@/utils';
+  import { generatorMenu, generatorMenuMix } from '@/utils';
  import { useProjectSettingStore } from '@/store/modules/projectSetting';

  export default defineComponent({
@@ -34,6 +34,11 @@
        // 侧边栏菜单是否收起
        type: Boolean,
      },
+      //位置
+      location: {
+        type: String,
+        default: 'left',
+      },
    },
    setup(props) {
      // 当前路由
@@ -41,6 +46,9 @@
      const router = useRouter();
      const asyncRouteStore = useAsyncRouteStore();
      const settingStore = useProjectSettingStore();
+      const menus = ref<any[]>([]);
+      const selectedKeys = ref<string>(currentRoute.name as string);
+      const headerMenuSelectKey = ref<string>('');

      // 获取当前打开的子菜单
      const matched = currentRoute.matched;
@@ -49,23 +57,30 @@

      const state = reactive({
        openKeys: getOpenKeys,
-        selectedKeys: currentRoute.name,
      });

      const inverted = computed(() => {
        return ['dark', 'header-dark'].includes(settingStore.navTheme);
      });

-      const menus = computed(() => {
-        return generatorMenu(asyncRouteStore.getMenus);
+      const getSelectedKeys = computed(() => {
+        return props.location === 'left' ? unref(selectedKeys) : unref(headerMenuSelectKey);
      });

+      // 监听分割菜单
+      watch(
+        () => settingStore.menuSetting.mixMenu,
+        () => {
+          updateMenu();
+        }
+      );
+
      // 监听菜单收缩状态
      watch(
        () => props.collapsed,
        (newVal) => {
          state.openKeys = newVal ? [] : getOpenKeys;
-          state.selectedKeys = currentRoute.name;
+          selectedKeys.value = currentRoute.name as string;
        }
      );

@@ -73,12 +88,26 @@
      watch(
        () => currentRoute.fullPath,
        () => {
+          updateMenu();
          const matched = currentRoute.matched;
          state.openKeys = matched.map((item) => item.name);
-          state.selectedKeys = currentRoute.name;
+          const activeMenu: string = (currentRoute.meta?.activeMenu as string) || '';
+          selectedKeys.value = activeMenu ? (activeMenu as string) : (currentRoute.name as string);
        }
      );

+      function updateMenu() {
+        if (!settingStore.menuSetting.mixMenu) {
+          menus.value = generatorMenu(asyncRouteStore.getMenus);
+        } else {
+          //混合菜单
+          const firstRouteName: string = (currentRoute.matched[0].name as string) || '';
+          menus.value = generatorMenuMix(asyncRouteStore.getMenus, firstRouteName, props.location);
+          const activeMenu: string = currentRoute?.matched[0].meta?.activeMenu as string;
+          headerMenuSelectKey.value = (activeMenu ? activeMenu : firstRouteName) || '';
+        }
+      }
+
      // 点击菜单
      function clickMenuItem(key: string) {
        if (/http(s)?:/.test(key)) {
@@ -101,17 +130,24 @@
        if (!key) return false;
        const subRouteChildren: string[] = [];
        for (const { children, key } of unref(menus)) {
-          if (children && children.length > 0) {
+          if (children && children.length) {
            subRouteChildren.push(key as string);
          }
        }
        return subRouteChildren.includes(key);
      }

+      onMounted(() => {
+        updateMenu();
+      });
+
      return {
        ...toRefs(state),
        inverted,
        menus,
+        selectedKeys,
+        headerMenuSelectKey,
+        getSelectedKeys,
        clickMenuItem,
        menuExpanded,
      };
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -116,6 +116,7 @@
  import { renderIcon } from '@/utils/index';
  import elementResizeDetectorMaker from 'element-resize-detector';
  import { useDesignSetting } from '@/hooks/setting/useDesignSetting';
+  import { useProjectSettingStore } from '@/store/modules/projectSetting';

  export default defineComponent({
    name: 'TabsView',
@@ -135,6 +136,7 @@
      const { getDarkTheme } = useDesignSetting();
      const { getNavMode, getHeaderSetting, getMenuSetting, getMultiTabsSetting } =
        useProjectSetting();
+      const settingStore = useProjectSettingStore();

      const message = useMessage();
      const route = useRoute();
@@ -165,6 +167,17 @@
        return { fullPath, hash, meta, name, params, path, query };
      };

+      const isMixMenuNoneSub = computed(() => {
+        const mixMenu = settingStore.menuSetting.mixMenu;
+        const currentRoute = useRoute();
+        const navMode = unref(getNavMode);
+        if (unref(navMode) != 'horizontal-mix') return true;
+        if (unref(navMode) === 'horizontal-mix' && mixMenu && currentRoute.meta.isRoot) {
+          return false;
+        }
+        return true;
+      });
+
      //动态组装样式 菜单缩进
      const getChangeStyle = computed(() => {
        const { collapsed } = props;
@@ -172,7 +185,11 @@
        const { minMenuWidth, menuWidth }: any = unref(getMenuSetting);
        const { fixed }: any = unref(getMultiTabsSetting);
        let lenNum =
-          navMode === 'horizontal' ? '0px' : collapsed ? `${minMenuWidth}px` : `${menuWidth}px`;
+          navMode === 'horizontal' || !isMixMenuNoneSub.value
+            ? '0px'
+            : collapsed
+            ? `${minMenuWidth}px`
+            : `${menuWidth}px`;
        return {
          left: lenNum,
          width: `calc(100% - ${!fixed ? '0px' : lenNum})`,
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,7 +1,7 @@
 <template>
  <NLayout class="layout" :position="fixedMenu" has-sider>
    <NLayoutSider
-      v-if="navMode === 'vertical'"
+      v-if="isMixMenuNoneSub && (navMode === 'vertical' || navMode === 'horizontal-mix')"
      show-trigger
      @collapse="collapsed = true"
      :position="fixedMenu"
@@ -15,7 +15,7 @@
      class="layout-sider"
    >
      <Logo :collapsed="collapsed" />
-      <AsideMenu v-model:collapsed="collapsed" />
+      <AsideMenu v-model:collapsed="collapsed" v-model:location="getMenuLocation" />
    </NLayoutSider>

    <NLayout :inverted="inverted">
@@ -65,6 +65,8 @@
  import { useProjectSetting } from '@/hooks/setting/useProjectSetting';
  import { useDesignSetting } from '@/hooks/setting/useDesignSetting';
  import { useLoadingBar } from 'naive-ui';
+  import { useRoute } from 'vue-router';
+  import { useProjectSettingStore } from '@/store/modules/projectSetting';

  export default defineComponent({
    name: 'Layout',
@@ -77,7 +79,6 @@
    },
    setup() {
      const { getDarkTheme } = useDesignSetting();
-
      const {
        getShowFooter,
        getNavMode,
@@ -87,6 +88,8 @@
        getMultiTabsSetting,
      } = useProjectSetting();

+      const settingStore = useProjectSettingStore();
+
      const navMode = getNavMode;

      const collapsed = ref<boolean>(false);
@@ -96,6 +99,16 @@
        return fixed ? 'absolute' : 'static';
      });

+      const isMixMenuNoneSub = computed(() => {
+        const mixMenu = settingStore.menuSetting.mixMenu;
+        const currentRoute = useRoute();
+        if (unref(navMode) != 'horizontal-mix') return true;
+        if (unref(navMode) === 'horizontal-mix' && mixMenu && currentRoute.meta.isRoot) {
+          return false;
+        }
+        return true;
+      });
+
      const fixedMenu = computed(() => {
        const { fixed } = unref(getHeaderSetting);
        return fixed ? 'absolute' : 'static';
@@ -130,6 +143,10 @@
        };
      });

+      const getMenuLocation = computed(() => {
+        return 'left';
+      });
+
      function watchWidth() {
        const Width = document.body.clientWidth;
        if (Width <= 950) {
@@ -157,6 +174,8 @@
        getShowFooter,
        getDarkTheme,
        getHeaderInverted,
+        getMenuLocation,
+        isMixMenuNoneSub,
      };
    },
  });
--- a/src/router/modules/about.ts
+++ b/src/router/modules/about.ts
@@ -0,0 +1,32 @@
+import { RouteRecordRaw } from 'vue-router';
+import { Layout } from '@/router/constant';
+import { ProjectOutlined } from '@vicons/antd';
+import { renderIcon, renderNew } from '@/utils/index';
+
+const routes: Array<RouteRecordRaw> = [
+  {
+    path: '/about',
+    name: 'about',
+    component: Layout,
+    meta: {
+      sort: 9,
+      isRoot: true,
+      activeMenu: 'about_index',
+    },
+    children: [
+      {
+        path: 'index',
+        name: `about_index`,
+        meta: {
+          title: '关于',
+          icon: renderIcon(ProjectOutlined),
+          extra: renderNew(),
+          activeMenu: 'about_index',
+        },
+        component: () => import('@/views/about/index.vue'),
+      },
+    ],
+  },
+];
+
+export default routes;
--- a/src/router/modules/docs.ts
+++ b/src/router/modules/docs.ts
@@ -1,7 +1,7 @@
 import { RouteRecordRaw } from 'vue-router';
 import { Layout } from '@/router/constant';
 import { DocumentTextOutline } from '@vicons/ionicons5';
-import { renderIcon, renderNew } from '@/utils/index';
+import { renderIcon } from '@/utils/index';

 const routes: Array<RouteRecordRaw> = [
  {
@@ -12,7 +12,6 @@ const routes: Array<RouteRecordRaw> = [
      title: '项目文档',
      icon: renderIcon(DocumentTextOutline),
      sort: 8,
-      extra: renderNew(),
    },
  },
 ];
--- a/src/router/modules/list.ts
+++ b/src/router/modules/list.ts
@@ -41,6 +41,7 @@ const routes: Array<RouteRecordRaw> = [
        meta: {
          title: '基础详情',
          hidden: true,
+          activeMenu: 'basic-list',
        },
        component: () => import('@/views/list/basicList/info.vue'),
      },
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -31,6 +31,8 @@ const setting = {
    menuWidth: 200,
    //固定菜单
    fixed: true,
+    //分割菜单
+    mixMenu: false,
  },
  //面包屑
  crumbsSetting: {
--- a/src/utils/Drag.ts
+++ b/src/utils/Drag.ts
@@ -1,8 +1,9 @@
 //获取相关CSS属性
 const getCss = function (o, key) {
+  // @ts-ignore
  return o.currentStyle
    ? o.currentStyle[key]
-    : document.defaultView.getComputedStyle(o, false)[key];
+    : document.defaultView?.getComputedStyle(o, null)[key];
 };

 const params = {
@@ -57,7 +58,7 @@ const startDrag = function (bar, target, callback) {
    }
  };
  document.onmousemove = function (event) {
-    const e = event ? event : window.event;
+    const e: any = event ? event : window.event;
    if (params.flag) {
      const nowX = e.clientX,
        nowY = e.clientY;
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -3,7 +3,7 @@ import type { App, Plugin } from 'vue';
 import { NIcon, NTag } from 'naive-ui';
 import { PageEnum } from '@/enums/pageEnum';
 import { isObject } from './is/index';
-
+import { cloneDeep } from 'lodash-es';
 /**
 * render 图标
 * */
@@ -33,29 +33,89 @@ export function renderNew(type = 'warning', text = 'New', color: object = newTag
 * 递归组装菜单格式
 */
 export function generatorMenu(routerMap: Array<any>) {
-  return routerMap
-    .filter((item) => {
-      return (
-        (item.meta?.hidden || false) != true &&
-        !['/:path(.*)*', '/', PageEnum.REDIRECT, PageEnum.BASE_LOGIN].includes(item.path)
-      );
-    })
-    .map((item) => {
-      const info =
-        item.meta?.alwaysShow != true && item.children?.length === 1 ? item.children[0] : item;
+  return filterRouter(routerMap).map((item) => {
+    const isRoot = isRootRouter(item);
+    const info = isRoot ? item.children[0] : item;
+    const currentMenu = {
+      ...info,
+      ...info.meta,
+      label: info.meta?.title,
+      key: info.name,
+    };
+    // 是否有子菜单，并递归处理
+    if (info.children && info.children.length > 0) {
+      // Recursion
+      currentMenu.children = generatorMenu(info.children);
+    }
+    return currentMenu;
+  });
+}
+
+/**
+ * 混合菜单
+ * */
+export function generatorMenuMix(routerMap: Array<any>, routerName: string, location: string) {
+  const cloneRouterMap = cloneDeep(routerMap);
+  const newRouter = filterRouter(cloneRouterMap);
+  if (location === 'header') {
+    const firstRouter: any[] = [];
+    newRouter.forEach((item) => {
+      const isRoot = isRootRouter(item);
+      const info = isRoot ? item.children[0] : item;
+      info.children = undefined;
      const currentMenu = {
        ...info,
        ...info.meta,
        label: info.meta?.title,
        key: info.name,
      };
-      // 是否有子菜单，并递归处理
-      if (info.children && info.children.length > 0) {
-        // Recursion
-        currentMenu.children = generatorMenu(info.children);
-      }
-      return currentMenu;
+      firstRouter.push(currentMenu);
    });
+    return firstRouter;
+  } else {
+    return getChildrenRouter(newRouter.filter((item) => item.name === routerName));
+  }
+}
+
+/**
+ * 递归组装子菜单
+ * */
+export function getChildrenRouter(routerMap: Array<any>) {
+  return routerMap.map((item) => {
+    const isRoot = isRootRouter(item);
+    const info = isRoot ? item.children[0] : item;
+    const currentMenu = {
+      ...info,
+      ...info.meta,
+      label: info.meta?.title,
+      key: info.name,
+    };
+    // 是否有子菜单，并递归处理
+    if (info.children && info.children.length > 0) {
+      // Recursion
+      currentMenu.children = getChildrenRouter(info.children);
+    }
+    return currentMenu;
+  });
+}
+
+/**
+ * 判断根路由 Router
+ * */
+export function isRootRouter(item) {
+  return item.meta?.alwaysShow != true && item.children?.length === 1;
+}
+
+/**
+ * 排除Router
+ * */
+export function filterRouter(routerMap: Array<any>) {
+  return routerMap.filter((item) => {
+    return (
+      (item.meta?.hidden || false) != true &&
+      !['/:path(.*)*', '/', PageEnum.REDIRECT, PageEnum.BASE_LOGIN].includes(item.path)
+    );
+  });
 }

 export const withInstall = <T>(component: T, alias?: string) => {
--- a/src/views/about/index.vue
+++ b/src/views/about/index.vue
@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <div class="n-layout-page-header">
+      <n-card :bordered="false" title="关于">
+        {{ name }} 是一个基于 vue3，vite2，TypeScript
+        的中后台解决方案，它可以帮助你快速搭建企业级中后台项目，相信不管是从新技术使用还是其他方面，都能帮助到你，持续更新中。
+      </n-card>
+    </div>
+    <n-card
+      :bordered="false"
+      title="项目信息"
+      class="proCard mt-4"
+      size="small"
+      :segmented="{ content: 'hard' }"
+    >
+      <n-descriptions bordered label-placement="left" class="py-2">
+        <n-descriptions-item label="版本">
+          <n-tag type="info"> {{ version }} </n-tag>
+        </n-descriptions-item>
+        <n-descriptions-item label="最后编译时间">
+          <n-tag type="info"> {{ lastBuildTime }} </n-tag>
+        </n-descriptions-item>
+        <n-descriptions-item label="文档地址">
+          <div class="flex items-center">
+            <a href="https://jekip.github.io/docs/" class="py-2" target="_blank">查看文档地址</a>
+          </div>
+        </n-descriptions-item>
+        <n-descriptions-item label="预览地址">
+          <div class="flex items-center">
+            <a href="https://jekip.github.io/" class="py-2" target="_blank">查看预览地址</a>
+          </div>
+        </n-descriptions-item>
+        <n-descriptions-item label="Github">
+          <div class="flex items-center">
+            <a href="https://github.com/jekip/naive-ui-admin" class="py-2" target="_blank"
+              >查看Github地址</a
+            >
+          </div>
+        </n-descriptions-item>
+        <n-descriptions-item label="QQ交流群">
+          <div class="flex items-center">
+            <a href="https://jq.qq.com/?_wv=1027&k=xib9dU4C" class="py-2" target="_blank"
+              >点击链接加入群聊【Naive Admin】</a
+            >
+          </div>
+        </n-descriptions-item>
+      </n-descriptions>
+    </n-card>
+
+    <n-card
+      :bordered="false"
+      title="开发环境依赖"
+      class="proCard mt-4"
+      size="small"
+      :segmented="{ content: 'hard' }"
+    >
+      <n-descriptions bordered label-placement="left" class="py-2">
+        <n-descriptions-item v-for="item in devSchema" :key="item.field" :label="item.field">
+          {{ item.label }}
+        </n-descriptions-item>
+      </n-descriptions>
+    </n-card>
+
+    <n-card
+      :bordered="false"
+      title="生产环境依赖"
+      class="proCard mt-4"
+      size="small"
+      :segmented="{ content: 'hard' }"
+    >
+      <n-descriptions bordered label-placement="left" class="py-2">
+        <n-descriptions-item v-for="item in schema" :key="item.field" :label="item.field">
+          {{ item.label }}
+        </n-descriptions-item>
+      </n-descriptions>
+    </n-card>
+  </div>
+</template>
+
+<script lang="ts">
+  import { defineComponent } from 'vue';
+
+  export interface schemaItem {
+    field: string;
+    label: string;
+  }
+
+  export default defineComponent({
+    setup() {
+      const { pkg, lastBuildTime } = __APP_INFO__;
+      const { dependencies, devDependencies, name, version } = pkg;
+
+      const schema: schemaItem[] = [];
+      const devSchema: schemaItem[] = [];
+
+      Object.keys(dependencies).forEach((key) => {
+        schema.push({ field: key, label: dependencies[key] });
+      });
+
+      Object.keys(devDependencies).forEach((key) => {
+        devSchema.push({ field: key, label: devDependencies[key] });
+      });
+
+      return {
+        lastBuildTime,
+        dependencies,
+        devDependencies,
+        name,
+        version,
+        schema,
+        devSchema,
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped></style>
--- a/src/views/comp/form/basic.vue
+++ b/src/views/comp/form/basic.vue
@@ -0,0 +1,184 @@
+<template>
+  <div>
+    <div class="n-layout-page-header">
+      <n-card :bordered="false" title="基础表单"> 基础表单，用于向用户收集表单信息 </n-card>
+    </div>
+    <n-card :bordered="false" class="proCard mt-4">
+      <div class="BasicForm">
+        <BasicForm
+          submitButtonText="提交预约"
+          layout="horizontal"
+          :gridProps="{ cols: 1 }"
+          :schemas="schemas"
+        >
+          <template #statusSlot="{ model, field }">
+            <n-input v-model:value="model[field]" />
+          </template>
+        </BasicForm>
+      </div>
+    </n-card>
+  </div>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicForm, FormSchema } from '@/components/Form/index';
+  import { useMessage } from 'naive-ui';
+
+  const schemas: FormSchema[] = [
+    {
+      field: 'name',
+      component: 'NInput',
+      label: '姓名',
+      labelMessage: '这是一个提示',
+      componentProps: {
+        placeholder: '请输入姓名',
+        onInput: (e: any) => {
+          console.log(e);
+        },
+      },
+      rules: [{ required: true, message: '请输入姓名', trigger: ['blur'] }],
+    },
+    {
+      field: 'mobile',
+      component: 'NInputNumber',
+      label: '手机',
+      componentProps: {
+        placeholder: '请输入手机号码',
+        showButton: false,
+        onInput: (e: any) => {
+          console.log(e);
+        },
+      },
+    },
+    {
+      field: 'type',
+      component: 'NSelect',
+      label: '类型',
+      componentProps: {
+        placeholder: '请选择类型',
+        options: [
+          {
+            label: '舒适性',
+            value: 1,
+          },
+          {
+            label: '经济性',
+            value: 2,
+          },
+        ],
+        onUpdateValue: (e: any) => {
+          console.log(e);
+        },
+      },
+    },
+    {
+      field: 'makeDate',
+      component: 'NDatePicker',
+      label: '预约时间',
+      componentProps: {
+        type: 'date',
+        clearable: true,
+        defaultValue: 1183135260000,
+        onUpdateValue: (e: any) => {
+          console.log(e);
+        },
+      },
+    },
+    {
+      field: 'makeTime',
+      component: 'NTimePicker',
+      label: '停留时间',
+      componentProps: {
+        clearable: true,
+        onUpdateValue: (e: any) => {
+          console.log(e);
+        },
+      },
+    },
+    {
+      field: 'makeProject',
+      component: 'NCheckbox',
+      label: '预约项目',
+      componentProps: {
+        placeholder: '请选择预约项目',
+        options: [
+          {
+            label: '种牙',
+            value: 1,
+          },
+          {
+            label: '补牙',
+            value: 2,
+          },
+          {
+            label: '根管',
+            value: 3,
+          },
+        ],
+        onUpdateChecked: (e: any) => {
+          console.log(e);
+        },
+      },
+    },
+    {
+      field: 'makeSource',
+      component: 'NRadioGroup',
+      label: '来源',
+      componentProps: {
+        options: [
+          {
+            label: '网上',
+            value: 1,
+          },
+          {
+            label: '门店',
+            value: 2,
+          },
+        ],
+        onUpdateChecked: (e: any) => {
+          console.log(e);
+        },
+      },
+    },
+    {
+      field: 'status',
+      label: '状态',
+      //插槽
+      slot: 'statusSlot',
+    },
+  ];
+
+  export default defineComponent({
+    components: { BasicForm },
+    setup() {
+      const formRef: any = ref(null);
+      const message = useMessage();
+
+      function handleSubmit(values: Recordable) {
+        console.log(values);
+        message.success(JSON.stringify(values));
+      }
+
+      function handleReset(values: Recordable) {
+        console.log(values);
+      }
+
+      return {
+        schemas,
+        formRef,
+        handleSubmit,
+        handleReset,
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped>
+  .BasicForm {
+    width: 550px;
+    margin: 0 auto;
+    overflow: hidden;
+    padding-top: 20px;
+  }
+</style>
--- a/src/views/list/basicList/index.vue
+++ b/src/views/list/basicList/index.vue
@@ -284,7 +284,7 @@
      });

      const [register, {}] = useForm({
-        gridProps: { cols: 5 },
+        gridProps: { cols: '4' },
        labelWidth: 80,
        schemas,
      });
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -27,6 +27,7 @@ export interface ImenuSetting {
  minMenuWidth: number;
  menuWidth: number;
  fixed: boolean;
+  mixMenu: boolean;
 }

 export interface IcrumbsSetting {
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,6 +5,14 @@ import { wrapperEnv } from './build/utils';
 import { createVitePlugins } from './build/vite/plugin';
 import { OUTPUT_DIR } from './build/constant';
 import { createProxy } from './build/vite/proxy';
+import pkg from './package.json';
+import { format } from 'date-fns';
+const { dependencies, devDependencies, name, version } = pkg;
+
+const __APP_INFO__ = {
+  pkg: { dependencies, devDependencies, name, version },
+  lastBuildTime: format(new Date(), 'yyyy-MM-dd HH:mm:ss'),
+};

 function pathResolve(dir: string) {
  return resolve(process.cwd(), '.', dir);
@@ -35,6 +43,9 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
      dedupe: ['vue'],
    },
    plugins: createVitePlugins(viteEnv, isBuild, prodMock),
+    define: {
+      __APP_INFO__: JSON.stringify(__APP_INFO__),
+    },
    css: {
      preprocessorOptions: {
        less: {
Author	SHA1	Message	Date
Ah jung	5c5c52d9fa	日常版本更新	2021-08-06 17:10:54 +08:00
Ah jung	3e0b8efe7e	Fixes bug 新增顶部混合菜单	2021-08-06 17:06:33 +08:00
Ah jung	450234e7ea	Fixes bug	2021-08-05 21:38:32 +08:00