perf: 同步精简版代码

chore: update vite latest
perf: 同步精简版代码
2025-12-14 14:20:31 +08:00 · 2022-03-03 23:30:08 +08:00 · 2022-03-01 11:28:35 +08:00 · 2022-03-01 10:58:55 +08:00 · 2022-02-28 22:33:56 +08:00 · 2022-02-27 13:31:19 +08:00
65 changed files with 2729 additions and 1813 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -37,7 +37,7 @@ module.exports = {
    "eslint:recommended",
    "@vue/typescript/recommended",
    "@vue/prettier",
-    "@vue/prettier/@typescript-eslint"
+    "@vue/eslint-config-typescript"
  ],
  parser: "vue-eslint-parser",
  parserOptions: {
@@ -50,6 +50,10 @@ module.exports = {
    }
  },
  rules: {
+    "vue/no-v-html": "off",
+    "vue/require-default-prop": "off",
+    "vue/require-explicit-emits": "off",
+    "vue/multi-word-component-names": "off",
    "@typescript-eslint/no-explicit-any": "off", // any
    "no-debugger": "off",
    "@typescript-eslint/explicit-module-boundary-types": "off", // setup()
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ dist
 dist-ssr
 *.local
 .eslintcache
+.stylelintcache

 yarn.lock
 npm-debug.log*
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,6 +1,5 @@
 module.exports = {
  bracketSpacing: true,
-  jsxBracketSameLine: true,
  singleQuote: false,
  arrowParens: "avoid",
  trailingComma: "none"
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -40,3 +40,7 @@ bilibili: https://www.bilibili.com/video/BV1534y1S7HV/
 ## ⚠️ Note

 The lite version does not accept any issues and prs. If you have any questions, please go to the full version https://github.com/xiaoxian521/vue-pure-admin/issues/new/choose to mention it, thank you! ! !
+
+## License
+
+In principle, no fees and copyrights are charged, and you can use it with confidence, but if you need secondary open source, please contact the author for permission!
--- a/README.md
+++ b/README.md
@@ -27,11 +27,11 @@

 <img src="http://yiming_chang.gitee.io/manages/pay.jpg" width="150px" height="150px" />

-## 付费咨询、需求定制
+## QQ 交流群

-作者精力有限，需要提供技术服务的可扫下面的二维码加微信，添加请备注来意
+群里严禁`黄`、`赌`、`毒`、`vpn`等违法行为！

-<img src="http://yiming_chang.gitee.io/manages/wechat.jpg" width="150px" height="150px" />
+<img src="http://yiming_chang.gitee.io/manages/qq.jpg" width="150px" height="225px" />

 ## 用法

@@ -52,3 +52,7 @@ pnpm remove 包名
 ## ⚠️ 注意

 精简版不接受任何 issues 和 pr，如果有问题请到完整版 https://github.com/xiaoxian521/vue-pure-admin/issues/new/choose 去提，谢谢！！！
+
+## 许可证
+
+原则上不收取任何费用及版权，可以放心使用，不过如需二次开源（比如用此平台二次开发并开源）请联系作者获取许可！
--- a/build/info.ts
+++ b/build/info.ts
@@ -0,0 +1,85 @@
+import { readdir, stat } from "fs";
+import type { Plugin } from "vite";
+import dayjs, { Dayjs } from "dayjs";
+import { sum } from "lodash-unified";
+import duration from "dayjs/plugin/duration";
+import { green, blue, bold } from "picocolors";
+dayjs.extend(duration);
+
+const staticPath = "dist";
+const fileListTotal: number[] = [];
+
+const recursiveDirectory = (folder: string, callback: Function): void => {
+  readdir(folder, (err, files: string[]) => {
+    if (err) throw err;
+    let count = 0;
+    const checkEnd = () => {
+      ++count == files.length && callback();
+    };
+    files.forEach((item: string) => {
+      stat(folder + "/" + item, async (err, stats) => {
+        if (err) throw err;
+        if (stats.isFile()) {
+          fileListTotal.push(stats.size);
+          checkEnd();
+        } else if (stats.isDirectory()) {
+          recursiveDirectory(`${staticPath}/${item}/`, checkEnd);
+        }
+      });
+    });
+    files.length === 0 && callback();
+  });
+};
+
+const formatBytes = (a: number, b?: number): string => {
+  if (0 == a) return "0 Bytes";
+  const c = 1024,
+    d = b || 2,
+    e = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"],
+    f = Math.floor(Math.log(a) / Math.log(c));
+  return parseFloat((a / Math.pow(c, f)).toFixed(d)) + " " + e[f];
+};
+
+export function viteBuildInfo(): Plugin {
+  let config: { command: string };
+  let startTime: Dayjs;
+  let endTime: Dayjs;
+  return {
+    name: "vite:buildInfo",
+    configResolved(resolvedConfig: { command: string }) {
+      config = resolvedConfig;
+    },
+    buildStart() {
+      if (config.command === "build") {
+        startTime = dayjs(new Date());
+      }
+    },
+    closeBundle() {
+      if (config.command === "build") {
+        console.log(
+          bold(
+            green(
+              `👏欢迎使用${blue(
+                "[vue-pure-admin]"
+              )}，如果您感觉不错，记得点击后面链接给个star哦💖 https://github.com/xiaoxian521/vue-pure-admin`
+            )
+          )
+        );
+        endTime = dayjs(new Date());
+        recursiveDirectory(staticPath, () => {
+          console.log(
+            bold(
+              green(
+                `恭喜打包完成🎉（总用时${dayjs
+                  .duration(endTime.diff(startTime))
+                  .format("mm分ss秒")}，打包后的大小为${formatBytes(
+                  sum(fileListTotal)
+                )}）`
+              )
+            )
+          );
+        });
+      }
+    }
+  };
+}
--- a/build/plugins.ts
+++ b/build/plugins.ts
@@ -1,4 +1,5 @@
 import vue from "@vitejs/plugin-vue";
+import { viteBuildInfo } from "./info";
 import svgLoader from "vite-svg-loader";
 import legacy from "@vitejs/plugin-legacy";
 import vueJsx from "@vitejs/plugin-vue-jsx";
@@ -6,11 +7,13 @@ import WindiCSS from "vite-plugin-windicss";
 import { viteMockServe } from "vite-plugin-mock";
 import liveReload from "vite-plugin-live-reload";
 import ElementPlus from "unplugin-element-plus/vite";
+import { visualizer } from "rollup-plugin-visualizer";
 import removeConsole from "vite-plugin-remove-console";
 import themePreprocessorPlugin from "@zougt/vite-plugin-theme-preprocessor";

 export function getPluginsList(command, VITE_LEGACY) {
  const prodMock = true;
+  const lifecycle = process.env.npm_lifecycle_event;
  return [
    vue(),
    // jsx、tsx语法支持
@@ -18,6 +21,7 @@ export function getPluginsList(command, VITE_LEGACY) {
    WindiCSS(),
    // 线上环境删除console
    removeConsole(),
+    viteBuildInfo(),
    // 修改layout文件夹下的文件时自动重载浏览器 解决 https://github.com/xiaoxian521/vue-pure-admin/issues/170
    liveReload(["src/layout/**/*", "src/router/**/*"]),
    // 自定义主题
@@ -97,6 +101,10 @@ export function getPluginsList(command, VITE_LEGACY) {
          targets: ["ie >= 11"],
          additionalLegacyPolyfills: ["regenerator-runtime/runtime"]
        })
+      : null,
+    // 打包分析
+    lifecycle === "report"
+      ? visualizer({ open: true, brotliSize: true, filename: "report.html" })
      : null
  ];
 }
--- a/index.html
+++ b/index.html
@@ -13,20 +13,16 @@
  <body>
    <div id="app">
      <style>
-        * {
-          margin: 0;
-          padding: 0;
-        }
-
        html,
-        body {
+        body,
+        #app {
          width: 100%;
          height: 100%;
          display: flex;
+          position: relative;
          justify-content: center;
          align-items: center;
          overflow: hidden;
-          font-family: "Reggae One", cursive;
        }

        .loader,
@@ -52,6 +48,8 @@
          transform: translateZ(0);
          -webkit-animation-delay: -0.16s;
          animation-delay: -0.16s;
+          top: 0;
+          transform: translate(-50%, 0);
        }

        .loader:before,
@@ -95,7 +93,7 @@
          }
        }
      </style>
-      <div class="loader">Loading...</div>
+      <div class="loader"></div>
    </div>
    <script type="module" src="/src/main.ts"></script>
  </body>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "pure-admin-thin",
-  "version": "2.9.0",
+  "version": "3.1.0",
  "private": true,
  "engines": {
    "node": ">= 16",
@@ -10,6 +10,7 @@
    "dev": "cross-env --max_old_space_size=4096 vite",
    "serve": "pnpm dev",
    "build": "rimraf dist && cross-env vite build",
+    "report": "rimraf dist && cross-env vite build",
    "preview": "vite preview",
    "preview:build": "pnpm build && vite preview",
    "clean:cache": "rm -rf node_modules && rm -rf .eslintcache && pnpm install",
@@ -29,16 +30,18 @@
  ],
  "dependencies": {
    "@ctrl/tinycolor": "^3.4.0",
-    "@vueuse/core": "^7.5.5",
+    "@vueuse/core": "^7.6.2",
    "@vueuse/motion": "^2.0.0-beta.9",
-    "@vueuse/shared": "^7.5.5",
+    "@vueuse/shared": "^7.6.2",
    "animate.css": "^4.1.1",
    "axios": "^0.25.0",
    "css-color-function": "^1.3.3",
-    "element-plus": "1.3.0-beta.1",
+    "dayjs": "^1.10.7",
+    "element-plus": "^2.0.3",
    "element-resize-detector": "^1.2.3",
    "js-cookie": "^3.0.1",
    "lodash-es": "^4.17.21",
+    "lodash-unified": "^1.0.2",
    "mitt": "^3.0.0",
    "mockjs": "^1.1.0",
    "nprogress": "^0.2.0",
@@ -48,9 +51,9 @@
    "resize-observer-polyfill": "^1.5.1",
    "responsive-storage": "^1.0.11",
    "rgb-hex": "^4.0.0",
-    "vue": "^3.2.29",
+    "vue": "^3.2.31",
    "vue-i18n": "^9.2.0-beta.30",
-    "vue-router": "^4.0.12",
+    "vue-router": "^4.0.13",
    "vue-types": "^4.1.1"
  },
  "devDependencies": {
@@ -63,47 +66,54 @@
    "@iconify/vue": "^3.1.3",
    "@types/element-resize-detector": "1.1.3",
    "@types/js-cookie": "^3.0.1",
+    "@types/lodash-es": "^4.17.6",
    "@types/mockjs": "1.0.3",
    "@types/node": "14.14.14",
    "@types/nprogress": "0.2.0",
    "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "4.31.0",
-    "@typescript-eslint/parser": "4.31.0",
-    "@vitejs/plugin-legacy": "^1.6.4",
-    "@vitejs/plugin-vue": "^2.1.0",
-    "@vitejs/plugin-vue-jsx": "^1.3.3",
-    "@vue/eslint-config-prettier": "6.0.0",
-    "@vue/eslint-config-typescript": "7.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.2",
+    "@vitejs/plugin-legacy": "^1.7.1",
+    "@vitejs/plugin-vue": "^2.2.4",
+    "@vitejs/plugin-vue-jsx": "^1.3.8",
+    "@vue/eslint-config-prettier": "^7.0.0",
+    "@vue/eslint-config-typescript": "^10.0.0",
    "@zougt/vite-plugin-theme-preprocessor": "^1.4.4",
    "autoprefixer": "^10.4.2",
    "cross-env": "7.0.3",
-    "eslint": "7.30.0",
-    "eslint-plugin-prettier": "3.4.0",
-    "eslint-plugin-vue": "7.17.0",
+    "eslint": "^8.8.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-vue": "^8.4.1",
    "husky": "7.0.2",
    "lint-staged": "11.1.2",
-    "postcss": "8.2.6",
+    "picocolors": "^1.0.0",
+    "postcss": "^8.4.6",
+    "postcss-html": "^1.3.0",
    "postcss-import": "14.0.0",
-    "prettier": "2.3.2",
+    "postcss-scss": "^4.0.3",
+    "prettier": "^2.5.1",
    "pretty-quick": "3.1.1",
    "rimraf": "3.0.2",
+    "rollup-plugin-visualizer": "^5.6.0",
    "sass": "^1.49.0",
    "sass-loader": "^12.4.0",
-    "stylelint": "13.13.1",
-    "stylelint-config-prettier": "8.0.2",
-    "stylelint-config-standard": "22.0.0",
-    "stylelint-order": "4.1.0",
+    "stylelint": "^14.3.0",
+    "stylelint-config-html": "^1.0.0",
+    "stylelint-config-prettier": "^9.0.3",
+    "stylelint-config-recommended": "^6.0.0",
+    "stylelint-config-standard": "^24.0.0",
+    "stylelint-order": "^5.0.0",
    "typescript": "^4.5.5",
    "unplugin-element-plus": "^0.2.0",
-    "vite": "^2.7.13",
+    "vite": "^2.8.6",
    "vite-plugin-live-reload": "^2.1.0",
    "vite-plugin-mock": "^2.9.6",
    "vite-plugin-remove-console": "^0.0.6",
-    "vite-plugin-style-import": "^1.4.1",
-    "vite-plugin-windicss": "^1.6.3",
+    "vite-plugin-style-import": "1.4.1",
+    "vite-plugin-windicss": "^1.8.2",
    "vite-svg-loader": "2.2.0",
-    "vue-eslint-parser": "7.10.0",
-    "windicss": "^3.4.3"
+    "vue-eslint-parser": "^8.2.0",
+    "windicss": "^3.5.1"
  },
  "repository": "git@github.com:xiaoxian521/vue-pure-admin.git",
  "author": "xiaoxian521",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,5 @@
 {
-  "Version": "2.9.0",
+  "Version": "3.1.0",
  "Title": "PureAdmin",
  "FixedHeader": true,
  "HiddenSideBar": false,
--- a/src/components/ReIcon/src/hooks.ts
+++ b/src/components/ReIcon/src/hooks.ts
@@ -1,8 +1,14 @@
+import { iconType } from "./types";
 import { h, defineComponent, Component } from "vue";
 import { IconifyIconOffline, FontIcon } from "../index";

-// 支持fontawesome4、5+、iconfont、remixicon、element-plus的icons、自定义svg
-export function useRenderIcon(icon: string): Component {
+/**
+ * 支持fontawesome4、5+、iconfont、remixicon、element-plus的icons、自定义svg
+ * @param icon 必传 string 图标
+ * @param attrs 可选 iconType 属性
+ * @returns Component
+ */
+export function useRenderIcon(icon: string, attrs?: iconType): Component {
  // iconfont
  const ifReg = /^IF-/;
  // typeof icon === "function" 属于SVG
@@ -19,7 +25,8 @@ export function useRenderIcon(icon: string): Component {
      render() {
        return h(FontIcon, {
          icon: iconName,
-          iconType
+          iconType,
+          ...attrs
        });
      }
    });
@@ -31,7 +38,8 @@ export function useRenderIcon(icon: string): Component {
      name: "Icon",
      render() {
        return h(IconifyIconOffline, {
-          icon: icon
+          icon: icon,
+          ...attrs
        });
      }
    });
--- a/src/components/ReIcon/src/iconifyIconOffline.ts
+++ b/src/components/ReIcon/src/iconifyIconOffline.ts
@@ -51,9 +51,11 @@ addIcon("notebook", Notebook);
 import arrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";
 import arrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line";
 import logoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
+import nodeTree from "@iconify-icons/ri/node-tree";
 addIcon("arrow-right-s-line", arrowRightSLine);
 addIcon("arrow-left-s-line", arrowLeftSLine);
 addIcon("logout-circle-r-line", logoutCircleRLine);
+addIcon("node-tree", nodeTree);

 // Font Awesome 4
 import faUser from "@iconify-icons/fa/user";
--- a/src/components/ReIcon/src/types.ts
+++ b/src/components/ReIcon/src/types.ts
@@ -0,0 +1,18 @@
+export interface iconType {
+  // iconify (https://docs.iconify.design/icon-components/vue/#properties)
+  inline?: boolean;
+  width?: string | number;
+  height?: string | number;
+  horizontalFlip?: boolean;
+  verticalFlip?: boolean;
+  flip?: string;
+  rotate?: number | string;
+  color?: string;
+  horizontalAlign?: boolean;
+  verticalAlign?: boolean;
+  align?: string;
+  onLoad?: Function;
+
+  //  all icon
+  style?: object;
+}
--- a/src/layout/components/appMain.vue
+++ b/src/layout/components/appMain.vue
@@ -7,7 +7,6 @@ import {
  defineComponent,
  getCurrentInstance
 } from "vue";
-import { RouterView } from "vue-router";
 import backTop from "/@/assets/svg/back_top.svg?component";
 import { usePermissionStoreHook } from "/@/store/modules/permission";

--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/navbar.vue
@@ -1,71 +1,43 @@
 <script setup lang="ts">
-import { computed } from "vue";
 import { useI18n } from "vue-i18n";
-import { emitter } from "/@/utils/mitt";
+import { useNav } from "../hooks/nav";
+import { useRoute } from "vue-router";
 import Notice from "./notice/index.vue";
+import mixNav from "./sidebar/mixNav.vue";
 import avatars from "/@/assets/avatars.jpg";
-import { transformI18n } from "/@/plugins/i18n";
 import Hamburger from "./sidebar/hamBurger.vue";
-import { useRouter, useRoute } from "vue-router";
-import { storageSession } from "/@/utils/storage";
+import { watch, getCurrentInstance } from "vue";
 import Breadcrumb from "./sidebar/breadCrumb.vue";
-import { useAppStoreHook } from "/@/store/modules/app";
-import { unref, watch, getCurrentInstance } from "vue";
 import { deviceDetection } from "/@/utils/deviceDetection";
 import screenfull from "../components/screenfull/index.vue";
-import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
 import globalization from "/@/assets/svg/globalization.svg?component";

+const route = useRoute();
+const { locale } = useI18n();
 const instance =
  getCurrentInstance().appContext.config.globalProperties.$storage;
-const pureApp = useAppStoreHook();
-const router = useRouter();
-const route = useRoute();
-let usename = storageSession.getItem("info")?.username;
-const { locale } = useI18n();
-
-const getDropdownItemStyle = computed(() => {
-  return t => {
-    return {
-      background: locale.value === t ? useEpThemeStoreHook().epThemeColor : "",
-      color: locale.value === t ? "#f4f4f5" : "#000"
-    };
-  };
-});
+const {
+  logout,
+  onPanel,
+  changeTitle,
+  toggleSideBar,
+  pureApp,
+  usename,
+  getDropdownItemStyle
+} = useNav();

 watch(
  () => locale.value,
  () => {
-    //@ts-ignore
-    document.title = transformI18n(
-      //@ts-ignore
-      unref(route.meta.title),
-      unref(route.meta.i18n)
-    ); // 动态title
+    changeTitle(route.meta);
  }
 );

-// 退出登录
-const logout = (): void => {
-  storageSession.removeItem("info");
-  router.push("/login");
-};
-
-function onPanel() {
-  emitter.emit("openPanel");
-}
-
-function toggleSideBar() {
-  pureApp.toggleSideBar();
-}
-
-// 简体中文
 function translationCh() {
  instance.locale = { locale: "zh" };
  locale.value = "zh";
 }

-// English
 function translationEn() {
  instance.locale = { locale: "en" };
  locale.value = "en";
@@ -75,14 +47,17 @@ function translationEn() {
 <template>
  <div class="navbar">
    <Hamburger
+      v-if="pureApp.layout !== 'mix'"
      :is-active="pureApp.sidebar.opened"
      class="hamburger-container"
      @toggleClick="toggleSideBar"
    />

-    <Breadcrumb class="breadcrumb-container" />
+    <Breadcrumb v-if="pureApp.layout !== 'mix'" class="breadcrumb-container" />

-    <div class="vertical-header-right">
+    <mixNav v-if="pureApp.layout === 'mix'" />
+
+    <div v-if="pureApp.layout === 'vertical'" class="vertical-header-right">
      <!-- 通知 -->
      <Notice id="header-notice" />
      <!-- 全屏 -->
@@ -93,7 +68,7 @@ function translationEn() {
        <template #dropdown>
          <el-dropdown-menu class="translation">
            <el-dropdown-item
-              :style="getDropdownItemStyle('zh')"
+              :style="getDropdownItemStyle(locale, 'zh')"
              @click="translationCh"
              ><IconifyIconOffline
                class="check-zh"
@@ -102,7 +77,7 @@ function translationEn() {
              />简体中文</el-dropdown-item
            >
            <el-dropdown-item
-              :style="getDropdownItemStyle('en')"
+              :style="getDropdownItemStyle(locale, 'en')"
              @click="translationEn"
              ><el-icon class="check-en" v-show="locale === 'en'"
                ><IconifyIconOffline icon="check" /></el-icon
@@ -234,14 +209,8 @@ function translationEn() {
 }

 .translation {
-  .el-dropdown-menu__item {
-    padding: 5px 40px !important;
-  }
-
-  .el-dropdown-menu__item:focus,
-  .el-dropdown-menu__item:not(.is-disabled):hover {
-    color: #606266;
-    background: #f0f0f0;
+  ::v-deep(.el-dropdown-menu__item) {
+    padding: 5px 40px;
  }

  .check-zh {
@@ -258,16 +227,10 @@ function translationEn() {
 .logout {
  max-width: 120px;

-  .el-dropdown-menu__item {
+  ::v-deep(.el-dropdown-menu__item) {
    min-width: 100%;
    display: inline-flex;
    flex-wrap: wrap;
  }
-
-  .el-dropdown-menu__item:focus,
-  .el-dropdown-menu__item:not(.is-disabled):hover {
-    color: #606266;
-    background: #f0f0f0;
-  }
 }
 </style>
--- a/src/layout/components/panel/index.vue
+++ b/src/layout/components/panel/index.vue
@@ -125,7 +125,7 @@ emitter.on("openPanel", () => {

    &:hover {
      cursor: pointer;
-      color: red;
+      color: var(--el-color-primary);
    }
  }
 }
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -10,7 +10,7 @@ import {
  getCurrentInstance
 } from "vue";
 import rgbHex from "rgb-hex";
-import { find } from "lodash-es";
+import { find } from "lodash-unified";
 import { getConfig } from "/@/config";
 import { useRouter } from "vue-router";
 import panel from "../panel/index.vue";
@@ -61,6 +61,7 @@ let themeColors = ref<Array<themeColorsType>>([

 const verticalRef = templateRef<HTMLElement | null>("verticalRef", null);
 const horizontalRef = templateRef<HTMLElement | null>("horizontalRef", null);
+const mixRef = templateRef<HTMLElement | null>("mixRef", null);

 let layoutTheme =
  ref(storageLocal.getItem("responsive-layout")) ||
@@ -101,7 +102,7 @@ const getThemeColorStyle = computed(() => {
  };
 });

-function changeStorageConfigure(key, val) {
+function storageConfigureChange<T>(key: string, val: T): void {
  const storageConfigure = instance.configure;
  storageConfigure[key] = val;
  instance.configure = storageConfigure;
@@ -110,14 +111,14 @@ function changeStorageConfigure(key, val) {
 function toggleClass(flag: boolean, clsName: string, target?: HTMLElement) {
  const targetEl = target || document.body;
  let { className } = targetEl;
-  className = className.replace(clsName, "");
+  className = className.replace(clsName, "").trim();
  targetEl.className = flag ? `${className} ${clsName} ` : className;
 }

 // 灰色模式设置
 const greyChange = (value): void => {
  toggleClass(settings.greyVal, "html-grey", document.querySelector("html"));
-  changeStorageConfigure("grey", value);
+  storageConfigureChange("grey", value);
 };

 // 色弱模式设置
@@ -127,29 +128,30 @@ const weekChange = (value): void => {
    "html-weakness",
    document.querySelector("html")
  );
-  changeStorageConfigure("weak", value);
+  storageConfigureChange("weak", value);
 };

 const tagsChange = () => {
  let showVal = settings.tabsVal;
-  changeStorageConfigure("hideTabs", showVal);
+  storageConfigureChange("hideTabs", showVal);
  emitter.emit("tagViewsChange", showVal);
 };

 const multiTagsCacheChange = () => {
  let multiTagsCache = settings.multiTagsCache;
-  changeStorageConfigure("multiTagsCache", multiTagsCache);
+  storageConfigureChange("multiTagsCache", multiTagsCache);
  useMultiTagsStoreHook().multiTagsCacheChange(multiTagsCache);
 };

 // 清空缓存并返回登录页
 function onReset() {
-  toggleClass(getConfig().Grey, "html-grey", document.querySelector("html"));
-  toggleClass(
-    getConfig().Weak,
-    "html-weakness",
-    document.querySelector("html")
-  );
+  router.push("/login");
+  const { Grey, Weak, MultiTagsCache, EpThemeColor, Layout } = getConfig();
+  useAppStoreHook().setLayout(Layout);
+  useEpThemeStoreHook().setEpThemeColor(EpThemeColor);
+  useMultiTagsStoreHook().multiTagsCacheChange(MultiTagsCache);
+  toggleClass(Grey, "html-grey", document.querySelector("html"));
+  toggleClass(Weak, "html-weakness", document.querySelector("html"));
  useMultiTagsStoreHook().handleTags("equal", [
    {
      path: "/welcome",
@@ -161,23 +163,20 @@ function onReset() {
      }
    }
  ]);
-  useMultiTagsStoreHook().multiTagsCacheChange(getConfig().MultiTagsCache);
-  useEpThemeStoreHook().setEpThemeColor(getConfig().EpThemeColor);
  storageLocal.clear();
  storageSession.clear();
-  router.push("/login");
 }

 function onChange(label) {
-  changeStorageConfigure("showModel", label);
+  storageConfigureChange("showModel", label);
  emitter.emit("tagViewsShowModel", label);
 }

 // 侧边栏Logo
 function logoChange() {
  unref(logoVal)
-    ? changeStorageConfigure("showLogo", true)
-    : changeStorageConfigure("showLogo", false);
+    ? storageConfigureChange("showLogo", true)
+    : storageConfigureChange("showLogo", false);
  emitter.emit("logoChange", unref(logoVal));
 }

@@ -192,10 +191,17 @@ watch(instance, ({ layout }) => {
    case "vertical":
      toggleClass(true, isSelect, unref(verticalRef));
      debounce(setFalse([horizontalRef]), 50);
+      debounce(setFalse([mixRef]), 50);
      break;
    case "horizontal":
      toggleClass(true, isSelect, unref(horizontalRef));
      debounce(setFalse([verticalRef]), 50);
+      debounce(setFalse([mixRef]), 50);
+      break;
+    case "mix":
+      toggleClass(true, isSelect, unref(mixRef));
+      debounce(setFalse([verticalRef]), 50);
+      debounce(setFalse([horizontalRef]), 50);
      break;
  }
 });
@@ -315,7 +321,7 @@ nextTick(() => {

    <el-divider>导航栏模式</el-divider>
    <ul class="pure-theme">
-      <el-tooltip class="item" content="左侧菜单模式" placement="bottom">
+      <el-tooltip class="item" content="左侧模式" placement="bottom">
        <li
          :class="layoutTheme.layout === 'vertical' ? $style.isSelect : ''"
          ref="verticalRef"
@@ -326,7 +332,7 @@ nextTick(() => {
        </li>
      </el-tooltip>

-      <el-tooltip class="item" content="顶部菜单模式" placement="bottom">
+      <el-tooltip class="item" content="顶部模式" placement="bottom">
        <li
          :class="layoutTheme.layout === 'horizontal' ? $style.isSelect : ''"
          ref="horizontalRef"
@@ -336,6 +342,17 @@ nextTick(() => {
          <div></div>
        </li>
      </el-tooltip>
+
+      <el-tooltip class="item" content="混合模式" placement="bottom">
+        <li
+          :class="layoutTheme.layout === 'mix' ? $style.isSelect : ''"
+          ref="mixRef"
+          @click="setLayoutModel('mix')"
+        >
+          <div></div>
+          <div></div>
+        </li>
+      </el-tooltip>
    </ul>

    <el-divider v-show="!dataTheme">主题色</el-divider>
@@ -481,15 +498,14 @@ nextTick(() => {
 .pure-theme {
  margin-top: 25px;
  width: 100%;
-  height: 100px;
+  height: 50px;
  display: flex;
  flex-wrap: wrap;
  justify-content: space-around;

  li {
-    margin: 10px;
-    width: 36%;
-    height: 70px;
+    width: 18%;
+    height: 45px;
    background: #f0f2f5;
    position: relative;
    overflow: hidden;
@@ -527,6 +543,27 @@ nextTick(() => {
        }
      }
    }
+
+    &:nth-child(3) {
+      div {
+        &:nth-child(1) {
+          width: 100%;
+          height: 30%;
+          background: #1b2a47;
+          box-shadow: 0 0 1px #888;
+        }
+
+        &:nth-child(2) {
+          width: 30%;
+          height: 70%;
+          bottom: 0;
+          left: 0;
+          background: #fff;
+          box-shadow: 0 0 1px #888;
+          position: absolute;
+        }
+      }
+    }
  }
 }

--- a/src/layout/components/sidebar/breadCrumb.vue
+++ b/src/layout/components/sidebar/breadCrumb.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
-import { isEqual } from "lodash-es";
+import { isEqual } from "lodash-unified";
 import { transformI18n } from "/@/plugins/i18n";
 import { getParentPaths, findRouteByPath } from "/@/router/utils";
 import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -1,126 +1,68 @@
 <script setup lang="ts">
-import {
-  computed,
-  unref,
-  watch,
-  nextTick,
-  onMounted,
-  getCurrentInstance
-} from "vue";
 import { useI18n } from "vue-i18n";
-import { emitter } from "/@/utils/mitt";
+import { useNav } from "../../hooks/nav";
 import Notice from "../notice/index.vue";
 import { templateRef } from "@vueuse/core";
 import SidebarItem from "./sidebarItem.vue";
 import avatars from "/@/assets/avatars.jpg";
 import screenfull from "../screenfull/index.vue";
 import { useRoute, useRouter } from "vue-router";
-import { storageSession } from "/@/utils/storage";
 import { deviceDetection } from "/@/utils/deviceDetection";
+import { watch, nextTick, onMounted, getCurrentInstance } from "vue";
 import { usePermissionStoreHook } from "/@/store/modules/permission";
 import globalization from "/@/assets/svg/globalization.svg?component";

+const route = useRoute();
+const { locale } = useI18n();
+const routers = useRouter().options.routes;
+const menuRef = templateRef<ElRef | null>("menu", null);
 const instance =
  getCurrentInstance().appContext.config.globalProperties.$storage;
-
 const title =
  getCurrentInstance().appContext.config.globalProperties.$config?.Title;

-const menuRef = templateRef<ElRef | null>("menu", null);
-const route = useRoute();
-const router = useRouter();
-const routers = useRouter().options.routes;
-let usename = storageSession.getItem("info")?.username;
-const { locale, t } = useI18n();
+const {
+  logout,
+  backHome,
+  onPanel,
+  changeTitle,
+  handleResize,
+  menuSelect,
+  usename,
+  getDropdownItemStyle
+} = useNav();

-const getDropdownItemStyle = computed(() => {
-  return t => {
-    return {
-      background: locale.value === t ? "#1b2a47" : "",
-      color: locale.value === t ? "#f4f4f5" : "#000"
-    };
-  };
+onMounted(() => {
+  nextTick(() => {
+    handleResize(menuRef.value);
+  });
 });

 watch(
  () => locale.value,
  () => {
-    //@ts-ignore
-    // 动态title
-    document.title = t(unref(route.meta.title));
+    changeTitle(route.meta);
  }
 );

-// 退出登录
-const logout = (): void => {
-  storageSession.removeItem("info");
-  router.push("/login");
-};
-
-function onPanel() {
-  emitter.emit("openPanel");
-}
-
-const activeMenu = computed((): string => {
-  const { meta, path } = route;
-  if (meta.activeMenu) {
-    // @ts-ignore
-    return meta.activeMenu;
+watch(
+  () => route.path,
+  () => {
+    menuSelect(route.path, routers);
  }
-  return path;
-});
+);

-const menuSelect = (indexPath: string): void => {
-  let parentPath = "";
-  let parentPathIndex = indexPath.lastIndexOf("/");
-  if (parentPathIndex > 0) {
-    parentPath = indexPath.slice(0, parentPathIndex);
-  }
-  // 找到当前路由的信息
-  function findCurrentRoute(routes) {
-    return routes.map(item => {
-      if (item.path === indexPath) {
-        // 切换左侧菜单 通知标签页
-        emitter.emit("changLayoutRoute", {
-          indexPath,
-          parentPath
-        });
-      } else {
-        if (item.children) findCurrentRoute(item.children);
-      }
-    });
-  }
-  findCurrentRoute(routers);
-};
-
-function backHome() {
-  router.push("/welcome");
-}
-
-function handleResize() {
-  // @ts-ignore
-  menuRef.value.handleResize();
-}
-
-// 简体中文
 function translationCh() {
  instance.locale = { locale: "zh" };
  locale.value = "zh";
-  handleResize();
+  handleResize(menuRef.value);
 }

-// English
 function translationEn() {
  instance.locale = { locale: "en" };
  locale.value = "en";
-  handleResize();
+  handleResize(menuRef.value);
 }
-
-onMounted(() => {
-  nextTick(() => {
-    handleResize();
-  });
-});
 </script>

 <template>
@@ -135,12 +77,11 @@ onMounted(() => {
    </div>
    <el-menu
      ref="menu"
-      :default-active="activeMenu"
-      unique-opened
-      router
      class="horizontal-header-menu"
      mode="horizontal"
-      @select="menuSelect"
+      :default-active="route.path"
+      router
+      @select="indexPath => menuSelect(indexPath, routers)"
    >
      <sidebar-item
        v-for="route in usePermissionStoreHook().wholeMenus"
@@ -160,14 +101,14 @@ onMounted(() => {
        <template #dropdown>
          <el-dropdown-menu class="translation">
            <el-dropdown-item
-              :style="getDropdownItemStyle('zh')"
+              :style="getDropdownItemStyle(locale, 'zh')"
              @click="translationCh"
              ><el-icon class="check-zh" v-show="locale === 'zh'"
                ><IconifyIconOffline icon="check" /></el-icon
              >简体中文</el-dropdown-item
            >
            <el-dropdown-item
-              :style="getDropdownItemStyle('en')"
+              :style="getDropdownItemStyle(locale, 'en')"
              @click="translationEn"
              ><el-icon class="check-en" v-show="locale === 'en'"
                ><IconifyIconOffline icon="check" /></el-icon
@@ -207,14 +148,8 @@ onMounted(() => {

 <style lang="scss" scoped>
 .translation {
-  .el-dropdown-menu__item {
-    padding: 5px 40px !important;
-  }
-
-  .el-dropdown-menu__item:focus,
-  .el-dropdown-menu__item:not(.is-disabled):hover {
-    color: #606266;
-    background: #f0f0f0;
+  ::v-deep(.el-dropdown-menu__item) {
+    padding: 5px 40px;
  }

  .check-zh {
@@ -231,16 +166,10 @@ onMounted(() => {
 .logout {
  max-width: 120px;

-  .el-dropdown-menu__item {
+  ::v-deep(.el-dropdown-menu__item) {
    min-width: 100%;
    display: inline-flex;
    flex-wrap: wrap;
  }
-
-  .el-dropdown-menu__item:focus,
-  .el-dropdown-menu__item:not(.is-disabled):hover {
-    color: #606266;
-    background: #f0f0f0;
-  }
 }
 </style>
--- a/src/layout/components/sidebar/mixNav.vue
+++ b/src/layout/components/sidebar/mixNav.vue
@@ -0,0 +1,239 @@
+<script setup lang="ts">
+import { useI18n } from "vue-i18n";
+import Notice from "../notice/index.vue";
+import { useNav } from "../../hooks/nav";
+import { templateRef } from "@vueuse/core";
+import avatars from "/@/assets/avatars.jpg";
+import { transformI18n } from "/@/plugins/i18n";
+import screenfull from "../screenfull/index.vue";
+import { useRoute, useRouter } from "vue-router";
+import { deviceDetection } from "/@/utils/deviceDetection";
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+import { getParentPaths, findRouteByPath } from "/@/router/utils";
+import { usePermissionStoreHook } from "/@/store/modules/permission";
+import globalization from "/@/assets/svg/globalization.svg?component";
+import { ref, watch, nextTick, onMounted, getCurrentInstance } from "vue";
+
+const route = useRoute();
+const { locale } = useI18n();
+const routers = useRouter().options.routes;
+const menuRef = templateRef<ElRef | null>("menu", null);
+const instance =
+  getCurrentInstance().appContext.config.globalProperties.$storage;
+
+const {
+  logout,
+  onPanel,
+  changeTitle,
+  toggleSideBar,
+  handleResize,
+  menuSelect,
+  resolvePath,
+  pureApp,
+  usename,
+  getDropdownItemStyle
+} = useNav();
+
+let defaultActive = ref(null);
+
+function getDefaultActive(routePath) {
+  const wholeMenus = usePermissionStoreHook().wholeMenus;
+  // 当前路由的父级路径
+  const parentRoutes = getParentPaths(routePath, wholeMenus)[0];
+  defaultActive.value = findRouteByPath(
+    parentRoutes,
+    wholeMenus
+  )?.children[0]?.path;
+}
+
+onMounted(() => {
+  getDefaultActive(route.path);
+  nextTick(() => {
+    handleResize(menuRef.value);
+  });
+});
+
+watch(
+  () => locale.value,
+  () => {
+    changeTitle(route.meta);
+  }
+);
+
+watch(
+  () => route.path,
+  () => {
+    getDefaultActive(route.path);
+  }
+);
+
+function translationCh() {
+  instance.locale = { locale: "zh" };
+  locale.value = "zh";
+  handleResize(menuRef.value);
+}
+
+function translationEn() {
+  instance.locale = { locale: "en" };
+  locale.value = "en";
+  handleResize(menuRef.value);
+}
+</script>
+
+<template>
+  <div class="horizontal-header">
+    <div
+      :class="classes.container"
+      :title="pureApp.sidebar.opened ? '点击折叠' : '点击展开'"
+      @click="toggleSideBar"
+    >
+      <svg
+        :fill="useEpThemeStoreHook().fill"
+        :class="[
+          'hamburger',
+          pureApp.sidebar.opened ? 'is-active-hamburger' : ''
+        ]"
+        viewBox="0 0 1024 1024"
+        xmlns="http://www.w3.org/2000/svg"
+        width="64"
+        height="64"
+      >
+        <path
+          d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z"
+        />
+      </svg>
+    </div>
+    <el-menu
+      ref="menu"
+      class="horizontal-header-menu"
+      mode="horizontal"
+      :default-active="defaultActive"
+      router
+      @select="indexPath => menuSelect(indexPath, routers)"
+    >
+      <el-menu-item
+        v-for="route in usePermissionStoreHook().wholeMenus"
+        :key="route.path"
+        :index="resolvePath(route) || route.redirect"
+      >
+        <template #title>
+          <el-icon v-show="route.meta.icon" :class="route.meta.icon">
+            <component
+              :is="useRenderIcon(route.meta && route.meta.icon)"
+            ></component>
+          </el-icon>
+          <span>{{ transformI18n(route.meta.title, route.meta.i18n) }}</span>
+          <FontIcon
+            v-if="route.meta.extraIcon"
+            width="30px"
+            height="30px"
+            style="position: absolute; right: 10px"
+            :icon="route.meta.extraIcon.name"
+            :svg="route.meta.extraIcon.svg ? true : false"
+          ></FontIcon>
+        </template>
+      </el-menu-item>
+    </el-menu>
+    <div class="horizontal-header-right">
+      <!-- 通知 -->
+      <Notice id="header-notice" />
+      <!-- 全屏 -->
+      <screenfull id="header-screenfull" v-show="!deviceDetection()" />
+      <!-- 国际化 -->
+      <el-dropdown id="header-translation" trigger="click">
+        <globalization />
+        <template #dropdown>
+          <el-dropdown-menu class="translation">
+            <el-dropdown-item
+              :style="getDropdownItemStyle(locale, 'zh')"
+              @click="translationCh"
+              ><el-icon class="check-zh" v-show="locale === 'zh'"
+                ><IconifyIconOffline icon="check" /></el-icon
+              >简体中文</el-dropdown-item
+            >
+            <el-dropdown-item
+              :style="getDropdownItemStyle(locale, 'en')"
+              @click="translationEn"
+              ><el-icon class="check-en" v-show="locale === 'en'"
+                ><IconifyIconOffline icon="check" /></el-icon
+              >English</el-dropdown-item
+            >
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+      <!-- 退出登陆 -->
+      <el-dropdown trigger="click">
+        <span class="el-dropdown-link">
+          <img :src="avatars" />
+          <p>{{ usename }}</p>
+        </span>
+        <template #dropdown>
+          <el-dropdown-menu class="logout">
+            <el-dropdown-item @click="logout">
+              <IconifyIconOffline
+                icon="logout-circle-r-line"
+                style="margin: 5px"
+              />
+              {{ $t("buttons.hsLoginOut") }}</el-dropdown-item
+            >
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+      <el-icon
+        class="el-icon-setting"
+        :title="$t('buttons.hssystemSet')"
+        @click="onPanel"
+      >
+        <IconifyIconOffline icon="setting" />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style module="classes" scoped>
+.container {
+  padding: 0 15px;
+}
+</style>
+
+<style lang="scss" scoped>
+.hamburger {
+  width: 20px;
+  height: 20px;
+
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.is-active-hamburger {
+  transform: rotate(180deg);
+}
+
+.translation {
+  ::v-deep(.el-dropdown-menu__item) {
+    padding: 5px 40px;
+  }
+
+  .check-zh {
+    position: absolute;
+    left: 20px;
+  }
+
+  .check-en {
+    position: absolute;
+    left: 20px;
+  }
+}
+
+.logout {
+  max-width: 120px;
+
+  ::v-deep(.el-dropdown-menu__item) {
+    min-width: 100%;
+    display: inline-flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
--- a/src/layout/components/sidebar/sidebarItem.vue
+++ b/src/layout/components/sidebar/sidebarItem.vue
@@ -1,21 +1,14 @@
 <script setup lang="ts">
-import {
-  ref,
-  PropType,
-  nextTick,
-  computed,
-  CSSProperties,
-  getCurrentInstance
-} from "vue";
+import { ref, PropType, nextTick, computed, CSSProperties } from "vue";
 import path from "path";
+import { useNav } from "../../hooks/nav";
 import { childrenType } from "../../types";
 import { transformI18n } from "/@/plugins/i18n";
 import { useAppStoreHook } from "/@/store/modules/app";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";

-const instance = getCurrentInstance().appContext.app.config.globalProperties;
-const menuMode = instance.$storage.layout?.layout === "vertical";
-const pureApp = useAppStoreHook();
+const { pureApp } = useNav();
+const menuMode = ["vertical", "mix"].includes(pureApp.layout);

 const props = defineProps({
  item: {
@@ -31,6 +24,19 @@ const props = defineProps({
  }
 });

+const getExtraIconStyle = computed((): CSSProperties => {
+  if (useAppStoreHook().getSidebarStatus) {
+    return {
+      position: "absolute",
+      right: "10px"
+    };
+  } else {
+    return {
+      position: "static"
+    };
+  }
+});
+
 const getNoDropdownStyle = computed((): CSSProperties => {
  return {
    display: "flex",
@@ -92,7 +98,6 @@ function hoverMenu(key) {
      : Object.assign(key, {
          showTooltip: false
        });
-
    hoverMenuMap.set(key, true);
  });
 }
@@ -106,6 +111,10 @@ function hasOneShowingChild(
    return true;
  });

+  if (showingChildren[0]?.meta?.showParent) {
+    return false;
+  }
+
  if (showingChildren.length === 1) {
    return true;
  }
@@ -119,8 +128,8 @@ function hasOneShowingChild(

 function resolvePath(routePath) {
  const httpReg = /^http(s?):\/\//;
-  if (httpReg.test(routePath)) {
-    return props.basePath + "/" + routePath;
+  if (httpReg.test(routePath) || httpReg.test(props.basePath)) {
+    return routePath || props.basePath;
  } else {
    return path.resolve(props.basePath, routePath);
  }
@@ -149,6 +158,18 @@ function resolvePath(routePath) {
          "
        ></component>
      </el-icon>
+      <div
+        v-if="
+          !pureApp.sidebar.opened &&
+          pureApp.layout === 'mix' &&
+          props.item?.pathList?.length === 2
+        "
+        :style="getDivStyle"
+      >
+        <span :style="getMenuTextStyle">
+          {{ transformI18n(onlyOneChild.meta.title, onlyOneChild.meta.i18n) }}
+        </span>
+      </div>
      <template #title>
        <div :style="getDivStyle">
          <span v-if="!menuMode">{{
@@ -177,6 +198,9 @@ function resolvePath(routePath) {
          </el-tooltip>
          <FontIcon
            v-if="onlyOneChild.meta.extraIcon"
+            width="30px"
+            height="30px"
+            :style="getExtraIconStyle"
            :icon="onlyOneChild.meta.extraIcon.name"
            :svg="onlyOneChild.meta.extraIcon.svg ? true : false"
          ></FontIcon>
@@ -221,6 +245,9 @@ function resolvePath(routePath) {
      </el-tooltip>
      <FontIcon
        v-if="props.item.meta.extraIcon"
+        width="30px"
+        height="30px"
+        style="position: absolute; right: 10px"
        :icon="props.item.meta.extraIcon.name"
        :svg="props.item.meta.extraIcon.svg ? true : false"
      ></FontIcon>
--- a/src/layout/components/sidebar/vertical.vue
+++ b/src/layout/components/sidebar/vertical.vue
@@ -1,60 +1,59 @@
 <script setup lang="ts">
 import Logo from "./logo.vue";
 import { emitter } from "/@/utils/mitt";
+import { useNav } from "../../hooks/nav";
 import SidebarItem from "./sidebarItem.vue";
 import { storageLocal } from "/@/utils/storage";
 import { useRoute, useRouter } from "vue-router";
-import { computed, ref, onBeforeMount } from "vue";
-import { useAppStoreHook } from "/@/store/modules/app";
+import { ref, computed, watch, onBeforeMount } from "vue";
+import { findRouteByPath, getParentPaths } from "/@/router/utils";
 import { usePermissionStoreHook } from "/@/store/modules/permission";

 const route = useRoute();
-const pureApp = useAppStoreHook();
-const router = useRouter().options.routes;
+const routers = useRouter().options.routes;
 const showLogo = ref(
  storageLocal.getItem("responsive-configure")?.showLogo ?? true
 );
-const isCollapse = computed(() => {
-  return !pureApp.getSidebarStatus;
-});
-const activeMenu = computed((): string => {
-  const { meta, path } = route;
-  if (meta.activeMenu) {
-    // @ts-ignore
-    return meta.activeMenu;
-  }
-  return path;
+
+const { pureApp, isCollapse, menuSelect } = useNav();
+
+let subMenuData = ref([]);
+
+const menuData = computed(() => {
+  return pureApp.layout === "mix"
+    ? subMenuData.value
+    : usePermissionStoreHook().wholeMenus;
 });

-const menuSelect = (indexPath: string): void => {
-  let parentPath = "";
-  let parentPathIndex = indexPath.lastIndexOf("/");
-  if (parentPathIndex > 0) {
-    parentPath = indexPath.slice(0, parentPathIndex);
-  }
-  // 找到当前路由的信息
-  // eslint-disable-next-line no-inner-declarations
-  function findCurrentRoute(routes) {
-    return routes.map(item => {
-      if (item.path === indexPath) {
-        // 切换左侧菜单 通知标签页
-        emitter.emit("changLayoutRoute", {
-          indexPath,
-          parentPath
-        });
-      } else {
-        if (item.children) findCurrentRoute(item.children);
-      }
-    });
-  }
-  findCurrentRoute(router);
-};
+function getSubMenuData(path) {
+  // path的上级路由组成的数组
+  const parentPathArr = getParentPaths(
+    path,
+    usePermissionStoreHook().wholeMenus
+  );
+  // 当前路由的父级路由信息
+  const parenetRoute = findRouteByPath(
+    parentPathArr[0] || path,
+    usePermissionStoreHook().wholeMenus
+  );
+  if (!parenetRoute?.children) return;
+  subMenuData.value = parenetRoute?.children;
+}
+getSubMenuData(route.path);

 onBeforeMount(() => {
  emitter.on("logoChange", key => {
    showLogo.value = key;
  });
 });
+
+watch(
+  () => route.path,
+  () => {
+    getSubMenuData(route.path);
+    menuSelect(route.path, routers);
+  }
+);
 </script>

 <template>
@@ -62,21 +61,21 @@ onBeforeMount(() => {
    <Logo v-if="showLogo" :collapse="isCollapse" />
    <el-scrollbar wrap-class="scrollbar-wrapper">
      <el-menu
-        :default-active="activeMenu"
+        :default-active="route.path"
        :collapse="isCollapse"
        unique-opened
        router
        :collapse-transition="false"
        mode="vertical"
        class="outer-most"
-        @select="menuSelect"
+        @select="indexPath => menuSelect(indexPath, routers)"
      >
        <sidebar-item
-          v-for="route in usePermissionStoreHook().wholeMenus"
-          :key="route.path"
-          :item="route"
+          v-for="routes in menuData"
+          :key="routes.path"
+          :item="routes"
          class="outer-most"
-          :base-path="route.path"
+          :base-path="routes.path"
        />
      </el-menu>
    </el-scrollbar>
--- a/src/layout/components/tag/index.scss
+++ b/src/layout/components/tag/index.scss
@@ -18,36 +18,6 @@
  }
 }

-@-webkit-keyframes rotate {
-  from {
-    -webkit-transform: rotate(0deg);
-  }
-
-  to {
-    -webkit-transform: rotate(360deg);
-  }
-}
-
-@-moz-keyframes rotate {
-  from {
-    -moz-transform: rotate(0deg);
-  }
-
-  to {
-    -moz-transform: rotate(360deg);
-  }
-}
-
-@-o-keyframes rotate {
-  from {
-    -o-transform: rotate(0deg);
-  }
-
-  to {
-    -o-transform: rotate(360deg);
-  }
-}
-
@keyframes rotate {
  from {
    transform: rotate(0deg);
@@ -80,7 +50,7 @@

  .scroll-item {
    border-radius: 3px 3px 0 0;
-    padding: 0 6px 0 6px;
+    padding: 0 6px;
    box-shadow: 0 0 1px #888;
    position: relative;
    margin-right: 4px;
@@ -92,7 +62,7 @@

    .el-icon-close {
      font-size: 10px;
-      color: #1890ff;
+      color: var(--el-color-primary);
      cursor: pointer;
      position: absolute;
      top: 50%;
@@ -123,7 +93,7 @@
  a {
    text-decoration: none;
    color: #666;
-    padding: 0 4px 0 4px;
+    padding: 0 4px;
  }

  .scroll-container {
@@ -190,7 +160,8 @@
      align-items: center;

      &:hover {
-        background: #eee;
+        background: var(--el-color-primary-light-9);
+        color: var(--el-color-primary);
      }

      svg {
@@ -236,7 +207,7 @@
 }

 .scroll-item.is-active {
-  background-color: #eaf4fe;
+  background-color: var(--el-color-primary-light-9);
  position: relative;
  color: #fff;

@@ -249,7 +220,7 @@
  }

  a {
-    color: #1890ff;
+    color: var(--el-color-primary);
  }
 }

@@ -288,10 +259,10 @@

 /* 卡片模式下鼠标移入显示蓝色边框 */
 .card-in {
-  color: #1890ff;
+  color: var(--el-color-primary);

  a {
-    color: #1890ff;
+    color: var(--el-color-primary);
  }
 }

@@ -312,7 +283,7 @@
  position: absolute;
  left: 0;
  bottom: 0;
-  background: #1890ff;
+  background: var(--el-color-primary);
 }

 /* 灵动模式下鼠标移入显示蓝色进度条 */
@@ -322,7 +293,7 @@
  position: absolute;
  left: 0;
  bottom: 0;
-  background: #1890ff;
+  background: var(--el-color-primary);
  animation: scheduleInWidth 400ms ease-in;
 }

@@ -333,14 +304,11 @@
  position: absolute;
  left: 0;
  bottom: 0;
-  background: #1890ff;
+  background: var(--el-color-primary);
  animation: scheduleOutWidth 400ms ease-in;
 }

 /* 刷新按钮动画效果 */
 .refresh-button {
-  -webkit-animation: rotate 600ms linear infinite;
-  -moz-animation: rotate 600ms linear infinite;
-  -o-animation: rotate 600ms linear infinite;
  animation: rotate 600ms linear infinite;
 }
--- a/src/layout/components/tag/index.vue
+++ b/src/layout/components/tag/index.vue
@@ -21,10 +21,10 @@ import closeRight from "/@/assets/svg/close_right.svg?component";

 import { emitter } from "/@/utils/mitt";
 import { $t as t } from "/@/plugins/i18n";
-import { isEqual, isEmpty } from "lodash-es";
 import { transformI18n } from "/@/plugins/i18n";
 import { storageLocal } from "/@/utils/storage";
 import { useRoute, useRouter } from "vue-router";
+import { isEqual, isEmpty } from "lodash-unified";
 import { RouteConfigs, tagsViewsType } from "../../types";
 import { useSettingStoreHook } from "/@/store/modules/settings";
 import { handleAliveRoute, delAliveRoutes } from "/@/router/utils";
@@ -106,7 +106,11 @@ const iconIsActive = computed(() => {

 const dynamicTagView = () => {
  const index = multiTags.value.findIndex(item => {
-    return item.path === route.path;
+    if (item?.query) {
+      return isEqual(route?.query, item?.query);
+    } else {
+      return item.path === route.path;
+    }
  });
  moveToView(index);
 };
@@ -423,6 +427,11 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
  });
 }

+function handleCommand(command: object) {
+  const { key, item } = command;
+  onClickDrop(key, item);
+}
+
 // 触发右键中菜单的点击事件
 function selectTag(key, item) {
  onClickDrop(key, item, currentSelect.value);
@@ -709,7 +718,11 @@ const getContextMenuStyle = computed((): CSSProperties => {
        </el-icon>
      </li>
      <li>
-        <el-dropdown trigger="click" placement="bottom-end">
+        <el-dropdown
+          trigger="click"
+          placement="bottom-end"
+          @command="handleCommand"
+        >
          <el-icon>
            <IconifyIconOffline icon="arrow-down" />
          </el-icon>
@@ -718,11 +731,15 @@ const getContextMenuStyle = computed((): CSSProperties => {
              <el-dropdown-item
                v-for="(item, key) in tagsViews"
                :key="key"
+                :command="{ key, item }"
                :divided="item.divided"
                :disabled="item.disabled"
-                @click="onClickDrop(key, item)"
              >
-                <component :is="item.icon" :key="key" />
+                <component
+                  :is="item.icon"
+                  :key="key"
+                  style="margin-right: 6px"
+                />
                {{ $t(item.text) }}
              </el-dropdown-item>
            </el-dropdown-menu>
--- a/src/layout/frameView.vue
+++ b/src/layout/frameView.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="frame" v-loading="loading">
+    <iframe :src="frameSrc" class="frame-iframe" ref="frameRef"></iframe>
+  </div>
+</template>
+<script lang="ts" setup>
+import { useRoute } from "vue-router";
+import { ref, unref, onMounted, nextTick } from "vue";
+
+const loading = ref(false);
+const currentRoute = useRoute();
+const frameSrc = ref<string>("");
+const frameRef = ref<HTMLElement | null>(null);
+
+if (unref(currentRoute.meta)?.frameSrc) {
+  frameSrc.value = unref(currentRoute.meta)?.frameSrc as string;
+}
+
+function hideLoading() {
+  loading.value = false;
+}
+
+function init() {
+  nextTick(() => {
+    const iframe = unref(frameRef);
+    if (!iframe) return;
+    const _frame = iframe as any;
+    if (_frame.attachEvent) {
+      _frame.attachEvent("onload", () => {
+        hideLoading();
+      });
+    } else {
+      iframe.onload = () => {
+        hideLoading();
+      };
+    }
+  });
+}
+
+onMounted(() => {
+  loading.value = true;
+  init();
+});
+</script>
+
+<style lang="scss" scoped>
+.frame {
+  height: 100vh;
+  z-index: 998;
+
+  .frame-iframe {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    border: 0;
+    box-sizing: border-box;
+  }
+}
+
+.main-content {
+  margin: 0 !important;
+}
+</style>
--- a/src/layout/hooks/nav.ts
+++ b/src/layout/hooks/nav.ts
@@ -0,0 +1,117 @@
+import { computed } from "vue";
+import { router } from "/@/router";
+import { emitter } from "/@/utils/mitt";
+import { routeMetaType } from "../types";
+import { transformI18n } from "/@/plugins/i18n";
+import { storageSession } from "/@/utils/storage";
+import { useAppStoreHook } from "/@/store/modules/app";
+import { remainingPaths } from "/@/router/modules/index";
+import { Title } from "../../../public/serverConfig.json";
+import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+
+export function useNav() {
+  const pureApp = useAppStoreHook();
+  // 用户名
+  const usename: string = storageSession.getItem("info")?.username;
+
+  // 设置国际化选中后的样式
+  const getDropdownItemStyle = computed(() => {
+    return (locale, t) => {
+      return {
+        background: locale === t ? useEpThemeStoreHook().epThemeColor : "",
+        color: locale === t ? "#f4f4f5" : "#000"
+      };
+    };
+  });
+
+  const isCollapse = computed(() => {
+    return !pureApp.getSidebarStatus;
+  });
+
+  // 动态title
+  function changeTitle(meta: routeMetaType) {
+    if (Title)
+      document.title = `${transformI18n(meta.title, meta.i18n)} | ${Title}`;
+    else document.title = transformI18n(meta.title, meta.i18n);
+  }
+
+  // 退出登录
+  function logout() {
+    storageSession.removeItem("info");
+    router.push("/login");
+  }
+
+  function backHome() {
+    router.push("/welcome");
+  }
+
+  function onPanel() {
+    emitter.emit("openPanel");
+  }
+
+  function toggleSideBar() {
+    pureApp.toggleSideBar();
+  }
+
+  function handleResize(menuRef) {
+    menuRef.handleResize();
+  }
+
+  function resolvePath(route) {
+    const httpReg = /^http(s?):\/\//;
+    const routeChildPath = route.children[0]?.path;
+    if (httpReg.test(routeChildPath)) {
+      return route.path + "/" + routeChildPath;
+    } else {
+      return routeChildPath;
+    }
+  }
+
+  function menuSelect(indexPath: string, routers): void {
+    if (isRemaining(indexPath)) return;
+    let parentPath = "";
+    const parentPathIndex = indexPath.lastIndexOf("/");
+    if (parentPathIndex > 0) {
+      parentPath = indexPath.slice(0, parentPathIndex);
+    }
+    // 找到当前路由的信息
+    function findCurrentRoute(indexPath: string, routes) {
+      return routes.map(item => {
+        if (item.path === indexPath) {
+          if (item.redirect) {
+            findCurrentRoute(item.redirect, item.children);
+          } else {
+            // 切换左侧菜单 通知标签页
+            emitter.emit("changLayoutRoute", {
+              indexPath,
+              parentPath
+            });
+          }
+        } else {
+          if (item.children) findCurrentRoute(indexPath, item.children);
+        }
+      });
+    }
+    findCurrentRoute(indexPath, routers);
+  }
+
+  // 判断路径是否参与菜单
+  function isRemaining(path: string): boolean {
+    return remainingPaths.includes(path);
+  }
+
+  return {
+    logout,
+    backHome,
+    onPanel,
+    changeTitle,
+    toggleSideBar,
+    menuSelect,
+    handleResize,
+    resolvePath,
+    isCollapse,
+    pureApp,
+    usename,
+    getDropdownItemStyle
+  };
+}
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -171,7 +171,8 @@ const layoutHeader = defineComponent({
      },
      {
        default: () => [
-          !pureSetting.hiddenSideBar && layout.value.includes("vertical")
+          !pureSetting.hiddenSideBar &&
+          (layout.value.includes("vertical") || layout.value.includes("mix"))
            ? h(navbar)
            : h("div"),
          !pureSetting.hiddenSideBar && layout.value.includes("horizontal")
@@ -213,7 +214,10 @@ const layoutHeader = defineComponent({
      @click="useAppStoreHook().toggleSideBar()"
    />
    <Vertical
-      v-show="!pureSetting.hiddenSideBar && layout.includes('vertical')"
+      v-show="
+        !pureSetting.hiddenSideBar &&
+        (layout.includes('vertical') || layout.includes('mix'))
+      "
    />
    <div
      :class="[
--- a/src/layout/routerView/parent.vue
+++ b/src/layout/routerView/parent.vue
@@ -1,15 +0,0 @@
-<template>
-  <router-view>
-    <template #default="{ Component, route }">
-      <transition appear name="fade-transform" mode="out-in">
-        <component :is="Component" :key="route.fullPath" />
-      </transition>
-    </template>
-  </router-view>
-</template>
-
-<script lang="ts">
-export default {
-  name: "layoutParentView"
-};
-</script>
--- a/src/layout/theme/default-vars.scss
+++ b/src/layout/theme/default-vars.scss
@@ -19,7 +19,7 @@ $subMenuBg: #0f0303 !default;
 /* 有无子集的激活菜单背景 */
 $subMenuActiveBg: #4091f7 !default;
 $navTextColor: #fff !default;
-$menuText: rgba(254, 254, 254, 0.65) !default;
+$menuText: rgb(254 254 254 / 65%) !default;

 /* logo背景颜色 */
 $sidebarLogo: #002140 !default;
--- a/src/layout/theme/dusk-vars.scss
+++ b/src/layout/theme/dusk-vars.scss
@@ -5,7 +5,7 @@ $menuHover: #e13c39;
 $subMenuBg: #000;
 $subMenuActiveBg: #e13c39;
 $navTextColor: red;
-$menuText: rgba(254, 254, 254, 0.651);
+$menuText: rgb(254 254 254 / 65.1%);
 $sidebarLogo: #42090c;
 $menuTitleHover: #fff;
 $menuActiveBefore: #e13c39;
--- a/src/layout/theme/volcano-vars.scss
+++ b/src/layout/theme/volcano-vars.scss
@@ -5,7 +5,7 @@ $menuHover: #e85f33;
 $subMenuBg: #0f0603;
 $subMenuActiveBg: #e85f33;
 $navTextColor: #fff;
-$menuText: rgba(254, 254, 254, 0.65);
+$menuText: rgb(254 254 254 / 65%);
 $sidebarLogo: #441708;
 $menuTitleHover: #fff;
 $menuActiveBefore: #e85f33;
--- a/src/layout/theme/yellow-vars.scss
+++ b/src/layout/theme/yellow-vars.scss
@@ -5,7 +5,7 @@ $menuHover: #f6da4d;
 $subMenuBg: #0f0603;
 $subMenuActiveBg: #f6da4d;
 $navTextColor: #fff;
-$menuText: rgba(254, 254, 254, 0.65);
+$menuText: rgb(254 254 254 / 65%);
 $sidebarLogo: #443b05;
 $menuTitleHover: #fff;
 $menuActiveBefore: #f6da4d;
--- a/src/layout/types.ts
+++ b/src/layout/types.ts
@@ -11,18 +11,20 @@ export const routerArrays: Array<RouteConfigs> = [
  }
 ];

+export type routeMetaType = {
+  title?: string;
+  i18n?: boolean;
+  icon?: string;
+  showLink?: boolean;
+  savedPosition?: boolean;
+  authority?: Array<string>;
+};
+
 export type RouteConfigs = {
  path?: string;
  parentPath?: string;
  query?: object;
-  meta?: {
-    title?: string;
-    i18n?: boolean;
-    icon?: string;
-    showLink?: boolean;
-    savedPosition?: boolean;
-    authority?: Array<string>;
-  };
+  meta?: routeMetaType;
  children?: RouteConfigs[];
  name?: string;
 };
@@ -65,12 +67,15 @@ export type childrenType = {
    icon?: string;
    title?: string;
    i18n?: boolean;
+    showParent?: boolean;
    extraIcon?: {
      svg?: boolean;
      name?: string;
    };
  };
  showTooltip?: boolean;
+  parentId?: number;
+  pathList?: number[];
 };

 export type themeColorsType = {
--- a/src/main.ts
+++ b/src/main.ts
@@ -35,9 +35,10 @@ app.component("IconifyIconOnline", IconifyIconOnline);
 app.component("FontIcon", FontIcon);

 getServerConfig(app).then(async config => {
+  app.use(router);
+  await router.isReady();
  injectResponsiveStorage(app, config);
  setupStore(app);
-  app.use(router).use(MotionPlugin).use(useElementPlus).use(usI18n);
-  await router.isReady();
+  app.use(MotionPlugin).use(useElementPlus).use(usI18n);
  app.mount("#app");
 });
--- a/src/plugins/i18n/index.ts
+++ b/src/plugins/i18n/index.ts
@@ -1,6 +1,6 @@
 // 多组件库的国际化和本地项目国际化兼容
 import { App } from "vue";
-import { set } from "lodash-es";
+import { set } from "lodash-unified";
 import { createI18n } from "vue-i18n";
 import { localesConfigs } from "./config";
 import { storageLocal } from "/@/utils/storage";
@@ -11,7 +11,10 @@ import { storageLocal } from "/@/utils/storage";
 * @param isI18n  如果true,获取对应的消息,否则返回本身
 * @returns message
 */
-export function transformI18n(message: string | object = "", isI18n = false) {
+export function transformI18n(
+  message: string | unknown | object = "",
+  isI18n: boolean | unknown = false
+) {
  if (!message) {
    return "";
  }
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,11 +1,13 @@
+import { isUrl } from "/@/utils/is";
 import { toRouteType } from "./types";
 import { openLink } from "/@/utils/link";
 import NProgress from "/@/utils/progress";
 import { constantRoutes } from "./modules";
-import { split, findIndex } from "lodash-es";
+import { findIndex } from "lodash-unified";
 import { transformI18n } from "/@/plugins/i18n";
 import remainingRouter from "./modules/remaining";
 import { storageSession } from "/@/utils/storage";
+import { Title } from "../../public/serverConfig.json";
 import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
 import { usePermissionStoreHook } from "/@/store/modules/permission";
 import { Router, RouteMeta, createRouter, RouteRecordName } from "vue-router";
@@ -51,21 +53,22 @@ router.beforeEach((to: toRouteType, _from, next) => {
  }
  const name = storageSession.getItem("info");
  NProgress.start();
-  const externalLink = to?.redirectedFrom?.fullPath;
+  const externalLink = isUrl(to?.name);
  if (!externalLink)
    to.matched.some(item => {
-      item.meta.title
-        ? (document.title = transformI18n(
-            item.meta.title as string,
-            item.meta?.i18n as boolean
-          ))
-        : "";
+      if (!item.meta.title) return "";
+      if (Title)
+        document.title = `${transformI18n(
+          item.meta.title,
+          item.meta?.i18n
+        )} | ${Title}`;
+      else document.title = transformI18n(item.meta.title, item.meta?.i18n);
    });
  if (name) {
    if (_from?.name) {
-      // 如果路由包含http 则是超链接 反之是普通路由
-      if (externalLink && externalLink.includes("http")) {
-        openLink(`http${split(externalLink, "http")[1]}`);
+      // name为超链接
+      if (externalLink) {
+        openLink(to?.name);
        NProgress.done();
      } else {
        next();
--- a/src/router/modules/error.ts
+++ b/src/router/modules/error.ts
@@ -1,5 +1,5 @@
 import { $t } from "/@/plugins/i18n";
-import Layout from "/@/layout/index.vue";
+const Layout = () => import("/@/layout/index.vue");

 const errorRouter = {
  path: "/error",
--- a/src/router/modules/externalLink.ts
+++ b/src/router/modules/externalLink.ts
@@ -1,9 +1,8 @@
 import { $t } from "/@/plugins/i18n";
-import Layout from "/@/layout/index.vue";
+const Layout = () => import("/@/layout/index.vue");

 const externalLink = {
-  path: "/external",
-  name: "external",
+  path: "/externals",
  component: Layout,
  meta: {
    icon: "link",
@@ -13,11 +12,11 @@ const externalLink = {
  },
  children: [
    {
-      path: "https://github.com/xiaoxian521/vue-pure-admin",
+      path: "/external",
+      name: "https://pure-admin-doc.vercel.app",
      meta: {
        title: $t("menus.externalLink"),
-        i18n: true,
-        rank: 191
+        i18n: true
      }
    }
  ]
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -1,5 +1,5 @@
 import { $t } from "/@/plugins/i18n";
-import Layout from "/@/layout/index.vue";
+const Layout = () => import("/@/layout/index.vue");

 const homeRouter = {
  path: "/",
--- a/src/router/modules/index.ts
+++ b/src/router/modules/index.ts
@@ -10,16 +10,22 @@ import {
  formatTwoStageRoutes,
  formatFlatteningRoutes
 } from "../utils";
+import { buildHierarchyTree } from "/@/utils/tree";

 // 原始静态路由（未做任何处理）
 const routes = [homeRouter, errorRouter, externalLink];

 // 导出处理后的静态路由（三级及以上的路由全部拍成二级）
 export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
-  formatFlatteningRoutes(ascending(routes))
+  formatFlatteningRoutes(buildHierarchyTree(ascending(routes)))
 );

 // 用于渲染菜单，保持原始层级
 export const constantMenus: Array<RouteComponent> = ascending(routes).concat(
  ...remainingRouter
 );
+
+// 不参与菜单的路由
+export const remainingPaths = Object.keys(remainingRouter).map(v => {
+  return remainingRouter[v].path;
+});
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -1,5 +1,5 @@
 import { $t } from "/@/plugins/i18n";
-import Layout from "/@/layout/index.vue";
+const Layout = () => import("/@/layout/index.vue");

 const remainingRouter = [
  {
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -8,10 +8,12 @@ import {
 } from "vue-router";
 import { router } from "./index";
 import { loadEnv } from "../../build";
-import Layout from "/@/layout/index.vue";
 import { useTimeoutFn } from "@vueuse/core";
 import { RouteConfigs } from "/@/layout/types";
+import { buildHierarchyTree } from "/@/utils/tree";
 import { usePermissionStoreHook } from "/@/store/modules/permission";
+const Layout = () => import("/@/layout/index.vue");
+const IFrame = () => import("/@/layout/frameView.vue");
 // https://cn.vitejs.dev/guide/features.html#glob-import
 const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}");

@@ -125,6 +127,10 @@ function initRouter(name: string) {
              // 最终路由进行升序
              ascending(router.options.routes[0].children);
              if (!router.hasRoute(v?.name)) router.addRoute(v);
+              const flattenRouters = router
+                .getRoutes()
+                .find(n => n.path === "/");
+              router.addRoute(flattenRouters);
            }
            resolve(router);
          }
@@ -146,14 +152,15 @@ function initRouter(name: string) {
 */
 function formatFlatteningRoutes(routesList: RouteRecordRaw[]) {
  if (routesList.length === 0) return routesList;
-  for (let i = 0; i < routesList.length; i++) {
-    if (routesList[i].children) {
-      routesList = routesList
+  let hierarchyList = buildHierarchyTree(routesList);
+  for (let i = 0; i < hierarchyList.length; i++) {
+    if (hierarchyList[i].children) {
+      hierarchyList = hierarchyList
        .slice(0, i + 1)
-        .concat(routesList[i].children, routesList.slice(i + 1));
+        .concat(hierarchyList[i].children, hierarchyList.slice(i + 1));
    }
  }
-  return routesList;
+  return hierarchyList;
 }

 /**
@@ -216,6 +223,8 @@ function addAsyncRoutes(arrRoutes: Array<RouteRecordRaw>) {
  arrRoutes.forEach((v: RouteRecordRaw) => {
    if (v.redirect) {
      v.component = Layout;
+    } else if (v.meta?.frameSrc) {
+      v.component = IFrame;
    } else {
      const index = modulesRoutesKeys.findIndex(ev => ev.includes(v.path));
      v.component = modulesRoutes[modulesRoutesKeys[index]];
--- a/src/store/modules/epTheme.ts
+++ b/src/store/modules/epTheme.ts
@@ -8,16 +8,29 @@ export const useEpThemeStore = defineStore({
  state: () => ({
    epThemeColor:
      storageLocal.getItem("responsive-layout")?.epThemeColor ??
-      getConfig().EpThemeColor
+      getConfig().EpThemeColor,
+    epTheme:
+      storageLocal.getItem("responsive-layout")?.theme ?? getConfig().Theme
  }),
  getters: {
    getEpThemeColor() {
      return this.epThemeColor;
+    },
+    // 用于mix导航模式下hamburger-svg的fill属性
+    fill() {
+      if (this.epTheme === "light") {
+        return "#409eff";
+      } else if (this.epTheme === "yellow") {
+        return "#d25f00";
+      } else {
+        return "#fff";
+      }
    }
  },
  actions: {
    setEpThemeColor(newColor) {
      const layout = storageLocal.getItem("responsive-layout");
+      this.epTheme = layout?.theme;
      this.epThemeColor = newColor;
      layout.epThemeColor = newColor;
      storageLocal.setItem("responsive-layout", layout);
--- a/src/store/modules/multiTags.ts
+++ b/src/store/modules/multiTags.ts
@@ -1,6 +1,7 @@
 import { defineStore } from "pinia";
 import { store } from "/@/store";
-import { isEqual } from "lodash-es";
+import { isUrl } from "/@/utils/is";
+import { isEqual } from "lodash-unified";
 import { storageLocal } from "/@/utils/storage";
 import { multiType, positionType } from "./types";

@@ -54,6 +55,7 @@ export const useMultiTagsStore = defineStore({
        case "push":
          {
            const tagVal = value as multiType;
+            if (isUrl(tagVal?.name)) return;
            const tagPath = tagVal?.path;
            // 判断tag是否已存在
            const tagHasExits = this.multiTags.some(tag => {
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { store } from "/@/store";
 import { cacheType } from "./types";
-import { cloneDeep } from "lodash-es";
+import { cloneDeep } from "lodash-unified";
 import { RouteConfigs } from "/@/layout/types";
 import { constantMenus } from "/@/router/modules";
 import { ascending, filterTree } from "/@/router/utils";
--- a/src/style/dark.scss
+++ b/src/style/dark.scss
@@ -18,7 +18,7 @@
  }

  .el-overlay {
-    background-color: rgba(0, 0, 0, 0.05) !important;
+    background-color: rgb(0 0 0 / 5%) !important;
  }

  .el-drawer {
--- a/src/style/element-plus.scss
+++ b/src/style/element-plus.scss
@@ -25,7 +25,7 @@
 }

 .el-dropdown-menu {
-  padding: 2px 0 2px 0 !important;
+  padding: 2px 0 !important;
 }

 .el-range-separator {
@@ -38,14 +38,16 @@

 /* 动态改变cssvar 用于主题切换 https://github.com/element-plus/element-plus/issues/4856#issuecomment-1000174357 */
 .el-button--primary {
-  --el-button-bg-color: var(--el-color-primary) !important;
-  --el-button-border-color: var(--el-color-primary) !important;
-  --el-button-hover-bg-color: var(--el-color-primary-light-2) !important;
-  --el-button-hover-border-color: var(--el-color-primary-light-2) !important;
  --el-button-active-bg-color: var(--el-color-primary-active) !important;
  --el-button-active-border-color: var(--el-color-primary-active) !important;
 }

+/* button--primary plain */
+.el-button--primary.is-plain {
+  --el-button-active-bg-color: var(--el-color-primary) !important;
+  --el-button-active-border-color: var(--el-color-primary) !important;
+}
+
 /* nprogress适配ep的primary */
 #nprogress {
  & .bar {
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -11,9 +11,9 @@ body {
  padding: 0;
  -moz-osx-font-smoothing: grayscale;
  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-    Microsoft YaHei, Arial, sans-serif;
+  text-rendering: optimizelegibility;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
+    "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
 }

 html {
@@ -22,6 +22,11 @@ html {
  box-sizing: border-box;
 }

+#app {
+  width: 100%;
+  height: 100%;
+}
+
 label {
  font-weight: 700;
 }
@@ -74,19 +79,11 @@ ul {
 /* 灰色模式 */
 .html-grey {
  filter: grayscale(100%);
-  -webkit-filter: grayscale(100%);
-  -moz-filter: grayscale(100%);
-  -ms-filter: grayscale(100%);
-  -o-filter: grayscale(100%);
 }

 /* 色弱模式 */
 .html-weakness {
  filter: invert(80%);
-  -webkit-filter: invert(80%);
-  -moz-filter: invert(80%);
-  -ms-filter: invert(80%);
-  -o-filter: invert(80%);
 }

 .pc-spacing {
--- a/src/style/sidebar.scss
+++ b/src/style/sidebar.scss
@@ -23,16 +23,6 @@
    margin-left: $sideBarWidth;
    position: relative;
    background: #f0f2f5;
-    @media screen and (min-width: 150px) and (max-width: 420px) {
-      .app-main .el-scrollbar__view:first-child {
-        overflow-y: hidden;
-      }
-    }
-    @media screen and (min-width: 420px) {
-      .app-main .el-scrollbar__view:first-child {
-        overflow: hidden;
-      }
-    }
  }

  .fixed-header {
@@ -306,6 +296,10 @@
      height: 48px;
      line-height: 48px;
      background: $menuBg;
+
+      svg {
+        position: static !important;
+      }
    }

    .is-active > .el-sub-menu__title,
@@ -498,9 +492,7 @@
    background-color: $menuActiveBefore;
    content: "";
    clear: both;
-    -webkit-transition: all 0.2s ease-in-out;
    transition: all 0.2s ease-in-out;
-    -webkit-transform: translateY(0);
    transform: translateY(0);
  }

@@ -513,9 +505,7 @@
    background-color: $menuActiveBefore;
    content: "";
    clear: both;
-    -webkit-transition: all 0.2s ease-in-out;
    transition: all 0.2s ease-in-out;
-    -webkit-transform: translateY(0);
    transform: translateY(0);
  }

@@ -526,7 +516,6 @@
    position: absolute;
    height: 0;
    width: 3px;
-    -webkit-transform: translateY(-50%);
    transform: translateY(-50%);
    top: 50%;
  }
@@ -600,16 +589,6 @@ body[layout="vertical"] {
      }
    }

-    .el-sub-menu {
-      overflow: hidden;
-
-      & > .el-sub-menu__title {
-        .el-sub-menu__icon-arrow {
-          display: none;
-        }
-      }
-    }
-
    /* 菜单折叠 */
    .el-menu--collapse {
      .el-sub-menu {
@@ -649,3 +628,64 @@ body[layout="horizontal"] {
    transition: none !important;
  }
 }
+
+body[layout="mix"] {
+  $sideBarWidth: 210px;
+  @include merge-style($sideBarWidth);
+
+  .el-menu {
+    --el-menu-hover-bg-color: transparent !important;
+  }
+
+  .hideSidebar {
+    .fixed-header {
+      width: calc(100% - 54px);
+      transition: width 0.28s;
+    }
+
+    .sidebar-container {
+      width: 54px !important;
+    }
+
+    .main-container {
+      margin-left: 54px;
+    }
+
+    .submenu-title-noDropdown {
+      padding: 0 !important;
+      position: relative;
+
+      .el-tooltip {
+        padding: 0 !important;
+      }
+    }
+
+    /* 菜单折叠 */
+    .el-menu--collapse {
+      .el-sub-menu {
+        & > .el-sub-menu__title {
+          & > span {
+            height: 0;
+            width: 0;
+            overflow: hidden;
+            visibility: hidden;
+            display: inline-block;
+          }
+        }
+      }
+
+      /* 无子菜单 */
+      .el-menu-item [class^="el-icon"] {
+        right: 5px;
+      }
+
+      .el-sub-menu__title [class^="el-icon"] {
+        right: 2px;
+      }
+
+      .submenu-title-noDropdown {
+        background: transparent !important;
+      }
+    }
+  }
+}
--- a/src/utils/http/index.ts
+++ b/src/utils/http/index.ts
@@ -3,7 +3,7 @@ import {
  resultType,
  PureHttpError,
  RequestMethods,
-  PureHttpResoponse,
+  PureHttpResponse,
  PureHttpRequestConfig
 } from "./types.d";
 import qs from "qs";
@@ -91,7 +91,7 @@ class PureHttp {
  private httpInterceptorsResponse(): void {
    const instance = PureHttp.axiosInstance;
    instance.interceptors.response.use(
-      (response: PureHttpResoponse) => {
+      (response: PureHttpResponse) => {
        const $config = response.config;
        // 关闭进度条动画
        NProgress.done();
@@ -145,21 +145,21 @@ class PureHttp {
  }

  // 单独抽离的post工具函数
-  public post<T>(
+  public post<T, P>(
    url: string,
    params?: T,
    config?: PureHttpRequestConfig
-  ): Promise<T> {
-    return this.request<T>("post", url, params, config);
+  ): Promise<P> {
+    return this.request<P>("post", url, params, config);
  }

  // 单独抽离的get工具函数
-  public get<T>(
+  public get<T, P>(
    url: string,
    params?: T,
    config?: PureHttpRequestConfig
-  ): Promise<T> {
-    return this.request<T>("get", url, params, config);
+  ): Promise<P> {
+    return this.request<P>("get", url, params, config);
  }
 }

--- a/src/utils/http/types.d.ts
+++ b/src/utils/http/types.d.ts
@@ -18,13 +18,13 @@ export interface PureHttpError extends AxiosError {
  isCancelRequest?: boolean;
 }

-export interface PureHttpResoponse extends AxiosResponse {
+export interface PureHttpResponse extends AxiosResponse {
  config: PureHttpRequestConfig;
 }

 export interface PureHttpRequestConfig extends AxiosRequestConfig {
  beforeRequestCallback?: (request: PureHttpRequestConfig) => void;
-  beforeResponseCallback?: (response: PureHttpResoponse) => void;
+  beforeResponseCallback?: (response: PureHttpResponse) => void;
 }

 export default class PureHttp {
@@ -34,6 +34,14 @@ export default class PureHttp {
    param?: AxiosRequestConfig,
    axiosConfig?: PureHttpRequestConfig
  ): Promise<T>;
-  post<T>(url: string, params?: T, config?: PureHttpRequestConfig): Promise<T>;
-  get<T>(url: string, params?: T, config?: PureHttpRequestConfig): Promise<T>;
+  post<T, P>(
+    url: string,
+    params?: T,
+    config?: PureHttpRequestConfig
+  ): Promise<P>;
+  get<T, P>(
+    url: string,
+    params?: T,
+    config?: PureHttpRequestConfig
+  ): Promise<P>;
 }
--- a/src/utils/is.ts
+++ b/src/utils/is.ts
@@ -94,8 +94,9 @@ export const isServer = typeof window === "undefined";

 export const isClient = !isServer;

-export function isUrl(path: string): boolean {
+export function isUrl<T>(path: T): boolean {
  const reg =
    /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
+  // @ts-expect-error
  return reg.test(path);
 }
--- a/src/utils/link.ts
+++ b/src/utils/link.ts
@@ -1,5 +1,6 @@
-export const openLink = (link: string) => {
+export const openLink = <T>(link: T): void => {
  const $a: HTMLElement = document.createElement("a");
+  // @ts-expect-error
  $a.setAttribute("href", link);
  $a.setAttribute("target", "_blank");
  $a.setAttribute("rel", "noreferrer noopener");
--- a/src/utils/loaders/index.ts
+++ b/src/utils/loaders/index.ts
@@ -0,0 +1,54 @@
+interface ProxyLoader {
+  loadCss(src: string): any;
+  loadScript(src: string): Promise<any>;
+  loadScriptConcurrent(src: Array<string>): Promise<any>;
+}
+
+class loaderProxy implements ProxyLoader {
+  constructor() {}
+
+  protected scriptLoaderCache: Array<string> = [];
+
+  public loadCss = (src: string): any => {
+    const element: HTMLLinkElement = document.createElement("link");
+    element.rel = "stylesheet";
+    element.href = src;
+    document.body.appendChild(element);
+  };
+
+  public loadScript = async (src: string): Promise<any> => {
+    if (this.scriptLoaderCache.includes(src)) {
+      return src;
+    } else {
+      const element: HTMLScriptElement = document.createElement("script");
+      element.src = src;
+      document.body.appendChild(element);
+      element.onload = () => {
+        return this.scriptLoaderCache.push(src);
+      };
+    }
+  };
+
+  public loadScriptConcurrent = async (
+    srcList: Array<string>
+  ): Promise<any> => {
+    if (Array.isArray(srcList)) {
+      const len: number = srcList.length;
+      if (len > 0) {
+        let count = 0;
+        srcList.map(src => {
+          if (src) {
+            this.loadScript(src).then(() => {
+              count++;
+              if (count === len) {
+                return;
+              }
+            });
+          }
+        });
+      }
+    }
+  };
+}
+
+export const loader = new loaderProxy();
--- a/src/utils/operate/index.ts
+++ b/src/utils/operate/index.ts
@@ -1,3 +1,5 @@
+import type { FunctionArgs } from "@vueuse/core";
+
 export const hasClass = (ele: RefType<any>, cls: string): any => {
  return !!ele.className.match(new RegExp("(\\s|^)" + cls + "(\\s|$)"));
 };
@@ -40,3 +42,16 @@ export const toggleClass = (
  className = className.replace(clsName, "");
  targetEl.className = flag ? `${className} ${clsName} ` : className;
 };
+
+export function useRafThrottle<T extends FunctionArgs>(fn: T): T {
+  let locked = false;
+  // @ts-ignore
+  return function (...args) {
+    if (locked) return;
+    locked = true;
+    window.requestAnimationFrame(() => {
+      fn.apply(this, args);
+      locked = false;
+    });
+  };
+}
--- a/src/utils/print.ts
+++ b/src/utils/print.ts
@@ -0,0 +1,226 @@
+interface PrintFunction {
+  extendOptions: Function;
+  getStyle: Function;
+  setDomHeight: Function;
+  toPrint: Function;
+}
+
+const Print = function (dom, options?: object): PrintFunction {
+  options = options || {};
+  // @ts-expect-error
+  if (!(this instanceof Print)) return new Print(dom, options);
+  this.conf = {
+    styleStr: "",
+    // Elements that need to dynamically get and set the height
+    setDomHeightArr: [],
+    // Echart dom List
+    echartDomArr: [],
+    // Callback before printing
+    printBeforeFn: null,
+    // Callback after printing
+    printDoneCallBack: null
+  };
+  for (const key in this.conf) {
+    // eslint-disable-next-line no-prototype-builtins
+    if (key && options.hasOwnProperty(key)) {
+      this.conf[key] = options[key];
+    }
+  }
+  if (typeof dom === "string") {
+    this.dom = document.querySelector(dom);
+  } else {
+    this.dom = this.isDOM(dom) ? dom : dom.$el;
+  }
+  if (this.conf.setDomHeightArr && this.conf.setDomHeightArr.length) {
+    this.setDomHeight(this.conf.setDomHeightArr);
+  }
+  this.init();
+};
+
+Print.prototype = {
+  /**
+   * init
+   */
+  init: function (): void {
+    const content = this.getStyle() + this.getHtml();
+    this.writeIframe(content);
+  },
+  /**
+   * Configuration property extension
+   * @param {Object} obj
+   * @param {Object} obj2
+   */
+  extendOptions: function <T>(obj, obj2: T): T {
+    for (const k in obj2) {
+      obj[k] = obj2[k];
+    }
+    return obj;
+  },
+  /**
+    Copy all styles of the original page
+  */
+  getStyle: function (): string {
+    let str = "";
+    const styles: NodeListOf<Element> = document.querySelectorAll("style,link");
+    for (let i = 0; i < styles.length; i++) {
+      str += styles[i].outerHTML;
+    }
+    str += `<style>.no-print{display:none;}${this.conf.styleStr}</style>`;
+    return str;
+  },
+  // form assignment
+  getHtml: function (): Element {
+    const inputs = document.querySelectorAll("input");
+    const selects = document.querySelectorAll("select");
+    const textareas = document.querySelectorAll("textarea");
+    for (let k = 0; k < inputs.length; k++) {
+      if (inputs[k].type == "checkbox" || inputs[k].type == "radio") {
+        if (inputs[k].checked == true) {
+          inputs[k].setAttribute("checked", "checked");
+        } else {
+          inputs[k].removeAttribute("checked");
+        }
+      } else if (inputs[k].type == "text") {
+        inputs[k].setAttribute("value", inputs[k].value);
+      } else {
+        inputs[k].setAttribute("value", inputs[k].value);
+      }
+    }
+
+    for (let k2 = 0; k2 < textareas.length; k2++) {
+      if (textareas[k2].type == "textarea") {
+        textareas[k2].innerHTML = textareas[k2].value;
+      }
+    }
+
+    for (let k3 = 0; k3 < selects.length; k3++) {
+      if (selects[k3].type == "select-one") {
+        const child = selects[k3].children;
+        for (const i in child) {
+          if (child[i].tagName == "OPTION") {
+            // @ts-ignore
+            if (child[i].selected == true) {
+              child[i].setAttribute("selected", "selected");
+            } else {
+              child[i].removeAttribute("selected");
+            }
+          }
+        }
+      }
+    }
+
+    return this.dom.outerHTML;
+  },
+  /**
+    create iframe
+  */
+  writeIframe: function (content) {
+    let w: Document | Window;
+    let doc: Document;
+    const iframe: HTMLIFrameElement = document.createElement("iframe");
+    const f: HTMLIFrameElement = document.body.appendChild(iframe);
+    iframe.id = "myIframe";
+    iframe.setAttribute(
+      "style",
+      "position:absolute;width:0;height:0;top:-10px;left:-10px;"
+    );
+    // eslint-disable-next-line prefer-const
+    w = f.contentWindow || f.contentDocument;
+    // eslint-disable-next-line prefer-const
+    doc = f.contentDocument || f.contentWindow.document;
+    doc.open();
+    doc.write(content);
+    doc.close();
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const _this = this;
+    iframe.onload = function (): void {
+      // Before popping, callback
+      if (_this.conf.printBeforeFn) {
+        _this.conf.printBeforeFn({ doc });
+      }
+
+      _this.drawEchartImg(doc).then(() => {
+        _this.toPrint(w);
+        setTimeout(function () {
+          document.body.removeChild(iframe);
+          // After popup, callback
+          if (_this.conf.printDoneCallBack) {
+            _this.conf.printDoneCallBack();
+          }
+        }, 100);
+      });
+    };
+  },
+  /**
+   * echarts printing
+   * @param {Object} doc iframe window
+   */
+  drawEchartImg(doc): Promise<void> {
+    return new Promise<void>(resolve => {
+      if (this.conf.echartDomArr && this.conf.echartDomArr.length > 0) {
+        this.conf.echartDomArr.forEach(e => {
+          const dom = doc.querySelector("#" + e.$el.id);
+          const img = new Image();
+          const w = dom.offsetWidth + "px";
+          const H = dom.offsetHeight + "px";
+
+          img.style.width = w;
+          img.style.height = H;
+          img.src = e.imgSrc;
+          dom.innerHTML = "";
+          dom.appendChild(img);
+        });
+      }
+      resolve();
+    });
+  },
+  /**
+    Print
+  */
+  toPrint: function (frameWindow): void {
+    try {
+      setTimeout(function () {
+        frameWindow.focus();
+        try {
+          if (!frameWindow.document.execCommand("print", false, null)) {
+            frameWindow.print();
+          }
+        } catch (e) {
+          frameWindow.print();
+        }
+        frameWindow.close();
+      }, 10);
+    } catch (err) {
+      console.error(err);
+    }
+  },
+  isDOM:
+    typeof HTMLElement === "object"
+      ? function (obj) {
+          return obj instanceof HTMLElement;
+        }
+      : function (obj) {
+          return (
+            obj &&
+            typeof obj === "object" &&
+            obj.nodeType === 1 &&
+            typeof obj.nodeName === "string"
+          );
+        },
+  /**
+   * Set the height of the specified dom element by getting the existing height of the dom element and setting
+   * @param {Array} arr
+   */
+  setDomHeight(arr) {
+    if (arr && arr.length) {
+      arr.forEach(name => {
+        const domArr = document.querySelectorAll(name);
+        domArr.forEach(dom => {
+          dom.style.height = dom.offsetHeight + "px";
+        });
+      });
+    }
+  }
+};
+
+export default Print;
--- a/src/utils/resize/index.ts
+++ b/src/utils/resize/index.ts
@@ -0,0 +1,35 @@
+import ResizeObserver from "resize-observer-polyfill";
+
+const isServer = typeof window === "undefined";
+
+const resizeHandler = (entries: any[]): void => {
+  for (const entry of entries) {
+    const listeners = entry.target.__resizeListeners__ || [];
+    if (listeners.length) {
+      listeners.forEach((fn: () => any) => {
+        fn();
+      });
+    }
+  }
+};
+
+export const addResizeListener = (element: any, fn: () => any): any => {
+  if (isServer) return;
+  if (!element.__resizeListeners__) {
+    element.__resizeListeners__ = [];
+    element.__ro__ = new ResizeObserver(resizeHandler);
+    element.__ro__.observe(element);
+  }
+  element.__resizeListeners__.push(fn);
+};
+
+export const removeResizeListener = (element: any, fn: () => any): any => {
+  if (!element || !element.__resizeListeners__) return;
+  element.__resizeListeners__.splice(
+    element.__resizeListeners__.indexOf(fn),
+    1
+  );
+  if (!element.__resizeListeners__.length) {
+    element.__ro__.disconnect();
+  }
+};
--- a/src/utils/storage/responsive.ts
+++ b/src/utils/storage/responsive.ts
@@ -20,7 +20,7 @@ export const injectResponsiveStorage = (app: App, config: ServerConfigs) => {
          theme: config.Theme ?? "default",
          darkMode: config.DarkMode ?? false,
          sidebarStatus: config.SidebarStatus ?? true,
-          epThemeColor: config.EpThemeColor ?? "409EFF"
+          epThemeColor: config.EpThemeColor ?? "#409EFF"
        }
      },
      configure: {
--- a/src/utils/tree.ts
+++ b/src/utils/tree.ts
@@ -0,0 +1,67 @@
+/**
+ * 提取菜单树中的每一项uniqueId
+ * @param {Array} {menuTree 菜单树}
+ * @param {return}} expandedPaths 每一项uniqueId组成的数组
+ */
+const expandedPaths = [];
+export function extractPathList(menuTree) {
+  if (!Array.isArray(menuTree)) {
+    console.warn("menuTree must be an array");
+    return;
+  }
+  if (!menuTree || menuTree.length === 0) return;
+  for (const node of menuTree) {
+    const hasChildren = node.children && node.children.length > 0;
+    if (hasChildren) {
+      extractPathList(node.children);
+    }
+    expandedPaths.push(node.uniqueId);
+  }
+  return expandedPaths;
+}
+
+/**
+ * 如果父级下children的length为1，删除children并自动组建唯一uniqueId
+ * @param {Array} {menuTree 菜单树}
+ * @param {Array} {pathList 每一项的id组成的数组}
+ * @param {return}}
+ */
+export function deleteChildren(menuTree, pathList = []) {
+  if (!Array.isArray(menuTree)) {
+    console.warn("menuTree must be an array");
+    return;
+  }
+  if (!menuTree || menuTree.length === 0) return;
+  for (const [key, node] of menuTree.entries()) {
+    if (node.children && node.children.length === 1) delete node.children;
+    node.id = key;
+    node.parentId = pathList.length ? pathList[pathList.length - 1] : null;
+    node.pathList = [...pathList, node.id];
+    node.uniqueId =
+      node.pathList.length > 1 ? node.pathList.join("-") : node.pathList[0];
+    const hasChildren = node.children && node.children.length > 0;
+    if (hasChildren) {
+      deleteChildren(node.children, node.pathList);
+    }
+  }
+  return menuTree;
+}
+
+// 创建层级关系
+export function buildHierarchyTree(menuTree, pathList = []) {
+  if (!Array.isArray(menuTree)) {
+    console.warn("menuTree must be an array");
+    return;
+  }
+  if (!menuTree || menuTree.length === 0) return;
+  for (const [key, node] of menuTree.entries()) {
+    node.id = key;
+    node.parentId = pathList.length ? pathList[pathList.length - 1] : null;
+    node.pathList = [...pathList, node.id];
+    const hasChildren = node.children && node.children.length > 0;
+    if (hasChildren) {
+      buildHierarchyTree(node.children, node.pathList);
+    }
+  }
+  return menuTree;
+}
--- a/src/utils/watermark.ts
+++ b/src/utils/watermark.ts
@@ -0,0 +1,116 @@
+import {
+  ref,
+  Ref,
+  unref,
+  shallowRef,
+  onBeforeUnmount,
+  getCurrentInstance
+} from "vue";
+import { isDef } from "/@/utils/is";
+import { useRafThrottle } from "/@/utils/operate";
+import { addResizeListener, removeResizeListener } from "/@/utils/resize";
+
+const domSymbol = Symbol("watermark-dom");
+
+type attr = {
+  font?: string;
+  fillStyle?: string;
+};
+
+export function useWatermark(
+  appendEl: Ref<HTMLElement | null> = ref(document.body) as Ref<HTMLElement>
+) {
+  const func = useRafThrottle(function () {
+    const el = unref(appendEl);
+    if (!el) return;
+    const { clientHeight: height, clientWidth: width } = el;
+    updateWatermark({ height, width });
+  });
+  const id = domSymbol.toString();
+  const watermarkEl = shallowRef<HTMLElement>();
+
+  const clear = () => {
+    const domId = unref(watermarkEl);
+    watermarkEl.value = undefined;
+    const el = unref(appendEl);
+    if (!el) return;
+    domId && el.removeChild(domId);
+    removeResizeListener(el, func);
+  };
+
+  function createBase64(str: string, attr?: attr) {
+    const can = document.createElement("canvas");
+    const width = 300;
+    const height = 240;
+    Object.assign(can, { width, height });
+
+    const cans = can.getContext("2d");
+    if (cans) {
+      cans.rotate((-20 * Math.PI) / 120);
+      cans.font = attr?.font ?? "15px Reggae One";
+      cans.fillStyle = attr?.fillStyle ?? "rgba(0, 0, 0, 0.15)";
+      cans.textAlign = "left";
+      cans.textBaseline = "middle";
+      cans.fillText(str, width / 20, height);
+    }
+    return can.toDataURL("image/png");
+  }
+
+  function updateWatermark(
+    options: {
+      width?: number;
+      height?: number;
+      str?: string;
+      attr?: attr;
+    } = {}
+  ) {
+    const el = unref(watermarkEl);
+    if (!el) return;
+    if (isDef(options.width)) {
+      el.style.width = `${options.width}px`;
+    }
+    if (isDef(options.height)) {
+      el.style.height = `${options.height}px`;
+    }
+    if (isDef(options.str)) {
+      el.style.background = `url(${createBase64(
+        options.str,
+        options.attr
+      )}) left top repeat`;
+    }
+  }
+
+  const createWatermark = (str: string, attr?: attr) => {
+    if (unref(watermarkEl)) {
+      updateWatermark({ str, attr });
+      return id;
+    }
+    const div = document.createElement("div");
+    watermarkEl.value = div;
+    div.id = id;
+    div.style.pointerEvents = "none";
+    div.style.top = "0px";
+    div.style.left = "0px";
+    div.style.position = "absolute";
+    div.style.zIndex = "100000";
+    const el = unref(appendEl);
+    if (!el) return id;
+    const { clientHeight: height, clientWidth: width } = el;
+    updateWatermark({ str, width, height, attr });
+    el.appendChild(div);
+    return id;
+  };
+
+  function setWatermark(str: string, attr?: attr) {
+    createWatermark(str, attr);
+    addResizeListener(document.documentElement, func);
+    const instance = getCurrentInstance();
+    if (instance) {
+      onBeforeUnmount(() => {
+        clear();
+      });
+    }
+  }
+
+  return { setWatermark, clear };
+}
--- a/src/views/permission/page/index.vue
+++ b/src/views/permission/page/index.vue
@@ -7,6 +7,7 @@ export default {
 <script setup lang="ts">
 import { ref, unref } from "vue";
 import { storageSession } from "/@/utils/storage";
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";

 let purview = ref<string>(storageSession.getItem("info").username);

@@ -36,6 +37,11 @@ function changRole() {
        查看左侧菜单变化(系统管理)，模拟后台根据不同角色返回对应路由
      </p>
    </h4>
-    <el-button type="primary" @click="changRole">切换角色</el-button>
+    <el-button
+      type="primary"
+      @click="changRole"
+      :icon="useRenderIcon('user', { color: '#fff' })"
+      >切换角色</el-button
+    >
  </div>
 </template>
--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -1,18 +1,20 @@
 module.exports = {
  root: true,
  plugins: ["stylelint-order"],
+  customSyntax: "postcss-html",
  extends: ["stylelint-config-standard", "stylelint-config-prettier"],
  rules: {
+    "selector-class-pattern": null,
    "selector-pseudo-class-no-unknown": [
      true,
      {
-        ignorePseudoClasses: ["deep"]
+        ignorePseudoClasses: ["global"]
      }
    ],
    "selector-pseudo-element-no-unknown": [
      true,
      {
-        ignorePseudoElements: ["v-deep", ":deep"]
+        ignorePseudoElements: ["v-deep"]
      }
    ],
    "at-rule-no-unknown": [
@@ -65,5 +67,26 @@ module.exports = {
      { severity: "warning" }
    ]
  },
-  ignoreFiles: ["**/*.js", "**/*.jsx", "**/*.tsx", "**/*.ts", "**/*.json"]
+  ignoreFiles: ["**/*.js", "**/*.jsx", "**/*.tsx", "**/*.ts", "**/*.json"],
+  overrides: [
+    {
+      files: ["*.vue", "**/*.vue", "*.html", "**/*.html"],
+      extends: ["stylelint-config-recommended", "stylelint-config-html"],
+      rules: {
+        "keyframes-name-pattern": null,
+        "selector-pseudo-class-no-unknown": [
+          true,
+          {
+            ignorePseudoClasses: ["deep", "global"]
+          }
+        ],
+        "selector-pseudo-element-no-unknown": [
+          true,
+          {
+            ignorePseudoElements: ["v-deep", "v-global", "v-slotted"]
+          }
+        ]
+      }
+    }
+  ]
 };
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -16,6 +16,15 @@ declare module "vue" {
 }

 declare global {
+  const __APP_INFO__: {
+    pkg: {
+      name: string;
+      version: string;
+      dependencies: Recordable<string>;
+      devDependencies: Recordable<string>;
+    };
+    lastBuildTime: string;
+  };
  interface Window {
    // Global vue app instance
    __APP__: App<Element>;
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,4 +1,6 @@
+import dayjs from "dayjs";
 import { resolve } from "path";
+import pkg from "./package.json";
 import { warpperEnv, regExps } from "./build";
 import { getPluginsList } from "./build/plugins";
 import { UserConfigExport, ConfigEnv, loadEnv } from "vite";
@@ -19,6 +21,12 @@ const alias: Record<string, string> = {
  "vue-i18n": "vue-i18n/dist/vue-i18n.cjs.js"
 };

+const { dependencies, devDependencies, name, version } = pkg;
+const __APP_INFO__ = {
+  pkg: { dependencies, devDependencies, name, version },
+  lastBuildTime: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss")
+};
+
 export default ({ command, mode }: ConfigEnv): UserConfigExport => {
  const {
    VITE_PORT,
@@ -90,7 +98,8 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
      chunkSizeWarningLimit: 2000
    },
    define: {
-      __INTLIFY_PROD_DEVTOOLS__: false
+      __INTLIFY_PROD_DEVTOOLS__: false,
+      __APP_INFO__: JSON.stringify(__APP_INFO__)
    }
  };
 };
Author	SHA1	Message	Date
xiaoxian521	51fd06c6a1	perf: 同步精简版代码	2022-03-03 23:30:08 +08:00
xiaoxian521	4bb8647990	chore: update vite latest	2022-03-01 11:28:35 +08:00
xiaoxian521	a43d5ce865	perf: 同步精简版代码	2022-03-01 10:58:55 +08:00
xiaoxian521	aea8605a60	perf: 同步完整版代码	2022-02-28 22:33:56 +08:00
xiaoxian521	eb9d1e8238	perf: 同步完整版	2022-02-27 13:31:19 +08:00
xiaoxian521	138e0fd2e4	fix: delete routerView	2022-02-23 15:21:26 +08:00
xiaoxian521	526023e0b0	fix: axios type	2022-02-18 14:55:04 +08:00
xiaoxian521	885cbf2d9f	perf: 同步完整版分支代码	2022-02-18 11:52:12 +08:00
xiaoxian521	e161102495	perf: 同步完整版分支代码	2022-02-15 23:16:15 +08:00
xiaoxian521	5300781d05	docs: update	2022-02-10 13:15:53 +08:00
xiaoxian521	2e7e2ee3ce	fix: epThemeColor error	2022-02-10 13:00:48 +08:00
xiaoxian521	aa165ff70b	docs: update	2022-02-10 12:31:04 +08:00
xiaoxian521	b77ba43572	chore: update eslint@8.8.0	2022-02-07 16:20:22 +08:00
xiaoxian521	7cc69ac52d	chore: update element-plus@2.0.0	2022-02-07 13:53:59 +08:00
xiaoxian521	1b93ce989c	perf: 同步完整版分支代码	2022-02-05 17:42:39 +08:00
xiaoxian521	9e5fe5edbc	feat: add build report	2022-02-05 15:32:38 +08:00