chore: 同步完整版代码

release: update `5.2.0`

.lintstagedrc

@@ -3,7 +3,7 @@
     "prettier --cache --ignore-unknown  --write",
     "eslint --cache --fix"
   ],
-  "{!(package)*.json,*.code-snippets,.!({browserslist,npm,nvm})*rc}": [
+  "{!(package)*.json,*.code-snippets,.!({browserslist,nvm})*rc}": [
     "prettier --cache --write--parser json"
   ],
   "package.json": ["prettier --cache --write"],

.npmrc

@@ -1,4 +1,3 @@
-shell-emulator=true
 shamefully-hoist=true
-enable-pre-post-scripts=false
+strict-peer-dependencies=false
-strict-peer-dependencies=false
+shell-emulator=true

.nvmrc

@@ -1 +1 @@
-v22.20.0
+v20.12.2

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
   "recommendations": [
     "christian-kohler.path-intellisense",
-    "warmthsea.vscode-custom-code-color",
     "vscode-icons-team.vscode-icons",
     "davidanson.vscode-markdownlint",
     "ms-azuretools.vscode-docker",
@@ -9,7 +8,6 @@
     "bradlc.vscode-tailwindcss",
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
-    "lokalise.i18n-ally",
     "redhat.vscode-yaml",
     "csstools.postcss",
     "mikestead.dotenv",
@@ -17,4 +15,4 @@
     "antfu.iconify",
     "Vue.volar"
   ]
-}
+}

.vscode/settings.json

@@ -1,5 +1,4 @@
 {
-  "tailwindCSS.experimental.configFile": "src/style/tailwind.css",
   "editor.formatOnType": true,
   "editor.formatOnSave": true,
   "[vue]": {
@@ -28,30 +27,5 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   },
-  "i18n-ally.localesPaths": "locales",
+  "iconify.excludes": ["el"]
-  "i18n-ally.keystyle": "nested",
+}
-  "i18n-ally.sortKeys": true,
-  "i18n-ally.namespace": true,
-  "i18n-ally.enabledParsers": [
-    "yaml",
-    "js"
-  ],
-  "i18n-ally.sourceLanguage": "en",
-  "i18n-ally.displayLanguage": "zh-CN",
-  "i18n-ally.enabledFrameworks": [
-    "vue"
-  ],
-  "iconify.excludes": [
-    "el"
-  ],
-  "vscodeCustomCodeColor.highlightValue": [
-    "v-loading",
-    "v-auth",
-    "v-copy",
-    "v-longpress",
-    "v-optimize",
-    "v-perms",
-    "v-ripple"
-  ],
-  "vscodeCustomCodeColor.highlightValueColor": "#b392f0",
-}

Dockerfile

@@ -1,8 +1,8 @@
-FROM node:20-alpine as build-stage
+FROM node:18-alpine as build-stage
 
 WORKDIR /app
 RUN corepack enable
-RUN corepack prepare pnpm@latest --activate
+RUN corepack prepare pnpm@8.6.10 --activate
 
 RUN npm config set registry https://registry.npmmirror.com
 

README.en-US.md

@@ -1,4 +1,4 @@
-<h1>vue-pure-admin Lite Edition（i18n version）</h1>
+<h1>vue-pure-admin Lite Edition（no i18n version）</h1>
 
 [![license](https://img.shields.io/github/license/pure-admin/vue-pure-admin.svg)](LICENSE)
 
@@ -15,12 +15,12 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
 
 ## Nanny-level documents
 
-[Click me to view vue-pure-admin documentation](https://pure-admin.cn/)  
+[Click me to view vue-pure-admin documentation](https://yiming_chang.gitee.io/pure-admin-doc)  
 [Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app)
 
-## Premium service
+## Quality service, software outsourcing, sponsorship support
 
-[Click me to view details](https://pure-admin.cn/pages/service/)
+[Click me to view details](https://yiming_chang.gitee.io/pure-admin-doc/pages/service/)
 
 ## Preview
 

README.md

@@ -1,4 +1,4 @@
-<h1>vue-pure-admin精简版（国际化版本）</h1>
+<h1>vue-pure-admin精简版（非国际化版本）</h1>
 
 [![license](https://img.shields.io/github/license/pure-admin/vue-pure-admin.svg)](LICENSE)
 
@@ -10,7 +10,7 @@
 
 ## 版本选择
 
-当前是国际化版本，如果您需要非国际化版本 [请点击](https://github.com/pure-admin/pure-admin-thin)
+当前是非国际化版本，如果您需要国际化版本 [请点击](https://github.com/pure-admin/pure-admin-thin/tree/i18n)
 
 ## 配套视频
 
@@ -19,12 +19,12 @@
 
 ## 配套保姆级文档
 
-[点我查看 vue-pure-admin 文档](https://pure-admin.cn/)  
+[点我查看 vue-pure-admin 文档](https://yiming_chang.gitee.io/pure-admin-doc)  
 [点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)
 
-## 高级服务
+## 优质服务、软件外包、赞助支持
 
-[点我查看详情](https://pure-admin.cn/pages/service/)
+[点我查看详情](https://yiming_chang.gitee.io/pure-admin-doc/pages/service/)
 
 ## 预览
 

build/cdn.ts

@@ -3,6 +3,7 @@ import { Plugin as importToCDN } from "vite-plugin-cdn-import";
 /**
  * @description 打包时采用`cdn`模式，仅限外网使用（默认不采用，如果需要采用cdn模式，请在 .env.production 文件，将 VITE_CDN 设置成true）
  * 平台采用国内cdn：https://www.bootcdn.cn，当然你也可以选择 https://unpkg.com 或者 https://www.jsdelivr.com
+ * 提醒：mockjs不能用cdn模式引入，会报错。正确的方式是，生产环境删除mockjs，使用真实的后端请求
  * 注意：上面提到的仅限外网使用也不是完全肯定的，如果你们公司内网部署的有相关js、css文件，也可以将下面配置对应改一下，整一套内网版cdn
  */
 export const cdn = importToCDN({
@@ -19,11 +20,6 @@ export const cdn = importToCDN({
       var: "VueRouter",
       path: "vue-router.global.min.js"
     },
-    {
-      name: "vue-i18n",
-      var: "VueI18n",
-      path: "vue-i18n.runtime.global.prod.min.js"
-    },
     // 项目中没有直接安装vue-demi，但是pinia用到了，所以需要在引入pinia前引入vue-demi（https://github.com/vuejs/pinia/blob/v2/packages/pinia/package.json#L77）
     {
       name: "vue-demi",

build/info.ts

@@ -1,13 +1,13 @@
 import type { Plugin } from "vite";
-import gradient from "gradient-string";
 import { getPackageSize } from "./utils";
 import dayjs, { type Dayjs } from "dayjs";
 import duration from "dayjs/plugin/duration";
+import gradientString from "gradient-string";
 import boxen, { type Options as BoxenOptions } from "boxen";
 dayjs.extend(duration);
 
-const welcomeMessage = gradient(["cyan", "magenta"]).multiline(
+const welcomeMessage = gradientString("cyan", "magenta").multiline(
-  `您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://pure-admin.cn\nhttps://pure-admin-utils.netlify.app`
+  `您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://yiming_chang.gitee.io/pure-admin-doc\nhttps://pure-admin-utils.netlify.app`
 );
 
 const boxenOptions: BoxenOptions = {
@@ -41,7 +41,7 @@ export function viteBuildInfo(): Plugin {
           callback: (size: string) => {
             console.log(
               boxen(
-                gradient(["cyan", "magenta"]).multiline(
+                gradientString("cyan", "magenta").multiline(
                   `🎉 恭喜打包完成（总用时${dayjs
                     .duration(endTime.diff(startTime))
                     .format("mm分ss秒")}，打包后的大小为${size}）`

build/optimize.ts

@@ -10,7 +10,6 @@ const include = [
   "dayjs",
   "axios",
   "pinia",
-  "vue-i18n",
   "vue-types",
   "js-cookie",
   "vue-tippy",
@@ -23,8 +22,12 @@ const include = [
 
 /**
  * 在预构建中强制排除的依赖项
- * 温馨提示：平台推荐的使用方式是哪里需要哪里引入而且都是单个的引入，不需要预构建，直接让浏览器加载就好
+ * 温馨提示：所有以 `@iconify-icons/` 开头引入的的本地图标模块，都应该加入到下面的 `exclude` 里，因为平台推荐的使用方式是哪里需要哪里引入而且都是单个的引入，不需要预构建，直接让浏览器加载就好
  */
-const exclude = ["@iconify/json"];
+const exclude = [
+  "@iconify-icons/ep",
+  "@iconify-icons/ri",
+  "@pureadmin/theme/dist/browser-utils"
+];
 
 export { include, exclude };

build/plugins.ts

@@ -1,18 +1,15 @@
 import { cdn } from "./cdn";
 import vue from "@vitejs/plugin-vue";
-import { pathResolve } from "./utils";
 import { viteBuildInfo } from "./info";
 import svgLoader from "vite-svg-loader";
-import Icons from "unplugin-icons/vite";
 import type { PluginOption } from "vite";
 import vueJsx from "@vitejs/plugin-vue-jsx";
-import tailwindcss from "@tailwindcss/vite";
 import { configCompressPlugin } from "./compress";
 import removeNoMatch from "vite-plugin-router-warn";
 import { visualizer } from "rollup-plugin-visualizer";
 import removeConsole from "vite-plugin-remove-console";
-import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";
+import { themePreprocessorPlugin } from "@pureadmin/theme";
-import { codeInspectorPlugin } from "code-inspector-plugin";
+import { genScssMultipleScopeVars } from "../src/layout/theme";
 import { vitePluginFakeServer } from "vite-plugin-fake-server";
 
 export function getPluginsList(
@@ -21,23 +18,9 @@ export function getPluginsList(
 ): PluginOption[] {
   const lifecycle = process.env.npm_lifecycle_event;
   return [
-    tailwindcss(),
     vue(),
     // jsx、tsx语法支持
     vueJsx(),
-    VueI18nPlugin({
-      include: [pathResolve("../locales/**")]
-    }),
-    /**
-     * 在页面上按住组合键时，鼠标在页面移动即会在 DOM 上出现遮罩层并显示相关信息，点击一下将自动打开 IDE 并将光标定位到元素对应的代码位置
-     * Mac 默认组合键 Option + Shift
-     * Windows 默认组合键 Alt + Shift
-     * 更多用法看 https://inspector.fe-dev.cn/guide/start.html
-     */
-    codeInspectorPlugin({
-      bundler: "vite",
-      hideConsole: true
-    }),
     viteBuildInfo(),
     /**
      * 开发环境下移除非必要的vue-router动态路由警告No match found for location with path
@@ -52,13 +35,15 @@ export function getPluginsList(
       infixName: false,
       enableProd: true
     }),
+    // 自定义主题
+    themePreprocessorPlugin({
+      scss: {
+        multipleScopeVars: genScssMultipleScopeVars(),
+        extract: true
+      }
+    }),
     // svg组件化支持
     svgLoader(),
-    // 自动按需加载图标
-    Icons({
-      compiler: "vue3",
-      scale: 1
-    }),
     VITE_CDN ? cdn : null,
     configCompressPlugin(VITE_COMPRESSION),
     // 线上环境删除console

build/utils.ts

@@ -48,7 +48,7 @@ const __APP_INFO__ = {
 };
 
 /** 处理环境变量 */
-const wrapperEnv = (envConf: Recordable): ViteEnv => {
+const warpperEnv = (envConf: Recordable): ViteEnv => {
   // 默认值
   const ret: ViteEnv = {
     VITE_PORT: 8848,
@@ -107,4 +107,4 @@ const getPackageSize = options => {
   });
 };
 
-export { root, pathResolve, alias, __APP_INFO__, wrapperEnv, getPackageSize };
+export { root, pathResolve, alias, __APP_INFO__, warpperEnv, getPackageSize };

eslint.config.js

@@ -1,25 +1,26 @@
 import js from "@eslint/js";
-import tseslint from "typescript-eslint";
 import pluginVue from "eslint-plugin-vue";
 import * as parserVue from "vue-eslint-parser";
 import configPrettier from "eslint-config-prettier";
 import pluginPrettier from "eslint-plugin-prettier";
-import { defineConfig, globalIgnores } from "eslint/config";
+import { defineFlatConfig } from "eslint-define-config";
+import * as parserTypeScript from "@typescript-eslint/parser";
+import pluginTypeScript from "@typescript-eslint/eslint-plugin";
 
-export default defineConfig([
+export default defineFlatConfig([
-  globalIgnores([
-    "**/.*",
-    "dist/*",
-    "*.d.ts",
-    "public/*",
-    "src/assets/**",
-    "src/**/iconfont/**"
-  ]),
   {
     ...js.configs.recommended,
+    ignores: [
+      "**/.*",
+      "dist/*",
+      "*.d.ts",
+      "public/*",
+      "src/assets/**",
+      "src/**/iconfont/**"
+    ],
     languageOptions: {
       globals: {
-        // types/index.d.ts
+        // index.d.ts
         RefType: "readonly",
         EmitType: "readonly",
         TargetContext: "readonly",
@@ -72,18 +73,26 @@ export default defineConfig([
       ]
     }
   },
-  ...tseslint.config({
+  {
-    extends: [...tseslint.configs.recommended],
     files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"],
+    languageOptions: {
+      parser: parserTypeScript,
+      parserOptions: {
+        sourceType: "module"
+      }
+    },
+    plugins: {
+      "@typescript-eslint": pluginTypeScript
+    },
     rules: {
+      ...pluginTypeScript.configs.strict.rules,
+      "@typescript-eslint/ban-types": "off",
       "@typescript-eslint/no-redeclare": "error",
       "@typescript-eslint/ban-ts-comment": "off",
       "@typescript-eslint/no-explicit-any": "off",
       "@typescript-eslint/prefer-as-const": "warn",
       "@typescript-eslint/no-empty-function": "off",
       "@typescript-eslint/no-non-null-assertion": "off",
-      "@typescript-eslint/no-unused-expressions": "off",
-      "@typescript-eslint/no-unsafe-function-type": "off",
       "@typescript-eslint/no-import-type-side-effects": "error",
       "@typescript-eslint/explicit-module-boundary-types": "off",
       "@typescript-eslint/consistent-type-imports": [
@@ -102,20 +111,20 @@ export default defineConfig([
         }
       ]
     }
-  }),
+  },
   {
     files: ["**/*.d.ts"],
     rules: {
       "eslint-comments/no-unlimited-disable": "off",
       "import/no-duplicates": "off",
-      "no-restricted-syntax": "off",
       "unused-imports/no-unused-vars": "off"
     }
   },
   {
     files: ["**/*.?([cm])js"],
     rules: {
-      "@typescript-eslint/no-require-imports": "off"
+      "@typescript-eslint/no-require-imports": "off",
+      "@typescript-eslint/no-var-requires": "off"
     }
   },
   {
@@ -136,19 +145,18 @@ export default defineConfig([
           jsx: true
         },
         extraFileExtensions: [".vue"],
-        parser: tseslint.parser,
+        parser: "@typescript-eslint/parser",
         sourceType: "module"
       }
     },
     plugins: {
-      "@typescript-eslint": tseslint.plugin,
       vue: pluginVue
     },
     processor: pluginVue.processors[".vue"],
     rules: {
       ...pluginVue.configs.base.rules,
-      ...pluginVue.configs.essential.rules,
+      ...pluginVue.configs["vue3-essential"].rules,
-      ...pluginVue.configs.recommended.rules,
+      ...pluginVue.configs["vue3-recommended"].rules,
       "no-undef": "off",
       "no-unused-vars": "off",
       "vue/no-v-html": "off",

index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -10,6 +10,9 @@
     />
     <title>pure-admin-thin</title>
     <link rel="icon" href="/favicon.ico" />
+    <script>
+      window.process = {};
+    </script>
   </head>
 
   <body>

locales/en.yaml

@@ -1,91 +0,0 @@
-buttons:
-  pureLoginOut: LoginOut
-  pureLogin: Login
-  pureOpenSystemSet: Open System Configs
-  pureReload: Reload
-  pureCloseCurrentTab: Close CurrentTab
-  pureCloseLeftTabs: Close LeftTabs
-  pureCloseRightTabs: Close RightTabs
-  pureCloseOtherTabs: Close OtherTabs
-  pureCloseAllTabs: Close AllTabs
-  pureContentFullScreen: Content FullScreen
-  pureContentExitFullScreen: Content ExitFullScreen
-  pureClickCollapse: Collapse
-  pureClickExpand: Expand
-  pureConfirm: Confirm
-  pureSwitch: Switch
-  pureClose: Close
-  pureBackTop: BackTop
-  pureOpenText: Open
-  pureCloseText: Close
-search:
-  pureTotal: Total
-  pureHistory: History
-  pureCollect: Collect
-  pureDragSort: （Drag Sort）
-  pureEmpty: Empty
-  purePlaceholder: Search Menu
-panel:
-  pureSystemSet: System Configs
-  pureCloseSystemSet: Close System Configs
-  pureClearCacheAndToLogin: Clear cache and return to login page
-  pureClearCache: Clear Cache
-  pureOverallStyle: Overall Style
-  pureOverallStyleLight: Light
-  pureOverallStyleLightTip: Set sail freshly and light up the comfortable work interface
-  pureOverallStyleDark: Dark
-  pureOverallStyleDarkTip: Moonlight Overture, indulge in the tranquility and elegance of the night
-  pureOverallStyleSystem: Auto
-  pureOverallStyleSystemTip: Synchronize time, the interface naturally responds to morning and dusk
-  pureThemeColor: Theme Color
-  pureLayoutModel: Layout Model
-  pureVerticalTip: The menu on the left is familiar and friendly
-  pureHorizontalTip: Top menu, concise overview
-  pureMixTip: Mixed menu, flexible
-  pureStretch: Stretch Page
-  pureStretchFixed: Fixed
-  pureStretchFixedTip: Compact pages make it easy to find the information you need
-  pureStretchCustom: Custom
-  pureStretchCustomTip: Minimum 1280, maximum 1600
-  pureTagsStyle: Tags Style
-  pureTagsStyleSmart: Smart
-  pureTagsStyleSmartTip: Smart tags add fun and brilliance
-  pureTagsStyleCard: Card
-  pureTagsStyleCardTip: Card tags for efficient browsing
-  pureTagsStyleChrome: Chrome
-  pureTagsStyleChromeTip: Chrome style is classic and elegant
-  pureInterfaceDisplay: Interface Display
-  pureGreyModel: Grey Model
-  pureWeakModel: Weak Model
-  pureHiddenTags: Hidden Tags
-  pureHiddenFooter: Hidden Footer
-  pureMultiTagsCache: MultiTags Cache
-menus:
-  pureHome: Home
-  pureLogin: Login
-  pureAbnormal: Abnormal Page
-  purePageNotFound: "404"
-  pureAccessDenied: "403"
-  pureServerError: "500"
-  purePermission: Permission Manage
-  purePermissionPage: Page Permission
-  purePermissionButton: Button Permission
-  purePermissionButtonRouter: Route return button permission
-  purePermissionButtonLogin: Login interface return button permission
-status:
-  pureLoad: Loading...
-  pureMessage: Message
-  pureNotify: Notify
-  pureTodo: Todo
-  pureNoMessage: No Message
-  pureNoNotify: No Notify
-  pureNoTodo: No Todo
-login:
-  pureUsername: Username
-  purePassword: Password
-  pureLogin: Login
-  pureLoginSuccess: Login Success
-  pureLoginFail: Login Fail
-  pureUsernameReg: Please enter username
-  purePassWordReg: Please enter password
-  purePassWordRuleReg: The password format should be any combination of 8-18 digits

locales/zh-CN.yaml

@@ -1,91 +0,0 @@
-buttons:
-  pureLoginOut: 退出系统
-  pureLogin: 登录
-  pureOpenSystemSet: 打开系统配置
-  pureReload: 重新加载
-  pureCloseCurrentTab: 关闭当前标签页
-  pureCloseLeftTabs: 关闭左侧标签页
-  pureCloseRightTabs: 关闭右侧标签页
-  pureCloseOtherTabs: 关闭其他标签页
-  pureCloseAllTabs: 关闭全部标签页
-  pureContentFullScreen: 内容区全屏
-  pureContentExitFullScreen: 内容区退出全屏
-  pureClickCollapse: 点击折叠
-  pureClickExpand: 点击展开
-  pureConfirm: 确认
-  pureSwitch: 切换
-  pureClose: 关闭
-  pureBackTop: 回到顶部
-  pureOpenText: 开
-  pureCloseText: 关
-search:
-  pureTotal: 共
-  pureHistory: 搜索历史
-  pureCollect: 收藏
-  pureDragSort: （可拖拽排序）
-  pureEmpty: 暂无搜索结果
-  purePlaceholder: 搜索菜单（支持拼音搜索）
-panel:
-  pureSystemSet: 系统配置
-  pureCloseSystemSet: 关闭配置
-  pureClearCacheAndToLogin: 清空缓存并返回登录页
-  pureClearCache: 清空缓存
-  pureOverallStyle: 整体风格
-  pureOverallStyleLight: 浅色
-  pureOverallStyleLightTip: 清新启航，点亮舒适的工作界面
-  pureOverallStyleDark: 深色
-  pureOverallStyleDarkTip: 月光序曲，沉醉于夜的静谧雅致
-  pureOverallStyleSystem: 自动
-  pureOverallStyleSystemTip: 同步时光，界面随晨昏自然呼应
-  pureThemeColor: 主题色
-  pureLayoutModel: 导航模式
-  pureVerticalTip: 左侧菜单，亲切熟悉
-  pureHorizontalTip: 顶部菜单，简洁概览
-  pureMixTip: 混合菜单，灵活多变
-  pureStretch: 页宽
-  pureStretchFixed: 固定
-  pureStretchFixedTip: 紧凑页面，轻松找到所需信息
-  pureStretchCustom: 自定义
-  pureStretchCustomTip: 最小1280、最大1600
-  pureTagsStyle: 页签风格
-  pureTagsStyleSmart: 灵动
-  pureTagsStyleSmartTip: 灵动标签，添趣生辉
-  pureTagsStyleCard: 卡片
-  pureTagsStyleCardTip: 卡片标签，高效浏览
-  pureTagsStyleChrome: 谷歌
-  pureTagsStyleChromeTip: 谷歌风格，经典美观
-  pureInterfaceDisplay: 界面显示
-  pureGreyModel: 灰色模式
-  pureWeakModel: 色弱模式
-  pureHiddenTags: 隐藏标签页
-  pureHiddenFooter: 隐藏页脚
-  pureMultiTagsCache: 页签持久化
-menus:
-  pureHome: 首页
-  pureLogin: 登录
-  pureAbnormal: 异常页面
-  purePageNotFound: "404"
-  pureAccessDenied: "403"
-  pureServerError: "500"
-  purePermission: 权限管理
-  purePermissionPage: 页面权限
-  purePermissionButton: 按钮权限
-  purePermissionButtonRouter: 路由返回按钮权限
-  purePermissionButtonLogin: 登录接口返回按钮权限
-status:
-  pureLoad: 加载中...
-  pureMessage: 消息
-  pureNotify: 通知
-  pureTodo: 待办
-  pureNoMessage: 暂无消息
-  pureNoNotify: 暂无通知
-  pureNoTodo: 暂无待办
-login:
-  pureUsername: 账号
-  purePassword: 密码
-  pureLogin: 登录
-  pureLoginSuccess: 登录成功
-  pureLoginFail: 登录失败
-  pureUsernameReg: 请输入账号
-  purePassWordReg: 请输入密码
-  purePassWordRuleReg: 密码格式应为8-18位数字、字母、符号的任意两种组合

mock/asyncRoutes.ts

@@ -9,7 +9,7 @@ import { defineFakeRoute } from "vite-plugin-fake-server/client";
 const permissionRouter = {
   path: "/permission",
   meta: {
-    title: "menus.purePermission",
+    title: "权限管理",
     icon: "ep:lollipop",
     rank: 10
   },
@@ -18,39 +18,22 @@ const permissionRouter = {
       path: "/permission/page/index",
       name: "PermissionPage",
       meta: {
-        title: "menus.purePermissionPage",
+        title: "页面权限",
         roles: ["admin", "common"]
       }
     },
     {
-      path: "/permission/button",
+      path: "/permission/button/index",
+      name: "PermissionButton",
       meta: {
-        title: "menus.purePermissionButton",
+        title: "按钮权限",
-        roles: ["admin", "common"]
+        roles: ["admin", "common"],
-      },
+        auths: [
-      children: [
+          "permission:btn:add",
-        {
+          "permission:btn:edit",
-          path: "/permission/button/router",
+          "permission:btn:delete"
-          component: "permission/button/index",
+        ]
-          name: "PermissionButtonRouter",
+      }
-          meta: {
-            title: "menus.purePermissionButtonRouter",
-            auths: [
-              "permission:btn:add",
-              "permission:btn:edit",
-              "permission:btn:delete"
-            ]
-          }
-        },
-        {
-          path: "/permission/button/login",
-          component: "permission/button/perms",
-          name: "PermissionButtonLogin",
-          meta: {
-            title: "menus.purePermissionButtonLogin"
-          }
-        }
-      ]
     }
   ]
 };

mock/login.ts

@@ -15,8 +15,6 @@ export default defineFakeRoute([
             nickname: "小铭",
             // 一个用户可能有多个角色
             roles: ["admin"],
-            // 按钮级别权限
-            permissions: ["*:*:*"],
             accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
             refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh",
             expires: "2030/10/30 00:00:00"
@@ -30,7 +28,6 @@ export default defineFakeRoute([
             username: "common",
             nickname: "小林",
             roles: ["common"],
-            permissions: ["permission:btn:add", "permission:btn:edit"],
             accessToken: "eyJhbGciOiJIUzUxMiJ9.common",
             refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh",
             expires: "2030/10/30 00:00:00"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pure-admin-thin",
-  "version": "6.2.0",
+  "version": "5.4.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -22,7 +22,6 @@
     "preinstall": "npx only-allow pnpm"
   },
   "keywords": [
-    "pure-admin-thin",
     "vue-pure-admin",
     "element-plus",
     "tailwindcss",
@@ -33,13 +32,13 @@
     "vite",
     "esm"
   ],
-  "homepage": "https://github.com/pure-admin/pure-admin-thin/tree/i18n",
+  "homepage": "https://github.com/pure-admin/pure-admin-thin",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/pure-admin/pure-admin-thin.git"
   },
   "bugs": {
-    "url": "https://github.com/pure-admin/vue-pure-admin/issues"
+    "url": "https://github.com/pure-admin/pure-admin-thin/issues"
   },
   "license": "MIT",
   "author": {
@@ -49,116 +48,104 @@
   },
   "dependencies": {
     "@pureadmin/descriptions": "^1.2.1",
-    "@pureadmin/table": "^3.3.0",
+    "@pureadmin/table": "^3.1.2",
-    "@pureadmin/utils": "^2.6.2",
+    "@pureadmin/utils": "^2.4.7",
-    "@vueuse/core": "^14.0.0",
+    "@vueuse/core": "^10.9.0",
-    "@vueuse/motion": "^3.0.3",
+    "@vueuse/motion": "^2.1.0",
     "animate.css": "^4.1.1",
-    "axios": "^1.12.2",
+    "axios": "^1.6.8",
-    "dayjs": "^1.11.18",
+    "dayjs": "^1.11.10",
-    "echarts": "^6.0.0",
+    "echarts": "^5.5.0",
-    "element-plus": "^2.11.5",
+    "element-plus": "^2.7.1",
     "js-cookie": "^3.0.5",
     "localforage": "^1.10.0",
     "mitt": "^3.0.1",
     "nprogress": "^0.2.0",
-    "path-browserify": "^1.0.1",
+    "path": "^0.12.7",
-    "pinia": "^3.0.3",
+    "pinia": "^2.1.7",
-    "pinyin-pro": "^3.27.0",
+    "pinyin-pro": "^3.20.2",
-    "qs": "^6.14.0",
+    "qs": "^6.12.1",
     "responsive-storage": "^2.2.0",
-    "sortablejs": "^1.15.6",
+    "sortablejs": "^1.15.2",
-    "vue": "^3.5.22",
+    "vue": "^3.4.24",
-    "vue-i18n": "^11.1.12",
+    "vue-router": "^4.3.2",
-    "vue-router": "^4.6.3",
+    "vue-tippy": "^6.4.1",
-    "vue-tippy": "^6.7.1",
+    "vue-types": "^5.1.1"
-    "vue-types": "^6.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^20.1.0",
+    "@commitlint/cli": "^19.2.2",
-    "@commitlint/config-conventional": "^20.0.0",
+    "@commitlint/config-conventional": "^19.2.2",
-    "@commitlint/types": "^20.0.0",
+    "@commitlint/types": "^19.0.3",
-    "@eslint/js": "^9.38.0",
+    "@eslint/js": "^9.1.1",
-    "@faker-js/faker": "^10.1.0",
+    "@faker-js/faker": "^8.4.1",
-    "@iconify/json": "^2.2.400",
+    "@iconify-icons/ep": "^1.2.12",
-    "@iconify/vue": "4.2.0",
+    "@iconify-icons/ri": "^1.2.10",
-    "@intlify/unplugin-vue-i18n": "^11.0.1",
+    "@iconify/vue": "^4.1.2",
-    "@tailwindcss/vite": "^4.1.16",
+    "@pureadmin/theme": "^3.2.0",
+    "@types/gradient-string": "^1.1.6",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.19.23",
+    "@types/node": "^20.12.7",
     "@types/nprogress": "^0.2.3",
-    "@types/path-browserify": "^1.0.3",
+    "@types/qs": "^6.9.15",
-    "@types/qs": "^6.14.0",
+    "@types/sortablejs": "^1.15.8",
-    "@types/sortablejs": "^1.15.9",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
-    "@vitejs/plugin-vue": "^6.0.1",
+    "@typescript-eslint/parser": "^7.7.1",
-    "@vitejs/plugin-vue-jsx": "^5.1.1",
+    "@vitejs/plugin-vue": "^5.0.4",
-    "boxen": "^8.0.1",
+    "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "code-inspector-plugin": "^1.2.10",
+    "autoprefixer": "^10.4.19",
-    "cssnano": "^7.1.1",
+    "boxen": "^7.1.1",
-    "eslint": "^9.38.0",
+    "cssnano": "^6.1.2",
-    "eslint-config-prettier": "^10.1.8",
+    "eslint": "^9.1.1",
-    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-vue": "^10.5.1",
+    "eslint-define-config": "^2.1.0",
-    "gradient-string": "^3.0.0",
+    "eslint-plugin-prettier": "^5.1.3",
-    "husky": "^9.1.7",
+    "eslint-plugin-vue": "^9.25.0",
-    "lint-staged": "^16.2.6",
+    "gradient-string": "^2.0.2",
-    "postcss": "^8.5.6",
+    "husky": "^9.0.11",
-    "postcss-html": "^1.8.0",
+    "lint-staged": "^15.2.2",
-    "postcss-load-config": "^6.0.1",
+    "postcss": "^8.4.38",
+    "postcss-html": "^1.6.0",
+    "postcss-import": "^16.1.0",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.6.2",
+    "prettier": "^3.2.5",
-    "rimraf": "^6.0.1",
+    "rimraf": "^5.0.5",
-    "rollup-plugin-visualizer": "^6.0.5",
+    "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.93.2",
+    "sass": "^1.75.0",
-    "stylelint": "^16.25.0",
+    "stylelint": "^16.3.1",
-    "stylelint-config-recess-order": "^7.4.0",
+    "stylelint-config-recess-order": "^5.0.1",
-    "stylelint-config-recommended-vue": "^1.6.1",
+    "stylelint-config-recommended-vue": "^1.5.0",
-    "stylelint-config-standard-scss": "^14.0.0",
+    "stylelint-config-standard-scss": "^13.1.0",
-    "stylelint-prettier": "^5.0.3",
+    "stylelint-prettier": "^5.0.0",
-    "svgo": "^4.0.0",
+    "svgo": "^3.2.0",
-    "tailwindcss": "^4.1.16",
+    "tailwindcss": "^3.4.3",
-    "typescript": "^5.9.3",
+    "typescript": "^5.4.5",
-    "typescript-eslint": "^8.46.2",
+    "vite": "^5.2.10",
-    "unplugin-icons": "^22.5.0",
+    "vite-plugin-cdn-import": "^0.3.5",
-    "vite": "^7.1.12",
-    "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-fake-server": "^2.2.0",
+    "vite-plugin-fake-server": "^2.1.1",
     "vite-plugin-remove-console": "^2.2.0",
     "vite-plugin-router-warn": "^1.0.0",
     "vite-svg-loader": "^5.1.0",
-    "vue-eslint-parser": "^10.2.0",
+    "vue-eslint-parser": "^9.4.2",
-    "vue-tsc": "^3.1.2"
+    "vue-tsc": "^1.8.27"
   },
   "engines": {
-    "node": "^20.19.0 || >=22.13.0",
+    "node": "^18.18.0 || ^20.9.0 || >=21.1.0",
-    "pnpm": ">=9"
+    "pnpm": ">=8.6.10"
   },
+  "packageManager": "pnpm@8.6.10",
   "pnpm": {
     "allowedDeprecatedVersions": {
-      "are-we-there-yet": "*",
       "sourcemap-codec": "*",
-      "lodash.isequal": "*",
       "domexception": "*",
       "w3c-hr-time": "*",
-      "inflight": "*",
-      "npmlog": "*",
-      "rimraf": "*",
       "stable": "*",
-      "gauge": "*",
+      "abab": "*"
-      "abab": "*",
-      "glob": "*"
     },
-    "onlyBuiltDependencies": [
+    "peerDependencyRules": {
-      "@parcel/watcher",
+      "allowedVersions": {
-      "core-js",
+        "eslint": "9"
-      "es5-ext",
+      }
-      "esbuild",
+    }
-      "typeit",
-      "vue-demi"
-    ],
-    "ignoredBuiltDependencies": [
-      "@tailwindcss/oxide"
-    ]
   }
 }

postcss.config.js

@@ -3,6 +3,10 @@
 /** @type {import('postcss-load-config').Config} */
 export default {
   plugins: {
+    "postcss-import": {},
+    "tailwindcss/nesting": {},
+    tailwindcss: {},
+    autoprefixer: {},
     ...(process.env.NODE_ENV === "production" ? { cssnano: {} } : {})
   }
 };

public/platform-config.json

@@ -1,11 +1,10 @@
 {
-  "Version": "6.2.0",
+  "Version": "5.4.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,
   "MultiTagsCache": false,
   "KeepAlive": true,
-  "Locale": "zh",
   "Layout": "vertical",
   "Theme": "light",
   "DarkMode": false,

src/App.vue

@@ -9,7 +9,6 @@
 import { defineComponent } from "vue";
 import { ElConfigProvider } from "element-plus";
 import { ReDialog } from "@/components/ReDialog";
-import en from "element-plus/es/locale/lang/en";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 
 export default defineComponent({
@@ -20,7 +19,7 @@ export default defineComponent({
   },
   computed: {
     currentLocale() {
-      return this.$storage.locale?.locale === "zh" ? zhCn : en;
+      return zhCn;
     }
   }
 });

src/api/user.ts

@@ -11,8 +11,6 @@ export type UserResult = {
     nickname: string;
     /** 当前登录用户的角色 */
     roles: Array<string>;
-    /** 按钮级别权限 */
-    permissions: Array<string>;
     /** `token` */
     accessToken: string;
     /** 用于调用刷新`accessToken`的接口时所需的`token` */

src/assets/svg/enter_outlined.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" class="iconify iconify--ant-design" 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-8"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" aria-hidden="true" class="iconify iconify--ant-design" 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-8"/></svg>

src/assets/svg/exit_screen.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3.5 4H1V3h2V1h1v2.5zM13 3V1h-1v2.5l.5.5H15V3zm-1 9.5V15h1v-2h2v-1h-2.5zM1 12v1h2v2h1v-2.5l-.5-.5zm11-1.5-.5.5h-7l-.5-.5v-5l.5-.5h7l.5.5zM10 7H6v2h4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" aria-hidden="true" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3.5 4H1V3h2V1h1v2.5zM13 3V1h-1v2.5l.5.5H15V3zm-1 9.5V15h1v-2h2v-1h-2.5zM1 12v1h2v2h1v-2.5l-.5-.5zm11-1.5-.5.5h-7l-.5-.5v-5l.5-.5h7l.5.5zM10 7H6v2h4z"/></svg>

src/assets/svg/full_screen.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3 12h10V4H3zm2-6h6v4H5zM2 6H1V2.5l.5-.5H5v1H2zm13-3.5V6h-1V3h-3V2h3.5zM14 10h1v3.5l-.5.5H11v-1h3zM2 13h3v1H1.5l-.5-.5V10h1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" aria-hidden="true" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3 12h10V4H3zm2-6h6v4H5zM2 6H1V2.5l.5-.5H5v1H2zm13-3.5V6h-1V3h-3V2h3.5zM14 10h1v3.5l-.5.5H11v-1h3zM2 13h3v1H1.5l-.5-.5V10h1z"/></svg>

src/assets/svg/globalization.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" class="globalization" viewBox="0 0 512 512"><path fill="currentColor" d="m478.33 433.6-90-218a22 22 0 0 0-40.67 0l-90 218a22 22 0 1 0 40.67 16.79L316.66 406h102.67l18.33 44.39A22 22 0 0 0 458 464a22 22 0 0 0 20.32-30.4zM334.83 362 368 281.65 401.17 362zm-66.99-19.08a22 22 0 0 0-4.89-30.7c-.2-.15-15-11.13-36.49-34.73 39.65-53.68 62.11-114.75 71.27-143.49H330a22 22 0 0 0 0-44H214V70a22 22 0 0 0-44 0v20H54a22 22 0 0 0 0 44h197.25c-9.52 26.95-27.05 69.5-53.79 108.36-31.41-41.68-43.08-68.65-43.17-68.87a22 22 0 0 0-40.58 17c.58 1.38 14.55 34.23 52.86 83.93.92 1.19 1.83 2.35 2.74 3.51-39.24 44.35-77.74 71.86-93.85 80.74a22 22 0 1 0 21.07 38.63c2.16-1.18 48.6-26.89 101.63-85.59 22.52 24.08 38 35.44 38.93 36.1a22 22 0 0 0 30.75-4.9z"/></svg>

src/assets/svg/keyboard_esc.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" class="iconify iconify--mdi" viewBox="0 0 24 24"><path fill="currentColor" d="M1 7h6v2H3v2h4v2H3v2h4v2H1zm10 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-2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" aria-hidden="true" class="iconify iconify--mdi" viewBox="0 0 24 24"><path fill="currentColor" d="M1 7h6v2H3v2h4v2H3v2h4v2H1zm10 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-2"/></svg>

src/assets/table-bar/drag.svg

@@ -1 +0,0 @@
-<svg width="32" height="32" fill="currentColor" data-icon="holder" viewBox="64 64 896 896"><path d="M300 276.5a56 56 0 1 0 56-97 56 56 0 0 0-56 97m0 284a56 56 0 1 0 56-97 56 56 0 0 0-56 97M640 228a56 56 0 1 0 112 0 56 56 0 0 0-112 0m0 284a56 56 0 1 0 112 0 56 56 0 0 0-112 0M300 844.5a56 56 0 1 0 56-97 56 56 0 0 0-56 97M640 796a56 56 0 1 0 112 0 56 56 0 0 0-112 0"/></svg>

src/components/ReDialog/index.ts

@@ -29,11 +29,9 @@ const addDialog = (options: DialogOptions) => {
 const closeDialog = (options: DialogOptions, index: number, args?: any) => {
   dialogStore.value[index].visible = false;
   options.closeCallBack && options.closeCallBack({ options, index, args });
-
-  const closeDelay = options?.closeDelay ?? 200;
   useTimeoutFn(() => {
     dialogStore.value.splice(index, 1);
-  }, closeDelay);
+  }, 200);
 };
 
 /**

src/components/ReDialog/index.vue

@@ -8,14 +8,13 @@ import {
 } from "./index";
 import { ref, computed } from "vue";
 import { isFunction } from "@pureadmin/utils";
-import Fullscreen from "~icons/ri/fullscreen-fill";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
 
 defineOptions({
   name: "ReDialog"
 });
 
-const sureBtnMap = ref({});
 const fullscreen = ref(false);
 
 const footerButtons = computed(() => {
@@ -44,26 +43,10 @@ const footerButtons = computed(() => {
             bg: true,
             popconfirm: options?.popconfirm,
             btnClick: ({ dialog: { options, index } }) => {
-              if (options?.sureBtnLoading) {
+              const done = () =>
-                sureBtnMap.value[index] = Object.assign(
-                  {},
-                  sureBtnMap.value[index],
-                  {
-                    loading: true
-                  }
-                );
-              }
-              const closeLoading = () => {
-                if (options?.sureBtnLoading) {
-                  sureBtnMap.value[index].loading = false;
-                }
-              };
-              const done = () => {
-                closeLoading();
                 closeDialog(options, index, { command: "sure" });
-              };
               if (options?.beforeSure && isFunction(options?.beforeSure)) {
-                options.beforeSure(done, { options, index, closeLoading });
+                options.beforeSure(done, { options, index });
               } else {
                 done();
               }
@@ -79,7 +62,7 @@ const fullscreenClass = computed(() => {
     "el-dialog__close",
     "-translate-x-2",
     "cursor-pointer",
-    "hover:text-[red]!"
+    "hover:!text-[red]"
   ];
 });
 
@@ -189,7 +172,6 @@ function handleClose(
           <el-button
             v-else
             v-bind="btn"
-            :loading="key === 1 && sureBtnMap[index]?.loading"
             @click="
               btn.btnClick({
                 dialog: { options, index },

src/components/ReDialog/type.ts

@@ -69,11 +69,11 @@ type DialogProps = {
 type Popconfirm = {
   /** 标题 */
   title?: string;
-  /** 确定按钮文字 */
+  /** 确认按钮文字 */
   confirmButtonText?: string;
   /** 取消按钮文字 */
   cancelButtonText?: string;
-  /** 确定按钮类型，默认 `primary` */
+  /** 确认按钮类型，默认 `primary` */
   confirmButtonType?: ButtonType;
   /** 取消按钮类型，默认 `text` */
   cancelButtonType?: ButtonType;
@@ -121,7 +121,7 @@ type ButtonProps = {
   round?: boolean;
   /** 是否为圆形按钮，默认 `false` */
   circle?: boolean;
-  /** 确定按钮的 `Popconfirm` 气泡确认框相关配置 */
+  /** 确认按钮的 `Popconfirm` 气泡确认框相关配置 */
   popconfirm?: Popconfirm;
   /** 是否为加载中状态，默认 `false` */
   loading?: boolean;
@@ -160,10 +160,8 @@ interface DialogOptions extends DialogProps {
   props?: any;
   /** 是否隐藏 `Dialog` 按钮操作区的内容 */
   hideFooter?: boolean;
-  /** 确定按钮的 `Popconfirm` 气泡确认框相关配置 */
+  /** 确认按钮的 `Popconfirm` 气泡确认框相关配置 */
   popconfirm?: Popconfirm;
-  /** 点击确定按钮后是否开启 `loading` 加载动画 */
-  sureBtnLoading?: boolean;
   /**
    * @description 自定义对话框标题的内容渲染器
    * @see {@link https://element-plus.org/zh-CN/component/dialog.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%A4%B4%E9%83%A8}
@@ -261,13 +259,10 @@ interface DialogOptions extends DialogProps {
     done: Function,
     {
       options,
-      index,
+      index
-      closeLoading
     }: {
       options: DialogOptions;
       index: number;
-      /** 关闭确定按钮的 `loading` 加载动画 */
-      closeLoading: Function;
     }
   ) => void;
 }

src/components/ReIcon/src/hooks.ts

@@ -1,10 +1,10 @@
 import type { iconType } from "./types";
 import { h, defineComponent, type Component } from "vue";
-import { FontIcon, IconifyIconOnline, IconifyIconOffline } from "../index";
+import { IconifyIconOnline, IconifyIconOffline, FontIcon } from "../index";
 
 /**
  * 支持 `iconfont`、自定义 `svg` 以及 `iconify` 中所有的图标
- * @see 点击查看文档图标篇 {@link https://pure-admin.cn/pages/icon/}
+ * @see 点击查看文档图标篇 {@link https://yiming_chang.gitee.io/pure-admin-doc/pages/icon/}
  * @param icon 必传 图标
  * @param attrs 可选 iconType 属性
  * @returns Component
@@ -49,12 +49,10 @@ export function useRenderIcon(icon: any, attrs?: iconType): Component {
     return defineComponent({
       name: "Icon",
       render() {
-        if (!icon) return;
+        const IconifyIcon =
-        const IconifyIcon = icon.includes(":")
+          icon && icon.includes(":") ? IconifyIconOnline : IconifyIconOffline;
-          ? IconifyIconOnline
-          : IconifyIconOffline;
         return h(IconifyIcon, {
-          icon,
+          icon: icon,
           ...attrs
         });
       }

src/components/ReIcon/src/iconfont.ts

@@ -27,7 +27,8 @@ export default defineComponent({
       return h(
         "svg",
         {
-          class: "icon-svg"
+          class: "icon-svg",
+          "aria-hidden": true
         },
         {
           default: () => [

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -13,35 +13,18 @@ export default defineComponent({
   render() {
     if (typeof this.icon === "object") addIcon(this.icon, this.icon);
     const attrs = this.$attrs;
-    if (typeof this.icon === "string") {
+    return h(
-      return h(
+      IconifyIcon,
-        IconifyIcon,
+      {
-        {
+        icon: this.icon,
-          icon: this.icon,
+        style: attrs?.style
-          "aria-hidden": false,
+          ? Object.assign(attrs.style, { outline: "none" })
-          style: attrs?.style
+          : { outline: "none" },
-            ? Object.assign(attrs.style, { outline: "none" })
+        ...attrs
-            : { outline: "none" },
+      },
-          ...attrs
+      {
-        },
+        default: () => []
-        {
+      }
-          default: () => []
+    );
-        }
-      );
-    } else {
-      return h(
-        this.icon,
-        {
-          "aria-hidden": false,
-          style: attrs?.style
-            ? Object.assign(attrs.style, { outline: "none" })
-            : { outline: "none" },
-          ...attrs
-        },
-        {
-          default: () => []
-        }
-      );
-    }
   }
 });

src/components/ReIcon/src/iconifyIconOnline.ts

@@ -17,7 +17,6 @@ export default defineComponent({
       IconifyIcon,
       {
         icon: `${this.icon}`,
-        "aria-hidden": false,
         style: attrs?.style
           ? Object.assign(attrs.style, { outline: "none" })
           : { outline: "none" },

src/components/ReIcon/src/offlineIcon.ts

@@ -1,23 +1,14 @@
 // 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
-import { getSvgInfo } from "@pureadmin/utils";
 import { addIcon } from "@iconify/vue/dist/offline";
 
-// https://icon-sets.iconify.design/ep/?keyword=ep
-import EpHomeFilled from "~icons/ep/home-filled?raw";
-
-// https://icon-sets.iconify.design/ri/?keyword=ri
-import RiSearchLine from "~icons/ri/search-line?raw";
-import RiInformationLine from "~icons/ri/information-line?raw";
-
-const icons = [
-  // Element Plus Icon: https://github.com/element-plus/element-plus-icons
-  ["ep/home-filled", EpHomeFilled],
-  // Remix Icon: https://github.com/Remix-Design/RemixIcon
-  ["ri/search-line", RiSearchLine],
-  ["ri/information-line", RiInformationLine]
-];
-
 // 本地菜单图标，后端在路由的 icon 中返回对应的图标字符串并且前端在此处使用 addIcon 添加即可渲染菜单图标
-icons.forEach(([name, icon]) => {
+// @iconify-icons/ep
-  addIcon(name as string, getSvgInfo(icon as string));
+import Lollipop from "@iconify-icons/ep/lollipop";
-});
+import HomeFilled from "@iconify-icons/ep/home-filled";
+addIcon("ep:lollipop", Lollipop);
+addIcon("ep:home-filled", HomeFilled);
+// @iconify-icons/ri
+import Search from "@iconify-icons/ri/search-line";
+import InformationLine from "@iconify-icons/ri/information-line";
+addIcon("ri:search-line", Search);
+addIcon("ri:information-line", InformationLine);

src/components/RePerms/index.ts

@@ -1,5 +0,0 @@
-import perms from "./src/perms";
-
-const Perms = perms;
-
-export { Perms };

src/components/RePerms/src/perms.tsx

@@ -1,20 +0,0 @@
-import { defineComponent, Fragment } from "vue";
-import { hasPerms } from "@/utils/auth";
-
-export default defineComponent({
-  name: "Perms",
-  props: {
-    value: {
-      type: undefined,
-      default: []
-    }
-  },
-  setup(props, { slots }) {
-    return () => {
-      if (!slots) return null;
-      return hasPerms(props.value) ? (
-        <Fragment>{slots.default?.()}</Fragment>
-      ) : null;
-    };
-  }
-});

src/components/RePureTableBar/src/bar.tsx

@@ -1,5 +1,4 @@
 import Sortable from "sortablejs";
-import { transformI18n } from "@/plugins/i18n";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import {
   type PropType,
@@ -18,13 +17,11 @@ import {
   getKeyList
 } from "@pureadmin/utils";
 
-import Fullscreen from "~icons/ri/fullscreen-fill";
+import DragIcon from "./svg/drag.svg?component";
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
+import ExpandIcon from "./svg/expand.svg?component";
-import DragIcon from "@/assets/table-bar/drag.svg?component";
+import RefreshIcon from "./svg/refresh.svg?component";
-import ExpandIcon from "@/assets/table-bar/expand.svg?component";
+import SettingIcon from "./svg/settings.svg?component";
-import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
+import CollapseIcon from "./svg/collapse.svg?component";
-import SettingIcon from "@/assets/table-bar/settings.svg?component";
-import CollapseIcon from "@/assets/table-bar/collapse.svg?component";
 
 const props = {
   /** 头部最左边的标题 */
@@ -54,12 +51,11 @@ const props = {
 export default defineComponent({
   name: "PureTableBar",
   props,
-  emits: ["refresh", "fullscreen"],
+  emits: ["refresh"],
   setup(props, { emit, slots, attrs }) {
     const size = ref("default");
     const loading = ref(false);
     const checkAll = ref(true);
-    const isFullscreen = ref(false);
     const isIndeterminate = ref(false);
     const instance = getCurrentInstance()!;
     const isExpandAll = ref(props.isExpandAll);
@@ -87,9 +83,9 @@ export default defineComponent({
         "text-black",
         "dark:text-white",
         "duration-100",
-        "hover:text-primary!",
+        "hover:!text-primary",
         "cursor-pointer",
-        "outline-hidden"
+        "outline-none"
       ];
     });
 
@@ -117,11 +113,6 @@ export default defineComponent({
       toggleRowExpansionAll(props.tableRef.data, isExpandAll.value);
     }
 
-    function onFullscreen() {
-      isFullscreen.value = !isFullscreen.value;
-      emit("fullscreen", isFullscreen.value);
-    }
-
     function toggleRowExpansionAll(data, isExpansion) {
       data.forEach(item => {
         props.tableRef.toggleRowExpansion(item, isExpansion);
@@ -148,9 +139,7 @@ export default defineComponent({
     }
 
     function handleCheckColumnListChange(val: boolean, label: string) {
-      dynamicColumns.value.filter(
+      dynamicColumns.value.filter(item => item.label === label)[0].hide = !val;
-        item => transformI18n(item.label) === transformI18n(label)
-      )[0].hide = !val;
     }
 
     async function onReset() {
@@ -223,9 +212,7 @@ export default defineComponent({
     };
 
     const isFixedColumn = (label: string) => {
-      return dynamicColumns.value.filter(
+      return dynamicColumns.value.filter(item => item.label === label)[0].fixed
-        item => transformI18n(item.label) === transformI18n(label)
-      )[0].fixed
         ? true
         : false;
     };
@@ -252,18 +239,7 @@ export default defineComponent({
 
     return () => (
       <>
-        <div
+        <div {...attrs} class="w-[99/100] mt-2 px-2 pb-2 bg-bg_color">
-          {...attrs}
-          class={[
-            "w-full",
-            "px-2",
-            "pb-2",
-            "bg-bg_color",
-            isFullscreen.value
-              ? ["h-full!", "z-2002", "fixed", "inset-0"]
-              : "mt-2"
-          ]}
-        >
           <div class="flex justify-between w-full h-[60px] p-4">
             {slots?.title ? (
               slots.title()
@@ -317,7 +293,7 @@ export default defineComponent({
               >
                 <div class={[topClass.value]}>
                   <el-checkbox
-                    class="-mr-1!"
+                    class="!-mr-1"
                     label="列展示"
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
@@ -347,8 +323,8 @@ export default defineComponent({
                                 class={[
                                   "drag-btn w-[16px] mr-2",
                                   isFixedColumn(item)
-                                    ? "cursor-no-drop!"
+                                    ? "!cursor-no-drop"
-                                    : "cursor-grab!"
+                                    : "!cursor-grab"
                                 ]}
                                 onMouseenter={(event: {
                                   preventDefault: () => void;
@@ -363,10 +339,10 @@ export default defineComponent({
                                 }
                               >
                                 <span
-                                  title={transformI18n(item)}
+                                  title={item}
                                   class="inline-block w-[120px] truncate hover:text-text_color_primary"
                                 >
-                                  {transformI18n(item)}
+                                  {item}
                                 </span>
                               </el-checkbox>
                             </div>
@@ -377,14 +353,6 @@ export default defineComponent({
                   </el-scrollbar>
                 </div>
               </el-popover>
-              <el-divider direction="vertical" />
-
-              <iconifyIconOffline
-                class={["w-[16px]", iconClass.value]}
-                icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
-                v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
-                onClick={() => onFullscreen()}
-              />
             </div>
           </div>
           {slots.default({

src/components/RePureTableBar/src/svg/drag.svg

@@ -0,0 +1 @@
+<svg width="32" height="32" fill="currentColor" aria-hidden="true" data-icon="holder" viewBox="64 64 896 896"><path d="M300 276.5a56 56 0 1 0 56-97 56 56 0 0 0-56 97m0 284a56 56 0 1 0 56-97 56 56 0 0 0-56 97M640 228a56 56 0 1 0 112 0 56 56 0 0 0-112 0m0 284a56 56 0 1 0 112 0 56 56 0 0 0-112 0M300 844.5a56 56 0 1 0 56-97 56 56 0 0 0-56 97M640 796a56 56 0 1 0 112 0 56 56 0 0 0-112 0"/></svg>

src/components/ReSegmented/src/index.css

@@ -98,6 +98,7 @@
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  transition: 0.1s;
 }
 
 .pure-segmented-group {

src/components/ReSegmented/src/index.tsx

@@ -127,9 +127,7 @@ export default defineComponent({
       }
     );
 
-    watch(() => props.size, handleResizeInit, {
+    watch(() => props.size, handleResizeInit);
-      immediate: true
-    });
 
     const rendLabel = () => {
       return props.options.map((option, index) => {

src/components/ReSegmented/src/type.ts

@@ -6,7 +6,7 @@ export interface OptionsType {
   label?: string | (() => VNode | Component);
   /**
    * @description 图标，采用平台内置的 `useRenderIcon` 函数渲染
-   * @see {@link 用法参考 https://pure-admin.cn/pages/icon/#%E9%80%9A%E7%94%A8%E5%9B%BE%E6%A0%87-userendericon-hooks }
+   * @see {@link 用法参考 https://yiming_chang.gitee.io/pure-admin-doc/pages/icon/#%E9%80%9A%E7%94%A8%E5%9B%BE%E6%A0%87-userendericon-hooks }
    */
   icon?: string | Component;
   /** 图标属性、样式配置 */

src/components/ReText/src/index.vue

@@ -1,6 +1,6 @@
-<script setup lang="ts">
+<script lang="ts" setup>
-import { h, onMounted, ref } from "vue";
+import { h, onMounted, ref, useSlots } from "vue";
-import { type TippyOptions, type TippyContent, useTippy } from "vue-tippy";
+import { type TippyOptions, useTippy } from "vue-tippy";
 
 defineOptions({
   name: "ReText"
@@ -17,10 +17,7 @@ const props = defineProps({
   }
 });
 
-const slots = defineSlots<{
+const $slots = useSlots();
-  content: () => TippyContent;
-  default: () => any;
-}>();
 
 const textRef = ref();
 const tippyFunc = ref();
@@ -36,7 +33,7 @@ const isTextEllipsis = (el: HTMLElement) => {
 };
 
 const getTippyProps = () => ({
-  content: h(slots.content || slots.default),
+  content: h($slots.content || $slots.default),
   ...props.tippyProps
 });
 

src/directives/auth/index.ts

@@ -2,7 +2,7 @@ import { hasAuth } from "@/router/utils";
 import type { Directive, DirectiveBinding } from "vue";
 
 export const auth: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding<string | Array<string>>) {
+  mounted(el: HTMLElement, binding: DirectiveBinding) {
     const { value } = binding;
     if (value) {
       !hasAuth(value) && el.parentNode?.removeChild(el);

src/directives/copy/index.ts

@@ -3,13 +3,13 @@ import { useEventListener } from "@vueuse/core";
 import { copyTextToClipboard } from "@pureadmin/utils";
 import type { Directive, DirectiveBinding } from "vue";
 
-export interface CopyEl extends HTMLElement {
+interface CopyEl extends HTMLElement {
   copyValue: string;
 }
 
 /** 文本复制指令（默认双击复制） */
 export const copy: Directive = {
-  mounted(el: CopyEl, binding: DirectiveBinding<string>) {
+  mounted(el: CopyEl, binding: DirectiveBinding) {
     const { value } = binding;
     if (value) {
       el.copyValue = value;

src/directives/index.ts

@@ -2,5 +2,4 @@ export * from "./auth";
 export * from "./copy";
 export * from "./longpress";
 export * from "./optimize";
-export * from "./perms";
 export * from "./ripple";

src/directives/longpress/index.ts

@@ -3,7 +3,7 @@ import type { Directive, DirectiveBinding } from "vue";
 import { subBefore, subAfter, isFunction } from "@pureadmin/utils";
 
 export const longpress: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding<Function>) {
+  mounted(el: HTMLElement, binding: DirectiveBinding) {
     const cb = binding.value;
     if (cb && isFunction(cb)) {
       let timer = null;

src/directives/optimize/index.ts

@@ -8,22 +8,9 @@ import {
 import { useEventListener } from "@vueuse/core";
 import type { Directive, DirectiveBinding } from "vue";
 
-export interface OptimizeOptions {
-  /** 事件名 */
-  event: string;
-  /** 事件触发的方法 */
-  fn: (...params: any) => any;
-  /** 是否立即执行 */
-  immediate?: boolean;
-  /** 防抖或节流的延迟时间（防抖默认：`200`毫秒、节流默认：`1000`毫秒） */
-  timeout?: number;
-  /** 传递的参数 */
-  params?: any;
-}
-
 /** 防抖（v-optimize或v-optimize:debounce）、节流（v-optimize:throttle）指令 */
 export const optimize: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding<OptimizeOptions>) {
+  mounted(el: HTMLElement, binding: DirectiveBinding) {
     const { value } = binding;
     const optimizeType = binding.arg ?? "debounce";
     const type = ["debounce", "throttle"].find(t => t === optimizeType);

src/directives/perms/index.ts

@@ -1,15 +0,0 @@
-import { hasPerms } from "@/utils/auth";
-import type { Directive, DirectiveBinding } from "vue";
-
-export const perms: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding<string | Array<string>>) {
-    const { value } = binding;
-    if (value) {
-      !hasPerms(value) && el.parentNode?.removeChild(el);
-    } else {
-      throw new Error(
-        "[Directive: perms]: need perms! Like v-perms=\"['btn.add','btn.edit']\""
-      );
-    }
-  }
-};

src/directives/ripple/index.scss

@@ -13,10 +13,10 @@ $ripple-animation-visible-opacity: 0.25 !default;
     z-index: 0;
     width: 100%;
     height: 100%;
-    contain: strict;
     overflow: hidden;
     pointer-events: none;
     border-radius: inherit;
+    contain: strict;
   }
 
   &__animation {

src/directives/ripple/index.ts

@@ -2,10 +2,8 @@ import "./index.scss";
 import { isObject } from "@pureadmin/utils";
 import type { Directive, DirectiveBinding } from "vue";
 
-export interface RippleOptions {
+interface RippleOptions {
-  /** 自定义`ripple`颜色，支持`tailwindcss` */
   class?: string;
-  /** 是否从中心扩散 */
   center?: boolean;
   circle?: boolean;
 }
@@ -32,8 +30,8 @@ const calculate = (
   const offset = el.getBoundingClientRect();
 
   // 获取点击位置距离 el 的垂直和水平距离
-  const localX = e.clientX - offset.left;
+  let localX = e.clientX - offset.left;
-  const localY = e.clientY - offset.top;
+  let localY = e.clientY - offset.top;
 
   let radius = 0;
   let scale = 0.3;
@@ -222,6 +220,13 @@ function updated(el: HTMLElement, binding: RippleDirectiveBinding) {
   updateRipple(el, binding, wasEnabled);
 }
 
+/**
+ * @description 指令 v-ripple
+ * @use 用法如下
+ * 1. v-ripple 代表启用基本的 ripple 功能
+ * 2. v-ripple="{ class: 'text-red' }" 代表自定义 ripple 颜色，支持 tailwindcss，生效样式是 color
+ * 3. v-ripple.center 代表从中心扩散
+ */
 export const Ripple: Directive = {
   mounted,
   unmounted,

src/layout/components/appMain.vue

@@ -1,10 +1,8 @@
 <script setup lang="ts">
-import { useI18n } from "vue-i18n";
+import Footer from "./footer/index.vue";
-import LayFrame from "../lay-frame/index.vue";
-import LayFooter from "../lay-footer/index.vue";
-import { useTags } from "@/layout/hooks/useTag";
 import { useGlobal, isNumber } from "@pureadmin/utils";
-import BackTopIcon from "@/assets/svg/back_top.svg?component";
+import KeepAliveFrame from "./keepAliveFrame/index.vue";
+import backTop from "@/assets/svg/back_top.svg?component";
 import { h, computed, Transition, defineComponent } from "vue";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 
@@ -12,8 +10,6 @@ const props = defineProps({
   fixedHeader: Boolean
 });
 
-const { t } = useI18n();
-const { showModel } = useTags();
 const { $storage, $config } = useGlobal<GlobalPropertiesApi>();
 
 const isKeepAlive = computed(() => {
@@ -53,17 +49,9 @@ const getMainWidth = computed(() => {
 const getSectionStyle = computed(() => {
   return [
     hideTabs.value && layout ? "padding-top: 48px;" : "",
-    !hideTabs.value && layout
+    !hideTabs.value && layout ? "padding-top: 81px;" : "",
-      ? showModel.value == "chrome"
-        ? "padding-top: 85px;"
-        : "padding-top: 81px;"
-      : "",
     hideTabs.value && !layout.value ? "padding-top: 48px;" : "",
-    !hideTabs.value && !layout.value
+    !hideTabs.value && !layout.value ? "padding-top: 81px;" : "",
-      ? showModel.value == "chrome"
-        ? "padding-top: 85px;"
-        : "padding-top: 81px;"
-      : "",
     props.fixedHeader
       ? ""
       : `padding-top: 0;${
@@ -109,15 +97,15 @@ const transitionMain = defineComponent({
 
 <template>
   <section
-    :class="[fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
+    :class="[props.fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
     :style="getSectionStyle"
   >
     <router-view>
       <template #default="{ Component, route }">
-        <LayFrame :currComp="Component" :currRoute="route">
+        <KeepAliveFrame :currComp="Component" :currRoute="route">
           <template #default="{ Comp, fullPath, frameInfo }">
             <el-scrollbar
-              v-if="fixedHeader"
+              v-if="props.fixedHeader"
               :wrap-style="{
                 display: 'flex',
                 'flex-wrap': 'wrap',
@@ -133,10 +121,10 @@ const transitionMain = defineComponent({
               }"
             >
               <el-backtop
-                :title="t('buttons.pureBackTop')"
+                title="回到顶部"
                 target=".app-main .el-scrollbar__wrap"
               >
-                <BackTopIcon />
+                <backTop />
               </el-backtop>
               <div class="grow">
                 <transitionMain :route="route">
@@ -160,7 +148,7 @@ const transitionMain = defineComponent({
                   />
                 </transitionMain>
               </div>
-              <LayFooter v-if="!hideFooter" />
+              <Footer v-if="!hideFooter" />
             </el-scrollbar>
             <div v-else class="grow">
               <transitionMain :route="route">
@@ -185,12 +173,12 @@ const transitionMain = defineComponent({
               </transitionMain>
             </div>
           </template>
-        </LayFrame>
+        </KeepAliveFrame>
       </template>
     </router-view>
 
     <!-- 页脚 -->
-    <LayFooter v-if="!hideFooter && !fixedHeader" />
+    <Footer v-if="!hideFooter && !props.fixedHeader" />
   </section>
 </template>
 

src/layout/components/footer/index.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { getConfig } from "@/config";
 
 const TITLE = getConfig("Title");
@@ -10,7 +10,7 @@ const TITLE = getConfig("Title");
   >
     Copyright © 2020-present
     <a
-      class="hover:text-primary!"
+      class="hover:text-primary"
       href="https://github.com/pure-admin"
       target="_blank"
     >

src/layout/components/keepAliveFrame/index.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { getConfig } from "@/config";
-import { useMultiFrame } from "@/layout/hooks/useMultiFrame";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { type Component, shallowRef, watch, computed } from "vue";
 import { type RouteRecordRaw, RouteLocationNormalizedLoaded } from "vue-router";
+import { useMultiFrame } from "@/layout/components/keepAliveFrame/useMultiFrame";
 
 const props = defineProps<{
   currRoute: RouteLocationNormalizedLoaded;
@@ -20,7 +20,7 @@ const keep = computed(() => {
     !!props.currRoute.meta?.frameSrc
   );
 });
-// 避免重新渲染 LayFrame
+// 避免重新渲染 frameView
 const normalComp = computed(() => !keep.value && props.currComp);
 
 watch(useMultiTagsStoreHook().multiTags, (tags: any) => {
@@ -65,7 +65,7 @@ watch(
 </script>
 <template>
   <template v-for="[fullPath, Comp] in compList" :key="fullPath">
-    <div v-show="fullPath === currRoute.fullPath" class="w-full h-full">
+    <div v-show="fullPath === props.currRoute.fullPath" class="w-full h-full">
       <slot
         :fullPath="fullPath"
         :Comp="Comp"
@@ -74,6 +74,6 @@ watch(
     </div>
   </template>
   <div v-show="!keep" class="w-full h-full">
-    <slot :Comp="normalComp" :fullPath="currRoute.fullPath" frameInfo />
+    <slot :Comp="normalComp" :fullPath="props.currRoute.fullPath" frameInfo />
   </div>
 </template>

src/layout/components/lay-navbar/index.vue

@@ -1,190 +0,0 @@
-<script setup lang="ts">
-import { useNav } from "@/layout/hooks/useNav";
-import LaySearch from "../lay-search/index.vue";
-import LayNotice from "../lay-notice/index.vue";
-import LayNavMix from "../lay-sidebar/NavMix.vue";
-import { useTranslationLang } from "@/layout/hooks/useTranslationLang";
-import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
-import LaySidebarBreadCrumb from "../lay-sidebar/components/SidebarBreadCrumb.vue";
-import LaySidebarTopCollapse from "../lay-sidebar/components/SidebarTopCollapse.vue";
-
-import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
-import LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
-import Setting from "~icons/ri/settings-3-line";
-import Check from "~icons/ep/check";
-
-const {
-  layout,
-  device,
-  logout,
-  onPanel,
-  pureApp,
-  username,
-  userAvatar,
-  avatarsStyle,
-  toggleSideBar,
-  getDropdownItemStyle,
-  getDropdownItemClass
-} = useNav();
-
-const { t, locale, translationCh, translationEn } = useTranslationLang();
-</script>
-
-<template>
-  <div class="navbar bg-[#fff] shadow-xs shadow-[rgba(0,21,41,0.08)]">
-    <LaySidebarTopCollapse
-      v-if="device === 'mobile'"
-      class="hamburger-container"
-      :is-active="pureApp.sidebar.opened"
-      @toggleClick="toggleSideBar"
-    />
-
-    <LaySidebarBreadCrumb
-      v-if="layout !== 'mix' && device !== 'mobile'"
-      class="breadcrumb-container"
-    />
-
-    <LayNavMix v-if="layout === 'mix'" />
-
-    <div v-if="layout === 'vertical'" class="vertical-header-right">
-      <!-- 菜单搜索 -->
-      <LaySearch id="header-search" />
-      <!-- 国际化 -->
-      <el-dropdown id="header-translation" trigger="click">
-        <GlobalizationIcon
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
-        />
-        <template #dropdown>
-          <el-dropdown-menu class="translation">
-            <el-dropdown-item
-              :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:text-white!', getDropdownItemClass(locale, 'zh')]"
-              @click="translationCh"
-            >
-              <IconifyIconOffline
-                v-show="locale === 'zh'"
-                class="check-zh"
-                :icon="Check"
-              />
-              简体中文
-            </el-dropdown-item>
-            <el-dropdown-item
-              :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:text-white!', getDropdownItemClass(locale, 'en')]"
-              @click="translationEn"
-            >
-              <span v-show="locale === 'en'" class="check-en">
-                <IconifyIconOffline :icon="Check" />
-              </span>
-              English
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
-      <!-- 全屏 -->
-      <LaySidebarFullScreen id="full-screen" />
-      <!-- 消息通知 -->
-      <LayNotice id="header-notice" />
-      <!-- 退出登录 -->
-      <el-dropdown trigger="click">
-        <span class="el-dropdown-link navbar-bg-hover select-none">
-          <img :src="userAvatar" :style="avatarsStyle" />
-          <p v-if="username" class="dark:text-white">{{ username }}</p>
-        </span>
-        <template #dropdown>
-          <el-dropdown-menu class="logout">
-            <el-dropdown-item @click="logout">
-              <IconifyIconOffline
-                :icon="LogoutCircleRLine"
-                style="margin: 5px"
-              />
-              {{ t("buttons.pureLoginOut") }}
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
-      <span
-        class="set-icon navbar-bg-hover"
-        :title="t('buttons.pureOpenSystemSet')"
-        @click="onPanel"
-      >
-        <IconifyIconOffline :icon="Setting" />
-      </span>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.navbar {
-  width: 100%;
-  height: 48px;
-  overflow: hidden;
-
-  .hamburger-container {
-    float: left;
-    height: 100%;
-    line-height: 48px;
-    cursor: pointer;
-  }
-
-  .vertical-header-right {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    min-width: 280px;
-    height: 48px;
-    color: #000000d9;
-
-    .el-dropdown-link {
-      display: flex;
-      align-items: center;
-      justify-content: space-around;
-      height: 48px;
-      padding: 10px;
-      color: #000000d9;
-      cursor: pointer;
-
-      p {
-        font-size: 14px;
-      }
-
-      img {
-        width: 22px;
-        height: 22px;
-        border-radius: 50%;
-      }
-    }
-  }
-
-  .breadcrumb-container {
-    float: left;
-    margin-left: 16px;
-  }
-}
-
-.translation {
-  ::v-deep(.el-dropdown-menu__item) {
-    padding: 5px 40px;
-  }
-
-  .check-zh {
-    position: absolute;
-    left: 20px;
-  }
-
-  .check-en {
-    position: absolute;
-    left: 20px;
-  }
-}
-
-.logout {
-  width: 120px;
-
-  ::v-deep(.el-dropdown-menu__item) {
-    display: inline-flex;
-    flex-wrap: wrap;
-    min-width: 100%;
-  }
-}
-</style>

src/layout/components/lay-notice/components/NoticeList.vue

@@ -1,24 +0,0 @@
-<script setup lang="ts">
-import { PropType } from "vue";
-import { ListItem } from "../data";
-import NoticeItem from "./NoticeItem.vue";
-import { transformI18n } from "@/plugins/i18n";
-
-defineProps({
-  list: {
-    type: Array as PropType<Array<ListItem>>,
-    default: () => []
-  },
-  emptyText: {
-    type: String,
-    default: ""
-  }
-});
-</script>
-
-<template>
-  <div v-if="list.length">
-    <NoticeItem v-for="(item, index) in list" :key="index" :noticeItem="item" />
-  </div>
-  <el-empty v-else :description="transformI18n(emptyText)" />
-</template>

src/layout/components/lay-notice/data.ts

@@ -1,99 +0,0 @@
-import { $t } from "@/plugins/i18n";
-
-export interface ListItem {
-  avatar: string;
-  title: string;
-  datetime: string;
-  type: string;
-  description: string;
-  status?: "primary" | "success" | "warning" | "info" | "danger";
-  extra?: string;
-}
-
-export interface TabItem {
-  key: string;
-  name: string;
-  list: ListItem[];
-  emptyText: string;
-}
-
-export const noticesData: TabItem[] = [
-  {
-    key: "1",
-    name: $t("status.pureNotify"),
-    list: [],
-    emptyText: $t("status.pureNoNotify")
-  },
-  {
-    key: "2",
-    name: $t("status.pureMessage"),
-    list: [
-      {
-        avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile1.svg",
-        title: "小铭 评论了你",
-        description: "诚在于心，信在于行，诚信在于心行合一。",
-        datetime: "今天",
-        type: "2"
-      },
-      {
-        avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile2.svg",
-        title: "李白 回复了你",
-        description: "长风破浪会有时，直挂云帆济沧海。",
-        datetime: "昨天",
-        type: "2"
-      },
-      {
-        avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile5.svg",
-        title: "标题",
-        description:
-          "请将鼠标移动到此处，以便测试超长的消息在此处将如何处理。本例中设置的描述最大行数为2，超过2行的描述内容将被省略并且可以通过tooltip查看完整内容",
-        datetime: "时间",
-        type: "2"
-      }
-    ],
-    emptyText: $t("status.pureNoMessage")
-  },
-  {
-    key: "3",
-    name: $t("status.pureTodo"),
-    list: [
-      {
-        avatar: "",
-        title: "第三方紧急代码变更",
-        description:
-          "小林提交于 2024-05-10，需在 2024-05-11 前完成代码变更任务",
-        datetime: "",
-        extra: "马上到期",
-        status: "danger",
-        type: "3"
-      },
-      {
-        avatar: "",
-        title: "版本发布",
-        description: "指派小铭于 2024-06-18 前完成更新并发布",
-        datetime: "",
-        extra: "已耗时 8 天",
-        status: "warning",
-        type: "3"
-      },
-      {
-        avatar: "",
-        title: "新功能开发",
-        description: "开发多租户管理",
-        datetime: "",
-        extra: "进行中",
-        type: "3"
-      },
-      {
-        avatar: "",
-        title: "任务名称",
-        description: "任务需要在 2030-10-30 10:00 前启动",
-        datetime: "",
-        extra: "未开始",
-        status: "info",
-        type: "3"
-      }
-    ],
-    emptyText: $t("status.pureNoTodo")
-  }
-];

src/layout/components/lay-sidebar/NavHorizontal.vue

@@ -1,175 +0,0 @@
-<script setup lang="ts">
-import { emitter } from "@/utils/mitt";
-import { useNav } from "@/layout/hooks/useNav";
-import LaySearch from "../lay-search/index.vue";
-import LayNotice from "../lay-notice/index.vue";
-import { responsiveStorageNameSpace } from "@/config";
-import { ref, nextTick, computed, onMounted } from "vue";
-import { storageLocal, isAllEmpty } from "@pureadmin/utils";
-import { useTranslationLang } from "../../hooks/useTranslationLang";
-import { usePermissionStoreHook } from "@/store/modules/permission";
-import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
-import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
-
-import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
-import LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
-import Setting from "~icons/ri/settings-3-line";
-import Check from "~icons/ep/check";
-
-const menuRef = ref();
-const showLogo = ref(
-  storageLocal().getItem<StorageConfigs>(
-    `${responsiveStorageNameSpace()}configure`
-  )?.showLogo ?? true
-);
-
-const { t, route, locale, translationCh, translationEn } =
-  useTranslationLang(menuRef);
-const {
-  title,
-  logout,
-  onPanel,
-  getLogo,
-  username,
-  userAvatar,
-  backTopMenu,
-  avatarsStyle,
-  getDropdownItemStyle,
-  getDropdownItemClass
-} = useNav();
-
-const defaultActive = computed(() =>
-  !isAllEmpty(route.meta?.activePath) ? route.meta.activePath : route.path
-);
-
-nextTick(() => {
-  menuRef.value?.handleResize();
-});
-
-onMounted(() => {
-  emitter.on("logoChange", key => {
-    showLogo.value = key;
-  });
-});
-</script>
-
-<template>
-  <div
-    v-loading="usePermissionStoreHook().wholeMenus.length === 0"
-    class="horizontal-header"
-  >
-    <div v-if="showLogo" class="horizontal-header-left" @click="backTopMenu">
-      <img :src="getLogo()" alt="logo" />
-      <span>{{ title }}</span>
-    </div>
-    <el-menu
-      ref="menuRef"
-      mode="horizontal"
-      popper-class="pure-scrollbar"
-      class="horizontal-header-menu"
-      :default-active="defaultActive"
-    >
-      <LaySidebarItem
-        v-for="route in usePermissionStoreHook().wholeMenus"
-        :key="route.path"
-        :item="route"
-        :base-path="route.path"
-      />
-    </el-menu>
-    <div class="horizontal-header-right">
-      <!-- 菜单搜索 -->
-      <LaySearch id="header-search" />
-      <!-- 国际化 -->
-      <el-dropdown id="header-translation" trigger="click">
-        <GlobalizationIcon
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
-        />
-        <template #dropdown>
-          <el-dropdown-menu class="translation">
-            <el-dropdown-item
-              :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:text-white!', getDropdownItemClass(locale, 'zh')]"
-              @click="translationCh"
-            >
-              <span v-show="locale === 'zh'" class="check-zh">
-                <IconifyIconOffline :icon="Check" />
-              </span>
-              简体中文
-            </el-dropdown-item>
-            <el-dropdown-item
-              :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:text-white!', getDropdownItemClass(locale, 'en')]"
-              @click="translationEn"
-            >
-              <span v-show="locale === 'en'" class="check-en">
-                <IconifyIconOffline :icon="Check" />
-              </span>
-              English
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
-      <!-- 全屏 -->
-      <LaySidebarFullScreen id="full-screen" />
-      <!-- 消息通知 -->
-      <LayNotice id="header-notice" />
-      <!-- 退出登录 -->
-      <el-dropdown trigger="click">
-        <span class="el-dropdown-link navbar-bg-hover">
-          <img :src="userAvatar" :style="avatarsStyle" />
-          <p v-if="username" class="dark:text-white">{{ username }}</p>
-        </span>
-        <template #dropdown>
-          <el-dropdown-menu class="logout">
-            <el-dropdown-item @click="logout">
-              <IconifyIconOffline
-                :icon="LogoutCircleRLine"
-                style="margin: 5px"
-              />
-              {{ t("buttons.pureLoginOut") }}
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
-      <span
-        class="set-icon navbar-bg-hover"
-        :title="t('buttons.pureOpenSystemSet')"
-        @click="onPanel"
-      >
-        <IconifyIconOffline :icon="Setting" />
-      </span>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-loading-mask) {
-  opacity: 0.45;
-}
-
-.translation {
-  ::v-deep(.el-dropdown-menu__item) {
-    padding: 5px 40px;
-  }
-
-  .check-zh {
-    position: absolute;
-    left: 20px;
-  }
-
-  .check-en {
-    position: absolute;
-    left: 20px;
-  }
-}
-
-.logout {
-  width: 120px;
-
-  ::v-deep(.el-dropdown-menu__item) {
-    display: inline-flex;
-    flex-wrap: wrap;
-    min-width: 100%;
-  }
-}
-</style>

src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue

@@ -1,38 +0,0 @@
-<script setup lang="ts">
-import { useI18n } from "vue-i18n";
-import MenuFold from "~icons/ri/menu-fold-fill";
-import MenuUnfold from "~icons/ri/menu-unfold-fill";
-
-interface Props {
-  isActive?: boolean;
-}
-
-withDefaults(defineProps<Props>(), {
-  isActive: false
-});
-
-const { t } = useI18n();
-
-const emit = defineEmits<{
-  (e: "toggleClick"): void;
-}>();
-
-const toggleClick = () => {
-  emit("toggleClick");
-};
-</script>
-
-<template>
-  <div
-    class="px-3 mr-1 navbar-bg-hover"
-    :title="
-      isActive ? t('buttons.pureClickCollapse') : t('buttons.pureClickExpand')
-    "
-    @click="toggleClick"
-  >
-    <IconifyIconOffline
-      :icon="isActive ? MenuFold : MenuUnfold"
-      class="inline-block! align-middle hover:text-primary dark:hover:text-white!"
-    />
-  </div>
-</template>

src/layout/components/lay-tag/components/TagChrome.vue

@@ -1,33 +0,0 @@
-<template>
-  <svg class="w-full h-full">
-    <defs>
-      <symbol id="geometry-left" viewBox="0 0 214 36">
-        <path d="M17 0h197v36H0v-2c4.5 0 9-3.5 9-8V8c0-4.5 3.5-8 8-8z" />
-      </symbol>
-      <symbol id="geometry-right" viewBox="0 0 214 36">
-        <use xlink:href="#geometry-left" />
-      </symbol>
-      <clipPath>
-        <rect width="100%" height="100%" x="0" />
-      </clipPath>
-    </defs>
-    <svg width="51%" height="100%">
-      <use
-        xlink:href="#geometry-left"
-        width="214"
-        height="36"
-        fill="currentColor"
-      />
-    </svg>
-    <g transform="scale(-1, 1)">
-      <svg width="51%" height="100%" x="-100%" y="0">
-        <use
-          xlink:href="#geometry-right"
-          width="214"
-          height="36"
-          fill="currentColor"
-        />
-      </svg>
-    </g>
-  </svg>
-</template>

src/layout/components/navbar.vue

@@ -0,0 +1,134 @@
+<script setup lang="ts">
+import Search from "./search/index.vue";
+import Notice from "./notice/index.vue";
+import mixNav from "./sidebar/mixNav.vue";
+import { useNav } from "@/layout/hooks/useNav";
+import FullScreen from "./sidebar/fullScreen.vue";
+import Breadcrumb from "./sidebar/breadCrumb.vue";
+import topCollapse from "./sidebar/topCollapse.vue";
+import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
+import Setting from "@iconify-icons/ri/settings-3-line";
+
+const {
+  layout,
+  device,
+  logout,
+  onPanel,
+  pureApp,
+  username,
+  userAvatar,
+  avatarsStyle,
+  toggleSideBar
+} = useNav();
+</script>
+
+<template>
+  <div class="navbar bg-[#fff] shadow-sm shadow-[rgba(0,21,41,0.08)]">
+    <topCollapse
+      v-if="device === 'mobile'"
+      class="hamburger-container"
+      :is-active="pureApp.sidebar.opened"
+      @toggleClick="toggleSideBar"
+    />
+
+    <Breadcrumb
+      v-if="layout !== 'mix' && device !== 'mobile'"
+      class="breadcrumb-container"
+    />
+
+    <mixNav v-if="layout === 'mix'" />
+
+    <div v-if="layout === 'vertical'" class="vertical-header-right">
+      <!-- 菜单搜索 -->
+      <Search id="header-search" />
+      <!-- 全屏 -->
+      <FullScreen id="full-screen" />
+      <!-- 消息通知 -->
+      <Notice id="header-notice" />
+      <!-- 退出登录 -->
+      <el-dropdown trigger="click">
+        <span class="el-dropdown-link navbar-bg-hover select-none">
+          <img :src="userAvatar" :style="avatarsStyle" />
+          <p v-if="username" class="dark:text-white">{{ username }}</p>
+        </span>
+        <template #dropdown>
+          <el-dropdown-menu class="logout">
+            <el-dropdown-item @click="logout">
+              <IconifyIconOffline
+                :icon="LogoutCircleRLine"
+                style="margin: 5px"
+              />
+              退出系统
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+      <span
+        class="set-icon navbar-bg-hover"
+        title="打开系统配置"
+        @click="onPanel"
+      >
+        <IconifyIconOffline :icon="Setting" />
+      </span>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.navbar {
+  width: 100%;
+  height: 48px;
+  overflow: hidden;
+
+  .hamburger-container {
+    float: left;
+    height: 100%;
+    line-height: 48px;
+    cursor: pointer;
+  }
+
+  .vertical-header-right {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    min-width: 280px;
+    height: 48px;
+    color: #000000d9;
+
+    .el-dropdown-link {
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      height: 48px;
+      padding: 10px;
+      color: #000000d9;
+      cursor: pointer;
+
+      p {
+        font-size: 14px;
+      }
+
+      img {
+        width: 22px;
+        height: 22px;
+        border-radius: 50%;
+      }
+    }
+  }
+
+  .breadcrumb-container {
+    float: left;
+    margin-left: 16px;
+  }
+}
+
+.logout {
+  width: 120px;
+
+  ::v-deep(.el-dropdown-menu__item) {
+    display: inline-flex;
+    flex-wrap: wrap;
+    min-width: 100%;
+  }
+}
+</style>

src/layout/components/notice/data.ts

@@ -0,0 +1,146 @@
+export interface ListItem {
+  avatar: string;
+  title: string;
+  datetime: string;
+  type: string;
+  description: string;
+  status?: "primary" | "success" | "warning" | "info" | "danger";
+  extra?: string;
+}
+
+export interface TabItem {
+  key: string;
+  name: string;
+  list: ListItem[];
+}
+
+export const noticesData: TabItem[] = [
+  {
+    key: "1",
+    name: "通知",
+    list: [
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png",
+        title: "你收到了 12 份新周报",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png",
+        title: "你推荐的 前端高手 已通过第三轮面试",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png",
+        title: "这种模板可以区分多种通知类型",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
+        title:
+          "展示标题内容超过一行后的处理方式，如果内容超过1行将自动截断并支持tooltip显示完整标题。",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
+        title: "左侧图标用于区分不同的类型",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
+        title: "左侧图标用于区分不同的类型",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      }
+    ]
+  },
+  {
+    key: "2",
+    name: "消息",
+    list: [
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg",
+        title: "李白 评论了你",
+        description: "长风破浪会有时,直挂云帆济沧海",
+        datetime: "一年前",
+        type: "2"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg",
+        title: "李白 回复了你",
+        description: "行路难，行路难，多歧路，今安在。",
+        datetime: "一年前",
+        type: "2"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg",
+        title: "标题",
+        description:
+          "请将鼠标移动到此处，以便测试超长的消息在此处将如何处理。本例中设置的描述最大行数为2，超过2行的描述内容将被省略并且可以通过tooltip查看完整内容",
+        datetime: "一年前",
+        type: "2"
+      }
+    ]
+  },
+  {
+    key: "3",
+    name: "待办",
+    list: [
+      {
+        avatar: "",
+        title: "任务名称",
+        description: "任务需要在 2022-11-16 20:00 前启动",
+        datetime: "",
+        extra: "未开始",
+        status: "info",
+        type: "3"
+      },
+      {
+        avatar: "",
+        title: "第三方紧急代码变更",
+        description:
+          "一拳提交于 2022-11-16，需在 2022-11-18 前完成代码变更任务",
+        datetime: "",
+        extra: "马上到期",
+        status: "danger",
+        type: "3"
+      },
+      {
+        avatar: "",
+        title: "信息安全考试",
+        description: "指派小仙于 2022-12-12 前完成更新并发布",
+        datetime: "",
+        extra: "已耗时 8 天",
+        status: "warning",
+        type: "3"
+      },
+      {
+        avatar: "",
+        title: "vue-pure-admin 版本发布",
+        description: "vue-pure-admin 版本发布",
+        datetime: "",
+        extra: "进行中",
+        type: "3"
+      }
+    ]
+  }
+];

src/layout/components/notice/index.vue

@@ -1,36 +1,22 @@
 <script setup lang="ts">
-import { useI18n } from "vue-i18n";
+import { ref } from "vue";
-import { ref, computed } from "vue";
 import { noticesData } from "./data";
-import NoticeList from "./components/NoticeList.vue";
+import NoticeList from "./noticeList.vue";
-import BellIcon from "~icons/ep/bell";
+import Bell from "@iconify-icons/ep/bell";
 
-const { t } = useI18n();
 const noticesNum = ref(0);
 const notices = ref(noticesData);
-const activeKey = ref(noticesData[0]?.key);
+const activeKey = ref(noticesData[0].key);
 
 notices.value.map(v => (noticesNum.value += v.list.length));
-
-const getLabel = computed(
-  () => item =>
-    t(item.name) + (item.list.length > 0 ? `(${item.list.length})` : "")
-);
 </script>
 
 <template>
   <el-dropdown trigger="click" placement="bottom-end">
-    <span
+    <span class="dropdown-badge navbar-bg-hover select-none">
-      :class="[
+      <el-badge :value="noticesNum" :max="99">
-        'dropdown-badge',
-        'navbar-bg-hover',
-        'select-none',
-        Number(noticesNum) !== 0 && 'mr-[10px]'
-      ]"
-    >
-      <el-badge :value="Number(noticesNum) === 0 ? '' : noticesNum" :max="99">
         <span class="header-notice-icon">
-          <IconifyIconOffline :icon="BellIcon" />
+          <IconifyIconOffline :icon="Bell" />
         </span>
       </el-badge>
     </span>
@@ -44,15 +30,18 @@ const getLabel = computed(
         >
           <el-empty
             v-if="notices.length === 0"
-            :description="t('status.pureNoMessage')"
+            description="暂无消息"
             :image-size="60"
           />
           <span v-else>
             <template v-for="item in notices" :key="item.key">
-              <el-tab-pane :label="getLabel(item)" :name="`${item.key}`">
+              <el-tab-pane
+                :label="`${item.name}(${item.list.length})`"
+                :name="`${item.key}`"
+              >
                 <el-scrollbar max-height="330px">
                   <div class="noticeList-container">
-                    <NoticeList :list="item.list" :emptyText="item.emptyText" />
+                    <NoticeList :list="item.list" />
                   </div>
                 </el-scrollbar>
               </el-tab-pane>
@@ -71,6 +60,7 @@ const getLabel = computed(
   justify-content: center;
   width: 40px;
   height: 48px;
+  margin-right: 10px;
   cursor: pointer;
 
   .header-notice-icon {

src/layout/components/notice/noticeItem.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { ListItem } from "../data";
+import { ListItem } from "./data";
 import { ref, PropType, nextTick } from "vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { deviceDetection } from "@pureadmin/utils";
 
-defineProps({
+const props = defineProps({
   noticeItem: {
     type: Object as PropType<ListItem>,
     default: () => {}
@@ -49,12 +49,12 @@ function hoverDescription(event, description) {
 
 <template>
   <div
-    class="notice-container border-0 border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
+    class="notice-container border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
   >
     <el-avatar
-      v-if="noticeItem.avatar"
+      v-if="props.noticeItem.avatar"
       :size="30"
-      :src="noticeItem.avatar"
+      :src="props.noticeItem.avatar"
       class="notice-container-avatar"
     />
     <div class="notice-container-text">
@@ -63,7 +63,7 @@ function hoverDescription(event, description) {
           popper-class="notice-title-popper"
           :effect="tooltipEffect"
           :disabled="!titleTooltip"
-          :content="noticeItem.title"
+          :content="props.noticeItem.title"
           placement="top-start"
           :enterable="!isMobile"
         >
@@ -72,16 +72,16 @@ function hoverDescription(event, description) {
             class="notice-title-content"
             @mouseover="hoverTitle"
           >
-            {{ noticeItem.title }}
+            {{ props.noticeItem.title }}
           </div>
         </el-tooltip>
         <el-tag
-          v-if="noticeItem?.extra"
+          v-if="props.noticeItem?.extra"
-          :type="noticeItem?.status"
+          :type="props.noticeItem?.status"
           size="small"
           class="notice-title-extra"
         >
-          {{ noticeItem?.extra }}
+          {{ props.noticeItem?.extra }}
         </el-tag>
       </div>
 
@@ -89,19 +89,19 @@ function hoverDescription(event, description) {
         popper-class="notice-title-popper"
         :effect="tooltipEffect"
         :disabled="!descriptionTooltip"
-        :content="noticeItem.description"
+        :content="props.noticeItem.description"
         placement="top-start"
       >
         <div
           ref="descriptionRef"
           class="notice-text-description"
-          @mouseover="hoverDescription($event, noticeItem.description)"
+          @mouseover="hoverDescription($event, props.noticeItem.description)"
         >
-          {{ noticeItem.description }}
+          {{ props.noticeItem.description }}
         </div>
       </el-tooltip>
       <div class="notice-text-datetime text-[#00000073] dark:text-white">
-        {{ noticeItem.datetime }}
+        {{ props.noticeItem.datetime }}
       </div>
     </div>
   </div>
@@ -112,7 +112,7 @@ function hoverDescription(event, description) {
   max-width: 238px;
 }
 </style>
-<style lang="scss" scoped>
+<style scoped lang="scss">
 .notice-container {
   display: flex;
   align-items: flex-start;

src/layout/components/notice/noticeList.vue

@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import { PropType } from "vue";
+import { ListItem } from "./data";
+import NoticeItem from "./noticeItem.vue";
+
+const props = defineProps({
+  list: {
+    type: Array as PropType<Array<ListItem>>,
+    default: () => []
+  }
+});
+</script>
+
+<template>
+  <div v-if="props.list.length">
+    <NoticeItem
+      v-for="(item, index) in props.list"
+      :key="index"
+      :noticeItem="item"
+    />
+  </div>
+  <el-empty v-else description="暂无消息" />
+</template>

src/layout/components/panel/index.vue

@@ -1,10 +1,9 @@
 <script setup lang="ts">
-import { useI18n } from "vue-i18n";
 import { emitter } from "@/utils/mitt";
 import { onClickOutside } from "@vueuse/core";
 import { ref, computed, onMounted, onBeforeUnmount } from "vue";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
-import CloseIcon from "~icons/ep/close";
+import Close from "@iconify-icons/ep/close";
 
 const target = ref(null);
 const show = ref<Boolean>(false);
@@ -16,7 +15,7 @@ const iconClass = computed(() => {
     "flex",
     "justify-center",
     "items-center",
-    "outline-hidden",
+    "outline-none",
     "rounded-[4px]",
     "cursor-pointer",
     "transition-colors",
@@ -26,7 +25,6 @@ const iconClass = computed(() => {
   ];
 });
 
-const { t } = useI18n();
 const { onReset } = useDataThemeChange();
 
 onClickOutside(target, (event: any) => {
@@ -51,14 +49,12 @@ onBeforeUnmount(() => {
     <div class="right-panel-background" />
     <div ref="target" class="right-panel bg-bg_color">
       <div
-        class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
+        class="project-configuration border-b-[1px] border-solid border-[var(--pure-border-color)]"
       >
-        <h4 class="dark:text-white">
+        <h4 class="dark:text-white">系统配置</h4>
-          {{ t("panel.pureSystemSet") }}
-        </h4>
         <span
           v-tippy="{
-            content: t('panel.pureCloseSystemSet'),
+            content: '关闭配置',
             placement: 'bottom-start',
             zIndex: 41000
           }"
@@ -68,7 +64,7 @@ onBeforeUnmount(() => {
             class="dark:text-white"
             width="18px"
             height="18px"
-            :icon="CloseIcon"
+            :icon="Close"
             @click="show = !show"
           />
         </span>
@@ -78,11 +74,11 @@ onBeforeUnmount(() => {
       </el-scrollbar>
 
       <div
-        class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
+        class="flex justify-end p-3 border-t-[1px] border-solid border-[var(--pure-border-color)]"
       >
         <el-button
           v-tippy="{
-            content: t('panel.pureClearCacheAndToLogin'),
+            content: '清空缓存并返回登录页',
             placement: 'left-start',
             zIndex: 41000
           }"
@@ -91,7 +87,7 @@ onBeforeUnmount(() => {
           bg
           @click="onReset"
         >
-          {{ t("panel.pureClearCache") }}
+          清空缓存
         </el-button>
       </div>
     </div>
@@ -121,8 +117,8 @@ onBeforeUnmount(() => {
   width: 100%;
   max-width: 280px;
   box-shadow: 0 0 15px 0 rgb(0 0 0 / 5%);
-  transform: translate(100%);
   transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
+  transform: translate(100%);
 }
 
 .show {

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

@@ -1,36 +1,37 @@
 <script setup lang="ts">
-import { useI18n } from "vue-i18n";
 import { useNav } from "@/layout/hooks/useNav";
-import MdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
+import mdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
-import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
+import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
-import ArrowUpLine from "~icons/ri/arrow-up-line";
+import ArrowUpLine from "@iconify-icons/ri/arrow-up-line";
-import ArrowDownLine from "~icons/ri/arrow-down-line";
+import ArrowDownLine from "@iconify-icons/ri/arrow-down-line";
 
-withDefaults(defineProps<{ total?: number }>(), {
+const props = withDefaults(defineProps<{ total: number }>(), {
   total: 0
 });
 
-const { t } = useI18n();
 const { device } = useNav();
 </script>
 
 <template>
   <div class="search-footer text-[#333] dark:text-white">
     <span class="search-footer-item">
-      <EnterOutlined class="icon" />
+      <enterOutlined class="icon" />
-      {{ t("buttons.pureConfirm") }}
+      确认
     </span>
     <span class="search-footer-item">
       <IconifyIconOffline :icon="ArrowUpLine" class="icon" />
       <IconifyIconOffline :icon="ArrowDownLine" class="icon" />
-      {{ t("buttons.pureSwitch") }}
+      切换
     </span>
     <span class="search-footer-item">
-      <MdiKeyboardEsc class="icon" />
+      <mdiKeyboardEsc class="icon" />
-      {{ t("buttons.pureClose") }}
+      关闭
     </span>
-    <p v-if="device !== 'mobile' && total > 0" class="search-footer-total">
+    <p
-      {{ `${t("search.pureTotal")} ${total}` }}
+      v-if="device !== 'mobile' && props.total > 0"
+      class="search-footer-total"
+    >
+      共{{ props.total }}项
     </p>
   </div>
 </template>

src/layout/components/search/components/SearchHistory.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import Sortable from "sortablejs";
-import { useI18n } from "vue-i18n";
 import SearchHistoryItem from "./SearchHistoryItem.vue";
 import type { optionsItem, dragItem, Props } from "../types";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
@@ -20,7 +19,6 @@ const innerHeight = ref();
 /** 判断是否停止鼠标移入事件处理 */
 const stopMouseEvent = ref(false);
 
-const { t } = useI18n();
 const emit = defineEmits<Emits>();
 const instance = getCurrentInstance()!;
 const props = withDefaults(defineProps<Props>(), {});
@@ -143,9 +141,7 @@ defineExpose({ handleScroll });
 <template>
   <div ref="historyRef" class="history">
     <template v-if="historyList.length">
-      <div :style="titleStyle">
+      <div :style="titleStyle">搜索历史</div>
-        {{ t("search.pureHistory") }}
-      </div>
       <div
         v-for="(item, index) in historyList"
         :key="item.path"
@@ -164,9 +160,7 @@ defineExpose({ handleScroll });
     </template>
     <template v-if="collectList.length">
       <div :style="titleStyle">
-        {{
+        收藏{{ collectList.length > 1 ? "（可拖拽排序）" : "" }}
-          `${t("search.pureCollect")}${collectList.length > 1 ? t("search.pureDragSort") : ""}`
-        }}
       </div>
       <div class="collect-container">
         <div

src/layout/components/search/components/SearchHistoryItem.vue

@@ -1,9 +1,8 @@
 <script setup lang="ts">
 import type { optionsItem } from "../types";
-import { transformI18n } from "@/plugins/i18n";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import StarIcon from "~icons/ep/star";
+import Star from "@iconify-icons/ep/star";
-import CloseIcon from "~icons/ep/close";
+import Close from "@iconify-icons/ep/close";
 
 interface Props {
   item: optionsItem;
@@ -29,16 +28,16 @@ function handleDelete(item) {
 <template>
   <component :is="useRenderIcon(item.meta?.icon)" />
   <span class="history-item-title">
-    {{ transformI18n(item.meta?.title) }}
+    {{ item.meta?.title }}
   </span>
   <IconifyIconOffline
     v-show="item.type === 'history'"
-    :icon="StarIcon"
+    :icon="Star"
     class="w-[18px] h-[18px] mr-2 hover:text-[#d7d5d4]"
     @click.stop="handleCollect(item)"
   />
   <IconifyIconOffline
-    :icon="CloseIcon"
+    :icon="Close"
     class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
     @click.stop="handleDelete(item)"
   />

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

@@ -1,19 +1,17 @@
 <script setup lang="ts">
 import { match } from "pinyin-pro";
-import { useI18n } from "vue-i18n";
 import { getConfig } from "@/config";
 import { useRouter } from "vue-router";
 import SearchResult from "./SearchResult.vue";
 import SearchFooter from "./SearchFooter.vue";
 import { useNav } from "@/layout/hooks/useNav";
-import { transformI18n } from "@/plugins/i18n";
 import SearchHistory from "./SearchHistory.vue";
 import type { optionsItem, dragItem } from "../types";
 import { ref, computed, shallowRef, watch } from "vue";
 import { useDebounceFn, onKeyStroke } from "@vueuse/core";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import { cloneDeep, isAllEmpty, storageLocal } from "@pureadmin/utils";
-import SearchIcon from "~icons/ri/search-line";
+import Search from "@iconify-icons/ri/search-line";
 
 interface Props {
   /** 弹窗显隐 */
@@ -29,7 +27,6 @@ const emit = defineEmits<Emits>();
 const props = withDefaults(defineProps<Props>(), {});
 
 const router = useRouter();
-const { t, locale } = useI18n();
 
 const HISTORY_TYPE = "history";
 const COLLECT_TYPE = "collect";
@@ -110,16 +107,15 @@ function search() {
   const flatMenusData = flatTree(menusData.value);
   resultOptions.value = flatMenusData.filter(menu =>
     keyword.value
-      ? transformI18n(menu.meta?.title)
+      ? menu.meta?.title
           .toLocaleLowerCase()
           .includes(keyword.value.toLocaleLowerCase().trim()) ||
-        (locale.value === "zh" &&
+        !isAllEmpty(
-          !isAllEmpty(
+          match(
-            match(
+            menu.meta?.title.toLocaleLowerCase(),
-              transformI18n(menu.meta?.title).toLocaleLowerCase(),
+            keyword.value.toLocaleLowerCase().trim()
-              keyword.value.toLocaleLowerCase().trim()
+          )
-            )
+        )
-          ))
       : false
   );
   activePath.value =
@@ -293,19 +289,19 @@ onKeyStroke("ArrowDown", handleDown);
       v-model="keyword"
       size="large"
       clearable
-      :placeholder="t('search.purePlaceholder')"
+      placeholder="搜索菜单（支持拼音搜索）"
       @input="handleSearch"
     >
       <template #prefix>
         <IconifyIconOffline
-          :icon="SearchIcon"
+          :icon="Search"
           class="text-primary w-[24px] h-[24px]"
         />
       </template>
     </el-input>
     <div class="search-content">
       <el-scrollbar ref="scrollbarRef" max-height="calc(90vh - 140px)">
-        <el-empty v-if="showEmpty" :description="t('search.pureEmpty')" />
+        <el-empty v-if="showEmpty" description="暂无搜索结果" />
         <SearchHistory
           v-if="showSearchHistory"
           ref="historyRef"

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

@@ -1,11 +1,10 @@
 <script setup lang="ts">
 import type { Props } from "../types";
-import { transformI18n } from "@/plugins/i18n";
 import { useResizeObserver } from "@pureadmin/utils";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { ref, computed, getCurrentInstance, onMounted } from "vue";
-import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
+import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
 
 interface Emits {
   (e: "update:value", val: string): void;
@@ -82,9 +81,9 @@ defineExpose({ handleScroll });
     >
       <component :is="useRenderIcon(item.meta?.icon)" />
       <span class="result-item-title">
-        {{ transformI18n(item.meta?.title) }}
+        {{ item.meta?.title }}
       </span>
-      <EnterOutlined />
+      <enterOutlined />
     </div>
   </div>
 </template>

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

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

src/layout/components/search/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { SearchModal } from "./components";
 import { useBoolean } from "../../hooks/useBoolean";
-import SearchModal from "./components/SearchModal.vue";
 
 const { bool: show, toggle } = useBoolean();
 function handleSearch() {
@@ -14,7 +14,7 @@ function handleSearch() {
       class="search-container w-[40px] h-[48px] flex-c cursor-pointer navbar-bg-hover"
       @click="handleSearch"
     >
-      <IconifyIconOffline icon="ri/search-line" />
+      <IconifyIconOffline icon="ri:search-line" />
     </div>
     <SearchModal v-model:value="show" />
   </div>

src/layout/components/setting/index.vue

@@ -9,24 +9,23 @@ import {
   onUnmounted,
   onBeforeMount
 } from "vue";
-import { useI18n } from "vue-i18n";
+import panel from "../panel/index.vue";
 import { emitter } from "@/utils/mitt";
-import LayPanel from "../lay-panel/index.vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { useAppStoreHook } from "@/store/modules/app";
+import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import Segmented, { type OptionsType } from "@/components/ReSegmented";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
 import { useDark, useGlobal, debounce, isNumber } from "@pureadmin/utils";
 
-import Check from "~icons/ep/check";
+import Check from "@iconify-icons/ep/check";
-import LeftArrow from "~icons/ri/arrow-left-s-line?width=20&height=20";
+import LeftArrow from "@iconify-icons/ri/arrow-left-s-line";
-import RightArrow from "~icons/ri/arrow-right-s-line?width=20&height=20";
+import RightArrow from "@iconify-icons/ri/arrow-right-s-line";
-import DayIcon from "@/assets/svg/day.svg?component";
+import dayIcon from "@/assets/svg/day.svg?component";
-import DarkIcon from "@/assets/svg/dark.svg?component";
+import darkIcon from "@/assets/svg/dark.svg?component";
-import SystemIcon from "@/assets/svg/system.svg?component";
+import systemIcon from "@/assets/svg/system.svg?component";
 
-const { t } = useI18n();
 const { device } = useNav();
 const { isDark } = useDark();
 const { $storage } = useGlobal<GlobalPropertiesApi>();
@@ -49,7 +48,9 @@ const {
 if (unref(layoutTheme)) {
   const layout = unref(layoutTheme).layout;
   const theme = unref(layoutTheme).theme;
-  document.documentElement.setAttribute("data-theme", theme);
+  toggleTheme({
+    scopeName: `layout-theme-${theme}`
+  });
   setLayoutModel(layout);
 }
 
@@ -147,13 +148,13 @@ function setFalse(Doms): any {
 const stretchTypeOptions = computed<Array<OptionsType>>(() => {
   return [
     {
-      label: t("panel.pureStretchFixed"),
+      label: "固定",
-      tip: t("panel.pureStretchFixedTip"),
+      tip: "紧凑页面，轻松找到所需信息",
       value: "fixed"
     },
     {
-      label: t("panel.pureStretchCustom"),
+      label: "自定义",
-      tip: t("panel.pureStretchCustomTip"),
+      tip: "最小1280、最大1600",
       value: "custom"
     }
   ];
@@ -189,30 +190,30 @@ const getThemeColor = computed(() => {
 });
 
 const pClass = computed(() => {
-  return ["mb-[12px]!", "font-medium", "text-sm", "dark:text-white"];
+  return ["mb-[12px]", "font-medium", "text-sm", "dark:text-white"];
 });
 
 const themeOptions = computed<Array<OptionsType>>(() => {
   return [
     {
-      label: t("panel.pureOverallStyleLight"),
+      label: "浅色",
-      icon: DayIcon,
+      icon: dayIcon,
       theme: "light",
-      tip: t("panel.pureOverallStyleLightTip"),
+      tip: "清新启航，点亮舒适的工作界面",
       iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
     },
     {
-      label: t("panel.pureOverallStyleDark"),
+      label: "深色",
-      icon: DarkIcon,
+      icon: darkIcon,
       theme: "dark",
-      tip: t("panel.pureOverallStyleDarkTip"),
+      tip: "月光序曲，沉醉于夜的静谧雅致",
       iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
     },
     {
-      label: t("panel.pureOverallStyleSystem"),
+      label: "自动",
-      icon: SystemIcon,
+      icon: systemIcon,
       theme: "system",
-      tip: t("panel.pureOverallStyleSystemTip"),
+      tip: "同步时光，界面随晨昏自然呼应",
       iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
     }
   ];
@@ -221,19 +222,14 @@ const themeOptions = computed<Array<OptionsType>>(() => {
 const markOptions = computed<Array<OptionsType>>(() => {
   return [
     {
-      label: t("panel.pureTagsStyleSmart"),
+      label: "灵动",
-      tip: t("panel.pureTagsStyleSmartTip"),
+      tip: "灵动标签，添趣生辉",
       value: "smart"
     },
     {
-      label: t("panel.pureTagsStyleCard"),
+      label: "卡片",
-      tip: t("panel.pureTagsStyleCardTip"),
+      tip: "卡片标签，高效浏览",
       value: "card"
-    },
-    {
-      label: t("panel.pureTagsStyleChrome"),
-      tip: t("panel.pureTagsStyleChromeTip"),
-      value: "chrome"
     }
   ];
 });
@@ -315,9 +311,9 @@ onUnmounted(() => removeMatchMedia);
 </script>
 
 <template>
-  <LayPanel>
+  <panel>
     <div class="p-5">
-      <p :class="pClass">{{ t("panel.pureOverallStyle") }}</p>
+      <p :class="pClass">整体风格</p>
       <Segmented
         resize
         class="select-none"
@@ -335,7 +331,7 @@ onUnmounted(() => removeMatchMedia);
         "
       />
 
-      <p :class="['mt-5!', pClass]">{{ t("panel.pureThemeColor") }}</p>
+      <p :class="['mt-5', pClass]">主题色</p>
       <ul class="theme-color">
         <li
           v-for="(item, index) in themeColors"
@@ -354,12 +350,12 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
 
-      <p :class="['mt-5!', pClass]">{{ t("panel.pureLayoutModel") }}</p>
+      <p :class="['mt-5', pClass]">导航模式</p>
       <ul class="pure-theme">
         <li
           ref="verticalRef"
           v-tippy="{
-            content: t('panel.pureVerticalTip'),
+            content: '左侧菜单，亲切熟悉',
             zIndex: 41000
           }"
           :class="layoutTheme.layout === 'vertical' ? 'is-select' : ''"
@@ -372,7 +368,7 @@ onUnmounted(() => removeMatchMedia);
           v-if="device !== 'mobile'"
           ref="horizontalRef"
           v-tippy="{
-            content: t('panel.pureHorizontalTip'),
+            content: '顶部菜单，简洁概览',
             zIndex: 41000
           }"
           :class="layoutTheme.layout === 'horizontal' ? 'is-select' : ''"
@@ -385,7 +381,7 @@ onUnmounted(() => removeMatchMedia);
           v-if="device !== 'mobile'"
           ref="mixRef"
           v-tippy="{
-            content: t('panel.pureMixTip'),
+            content: '混合菜单，灵活多变',
             zIndex: 41000
           }"
           :class="layoutTheme.layout === 'mix' ? 'is-select' : ''"
@@ -397,7 +393,7 @@ onUnmounted(() => removeMatchMedia);
       </ul>
 
       <span v-if="useAppStoreHook().getViewportWidth > 1280">
-        <p :class="['mt-5!', pClass]">{{ t("panel.pureStretch") }}</p>
+        <p :class="['mt-5', pClass]">页宽</p>
         <Segmented
           resize
           class="mb-2 select-none"
@@ -426,68 +422,68 @@ onUnmounted(() => removeMatchMedia);
           >
             <IconifyIconOffline
               :icon="settings.stretch ? RightArrow : LeftArrow"
+              height="20"
             />
             <div
-              class="grow border-0 border-b border-dashed"
+              class="flex-grow border-b border-dashed"
               style="border-color: var(--el-color-primary)"
             />
             <IconifyIconOffline
               :icon="settings.stretch ? LeftArrow : RightArrow"
+              height="20"
             />
           </div>
         </button>
       </span>
 
-      <p :class="['mt-4!', pClass]">{{ t("panel.pureTagsStyle") }}</p>
+      <p :class="['mt-4', pClass]">页签风格</p>
       <Segmented
         resize
         class="select-none"
-        :modelValue="markValue === 'smart' ? 0 : markValue === 'card' ? 1 : 2"
+        :modelValue="markValue === 'smart' ? 0 : 1"
         :options="markOptions"
         @change="onChange"
       />
 
-      <p class="mt-5! font-medium text-sm dark:text-white">
+      <p class="mt-5 font-medium text-sm dark:text-white">界面显示</p>
-        {{ t("panel.pureInterfaceDisplay") }}
-      </p>
       <ul class="setting">
         <li>
-          <span class="dark:text-white">{{ t("panel.pureGreyModel") }}</span>
+          <span class="dark:text-white">灰色模式</span>
           <el-switch
             v-model="settings.greyVal"
             inline-prompt
-            :active-text="t('buttons.pureOpenText')"
+            active-text="开"
-            :inactive-text="t('buttons.pureCloseText')"
+            inactive-text="关"
             @change="greyChange"
           />
         </li>
         <li>
-          <span class="dark:text-white">{{ t("panel.pureWeakModel") }}</span>
+          <span class="dark:text-white">色弱模式</span>
           <el-switch
             v-model="settings.weakVal"
             inline-prompt
-            :active-text="t('buttons.pureOpenText')"
+            active-text="开"
-            :inactive-text="t('buttons.pureCloseText')"
+            inactive-text="关"
             @change="weekChange"
           />
         </li>
         <li>
-          <span class="dark:text-white">{{ t("panel.pureHiddenTags") }}</span>
+          <span class="dark:text-white">隐藏标签页</span>
           <el-switch
             v-model="settings.tabsVal"
             inline-prompt
-            :active-text="t('buttons.pureOpenText')"
+            active-text="开"
-            :inactive-text="t('buttons.pureCloseText')"
+            inactive-text="关"
             @change="tagsChange"
           />
         </li>
         <li>
-          <span class="dark:text-white">{{ t("panel.pureHiddenFooter") }}</span>
+          <span class="dark:text-white">隐藏页脚</span>
           <el-switch
             v-model="settings.hideFooter"
             inline-prompt
-            :active-text="t('buttons.pureOpenText')"
+            active-text="开"
-            :inactive-text="t('buttons.pureCloseText')"
+            inactive-text="关"
             @change="hideFooterChange"
           />
         </li>
@@ -498,26 +494,24 @@ onUnmounted(() => removeMatchMedia);
             inline-prompt
             :active-value="true"
             :inactive-value="false"
-            :active-text="t('buttons.pureOpenText')"
+            active-text="开"
-            :inactive-text="t('buttons.pureCloseText')"
+            inactive-text="关"
             @change="logoChange"
           />
         </li>
         <li>
-          <span class="dark:text-white">
+          <span class="dark:text-white">页签持久化</span>
-            {{ t("panel.pureMultiTagsCache") }}
-          </span>
           <el-switch
             v-model="settings.multiTagsCache"
             inline-prompt
-            :active-text="t('buttons.pureOpenText')"
+            active-text="开"
-            :inactive-text="t('buttons.pureCloseText')"
+            inactive-text="关"
             @change="multiTagsCacheChange"
           />
         </li>
       </ul>
     </div>
-  </LayPanel>
+  </panel>
 </template>
 
 <style lang="scss" scoped>

src/layout/components/sidebar/breadCrumb.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { isEqual } from "@pureadmin/utils";
-import { transformI18n } from "@/plugins/i18n";
 import { useRoute, useRouter } from "vue-router";
 import { ref, watch, onMounted, toRaw } from "vue";
 import { getParentPaths, findRouteByPath } from "@/router/utils";
@@ -105,15 +104,15 @@ watch(
 </script>
 
 <template>
-  <el-breadcrumb class="leading-[50px]! select-none" separator="/">
+  <el-breadcrumb class="!leading-[50px] select-none" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item
         v-for="item in levelList"
         :key="item.path"
-        class="inline! items-stretch!"
+        class="!inline !items-stretch"
       >
         <a @click.prevent="handleLink(item)">
-          {{ transformI18n(item.meta.title) }}
+          {{ item.meta.title }}
         </a>
       </el-breadcrumb-item>
     </transition-group>

src/layout/components/sidebar/centerCollapse.vue

@@ -1,20 +1,18 @@
 <script setup lang="ts">
 import { computed } from "vue";
-import { useI18n } from "vue-i18n";
 import { useGlobal } from "@pureadmin/utils";
 import { useNav } from "@/layout/hooks/useNav";
 
-import ArrowLeft from "~icons/ri/arrow-left-double-fill";
+import ArrowLeft from "@iconify-icons/ri/arrow-left-double-fill";
 
 interface Props {
-  isActive?: boolean;
+  isActive: boolean;
 }
 
-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
   isActive: false
 });
 
-const { t } = useI18n();
 const { tooltipEffect } = useNav();
 
 const iconClass = computed(() => {
@@ -36,9 +34,7 @@ const toggleClick = () => {
 <template>
   <div
     v-tippy="{
-      content: isActive
+      content: props.isActive ? '点击折叠' : '点击展开',
-        ? t('buttons.pureClickCollapse')
-        : t('buttons.pureClickExpand'),
       theme: tooltipEffect,
       hideOnClick: 'toggle',
       placement: 'right'
@@ -49,7 +45,7 @@ const toggleClick = () => {
     <IconifyIconOffline
       :icon="ArrowLeft"
       :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
-      :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
+      :style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }"
     />
   </div>
 </template>

src/layout/components/sidebar/extraIcon.vue

@@ -2,7 +2,7 @@
 import { toRaw } from "vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 
-defineProps({
+const props = defineProps({
   extraIcon: {
     type: String,
     default: ""
@@ -11,9 +11,9 @@ defineProps({
 </script>
 
 <template>
-  <div v-if="extraIcon" class="flex justify-center items-center">
+  <div v-if="props.extraIcon" class="flex justify-center items-center">
     <component
-      :is="useRenderIcon(toRaw(extraIcon))"
+      :is="useRenderIcon(toRaw(props.extraIcon))"
       class="w-[30px] h-[30px]"
     />
   </div>

src/layout/components/sidebar/horizontal.vue

@@ -0,0 +1,110 @@
+<script setup lang="ts">
+import Search from "../search/index.vue";
+import Notice from "../notice/index.vue";
+import FullScreen from "./fullScreen.vue";
+import SidebarItem from "./sidebarItem.vue";
+import { isAllEmpty } from "@pureadmin/utils";
+import { ref, nextTick, computed } from "vue";
+import { useNav } from "@/layout/hooks/useNav";
+import { usePermissionStoreHook } from "@/store/modules/permission";
+import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
+import Setting from "@iconify-icons/ri/settings-3-line";
+
+const menuRef = ref();
+
+const {
+  route,
+  title,
+  logout,
+  backTopMenu,
+  onPanel,
+  getLogo,
+  username,
+  userAvatar,
+  avatarsStyle
+} = useNav();
+
+const defaultActive = computed(() =>
+  !isAllEmpty(route.meta?.activePath) ? route.meta.activePath : route.path
+);
+
+nextTick(() => {
+  menuRef.value?.handleResize();
+});
+</script>
+
+<template>
+  <div
+    v-loading="usePermissionStoreHook().wholeMenus.length === 0"
+    class="horizontal-header"
+  >
+    <div class="horizontal-header-left" @click="backTopMenu">
+      <img :src="getLogo()" alt="logo" />
+      <span>{{ title }}</span>
+    </div>
+    <el-menu
+      ref="menuRef"
+      router
+      mode="horizontal"
+      popper-class="pure-scrollbar"
+      class="horizontal-header-menu"
+      :default-active="defaultActive"
+    >
+      <sidebar-item
+        v-for="route in usePermissionStoreHook().wholeMenus"
+        :key="route.path"
+        :item="route"
+        :base-path="route.path"
+      />
+    </el-menu>
+    <div class="horizontal-header-right">
+      <!-- 菜单搜索 -->
+      <Search id="header-search" />
+      <!-- 全屏 -->
+      <FullScreen id="full-screen" />
+      <!-- 消息通知 -->
+      <Notice id="header-notice" />
+      <!-- 退出登录 -->
+      <el-dropdown trigger="click">
+        <span class="el-dropdown-link navbar-bg-hover">
+          <img :src="userAvatar" :style="avatarsStyle" />
+          <p v-if="username" class="dark:text-white">{{ username }}</p>
+        </span>
+        <template #dropdown>
+          <el-dropdown-menu class="logout">
+            <el-dropdown-item @click="logout">
+              <IconifyIconOffline
+                :icon="LogoutCircleRLine"
+                style="margin: 5px"
+              />
+              退出系统
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+      <span
+        class="set-icon navbar-bg-hover"
+        title="打开系统配置"
+        @click="onPanel"
+      >
+        <IconifyIconOffline :icon="Setting" />
+      </span>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-loading-mask) {
+  opacity: 0.45;
+}
+
+.logout {
+  width: 120px;
+
+  ::v-deep(.el-dropdown-menu__item) {
+    display: inline-flex;
+    flex-wrap: wrap;
+    min-width: 100%;
+  }
+}
+</style>

src/layout/components/sidebar/leftCollapse.vue

@@ -1,20 +1,18 @@
 <script setup lang="ts">
 import { computed } from "vue";
-import { useI18n } from "vue-i18n";
 import { useGlobal } from "@pureadmin/utils";
 import { useNav } from "@/layout/hooks/useNav";
 
-import MenuFold from "~icons/ri/menu-fold-fill";
+import MenuFold from "@iconify-icons/ri/menu-fold-fill";
 
 interface Props {
-  isActive?: boolean;
+  isActive: boolean;
 }
 
-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
   isActive: false
 });
 
-const { t } = useI18n();
 const { tooltipEffect } = useNav();
 
 const iconClass = computed(() => {
@@ -23,7 +21,7 @@ const iconClass = computed(() => {
     "mb-1",
     "w-[16px]",
     "h-[16px]",
-    "inline-block!",
+    "inline-block",
     "align-middle",
     "cursor-pointer",
     "duration-[100ms]"
@@ -46,16 +44,14 @@ const toggleClick = () => {
   <div class="left-collapse">
     <IconifyIconOffline
       v-tippy="{
-        content: isActive
+        content: props.isActive ? '点击折叠' : '点击展开',
-          ? t('buttons.pureClickCollapse')
-          : t('buttons.pureClickExpand'),
         theme: tooltipEffect,
         hideOnClick: 'toggle',
         placement: 'right'
       }"
       :icon="MenuFold"
       :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
-      :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
+      :style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }"
       @click="toggleClick"
     />
   </div>

src/layout/components/sidebar/linkItem.vue

@@ -3,6 +3,10 @@ import { computed } from "vue";
 import { isUrl } from "@pureadmin/utils";
 import { menuType } from "@/layout/types";
 
+defineOptions({
+  name: "LinkItem"
+});
+
 const props = defineProps<{
   to: menuType;
 }>();

src/layout/components/sidebar/logo.vue

@@ -2,7 +2,7 @@
 import { getTopMenu } from "@/router/utils";
 import { useNav } from "@/layout/hooks/useNav";
 
-defineProps({
+const props = defineProps({
   collapse: Boolean
 });
 
@@ -10,11 +10,11 @@ const { title, getLogo } = useNav();
 </script>
 
 <template>
-  <div class="sidebar-logo-container" :class="{ collapses: collapse }">
+  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
     <transition name="sidebarLogoFade">
       <router-link
-        v-if="collapse"
+        v-if="props.collapse"
-        key="collapse"
+        key="props.collapse"
         :title="title"
         class="sidebar-logo-link"
         :to="getTopMenu()?.path ?? '/'"
@@ -60,11 +60,11 @@ const { title, getLogo } = useNav();
       height: 32px;
       margin: 2px 0 0 12px;
       overflow: hidden;
-      text-overflow: ellipsis;
       font-size: 18px;
       font-weight: 600;
       line-height: 32px;
-      color: var(--pure-theme-sub-menu-active-text);
+      color: $subMenuActiveText;
+      text-overflow: ellipsis;
       white-space: nowrap;
     }
   }

src/layout/components/sidebar/mixNav.vue

@@ -1,28 +1,22 @@
 <script setup lang="ts">
+import extraIcon from "./extraIcon.vue";
+import Search from "../search/index.vue";
+import Notice from "../notice/index.vue";
+import FullScreen from "./fullScreen.vue";
 import { isAllEmpty } from "@pureadmin/utils";
 import { useNav } from "@/layout/hooks/useNav";
-import { transformI18n } from "@/plugins/i18n";
-import LaySearch from "../lay-search/index.vue";
-import LayNotice from "../lay-notice/index.vue";
 import { ref, toRaw, watch, onMounted, nextTick } from "vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { getParentPaths, findRouteByPath } from "@/router/utils";
-import { useTranslationLang } from "../../hooks/useTranslationLang";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import LaySidebarExtraIcon from "../lay-sidebar/components/SidebarExtraIcon.vue";
+import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
-import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
+import Setting from "@iconify-icons/ri/settings-3-line";
-
-import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
-import LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
-import Setting from "~icons/ri/settings-3-line";
-import Check from "~icons/ep/check";
 
 const menuRef = ref();
 const defaultActive = ref(null);
 
-const { t, route, locale, translationCh, translationEn } =
-  useTranslationLang(menuRef);
 const {
+  route,
   device,
   logout,
   onPanel,
@@ -30,9 +24,7 @@ const {
   username,
   userAvatar,
   getDivStyle,
-  avatarsStyle,
+  avatarsStyle
-  getDropdownItemStyle,
-  getDropdownItemClass
 } = useNav();
 
 function getDefaultActive(routePath) {
@@ -90,50 +82,20 @@ watch(
           </div>
           <div :style="getDivStyle">
             <span class="select-none">
-              {{ transformI18n(route.meta.title) }}
+              {{ route.meta.title }}
             </span>
-            <LaySidebarExtraIcon :extraIcon="route.meta.extraIcon" />
+            <extraIcon :extraIcon="route.meta.extraIcon" />
           </div>
         </template>
       </el-menu-item>
     </el-menu>
     <div class="horizontal-header-right">
       <!-- 菜单搜索 -->
-      <LaySearch id="header-search" />
+      <Search id="header-search" />
-      <!-- 国际化 -->
-      <el-dropdown id="header-translation" trigger="click">
-        <GlobalizationIcon
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
-        />
-        <template #dropdown>
-          <el-dropdown-menu class="translation">
-            <el-dropdown-item
-              :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:text-white!', getDropdownItemClass(locale, 'zh')]"
-              @click="translationCh"
-            >
-              <span v-show="locale === 'zh'" class="check-zh">
-                <IconifyIconOffline :icon="Check" />
-              </span>
-              简体中文
-            </el-dropdown-item>
-            <el-dropdown-item
-              :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:text-white!', getDropdownItemClass(locale, 'en')]"
-              @click="translationEn"
-            >
-              <span v-show="locale === 'en'" class="check-en">
-                <IconifyIconOffline :icon="Check" />
-              </span>
-              English
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
       <!-- 全屏 -->
-      <LaySidebarFullScreen id="full-screen" />
+      <FullScreen id="full-screen" />
       <!-- 消息通知 -->
-      <LayNotice id="header-notice" />
+      <Notice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover select-none">
@@ -147,14 +109,14 @@ watch(
                 :icon="LogoutCircleRLine"
                 style="margin: 5px"
               />
-              {{ t("buttons.pureLoginOut") }}
+              退出系统
             </el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
       <span
         class="set-icon navbar-bg-hover"
-        :title="t('buttons.pureOpenSystemSet')"
+        title="打开系统配置"
         @click="onPanel"
       >
         <IconifyIconOffline :icon="Setting" />
@@ -168,22 +130,6 @@ watch(
   opacity: 0.45;
 }
 
-.translation {
-  ::v-deep(.el-dropdown-menu__item) {
-    padding: 5px 40px;
-  }
-
-  .check-zh {
-    position: absolute;
-    left: 20px;
-  }
-
-  .check-en {
-    position: absolute;
-    left: 20px;
-  }
-}
-
 .logout {
   width: 120px;
 

src/layout/components/sidebar/sidebarItem.vue

@@ -1,12 +1,11 @@
 <script setup lang="ts">
+import path from "path";
 import { getConfig } from "@/config";
-import { posix } from "path-browserify";
+import LinkItem from "./linkItem.vue";
-import { menuType } from "@/layout/types";
+import { menuType } from "../../types";
+import extraIcon from "./extraIcon.vue";
 import { ReText } from "@/components/ReText";
 import { useNav } from "@/layout/hooks/useNav";
-import { transformI18n } from "@/plugins/i18n";
-import SidebarLinkItem from "./SidebarLinkItem.vue";
-import SidebarExtraIcon from "./SidebarExtraIcon.vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import {
   type PropType,
@@ -17,10 +16,10 @@ import {
   useAttrs
 } from "vue";
 
-import ArrowUp from "~icons/ep/arrow-up-bold";
+import ArrowUp from "@iconify-icons/ep/arrow-up-bold";
-import EpArrowDown from "~icons/ep/arrow-down-bold";
+import EpArrowDown from "@iconify-icons/ep/arrow-down-bold";
-import ArrowLeft from "~icons/ep/arrow-left-bold";
+import ArrowLeft from "@iconify-icons/ep/arrow-left-bold";
-import ArrowRight from "~icons/ep/arrow-right-bold";
+import ArrowRight from "@iconify-icons/ep/arrow-right-bold";
 
 const attrs = useAttrs();
 const { layout, isCollapse, tooltipEffect, getDivStyle } = useNav();
@@ -61,21 +60,6 @@ const getSubMenuIconStyle = computed((): CSSProperties => {
   };
 });
 
-const textClass = computed(() => {
-  const item = props.item;
-  const baseClass = "w-full! text-inherit!";
-  if (
-    layout.value !== "horizontal" &&
-    isCollapse.value &&
-    !toRaw(item.meta.icon) &&
-    ((layout.value === "vertical" && item.parentId === null) ||
-      (layout.value === "mix" && item.pathList.length === 2))
-  ) {
-    return `${baseClass} min-w-[54px]! text-center! px-3!`;
-  }
-  return baseClass;
-});
-
 const expandCloseIcon = computed(() => {
   if (!getConfig()?.MenuArrowIconNoTransition) return "";
   return {
@@ -114,15 +98,16 @@ function resolvePath(routePath) {
   if (httpReg.test(routePath) || httpReg.test(props.basePath)) {
     return routePath || props.basePath;
   } else {
-    return posix.resolve(props.basePath, routePath);
+    // 使用path.posix.resolve替代path.resolve 避免windows环境下使用electron出现盘符问题
+    return path.posix.resolve(props.basePath, routePath);
   }
 }
 </script>
 
 <template>
-  <SidebarLinkItem
+  <link-item
     v-if="
-      hasOneShowingChild(item.children, item) &&
+      hasOneShowingChild(props.item.children, props.item) &&
       (!onlyOneChild.children || onlyOneChild.noShowingChildren)
     "
     :to="item"
@@ -134,7 +119,7 @@ function resolvePath(routePath) {
       v-bind="attrs"
     >
       <div
-        v-if="toRaw(item.meta.icon)"
+        v-if="toRaw(props.item.meta.icon)"
         class="sub-menu-icon"
         :style="getSubMenuIconStyle"
       >
@@ -142,26 +127,26 @@ function resolvePath(routePath) {
           :is="
             useRenderIcon(
               toRaw(onlyOneChild.meta.icon) ||
-                (item.meta && toRaw(item.meta.icon))
+                (props.item.meta && toRaw(props.item.meta.icon))
             )
           "
         />
       </div>
       <el-text
         v-if="
-          (!item?.meta.icon &&
+          (!props.item?.meta.icon &&
             isCollapse &&
             layout === 'vertical' &&
-            item?.pathList?.length === 1) ||
+            props.item?.pathList?.length === 1) ||
           (!onlyOneChild.meta.icon &&
             isCollapse &&
             layout === 'mix' &&
-            item?.pathList?.length === 2)
+            props.item?.pathList?.length === 2)
         "
         truncated
-        class="w-full! px-3! min-w-[54px]! text-center! text-inherit!"
+        class="!w-full !px-4 !text-inherit"
       >
-        {{ transformI18n(onlyOneChild.meta.title) }}
+        {{ onlyOneChild.meta.title }}
       </el-text>
 
       <template #title>
@@ -171,54 +156,64 @@ function resolvePath(routePath) {
               offset: [0, -10],
               theme: tooltipEffect
             }"
-            class="w-full! text-inherit!"
+            class="!w-full !text-inherit"
           >
-            {{ transformI18n(onlyOneChild.meta.title) }}
+            {{ onlyOneChild.meta.title }}
           </ReText>
-          <SidebarExtraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
+          <extraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
         </div>
       </template>
     </el-menu-item>
-  </SidebarLinkItem>
+  </link-item>
   <el-sub-menu
     v-else
     ref="subMenu"
     teleported
-    :index="resolvePath(item.path)"
+    :index="resolvePath(props.item.path)"
     v-bind="expandCloseIcon"
   >
     <template #title>
       <div
-        v-if="toRaw(item.meta.icon)"
+        v-if="toRaw(props.item.meta.icon)"
         :style="getSubMenuIconStyle"
         class="sub-menu-icon"
       >
-        <component :is="useRenderIcon(item.meta && toRaw(item.meta.icon))" />
+        <component
+          :is="useRenderIcon(props.item.meta && toRaw(props.item.meta.icon))"
+        />
       </div>
       <ReText
         v-if="
-          layout === 'mix' && toRaw(item.meta.icon)
+          layout === 'mix' && toRaw(props.item.meta.icon)
-            ? !isCollapse || item?.pathList?.length !== 2
+            ? !isCollapse || props.item?.pathList?.length !== 2
             : !(
                 layout === 'vertical' &&
                 isCollapse &&
-                toRaw(item.meta.icon) &&
+                toRaw(props.item.meta.icon) &&
-                item.parentId === null
+                props.item.parentId === null
               )
         "
         :tippyProps="{
           offset: [0, -10],
           theme: tooltipEffect
         }"
-        :class="textClass"
+        :class="{
+          '!w-full': true,
+          '!text-inherit': true,
+          '!px-4':
+            layout !== 'horizontal' &&
+            isCollapse &&
+            !toRaw(props.item.meta.icon) &&
+            props.item.parentId === null
+        }"
       >
-        {{ transformI18n(item.meta.title) }}
+        {{ props.item.meta.title }}
       </ReText>
-      <SidebarExtraIcon v-if="!isCollapse" :extraIcon="item.meta.extraIcon" />
+      <extraIcon v-if="!isCollapse" :extraIcon="props.item.meta.extraIcon" />
     </template>
 
     <sidebar-item
-      v-for="child in item.children"
+      v-for="child in props.item.children"
       :key="child.path"
       :is-nest="true"
       :item="child"

src/layout/components/sidebar/topCollapse.vue

@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import MenuFold from "@iconify-icons/ri/menu-fold-fill";
+import MenuUnfold from "@iconify-icons/ri/menu-unfold-fill";
+
+interface Props {
+  isActive: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  isActive: false
+});
+
+const emit = defineEmits<{
+  (e: "toggleClick"): void;
+}>();
+
+const toggleClick = () => {
+  emit("toggleClick");
+};
+</script>
+
+<template>
+  <div
+    class="px-3 mr-1 navbar-bg-hover"
+    :title="props.isActive ? '点击折叠' : '点击展开'"
+    @click="toggleClick"
+  >
+    <IconifyIconOffline
+      :icon="props.isActive ? MenuFold : MenuUnfold"
+      class="inline-block align-middle hover:text-primary dark:hover:!text-white"
+    />
+  </div>
+</template>

src/layout/components/sidebar/vertical.vue

@@ -1,16 +1,16 @@
 <script setup lang="ts">
+import Logo from "./logo.vue";
 import { useRoute } from "vue-router";
 import { emitter } from "@/utils/mitt";
+import SidebarItem from "./sidebarItem.vue";
+import LeftCollapse from "./leftCollapse.vue";
 import { useNav } from "@/layout/hooks/useNav";
+import CenterCollapse from "./centerCollapse.vue";
 import { responsiveStorageNameSpace } from "@/config";
 import { storageLocal, isAllEmpty } from "@pureadmin/utils";
 import { findRouteByPath, getParentPaths } from "@/router/utils";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import { ref, computed, watch, onMounted, onBeforeUnmount } from "vue";
-import LaySidebarLogo from "../lay-sidebar/components/SidebarLogo.vue";
-import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
-import LaySidebarLeftCollapse from "../lay-sidebar/components/SidebarLeftCollapse.vue";
-import LaySidebarCenterCollapse from "../lay-sidebar/components/SidebarCenterCollapse.vue";
 
 const route = useRoute();
 const isShow = ref(false);
@@ -93,12 +93,13 @@ onBeforeUnmount(() => {
     @mouseenter.prevent="isShow = true"
     @mouseleave.prevent="isShow = false"
   >
-    <LaySidebarLogo v-if="showLogo" :collapse="isCollapse" />
+    <Logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar
       wrap-class="scrollbar-wrapper"
       :class="[device === 'mobile' ? 'mobile' : 'pc']"
     >
       <el-menu
+        router
         unique-opened
         mode="vertical"
         popper-class="pure-scrollbar"
@@ -108,7 +109,7 @@ onBeforeUnmount(() => {
         :popper-effect="tooltipEffect"
         :default-active="defaultActive"
       >
-        <LaySidebarItem
+        <sidebar-item
           v-for="routes in menuData"
           :key="routes.path"
           :item="routes"
@@ -117,12 +118,12 @@ onBeforeUnmount(() => {
         />
       </el-menu>
     </el-scrollbar>
-    <LaySidebarCenterCollapse
+    <CenterCollapse
       v-if="device !== 'mobile' && (isShow || isCollapse)"
       :is-active="pureApp.sidebar.opened"
       @toggleClick="toggleSideBar"
     />
-    <LaySidebarLeftCollapse
+    <LeftCollapse
       v-if="device !== 'mobile'"
       :is-active="pureApp.sidebar.opened"
       @toggleClick="toggleSideBar"

src/layout/components/tag/index.scss

@@ -41,13 +41,6 @@
       padding-right: 24px;
     }
 
-    &.chrome-item {
-      padding-right: 0;
-      padding-left: 0;
-      margin-right: -18px;
-      box-shadow: none;
-    }
-
     .el-icon-close {
       position: absolute;
       top: 50%;
@@ -59,10 +52,10 @@
       color: var(--el-color-primary);
       cursor: pointer;
       border-radius: 4px;
-      transform: translate(0, -50%);
       transition:
         background-color 0.12s,
         color 0.12s;
+      transform: translate(0, -50%);
 
       &:hover {
         color: rgb(0 0 0 / 88%) !important;
@@ -83,14 +76,6 @@
     overflow: hidden;
     white-space: nowrap;
 
-    &.chrome-scroll-container {
-      padding-top: 4px;
-
-      .fixed-tag {
-        padding: 0 !important;
-      }
-    }
-
     .tab {
       position: relative;
       float: left;
@@ -104,12 +89,6 @@
         &:nth-child(1) {
           padding: 0 12px;
         }
-
-        &.chrome-item {
-          &:nth-child(1) {
-            padding: 0;
-          }
-        }
       }
 
       .fixed-tag {
@@ -127,10 +106,10 @@
     font-weight: normal;
     color: var(--el-text-color-primary);
     white-space: nowrap;
-    outline: 0;
     list-style-type: none;
     background: #fff;
     border-radius: 4px;
+    outline: 0;
     box-shadow: 0 2px 8px rgb(0 0 0 / 15%);
 
     li {
@@ -194,29 +173,9 @@
   color: #fff;
   box-shadow: 0 0 0.7px #888;
 
-  .chrome-tab {
-    z-index: 10;
-  }
-
-  .chrome-tab__bg {
-    color: var(--el-color-primary-light-9) !important;
-  }
-
   .tag-title {
     color: var(--el-color-primary) !important;
   }
-
-  .chrome-close-btn {
-    color: var(--el-color-primary);
-
-    &:hover {
-      background-color: var(--el-color-primary);
-    }
-  }
-
-  .chrome-tab-divider {
-    opacity: 0;
-  }
 }
 
 .arrow-left,
@@ -303,69 +262,3 @@
   background: var(--el-color-primary);
   animation: schedule-out-width 200ms ease-in;
 }
-
-/* 谷歌风格的页签 */
-.chrome-tab {
-  position: relative;
-  display: inline-flex;
-  gap: 16px;
-  align-items: center;
-  justify-content: center;
-  padding: 0 24px;
-  white-space: nowrap;
-  cursor: pointer;
-
-  .tag-title {
-    padding: 0;
-  }
-
-  .chrome-tab-divider {
-    position: absolute;
-    right: 7px;
-    width: 1px;
-    height: 14px;
-    background-color: #2b2d2f;
-  }
-
-  &:hover {
-    z-index: 10;
-
-    .chrome-tab__bg {
-      color: #dee1e6;
-    }
-
-    .tag-title {
-      color: #1f1f1f;
-    }
-
-    .chrome-tab-divider {
-      opacity: 0;
-    }
-  }
-
-  .chrome-tab__bg {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: -10;
-    width: 100%;
-    height: 100%;
-    color: transparent;
-    pointer-events: none;
-  }
-
-  .chrome-close-btn {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    width: 16px;
-    height: 16px;
-    color: #666;
-    border-radius: 50%;
-
-    &:hover {
-      color: white;
-      background-color: #b1b3b8;
-    }
-  }
-}

src/layout/components/tag/index.vue

@@ -1,12 +1,9 @@
 <script setup lang="ts">
-import { $t } from "@/plugins/i18n";
 import { emitter } from "@/utils/mitt";
-import NProgress from "@/utils/progress";
 import { RouteConfigs } from "../../types";
 import { useTags } from "../../hooks/useTag";
 import { routerArrays } from "@/layout/types";
 import { onClickOutside } from "@vueuse/core";
-import TagChrome from "./components/TagChrome.vue";
 import { handleAliveRoute, getTopMenu } from "@/router/utils";
 import { useSettingStoreHook } from "@/store/modules/settings";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
@@ -19,11 +16,11 @@ import {
   useResizeObserver
 } from "@pureadmin/utils";
 
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
-import Fullscreen from "~icons/ri/fullscreen-fill";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
-import ArrowDown from "~icons/ri/arrow-down-s-line";
+import ArrowDown from "@iconify-icons/ri/arrow-down-s-line";
-import ArrowRightSLine from "~icons/ri/arrow-right-s-line";
+import ArrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";
-import ArrowLeftSLine from "~icons/ri/arrow-left-s-line";
+import ArrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line";
 
 const {
   Close,
@@ -38,7 +35,6 @@ const {
   buttonLeft,
   showModel,
   translateX,
-  isFixedTag,
   pureSetting,
   activeIndex,
   getTabStyle,
@@ -52,7 +48,6 @@ const {
   onMounted,
   onMouseenter,
   onMouseleave,
-  transformI18n,
   onContentFullScreen
 } = useTags();
 
@@ -207,14 +202,12 @@ function dynamicRouteTag(value: string): void {
 
 /** 刷新路由 */
 function onFresh() {
-  NProgress.start();
   const { fullPath, query } = unref(route);
   router.replace({
     path: "/redirect" + fullPath,
     query
   });
   handleAliveRoute(route as ToRouteType, "refresh");
-  NProgress.done();
 }
 
 function deleteDynamicTag(obj: any, current: any, tag?: string) {
@@ -257,7 +250,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
   if (tag === "other") {
     spliceRoute(1, 1, true);
   } else if (tag === "left") {
-    spliceRoute(fixedTags.length, valueIndex - fixedTags.length);
+    spliceRoute(fixedTags.length, valueIndex - 1, true);
   } else if (tag === "right") {
     spliceRoute(valueIndex + 1, multiTags.value.length);
   } else {
@@ -347,16 +340,16 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
       setTimeout(() => {
         if (pureSetting.hiddenSideBar) {
           tagsViews[6].icon = ExitFullscreen;
-          tagsViews[6].text = $t("buttons.pureContentExitFullScreen");
+          tagsViews[6].text = "内容区退出全屏";
         } else {
           tagsViews[6].icon = Fullscreen;
-          tagsViews[6].text = $t("buttons.pureContentFullScreen");
+          tagsViews[6].text = "内容区全屏";
         }
       }, 100);
       break;
   }
   setTimeout(() => {
-    showMenuModel(route.fullPath, route.query, route.params);
+    showMenuModel(route.fullPath, route.query);
   });
 }
 
@@ -391,18 +384,15 @@ function disabledMenus(value: boolean, fixedTag = false) {
 function showMenuModel(
   currentPath: string,
   query: object = {},
-  params: object = {},
   refresh = false
 ) {
   const allRoute = multiTags.value;
   const routeLength = multiTags.value.length;
   let currentIndex = -1;
-  if (!isAllEmpty(params)) {
+  if (isAllEmpty(query)) {
-    currentIndex = allRoute.findIndex(v => isEqual(v.params, params));
-  } else if (!isAllEmpty(query)) {
-    currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
-  } else {
     currentIndex = allRoute.findIndex(v => v.path === currentPath);
+  } else {
+    currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
   }
   function fixedTagDisabled() {
     if (allRoute[currentIndex]?.meta?.fixedTag) {
@@ -468,14 +458,14 @@ function openMenu(tag, e) {
   } else if (route.path !== tag.path && route.name !== tag.name) {
     // 右键菜单不匹配当前路由，隐藏刷新
     tagsViews[0].show = false;
-    showMenuModel(tag.path, tag.query, tag.params);
+    showMenuModel(tag.path, tag.query);
   } else if (multiTags.value.length === 2 && route.path !== tag.path) {
     showMenus(true);
     // 只有两个标签时不显示关闭其他标签页
     tagsViews[4].show = false;
-    showMenuModel(tag.path, tag.query, tag.params);
+  } else if (route.path === tag.path) {
-  } else {
+    // 右键当前激活的菜单
-    showMenuModel(tag.path, tag.query, tag.params, true);
+    showMenuModel(tag.path, tag.query, true);
   }
 
   currentSelect.value = tag;
@@ -517,7 +507,6 @@ function tagOnClick(item) {
   } else {
     router.push({ path });
   }
-  emitter.emit("tagOnClick", item);
 }
 
 onClickOutside(contextmenuRef, closeMenu, {
@@ -574,7 +563,6 @@ onBeforeUnmount(() => {
     <div
       ref="scrollbarDom"
       class="scroll-container"
-      :class="showModel === 'chrome' && 'chrome-scroll-container'"
       @wheel.prevent="handleWheel"
     >
       <div ref="tabDom" class="tab select-none" :style="getTabStyle">
@@ -585,54 +573,35 @@ onBeforeUnmount(() => {
           :class="[
             'scroll-item is-closable',
             linkIsActive(item),
-            showModel === 'chrome' && 'chrome-item',
+            !isAllEmpty(item?.meta?.fixedTag) && 'fixed-tag'
-            isFixedTag(item) && 'fixed-tag'
           ]"
           @contextmenu.prevent="openMenu(item, $event)"
           @mouseenter.prevent="onMouseenter(index)"
           @mouseleave.prevent="onMouseleave(index)"
           @click="tagOnClick(item)"
         >
-          <template v-if="showModel !== 'chrome'">
+          <span
-            <span
+            class="tag-title dark:!text-text_color_primary dark:hover:!text-primary"
-              class="tag-title dark:text-text_color_primary! dark:hover:text-primary!"
+          >
-            >
+            {{ item.meta.title }}
-              {{ transformI18n(item.meta.title) }}
+          </span>
-            </span>
+          <span
-            <span
+            v-if="
-              v-if="
+              isAllEmpty(item?.meta?.fixedTag)
-                isFixedTag(item)
+                ? iconIsActive(item, index) ||
-                  ? false
+                  (index === activeIndex && index !== 0)
-                  : iconIsActive(item, index) ||
+                : false
-                    (index === activeIndex && index !== 0)
+            "
-              "
+            class="el-icon-close"
-              class="el-icon-close"
+            @click.stop="deleteMenu(item)"
-              @click.stop="deleteMenu(item)"
+          >
-            >
+            <IconifyIconOffline :icon="Close" />
-              <IconifyIconOffline :icon="Close" />
+          </span>
-            </span>
+          <span
-            <span
+            v-if="showModel !== 'card'"
-              v-if="showModel !== 'card'"
+            :ref="'schedule' + index"
-              :ref="'schedule' + index"
+            :class="[scheduleIsActive(item)]"
-              :class="[scheduleIsActive(item)]"
+          />
-            />
-          </template>
-          <div v-else class="chrome-tab">
-            <div class="chrome-tab__bg">
-              <TagChrome />
-            </div>
-            <span class="tag-title">
-              {{ transformI18n(item.meta.title) }}
-            </span>
-            <span
-              v-if="isFixedTag(item) ? false : index !== 0"
-              class="chrome-close-btn"
-              @click.stop="deleteMenu(item)"
-            >
-              <IconifyIconOffline :icon="Close" />
-            </span>
-            <span class="chrome-tab-divider" />
-          </div>
         </div>
       </div>
     </div>
@@ -655,7 +624,7 @@ onBeforeUnmount(() => {
         >
           <li v-if="item.show" @click="selectTag(key, item)">
             <IconifyIconOffline :icon="item.icon" />
-            {{ transformI18n(item.text) }}
+            {{ item.text }}
           </li>
         </div>
       </ul>
@@ -679,7 +648,7 @@ onBeforeUnmount(() => {
             :disabled="item.disabled"
           >
             <IconifyIconOffline :icon="item.icon" />
-            {{ transformI18n(item.text) }}
+            {{ item.text }}
           </el-dropdown-item>
         </el-dropdown-menu>
       </template>

src/layout/frameView.vue

@@ -1,10 +1,9 @@
 <script setup lang="ts">
-import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
 import { ref, unref, watch, onMounted, nextTick } from "vue";
 
 defineOptions({
-  name: "LayFrame"
+  name: "FrameView"
 });
 
 const props = defineProps<{
@@ -14,27 +13,17 @@ const props = defineProps<{
   };
 }>();
 
-const { t } = useI18n();
 const loading = ref(true);
 const currentRoute = useRoute();
 const frameSrc = ref<string>("");
 const frameRef = ref<HTMLElement | null>(null);
-const fallbackTimer = ref<number | null>(null);
-
 if (unref(currentRoute.meta)?.frameSrc) {
   frameSrc.value = unref(currentRoute.meta)?.frameSrc as string;
 }
-
+unref(currentRoute.meta)?.frameLoading === false && hideLoading();
-function clearFallbackTimer() {
-  if (fallbackTimer.value !== null) {
-    clearTimeout(fallbackTimer.value);
-    fallbackTimer.value = null;
-  }
-}
 
 function hideLoading() {
   loading.value = false;
-  clearFallbackTimer();
 }
 
 function init() {
@@ -43,42 +32,32 @@ function init() {
     if (!iframe) return;
     const _frame = iframe as any;
     if (_frame.attachEvent) {
-      _frame.attachEvent("onload", hideLoading);
+      _frame.attachEvent("onload", () => {
+        hideLoading();
+      });
     } else {
-      iframe.onload = hideLoading;
+      iframe.onload = () => {
+        hideLoading();
+      };
     }
   });
 }
 
-let isRedirect = false;
-
 watch(
   () => currentRoute.fullPath,
   path => {
     if (
       currentRoute.name === "Redirect" &&
-      props.frameInfo?.fullPath &&
+      path.includes(props.frameInfo?.fullPath)
-      path.includes(props.frameInfo.fullPath)
     ) {
-      isRedirect = true;
+      frameSrc.value = path; // redirect时，置换成任意值，待重定向后 重新赋值
       loading.value = true;
-      return;
     }
-    if (props.frameInfo?.fullPath === path && isRedirect) {
+    // 重新赋值
-      loading.value = true;
+    if (props.frameInfo?.fullPath === path) {
-      clearFallbackTimer();
+      frameSrc.value = props.frameInfo?.frameSrc;
-      const url = new URL(props.frameInfo.frameSrc, window.location.origin);
-      const joinChar = url.search ? "&" : "?";
-      frameSrc.value = `${props.frameInfo.frameSrc}${joinChar}t=${Date.now()}`;
-      fallbackTimer.value = window.setTimeout(() => {
-        if (loading.value) {
-          hideLoading();
-        }
-      }, 1500);
-      isRedirect = false;
     }
-  },
+  }
-  { immediate: true }
 );
 
 onMounted(() => {
@@ -87,11 +66,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <div
+  <div v-loading="loading" class="frame" element-loading-text="加载中...">
-    v-loading="loading"
-    class="frame"
-    :element-loading-text="t('status.pureLoad')"
-  >
     <iframe ref="frameRef" :src="frameSrc" class="frame-iframe" />
   </div>
 </template>