release: update 3.2.0

.eslintrc.js

@@ -61,6 +61,18 @@ module.exports = {
     "@typescript-eslint/ban-ts-comment": "off",
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/no-non-null-assertion": "off",
+    "vue/html-self-closing": [
+      "error",
+      {
+        html: {
+          void: "always",
+          normal: "always",
+          component: "always"
+        },
+        svg: "always",
+        math: "always"
+      }
+    ],
     "@typescript-eslint/no-unused-vars": [
       "error",
       {

.vscode/extensions.json

@@ -1,6 +1,5 @@
 {
   "recommendations": [
-    "johnsoncodehk.vscode-typescript-vue-plugin",
     "voorjaar.windicss-intellisense",
     "vscode-icons-team.vscode-icons",
     "davidanson.vscode-markdownlint",

.vscode/settings.json

@@ -1,13 +1,9 @@
 {
   "editor.formatOnType": true,
   "editor.formatOnSave": true,
-  "javascript.updateImportsOnFileMove.enabled": "always",
   "[vue]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "[javascript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  },
   "editor.tabSize": 2,
   "editor.formatOnPaste": true,
   "files.autoSave": "afterDelay",
@@ -30,14 +26,12 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "i18n-ally.localesPaths": ["src/plugins/i18n"],
+  "i18n-ally.localesPaths": "locales",
   "i18n-ally.keystyle": "nested",
   "i18n-ally.sortKeys": true,
   "i18n-ally.namespace": true,
-  "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}",
-  "i18n-ally.enabledParsers": ["ts"],
+  "i18n-ally.enabledParsers": ["yaml", "js"],
   "i18n-ally.sourceLanguage": "en",
   "i18n-ally.displayLanguage": "zh-CN",
-  "i18n-ally.enabledFrameworks": ["vue", "react"]
+  "i18n-ally.enabledFrameworks": ["vue"]
 }

README.md

@@ -23,15 +23,15 @@
 
 ## 捐赠
 
-如果你觉得这个项目对你有帮助，你可以帮作者买一杯咖啡表示支持
+如果你觉得这个项目对您有帮助，可以帮作者买一杯果汁 🍹 表示支持
 
-<img src="http://yiming_chang.gitee.io/manages/pay.jpg" width="150px" height="150px" />
+<img src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f69bf13c5b854ed5b699807cafa0e3ce~tplv-k3u1fbpfcp-zoom-in-crop-mark:1304:0:0:0.awebp?" width="150px" height="150px" />
 
 ## QQ 交流群
 
 群里严禁`黄`、`赌`、`毒`、`vpn`等违法行为！
 
-<img src="http://yiming_chang.gitee.io/manages/qq.jpg" width="150px" height="225px" />
+<img src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f0697596aec84661b724f6eebdf8db17~tplv-k3u1fbpfcp-watermark.awebp?" width="150px" height="225px" />
 
 ## 用法
 
@@ -47,7 +47,7 @@ pnpm add 包名
 
 pnpm remove 包名
 
-我认为你应该先 fork 项目去开发，以便我更新时你可以同步拉取更新！！！
+我认为你应该先 fork 项目去开发，以便我更新时您可以同步拉取更新！！！
 
 ## ⚠️ 注意
 
@@ -56,3 +56,5 @@ pnpm remove 包名
 ## 许可证
 
 原则上不收取任何费用及版权，可以放心使用，不过如需二次开源（比如用此平台二次开发并开源）请联系作者获取许可！
+
+[MIT © xiaoxian521-2020](./LICENSE)

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)
+                )}）`
+              )
+            )
+          );
+        });
+      }
+    }
+  };
+}

build/plugins.ts

@@ -1,25 +1,35 @@
+import { resolve } from "path";
 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";
 import WindiCSS from "vite-plugin-windicss";
 import { viteMockServe } from "vite-plugin-mock";
 import liveReload from "vite-plugin-live-reload";
+import VueI18n from "@intlify/vite-plugin-vue-i18n";
 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";
+import themePreprocessorPlugin from "@pureadmin/theme";
 
 export function getPluginsList(command, VITE_LEGACY) {
   const prodMock = true;
   const lifecycle = process.env.npm_lifecycle_event;
   return [
     vue(),
+    // https://github.com/intlify/bundle-tools/tree/main/packages/vite-plugin-vue-i18n
+    VueI18n({
+      runtimeOnly: true,
+      compositionOnly: true,
+      include: [resolve("locales/**")]
+    }),
     // jsx、tsx语法支持
     vueJsx(),
     WindiCSS(),
     // 线上环境删除console
     removeConsole(),
+    viteBuildInfo(),
     // 修改layout文件夹下的文件时自动重载浏览器 解决 https://github.com/xiaoxian521/vue-pure-admin/issues/170
     liveReload(["src/layout/**/*", "src/router/**/*"]),
     // 自定义主题

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>

locales/en.yaml

@@ -0,0 +1,30 @@
+buttons:
+  hsLoginOut: LoginOut
+  hsfullscreen: FullScreen
+  hsexitfullscreen: ExitFullscreen
+  hsrefreshRoute: RefreshRoute
+  hslogin: Login
+  hsadd: Add
+  hsmark: Mark/Cancel
+  hssave: Save
+  hssearch: Search
+  hsexpendAll: Expand All
+  hscollapseAll: Collapse All
+  hssystemSet: Open ProjectConfig
+  hsdelete: Delete
+  hsreload: Reload
+  hscloseCurrentTab: Close CurrentTab
+  hscloseLeftTabs: Close LeftTabs
+  hscloseRightTabs: Close RightTabs
+  hscloseOtherTabs: Close OtherTabs
+  hscloseAllTabs: Close AllTabs
+menus:
+  hshome: Home
+  hslogin: Login
+  hserror: Error Page
+  hsfourZeroFour: "404"
+  hsfourZeroOne: "403"
+  hsFive: "500"
+  permission: Permission Manage
+  permissionPage: Page Permission
+  permissionButton: Button Permission

locales/zh-CN.yaml

@@ -0,0 +1,30 @@
+buttons:
+  hsLoginOut: 退出系统
+  hsfullscreen: 全屏
+  hsexitfullscreen: 退出全屏
+  hsrefreshRoute: 刷新路由
+  hslogin: 登陆
+  hsadd: 新增
+  hsmark: 标记/取消
+  hssave: 保存
+  hssearch: 搜索
+  hsexpendAll: 全部展开
+  hscollapseAll: 全部折叠
+  hssystemSet: 打开项目配置
+  hsdelete: 删除
+  hsreload: 重新加载
+  hscloseCurrentTab: 关闭当前标签页
+  hscloseLeftTabs: 关闭左侧标签页
+  hscloseRightTabs: 关闭右侧标签页
+  hscloseOtherTabs: 关闭其他标签页
+  hscloseAllTabs: 关闭全部标签页
+menus:
+  hshome: 首页
+  hslogin: 登陆
+  hserror: 错误页面
+  hsfourZeroFour: "404"
+  hsfourZeroOne: "403"
+  hsFive: "500"
+  permission: 权限管理
+  permissionPage: 页面权限
+  permissionButton: 按钮权限

mock/asyncRoutes.ts

@@ -3,13 +3,12 @@ import { MockMethod } from "vite-plugin-mock";
 
 const permissionRouter = {
   path: "/permission",
-  name: "permission",
   redirect: "/permission/page/index",
   meta: {
     title: "menus.permission",
     icon: "lollipop",
     i18n: true,
-    rank: 3
+    rank: 7
   },
   children: [
     {

package.json

@@ -1,11 +1,7 @@
 {
   "name": "pure-admin-thin",
-  "version": "3.0",
+  "version": "3.2.0",
   "private": true,
-  "engines": {
-    "node": ">= 16",
-    "pnpm": ">= 6"
-  },
   "scripts": {
     "dev": "cross-env --max_old_space_size=4096 vite",
     "serve": "pnpm dev",
@@ -30,28 +26,32 @@
   ],
   "dependencies": {
     "@ctrl/tinycolor": "^3.4.0",
-    "@vueuse/core": "^7.6.2",
+    "@pureadmin/components": "^1.0.2",
+    "@vueuse/core": "^8.0.1",
     "@vueuse/motion": "^2.0.0-beta.9",
-    "@vueuse/shared": "^7.6.2",
+    "@vueuse/shared": "^8.0.1",
     "animate.css": "^4.1.1",
-    "axios": "^0.25.0",
+    "axios": "^0.26.1",
     "css-color-function": "^1.3.3",
-    "element-plus": "^2.0.2",
+    "dayjs": "^1.11.0",
+    "element-plus": "^2.1.4",
     "element-resize-detector": "^1.2.3",
     "js-cookie": "^3.0.1",
+    "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
+    "lodash-unified": "^1.0.2",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
-    "pinia": "^2.0.11",
+    "pinia": "^2.0.12",
     "qs": "^6.10.2",
     "resize-observer-polyfill": "^1.5.1",
     "responsive-storage": "^1.0.11",
     "rgb-hex": "^4.0.0",
     "vue": "^3.2.31",
-    "vue-i18n": "^9.2.0-beta.30",
-    "vue-router": "^4.0.12",
+    "vue-i18n": "^9.2.0-beta.32",
+    "vue-router": "^4.0.14",
     "vue-types": "^4.1.1"
   },
   "devDependencies": {
@@ -61,9 +61,13 @@
     "@iconify-icons/fa": "^1.1.1",
     "@iconify-icons/fa-solid": "^1.1.2",
     "@iconify-icons/ri": "^1.1.1",
-    "@iconify/vue": "^3.1.3",
+    "@iconify/vue": "^3.1.4",
+    "@intlify/vite-plugin-vue-i18n": "^3.3.1",
+    "@pureadmin/theme": "^0.0.1",
     "@types/element-resize-detector": "1.1.3",
     "@types/js-cookie": "^3.0.1",
+    "@types/lodash": "^4.14.180",
+    "@types/lodash-es": "^4.17.6",
     "@types/mockjs": "1.0.3",
     "@types/node": "14.14.14",
     "@types/nprogress": "0.2.0",
@@ -71,11 +75,10 @@
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
     "@vitejs/plugin-legacy": "^1.7.1",
-    "@vitejs/plugin-vue": "^2.2.0",
-    "@vitejs/plugin-vue-jsx": "^1.3.7",
+    "@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": "^8.8.0",
@@ -83,6 +86,7 @@
     "eslint-plugin-vue": "^8.4.1",
     "husky": "7.0.2",
     "lint-staged": "11.1.2",
+    "picocolors": "^1.0.0",
     "postcss": "^8.4.6",
     "postcss-html": "^1.3.0",
     "postcss-import": "14.0.0",
@@ -90,26 +94,26 @@
     "prettier": "^2.5.1",
     "pretty-quick": "3.1.1",
     "rimraf": "3.0.2",
-    "rollup-plugin-visualizer": "^5.5.4",
-    "sass": "^1.49.0",
-    "sass-loader": "^12.4.0",
+    "rollup": "^2.70.1",
+    "rollup-plugin-visualizer": "^5.6.0",
+    "sass": "^1.49.9",
     "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",
+    "typescript": "^4.6.2",
+    "unplugin-element-plus": "^0.3.2",
+    "vite": "^2.9.0-beta.4",
     "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.7.0",
+    "vite-plugin-windicss": "^1.8.3",
     "vite-svg-loader": "2.2.0",
     "vue-eslint-parser": "^8.2.0",
-    "windicss": "^3.4.3"
+    "windicss": "^3.5.1"
   },
   "repository": "git@github.com:xiaoxian521/vue-pure-admin.git",
   "author": "xiaoxian521",

public/serverConfig.json

@@ -1,5 +1,5 @@
 {
-  "Version": "3.0",
+  "Version": "3.2.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,

src/assets/svg/enter_outlined.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--ant-design" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 1024 1024"><path fill="currentColor" d="M864 170h-60c-4.4 0-8 3.6-8 8v518H310v-73c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 0 0 0 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-75h498c35.3 0 64-28.7 64-64V178c0-4.4-3.6-8-8-8z"></path></svg>

src/assets/svg/mdi_keyboard_esc.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--mdi" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><path fill="currentColor" d="M1 7h6v2H3v2h4v2H3v2h4v2H1V7m10 0h4v2h-4v2h2a2 2 0 0 1 2 2v2c0 1.11-.89 2-2 2H9v-2h4v-2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2m8 0h2a2 2 0 0 1 2 2v1h-2V9h-2v6h2v-1h2v1c0 1.11-.89 2-2 2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2Z"></path></svg>

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
         });
       }
     });

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -24,6 +24,10 @@ import Location from "@iconify-icons/ep/location";
 import Tickets from "@iconify-icons/ep/tickets";
 import OfficeBuilding from "@iconify-icons/ep/office-building";
 import Notebook from "@iconify-icons/ep/notebook";
+import Rank from "@iconify-icons/ep/rank";
+import videoPlay from "@iconify-icons/ep/video-play";
+import Monitor from "@iconify-icons/ep/monitor";
+import Search from "@iconify-icons/ep/search";
 addIcon("check", Check);
 addIcon("menu", Menu);
 addIcon("home-filled", HomeFilled);
@@ -46,14 +50,36 @@ addIcon("location", Location);
 addIcon("tickets", Tickets);
 addIcon("office-building", OfficeBuilding);
 addIcon("notebook", Notebook);
+addIcon("video-play", videoPlay);
+addIcon("rank", Rank);
+addIcon("monitor", Monitor);
+addIcon("search", Search);
 
 // remixicon
 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";
+import ubuntuFill from "@iconify-icons/ri/ubuntu-fill";
+import questionLine from "@iconify-icons/ri/question-line";
+import checkboxCircleLine from "@iconify-icons/ri/checkbox-circle-line";
+import informationLine from "@iconify-icons/ri/information-line";
+import closeCircleLine from "@iconify-icons/ri/close-circle-line";
+import arrowUpLine from "@iconify-icons/ri/arrow-up-line";
+import arrowDownLine from "@iconify-icons/ri/arrow-down-line";
+import bookmark2Line from "@iconify-icons/ri/bookmark-2-line";
 addIcon("arrow-right-s-line", arrowRightSLine);
 addIcon("arrow-left-s-line", arrowLeftSLine);
 addIcon("logout-circle-r-line", logoutCircleRLine);
+addIcon("node-tree", nodeTree);
+addIcon("ubuntu-fill", ubuntuFill);
+addIcon("question-line", questionLine);
+addIcon("checkbox-circle-line", checkboxCircleLine);
+addIcon("information-line", informationLine);
+addIcon("close-circle-line", closeCircleLine);
+addIcon("arrow-up-line", arrowUpLine);
+addIcon("arrow-down-line", arrowDownLine);
+addIcon("bookmark-2-line", bookmark2Line);
 
 // Font Awesome 4
 import faUser from "@iconify-icons/fa/user";

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;
+}

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";
 

src/layout/components/navbar.vue

@@ -2,6 +2,7 @@
 import { useI18n } from "vue-i18n";
 import { useNav } from "../hooks/nav";
 import { useRoute } from "vue-router";
+import Search from "./search/index.vue";
 import Notice from "./notice/index.vue";
 import mixNav from "./sidebar/mixNav.vue";
 import avatars from "/@/assets/avatars.jpg";
@@ -13,7 +14,7 @@ import screenfull from "../components/screenfull/index.vue";
 import globalization from "/@/assets/svg/globalization.svg?component";
 
 const route = useRoute();
-const { locale } = useI18n();
+const { locale, t } = useI18n();
 const instance =
   getCurrentInstance().appContext.config.globalProperties.$storage;
 const {
@@ -58,6 +59,8 @@ function translationEn() {
     <mixNav v-if="pureApp.layout === 'mix'" />
 
     <div v-if="pureApp.layout === 'vertical'" class="vertical-header-right">
+      <!-- 菜单搜索 -->
+      <Search />
       <!-- 通知 -->
       <Notice id="header-notice" />
       <!-- 全屏 -->
@@ -79,10 +82,11 @@ function translationEn() {
             <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
             >
+              <span class="check-en" v-show="locale === 'en'">
+                <IconifyIconOffline icon="check" /> </span
+              >English
+            </el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
@@ -98,18 +102,18 @@ function translationEn() {
               <IconifyIconOffline
                 icon="logout-circle-r-line"
                 style="margin: 5px"
-              />{{ $t("buttons.hsLoginOut") }}</el-dropdown-item
+              />{{ t("buttons.hsLoginOut") }}</el-dropdown-item
             >
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <el-icon
+      <span
         class="el-icon-setting"
-        :title="$t('buttons.hssystemSet')"
+        :title="t('buttons.hssystemSet')"
         @click="onPanel"
       >
         <IconifyIconOffline icon="setting" />
-      </el-icon>
+      </span>
     </div>
   </div>
 </template>

src/layout/components/notice/index.vue

@@ -1,8 +1,11 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import NoticeList from "./noticeList.vue";
 import { noticesData } from "./data";
+import NoticeList from "./noticeList.vue";
+import { templateRef } from "@vueuse/core";
+import { Tabs, TabPane } from "@pureadmin/components";
 
+const dropdownDom = templateRef<ElRef | null>("dropdownDom", null);
 const activeName = ref(noticesData[0].name);
 const notices = ref(noticesData);
 
@@ -10,38 +13,51 @@ let noticesNum = ref(0);
 notices.value.forEach(notice => {
   noticesNum.value += notice.list.length;
 });
+
+function tabClick() {
+  // @ts-expect-error
+  dropdownDom.value.handleOpen();
+}
 </script>
 
 <template>
-  <el-dropdown trigger="click" placement="bottom-end">
+  <el-dropdown ref="dropdownDom" trigger="click" placement="bottom-end">
     <span class="dropdown-badge">
       <el-badge :value="noticesNum" :max="99">
-        <el-icon class="header-notice-icon"
-          ><IconifyIconOffline icon="bell"
-        /></el-icon>
+        <span class="header-notice-icon">
+          <IconifyIconOffline icon="bell" />
+        </span>
       </el-badge>
     </span>
     <template #dropdown>
       <el-dropdown-menu>
-        <el-tabs v-model="activeName" class="dropdown-tabs">
-          <template v-for="item in notices" :key="item.key">
-            <el-tab-pane
-              :label="`${item.name}(${item.list.length})`"
-              :name="item.name"
+        <Tabs
+          centered
+          class="dropdown-tabs"
+          v-model:activeName="activeName"
+          @tabClick="tabClick"
         >
+          <template v-for="item in notices" :key="item.key">
+            <TabPane :tab="`${item.name}(${item.list.length})`">
               <el-scrollbar max-height="330px">
                 <div class="noticeList-container">
                   <NoticeList :list="item.list" />
                 </div>
               </el-scrollbar>
-            </el-tab-pane>
+            </TabPane>
           </template>
-        </el-tabs>
+        </Tabs>
       </el-dropdown-menu>
     </template>
   </el-dropdown>
 </template>
 
+<style>
+.ant-tabs-dropdown {
+  z-index: 2900 !important;
+}
+</style>
+
 <style lang="scss" scoped>
 .dropdown-badge {
   display: flex;
@@ -79,4 +95,8 @@ notices.value.forEach(notice => {
     padding: 15px 24px 0 24px;
   }
 }
+
+:deep(.ant-tabs-nav) {
+  margin-bottom: 0;
+}
 </style>

src/layout/components/notice/noticeItem.vue

@@ -10,8 +10,8 @@ const props = defineProps({
 });
 
 const titleRef = ref(null);
-const descriptionRef = ref(null);
 const titleTooltip = ref(false);
+const descriptionRef = ref(null);
 const descriptionTooltip = ref(false);
 
 function hoverTitle() {
@@ -50,7 +50,7 @@ function hoverDescription(event, description) {
       :size="30"
       :src="props.noticeItem.avatar"
       class="notice-container-avatar"
-    ></el-avatar>
+    />
     <div class="notice-container-text">
       <div class="notice-text-title">
         <el-tooltip

src/layout/components/notice/noticeList.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { PropType } from "vue";
-import NoticeItem from "./noticeItem.vue";
 import { ListItem } from "./data";
+import NoticeItem from "./noticeItem.vue";
 
 const props = defineProps({
   list: {
@@ -17,7 +17,7 @@ const props = defineProps({
       v-for="(item, index) in props.list"
       :noticeItem="item"
       :key="index"
-    ></NoticeItem>
+    />
   </div>
-  <el-empty v-else description="暂无数据"></el-empty>
+  <el-empty v-else description="暂无数据" />
 </template>

src/layout/components/panel/index.vue

@@ -26,7 +26,7 @@ emitter.on("openPanel", () => {
             <IconifyIconOffline icon="close" />
           </el-icon>
         </div>
-        <div style="border-bottom: 1px solid #dcdfe6"></div>
+        <div style="border-bottom: 1px solid #dcdfe6" />
         <slot />
       </div>
     </div>

src/layout/components/screenfull/index.vue

@@ -1,5 +1,8 @@
 <script setup lang="ts">
 import { useFullscreen } from "@vueuse/core";
+import { useI18n } from "vue-i18n";
+
+const { t } = useI18n();
 const { isFullscreen, toggle } = useFullscreen();
 </script>
 
@@ -7,9 +10,7 @@ const { isFullscreen, toggle } = useFullscreen();
   <div class="screen-full" @click="toggle">
     <FontIcon
       :title="
-        isFullscreen
-          ? $t('buttons.hsexitfullscreen')
-          : $t('buttons.hsfullscreen')
+        isFullscreen ? t('buttons.hsexitfullscreen') : t('buttons.hsfullscreen')
       "
       :icon="isFullscreen ? 'team-iconexit-fullscreen' : 'team-iconfullscreen'"
     />

src/layout/components/search/components/SearchFooter.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="search-footer">
+    <span class="search-footer-item">
+      <enterOutlined class="icon" />
+      确认
+    </span>
+    <span class="search-footer-item">
+      <IconifyIconOffline icon="arrow-up-line" class="icon" />
+      <IconifyIconOffline icon="arrow-down-line" class="icon" />
+      切换
+    </span>
+    <span class="search-footer-item">
+      <mdiKeyboardEsc class="icon" />
+      关闭
+    </span>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import enterOutlined from "/@/assets/svg/enter_outlined.svg?component";
+import mdiKeyboardEsc from "/@/assets/svg/mdi_keyboard_esc.svg?component";
+</script>
+<style lang="scss" scoped>
+.search-footer {
+  display: flex;
+  color: #333;
+
+  .search-footer-item {
+    display: flex;
+    align-items: center;
+    margin-right: 14px;
+  }
+
+  .icon {
+    padding: 2px;
+    margin-right: 3px;
+    font-size: 20px;
+    box-shadow: inset 0 -2px #cdcde6, inset 0 0 1px 1px #fff,
+      0 1px 2px 1px #1e235a66;
+  }
+}
+</style>

src/layout/components/search/components/SearchModal.vue

@@ -0,0 +1,165 @@
+<script lang="ts" setup>
+import { useRouter } from "vue-router";
+import SearchResult from "./SearchResult.vue";
+import SearchFooter from "./SearchFooter.vue";
+import { deleteChildren } from "/@/utils/tree";
+import { transformI18n } from "/@/plugins/i18n";
+import { useDebounceFn, onKeyStroke } from "@vueuse/core";
+import { ref, watch, computed, nextTick, shallowRef } from "vue";
+import { usePermissionStoreHook } from "/@/store/modules/permission";
+
+interface Props {
+  /** 弹窗显隐 */
+  value: boolean;
+}
+
+interface Emits {
+  (e: "update:value", val: boolean): void;
+}
+
+const emit = defineEmits<Emits>();
+const props = withDefaults(defineProps<Props>(), {});
+const router = useRouter();
+
+const keyword = ref("");
+const activePath = ref("");
+const inputRef = ref<HTMLInputElement | null>(null);
+const resultOptions = shallowRef([]);
+const handleSearch = useDebounceFn(search, 300);
+
+/** 菜单树形结构 */
+const menusData = computed(() => {
+  return deleteChildren(usePermissionStoreHook().menusTree);
+});
+
+const show = computed({
+  get() {
+    return props.value;
+  },
+  set(val: boolean) {
+    emit("update:value", val);
+  }
+});
+
+watch(show, async val => {
+  if (val) {
+    /** 自动聚焦 */
+    await nextTick();
+    inputRef.value?.focus();
+  }
+});
+
+/** 将菜单树形结构扁平化为一维数组，用于菜单查询 */
+function flatTree(arr) {
+  const res = [];
+  function deep(arr) {
+    arr.forEach(item => {
+      res.push(item);
+      item.children && deep(item.children);
+    });
+  }
+  deep(arr);
+  return res;
+}
+
+/** 查询 */
+function search() {
+  const flatMenusData = flatTree(menusData.value);
+  resultOptions.value = flatMenusData.filter(
+    menu =>
+      keyword.value &&
+      transformI18n(menu.meta?.title, menu.meta?.i18n)
+        .toLocaleLowerCase()
+        .includes(keyword.value.toLocaleLowerCase().trim())
+  );
+  if (resultOptions.value?.length > 0) {
+    activePath.value = resultOptions.value[0].path;
+  } else {
+    activePath.value = "";
+  }
+}
+
+function handleClose() {
+  show.value = false;
+  /** 延时处理防止用户看到某些操作 */
+  setTimeout(() => {
+    resultOptions.value = [];
+    keyword.value = "";
+  }, 200);
+}
+
+/** key up */
+function handleUp() {
+  const { length } = resultOptions.value;
+  if (length === 0) return;
+  const index = resultOptions.value.findIndex(
+    item => item.path === activePath.value
+  );
+  if (index === 0) {
+    activePath.value = resultOptions.value[length - 1].path;
+  } else {
+    activePath.value = resultOptions.value[index - 1].path;
+  }
+}
+
+/** key down */
+function handleDown() {
+  const { length } = resultOptions.value;
+  if (length === 0) return;
+  const index = resultOptions.value.findIndex(
+    item => item.path === activePath.value
+  );
+  if (index + 1 === length) {
+    activePath.value = resultOptions.value[0].path;
+  } else {
+    activePath.value = resultOptions.value[index + 1].path;
+  }
+}
+
+/** key enter */
+function handleEnter() {
+  const { length } = resultOptions.value;
+  if (length === 0 || activePath.value === "") return;
+  router.push(activePath.value);
+  handleClose();
+}
+
+onKeyStroke("Enter", handleEnter);
+onKeyStroke("ArrowUp", handleUp);
+onKeyStroke("ArrowDown", handleDown);
+</script>
+
+<template>
+  <el-dialog top="5vh" v-model="show" :before-close="handleClose">
+    <el-input
+      ref="inputRef"
+      v-model="keyword"
+      clearable
+      placeholder="请输入关键词搜索"
+      @input="handleSearch"
+    >
+      <template #prefix>
+        <span class="el-input__icon">
+          <IconifyIconOffline icon="search" />
+        </span>
+      </template>
+    </el-input>
+    <div class="search-result-container">
+      <el-empty v-if="resultOptions.length === 0" description="暂无搜索结果" />
+      <SearchResult
+        v-else
+        v-model:value="activePath"
+        :options="resultOptions"
+        @click="handleEnter"
+      />
+    </div>
+    <template #footer>
+      <SearchFooter />
+    </template>
+  </el-dialog>
+</template>
+<style lang="scss" scoped>
+.search-result-container {
+  margin-top: 20px;
+}
+</style>

src/layout/components/search/components/SearchResult.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="result">
+    <template v-for="item in options" :key="item.path">
+      <div
+        class="result-item"
+        :style="{
+          background:
+            item?.path === active ? useEpThemeStoreHook().epThemeColor : '',
+          color: item.path === active ? '#fff' : ''
+        }"
+        @click="handleTo"
+        @mouseenter="handleMouse(item)"
+      >
+        <component :is="useRenderIcon(item.meta?.icon ?? 'bookmark-2-line')" />
+        <span class="result-item-title">{{ t(item.meta?.title) }}</span>
+        <enterOutlined />
+      </div>
+    </template>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useI18n } from "vue-i18n";
+import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import enterOutlined from "/@/assets/svg/enter_outlined.svg?component";
+
+const { t } = useI18n();
+
+interface optionsItem {
+  path: string;
+  meta?: {
+    icon?: string;
+    title?: string;
+  };
+}
+
+interface Props {
+  value: string;
+  options: Array<optionsItem>;
+}
+
+interface Emits {
+  (e: "update:value", val: string): void;
+  (e: "enter"): void;
+}
+
+const props = withDefaults(defineProps<Props>(), {});
+const emit = defineEmits<Emits>();
+
+const active = computed({
+  get() {
+    return props.value;
+  },
+  set(val: string) {
+    emit("update:value", val);
+  }
+});
+
+/** 鼠标移入 */
+async function handleMouse(item) {
+  active.value = item.path;
+}
+
+function handleTo() {
+  emit("enter");
+}
+</script>
+<style lang="scss" scoped>
+.result {
+  padding-bottom: 12px;
+
+  &-item {
+    display: flex;
+    align-items: center;
+    height: 56px;
+    margin-top: 8px;
+    padding: 14px;
+    border-radius: 4px;
+    background: #e5e7eb;
+    cursor: pointer;
+
+    &-title {
+      display: flex;
+      flex: 1;
+      margin-left: 5px;
+    }
+  }
+}
+</style>

src/layout/components/search/components/index.ts

@@ -0,0 +1,3 @@
+import SearchModal from "./SearchModal.vue";
+
+export { SearchModal };

src/layout/components/search/index.vue

@@ -0,0 +1,30 @@
+<script lang="ts" setup>
+import { SearchModal } from "./components";
+import useBoolean from "../../hooks/useBoolean";
+const { bool: show, toggle } = useBoolean();
+function handleSearch() {
+  toggle();
+}
+</script>
+
+<template>
+  <div class="search-container" @click="handleSearch">
+    <IconifyIconOffline icon="search" />
+  </div>
+  <SearchModal v-model:value="show" />
+</template>
+
+<style lang="scss" scoped>
+.search-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 48px;
+  width: 40px;
+  cursor: pointer;
+
+  &:hover {
+    background: #f6f6f6;
+  }
+}
+</style>

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";
@@ -24,7 +24,7 @@ import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
 import { storageLocal, storageSession } from "/@/utils/storage";
 import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
 import { createNewStyle, writeNewStyle } from "../../theme/element-plus";
-import { toggleTheme } from "@zougt/vite-plugin-theme-preprocessor/dist/browser-utils";
+import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
 
 import dayIcon from "/@/assets/svg/day.svg?component";
 import darkIcon from "/@/assets/svg/dark.svg?component";
@@ -111,7 +111,7 @@ function storageConfigureChange<T>(key: string, val: T): void {
 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;
 }
 
@@ -316,8 +316,7 @@ nextTick(() => {
       :active-icon="dayIcon"
       :inactive-icon="darkIcon"
       @change="dataThemeChange"
-    >
-    </el-switch>
+    />
 
     <el-divider>导航栏模式</el-divider>
     <ul class="pure-theme">
@@ -327,8 +326,8 @@ nextTick(() => {
           ref="verticalRef"
           @click="setLayoutModel('vertical')"
         >
-          <div></div>
-          <div></div>
+          <div />
+          <div />
         </li>
       </el-tooltip>
 
@@ -338,8 +337,8 @@ nextTick(() => {
           ref="horizontalRef"
           @click="setLayoutModel('horizontal')"
         >
-          <div></div>
-          <div></div>
+          <div />
+          <div />
         </li>
       </el-tooltip>
 
@@ -349,8 +348,8 @@ nextTick(() => {
           ref="mixRef"
           @click="setLayoutModel('mix')"
         >
-          <div></div>
-          <div></div>
+          <div />
+          <div />
         </li>
       </el-tooltip>
     </ul>
@@ -384,8 +383,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="greyChange"
-        >
-        </el-switch>
+        />
       </li>
       <li v-show="!dataTheme">
         <span>色弱模式</span>
@@ -396,8 +394,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="weekChange"
-        >
-        </el-switch>
+        />
       </li>
       <li>
         <span>隐藏标签页</span>
@@ -408,8 +405,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="tagsChange"
-        >
-        </el-switch>
+        />
       </li>
       <li>
         <span>侧边栏Logo</span>
@@ -422,8 +418,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="logoChange"
-        >
-        </el-switch>
+        />
       </li>
       <li>
         <span>标签页持久化</span>
@@ -434,8 +429,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="multiTagsCacheChange"
-        >
-        </el-switch>
+        />
       </li>
 
       <li>

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";

src/layout/components/sidebar/horizontal.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
 import { useNav } from "../../hooks/nav";
+import Search from "../search/index.vue";
 import Notice from "../notice/index.vue";
 import { templateRef } from "@vueuse/core";
 import SidebarItem from "./sidebarItem.vue";
@@ -13,7 +14,7 @@ import { usePermissionStoreHook } from "/@/store/modules/permission";
 import globalization from "/@/assets/svg/globalization.svg?component";
 
 const route = useRoute();
-const { locale } = useI18n();
+const { locale, t } = useI18n();
 const routers = useRouter().options.routes;
 const menuRef = templateRef<ElRef | null>("menu", null);
 const instance =
@@ -45,6 +46,13 @@ watch(
   }
 );
 
+watch(
+  () => route.path,
+  () => {
+    menuSelect(route.path, routers);
+  }
+);
+
 function translationCh() {
   instance.locale = { locale: "zh" };
   locale.value = "zh";
@@ -61,11 +69,7 @@ function translationEn() {
 <template>
   <div class="horizontal-header">
     <div class="horizontal-header-left" @click="backHome">
-      <FontIcon
-        icon="team-iconlogo"
-        svg
-        style="width: 35px; height: 35px"
-      ></FontIcon>
+      <FontIcon icon="team-iconlogo" svg style="width: 35px; height: 35px" />
       <h4>{{ title }}</h4>
     </div>
     <el-menu
@@ -84,6 +88,8 @@ function translationEn() {
       />
     </el-menu>
     <div class="horizontal-header-right">
+      <!-- 菜单搜索 -->
+      <Search />
       <!-- 通知 -->
       <Notice id="header-notice" />
       <!-- 全屏 -->
@@ -96,15 +102,17 @@ function translationEn() {
             <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
             >
+              <span class="check-zh" v-show="locale === 'zh'">
+                <IconifyIconOffline icon="check" /> </span
+              >简体中文
+            </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
+            >
+              <span class="check-en" v-show="locale === 'en'">
+                <IconifyIconOffline icon="check" /> </span
               >English</el-dropdown-item
             >
           </el-dropdown-menu>
@@ -123,18 +131,18 @@ function translationEn() {
                 icon="logout-circle-r-line"
                 style="margin: 5px"
               />
-              {{ $t("buttons.hsLoginOut") }}</el-dropdown-item
+              {{ t("buttons.hsLoginOut") }}</el-dropdown-item
             >
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <el-icon
+      <span
         class="el-icon-setting"
-        :title="$t('buttons.hssystemSet')"
+        :title="t('buttons.hssystemSet')"
         @click="onPanel"
       >
         <IconifyIconOffline icon="setting" />
-      </el-icon>
+      </span>
     </div>
   </div>
 </template>

src/layout/components/sidebar/logo.vue

@@ -18,11 +18,7 @@ const title =
         class="sidebar-logo-link"
         to="/"
       >
-        <FontIcon
-          icon="team-iconlogo"
-          svg
-          style="width: 35px; height: 35px"
-        ></FontIcon>
+        <FontIcon icon="team-iconlogo" svg style="width: 35px; height: 35px" />
         <span class="sidebar-title">{{ title }}</span>
       </router-link>
       <router-link
@@ -32,11 +28,7 @@ const title =
         class="sidebar-logo-link"
         to="/"
       >
-        <FontIcon
-          icon="team-iconlogo"
-          svg
-          style="width: 35px; height: 35px"
-        ></FontIcon>
+        <FontIcon icon="team-iconlogo" svg style="width: 35px; height: 35px" />
         <span class="sidebar-title">{{ title }}</span>
       </router-link>
     </transition>

src/layout/components/sidebar/mixNav.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
+import Search from "../search/index.vue";
 import Notice from "../notice/index.vue";
 import { useNav } from "../../hooks/nav";
 import { templateRef } from "@vueuse/core";
@@ -16,7 +17,7 @@ import globalization from "/@/assets/svg/globalization.svg?component";
 import { ref, watch, nextTick, onMounted, getCurrentInstance } from "vue";
 
 const route = useRoute();
-const { locale } = useI18n();
+const { locale, t } = useI18n();
 const routers = useRouter().options.routes;
 const menuRef = templateRef<ElRef | null>("menu", null);
 const instance =
@@ -118,11 +119,9 @@ function translationEn() {
         :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>
+          <div v-show="route.meta.icon" :class="['el-icon', route.meta.icon]">
+            <component :is="useRenderIcon(route.meta && route.meta.icon)" />
+          </div>
           <span>{{ transformI18n(route.meta.title, route.meta.i18n) }}</span>
           <FontIcon
             v-if="route.meta.extraIcon"
@@ -131,11 +130,13 @@ function translationEn() {
             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">
+      <!-- 菜单搜索 -->
+      <Search />
       <!-- 通知 -->
       <Notice id="header-notice" />
       <!-- 全屏 -->
@@ -148,15 +149,15 @@ function translationEn() {
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'zh')"
               @click="translationCh"
-              ><el-icon class="check-zh" v-show="locale === 'zh'"
-                ><IconifyIconOffline icon="check" /></el-icon
+              ><span class="check-zh" v-show="locale === 'zh'"
+                ><IconifyIconOffline icon="check" /></span
               >简体中文</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
+              ><span class="check-en" v-show="locale === 'en'"
+                ><IconifyIconOffline icon="check" /></span
               >English</el-dropdown-item
             >
           </el-dropdown-menu>
@@ -175,18 +176,18 @@ function translationEn() {
                 icon="logout-circle-r-line"
                 style="margin: 5px"
               />
-              {{ $t("buttons.hsLoginOut") }}</el-dropdown-item
+              {{ t("buttons.hsLoginOut") }}</el-dropdown-item
             >
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <el-icon
+      <span
         class="el-icon-setting"
-        :title="$t('buttons.hssystemSet')"
+        :title="t('buttons.hssystemSet')"
         @click="onPanel"
       >
         <IconifyIconOffline icon="setting" />
-      </el-icon>
+      </span>
     </div>
   </div>
 </template>

src/layout/components/sidebar/sidebarItem.vue

@@ -111,6 +111,10 @@ function hasOneShowingChild(
     return true;
   });
 
+  if (showingChildren[0]?.meta?.showParent) {
+    return false;
+  }
+
   if (showingChildren.length === 1) {
     return true;
   }
@@ -144,7 +148,7 @@ function resolvePath(routePath) {
       :class="{ 'submenu-title-noDropdown': !isNest }"
       :style="getNoDropdownStyle"
     >
-      <el-icon v-show="props.item.meta.icon">
+      <div class="el-icon" v-show="props.item.meta.icon">
         <component
           :is="
             useRenderIcon(
@@ -152,8 +156,8 @@ function resolvePath(routePath) {
                 (props.item.meta && props.item.meta.icon)
             )
           "
-        ></component>
-      </el-icon>
+        />
+      </div>
       <div
         v-if="
           !pureApp.sidebar.opened &&
@@ -199,7 +203,7 @@ function resolvePath(routePath) {
             :style="getExtraIconStyle"
             :icon="onlyOneChild.meta.extraIcon.name"
             :svg="onlyOneChild.meta.extraIcon.svg ? true : false"
-          ></FontIcon>
+          />
         </div>
       </template>
     </el-menu-item>
@@ -212,11 +216,14 @@ function resolvePath(routePath) {
     popper-append-to-body
   >
     <template #title>
-      <el-icon v-show="props.item.meta.icon" :class="props.item.meta.icon">
+      <div
+        v-show="props.item.meta.icon"
+        :class="['el-icon', props.item.meta.icon]"
+      >
         <component
           :is="useRenderIcon(props.item.meta && props.item.meta.icon)"
-        ></component>
-      </el-icon>
+        />
+      </div>
       <span v-if="!menuMode">{{
         transformI18n(props.item.meta.title, props.item.meta.i18n)
       }}</span>
@@ -246,7 +253,7 @@ function resolvePath(routePath) {
         style="position: absolute; right: 10px"
         :icon="props.item.meta.extraIcon.name"
         :svg="props.item.meta.extraIcon.svg ? true : false"
-      ></FontIcon>
+      />
     </template>
     <sidebar-item
       v-for="child in props.item.children"

src/layout/components/sidebar/vertical.vue

@@ -49,7 +49,10 @@ onBeforeMount(() => {
 
 watch(
   () => route.path,
-  () => getSubMenuData(route.path)
+  () => {
+    getSubMenuData(route.path);
+    menuSelect(route.path, routers);
+  }
 );
 </script>
 

src/layout/components/tag/index.vue

@@ -19,12 +19,12 @@ import closeLeft from "/@/assets/svg/close_left.svg?component";
 import closeOther from "/@/assets/svg/close_other.svg?component";
 import closeRight from "/@/assets/svg/close_right.svg?component";
 
+import { useI18n } from "vue-i18n";
 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 { transformI18n, $t } from "/@/plugins/i18n";
 import { RouteConfigs, tagsViewsType } from "../../types";
 import { useSettingStoreHook } from "/@/store/modules/settings";
 import { handleAliveRoute, delAliveRoutes } from "/@/router/utils";
@@ -33,6 +33,7 @@ import { usePermissionStoreHook } from "/@/store/modules/permission";
 import { toggleClass, removeClass, hasClass } from "/@/utils/operate";
 import { templateRef, useResizeObserver, useDebounceFn } from "@vueuse/core";
 
+const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 const translateX = ref<number>(0);
@@ -193,42 +194,42 @@ const handleScroll = (offset: number): void => {
 const tagsViews = reactive<Array<tagsViewsType>>([
   {
     icon: refresh,
-    text: t("buttons.hsreload"),
+    text: $t("buttons.hsreload"),
     divided: false,
     disabled: false,
     show: true
   },
   {
     icon: close,
-    text: t("buttons.hscloseCurrentTab"),
+    text: $t("buttons.hscloseCurrentTab"),
     divided: false,
     disabled: multiTags.value.length > 1 ? false : true,
     show: true
   },
   {
     icon: closeLeft,
-    text: t("buttons.hscloseLeftTabs"),
+    text: $t("buttons.hscloseLeftTabs"),
     divided: true,
     disabled: multiTags.value.length > 1 ? false : true,
     show: true
   },
   {
     icon: closeRight,
-    text: t("buttons.hscloseRightTabs"),
+    text: $t("buttons.hscloseRightTabs"),
     divided: false,
     disabled: multiTags.value.length > 1 ? false : true,
     show: true
   },
   {
     icon: closeOther,
-    text: t("buttons.hscloseOtherTabs"),
+    text: $t("buttons.hscloseOtherTabs"),
     divided: true,
     disabled: multiTags.value.length > 2 ? false : true,
     show: true
   },
   {
     icon: closeAll,
-    text: t("buttons.hscloseAllTabs"),
+    text: $t("buttons.hscloseAllTabs"),
     divided: false,
     disabled: multiTags.value.length > 1 ? false : true,
     show: true
@@ -428,6 +429,7 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
 }
 
 function handleCommand(command: object) {
+  // @ts-expect-error
   const { key, item } = command;
   onClickDrop(key, item);
 }
@@ -662,7 +664,7 @@ const getContextMenuStyle = computed((): CSSProperties => {
           <router-link :to="item.path"
             >{{ transformI18n(item.meta.title, item.meta.i18n) }}
           </router-link>
-          <el-icon
+          <span
             v-if="
               iconIsActive(item, index) ||
               (index === activeIndex && index !== 0)
@@ -671,12 +673,12 @@ const getContextMenuStyle = computed((): CSSProperties => {
             @click.stop="deleteMenu(item)"
           >
             <IconifyIconOffline icon="close-bold" />
-          </el-icon>
+          </span>
           <div
             :ref="'schedule' + index"
             v-if="showModel !== 'card'"
             :class="[scheduleIsActive(item)]"
-          ></div>
+          />
         </div>
       </div>
     </div>
@@ -701,7 +703,7 @@ const getContextMenuStyle = computed((): CSSProperties => {
         >
           <li v-if="item.show" @click="selectTag(key, item)">
             <component :is="item.icon" :key="key" />
-            {{ $t(item.text) }}
+            {{ t(item.text) }}
           </li>
         </div>
       </ul>
@@ -709,13 +711,13 @@ const getContextMenuStyle = computed((): CSSProperties => {
     <!-- 右侧功能按钮 -->
     <ul class="right-button">
       <li>
-        <el-icon
-          :title="$t('buttons.hsrefreshRoute')"
+        <span
+          :title="t('buttons.hsrefreshRoute')"
           class="el-icon-refresh-right rotate"
           @click="onFresh"
         >
           <IconifyIconOffline icon="refresh-right" />
-        </el-icon>
+        </span>
       </li>
       <li>
         <el-dropdown
@@ -723,9 +725,7 @@ const getContextMenuStyle = computed((): CSSProperties => {
           placement="bottom-end"
           @command="handleCommand"
         >
-          <el-icon>
           <IconifyIconOffline icon="arrow-down" />
-          </el-icon>
           <template #dropdown>
             <el-dropdown-menu>
               <el-dropdown-item
@@ -740,14 +740,14 @@ const getContextMenuStyle = computed((): CSSProperties => {
                   :key="key"
                   style="margin-right: 6px"
                 />
-                {{ $t(item.text) }}
+                {{ t(item.text) }}
               </el-dropdown-item>
             </el-dropdown-menu>
           </template>
         </el-dropdown>
       </li>
       <li>
-        <slot></slot>
+        <slot />
       </li>
     </ul>
   </div>

src/layout/frameView.vue

@@ -0,0 +1,63 @@
+<template>
+  <div class="frame" v-loading="loading">
+    <iframe :src="frameSrc" class="frame-iframe" ref="frameRef" />
+  </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>

src/layout/hooks/nav.ts

@@ -1,11 +1,12 @@
 import { computed } from "vue";
 import { router } from "/@/router";
+import { getConfig } from "/@/config";
 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 { Title } from "../../../public/serverConfig.json";
+import { remainingPaths } from "/@/router/modules/index";
 import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
 
 export function useNav() {
@@ -29,6 +30,7 @@ export function useNav() {
 
   // 动态title
   function changeTitle(meta: routeMetaType) {
+    const Title = getConfig().Title;
     if (Title)
       document.title = `${transformI18n(meta.title, meta.i18n)} | ${Title}`;
     else document.title = transformI18n(meta.title, meta.i18n);
@@ -67,6 +69,7 @@ export function useNav() {
   }
 
   function menuSelect(indexPath: string, routers): void {
+    if (isRemaining(indexPath)) return;
     let parentPath = "";
     const parentPathIndex = indexPath.lastIndexOf("/");
     if (parentPathIndex > 0) {
@@ -93,6 +96,11 @@ export function useNav() {
     findCurrentRoute(indexPath, routers);
   }
 
+  // 判断路径是否参与菜单
+  function isRemaining(path: string): boolean {
+    return remainingPaths.includes(path);
+  }
+
   return {
     logout,
     backHome,

src/layout/hooks/useBoolean.ts

@@ -0,0 +1,26 @@
+import { ref } from "vue";
+
+export default function useBoolean(initValue = false) {
+  const bool = ref(initValue);
+
+  function setBool(value: boolean) {
+    bool.value = value;
+  }
+  function setTrue() {
+    setBool(true);
+  }
+  function setFalse() {
+    setBool(false);
+  }
+  function toggle() {
+    setBool(!bool.value);
+  }
+
+  return {
+    bool,
+    setBool,
+    setTrue,
+    setFalse,
+    toggle
+  };
+}

src/layout/redirect.vue

@@ -16,5 +16,5 @@ replace({
 </script>
 
 <template>
-  <div></div>
+  <div />
 </template>

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>

src/layout/theme/element-plus.ts

@@ -1,8 +1,8 @@
 /* 动态改变element-plus主题色 */
 import rgbHex from "rgb-hex";
-import { convert } from "css-color-function";
+import epCss from "./element.scss";
 import { TinyColor } from "@ctrl/tinycolor";
-import epCss from "element-plus/dist/index.css";
+import { convert } from "css-color-function";
 
 // 色值表
 const formula = {

src/layout/theme/element.scss

@@ -0,0 +1,2 @@
+/* 通过scss模块本地导入element-plus的全局样式文件，解决vite2.7.13版本后使用 import epCss from "element-plus/dist/index.css"，打包后加载不到样式的问题 */
+@import "element-plus/dist/index.css";

src/layout/types.ts

@@ -67,6 +67,7 @@ export type childrenType = {
     icon?: string;
     title?: string;
     i18n?: boolean;
+    showParent?: boolean;
     extraIcon?: {
       svg?: boolean;
       name?: string;

src/main.ts

@@ -3,7 +3,7 @@ import router from "./router";
 import { setupStore } from "/@/store";
 import { getServerConfig } from "./config";
 import { createApp, Directive } from "vue";
-import { usI18n } from "../src/plugins/i18n";
+import { useI18n } from "../src/plugins/i18n";
 import { MotionPlugin } from "@vueuse/motion";
 import { useElementPlus } from "../src/plugins/element-plus";
 import { injectResponsiveStorage } from "/@/utils/storage/responsive";
@@ -12,6 +12,8 @@ import "animate.css";
 import "virtual:windi.css";
 // 导入公共样式
 import "./style/index.scss";
+import "@pureadmin/components/dist/index.css";
+import "@pureadmin/components/dist/theme.css";
 // 导入字体图标
 import "./assets/iconfont/iconfont.js";
 import "./assets/iconfont/iconfont.css";
@@ -35,9 +37,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(useI18n).use(useElementPlus);
   app.mount("#app");
 });

src/plugins/element-plus/index.ts

@@ -32,6 +32,8 @@ import {
   ElEmpty,
   ElCollapse,
   ElCollapseItem,
+  ElDialog,
+  ElCard,
   // 指令
   ElLoading,
   ElInfiniteScroll
@@ -72,7 +74,9 @@ const components = [
   ElAvatar,
   ElEmpty,
   ElCollapse,
-  ElCollapseItem
+  ElCollapseItem,
+  ElDialog,
+  ElCard
 ];
 
 export function useElementPlus(app: App) {

src/plugins/i18n.ts

@@ -0,0 +1,72 @@
+// 多组件库的国际化和本地项目国际化兼容
+import { App, WritableComputedRef } from "vue";
+import { storageLocal } from "/@/utils/storage";
+import { type I18n, createI18n } from "vue-i18n";
+
+// element-plus国际化
+import enLocale from "element-plus/lib/locale/lang/en";
+import zhLocale from "element-plus/lib/locale/lang/zh-cn";
+
+function siphonI18n(prefix = "zh-CN") {
+  return Object.fromEntries(
+    Object.entries(import.meta.globEager("../../locales/*.y(a)?ml")).map(
+      ([key, value]) => {
+        const matched = key.match(/([A-Za-z0-9-_]+)\./i)[1];
+        return [matched, value.default];
+      }
+    )
+  )[prefix];
+}
+
+export const localesConfigs = {
+  zh: {
+    ...siphonI18n("zh-CN"),
+    ...zhLocale
+  },
+  en: {
+    ...siphonI18n("en"),
+    ...enLocale
+  }
+};
+
+/**
+ * 国际化转换工具函数
+ * @param message message
+ * @param isI18n  如果true,获取对应的消息,否则返回本身
+ * @returns message
+ */
+export function transformI18n(
+  message: string | unknown | object = "",
+  isI18n: boolean | unknown = false
+) {
+  if (!message) {
+    return "";
+  }
+
+  // 处理存储动态路由的title,格式 {zh:"",en:""}
+  if (typeof message === "object") {
+    const locale: string | WritableComputedRef<string> | any =
+      i18n.global.locale;
+    return message[locale?.value];
+  }
+
+  if (isI18n) {
+    return i18n.global.t.call(i18n.global.locale, message);
+  } else {
+    return message;
+  }
+}
+
+// 此函数只是配合i18n Ally插件来进行国际化智能提示，并无实际意义（只对提示起作用），如果不需要国际化可删除
+export const $t = (key: string) => key;
+
+export const i18n: I18n = createI18n({
+  legacy: false,
+  locale: storageLocal.getItem("responsive-locale")?.locale ?? "zh",
+  fallbackLocale: "en",
+  messages: localesConfigs
+});
+
+export function useI18n(app: App) {
+  app.use(i18n);
+}

src/plugins/i18n/config.ts

@@ -1,20 +0,0 @@
-import { siphonI18n } from "./index";
-
-// element-plus国际化
-import enLocale from "element-plus/lib/locale/lang/en";
-import zhLocale from "element-plus/lib/locale/lang/zh-cn";
-
-// 项目内自定义国际化
-const zhModules = import.meta.globEager("./zh-CN/**/*.ts");
-const enModules = import.meta.globEager("./en/**/*.ts");
-
-export const localesConfigs = {
-  zh: {
-    ...siphonI18n(zhModules, "zh-CN"),
-    ...zhLocale
-  },
-  en: {
-    ...siphonI18n(enModules, "en"),
-    ...enLocale
-  }
-};

src/plugins/i18n/en/buttons.ts

@@ -1,21 +0,0 @@
-export default {
-  hsLoginOut: "LoginOut",
-  hsfullscreen: "FullScreen",
-  hsexitfullscreen: "ExitFullscreen",
-  hsrefreshRoute: "RefreshRoute",
-  hslogin: "Login",
-  hsadd: "Add",
-  hsmark: "Mark/Cancel",
-  hssave: "Save",
-  hssearch: "Search",
-  hsexpendAll: "Expand All",
-  hscollapseAll: "Collapse All",
-  hssystemSet: "Open ProjectConfig",
-  hsdelete: "Delete",
-  hsreload: "Reload",
-  hscloseCurrentTab: "Close CurrentTab",
-  hscloseLeftTabs: "Close LeftTabs",
-  hscloseRightTabs: "Close RightTabs",
-  hscloseOtherTabs: "Close OtherTabs",
-  hscloseAllTabs: "Close AllTabs"
-};

src/plugins/i18n/en/menus.ts

@@ -1,21 +0,0 @@
-export default {
-  hshome: "Home",
-  hslogin: "Login",
-  hssysManagement: "System Manage",
-  hsBaseinfo: "Base Info",
-  hserror: "Error Page",
-  hsfourZeroFour: "404",
-  hsfourZeroOne: "401",
-  hsmenus: "MultiLevel Menu",
-  hsmenu1: "Menu1",
-  "hsmenu1-1": "Menu1-1",
-  "hsmenu1-2": "Menu1-2",
-  "hsmenu1-2-1": "Menu1-2-1",
-  "hsmenu1-2-2": "Menu1-2-2",
-  "hsmenu1-3": "Menu1-3",
-  hsmenu2: "Menu2",
-  permission: "Permission Manage",
-  permissionPage: "Page Permission",
-  permissionButton: "Button Permission",
-  externalLink: "External Link"
-};

src/plugins/i18n/index.ts

@@ -1,77 +0,0 @@
-// 多组件库的国际化和本地项目国际化兼容
-import { App } from "vue";
-import { set } from "lodash-es";
-import { createI18n } from "vue-i18n";
-import { localesConfigs } from "./config";
-import { storageLocal } from "/@/utils/storage";
-
-/**
- * 国际化转换工具函数
- * @param message message
- * @param isI18n  如果true,获取对应的消息,否则返回本身
- * @returns message
- */
-export function transformI18n(
-  message: string | unknown | object = "",
-  isI18n: boolean | unknown = false
-) {
-  if (!message) {
-    return "";
-  }
-
-  // 处理存储动态路由的title,格式 {zh:"",en:""}
-  if (typeof message === "object") {
-    return message[i18n.global?.locale];
-  }
-
-  if (isI18n) {
-    //@ts-ignore
-    return i18n.global.tc.call(i18n.global, message);
-  } else {
-    return message;
-  }
-}
-
-/**
- * 从模块中抽取国际化
- * @param langs 存放国际化模块
- * @param prefix 语言 默认 zh-CN
- * @returns obj 格式：{模块名.**}
- */
-export function siphonI18n(
-  langs: Record<string, Record<string, any>>,
-  prefix = "zh-CN"
-) {
-  const langsObj: Recordable = {};
-  Object.keys(langs).forEach((key: string) => {
-    let fileName = key.replace(`./${prefix}/`, "").replace(/^\.\//, "");
-    fileName = fileName.substring(0, fileName.lastIndexOf("."));
-    const keyList = fileName.split("/");
-    const moduleName = keyList.shift();
-    const objKey = keyList.join(".");
-    const langFileModule = langs[key].default;
-
-    if (moduleName) {
-      if (objKey) {
-        set(langsObj, moduleName, langsObj[moduleName] || {});
-        set(langsObj[moduleName], objKey, langFileModule);
-      } else {
-        set(langsObj, moduleName, langFileModule || {});
-      }
-    }
-  });
-  return langsObj;
-}
-
-// 此函数只是配合i18n Ally插件来进行国际化智能提示，并无实际意义（只对提示起作用），如果不需要国际化可删除
-export const $t = (key: string) => key;
-
-export const i18n = createI18n({
-  locale: storageLocal.getItem("responsive-locale")?.locale ?? "zh",
-  fallbackLocale: "en",
-  messages: localesConfigs
-});
-
-export function usI18n(app: App) {
-  app.use(i18n);
-}

src/plugins/i18n/zh-CN/buttons.ts

@@ -1,21 +0,0 @@
-export default {
-  hsLoginOut: "退出系统",
-  hsfullscreen: "全屏",
-  hsexitfullscreen: "退出全屏",
-  hsrefreshRoute: "刷新路由",
-  hslogin: "登陆",
-  hsadd: "新增",
-  hsmark: "标记/取消",
-  hssave: "保存",
-  hssearch: "搜索",
-  hsexpendAll: "全部展开",
-  hscollapseAll: "全部折叠",
-  hssystemSet: "打开项目配置",
-  hsdelete: "删除",
-  hsreload: "重新加载",
-  hscloseCurrentTab: "关闭当前标签页",
-  hscloseLeftTabs: "关闭左侧标签页",
-  hscloseRightTabs: "关闭右侧标签页",
-  hscloseOtherTabs: "关闭其他标签页",
-  hscloseAllTabs: "关闭全部标签页"
-};

src/plugins/i18n/zh-CN/menus.ts

@@ -1,21 +0,0 @@
-export default {
-  hshome: "首页",
-  hslogin: "登陆",
-  hssysManagement: "系统管理",
-  hsBaseinfo: "基础信息",
-  hserror: "错误页面",
-  hsfourZeroFour: "404",
-  hsfourZeroOne: "401",
-  hsmenus: "多级菜单",
-  hsmenu1: "菜单1",
-  "hsmenu1-1": "菜单1-1",
-  "hsmenu1-2": "菜单1-2",
-  "hsmenu1-2-1": "菜单1-2-1",
-  "hsmenu1-2-2": "菜单1-2-2",
-  "hsmenu1-3": "菜单1-3",
-  hsmenu2: "菜单2",
-  permission: "权限管理",
-  permissionPage: "页面权限",
-  permissionButton: "按钮权限",
-  externalLink: "外链"
-};

src/router/index.ts

@@ -1,12 +1,13 @@
+import { isUrl } from "/@/utils/is";
+import { getConfig } from "/@/config";
 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";
@@ -52,10 +53,11 @@ 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 => {
       if (!item.meta.title) return "";
+      const Title = getConfig().Title;
       if (Title)
         document.title = `${transformI18n(
           item.meta.title,
@@ -65,9 +67,9 @@ router.beforeEach((to: toRouteType, _from, next) => {
     });
   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();

src/router/modules/error.ts

@@ -1,22 +1,21 @@
 import { $t } from "/@/plugins/i18n";
-import Layout from "/@/layout/index.vue";
+const Layout = () => import("/@/layout/index.vue");
 
 const errorRouter = {
   path: "/error",
-  name: "error",
   component: Layout,
-  redirect: "/error/401",
+  redirect: "/error/403",
   meta: {
-    icon: "position",
+    icon: "information-line",
     title: $t("menus.hserror"),
     i18n: true,
-    rank: 7
+    rank: 9
   },
   children: [
     {
-      path: "/error/401",
-      name: "401",
-      component: () => import("/@/views/error/401.vue"),
+      path: "/error/403",
+      name: "403",
+      component: () => import("/@/views/error/403.vue"),
       meta: {
         title: $t("menus.hsfourZeroOne"),
         i18n: true
@@ -30,6 +29,15 @@ const errorRouter = {
         title: $t("menus.hsfourZeroFour"),
         i18n: true
       }
+    },
+    {
+      path: "/error/500",
+      name: "500",
+      component: () => import("/@/views/error/500.vue"),
+      meta: {
+        title: $t("menus.hsFive"),
+        i18n: true
+      }
     }
   ]
 };

src/router/modules/externalLink.ts

@@ -1,26 +0,0 @@
-import { $t } from "/@/plugins/i18n";
-import Layout from "/@/layout/index.vue";
-
-const externalLink = {
-  path: "/external",
-  name: "external",
-  component: Layout,
-  meta: {
-    icon: "link",
-    title: $t("menus.externalLink"),
-    i18n: true,
-    rank: 190
-  },
-  children: [
-    {
-      path: "https://github.com/xiaoxian521/vue-pure-admin",
-      meta: {
-        title: $t("menus.externalLink"),
-        i18n: true,
-        rank: 191
-      }
-    }
-  ]
-};
-
-export default externalLink;

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: "/",

src/router/modules/index.ts

@@ -1,7 +1,6 @@
 // 静态路由
 import homeRouter from "./home";
 import errorRouter from "./error";
-import externalLink from "./externalLink";
 import remainingRouter from "./remaining";
 import { RouteRecordRaw, RouteComponent } from "vue-router";
 
@@ -13,7 +12,7 @@ import {
 import { buildHierarchyTree } from "/@/utils/tree";
 
 // 原始静态路由（未做任何处理）
-const routes = [homeRouter, errorRouter, externalLink];
+const routes = [homeRouter, errorRouter];
 
 // 导出处理后的静态路由（三级及以上的路由全部拍成二级）
 export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
@@ -24,3 +23,8 @@ export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
 export const constantMenus: Array<RouteComponent> = ascending(routes).concat(
   ...remainingRouter
 );
+
+// 不参与菜单的路由
+export const remainingPaths = Object.keys(remainingRouter).map(v => {
+  return remainingRouter[v].path;
+});

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 = [
   {
@@ -15,7 +15,6 @@ const remainingRouter = [
   },
   {
     path: "/redirect",
-    name: "redirect",
     component: Layout,
     meta: {
       icon: "home-filled",
@@ -28,7 +27,7 @@ const remainingRouter = [
       {
         path: "/redirect/:path(.*)",
         name: "redirect",
-        component: () => import("/@/views/redirect.vue")
+        component: () => import("/@/layout/redirect.vue")
       }
     ]
   }

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}");
 
@@ -20,6 +22,14 @@ import { getAsyncRoutes } from "/@/api/routes";
 
 // 按照路由中meta下的rank等级升序来排序路由
 function ascending(arr: any[]) {
+  arr.forEach(v => {
+    if (v?.meta?.rank === null) v.meta.rank = undefined;
+    if (v?.meta?.rank === 0) {
+      if (v.name !== "home" && v.path !== "/") {
+        console.warn("rank only the home page can be 0");
+      }
+    }
+  });
   return arr.sort(
     (a: { meta: { rank: number } }, b: { meta: { rank: number } }) => {
       return a?.meta?.rank - b?.meta?.rank;
@@ -125,6 +135,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 +160,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 +231,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]];

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 => {

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";

src/store/modules/user.ts

@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { store } from "/@/store";
 import { userType } from "./types";
-import { useRouter } from "vue-router";
+import { router } from "/@/router";
 import { getLogin, refreshToken } from "/@/api/user";
 import { storageLocal, storageSession } from "/@/utils/storage";
 import { getToken, setToken, removeToken } from "/@/utils/auth";
@@ -64,7 +64,7 @@ export const useUserStore = defineStore({
           }
         }
       ]);
-      useRouter().push("/login");
+      router.push("/login");
     },
     // 刷新token
     async refreshToken(data) {

src/style/element-plus.scss

@@ -36,16 +36,23 @@
   z-index: 99999 !important;
 }
 
+// 自定义popover的类名
+.pure-popper {
+  padding: 0 !important;
+}
+
 /* 动态改变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 {

src/style/index.scss

@@ -12,8 +12,8 @@ body {
   -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;
+  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;
 }

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 {
@@ -212,7 +202,7 @@
 
     .horizontal-header-right {
       display: flex;
-      min-width: 280px;
+      min-width: 340px;
       align-items: center;
       color: $subMenuActiveText;
       justify-content: flex-end;
@@ -226,6 +216,12 @@
         }
       }
 
+      .search-container {
+        &:hover {
+          background: $menuHover;
+        }
+      }
+
       .screen-full {
         cursor: pointer;
 
@@ -613,15 +609,12 @@ body[layout="vertical"] {
         }
       }
 
-      /* 无子菜单 */
+      /* 有无子菜单 */
+      .el-sub-menu__title,
       .el-menu-item [class^="el-icon"] {
         right: 5px;
       }
 
-      .el-sub-menu__title [class^="el-icon"] {
-        right: 2px;
-      }
-
       .submenu-title-noDropdown {
         background: transparent !important;
       }

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);
   }
 }
 

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>;
 }

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);
 }

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");

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();

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;
+    });
+  };
+}

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;

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();
+  }
+};

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 };
+}

src/views/error/401.vue

@@ -1,73 +0,0 @@
-<script setup lang="ts">
-import imgs from "/@/assets/401.gif";
-import { ref } from "vue";
-
-const img = ref(`${imgs}?${new Date()}`);
-</script>
-
-<template>
-  <div class="errPage-container">
-    <el-row>
-      <el-col :span="12">
-        <h1 class="text-jumbo text-ginormous">Pure Admin</h1>
-        <h2>你没有权限去该页面</h2>
-      </el-col>
-      <el-col :span="12">
-        <img
-          :src="img"
-          width="313"
-          height="428"
-          alt="Girl has dropped her ice cream."
-        />
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.errPage-container {
-  width: 800px;
-  max-width: 100%;
-  margin: 100px auto;
-
-  .pan-back-btn {
-    background: #008489;
-    color: #fff;
-    border: none !important;
-  }
-
-  .pan-gif {
-    margin: 0 auto;
-    display: block;
-  }
-
-  .pan-img {
-    display: block;
-    margin: 0 auto;
-    width: 100%;
-  }
-
-  .text-jumbo {
-    font-size: 60px;
-    font-weight: 700;
-    color: #484848;
-  }
-
-  .list-unstyled {
-    font-size: 14px;
-
-    li {
-      padding-bottom: 5px;
-    }
-
-    a {
-      color: #008489;
-      text-decoration: none;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-}
-</style>

src/views/error/403.vue

@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import noAccess from "/@/assets/status/403.svg?component";
+</script>
+
+<template>
+  <div class="flex justify-center items-center h-screen-sm">
+    <noAccess />
+    <div class="ml-12">
+      <p
+        class="font-medium text-4xl mb-4"
+        v-motion
+        :initial="{
+          opacity: 0,
+          y: 100
+        }"
+        :enter="{
+          opacity: 1,
+          y: 0,
+          transition: {
+            delay: 100
+          }
+        }"
+      >
+        403
+      </p>
+      <p
+        class="mb-4 text-gray-500"
+        v-motion
+        :initial="{
+          opacity: 0,
+          y: 100
+        }"
+        :enter="{
+          opacity: 1,
+          y: 0,
+          transition: {
+            delay: 300
+          }
+        }"
+      >
+        抱歉，你无权访问该页面
+      </p>
+      <el-button
+        type="primary"
+        @click="$router.push('/')"
+        v-motion
+        :initial="{
+          opacity: 0,
+          y: 100
+        }"
+        :enter="{
+          opacity: 1,
+          y: 0,
+          transition: {
+            delay: 500
+          }
+        }"
+        >返回首页</el-button
+      >
+    </div>
+  </div>
+</template>

src/views/error/404.vue

@@ -1,250 +1,62 @@
 <script setup lang="ts">
-import { computed } from "vue";
-import four from "/@/assets/404.png";
-import four_cloud from "/@/assets/404_cloud.png";
-
-const message = computed(() => {
-  return "The webmaster said that you can not enter this page...";
-});
+import noExist from "/@/assets/status/404.svg?component";
 </script>
 
 <template>
-  <div class="wscn-http404-container">
-    <div class="wscn-http404">
-      <div class="pic-404">
-        <img class="pic-404__parent" :src="four" alt="404" />
-        <img class="pic-404__child left" :src="four_cloud" alt="404" />
-        <img class="pic-404__child mid" :src="four_cloud" alt="404" />
-        <img class="pic-404__child right" :src="four_cloud" alt="404" />
-      </div>
-      <div class="bullshit">
-        <div class="bullshit__oops">Pure Admin</div>
-        <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">
-          Please check that the URL you entered is correct, or click the button
-          below to return to the homepage.
-        </div>
-        <a href="" class="bullshit__return-home">Back to home</a>
-      </div>
+  <div class="flex justify-center items-center h-screen-sm">
+    <noExist />
+    <div class="ml-12">
+      <p
+        class="font-medium text-4xl mb-4"
+        v-motion
+        :initial="{
+          opacity: 0,
+          y: 100
+        }"
+        :enter="{
+          opacity: 1,
+          y: 0,
+          transition: {
+            delay: 100
+          }
+        }"
+      >
+        404
+      </p>
+      <p
+        class="mb-4 text-gray-500"
+        v-motion
+        :initial="{
+          opacity: 0,
+          y: 100
+        }"
+        :enter="{
+          opacity: 1,
+          y: 0,
+          transition: {
+            delay: 300
+          }
+        }"
+      >
+        抱歉，你访问的页面不存在
+      </p>
+      <el-button
+        type="primary"
+        @click="$router.push('/')"
+        v-motion
+        :initial="{
+          opacity: 0,
+          y: 100
+        }"
+        :enter="{
+          opacity: 1,
+          y: 0,
+          transition: {
+            delay: 500
+          }
+        }"
+        >返回首页</el-button
+      >
     </div>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.wscn-http404-container {
-  transform: translate(-50%, -50%);
-  position: absolute;
-  top: 40%;
-  left: 50%;
-}
-
-.wscn-http404 {
-  position: relative;
-  width: 1200px;
-  padding: 0 50px;
-  overflow: hidden;
-
-  .pic-404 {
-    position: relative;
-    float: left;
-    width: 600px;
-    overflow: hidden;
-
-    &__parent {
-      width: 100%;
-    }
-
-    &__child {
-      @keyframes cloudLeft {
-        0% {
-          top: 17px;
-          left: 220px;
-          opacity: 0;
-        }
-
-        20% {
-          top: 33px;
-          left: 188px;
-          opacity: 1;
-        }
-
-        80% {
-          top: 81px;
-          left: 92px;
-          opacity: 1;
-        }
-
-        100% {
-          top: 97px;
-          left: 60px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudMid {
-        0% {
-          top: 10px;
-          left: 420px;
-          opacity: 0;
-        }
-
-        20% {
-          top: 40px;
-          left: 360px;
-          opacity: 1;
-        }
-
-        70% {
-          top: 130px;
-          left: 180px;
-          opacity: 1;
-        }
-
-        100% {
-          top: 160px;
-          left: 120px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudRight {
-        0% {
-          top: 100px;
-          left: 500px;
-          opacity: 0;
-        }
-
-        20% {
-          top: 120px;
-          left: 460px;
-          opacity: 1;
-        }
-
-        80% {
-          top: 180px;
-          left: 340px;
-          opacity: 1;
-        }
-
-        100% {
-          top: 200px;
-          left: 300px;
-          opacity: 0;
-        }
-      }
-
-      position: absolute;
-
-      &.left {
-        width: 80px;
-        top: 17px;
-        left: 220px;
-        opacity: 0;
-        animation-name: cloudLeft;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
-      }
-
-      &.mid {
-        width: 46px;
-        top: 10px;
-        left: 420px;
-        opacity: 0;
-        animation-name: cloudMid;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1.2s;
-      }
-
-      &.right {
-        width: 62px;
-        top: 100px;
-        left: 500px;
-        opacity: 0;
-        animation-name: cloudRight;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
-      }
-    }
-  }
-
-  .bullshit {
-    @keyframes slideUp {
-      0% {
-        transform: translateY(60px);
-        opacity: 0;
-      }
-
-      100% {
-        transform: translateY(0);
-        opacity: 1;
-      }
-    }
-
-    position: relative;
-    float: left;
-    width: 300px;
-    padding: 30px 0;
-    overflow: hidden;
-
-    &__oops {
-      font-size: 32px;
-      font-weight: bold;
-      line-height: 40px;
-      color: #1482f0;
-      opacity: 0;
-      margin-bottom: 20px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-fill-mode: forwards;
-    }
-
-    &__headline {
-      font-size: 20px;
-      line-height: 24px;
-      color: #222;
-      font-weight: bold;
-      opacity: 0;
-      margin-bottom: 10px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.1s;
-      animation-fill-mode: forwards;
-    }
-
-    &__info {
-      font-size: 13px;
-      line-height: 21px;
-      color: grey;
-      opacity: 0;
-      margin-bottom: 30px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.2s;
-      animation-fill-mode: forwards;
-    }
-
-    &__return-home {
-      display: block;
-      float: left;
-      width: 110px;
-      height: 36px;
-      background: #1482f0;
-      border-radius: 100px;
-      text-align: center;
-      color: #fff;
-      opacity: 0;
-      font-size: 14px;
-      line-height: 36px;
-      cursor: pointer;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.3s;
-      animation-fill-mode: forwards;
-    }
-  }
-}
-</style>

src/views/error/500.vue

@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import noServer from "/@/assets/status/500.svg?component";
+</script>
+
+<template>
+  <div class="flex justify-center items-center h-screen-sm">
+    <noServer />
+    <div class="ml-12">
+      <p
+        class="font-medium text-4xl mb-4"
+        v-motion
+        :initial="{
+          opacity: 0,
+          y: 100
+        }"
+        :enter="{
+          opacity: 1,
+          y: 0,
+          transition: {
+            delay: 100
+          }
+        }"
+      >
+        403
+      </p>
+      <p
+        class="mb-4 text-gray-500"
+        v-motion
+        :initial="{
+          opacity: 0,
+          y: 100
+        }"
+        :enter="{
+          opacity: 1,
+          y: 0,
+          transition: {
+            delay: 300
+          }
+        }"
+      >
+        抱歉，服务器出错了
+      </p>
+      <el-button
+        type="primary"
+        @click="$router.push('/')"
+        v-motion
+        :initial="{
+          opacity: 0,
+          y: 100
+        }"
+        :enter="{
+          opacity: 1,
+          y: 0,
+          transition: {
+            delay: 500
+          }
+        }"
+        >返回首页</el-button
+      >
+    </div>
+  </div>
+</template>

src/views/permission/button/index.vue

@@ -20,12 +20,16 @@ function changRole(value) {
 </script>
 
 <template>
-  <div>
+  <el-card>
+    <template #header>
+      <div class="card-header">
         <el-radio-group v-model="auth" @change="changRole">
-      <el-radio-button label="admin"></el-radio-button>
-      <el-radio-button label="test"></el-radio-button>
+          <el-radio-button label="admin" />
+          <el-radio-button label="test" />
         </el-radio-group>
-    <p v-auth="'v-admin'">只有admin可看</p>
-    <p v-auth="'v-test'">只有test可看</p>
       </div>
     </template>
+    <p v-auth="'v-admin'">只有admin可看</p>
+    <p v-auth="'v-test'">只有test可看</p>
+  </el-card>
+</template>

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);
 
@@ -28,14 +29,23 @@ function changRole() {
 </script>
 
 <template>
-  <div>
-    <h4>
+  <el-card>
+    <template #header>
+      <div class="card-header">
+        <span>
           当前角色：
           <span style="font-size: 26px">{{ purview }}</span>
           <p style="color: #ffa500">
             查看左侧菜单变化(系统管理)，模拟后台根据不同角色返回对应路由
-      </p>
-    </h4>
-    <el-button type="primary" @click="changRole">切换角色</el-button>
+          </p></span
+        >
       </div>
     </template>
+    <el-button
+      type="primary"
+      @click="changRole"
+      :icon="useRenderIcon('user', { color: '#fff' })"
+      >切换角色</el-button
+    >
+  </el-card>
+</template>

src/views/type.ts

@@ -1,6 +0,0 @@
-export type infoType = {
-  svg?: string;
-  code?: number;
-  info?: string;
-  accessToken?: string;
-};

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>;

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";
@@ -14,9 +16,13 @@ const pathResolve = (dir: string): string => {
 // 设置别名
 const alias: Record<string, string> = {
   "/@": pathResolve("src"),
-  "@build": pathResolve("build"),
-  //解决开发环境下的警告
-  "vue-i18n": "vue-i18n/dist/vue-i18n.cjs.js"
+  "@build": pathResolve("build")
+};
+
+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 => {
@@ -81,7 +87,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
         "element-plus/lib/locale/lang/en",
         "element-plus/lib/locale/lang/zh-cn"
       ],
-      exclude: ["@zougt/vite-plugin-theme-preprocessor/dist/browser-utils"]
+      exclude: ["@pureadmin/theme/dist/browser-utils"]
     },
     build: {
       sourcemap: false,
@@ -90,7 +96,8 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
       chunkSizeWarningLimit: 2000
     },
     define: {
-      __INTLIFY_PROD_DEVTOOLS__: false
+      __INTLIFY_PROD_DEVTOOLS__: false,
+      __APP_INFO__: JSON.stringify(__APP_INFO__)
     }
   };
 };