'admin-22.07.10:发布v2.2.0版本，具体查看master分支根目录CHANGELOG.md'

Merge pull request !29 from 山田/master

.env

@@ -1,5 +1,8 @@
 # port 端口号
-VUE_APP_PORT = 9999
+VITE_PORT = 8888
 
 # open 运行 npm run dev 时自动打开浏览器
-VUE_APP_OPEN = false
+VITE_OPEN = false
+
+# public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可
+VITE_PUBLIC_PATH = /vue-next-admin-preview/

.env.development

@@ -1,2 +1,5 @@
-# 开发环境
-VUE_APP_BASE_API = http://localhost:9999/
+# 本地环境
+ENV = 'development'
+
+# 本地环境接口地址
+VITE_API_URL = 'http://localhost:8888/'

.env.production

@@ -1,2 +1,5 @@
 # 线上环境
-VUE_APP_BASE_API = ''
+ENV = 'production'
+
+# 线上环境接口地址
+VITE_API_URL = 'https://lyt-top.gitee.io/vue-next-admin-preview/'

.eslintignore

@@ -1,3 +1,4 @@
+
 *.sh
 node_modules
 lib
@@ -5,7 +6,6 @@ lib
 *.scss
 *.woff
 *.ttf
-*.json
 .vscode
 .idea
 dist

.eslintrc.js

@@ -1,22 +1,63 @@
 module.exports = {
 	root: true,
 	env: {
+		browser: true,
+		es2021: true,
 		node: true,
 	},
+	parser: 'vue-eslint-parser',
 	parserOptions: {
-		parser: '@babel/eslint-parser',
+		ecmaVersion: 12,
+		parser: '@typescript-eslint/parser',
+		sourceType: 'module',
 	},
-	plugins: ['vue'],
-	extends: ['plugin:vue/essential', 'eslint:recommended'],
+	extends: ['plugin:vue/vue3-essential', 'plugin:vue/essential', 'eslint:recommended'],
+	plugins: ['vue', '@typescript-eslint'],
 	rules: {
 		// http://eslint.cn/docs/rules/
+		// https://eslint.vuejs.org/rules/
+		'@typescript-eslint/ban-ts-ignore': 'off',
+		'@typescript-eslint/explicit-function-return-type': 'off',
+		'@typescript-eslint/no-explicit-any': 'off',
+		'@typescript-eslint/no-var-requires': 'off',
+		'@typescript-eslint/no-empty-function': 'off',
+		'@typescript-eslint/no-use-before-define': 'off',
+		'@typescript-eslint/ban-ts-comment': 'off',
+		'@typescript-eslint/ban-types': 'off',
+		'@typescript-eslint/no-non-null-assertion': 'off',
+		'@typescript-eslint/explicit-module-boundary-types': 'off',
+		'vue/custom-event-name-casing': 'off',
+		'vue/attributes-order': 'off',
+		'vue/one-component-per-file': 'off',
+		'vue/html-closing-bracket-newline': 'off',
+		'vue/max-attributes-per-line': 'off',
+		'vue/multiline-html-element-content-newline': 'off',
+		'vue/singleline-html-element-content-newline': 'off',
+		'vue/attribute-hyphenation': 'off',
+		'vue/html-self-closing': 'off',
+		'vue/no-multiple-template-root': 'off',
+		'vue/require-default-prop': 'off',
+		'vue/no-v-model-argument': 'off',
+		'vue/no-arrow-functions-in-watch': 'off',
+		'vue/no-template-key': 'off',
+		'vue/no-v-html': 'off',
+		'vue/comment-directive': 'off',
 		'vue/no-parsing-error': 'off',
-		'no-unused-vars': 'error',
-		'no-dupe-args': 'error',
-		'no-empty': 'off',
-		'no-extra-semi': 'off',
-		'no-constant-condition': 'off',
-		'no-console': 'error',
+		'vue/no-deprecated-v-on-native-modifier': 'off',
 		'vue/multi-word-component-names': 'off',
+		'no-useless-escape': 'off',
+		'no-sparse-arrays': 'off',
+		'no-prototype-builtins': 'off',
+		'no-constant-condition': 'off',
+		'no-use-before-define': 'off',
+		'no-restricted-globals': 'off',
+		'no-restricted-syntax': 'off',
+		'generator-star-spacing': 'off',
+		'no-unreachable': 'off',
+		'no-multiple-template-root': 'off',
+		'no-unused-vars': 'error',
+		'no-v-model-argument': 'off',
+		'no-case-declarations': 'off',
+		'no-console': 'error',
 	},
 };

.gitignore

@@ -1,7 +1,8 @@
-node_modules
 .DS_Store
+node_modules
 /dist
 
+
 # local env files
 .env.local
 .env.*.local
@@ -19,4 +20,4 @@ pnpm-debug.log*
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
+*.sw?

CHANGELOG.md

@@ -1,124 +1,367 @@
-# <a href="https://gitee.com/lyt-top/vue-next-admin/tree/vue-prev-admin" target="_blank">vue-prev-admin 更新日志</a>
+# <a href="https://gitee.com/lyt-top/vue-next-admin" target="_blank">vue-next-admin 更新日志</a>
 
-🎉🎉🔥 `vue-prev-admin` 基于 vue2.x + webpack + element ui，适配手机、平板、pc 的后台开源免费模板库（vue3.x 请切换 master 分支）
+🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）
 
-## 1.2.3
+## 2.2.0
 
-`2023.04.12`
+`2022.07.10`
 
-- 🐞 修复 [#I6UW2I 关闭标签页后，分栏没有消失，需要手动点击首页才会消失](https://gitee.com/lyt-top/vue-next-admin/issues/I6UW2I)，感谢[@小菜鸟儿](https://gitee.com/cainiaoer)
-- 🎯 优化 `layout/navBars/breadcrumb` 文件夹名称改成 `layout/navBars/topBar` 更易理解（可全局替换），感谢群友@傲世盛唐
-- 🎯 优化 `layout/navBars/topBar/user.vue` 组件，`UserNews` 点击消息图标触发范围，防止点击消息通知背景色时不触发 Popover 弹出框
+⚡⚡⚡ [/sec/stores/userInfo.ts](https://gitee.com/lyt-top/vue-next-admin/blob/master/src/stores/userInfo.ts) 下添加了 `getApiUserInfo` 接口模拟数据 `setTimeout` 为 3 秒
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 [主界面重新授权按钮点击卡死不跳转登录界面#I5C3JS](https://gitee.com/lyt-top/vue-next-admin/issues/I5C3JS)，感谢[@Hero-Typ](https://gitee.com/tian_yu_peng)
+- 🐞 修复 编译警告[#I5CVSB](https://gitee.com/lyt-top/vue-next-admin/issues/I5CVSB)，全局替换成 `:deep(attr)`，感谢[@Linvas](https://gitee.com/linvas)。参考文档：[vue3 sfc-style](https://v3.cn.vuejs.org/api/sfc-style.html#style-scoped)。`node_modules\print-js\dist\print.js` 需 `print-js` 作者适配或去除 `package.json` 中的 `"print-js": "^1.6.0"`
+- 🐞 修复 [vue-next-admin-template-js 版本前端控制路由：userInfo.js 请求用户信息接口报错，加载不到路由 可以写个定时器模拟一下接口 一样的报错#I5F1HP](https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP)，感谢[@白开水](https://gitee.com/libin951223)
+
+## 2.1.1
+
+`2022.05.27`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 深色模式下，`<el-button text></el-button>` 时，`:active` 样式
+- 🎯 优化 [页面缓存在刷新之后失效 #I58U75](https://gitee.com/lyt-top/vue-next-admin/issues/I58U75))，感谢[@ls0428](https://gitee.com/ls0428)
+- 🎯 优化 [SvgIcon 对下载的 Svg 图像设置颜色无效 #I59ND0](https://gitee.com/lyt-top/vue-next-admin/issues/I59ND0))，感谢[@elus_z](https://gitee.com/elus_z)
+- 🎯 优化 `/src/utils/toolsValidate.ts` 工具类
+- 🐞 修复 [布局切换，TagsView 显示的 tab 会多一个出来 #I58WGM](https://gitee.com/lyt-top/vue-next-admin/issues/I58WGM)，感谢[@lg_boy](https://gitee.com/lg_boy)
+- 🐞 修复 [如果设置顶部面包屑导航开启图标 isBreadcrumbIcon=true 后，样式有点问题 如果不开启就是正常的 #I58VB8](https://gitee.com/lyt-top/vue-next-admin/issues/I58VB8)
+- 🐞 修复 地址栏路由地址输入错误时，返回首页后，再次输入路由地址错误时，不跳转 404 问题
+- 🐞 修复 [2.1.0 版本的图标选择组件多次点击后功能失效 #I590TH](https://gitee.com/lyt-top/vue-next-admin/issues/I590TH)，感谢[@quber](https://gitee.com/quber)
+
+## 2.1.0
+
+`2022.04.18`
+
+⚡⚡⚡ 此版本为破环性更新，优化内容如下：（谨慎更新！谨慎更新！！谨慎更新！！！）。因为 `vuex` 替换成 `pinia`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 部分界面图片不显示问题（更换 gitee 在线图片地址源）
+- 🎯 优化 各界面方法引入与逻辑之间添加一行空行，方便区分内容
+- 🎯 优化 图标选择器 [#I4YAHB](https://gitee.com/lyt-top/vue-next-admin/issues/I4YAHB)，感谢[@真有你的](https://gitee.com/sunliusen)
+- 🎯 优化 图标选择器 icon type 类型为 all 时，类型 ali、ele、awe 回显问题
+- 🎯 优化 去掉开发环境 i18n 控制台警告，页面代码：[i18n/index.ts](https://gitee.com/lyt-top/vue-next-admin/blob/master/src/i18n/index.ts)
+- 🎯 优化 `NextLoading.start()` 方法，防止第一次进入界面时出现短暂空白
+- 🎯 优化 地址栏有参数退出登录，再次登录不跳之前界面问题 `src/layout/navBars/breadcrumb/user.vue`
+- 🎯 优化 `SvgIcon` 组件，防止 `开启 Tagsview 图标` 时，`tagsView 右键菜单关闭` 报错问题，工作流不可连线、全屏时关闭按钮消失问题
+- 🎯 优化 [如果 url 中有中文等特殊字符，第一次切换该 tab 时 keep-alive 失效#I55JS7](https://gitee.com/lyt-top/vue-next-admin/issues/I55JS7),感谢[yuyong1566](https://gitee.com/yuyong1566)
+- 🎯 优化 [wangEditor](https://www.wangeditor.com/) 更新到 v5，[vue3 版本线上示例中 wangeditor 富文本编辑器 demo 实例,无法换行#I5565B](https://gitee.com/lyt-top/vue-next-admin/issues/I5565B)，感谢@[jenchih](https://gitee.com/jenchih)
+- 🎯 优化 [在关闭 tagview 时，高度刷新时会会变化，出现滚动条](https://gitee.com/lyt-top/vue-next-admin/issues/I55FHM)，感谢[张松](https://gitee.com/zs310071113)
+- 🎯 优化 [路由参数](https://lyt-top.gitee.io/vue-next-admin-preview/#/params/common)演示
+- 🎉 新增 [vuex](https://vuex.vuejs.org/) 替换成 [pinia](https://pinia.vuejs.org/getting-started.html)
+- 🎉 新增 tagsView 支持自定义 tagsView 名称（文章详情时有用），前往体验：[路由参数/普通路由](https://lyt-top.gitee.io/vue-next-admin-preview/#/params/common)。新增 tagsView 支持自定义名称国际化，感谢[@q7but](https://gitee.com/q7but)、[!22 add 添加自定义 tagVIewName 拓展,支持国际化](https://gitee.com/lyt-top/vue-next-admin/pulls/22/files)、感谢[@tony_tong_xin](https://gitee.com/tony_tong_xin)
+- 🐞 修复 适配 `"element-plus": "^2.1.9"，2.2.0` 版本
+- 🐞 修复 [导航栏横向布局后，一级菜单显示问题#I4Z3M3](https://gitee.com/lyt-top/vue-next-admin/issues/I4Z3M3)
+- 🐞 修复 横向布局三级及以上导航菜单高亮、导航高度不统一问题
+- 🐞 修复 分栏模式下,选中的菜单是 primary 样式,鼠标移入字也变成 primary 色了，感谢群友@孤夜-流殇
+- 🐞 修复 [vuex 里面改了颜色 但是不生效 #I4WFMA](https://gitee.com/lyt-top/vue-next-admin/issues/I4WFMA)
+- 🐞 修复 全局主题 primary 清空颜色后报错，[#I4X0LG](https://gitee.com/lyt-top/vue-next-admin/issues/I4X0LG)，感谢[面向 BUG 编程](https://gitee.com/fhtfy)
+- 🐞 修复 [.eslintrc.js 文件 rules 标签名错误 #I53IPK](https://gitee.com/lyt-top/vue-next-admin/issues/I53IPK)，感谢[yuyong1566](https://gitee.com/yuyong1566)
+- 🐞 修复 `开启 Tagsview 图标` 时，`tagsView 右键菜单关闭` 报错问题
+- 🐞 修复 `router.push` 路径找不到时报错问题，`404、401 界面` 已移入到 `main` 主布局里（之前全屏）
+- 🐞 修复 [全局修改组件大小失效了](https://gitee.com/lyt-top/vue-next-admin/issues/I551RP)，感谢[lg_boy](https://gitee.com/lg_boy)
+- 🐞 修复 [修改一下配置时，需要每次都清理 `window.localStorage` 浏览器永久缓存，配置才会生效，问题解决#I567R1](https://gitee.com/lyt-top/vue-next-admin/issues/I567R1),感谢[@lanbao123](https://gitee.com/lanbao123)
+- 🐞 修复 [标记为需要缓存的 tab 页后，再次从左侧菜单打开，还是显示被缓存的页面内容#I4UY3G](https://gitee.com/lyt-top/vue-next-admin/issues/I4UY3G)，感谢@axcc1234、特别感谢群友@华仔
+- 🌈 重构 路由（`/src/router/index.ts`）解决 No match found for location with path "xxx"(前端控制，后端控制未解决) 问题
+
+## 2.0.2
+
+`2022.03.04`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 Alert 提示添加边框
+- 🎯 优化 功能 / 数字滚动 演示界面
+- 🐞 修复 全局主题按钮颜色 :active 问题
+- 🐞 修复 Dropdown 下拉菜单样式问题
+- 🐞 修复 SvgIcon 图标组件动态切换时报警告问题，[SvgIcon 改变 name 时可能导致图像不显示](https://gitee.com/lyt-top/vue-next-admin/issues/I4VGE0)，感谢@axcc1234
+
+## 2.0.1
+
+`2022.02.25`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 svgIcon 图标组件
+- 🎯 优化 vite.config.ts 打包，感谢群友@YourObjec
+- 🐞 修复 tagViews 开启图标不显示问题（风格 5），感谢群友@坏人
+- 🐞 修复 [Element Plus 1.2.0-beta.6 以后的版本 el-table 在移动端无法左右滑动](https://gitee.com/lyt-top/vue-next-admin/issues/I4UPTP)，感谢@YGDada
+
+## 2.0.0
+
+`2022.02.21`
+
+⚡⚡⚡ 此版本为破环性更新，优化内容如下：（谨慎更新！谨慎更新！！谨慎更新！！！）。演示界面建议直接覆盖文件。如需使用之前版本，请前往[gitee 发行版](https://gitee.com/lyt-top/vue-next-admin/releases) 进行对应版本下载。基础版会基于 `master` 分支进行修改
+
+- 🌟 更新 依赖更新最新版本
+- 🌟 更新 登录页、首页
+- 💔 移除 vue-web-screen-shot
+- 💔 移除 城市多级联动，完整 json 数据请去 [vue-next-admin-images/menu](https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu) 仓库查看
+- 💔 移除 功能/echartsTree 树图
+- 💔 移除 其它设置/Tagsview 风格 2、Tagsview 风格 3
+- 💔 移除 功能/验证器
+- 🚧 调整 src/api 编写方式
+- 🚧 调整 自定义封装公用组件演示，更好的维护
+- 🎉 新增 Volar 支持，vs code 配置参考 [Vue Language Features (Volar)](https://lyt-top.gitee.io/vue-next-admin-doc-preview/home/vscode/)
+- 🎉 新增 `SvgIcon` 支持本地 svg 图标使用
+- 🎉 新增 表单表格验证演示
+- 🎯 优化 全局主题（移除 success、info、warning、danger）
+- 🎯 优化 工作流（开源）
+- 🎯 优化 element plus svg 图标，`elementXXX` 改成 `ele-XXX`
+- 🌈 重构 深色模式
+- 🌹 合并 [处理 parent 的 h100 由于外层有 min-height 导致失效的问题](https://gitee.com/lyt-top/vue-next-admin/pulls/20)，感谢@MaxNull、@21030442-mao
+- 🐞 修复 element plus 升级 `^1.3.0-beta.5` 后 组件 size 大小问题（大改：涉及布局、演示界面）
+- 🐞 修复 vs code 使用 Vue Language Features (Volar) 插件 代码报红问题（可以把公用的 ts 类型定义封装起来公用）
 
 ## 1.2.2
 
-`2023.02.23`
+`2021.12.21`
 
-🚩🚩🚩 感谢 [驰骋工作流引擎-表单引擎-低代码开发平台](http://www.ccflow.org/) 赞助商的赞助。驰骋公司为社会提供流程引擎+表单引擎+低代码开发平台一体的开源软件解决方案，欢迎广大开发者前去体验！
-
-- 🎉 新增 赞助商组件（`/src/layout/sponsors`），[项目目录结构查看](https://lyt-top.gitee.io/vue-next-admin-doc-preview/config/)
-- 🎯 优化 `/src/utils/storage` 下 `key` 编写成 `${__NEXT_NAME__}:${key}`，防止部署多套系统到同一域名不同目录时，变量共用的问题（`__NEXT_NAME__`为 `package.json` 中的 `name`）
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 iframes 滚动条问题
+- 🎯 优化 部署后每次都要强制刷新清浏览器缓存问题
+- 🎉 新增 工具类百分比验证演示
+- 🐞 修复 [tag-view 标签右键会超出浏览器 #I4KN78](https://gitee.com/lyt-top/vue-next-admin/issues/I4KN78)
 
 ## 1.2.1
 
-`2022.12.12`
+`2021.12.12`
 
-- 🐞 优化 版本升级提示
-- 🐞 优化 深色模式
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 cropper 裁剪时卡顿问题 [#I4M2VQ](https://gitee.com/lyt-top/vue-next-admin/issues/I4M2VQ)
+- 🎯 优化 Wangeditor 富文本编辑器的问题 [#I4LPC1](https://gitee.com/lyt-top/vue-next-admin/issues/I4LPC1)、[#I4LM7I](https://gitee.com/lyt-top/vue-next-admin/issues/I4LM7I)
+- 🐞 修复 浏览器标题问题
+- 🐞 修复 element plus svg 图标引入
+- 🐞 修复 工作流不可以拖线连接问题
 
 ## 1.2.0
 
-`2022.12.06`
+`2021.11.28`
 
-- 🎉 新增 版本升级提示
-- 🎉 新增 主题色修改
-- 🎉 新增 深色模式
-- 🐞 优化 外链界面 `/src/layout/routerView/link.vue`
-- 🐞 修复 `菜单水平折叠` 刷新界面还原默认值问题
-- 💔 移除 `vue.config.js` 打包加时间戳方法，因为打包报错了
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 深色模式
+- 🎯 优化 `/@/utils` 文件夹，合并删除单一内容
+- 🎯 优化 系统设置：菜单管理（新增、修改）、角色管理（新增菜单权限）、用户管理、部门管理、字典管理
+- 🎯 优化 登录界面逻辑、权限管理逻辑
+- 🎯 优化 同步 [vue-next-admin-images](https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu) 后端控制菜单模拟数据
+- 🎉 新增 适配 Font Icon 向 SVG Icon 迁移（改动大，"element-plus": "^1.2.0-beta.4" 谨慎更新）
+- 🐞 修复 热更新问题，感谢@甜蜜蜜
+- 🐞 修复 页面/element 字体图标演示
+- 🐞 修复 功能/图标选择器演示，新增高级功能 [issues #I4GJXQ](https://gitee.com/lyt-top/vue-next-admin/issues/I4GJXQ)
+
+## 1.1.2
+
+`2021.10.17`
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 开启全屏时，刷新界面被还原成未全屏的状态
+- 🎯 优化 tagsView 右键菜单关闭逻辑
+- 🎯 优化 wangeditor 富文本编辑器（增加双向绑定）
+- 🎉 新增 工作流（暂不开源）
+- 🎉 新增 基础版 ts（不带国际化），切换 `vue-next-admin-template` 分支
 
 ## 1.1.1
 
-`2022.11.17`
+`2021.09.25`
 
-- 🐞 优化 [vue2 版本打包出来配置路由懒加载无效。](https://gitee.com/lyt-top/vue-next-admin/issues/I5RFQT)，感谢[@林建生](https://gitee.com/ljsshuai)
+- 🌟 更新 依赖更新最新版本（`"element-plus": "^1.1.0-beta.13"` 版本运行错误，`^1.1.0-beta.16`修复横向菜单卡死问题）
+- 🐞 修复 Dialog 弹窗位置错误、Drawer 抽屉内边距、el-menu 菜单收起时背景色问题
+- 🎯 优化 锁屏界面自动锁屏(s/秒)必须设置至少 1 秒
+- 🎉 新增 分栏布局，鼠标移入当前项时，显示当前项菜单内容
+- 🎉 新增 工作流（未完成）
 
 ## 1.1.0
 
-`2022.06.12`
+`2021.09.10`
 
-- 🐞 优化 部分界面演示图片不出来问题
-- 🐞 修复 [vue-prev-admin 全屏模式下，滚动条无法滚到底 #I4S79C](https://gitee.com/lyt-top/vue-next-admin/issues/I4S79C)，感谢[@qfvh](https://gitee.com/qfvh)
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 小屏模式下登录页二维码遮挡标题问题
+- 🎉 新增 图片验证器
+- 🎉 新增 动态复杂表单
+- 🎉 新增 工作流（未完成）
+- 🎉 新增 深色主题(伪深色，样式变动大，谨慎更新)
+
+## 1.0.18
+
+`2021.08.29`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 权限组件去掉顶级 div（`/src/components/auth`）
+- 🎉 新增 布局配置添加恢复默认按钮
+- 🐞 修复 升级 <a href="https://element-plus.gitee.io/#/zh-CN/component/changelog" target="_blank">element plus 1.1.0-beta.7</a>后项目无法启动、el-menu 菜单
+- 🐞 修复 表格固定列时的层级、设置了相对定位时，遮挡左侧导航菜单问题
+
+## 1.0.17
+
+`2021.08.22`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 去除设置布局切换，重置主题样式（initSetLayoutChange），切换布局需手动设置样式，设置的样式自动同步各布局
+- 🎯 优化 Dropdown 下拉菜单用户账号靠边时换行问题
+- 🎯 优化 左侧导航菜单，共用菜单树，防止 `布局配置` 设置 `菜单 / 顶栏` 时，样式丢失等问题
+- 🐞 修复 固定 header 后没有回到顶部的 bug，拉取项目后运行不起来的 bug。<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/14" target="_blank">!14</a>，感谢<a href="https://gitee.com/wjs0509" target="_blank">@wjs0509</a>
+- 🐞 修复 tagView 右键全屏后，浏览器窗口大小发生任何变化都会导致左边菜单显示出来，并且可点击打开对应页面。<a href="https://gitee.com/lyt-top/vue-next-admin/issues/I46E6T" target="_blank">I46E6T</a>
+- 🐞 修复 默认设置 `菜单 / 顶栏` 样式不生效问题（/@/src/store/modules/themeConfig.ts）
+
+## 1.0.16
+
+`2021.08.14`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 菜单高亮（详情且详情设置了 meta.isHide 时，顶级菜单高亮），感谢群友@YourObject
+- 🎯 优化 详情路径写法：如父级（/pages/filtering），那么详情为（/pages/filtering/details?id=1）。这样写可实现（详情时，父级菜单高亮），否则写成（/pages/filteringDetails?id=1）顶级菜单将不会高亮。可参考：`页面/过滤筛选组件`，点击当前图片进行测试
+- 🎯 优化 tagsView 右键菜单全屏时，打开的界面高度问题
+- 🎯 优化 图表批量 resize 问题
+- 🐞 修复 菜单收起时（设置全局主题：primary 且有二级菜单时），文字高亮颜色不对
+- 🐞 修复 国际化 <a href="https://gitee.com/lyt-top/vue-next-admin/issues/I43NPE" target="_blank">#I43NPE</a>。可参考：`页面/过滤筛选组件`，点击顶部语言切换，进行底部分页国际化查看
+
+## 1.0.15
+
+`2021.08.06`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 tagsView 右键菜单点击时的字段名（id 已修改成 contextMenuClickId）与路由中返回的 id 名冲突问题，感谢群友@伯牙已遇钟子期
+- 🎉 新增 多个 form 表单验证界面演示
+
+## 1.0.14
+
+`2021.07.29`
+
+- 🌟 更新 依赖更新最新版本（vue、vuex、vue-router）,出现问题，请手动降级。版本查看：<a href="https://www.npmjs.com/" target="_blank">vnpm</a>
+- 🎯 优化 数据可视化图表演示加载卡顿问题、优化有图表的演示界面
+- 🎯 优化 路由参数演示界面
+- 🎯 优化 tagsView 操作演示界面，由于存在相同路由多标签，必须要传全部参数值（query 或者 params）
+- 🎉 新增 开启 TagsView 共用，开启时：（多个路由菜单共用一个详情组件（参数为后点击的覆盖前面点击的），tagsView 中只会出现一个（不支持同时出现多个 tagsView 标签））。关闭时：（多个路由菜单共用一个详情组件，参数不同，会同时出现多个 tagsView 标签）
+- 🐞 修复 tagsView 共用（单标签）时，右键菜单功能点击，参数不对的问题（第 2n+个参数未覆盖第一个参数值）
+- 🐞 修复 多 tagsView 标签（参数不同）、单个 tagsView 标签公用（参数不同）所带来的刷新功能、横向自动滚动等问题
+- 🐞 修复 处理全屏若干问题，<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/12" target="_blank">pr!12</a>，感谢群友@另一个前端
+
+## 1.0.13
+
+`2021.07.25`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 数据可视化演示界面（/visualizingDemo1、/visualizingDemo2）
+- 🎉 新增 登录页扫码登录
+
+## 1.0.12
+
+`2021.07.16`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 数据可视化演示空界面（待完善）
+- 🎯 优化 tagsView 动态路由（xxx/:id/:name）时的右键菜单刷新、关闭其它时参数丢失问题（2021.07.15 优化）
+- 🐞 修复 路由带参数时，复制路径到登录页，跳转后参数消失的问题
+- 🐞 修复 设置多个外链，点击后，页面内容停留在上一个内容（内容未改变）、国际化处理、打开新窗口 sessionStorage 共享等
+
+## 1.0.11
+
+`2021.07.14`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 路由参数、图片懒加载界面演示
+- ⚠️ 警告 Form 表单 `binding value must be a string or number`，解决：加上 `label-position="top"` 不报警告（等待官方修复）
+- 🎯 优化 锁屏界面动画效果、首页图表显示
+- 🎯 优化 tagsView 右键菜单 `关闭` 功能逻辑
+- 🐞 修复 开启 TagsView 拖拽报错及小于 `1000px` 时自动设置禁止拖拽（<a href="https://gitee.com/lyt-top/vue-next-admin/issues/I3ZRRI" target="_blank">#I3ZRRI</a>）
+- 🐞 修复 `iframe 内嵌、外链` 高度问题，使用 computed 进行计算
+- 🐞 修复 默认布局开启 `侧边栏 Logo` 与关闭 `菜单水平折叠`，切换到横向布局时，菜单看不见的问题
+- 🐞 修复 切换不同布局时，再去开启 `经典布局分割菜单` 功能不生效问题
+- 🐞 修复 浏览器窗口标题中/英文切换不实时生效的问题
+- 🐞 修复 切换布局时，某些功能不可以使用。部分界面不需要取消事件监听(proxy.mittBus.off('xxx'))
+- 🐞 修复 动态路由带参数，router-link 跳转问题（<a href="hhttps://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G" target="_blank">#I3YX6G</a>）
+- 🐞 修复 横向菜单有二级菜单时，点击子级菜单不高亮问题
+- 🐞 修复 功能 tagsView 操作演示不生效
+
+## 1.0.10
+
+`2021.07.07`
+
+- 🌟 更新 依赖更新最新版本（字体图标无问题）
+- 🎯 优化 内嵌 iframe、外链，解决 tagsView 刷新问题
 
 ## 1.0.9
 
-`2021.12.22`
+`2021.07.02`
 
-- 🎯 优化 部署后每次都要强制刷新清浏览器缓存问题
-- 🎉 新增 工具类百分比验证演示
-- 🐞 修复 tag-view 标签右键会超出浏览器
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 图标选择器设置宽度、v-model 等问题
+- 🎯 优化 滚动通知栏在手机上的体验
+- 🎯 优化 系统管理/新增菜单（编辑菜单），使用 `图标选择器` 进行模拟
+- 🎯 优化 字体图标(自动载入) 逻辑
+- 🐞 修复 screenfull 全屏时，按键盘 esc 键图标不改变问题，感谢群友@伯牙已遇钟子期
 
 ## 1.0.8
 
-`2021.12.16`
+`2021.06.29`
 
 - 🌟 更新 依赖更新最新版本
-- 🎯 优化 登录界面逻辑、权限管理逻辑
-- 🎯 优化 同步 vue-next-admin-images 后端控制菜单模拟数据
-- 🎯 优化 菜单格式（对象改数组）
-- 🐞 修复 登录页手机端样式问题
+- 🎉 新增 表单中英文切换演示
+- 🎯 优化 登录页查看密码 icon 图标
+- 🎯 优化 图标选择器
+- 🎯 优化 拖动指令
+- 🐞 修复 form 表单在页面小于 576px 时的排版问题
 
 ## 1.0.7
 
-`2021.11.27`
+`2021.06.24`
 
 - 🌟 更新 依赖更新最新版本
-- 🐞 修复 登录问题 [#I4GIKU](https://gitee.com/lyt-top/vue-next-admin/issues/I4GIKU)
+- 🎉 新增 拖动指令及其演示界面
+- 🎯 优化 锁屏界面，解锁提示
+- 🎯 优化 登录页在手机上显示的效果
 
 ## 1.0.6
 
-`2021.11.08`
+`2021.06.23`
 
-- 🌟 更新 依赖更新最新版本
-- 🎯 优化 目录移动 `@/views/layout` 移动 `@/layout` （可全局替换）
-- 🎯 优化 eslint 语法检测问题，`@babel/eslint-parser` 替换已废弃的 `babel-eslint`，出现报错，请尝试降级 eslint
-- 🎯 优化 vuex 文件自动导入
+- 🎯 优化 去掉内嵌 iframe 内边距（padding）
+- 🎯 优化 城市多级联动组件
+- 🎯 优化 Tree 树形控件改成表格组件
+- 🐞 修复 Cascader 级联选择器高度问题
 
 ## 1.0.5
 
-`2021.06.30`
+`2021.06.22`
 
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 表单自适应演示界面
-- 🎯 优化 去掉内嵌 iframe 内边距（padding）
+- 🌟 更新 vite 降级为@vite2.3.7，降级方法 `cnpm install vite@2.3.7`，防止 element plus 字体图标消失
+- 🐞 修复 开启后端控制路由（isRequestRoutes = true）时，内嵌 iframe、外链不可使用的问题
 
 ## 1.0.4
 
 `2021.06.19`
 
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 项目仓库地址
-- 🎯 优化 移除 utils/storage.ts 下的旧写法（改动较大）
-- 🐞 修复 鼠标移入顶部用户信息栏 开/关全屏 文字反向问题
+- 🌟 更新 依赖更新最新版本（"vite": "^2.3.7"）热更新无问题
+- 🎉 新增 深克隆工具，方便开发，感谢<a href="https://gitee.com/kangert" target="_blank">@kangert</a>(<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/6" target="_blank">#6</a>)
+- 🎯 优化 vuex 模块自动导入。感谢<a href="https://gitee.com/kangert" target="_blank">@kangert</a>(<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/4" target="_blank">#4</a>)，感谢群友@web 小学生-第五君
+- 🎯 优化 类型定义提高编码体验，修复不能将类型“string | undefined”分配给类型“string”的问题。感谢<a href="https://gitee.com/kangert" target="_blank">@kangert</a>(<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/5" target="_blank">#5</a>)
+- 🎯 优化 `layout` 文件夹移动到与 `views` 文件夹同级（改动较大，`/@/views/layout` 变成 `/@/layout`）
+- 🎯 优化 页面有 `console.log` 时 `eslint` 不生效问题
+- 🎯 优化 页面、ts 中 `any` 类型问题（改动较大）
+- 🎯 优化 登录页在手机上显示的效果
+- 🎯 优化 多行注释信息，鼠标放到方法名即可查看，更加直观的知道方法参数等。引入方法时需去掉以 `.ts` 结尾的后缀（改动较大）
+- 🎯 优化 移除 `utils/storage.ts` 下的旧写法（改动较大）
+- 🎯 优化 拆分 `router` 下内容，路由、前端、后端控制分开写，方便理解
+- 🐞 修复 鼠标移入顶部用户信息栏 `开/关全屏` 文字反向问题
+- 🐞 修复 热更新时，NextLoading（界面 loading） 不消失问题 `window.nextLoading === undefined`
+- 🐞 修复 vuex 中不可以使用 `/@/api/xxx` 下的接口调用问题
 
 ## 1.0.3
 
 `2021.06.02`
 
-- 🌟 更新 依赖更新最新版本
-- 💯 优化 动态加载后端返回路由路由(模拟数据)方法
+- ❄️ 删除 G6 思维导图界面
+- 🌟 更新 手动更新 vue、vue-router、vuex 到最近最多人使用的版本，出现不可预测的问题请降低版本。版本查看：<a href="https://www.npmjs.com/package/vue" target="_blank">vue 版本查看</a>
+- 🐞 修复 开启后端控制路由 `isRequestRoutes` 在非首页刷新页面后，回到首页的问题，感谢群友@伯牙已遇钟子期
 
 ## 1.0.2
 
 `2021.06.01`
 
+- 🌟 更新 依赖更新最新版本
 - 🐞 修复 菜单搜索中文不可以搜索的问题，感谢群友@逍遥天意
 
 ## 1.0.1
 
 `2021.05.31`
 
-- 🎉 新增 新增个人中心演示空白页
 - 🎉 新增 更新日志文件 `CHANGELOG.md`，以后每次更新都会在这里显示对应内容
 - 🌟 更新 依赖更新最新版本
-- 🐞 修复 分栏布局路由设置 `meta.isHide` 为 `true` 时报错问题，感谢群友@29、@芭芭拉
+- 🐞 修复 分栏、经典布局路由设置 `meta.isHide` 为 `true` 时报错问题，感谢群友@29、@芭芭拉
+- 🐞 修复 经典布局点击 `tagsView` 左侧菜单数据不变问题

LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2021 lyt-Top
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2021 lyt-Top
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

README.md

@@ -1,37 +1,33 @@
 <div align="center">
-	<img src="https://i.hd-r.cn/07fd893a28d4f62926fe6ad895af96a2.png">
+	<img src="https://img-blog.csdnimg.cn/9efd5420327a46b7bd6d93524a97229d.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_14,color_FFFFFF,t_70,g_se,x_16">
 	<p align="center">
-		<a href="https://cn.vuejs.org/" target="_blank">
-			<img src="https://img.shields.io/badge/vue.js-vue2.x-green" alt="vue">
+	    <a href="https://v3.vuejs.org/" target="_blank">
+	        <img src="https://img.shields.io/badge/vue.js-vue3.x-green" alt="vue">
+	    </a>
+	    <a href="https://element-plus.gitee.io/#/zh-CN/component/changelog" target="_blank">
+	        <img src="https://img.shields.io/badge/element--plus-%3E1.0.0-blue" alt="element plus">
+	    </a>
+		<a href="https://www.tslang.cn/" target="_blank">
+	        <img src="https://img.shields.io/badge/typescript-%3E4.0.0-blue" alt="typescript">
+	    </a>
+		<a href="https://vitejs.dev/" target="_blank">
+		    <img src="https://img.shields.io/badge/vite-%3E2.0.0-yellow" alt="vite">
 		</a>
-		<a href="https://element.eleme.cn/#/zh-CN/component/changelog" target="_blank">
-			<img src="https://img.shields.io/badge/element--ui-%3E1.0.0-blue" alt="element ui">
-		</a>
-		<a href="https://v4.webpack.docschina.org/concepts/" target="_blank">
-		  <img src="https://img.shields.io/badge/webpack-%3E1.0.0-success" alt="webpack">
-		</a>
-		<a href="https://gitee.com/lyt-top/vue-next-admin/blob/vue-prev-admin/LICENSE" target="_blank">
-		  <img src="https://img.shields.io/badge/license-MIT-yellow" alt="license">
+		<a href="https://gitee.com/lyt-top/vue-next-admin/blob/master/LICENSE" target="_blank">
+		    <img src="https://img.shields.io/badge/license-MIT-success" alt="license">
 		</a>
 	</p>
 	<p>&nbsp;</p>
 </div>
 
-#### 💝 长期赞助商
-
-<a href="http://www.ccflow.org/" target="_blank">
-	<img src="./src/assets/ccflowRightNextAdmin.png" width="50%" height="70px">
-</a>
-
 #### 🌈 介绍
 
-基于 vue2.x + webpack + element ui，适配手机、平板、pc 的后台开源免费模板，希望减少工作量，帮助大家实现快速开发。
+基于 vue3.x + CompositionAPI + typescript + vite + element plus + vue-router-next + next.vuex，适配手机、平板、pc 的后台开源免费模板，希望减少工作量，帮助大家实现快速开发。
 
 #### ⛱️ 线上预览
 
 - vue3.x 版本预览（vue-next-admin）<a href="https://lyt-top.gitee.io/vue-next-admin-preview/#/login" target="_blank">https://lyt-top.gitee.io/vue-next-admin-preview/#/login</a>
 - vue2.x 版本预览（vue-prev-admin）<a href="https://lyt-top.gitee.io/vue-prev-admin-preview/#/login" target="_blank">https://lyt-top.gitee.io/vue-prev-admin-preview/#/login</a>
-- vue3.x + uni-app 商城 H5（vue-next-admin-shop）<a href="https://lyt-top.gitee.io/vue-next-admin-shop-preview" target="_blank">https://lyt-top.gitee.io/vue-next-admin-shop-preview</a>
 
 #### 💒 代码仓库
 
@@ -43,11 +39,17 @@
 - 复制代码(桌面 cmd 运行) `npm install -g cnpm --registry=https://registry.npm.taobao.org`
 - 复制代码(桌面 cmd 运行) `npm install -g yarn`
 
+#### 🏭 环境支持
+
+| Edge      | Firefox      | Chrome      | Safari      |
+| --------- | ------------ | ----------- | ----------- |
+| Edge ≥ 79 | Firefox ≥ 78 | Chrome ≥ 64 | Safari ≥ 12 |
+
+> 由于 Vue3 不再支持 IE11，故而 ElementPlus 也不支持 IE11 及之前版本。
+
 #### ⚡ 使用说明
 
-建议使用 cnpm，因为 yarn 有时会报错。`npm install` 安装报错的话，请使用 `cnpm install`。
-
-> 注意：`node` 需大于 `12.xxx` 小于等于 `v16.14.0`，否则安装依赖将报错。
+建议使用 cnpm，因为 yarn 有时会报错。<a href="http://nodejs.cn/" target="_blank">node 版本 > 12xx.xx.x</a>
 
 ```bash
 # 克隆项目
@@ -56,9 +58,6 @@ git clone https://gitee.com/lyt-top/vue-next-admin.git
 # 进入项目
 cd vue-next-admin
 
-# 切换分支
-git checkout vue-prev-admin
-
 # 安装依赖
 cnpm install
 
@@ -69,21 +68,31 @@ cnpm run dev
 cnpm run build
 ```
 
-#### 📚 开发文档
-
-- 查看开发文档：<a href="https://lyt-top.gitee.io/vue-next-admin-doc-preview" target="_blank">vue-next-admin-doc</a>
-
 #### 💯 学习交流加 QQ 群
 
-> 1 - 4 交流群已满，请加 vue-next-admin 交流群 5
+- 若加群了没同意（一般秒过），那就是群满了（500 人群），请换一个群试试。群会定期清理半年（6 个月）未发言的群友，资源有限，请谅解。建议勿加多群，可能会误伤！
+- 查看开发文档：<a href="https://lyt-top.gitee.io/vue-next-admin-doc-preview" target="_blank">vue-next-admin-doc</a>
+- 群号码：
+  1 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">665452019</a>
+  2 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=zVfy3gNy7pNWVK3kMduDzwU369PZg2fw&jump_from=webapi">766356862</a>
+  3 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=02EWb5P2JkP-8iwzaDadgFdxA0HSHPpn&jump_from=webapi">795345435</a>
+  4 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=0gTFO04WwkeZZ6R4lju6gucbeXHK-wNd&jump_from=webapi">736626228</a>
 
-群号：556254895
-
-其它交流群请查看文档首页 [vueNextAdmin 解疑问](https://lyt-top.gitee.io/vue-next-admin-doc-preview/)
+  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">
+  	<img src="https://img-blog.csdnimg.cn/35e00f12a3fe4820892ec630ca72f15f.png" width="220" height="220" alt="vue-next-admin 讨论群1" title="vue-next-admin 讨论群1"/>
+  </a>
+  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=zVfy3gNy7pNWVK3kMduDzwU369PZg2fw&jump_from=webapi">
+  	<img src="https://img-blog.csdnimg.cn/5f1b548abd9f434eb41edde31d1c1fa9.png" width="220" height="220" alt="vue-next-admin 讨论群2" title="vue-next-admin 讨论群2"/>
+  </a>
+  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=02EWb5P2JkP-8iwzaDadgFdxA0HSHPpn&jump_from=webapi">
+  	<img src="https://img-blog.csdnimg.cn/70c8a012dd304246bddeac2184c4ab3a.png" width="220" height="220" alt="vue-next-admin 讨论群3" title="vue-next-admin 讨论群3"/>
+  </a>
+  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=0gTFO04WwkeZZ6R4lju6gucbeXHK-wNd&jump_from=webapi">
+  	<img src="https://img-blog.csdnimg.cn/e5c9704eed1342bc9d9e74b37203402d.png" width="220" height="220" alt="vue-next-admin 讨论群4" title="vue-next-admin 讨论群4"/>
+  </a>
 
 #### 💒 集成后端
 
-- <a target="_blank" href="https://gitee.com/zuohuaijun/Admin.NET">@zuohuaijun Admin.NET</a>
 - <a target="_blank" href="https://github.com/PandaGoAdmin/PandaX">@熊猫 PandaGoAdmin</a>
 - <a target="_blank" href="https://toscode.gitee.com/GionConnection/gopro_free">@甜蜜蜜 GoPro 平台</a>
 - <a target="_blank" href="https://gitee.com/GionConnection/niupi-free">@甜蜜蜜 NiuPi 平台</a>
@@ -92,6 +101,7 @@ cnpm run build
 - <a target="_blank" href="https://gitee.com/zsvg/vboot-net">@zsvg vboot-net</a>
 - <a target="_blank" href="https://gitee.com/zsvg/vboot-java">@zsvg vboot-java</a>
 - <a target="_blank" href="https://gitee.com/wonderful-code/buildadmin">@青红造了个白 buildadmin</a>
+- <a target="_blank" href="https://github.com/xiaodingding/iotfast">@Goodwell iotfast(一个开源的物联网平台)</a>
 
 #### ❤️ 鸣谢列表
 
@@ -99,19 +109,30 @@ cnpm run build
 - <a href="https://github.com/vuejs/vue-next" target="_blank">vue-next</a>
 - <a href="https://github.com/ElemeFE/element" target="_blank">element-ui</a>
 - <a href="https://github.com/element-plus/element-plus" target="_blank">element-plus</a>
-- <a href="https://github.com/vuejs/vue-router-next" target="_blank">vue-router-nex</a>
+- <a href="https://github.com/vuejs/vue-router-next" target="_blank">vue-router-next</a>
 - <a href="https://github.com/vuejs/vuex" target="_blank">vuex</a>
 - <a href="https://github.com/apache/echarts" target="_blank">echarts</a>
 - <a href="https://github.com/axios/axios" target="_blank">axios</a>
 - <a href="https://github.com/zenorocha/clipboard.js" target="_blank">clipboard</a>
 - <a href="https://github.com/inorganik/countUp.js" target="_blank">countUp</a>
+- <a href="https://github.com/developit/mitt" target="_blank">mitt</a>
 - <a href="https://github.com/rstacruz/nprogress" target="_blank">nprogress</a>
 - <a href="https://github.com/sindresorhus/screenfull.js" target="_blank">screenfull</a>
+- <a href="https://github.com/SortableJS/Sortable" target="_blank">sortablejs</a>
 - <a href="https://github.com/sass/sass" target="_blank">sass</a>
+- <a href="https://github.com/microsoft/TypeScript" target="_blank">typescript</a>
+- <a href="https://github.com/vitejs/vite" target="_blank">vite</a>
+- <a href="https://github.com/wangeditor-team/wangEditor" target="_blank">wangeditor</a>
+- <a href="https://github.com/fengyuanchen/cropperjs" target="_blank">cropperjs</a>
+- <a href="https://github.com/davidshimjs/qrcodejs" target="_blank">qrcodejs</a>
+- <a href="https://github.com/crabbly/Print.js" target="_blank">print-js</a>
+- <a href="https://github.com/jbaysolutions/vue-grid-layout" target="_blank">vue-grid-layout</a>
+- <a href="https://github.com/antoniandre/splitpanes" target="_blank">splitpanes</a>
+- <a href="https://github.com/jsplumb/jsplumb" target="_blank">jsplumb</a>
 
 #### 💕 特别感谢
 
-特别感谢群里老哥的建议、指导与帮忙，谢谢！
+特别感谢老哥们的建议、指导与帮忙。谢谢！
 
 - <a href="https://gitee.com/click33/sa-plus" target="_blank">@省长</a>
 - <a href="https://gitee.com/jskz/Jskz-SpringCloud" target="_blank">@唐参</a>

babel.config.js

@@ -1,4 +0,0 @@
-module.exports = {
-	presets: ['@vue/cli-plugin-babel/preset'],
-	plugins: ['@babel/plugin-proposal-optional-chaining'],
-};

index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh-CN">
 	<head>
-		<meta charset="UTF-8" />
+		<meta charset="utf-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<meta
@@ -12,19 +12,21 @@
 			name="description"
 			content="vue-next-admin，基于 vue3 + CompositionAPI + typescript + vite + element plus，适配手机、平板、pc 的后台开源免费管理系统模板！vue-prev-admin，基于 vue2 +  element ui，适配手机、平板、pc 的后台开源免费管理系统模板！"
 		/>
-		<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-		<title>vue-prev-admin</title>
+		<link rel="icon" href="/favicon.ico" />
+		<title>vue-next-admin</title>
 	</head>
 	<body>
 		<div id="app"></div>
 		<script type="text/javascript">
 			var _hmt = _hmt || [];
-			(function() {
+			(function () {
 				var hm = document.createElement('script');
-				hm.src = 'https://hm.baidu.com/hm.js?9d1e524198ede8205ac7c938c243344c';
+				hm.src = 'https://hm.baidu.com/hm.js?d9c8b87d10717013641458b300c552e4';
 				var s = document.getElementsByTagName('script')[0];
 				s.parentNode.insertBefore(hm, s);
 			})();
 		</script>
+		<script type="module" src="/src/main.ts"></script>
+		<script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=wsijQt8sLXrCW71YesmispvYHitfG9gv&s=1"></script>
 	</body>
 </html>

jsconfig.json

@@ -1,11 +0,0 @@
-{
-	"compilerOptions": {
-		"allowJs": true,
-		"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
-		"jsx": "preserve",
-		"baseUrl": ".",
-		"paths": {
-			"/@/*": ["src/*"]
-		}
-	}
-}

package.json

@@ -1,45 +1,57 @@
 {
-	"name": "vue-prev-admin",
-	"version": "1.2.3",
-	"private": true,
-	"description": "vue2 webpack admin template",
+	"name": "vue-next-admin",
+	"version": "2.2.0",
+	"description": "vue3 vite next admin template",
 	"author": "lyt_20201208",
 	"license": "MIT",
 	"scripts": {
-		"dev": "vue-cli-service serve",
-		"build": "vue-cli-service build",
-		"lint": "vue-cli-service lint",
-		"webpack": "webpack --version"
+		"dev": "vite --force",
+		"build": "vite build",
+		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
 	},
 	"dependencies": {
-		"axios": "0.24.0",
-		"clipboard": "2.0.8",
-		"countup.js": "2.0.8",
-		"echarts": "5.2.2",
-		"element-ui": "2.15.6",
-		"nprogress": "0.2.0",
-		"screenfull": "5.2.0",
-		"sign-canvas": "1.1.4",
-		"vue": "2.6.14",
-		"vue-i18n": "8.26.7",
-		"vue-particles": "1.0.9",
-		"vue-router": "3.5.3",
-		"vue-seamless-scroll": "1.1.23",
-		"vuex": "3.6.2"
+		"@element-plus/icons-vue": "^2.0.6",
+		"@wangeditor/editor": "^5.1.1",
+		"axios": "^0.27.2",
+		"countup.js": "^2.3.2",
+		"cropperjs": "^1.5.12",
+		"echarts": "^5.3.3",
+		"echarts-gl": "^2.0.9",
+		"echarts-wordcloud": "^2.0.0",
+		"element-plus": "^2.2.9",
+		"js-cookie": "^3.0.1",
+		"jsplumb": "^2.15.6",
+		"mitt": "^3.0.0",
+		"nprogress": "^0.2.0",
+		"pinia": "^2.0.14",
+		"print-js": "^1.6.0",
+		"qrcodejs2-fixes": "^0.0.2",
+		"screenfull": "^6.0.2",
+		"sortablejs": "^1.15.0",
+		"splitpanes": "^3.1.1",
+		"vue": "^3.2.37",
+		"vue-clipboard3": "^2.0.0",
+		"vue-grid-layout": "^3.0.0-beta1",
+		"vue-i18n": "^9.1.10",
+		"vue-router": "^4.1.1"
 	},
 	"devDependencies": {
-		"@babel/eslint-parser": "7.16.5",
-		"@babel/plugin-proposal-optional-chaining": "7.17.12",
-		"@vue/cli-plugin-babel": "4.5.15",
-		"@vue/cli-plugin-eslint": "4.5.15",
-		"@vue/cli-plugin-router": "4.5.15",
-		"@vue/cli-plugin-vuex": "4.5.15",
-		"@vue/cli-service": "4.5.15",
-		"eslint": "8.4.1",
-		"eslint-plugin-vue": "8.2.0",
-		"sass": "1.45.0",
-		"sass-loader": "10.1.1",
-		"vue-template-compiler": "2.6.14"
+		"@types/node": "^18.0.3",
+		"@types/nprogress": "^0.2.0",
+		"@types/sortablejs": "^1.13.0",
+		"@typescript-eslint/eslint-plugin": "^5.30.5",
+		"@typescript-eslint/parser": "^5.30.5",
+		"@vitejs/plugin-vue": "^2.3.3",
+		"@vue/compiler-sfc": "^3.2.37",
+		"dotenv": "^16.0.1",
+		"eslint": "^8.19.0",
+		"eslint-plugin-vue": "^9.2.0",
+		"prettier": "^2.7.1",
+		"sass": "^1.53.0",
+		"sass-loader": "^13.0.2",
+		"typescript": "^4.7.4",
+		"vite": "^2.9.14",
+		"vue-eslint-parser": "^9.0.3"
 	},
 	"browserslist": [
 		"> 1%",

plugins.d.ts

@@ -0,0 +1,4 @@
+declare module 'vue-grid-layout';
+declare module 'qrcodejs2-fixes';
+declare module 'splitpanes';
+declare module 'js-cookie';

public/admin.json

@@ -1,290 +0,0 @@
-{
-	"code": 0,
-	"data": [
-		{
-			"path": "/home",
-			"name": "home",
-			"component": "home",
-			"meta": {
-				"title": "message.router.home",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": true,
-				"isIframe": false,
-				"roles": ["admin", "common"],
-				"icon": "iconfont icon-shouye"
-			}
-		},
-		{
-			"path": "/tools",
-			"name": "tools",
-			"component": "tools",
-			"meta": {
-				"title": "message.router.tools",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin", "common"],
-				"icon": "iconfont icon-gongju"
-			}
-		},
-		{
-			"path": "/menu",
-			"name": "menu",
-			"component": "layout/routerView/parent",
-			"redirect": "/menu/menu1",
-			"meta": {
-				"title": "message.router.menu",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin", "common"],
-				"icon": "iconfont icon-caidan"
-			},
-			"children": [
-				{
-					"path": "/menu/menu1",
-					"name": "menu1",
-					"component": "layout/routerView/parent",
-					"redirect": "/menu/menu1/menu11",
-					"meta": {
-						"title": "message.router.menu1",
-						"isLink": "",
-						"isHide": false,
-						"isKeepAlive": true,
-						"isAffix": false,
-						"isIframe": false,
-						"roles": ["admin", "common"],
-						"icon": "iconfont icon-caidan"
-					},
-					"children": [
-						{
-							"path": "/menu/menu1/menu11",
-							"name": "menu11",
-							"component": "menu/menu1/menu11/index",
-							"meta": {
-								"title": "message.router.menu11",
-								"isLink": "",
-								"isHide": false,
-								"isKeepAlive": true,
-								"isAffix": false,
-								"isIframe": false,
-								"roles": ["admin", "common"],
-								"icon": "iconfont icon-caidan"
-							}
-						},
-						{
-							"path": "/menu/menu1/menu12",
-							"name": "menu12",
-							"component": "layout/routerView/parent",
-							"redirect": "/menu/menu1/menu12/menu121",
-							"meta": {
-								"title": "message.router.menu12",
-								"isLink": "",
-								"isHide": false,
-								"isKeepAlive": true,
-								"isAffix": false,
-								"isIframe": false,
-								"roles": ["admin", "common"],
-								"icon": "iconfont icon-caidan"
-							},
-							"children": [
-								{
-									"path": "/menu/menu1/menu12/menu121",
-									"name": "menu121",
-									"component": "menu/menu1/menu12/menu121/index",
-									"meta": {
-										"title": "message.router.menu121",
-										"isLink": "",
-										"isHide": false,
-										"isKeepAlive": true,
-										"isAffix": false,
-										"isIframe": false,
-										"roles": ["admin", "common"],
-										"icon": "iconfont icon-caidan"
-									}
-								},
-								{
-									"path": "/menu/menu1/menu12/menu122",
-									"name": "menu122",
-									"component": "menu/menu1/menu12/menu122/index",
-									"meta": {
-										"title": "message.router.menu122",
-										"isLink": "",
-										"isHide": false,
-										"isKeepAlive": true,
-										"isAffix": false,
-										"isIframe": false,
-										"roles": ["admin", "common"],
-										"icon": "iconfont icon-caidan"
-									}
-								}
-							]
-						},
-						{
-							"path": "/menu/menu1/menu13",
-							"name": "menu13",
-							"component": "menu/menu1/menu13/index",
-							"meta": {
-								"title": "message.router.menu13",
-								"isLink": "",
-								"isHide": false,
-								"isKeepAlive": true,
-								"isAffix": false,
-								"isIframe": false,
-								"roles": ["admin", "common"],
-								"icon": "iconfont icon-caidan"
-							}
-						}
-					]
-				},
-				{
-					"path": "/menu/menu2",
-					"name": "menu2",
-					"component": "menu/menu2/index",
-					"meta": {
-						"title": "message.router.menu2",
-						"isLink": "",
-						"isHide": false,
-						"isKeepAlive": true,
-						"isAffix": false,
-						"isIframe": false,
-						"roles": ["admin", "common"],
-						"icon": "iconfont icon-caidan"
-					}
-				}
-			]
-		},
-		{
-			"path": "/fun",
-			"name": "funIndex",
-			"component": "layout/routerView/parent",
-			"redirect": "/fun/tagsView",
-			"meta": {
-				"title": "message.router.funIndex",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin", "common"],
-				"icon": "iconfont icon-crew_feature"
-			},
-			"children": [
-				{
-					"path": "/fun/tagsView",
-					"name": "funTagsView",
-					"component": "fun/tagsView/index",
-					"meta": {
-						"title": "message.router.funTagsView",
-						"isLink": "",
-						"isHide": false,
-						"isKeepAlive": true,
-						"isAffix": false,
-						"isIframe": false,
-						"roles": ["admin", "common"],
-						"icon": "el-icon-thumb"
-					}
-				},
-				{
-					"path": "/fun/signCanvas",
-					"name": "funSignCanvas",
-					"component": "fun/signCanvas/index",
-					"meta": {
-						"title": "message.router.funSignCanvas",
-						"isLink": "",
-						"isHide": false,
-						"isKeepAlive": true,
-						"isAffix": false,
-						"isIframe": false,
-						"roles": ["admin", "common"],
-						"icon": "el-icon-edit"
-					}
-				}
-			]
-		},
-		{
-			"path": "/pages",
-			"name": "pagesIndex",
-			"component": "layout/routerView/parent",
-			"redirect": "/pages/formAdapt",
-			"meta": {
-				"title": "message.router.pagesIndex",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin", "common"],
-				"icon": "iconfont icon-fuzhiyemian"
-			},
-			"children": [
-				{
-					"path": "/pages/formAdapt",
-					"name": "pagesFormAdapt",
-					"component": "pages/formAdapt/index",
-					"meta": {
-						"title": "message.router.pagesFormAdapt",
-						"isLink": "",
-						"isHide": false,
-						"isKeepAlive": true,
-						"isAffix": false,
-						"isIframe": false,
-						"roles": ["admin", "common"],
-						"icon": "iconfont icon-biaodan"
-					}
-				}
-			]
-		},
-		{
-			"path": "/personal",
-			"name": "personal",
-			"component": "personal/index",
-			"meta": {
-				"title": "message.router.personal",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin", "common"],
-				"icon": "iconfont icon-gerenzhongxin"
-			}
-		},
-		{
-			"path": "/link",
-			"name": "layoutLinkView",
-			"component": "layout/routerView/parent",
-			"meta": {
-				"title": "message.router.layoutLinkView",
-				"isLink": "https://element-plus.gitee.io/#/zh-CN/component/installation",
-				"isHide": false,
-				"isKeepAlive": false,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin"],
-				"icon": "iconfont icon-caozuo-wailian"
-			}
-		},
-		{
-			"path": "/iframes",
-			"name": "layoutIfameView",
-			"component": "layout/routerView/parent",
-			"meta": {
-				"title": "message.router.layoutIfameView",
-				"isLink": "https://element-plus.gitee.io/zh-CN/#/zh-CN/component/installation",
-				"isHide": false,
-				"isKeepAlive": false,
-				"isAffix": true,
-				"isIframe": true,
-				"roles": ["admin"],
-				"icon": "iconfont icon-neiqianshujuchucun"
-			}
-		}
-	]
-}

public/test.json

@@ -1,227 +0,0 @@
-{
-	"code": 0,
-	"data": [
-		{
-			"path": "/home",
-			"name": "home",
-			"component": "home",
-			"meta": {
-				"title": "message.router.home",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": true,
-				"isIframe": false,
-				"roles": ["admin", "common"],
-				"icon": "iconfont icon-shouye"
-			}
-		},
-		{
-			"path": "/tools",
-			"name": "tools",
-			"component": "tools",
-			"meta": {
-				"title": "message.router.tools",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin"],
-				"icon": "iconfont icon-gongju"
-			}
-		},
-		{
-			"path": "/menu",
-			"name": "menu",
-			"component": "layout/routerView/parent",
-			"redirect": "/menu/menu1",
-			"meta": {
-				"title": "message.router.menu",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin"],
-				"icon": "iconfont icon-caidan"
-			},
-			"children": [
-				{
-					"path": "/menu/menu1",
-					"name": "menu1",
-					"component": "layout/routerView/parent",
-					"redirect": "/menu/menu1/menu11",
-					"meta": {
-						"title": "message.router.menu1",
-						"isLink": "",
-						"isHide": false,
-						"isKeepAlive": true,
-						"isAffix": false,
-						"isIframe": false,
-						"roles": ["admin", "common"],
-						"icon": "iconfont icon-caidan"
-					},
-					"children": [
-						{
-							"path": "/menu/menu1/menu11",
-							"name": "menu11",
-							"component": "menu/menu1/menu11/index",
-							"meta": {
-								"title": "message.router.menu11",
-								"isLink": "",
-								"isHide": false,
-								"isKeepAlive": true,
-								"isAffix": false,
-								"isIframe": false,
-								"roles": ["admin", "common"],
-								"icon": "iconfont icon-caidan"
-							}
-						},
-						{
-							"path": "/menu/menu1/menu12",
-							"name": "menu12",
-							"component": "layout/routerView/parent",
-							"redirect": "/menu/menu1/menu12/menu121",
-							"meta": {
-								"title": "message.router.menu12",
-								"isLink": "",
-								"isHide": false,
-								"isKeepAlive": true,
-								"isAffix": false,
-								"isIframe": false,
-								"roles": ["admin", "common"],
-								"icon": "iconfont icon-caidan"
-							},
-							"children": [
-								{
-									"path": "/menu/menu1/menu12/menu121",
-									"name": "menu121",
-									"component": "menu/menu1/menu12/menu121/index",
-									"meta": {
-										"title": "message.router.menu121",
-										"isLink": "",
-										"isHide": false,
-										"isKeepAlive": true,
-										"isAffix": false,
-										"isIframe": false,
-										"roles": ["admin", "common"],
-										"icon": "iconfont icon-caidan"
-									}
-								},
-								{
-									"path": "/menu/menu1/menu12/menu122",
-									"name": "menu122",
-									"component": "menu/menu1/menu12/menu122/index",
-									"meta": {
-										"title": "message.router.menu122",
-										"isLink": "",
-										"isHide": false,
-										"isKeepAlive": true,
-										"isAffix": false,
-										"isIframe": false,
-										"roles": ["admin", "common"],
-										"icon": "iconfont icon-caidan"
-									}
-								}
-							]
-						},
-						{
-							"path": "/menu/menu1/menu13",
-							"name": "menu13",
-							"component": "menu/menu1/menu13/index",
-							"meta": {
-								"title": "message.router.menu13",
-								"isLink": "",
-								"isHide": false,
-								"isKeepAlive": true,
-								"isAffix": false,
-								"isIframe": false,
-								"roles": ["admin", "common"],
-								"icon": "iconfont icon-caidan"
-							}
-						}
-					]
-				},
-				{
-					"path": "/menu/menu2",
-					"name": "menu2",
-					"component": "menu/menu2/index",
-					"meta": {
-						"title": "message.router.menu2",
-						"isLink": "",
-						"isHide": false,
-						"isKeepAlive": true,
-						"isAffix": false,
-						"isIframe": false,
-						"roles": ["admin", "common"],
-						"icon": "iconfont icon-caidan"
-					}
-				}
-			]
-		},
-		{
-			"path": "/fun",
-			"name": "funIndex",
-			"component": "layout/routerView/parent",
-			"redirect": "/fun/tagsView",
-			"meta": {
-				"title": "message.router.funIndex",
-				"isLink": "",
-				"isHide": false,
-				"isKeepAlive": true,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin", "common"],
-				"icon": "iconfont icon-crew_feature"
-			},
-			"children": [
-				{
-					"path": "/fun/tagsView",
-					"name": "funTagsView",
-					"component": "fun/tagsView/index",
-					"meta": {
-						"title": "message.router.funTagsView",
-						"isLink": "",
-						"isHide": false,
-						"isKeepAlive": true,
-						"isAffix": false,
-						"isIframe": false,
-						"roles": ["admin", "common"],
-						"icon": "el-icon-thumb"
-					}
-				}
-			]
-		},
-		{
-			"path": "/link",
-			"name": "layoutLinkView",
-			"component": "layout/routerView/parent",
-			"meta": {
-				"title": "message.router.layoutLinkView",
-				"isLink": "https://element-plus.gitee.io/#/zh-CN/component/installation",
-				"isHide": false,
-				"isKeepAlive": false,
-				"isAffix": false,
-				"isIframe": false,
-				"roles": ["admin"],
-				"icon": "iconfont icon-caozuo-wailian"
-			}
-		},
-		{
-			"path": "/iframes",
-			"name": "layoutIfameView",
-			"component": "layout/routerView/parent",
-			"meta": {
-				"title": "message.router.layoutIfameView",
-				"isLink": "https://gitee.com/lyt-top/vue-next-admin",
-				"isHide": false,
-				"isKeepAlive": false,
-				"isAffix": true,
-				"isIframe": true,
-				"roles": ["admin"],
-				"icon": "iconfont icon-neiqianshujuchucun"
-			}
-		}
-	]
-}

shim.d.ts

@@ -0,0 +1,13 @@
+/* eslint-disable */
+
+// 声明文件，*.vue 后缀的文件交给 vue 模块来处理
+declare module '*.vue' {
+	import type { DefineComponent } from 'vue';
+	const component: DefineComponent<{}, {}, any>;
+	export default component;
+}
+
+// 声明文件，定义全局变量。其它 app.config.globalProperties.xxx，使用 getCurrentInstance() 来获取
+interface Window {
+	nextLoading: boolean;
+}

source.d.ts

@@ -0,0 +1,6 @@
+declare module '*.json';
+declare module '*.png';
+declare module '*.jpg';
+declare module '*.scss';
+declare module '*.ts';
+declare module '*.js';

src/App.vue

@@ -1,78 +1,96 @@
 <template>
-	<div id="app">
-		<router-view />
-		<Setings ref="setingsRef" />
-		<Upgrade v-if="getVersion" />
-		<Sponsors />
-	</div>
+	<el-config-provider :size="getGlobalComponentSize" :locale="i18nLocale">
+		<router-view v-show="themeConfig.lockScreenTime > 1" />
+		<LockScreen v-if="themeConfig.isLockScreen" />
+		<Setings ref="setingsRef" v-show="themeConfig.lockScreenTime > 1" />
+		<CloseFull v-if="!themeConfig.isLockScreen" />
+	</el-config-provider>
 </template>
 
-<script>
-import config from '/package.json';
-import setIntroduction from '@/utils/setIconfont.js';
-import { Local } from '@/utils/storage.js';
-import Setings from '@/layout/navBars/topBar/setings.vue';
-import Upgrade from '@/layout/upgrade/index.vue';
-import Sponsors from '@/layout/sponsors/index.vue';
-export default {
-	name: 'App',
-	components: { Setings, Upgrade, Sponsors },
-	mounted() {
-		this.initSetIconfont();
-		this.openSetingsDrawer();
-		this.getLayoutThemeConfig();
-	},
-	computed: {
-		// 获取版本号
-		getVersion() {
-			let isVersion = false;
-			if (this.$route.path !== '/login') {
-				if ((Local.get('version') && Local.get('version') !== config.version) || !Local.get('version')) isVersion = true;
-			}
-			return isVersion;
-		},
-	},
-	methods: {
+<script lang="ts">
+import { computed, ref, getCurrentInstance, onBeforeMount, onMounted, onUnmounted, nextTick, defineComponent, watch, reactive, toRefs } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import other from '/@/utils/other';
+import { Local, Session } from '/@/utils/storage';
+import setIntroduction from '/@/utils/setIconfont';
+import LockScreen from '/@/layout/lockScreen/index.vue';
+import Setings from '/@/layout/navBars/breadcrumb/setings.vue';
+import CloseFull from '/@/layout/navBars/breadcrumb/closeFull.vue';
+
+export default defineComponent({
+	name: 'app',
+	components: { LockScreen, Setings, CloseFull },
+	setup() {
+		const { proxy } = <any>getCurrentInstance();
+		const setingsRef = ref();
+		const route = useRoute();
+		const stores = useTagsViewRoutes();
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const state = reactive({
+			i18nLocale: null,
+		});
+		// 获取全局组件大小
+		const getGlobalComponentSize = computed(() => {
+			return other.globalComponentSize();
+		});
+		// 布局配置弹窗打开
+		const openSetingsDrawer = () => {
+			setingsRef.value.openDrawer();
+		};
 		// 设置初始化，防止刷新时恢复默认
-		initSetIconfont() {
+		onBeforeMount(() => {
 			// 设置批量第三方 icon 图标
 			setIntroduction.cssCdn();
 			// 设置批量第三方 js
 			setIntroduction.jsCdn();
-		},
-		// 布局配置弹窗打开
-		openSetingsDrawer() {
-			this.bus.$on('openSetingsDrawer', () => {
-				this.$refs.setingsRef.openDrawer();
-			});
-		},
-		// 获取缓存中的布局配置
-		getLayoutThemeConfig() {
-			if (Local.get('themeConfigPrev')) {
-				this.$store.dispatch('themeConfig/setThemeConfig', Local.get('themeConfigPrev'));
-				document.documentElement.style.cssText = Local.get('themeConfigStyle');
-			} else {
-				Local.set('themeConfigPrev', this.$store.state.themeConfig.themeConfig);
-			}
-		},
-	},
-	watch: {
-		// 监听路由的变化
-		$route: {
-			handler(to) {
-				this.$nextTick(() => {
-					let webTitle = '';
-					let { globalTitle } = this.$store.state.themeConfig.themeConfig;
-					to.path === '/login' ? (webTitle = to.meta.title) : (webTitle = this.$t(to.meta.title));
-					document.title = `${webTitle} - ${globalTitle}` || globalTitle;
+		});
+		// 页面加载时
+		onMounted(() => {
+			nextTick(() => {
+				// 监听布局配置弹窗点击打开
+				proxy.mittBus.on('openSetingsDrawer', () => {
+					openSetingsDrawer();
 				});
+				// 设置 i18n，App.vue 中的 el-config-provider
+				proxy.mittBus.on('getI18nConfig', (locale: string) => {
+					(state.i18nLocale as string | null) = locale;
+				});
+				// 获取缓存中的布局配置
+				if (Local.get('themeConfig')) {
+					storesThemeConfig.setThemeConfig(Local.get('themeConfig'));
+					document.documentElement.style.cssText = Local.get('themeConfigStyle');
+				}
+				// 获取缓存中的全屏配置
+				if (Session.get('isTagsViewCurrenFull')) {
+					stores.setCurrenFullscreen(Session.get('isTagsViewCurrenFull'));
+				}
+			});
+		});
+		// 页面销毁时，关闭监听布局配置/i18n监听
+		onUnmounted(() => {
+			proxy.mittBus.off('openSetingsDrawer', () => {});
+			proxy.mittBus.off('getI18nConfig', () => {});
+		});
+		// 监听路由的变化，设置网站标题
+		watch(
+			() => route.path,
+			() => {
+				other.useTitle();
 			},
-			deep: true,
-			immediate: true,
-		},
+			{
+				deep: true,
+			}
+		);
+		return {
+			themeConfig,
+			setingsRef,
+			getGlobalComponentSize,
+			...toRefs(state),
+		};
 	},
-	destroyed() {
-		this.bus.$off('openSetingsDrawer');
-	},
-};
+});
 </script>

src/api/login/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request';
+import request from '/@/utils/request';
 
 /**
  * 登录api接口集合
@@ -7,14 +7,14 @@ import request from '@/utils/request';
  */
 export function useLoginApi() {
 	return {
-		signIn: (params) => {
+		signIn: (params: object) => {
 			return request({
 				url: '/user/signIn',
 				method: 'post',
 				data: params,
 			});
 		},
-		signOut: (params) => {
+		signOut: (params: object) => {
 			return request({
 				url: '/user/signOut',
 				method: 'post',

src/api/menu/index.js

@@ -1,48 +0,0 @@
-import request from '@/utils/request';
-
-/**
- * webpack 的代理只是本地开发生效，打包后需要在部署环境 搭建 nginx 代理
- * 所以：
- * 开发环境，请求跨越的接口。为了配置跨越示例
- * 线上环境，请求目录下的 `json` 数据
- * 一般后端接口都会处理跨越问题，可根据具体情况进行修改
- * json 格式地址：https://gitee.com/lyt-top/vue-next-admin-images/tree/master/vue2
- * 本地菜单地址：public/xxx.json
- */
-
-/**
- * 后端控制菜单模拟json，路径在 https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu
- * 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
- * @method getMenuAdmin 获取后端动态路由菜单(admin)
- * @method getMenuTest 获取后端动态路由菜单(test)
- */
-export function useMenuApi() {
-	return {
-		getMenuAdmin: (params) => {
-			// 本地数据，路径：`/public/xxx.json`
-			return request({
-				url: './admin.json',
-				method: 'get',
-				params,
-			});
-			// 模拟跨域
-			// return request({
-			// 	url: '/gitee/lyt-top/vue-next-admin-images/raw/master/vue2/admin.json',
-			// 	method: 'get',
-			// });
-		},
-		getMenuTest: (params) => {
-			// 本地数据，路径：`/public/xxx.json`
-			return request({
-				url: './test.json',
-				method: 'get',
-				params,
-			});
-			// 模拟跨域
-			// return request({
-			// 	url: '/gitee/lyt-top/vue-next-admin-images/raw/master/vue2/test.json',
-			// 	method: 'get',
-			// });
-		},
-	};
-}

src/api/menu/index.ts

@@ -0,0 +1,26 @@
+import request from '/@/utils/request';
+
+/**
+ * 后端控制菜单模拟json，路径在 https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu
+ * 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
+ * @method getMenuAdmin 获取后端动态路由菜单(admin)
+ * @method getMenuTest 获取后端动态路由菜单(test)
+ */
+export function useMenuApi() {
+	return {
+		getMenuAdmin: (params?: object) => {
+			return request({
+				url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/adminMenu.json',
+				method: 'get',
+				params,
+			});
+		},
+		getMenuTest: (params?: object) => {
+			return request({
+				url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/testMenu.json',
+				method: 'get',
+				params,
+			});
+		},
+	};
+}

src/assets/logo-mini.svg

@@ -1,6 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 50" width="64" height="50">
+	<defs>
+		<image width="64" height="50" id="img1" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAyCAYAAADsg90UAAAAAXNSR0IB2cksfwAACI5JREFUeJy1WgtsW9UZdvNq0xU6WhZoCCVx7Gunbld1GSsMdYpGREhwr+2IMbQWqRoTk+iWPZi2wWhm1kwEmqV52feRJrbvvd6DiUnbQCAemzY2xh4tSB0wOqZIqAtLYzultIWEpt13btLq+sap/R8nRzpK4vh+5/++85///8851yEk1V+hX6B0tyE3OWwt0x789VR78AKlZ0KBz1oxBE3+BdUW9PNuQ7nJbk/BDQ/v4hi0x44z1R64jyrAVCjQ/fLNN8/ZoUWdgqGc57AFE6I86giH+QRw6XI9QE4RBz3iTAyVW3EyQdEDUmeIIhyeFNtMHO/o0B4e8qYASfVvLk2p4BKgdnioFCAvEQeddhnyFivOpOgvBaFXiAKcygQDrk927S/zjkae5xUA/X3YI/C5AFwHLrSPw+2+YYfCMugiCvDaCbGt0hc9uAXuP1OEAPACZQ+fAGguQ9nGgglx0OfsOAhq24lBcG/YYQa/kWLIz3XlCW4B6mKRCoCMEQdNu3VpnRVnMhBYA2L/LVCATCooXuNJSHXFzv58P+mMyyu5RQDAKNntdLnNjoN0+NMCM0D8901NDkGXuyBAseRZn3Ubagu3AFjTd1GXAdZdpCqurMgSIBS4BwRn8wgwje/d4pV6yz2adGQJyM/bo/ZyC+DSlWqApIiDHqtPyFdlCyBeD4Lv5xHgr5mAWO4ZjTRh9s8tlQDoryIbrOISoLYvvAIALxIHnIHn3GnFmfDfztLhH/IEv/vYd72xyKElJM/6Gdjj4fYCuNA3yYMa6ogdBwQfvIwAk+mguHZz3+MbMPsfLrEALD3v5RfAkH3UOID+Jqqwj2ULIDZeJvhF2He8I0NfX2ry8wI85VSy41LBzaUPsXT4L/Iy0OUbrTgpsXUlyI7lEOAsvGOboPRdKejK28shAPqpek1etxjHArxAiXCo/pAdB2QPLRQg8BLcv8ITi4h4bnaZBGD2+IsQQG0DCDUyv2LfjcHVQyB93iLAecz+bvY/T1x6YrnImwIkVakIAeSrAfIucdCz7qRcY8VJh8RrQDplWfvHxttaVvkGe6vg/h8tpwDoR926wpcOb9CkEhQ4Mbrqym4rTkrcydLhs5bU95Wwwwx+311m8qxPQ4CtvE6AdKjcLlCrQkNJXNXdnYUD0t+eF+AE1v76rV0/qvTEo/8kkkGJq/yFLIKhPsgtgEszl8E4cdAxPHdllgDBwGZW9k6Fguaa9A4PtMEwkrDe0chhCPAZ/E5dNn/kPiWqGe5mVSH1rJCdze2w4rDNDsi/gdn/FPtb0KTfUmeyQenvuE45WCLQd6unsc3fwKeAw0yHX+Zwu247DpbB3emQv3R7x7du8GgybdtrKGc39Ty23rQnqfKk5y9wCwD1XACZJg56xGUMZFVhx1taytjPBnWAfuihyT+3TEiAQwC1Mhzmqwrr9QhbBoeJg36A6Ou0Y/kGe2qQ+mhiGspHDcODTZfs0eRr8fkE0Z4xpyGt4RJgTnX1carq8Jw9dhzv6BB5k+VJyK9t6+y8dNK74bGHMSHK00Scc/CC7fwC6MotAjX6GuqTzsTBkosYW/f9YKUnIb1OFiAW/c4Ce5Lq18jLKKnu5xaApTWBHn0n8Nz6ixhw4zvJ5HXlvU2R3gWui02XizwhrEznbTW9vQ64nUEckBUut13EQOHzFFUA70jErBv+09xcYrXHqUXK8H9qIXXapSs1dm4FN1SF95DdzlD72LMNUt/15CMvXT65NfzIRtQOq5FCv7jAHkPppdqDZ3YvZFZgY8WEQN8dvvFxpB8hLvWT3T8uyWxckG9CEfX38fk0ahGgmboMMIk/2xg5UJKbYZ62sf9RbI7UPxGJzLgT0R2Y/RM0z1HO+QZ6Gl/3+dh2Wmdb6HQwUJc9IfI6fPc40Z5xCLeW2wvw8Pfoy0B5mfoMAuYLn+7oKE0FxZqp+YvWTHugw24PvvtLIjZLh83cAghzmxHqASb5qntz/4EvsfEy7UHroepvJoKtWdUcPPKrVGwsA6k2FuYTAPXAGoC8RfYCStflqRvv3VuB4Hc1SI9bBJjAZ1VWe+p1+TqBHpfG+M8Ksa0EgLacAnhiETNzIPjdbztLPIfPWrME0CSkQ+UfxDFmkQ5v5RPAYcYBckFTcDfUWc+hwZsw06tA+EiOi5RoDns66ctA/Qm3AE4tuhYgZ5Zl9uPR32165PtlINoMwjM5jtPfSvn9WTe/iEufw7PUW+U3a2NSKZ8CTU0s+DyzHAJgq9yuNDaywxNtkQuVWaTDBqs5SIdsQt4hjsXOCvmvzrDu6Fdnebo3Hj3u69xXngoFqkH09KL3ie2BB6y2XCsfZNt1apnOqsL7uY/KoB57k+SDJRUhIZlX2iD4UJ4b5ef+3dqabY9hlunUdPt0XXyIryqs1yKVAv3qbPFuKNNedaAR5FeD4NE8AqRTwZ1ZmxqnHv0EcI4Rxz3hNqSqxThevrEXqpJq31IJgOD3TN3+h0tYmmPpLt9bJex80W4SRBzmEF7kE8Bhbo5aONwutwCx6K4JUVyByu/JfOTn+6EFAiTNN1uoAgxyC1BvqFcAZLJo8pr8rlvuq8wExfpFUl+u/s7/dt6R9UKkS5ergHeaOP6Yc2SQLw7Mqa6SDznsHakvzLAyoeAPCyRvVoXpUGCb1ZZqRWFnhdQXPWcg3Jac5App7C2MImf/5Kb+nupJ0X8FSL1NEOACEyyHPQ9QbWA73CIEkBuEIqrCzUO9CsNB6esCqQ8pAqD/Oe33l9vs2SLQd6svuhJSWW6GeVptLFKGbMD9eltjZ2cjw5m4o60ChF4lCvBeJhjIuntAYF4N3KNEO9Lwgmo+F/D5mNt1cbr/2OeD916qx+HSB4gCsDdNdmXZM7dbjRJtYXeZd/EJ4DDX3Q4uARLSj604yO23UgVA2jRy2EO+OkNX/w+fZNm8pw5QbAAAAABJRU5ErkJggg=="/>
+	</defs>
 	<style>
 		tspan { white-space:pre }
 	</style>
-	<path id="p " fill="#409eff" d="M32.37 1.82L32.37 1.82Q33.13 1.88 33.13 2.05L33.77 1.94Q44.03 1.94 49.24 11.55Q50.12 13.71 50.12 15.94Q50.12 20.75 45.61 24.03Q41.86 26.31 37.93 26.31L37.82 26.31Q34.24 26.31 30.02 25.14Q28.32 30.71 25.86 40.61L26.04 40.84Q25.39 43.36 24.46 48.4Q24.34 48.4 24.05 48.52Q19.13 46.23 19.13 42.84Q20.18 36.45 20.71 34.75Q20.71 31.82 16.31 25.67Q14.73 22.21 14.73 20.1L14.85 19.87Q14.85 19.75 14.73 19.75Q15.67 14.54 16.31 14.54Q17.07 11.96 22.64 6.63Q25.45 4.46 28.85 2.99Q30.67 2.52 32.37 1.82ZM35.77 4.69L35.77 4.69L35.77 4.81Q35.77 7.09 31.72 19.05Q31.72 19.4 30.67 22.56L30.55 23.21L30.55 23.62Q30.9 24.14 34.18 24.14Q38.23 24.14 42.09 21.57Q45.43 19.11 46.37 15.71L46.25 15.41Q46.66 14.54 46.66 14.01L46.66 12.31Q46.66 10.02 43.91 6.74Q40.8 4.69 36.53 4.69L35.77 4.69ZM18.48 16.88L18.48 16.88Q21.88 20.22 24.05 21.27Q24.81 19.52 26.04 15.18L27.45 10.79L28.73 7.27Q29.03 7.27 29.03 6.51L28.85 6.51Q22.64 8.97 18.77 16.12Q18.77 16.18 18.48 16.88ZM18.13 17.41L18.13 17.41Q17.6 19.05 17.31 21.57Q17.31 25.9 21.59 31L23.93 22.33Q23.93 22.04 21.06 20.1Q18.48 17.76 18.48 17.41L18.13 17.41Z" />
+	<use id="Background" href="#img1" x="0" y="0" />
 </svg>

src/components/auth/auth.vue

@@ -0,0 +1,30 @@
+<template>
+	<slot v-if="getUserAuthBtnList" />
+</template>
+
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '/@/stores/userInfo';
+
+export default defineComponent({
+	name: 'auth',
+	props: {
+		value: {
+			type: String,
+			default: () => '',
+		},
+	},
+	setup(props) {
+		const stores = useUserInfo();
+		const { userInfos } = storeToRefs(stores);
+		// 获取 vuex 中的用户权限
+		const getUserAuthBtnList = computed(() => {
+			return userInfos.value.authBtnList.some((v: string) => v === props.value);
+		});
+		return {
+			getUserAuthBtnList,
+		};
+	},
+});
+</script>

src/components/auth/authAll.vue

@@ -0,0 +1,31 @@
+<template>
+	<slot v-if="getUserAuthBtnList" />
+</template>
+
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '/@/stores/userInfo';
+import { judementSameArr } from '/@/utils/arrayOperation';
+
+export default defineComponent({
+	name: 'authAll',
+	props: {
+		value: {
+			type: Array,
+			default: () => [],
+		},
+	},
+	setup(props) {
+		const stores = useUserInfo();
+		const { userInfos } = storeToRefs(stores);
+		// 获取 pinia 中的用户权限
+		const getUserAuthBtnList = computed(() => {
+			return judementSameArr(props.value, userInfos.value.authBtnList);
+		});
+		return {
+			getUserAuthBtnList,
+		};
+	},
+});
+</script>

src/components/auth/auths.vue

@@ -0,0 +1,36 @@
+<template>
+	<slot v-if="getUserAuthBtnList" />
+</template>
+
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '/@/stores/userInfo';
+
+export default defineComponent({
+	name: 'auths',
+	props: {
+		value: {
+			type: Array,
+			default: () => [],
+		},
+	},
+	setup(props) {
+		const stores = useUserInfo();
+		const { userInfos } = storeToRefs(stores);
+		// 获取 vuex 中的用户权限
+		const getUserAuthBtnList = computed(() => {
+			let flag = false;
+			userInfos.value.authBtnList.map((val: string) => {
+				props.value.map((v) => {
+					if (val === v) flag = true;
+				});
+			});
+			return flag;
+		});
+		return {
+			getUserAuthBtnList,
+		};
+	},
+});
+</script>

src/components/cropper/index.vue

@@ -0,0 +1,149 @@
+<template>
+	<div>
+		<el-dialog title="更换头像" v-model="isShowDialog" width="769px">
+			<div class="cropper-warp">
+				<div class="cropper-warp-left">
+					<img :src="cropperImg" class="cropper-warp-left-img" />
+				</div>
+				<div class="cropper-warp-right">
+					<div class="cropper-warp-right-title">预览</div>
+					<div class="cropper-warp-right-item">
+						<div class="cropper-warp-right-value">
+							<img :src="cropperImgBase64" class="cropper-warp-right-value-img" />
+						</div>
+						<div class="cropper-warp-right-label">100 x 100</div>
+					</div>
+					<div class="cropper-warp-right-item">
+						<div class="cropper-warp-right-value">
+							<img :src="cropperImgBase64" class="cropper-warp-right-value-img cropper-size" />
+						</div>
+						<div class="cropper-warp-right-label">50 x 50</div>
+					</div>
+				</div>
+			</div>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit" size="default">更 换</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script lang="ts">
+import { reactive, toRefs, nextTick, defineComponent } from 'vue';
+import Cropper from 'cropperjs';
+import 'cropperjs/dist/cropper.css';
+
+export default defineComponent({
+	name: 'cropperIndex',
+	setup() {
+		const state = reactive({
+			isShowDialog: false,
+			cropperImg: '',
+			cropperImgBase64: '',
+			cropper: null,
+		});
+		// 打开弹窗
+		const openDialog = (imgs: any) => {
+			state.cropperImg = imgs;
+			state.isShowDialog = true;
+			nextTick(() => {
+				initCropper();
+			});
+		};
+		// 关闭弹窗
+		const closeDialog = () => {
+			state.isShowDialog = false;
+		};
+		// 取消
+		const onCancel = () => {
+			closeDialog();
+		};
+		// 更换
+		const onSubmit = () => {
+			// state.cropperImgBase64 = state.cropper.getCroppedCanvas().toDataURL('image/jpeg');
+		};
+		// 初始化cropperjs图片裁剪
+		const initCropper = () => {
+			const letImg: any = document.querySelector('.cropper-warp-left-img');
+			(<any>state.cropper) = new Cropper(letImg, {
+				viewMode: 1,
+				dragMode: 'none',
+				initialAspectRatio: 1,
+				aspectRatio: 1,
+				preview: '.before',
+				background: false,
+				autoCropArea: 0.6,
+				zoomOnWheel: false,
+				crop: () => {
+					state.cropperImgBase64 = (<any>state.cropper).getCroppedCanvas().toDataURL('image/jpeg');
+				},
+			});
+		};
+		return {
+			openDialog,
+			closeDialog,
+			onCancel,
+			onSubmit,
+			initCropper,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.cropper-warp {
+	display: flex;
+	.cropper-warp-left {
+		position: relative;
+		display: inline-block;
+		height: 350px;
+		flex: 1;
+		border: 1px solid var(--el-border-color);
+		background: var(--el-color-white);
+		overflow: hidden;
+		background-repeat: no-repeat;
+		cursor: move;
+		border-radius: var(--el-border-radius-base);
+		.cropper-warp-left-img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.cropper-warp-right {
+		width: 150px;
+		height: 350px;
+		.cropper-warp-right-title {
+			text-align: center;
+			height: 20px;
+			line-height: 20px;
+		}
+		.cropper-warp-right-item {
+			margin: 15px 0;
+			.cropper-warp-right-value {
+				display: flex;
+				.cropper-warp-right-value-img {
+					width: 100px;
+					height: 100px;
+					border-radius: var(--el-border-radius-circle);
+					margin: auto;
+				}
+				.cropper-size {
+					width: 50px;
+					height: 50px;
+				}
+			}
+			.cropper-warp-right-label {
+				text-align: center;
+				font-size: 12px;
+				color: var(--el-text-color-primary);
+				height: 30px;
+				line-height: 30px;
+			}
+		}
+	}
+}
+</style>

src/components/editor/index.vue

@@ -0,0 +1,115 @@
+<template>
+	<div class="editor-container">
+		<div ref="editorToolbar"></div>
+		<div ref="editorContent" :style="{ height }"></div>
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, watch, defineComponent } from 'vue';
+import { createEditor, createToolbar, IEditorConfig, IToolbarConfig, IDomEditor } from '@wangeditor/editor';
+import '@wangeditor/editor/dist/css/style.css';
+import { toolbarKeys } from './toolbar';
+
+// 定义接口来定义对象的类型
+interface WangeditorState {
+	editorToolbar: HTMLDivElement | null;
+	editorContent: HTMLDivElement | null;
+	editor: any;
+}
+
+export default defineComponent({
+	name: 'wngEditor',
+	props: {
+		// 节点 id
+		id: {
+			type: String,
+			default: () => 'wangeditor',
+		},
+		// 是否禁用
+		isDisable: {
+			type: Boolean,
+			default: () => false,
+		},
+		// 内容框默认 placeholder
+		placeholder: {
+			type: String,
+			default: () => '请输入内容',
+		},
+		// 双向绑定：双向绑定值，字段名为固定，改了之后将不生效
+		// 参考：https://v3.cn.vuejs.org/guide/migration/v-model.html#%E8%BF%81%E7%A7%BB%E7%AD%96%E7%95%A5
+		modelValue: String,
+		// https://www.wangeditor.com/v5/getting-started.html#mode-%E6%A8%A1%E5%BC%8F
+		// 模式，可选 <default|simple>，默认 default
+		mode: {
+			type: String,
+			default: () => 'default',
+		},
+		// 高度
+		height: {
+			type: String,
+			default: () => '310px',
+		},
+	},
+	setup(props, { emit }) {
+		const state = reactive<WangeditorState>({
+			editorToolbar: null,
+			editor: null,
+			editorContent: null,
+		});
+		// 富文本配置
+		const wangeditorConfig = () => {
+			const editorConfig: Partial<IEditorConfig> = { MENU_CONF: {} };
+			props.isDisable ? (editorConfig.readOnly = true) : (editorConfig.readOnly = false);
+			editorConfig.placeholder = props.placeholder;
+			editorConfig.onChange = (editor: IDomEditor) => {
+				// console.log('content', editor.children);
+				// console.log('html', editor.getHtml());
+				emit('update:modelValue', editor.getHtml());
+			};
+			(<any>editorConfig).MENU_CONF['uploadImage'] = {
+				base64LimitSize: 10 * 1024 * 1024,
+			};
+			return editorConfig;
+		};
+		//
+		const toolbarConfig = () => {
+			const toolbarConfig: Partial<IToolbarConfig> = {};
+			toolbarConfig.toolbarKeys = toolbarKeys;
+			return toolbarConfig;
+		};
+		// 初始化富文本
+		// https://www.wangeditor.com/
+		const initWangeditor = () => {
+			state.editor = createEditor({
+				html: props.modelValue,
+				selector: state.editorContent!,
+				config: wangeditorConfig(),
+				mode: props.mode,
+			});
+			createToolbar({
+				editor: state.editor,
+				selector: state.editorToolbar!,
+				mode: props.mode,
+				config: toolbarConfig(),
+			});
+		};
+		// 页面加载时
+		onMounted(() => {
+			initWangeditor();
+		});
+		// 监听双向绑定值的改变
+		// https://gitee.com/lyt-top/vue-next-admin/issues/I4LM7I
+		watch(
+			() => props.modelValue,
+			(value) => {
+				state.editor.clear();
+				state.editor.dangerouslyInsertHtml(value);
+			}
+		);
+		return {
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/components/editor/toolbar.ts

@@ -0,0 +1,60 @@
+/**
+ * 工具栏配置
+ */
+export const toolbarKeys = [
+	'headerSelect',
+	'blockquote',
+	'|',
+	'bold',
+	'underline',
+	'italic',
+	{
+		key: 'group-more-style',
+		title: '更多',
+		iconSvg:
+			'<svg viewBox="0 0 1024 1024"><path d="M204.8 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z"></path><path d="M505.6 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z"></path><path d="M806.4 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z"></path></svg>',
+		menuKeys: ['through', 'code', 'sup', 'sub', 'clearStyle'],
+	},
+	'color',
+	'bgColor',
+	'|',
+	'fontSize',
+	'fontFamily',
+	'lineHeight',
+	'|',
+	'bulletedList',
+	'numberedList',
+	'todo',
+	{
+		key: 'group-justify',
+		title: '对齐',
+		iconSvg:
+			'<svg viewBox="0 0 1024 1024"><path d="M768 793.6v102.4H51.2v-102.4h716.8z m204.8-230.4v102.4H51.2v-102.4h921.6z m-204.8-230.4v102.4H51.2v-102.4h716.8zM972.8 102.4v102.4H51.2V102.4h921.6z"></path></svg>',
+		menuKeys: ['justifyLeft', 'justifyRight', 'justifyCenter', 'justifyJustify'],
+	},
+	{
+		key: 'group-indent',
+		title: '缩进',
+		iconSvg:
+			'<svg viewBox="0 0 1024 1024"><path d="M0 64h1024v128H0z m384 192h640v128H384z m0 192h640v128H384z m0 192h640v128H384zM0 832h1024v128H0z m0-128V320l256 192z"></path></svg>',
+		menuKeys: ['indent', 'delIndent'],
+	},
+	'|',
+	'emotion',
+	'insertLink',
+	{
+		key: 'group-image',
+		title: '图片',
+		iconSvg:
+			'<svg viewBox="0 0 1024 1024"><path d="M959.877 128l0.123 0.123v767.775l-0.123 0.122H64.102l-0.122-0.122V128.123l0.122-0.123h895.775zM960 64H64C28.795 64 0 92.795 0 128v768c0 35.205 28.795 64 64 64h896c35.205 0 64-28.795 64-64V128c0-35.205-28.795-64-64-64zM832 288.01c0 53.023-42.988 96.01-96.01 96.01s-96.01-42.987-96.01-96.01S682.967 192 735.99 192 832 234.988 832 288.01zM896 832H128V704l224.01-384 256 320h64l224.01-192z"></path></svg>',
+		menuKeys: ['uploadImage'],
+	},
+	'insertTable',
+	'codeBlock',
+	'divider',
+	'|',
+	'undo',
+	'redo',
+	'|',
+	'fullScreen',
+];

src/components/iconSelector/index.vue

@@ -0,0 +1,252 @@
+<template>
+	<div class="icon-selector w100 h100">
+		<el-popover
+			placement="bottom"
+			:width="fontIconWidth"
+			trigger="click"
+			transition="el-zoom-in-top"
+			popper-class="icon-selector-popper"
+			@show="onPopoverShow"
+		>
+			<template #reference>
+				<el-input
+					v-model="fontIconSearch"
+					:placeholder="fontIconPlaceholder"
+					:clearable="clearable"
+					:disabled="disabled"
+					:size="size"
+					ref="inputWidthRef"
+					@clear="onClearFontIcon"
+					@focus="onIconFocus"
+					@blur="onIconBlur"
+				>
+					<template #prepend>
+						<SvgIcon
+							:name="fontIconPrefix === '' ? prepend : fontIconPrefix"
+							class="font14"
+							v-if="fontIconPrefix === '' ? prepend?.indexOf('ele-') > -1 : fontIconPrefix?.indexOf('ele-') > -1"
+						/>
+						<i v-else :class="fontIconPrefix === '' ? prepend : fontIconPrefix" class="font14"></i>
+					</template>
+				</el-input>
+			</template>
+			<template #default>
+				<div class="icon-selector-warp">
+					<div class="icon-selector-warp-title flex">
+						<div class="flex-auto">{{ title }}</div>
+						<div class="icon-selector-warp-title-tab" v-if="type === 'all'">
+							<span :class="{ 'span-active': fontIconType === 'ali' }" @click="onIconChange('ali')" class="ml10" title="iconfont 图标">ali</span>
+							<span :class="{ 'span-active': fontIconType === 'ele' }" @click="onIconChange('ele')" class="ml10" title="elementPlus 图标">ele</span>
+							<span :class="{ 'span-active': fontIconType === 'awe' }" @click="onIconChange('awe')" class="ml10" title="fontawesome 图标">awe</span>
+						</div>
+					</div>
+					<div class="icon-selector-warp-row">
+						<el-scrollbar ref="selectorScrollbarRef">
+							<el-row :gutter="10" v-if="fontIconSheetsFilterList.length > 0">
+								<el-col :xs="6" :sm="4" :md="4" :lg="4" :xl="4" @click="onColClick(v)" v-for="(v, k) in fontIconSheetsFilterList" :key="k">
+									<div class="icon-selector-warp-item" :class="{ 'icon-selector-active': fontIconPrefix === v }">
+										<div class="flex-margin">
+											<div class="icon-selector-warp-item-value">
+												<SvgIcon :name="v" />
+											</div>
+										</div>
+									</div>
+								</el-col>
+							</el-row>
+							<el-empty :image-size="100" v-if="fontIconSheetsFilterList.length <= 0" :description="emptyDescription"></el-empty>
+						</el-scrollbar>
+					</div>
+				</div>
+			</template>
+		</el-popover>
+	</div>
+</template>
+
+<script lang="ts">
+import { ref, toRefs, reactive, onMounted, nextTick, computed, watch, defineComponent } from 'vue';
+import initIconfont from '/@/utils/getStyleSheets';
+
+export default defineComponent({
+	name: 'iconSelector',
+	emits: ['update:modelValue', 'get', 'clear'],
+	props: {
+		// 输入框前置内容
+		prepend: {
+			type: String,
+			default: () => 'ele-Pointer',
+		},
+		// 输入框占位文本
+		placeholder: {
+			type: String,
+			default: () => '请输入内容搜索图标或者选择图标',
+		},
+		// 输入框占位文本
+		size: {
+			type: String,
+			default: () => 'default',
+		},
+		// 弹窗标题
+		title: {
+			type: String,
+			default: () => '请选择图标',
+		},
+		// icon 图标类型
+		type: {
+			type: String,
+			default: () => 'ele',
+		},
+		// 禁用
+		disabled: {
+			type: Boolean,
+			default: () => false,
+		},
+		// 是否可清空
+		clearable: {
+			type: Boolean,
+			default: () => true,
+		},
+		// 自定义空状态描述文字
+		emptyDescription: {
+			type: String,
+			default: () => '无相关图标',
+		},
+		// 双向绑定值，默认为 modelValue，
+		// 参考：https://v3.cn.vuejs.org/guide/migration/v-model.html#%E8%BF%81%E7%A7%BB%E7%AD%96%E7%95%A5
+		// 参考：https://v3.cn.vuejs.org/guide/component-custom-events.html#%E5%A4%9A%E4%B8%AA-v-model-%E7%BB%91%E5%AE%9A
+		modelValue: String,
+	},
+	setup(props, { emit }) {
+		const inputWidthRef = ref();
+		const selectorScrollbarRef = ref();
+		const state = reactive({
+			fontIconPrefix: '',
+			fontIconWidth: 0,
+			fontIconSearch: '',
+			fontIconTabsIndex: 0,
+			fontIconSheetsList: [],
+			fontIconPlaceholder: '',
+			fontIconType: 'ali',
+			fontIconShow: true,
+		});
+		// 处理 input 获取焦点时，modelValue 有值时，改变 input 的 placeholder 值
+		const onIconFocus = () => {
+			if (!props.modelValue) return false;
+			state.fontIconSearch = '';
+			state.fontIconPlaceholder = props.modelValue;
+		};
+		// 处理 input 失去焦点时，为空将清空 input 值，为点击选中图标时，将取原先值
+		const onIconBlur = () => {
+			setTimeout(() => {
+				const icon = state.fontIconSheetsList.filter((icon: string) => icon === state.fontIconSearch);
+				if (icon.length <= 0) state.fontIconSearch = '';
+			}, 300);
+		};
+		// 处理 icon 双向绑定数值回显
+		const initModeValueEcho = () => {
+			if (props.modelValue === '') return ((<string | undefined>state.fontIconPlaceholder) = props.placeholder);
+			(<string | undefined>state.fontIconPlaceholder) = props.modelValue;
+			(<string | undefined>state.fontIconPrefix) = props.modelValue;
+		};
+		// 处理 icon type 类型为 all 时，类型 ali、ele、awe 回显问题
+		const initFontIconTypeEcho = () => {
+			if ((<any>props.modelValue)?.indexOf('iconfont') > -1) onIconChange('ali');
+			else if ((<any>props.modelValue)?.indexOf('ele-') > -1) onIconChange('ele');
+			else if ((<any>props.modelValue)?.indexOf('fa') > -1) onIconChange('awe');
+			else onIconChange('ali');
+		};
+		// 图标搜索及图标数据显示
+		const fontIconSheetsFilterList = computed(() => {
+			if (!state.fontIconSearch) return state.fontIconSheetsList;
+			let search = state.fontIconSearch.trim().toLowerCase();
+			return state.fontIconSheetsList.filter((item: any) => {
+				if (item.toLowerCase().indexOf(search) !== -1) return item;
+			});
+		});
+		// 获取 input 的宽度
+		const getInputWidth = () => {
+			nextTick(() => {
+				state.fontIconWidth = inputWidthRef.value.$el.offsetWidth;
+			});
+		};
+		// 监听页面宽度改变
+		const initResize = () => {
+			window.addEventListener('resize', () => {
+				getInputWidth();
+			});
+		};
+		// 初始化数据
+		const initFontIconData = async (type: string) => {
+			state.fontIconSheetsList = [];
+			if (type === 'ali') {
+				await initIconfont.ali().then((res: any) => {
+					// 阿里字体图标使用 `iconfont xxx`
+					state.fontIconSheetsList = res.map((i: string) => `iconfont ${i}`);
+				});
+			} else if (type === 'ele') {
+				await initIconfont.ele().then((res: any) => {
+					state.fontIconSheetsList = res;
+				});
+			} else if (type === 'awe') {
+				await initIconfont.awe().then((res: any) => {
+					// fontawesome字体图标使用 `fa xxx`
+					state.fontIconSheetsList = res.map((i: string) => `fa ${i}`);
+				});
+			}
+			// 初始化 input 的 placeholder
+			// 参考（单项数据流）：https://cn.vuejs.org/v2/guide/components-props.html?#%E5%8D%95%E5%90%91%E6%95%B0%E6%8D%AE%E6%B5%81
+			state.fontIconPlaceholder = props.placeholder;
+			// 初始化双向绑定回显
+			initModeValueEcho();
+		};
+		// 图标点击切换
+		const onIconChange = (type: string) => {
+			state.fontIconType = type;
+			initFontIconData(type);
+		};
+		// 获取当前点击的 icon 图标
+		const onColClick = (v: any) => {
+			state.fontIconPlaceholder = v;
+			state.fontIconPrefix = v;
+			emit('get', state.fontIconPrefix);
+			emit('update:modelValue', state.fontIconPrefix);
+		};
+		// 清空当前点击的 icon 图标
+		const onClearFontIcon = () => {
+			state.fontIconPrefix = '';
+			emit('clear', state.fontIconPrefix);
+			emit('update:modelValue', state.fontIconPrefix);
+		};
+		// 监听 Popover 打开，用于双向绑定值回显
+		const onPopoverShow = () => {
+			initModeValueEcho();
+			initFontIconTypeEcho();
+		};
+		// 页面加载时
+		onMounted(() => {
+			initModeValueEcho();
+			initResize();
+			getInputWidth();
+		});
+
+		// 监听双向绑定 modelValue 的变化
+		watch(
+			() => props.modelValue,
+			() => {
+				initModeValueEcho();
+			}
+		);
+		return {
+			inputWidthRef,
+			selectorScrollbarRef,
+			fontIconSheetsFilterList,
+			onColClick,
+			onIconChange,
+			onClearFontIcon,
+			onIconFocus,
+			onIconBlur,
+			onPopoverShow,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/components/noticeBar/index.vue

@@ -0,0 +1,195 @@
+<template>
+	<div class="notice-bar" :style="{ background, height: `${height}px` }" v-show="!isMode">
+		<div class="notice-bar-warp" :style="{ color, fontSize: `${size}px` }">
+			<i v-if="leftIcon" class="notice-bar-warp-left-icon" :class="leftIcon"></i>
+			<div class="notice-bar-warp-text-box" ref="noticeBarWarpRef">
+				<div class="notice-bar-warp-text" ref="noticeBarTextRef" v-if="!scrollable">{{ text }}</div>
+				<div class="notice-bar-warp-slot" v-else><slot /></div>
+			</div>
+			<SvgIcon :name="rightIcon" v-if="rightIcon" class="notice-bar-warp-right-icon" @click="onRightIconClick" />
+		</div>
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, defineComponent, ref, onMounted, nextTick } from 'vue';
+
+export default defineComponent({
+	name: 'noticeBar',
+	props: {
+		// 通知栏模式，可选值为 closeable link
+		mode: {
+			type: String,
+			default: () => '',
+		},
+		// 通知文本内容
+		text: {
+			type: String,
+			default: () => '',
+		},
+		// 通知文本颜色
+		color: {
+			type: String,
+			default: () => 'var(--el-color-warning)',
+		},
+		// 通知背景色
+		background: {
+			type: String,
+			default: () => 'var(--el-color-warning-light-9)',
+		},
+		// 字体大小，单位px
+		size: {
+			type: [Number, String],
+			default: () => 14,
+		},
+		// 通知栏高度，单位px
+		height: {
+			type: Number,
+			default: () => 40,
+		},
+		// 动画延迟时间 (s)
+		delay: {
+			type: Number,
+			default: () => 1,
+		},
+		// 滚动速率 (px/s)
+		speed: {
+			type: Number,
+			default: () => 100,
+		},
+		// 是否开启垂直滚动
+		scrollable: {
+			type: Boolean,
+			default: () => false,
+		},
+		// 自定义左侧图标
+		leftIcon: {
+			type: String,
+			default: () => '',
+		},
+		// 自定义右侧图标
+		rightIcon: {
+			type: String,
+			default: () => '',
+		},
+	},
+	setup(props, { emit }) {
+		const noticeBarWarpRef = ref();
+		const noticeBarTextRef = ref();
+		const state = reactive({
+			order: 1,
+			oneTime: 0,
+			twoTime: 0,
+			warpOWidth: 0,
+			textOWidth: 0,
+			isMode: false,
+		});
+		// 初始化 animation 各项参数
+		const initAnimation = () => {
+			nextTick(() => {
+				state.warpOWidth = noticeBarWarpRef.value.offsetWidth;
+				state.textOWidth = noticeBarTextRef.value.offsetWidth;
+				document.styleSheets[0].insertRule(`@keyframes oneAnimation {0% {left: 0px;} 100% {left: -${state.textOWidth}px;}}`);
+				document.styleSheets[0].insertRule(`@keyframes twoAnimation {0% {left: ${state.warpOWidth}px;} 100% {left: -${state.textOWidth}px;}}`);
+				computeAnimationTime();
+				setTimeout(() => {
+					changeAnimation();
+				}, props.delay * 1000);
+			});
+		};
+		// 计算 animation 滚动时长
+		const computeAnimationTime = () => {
+			state.oneTime = state.textOWidth / props.speed;
+			state.twoTime = (state.textOWidth + state.warpOWidth) / props.speed;
+		};
+		// 改变 animation 动画调用
+		const changeAnimation = () => {
+			if (state.order === 1) {
+				noticeBarTextRef.value.style.cssText = `animation: oneAnimation ${state.oneTime}s linear; opactity: 1;}`;
+				state.order = 2;
+			} else {
+				noticeBarTextRef.value.style.cssText = `animation: twoAnimation ${state.twoTime}s linear infinite; opacity: 1;`;
+			}
+		};
+		// 监听 animation 动画的结束
+		const listenerAnimationend = () => {
+			noticeBarTextRef.value.addEventListener(
+				'animationend',
+				() => {
+					changeAnimation();
+				},
+				false
+			);
+		};
+		// 右侧 icon 图标点击
+		const onRightIconClick = () => {
+			if (!props.mode) return false;
+			if (props.mode === 'closeable') {
+				state.isMode = true;
+				emit('close');
+			} else if (props.mode === 'link') {
+				emit('link');
+			}
+		};
+		// 页面加载时
+		onMounted(() => {
+			if (props.scrollable) return false;
+			initAnimation();
+			listenerAnimationend();
+		});
+		return {
+			noticeBarWarpRef,
+			noticeBarTextRef,
+			onRightIconClick,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.notice-bar {
+	padding: 0 15px;
+	width: 100%;
+	border-radius: 4px;
+	.notice-bar-warp {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: inherit;
+		.notice-bar-warp-text-box {
+			flex: 1;
+			height: inherit;
+			display: flex;
+			align-items: center;
+			overflow: hidden;
+			position: relative;
+			.notice-bar-warp-text {
+				white-space: nowrap;
+				position: absolute;
+				left: 0;
+			}
+			.notice-bar-warp-slot {
+				width: 100%;
+				white-space: nowrap;
+				:deep(.el-carousel__item) {
+					display: flex;
+					align-items: center;
+				}
+			}
+		}
+		.notice-bar-warp-left-icon {
+			width: 24px;
+			font-size: inherit !important;
+		}
+		.notice-bar-warp-right-icon {
+			width: 24px;
+			text-align: right;
+			font-size: inherit !important;
+			&:hover {
+				cursor: pointer;
+			}
+		}
+	}
+}
+</style>

src/components/svgIcon/index.vue

@@ -0,0 +1,73 @@
+<template>
+	<i v-if="isShowIconSvg" class="el-icon" :style="setIconSvgStyle">
+		<component :is="getIconName" />
+	</i>
+	<div v-else-if="isShowIconImg" :style="setIconImgOutStyle">
+		<img :src="getIconName" :style="setIconSvgInsStyle" />
+	</div>
+	<i v-else :class="getIconName" :style="setIconSvgStyle" />
+</template>
+
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+
+export default defineComponent({
+	name: 'svgIcon',
+	props: {
+		// svg 图标组件名字
+		name: {
+			type: String,
+		},
+		// svg 大小
+		size: {
+			type: Number,
+			default: () => 14,
+		},
+		// svg 颜色
+		color: {
+			type: String,
+		},
+	},
+	setup(props) {
+		// 在线链接、本地引入地址前缀
+		const linesString = ['https', 'http', '/src', '/assets', import.meta.env.VITE_PUBLIC_PATH];
+
+		// 获取 icon 图标名称
+		const getIconName = computed(() => {
+			return props?.name;
+		});
+		// 用于判断 element plus 自带 svg 图标的显示、隐藏
+		const isShowIconSvg = computed(() => {
+			return props?.name?.startsWith('ele-');
+		});
+		// 用于判断在线链接、本地引入等图标显示、隐藏
+		const isShowIconImg = computed(() => {
+			return linesString.find((str) => props.name?.startsWith(str));
+		});
+		// 设置图标样式
+		const setIconSvgStyle = computed(() => {
+			return `font-size: ${props.size}px;color: ${props.color};`;
+		});
+		// 设置图片样式
+		const setIconImgOutStyle = computed(() => {
+			return `width: ${props.size}px;height: ${props.size}px;display: inline-block;overflow: hidden;`;
+		});
+		// 设置图片样式
+		// https://gitee.com/lyt-top/vue-next-admin/issues/I59ND0
+		const setIconSvgInsStyle = computed(() => {
+			const filterStyle: string[] = [];
+			const compatibles: string[] = ['-webkit', '-ms', '-o', '-moz'];
+			compatibles.forEach((j) => filterStyle.push(`${j}-filter: drop-shadow(${props.color} 30px 0);`));
+			return `width: ${props.size}px;height: ${props.size}px;position: relative;left: -${props.size}px;${filterStyle.join('')}`;
+		});
+		return {
+			getIconName,
+			isShowIconSvg,
+			isShowIconImg,
+			setIconSvgStyle,
+			setIconImgOutStyle,
+			setIconSvgInsStyle,
+		};
+	},
+});
+</script>

src/i18n/index.js

@@ -1,60 +0,0 @@
-import Vue from 'vue';
-import VueI18n from 'vue-i18n';
-import zhcnLocale from 'element-ui/lib/locale/lang/zh-CN';
-import enLocale from 'element-ui/lib/locale/lang/en';
-import zhtwLocale from 'element-ui/lib/locale/lang/zh-TW';
-import store from '@/store/index.js';
-
-import nextZhcn from '@/i18n/lang/zh-cn.js';
-import nextEn from '@/i18n/lang/en.js';
-import nextZhtw from '@/i18n/lang/zh-tw.js';
-
-import pagesHomeZhcn from '@/i18n/pages/home/zh-cn.js';
-import pagesHomeEn from '@/i18n/pages/home/en.js';
-import pagesHomeZhtw from '@/i18n/pages/home/zh-tw.js';
-import pagesLoginZhcn from '@/i18n/pages/login/zh-cn.js';
-import pagesLoginEn from '@/i18n/pages/login/en.js';
-import pagesLoginZhtw from '@/i18n/pages/login/zh-tw.js';
-
-// 使用插件
-Vue.use(VueI18n);
-
-// 定义语言国际化内容
-/**
- * 说明：
- * /src/i18n/lang 下的 js 为框架的国际化内容
- * /src/i18n/pages 下的 js 为各界面的国际化内容
- */
-const messages = {
-	'zh-cn': {
-		...zhcnLocale,
-		message: {
-			...nextZhcn,
-			...pagesHomeZhcn,
-			...pagesLoginZhcn,
-		},
-	},
-	en: {
-		...enLocale,
-		message: {
-			...nextEn,
-			...pagesHomeEn,
-			...pagesLoginEn,
-		},
-	},
-	'zh-tw': {
-		...zhtwLocale,
-		message: {
-			...nextZhtw,
-			...pagesHomeZhtw,
-			...pagesLoginZhtw,
-		},
-	},
-};
-
-// 导出语言国际化
-export const i18n = new VueI18n({
-	locale: store.state.themeConfig.themeConfig.globalI18n,
-	fallbackLocale: 'zh-cn',
-	messages,
-});

src/i18n/index.ts

@@ -0,0 +1,67 @@
+import { createI18n } from 'vue-i18n';
+import pinia from '/@/stores/index';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import zhcnLocale from 'element-plus/lib/locale/lang/zh-cn';
+import enLocale from 'element-plus/lib/locale/lang/en';
+import zhtwLocale from 'element-plus/lib/locale/lang/zh-tw';
+
+import nextZhcn from '/@/i18n/lang/zh-cn';
+import nextEn from '/@/i18n/lang/en';
+import nextZhtw from '/@/i18n/lang/zh-tw';
+
+import pagesLoginZhcn from '/@/i18n/pages/login/zh-cn';
+import pagesLoginEn from '/@/i18n/pages/login/en';
+import pagesLoginZhtw from '/@/i18n/pages/login/zh-tw';
+import pagesFormI18nZhcn from '/@/i18n/pages/formI18n/zh-cn';
+import pagesFormI18nEn from '/@/i18n/pages/formI18n/en';
+import pagesFormI18nZhtw from '/@/i18n/pages/formI18n/zh-tw';
+
+// 定义语言国际化内容
+/**
+ * 说明：
+ * /src/i18n/lang 下的 ts 为框架的国际化内容
+ * /src/i18n/pages 下的 ts 为各界面的国际化内容
+ */
+const messages = {
+	[zhcnLocale.name]: {
+		...zhcnLocale,
+		message: {
+			...nextZhcn,
+			...pagesLoginZhcn,
+			...pagesFormI18nZhcn,
+		},
+	},
+	[enLocale.name]: {
+		...enLocale,
+		message: {
+			...nextEn,
+			...pagesLoginEn,
+			...pagesFormI18nEn,
+		},
+	},
+	[zhtwLocale.name]: {
+		...zhtwLocale,
+		message: {
+			...nextZhtw,
+			...pagesLoginZhtw,
+			...pagesFormI18nZhtw,
+		},
+	},
+};
+
+// 读取 pinia 默认语言
+const stores = useThemeConfig(pinia);
+const { themeConfig } = storeToRefs(stores);
+
+// 导出语言国际化
+// https://vue-i18n.intlify.dev/guide/essentials/fallback.html#explicit-fallback-with-one-locale
+export const i18n = createI18n({
+	silentTranslationWarn: true,
+	missingWarn: false,
+	silentFallbackWarn: true,
+	fallbackWarn: false,
+	locale: themeConfig.value.globalI18n,
+	fallbackLocale: zhcnLocale.name,
+	messages,
+});

src/i18n/lang/en.ts

@@ -4,7 +4,10 @@ export default {
 		home: 'home',
 		system: 'system',
 		systemMenu: 'systemMenu',
+		systemRole: 'systemRole',
 		systemUser: 'systemUser',
+		systemDept: 'systemDept',
+		systemDic: 'systemDic',
 		limits: 'limits',
 		limitsFrontEnd: 'FrontEnd',
 		limitsFrontEndPage: 'FrontEndPage',
@@ -21,18 +24,16 @@ export default {
 		menu2: 'menu2',
 		funIndex: 'function',
 		funTagsView: 'funTagsView',
-		funSignCanvas: 'Online signature',
 		funCountup: 'countup',
-		funEchartsTree: 'echartsTree',
-		funSelector: 'funSelector',
 		funWangEditor: 'wangEditor',
 		funCropper: 'cropper',
-		funMindMap: 'G6 MindMap',
 		funQrcode: 'qrcode',
 		funEchartsMap: 'EchartsMap',
 		funPrintJs: 'PrintJs',
 		funClipboard: 'Copy cut',
-		funScreenShort: 'screenCapture',
+		funGridLayout: 'Drag layout',
+		funSplitpanes: 'Pane splitter',
+		funDragVerify: 'Validator',
 		pagesIndex: 'pages',
 		pagesFiltering: 'Filtering',
 		pagesFilteringDetails: 'FilteringDetails',
@@ -40,12 +41,33 @@ export default {
 		pagesIocnfont: 'iconfont icon',
 		pagesElement: 'element icon',
 		pagesAwesome: 'awesome icon',
-		pagesCityLinkage: 'CityLinkage',
 		pagesFormAdapt: 'FormAdapt',
+		pagesTableRules: 'pagesTableRules',
+		pagesFormI18n: 'FormI18n',
+		pagesFormRules: 'Multi form validation',
+		pagesDynamicForm: 'Dynamic complex form',
+		pagesWorkflow: 'Workflow',
 		pagesListAdapt: 'ListAdapt',
 		pagesWaterfall: 'Waterfall',
 		pagesSteps: 'Steps',
+		pagesPreview: 'Large preview',
+		pagesWaves: 'Wave effect',
+		pagesTree: 'tree alter table',
+		pagesDrag: 'Drag command',
+		pagesLazyImg: 'Image lazy loading',
+		makeIndex: 'makeIndex',
+		makeSelector: 'Icon selector',
+		makeNoticeBar: 'notification bar',
+		makeSvgDemo: 'Svgicon demo',
+		paramsIndex: 'Routing parameters',
+		paramsCommon: 'General routing',
+		paramsDynamic: 'Dynamic routing',
+		paramsCommonDetails: 'General routing details',
+		paramsDynamicDetails: 'Dynamic routing details',
 		chartIndex: 'chartIndex',
+		visualizingIndex: 'visualizingIndex',
+		visualizingLinkDemo1: 'visualizingLinkDemo1',
+		visualizingLinkDemo2: 'visualizingLinkDemo2',
 		personal: 'personal',
 		tools: 'tools',
 		layoutLinkView: 'LinkView',
@@ -64,10 +86,9 @@ export default {
 		title4: 'news',
 		title5: 'Full screen on',
 		title6: 'Full screen off',
+		dropdownLarge: 'large',
 		dropdownDefault: 'default',
-		dropdownMedium: 'medium',
 		dropdownSmall: 'small',
-		dropdownMini: 'mini',
 		dropdown1: 'home page',
 		dropdown2: 'Personal Center',
 		dropdown3: '404',
@@ -84,7 +105,6 @@ export default {
 		logOutConfirm: 'determine',
 		logOutCancel: 'cancel',
 		logOutExit: 'Exiting',
-		logOutSuccess: 'Exit successfully!',
 	},
 	tagsView: {
 		refresh: 'refresh',
@@ -92,6 +112,7 @@ export default {
 		closeOther: 'closeOther',
 		closeAll: 'closeAll',
 		fullscreen: 'fullscreen',
+		closeFullscreen: 'closeFullscreen',
 	},
 	notFound: {
 		foundTitle: 'Wrong address input, please re-enter the address~',
@@ -106,16 +127,18 @@ export default {
 	layout: {
 		configTitle: 'Layout configuration',
 		oneTitle: 'Global Themes',
-		twoTitle: 'Menu / top bar',
+		twoTopTitle: 'top bar set up',
+		twoMenuTitle: 'Menu set up',
+		twoColumnsTitle: 'Columns set up',
 		twoTopBar: 'Top bar background',
-		twoMenuBar: 'Menu background',
-		twoColumnsMenuBar: 'Column menu background',
 		twoTopBarColor: 'Top bar default font color',
-		twoMenuBarColor: 'Menu default font color',
-		twoColumnsMenuBarColor: 'Default font color bar menu',
 		twoIsTopBarColorGradual: 'Top bar gradient',
+		twoMenuBar: 'Menu background',
+		twoMenuBarColor: 'Menu default font color',
 		twoIsMenuBarColorGradual: 'Menu gradient',
-		twoIsMenuBarColorHighlight: 'Menu font highlight',
+		twoColumnsMenuBar: 'Column menu background',
+		twoColumnsMenuBarColor: 'Default font color bar menu',
+		twoIsColumnsMenuBarColorGradual: 'Column gradient',
 		threeTitle: 'Interface settings',
 		threeIsCollapse: 'Menu horizontal collapse',
 		threeIsUniqueOpened: 'Menu accordion',
@@ -131,6 +154,7 @@ export default {
 		fourIsTagsviewIcon: 'Open tagsview Icon',
 		fourIsCacheTagsView: 'Enable tagsview cache',
 		fourIsSortableTagsView: 'Enable tagsview drag',
+		fourIsShareTagsView: 'Enable tagsview sharing',
 		fourIsFooter: 'Open footer',
 		fourIsGrayscale: 'Grey model',
 		fourIsInvert: 'Color weak mode',
@@ -147,18 +171,10 @@ export default {
 		sixClassic: 'Two',
 		sixTransverse: 'Three',
 		sixColumns: 'Four',
-		tipText: 'Click the button below to copy the layout configuration to `/src/store/modules/themeConfig.js` It has been modified in.',
+		tipText: 'Click the button below to copy the layout configuration to `/src/stores/themeConfig.ts` It has been modified in.',
 		copyText: 'replication configuration',
 		resetText: 'restore default',
 		copyTextSuccess: 'Copy succeeded!',
 		copyTextError: 'Copy failed!',
 	},
-	upgrade: {
-		title: 'New version',
-		msg: 'The new version is available, please update it now! Dont worry, the update is fast!',
-		desc: 'Prompt: Update will restore the default configuration',
-		btnOne: 'Cruel refusal',
-		btnTwo: 'Update now',
-		btnTwoLoading: 'Updating',
-	},
 };

src/i18n/lang/zh-cn.ts

@@ -4,7 +4,10 @@ export default {
 		home: '首页',
 		system: '系统设置',
 		systemMenu: '菜单管理',
+		systemRole: '角色管理',
 		systemUser: '用户管理',
+		systemDept: '部门管理',
+		systemDic: '字典管理',
 		limits: '权限管理',
 		limitsFrontEnd: '前端控制',
 		limitsFrontEndPage: '页面权限',
@@ -21,31 +24,50 @@ export default {
 		menu2: '菜单2',
 		funIndex: '功能',
 		funTagsView: 'tagsView 操作',
-		funSignCanvas: '在线签名',
-		funCountup: 'countup 数字滚动',
-		funEchartsTree: 'echartsTree 树图',
-		funSelector: '图标选择器',
-		funWangEditor: 'wangEditor 编辑器',
-		funCropper: 'cropper 图片裁剪',
-		funMindMap: 'G6 思维导图',
-		funQrcode: 'qrcode 二维码生成',
+		funCountup: '数字滚动',
+		funWangEditor: 'Editor 编辑器',
+		funCropper: '图片裁剪',
+		funQrcode: '二维码生成',
 		funEchartsMap: '地理坐标/地图',
 		funPrintJs: '页面打印',
 		funClipboard: '复制剪切',
-		funScreenShort: 'web端自定义截屏',
+		funGridLayout: '拖拽布局',
+		funSplitpanes: '窗格拆分器',
+		funDragVerify: '验证器',
 		pagesIndex: '页面',
 		pagesFiltering: '过滤筛选组件',
 		pagesFilteringDetails: '过滤筛选组件详情',
 		pagesFilteringDetails1: '过滤筛选组件详情111',
-		pagesIocnfont: 'iconfont 字体图标',
-		pagesElement: 'element 字体图标',
-		pagesAwesome: 'awesome 字体图标',
-		pagesCityLinkage: '城市多级联动',
+		pagesIocnfont: 'ali 字体图标',
+		pagesElement: 'ele 字体图标',
+		pagesAwesome: 'awe 字体图标',
 		pagesFormAdapt: '表单自适应',
+		pagesTableRules: '表单表格验证',
+		pagesFormI18n: '表单国际化',
+		pagesFormRules: '多表单验证',
+		pagesDynamicForm: '动态复杂表单',
+		pagesWorkflow: '工作流',
 		pagesListAdapt: '列表自适应',
 		pagesWaterfall: '瀑布屏',
 		pagesSteps: '步骤条',
+		pagesPreview: '大图预览',
+		pagesWaves: '波浪效果',
+		pagesTree: '树形改表格',
+		pagesDrag: '拖动指令',
+		pagesLazyImg: '图片懒加载',
+		makeIndex: '组件封装',
+		makeSelector: '图标选择器',
+		makeNoticeBar: '滚动通知栏',
+		makeSvgDemo: 'svgIcon 演示',
+		paramsIndex: '路由参数',
+		paramsCommon: '普通路由',
+		paramsDynamic: '动态路由',
+		paramsCommonDetails: '普通路由详情',
+		paramsDynamicDetails: '动态路由详情',
 		chartIndex: '大数据图表',
+		visualizingIndex: '数据可视化',
+		visualizingLinkDemo1: '数据可视化演示1',
+		visualizingLinkDemo2: '数据可视化演示2',
 		personal: '个人中心',
 		tools: '工具类集合',
 		layoutLinkView: '外链',
@@ -64,10 +86,9 @@ export default {
 		title4: '消息',
 		title5: '开全屏',
 		title6: '关全屏',
+		dropdownLarge: '大型',
 		dropdownDefault: '默认',
-		dropdownMedium: '中等',
 		dropdownSmall: '小型',
-		dropdownMini: '超小',
 		dropdown1: '首页',
 		dropdown2: '个人中心',
 		dropdown3: '404',
@@ -84,7 +105,6 @@ export default {
 		logOutConfirm: '确定',
 		logOutCancel: '取消',
 		logOutExit: '退出中',
-		logOutSuccess: '安全退出成功！',
 	},
 	tagsView: {
 		refresh: '刷新',
@@ -92,6 +112,7 @@ export default {
 		closeOther: '关闭其它',
 		closeAll: '全部关闭',
 		fullscreen: '当前页全屏',
+		closeFullscreen: '关闭全屏',
 	},
 	notFound: {
 		foundTitle: '地址输入错误，请重新输入地址~',
@@ -106,16 +127,18 @@ export default {
 	layout: {
 		configTitle: '布局配置',
 		oneTitle: '全局主题',
-		twoTitle: '菜单 / 顶栏',
+		twoTopTitle: '顶栏设置',
+		twoMenuTitle: '菜单设置',
+		twoColumnsTitle: '分栏设置',
 		twoTopBar: '顶栏背景',
-		twoMenuBar: '菜单背景',
-		twoColumnsMenuBar: '分栏菜单背景',
 		twoTopBarColor: '顶栏默认字体颜色',
-		twoMenuBarColor: '菜单默认字体颜色',
-		twoColumnsMenuBarColor: '分栏菜单默认字体颜色',
 		twoIsTopBarColorGradual: '顶栏背景渐变',
+		twoMenuBar: '菜单背景',
+		twoMenuBarColor: '菜单默认字体颜色',
 		twoIsMenuBarColorGradual: '菜单背景渐变',
-		twoIsMenuBarColorHighlight: '菜单字体背景高亮',
+		twoColumnsMenuBar: '分栏菜单背景',
+		twoColumnsMenuBarColor: '分栏菜单默认字体颜色',
+		twoIsColumnsMenuBarColorGradual: '分栏菜单背景渐变',
 		threeTitle: '界面设置',
 		threeIsCollapse: '菜单水平折叠',
 		threeIsUniqueOpened: '菜单手风琴',
@@ -131,6 +154,7 @@ export default {
 		fourIsTagsviewIcon: '开启 Tagsview 图标',
 		fourIsCacheTagsView: '开启 TagsView 缓存',
 		fourIsSortableTagsView: '开启 TagsView 拖拽',
+		fourIsShareTagsView: '开启 TagsView 共用',
 		fourIsFooter: '开启 Footer',
 		fourIsGrayscale: '灰色模式',
 		fourIsInvert: '色弱模式',
@@ -147,18 +171,10 @@ export default {
 		sixClassic: '经典',
 		sixTransverse: '横向',
 		sixColumns: '分栏',
-		tipText: '点击下方按钮，复制布局配置去 `src/store/modules/themeConfig.js` 中修改。',
+		tipText: '点击下方按钮，复制布局配置去 `src/stores/themeConfig.ts` 中修改。',
 		copyText: '一键复制配置',
 		resetText: '一键恢复默认',
 		copyTextSuccess: '复制成功！',
 		copyTextError: '复制失败！',
 	},
-	upgrade: {
-		title: '新版本升级',
-		msg: '新版本来啦，马上更新尝鲜吧！不用担心，更新很快的哦！',
-		desc: '提示：更新会还原默认配置',
-		btnOne: '残忍拒绝',
-		btnTwo: '马上更新',
-		btnTwoLoading: '更新中',
-	},
 };

src/i18n/lang/zh-tw.ts

@@ -4,7 +4,10 @@ export default {
 		home: '首頁',
 		system: '系統設置',
 		systemMenu: '選單管理',
+		systemRole: '角色管理',
 		systemUser: '用戶管理',
+		systemDept: '部門管理',
+		systemDic: '字典管理',
 		limits: '許可權管理',
 		limitsFrontEnd: '前端控制',
 		limitsFrontEndPage: '頁面許可權',
@@ -21,31 +24,50 @@ export default {
 		menu2: '選單2',
 		funIndex: '功能',
 		funTagsView: 'tagsView 操作',
-		funSignCanvas: '線上簽名',
-		funCountup: 'countup 數位滾動',
-		funEchartsTree: 'echartsTree 樹圖',
-		funSelector: '圖標選擇器',
-		funWangEditor: 'wangEditor 編輯器',
-		funCropper: 'cropper 圖片裁剪',
-		funMindMap: 'G6 心智圖',
-		funQrcode: 'qrcode 二維碼生成',
+		funCountup: '數位滾動',
+		funWangEditor: 'Editor 編輯器',
+		funCropper: '圖片裁剪',
+		funQrcode: '二維碼生成',
 		funEchartsMap: '地理座標/地圖',
 		funPrintJs: '頁面列印',
 		funClipboard: '複製剪切',
-		funScreenShort: '自定義截圖',
+		funGridLayout: '拖拽佈局',
+		funSplitpanes: '窗格折開器',
+		funDragVerify: '驗證器',
 		pagesIndex: '頁面',
 		pagesFiltering: '過濾篩選組件',
 		pagesFilteringDetails: '過濾篩選組件詳情',
 		pagesFilteringDetails1: '過濾篩選組件詳情111',
-		pagesIocnfont: 'iconfont 字體圖標',
-		pagesElement: 'element 字體圖標',
-		pagesAwesome: 'awesome 字體圖標',
-		pagesCityLinkage: '都市多級聯動',
+		pagesIocnfont: 'ali 字體圖標',
+		pagesElement: 'ele 字體圖標',
+		pagesAwesome: 'awe 字體圖標',
 		pagesFormAdapt: '表單自我調整',
+		pagesTableRules: '表單表格驗證',
+		pagesFormI18n: '表單國際化',
+		pagesFormRules: '多表單驗證',
+		pagesDynamicForm: '動態複雜表單',
+		pagesWorkflow: '工作流',
 		pagesListAdapt: '清單自我調整',
 		pagesWaterfall: '瀑布屏',
 		pagesSteps: '步驟條',
+		pagesPreview: '大圖預覽',
+		pagesWaves: '波浪效果',
+		pagesTree: '樹形改表格',
+		pagesDrag: '拖動指令',
+		pagesLazyImg: '圖片懶加載',
+		makeIndex: '組件封裝',
+		makeSelector: '圖標選擇器',
+		makeNoticeBar: '滾動通知欄',
+		makeSvgDemo: 'svgIcon 演示',
+		paramsIndex: '路由參數',
+		paramsCommon: '普通路由',
+		paramsDynamic: '動態路由',
+		paramsCommonDetails: '普通路由詳情',
+		paramsDynamicDetails: '動態路由詳情',
 		chartIndex: '大資料圖表',
+		visualizingIndex: '數據視覺化',
+		visualizingLinkDemo1: '數據視覺化演示1',
+		visualizingLinkDemo2: '數據視覺化演示2',
 		personal: '個人中心',
 		tools: '工具類集合',
 		layoutLinkView: '外鏈',
@@ -64,10 +86,9 @@ export default {
 		title4: '消息',
 		title5: '開全屏',
 		title6: '關全屏',
+		dropdownLarge: '大型',
 		dropdownDefault: '默認',
-		dropdownMedium: '中等',
 		dropdownSmall: '小型',
-		dropdownMini: '超小',
 		dropdown1: '首頁',
 		dropdown2: '個人中心',
 		dropdown3: '404',
@@ -84,7 +105,6 @@ export default {
 		logOutConfirm: '確定',
 		logOutCancel: '取消',
 		logOutExit: '退出中',
-		logOutSuccess: '安全退出成功！',
 	},
 	tagsView: {
 		refresh: '重繪',
@@ -92,6 +112,7 @@ export default {
 		closeOther: '關閉其它',
 		closeAll: '全部關閉',
 		fullscreen: '當前頁全屏',
+		closeFullscreen: '關閉全屏',
 	},
 	notFound: {
 		foundTitle: '地址輸入錯誤，請重新輸入地址~',
@@ -106,16 +127,18 @@ export default {
 	layout: {
 		configTitle: '佈局配寘',
 		oneTitle: '全域主題',
-		twoTitle: '選單 / 頂欄',
+		twoTopTitle: '頂欄設定',
+		twoMenuTitle: '選單設定',
+		twoColumnsTitle: '分欄設定',
 		twoTopBar: '頂欄背景',
-		twoMenuBar: '選單背景',
-		twoColumnsMenuBar: '分欄選單背景',
 		twoTopBarColor: '頂欄默認字體顏色',
-		twoMenuBarColor: '選單默認字體顏色',
-		twoColumnsMenuBarColor: '分欄選單默認字體顏色',
 		twoIsTopBarColorGradual: '頂欄背景漸變',
+		twoMenuBar: '選單背景',
+		twoMenuBarColor: '選單默認字體顏色',
 		twoIsMenuBarColorGradual: '選單背景漸變',
-		twoIsMenuBarColorHighlight: '選單字體背景高亮',
+		twoColumnsMenuBar: '分欄選單背景',
+		twoColumnsMenuBarColor: '分欄選單默認字體顏色',
+		twoIsColumnsMenuBarColorGradual: '分欄選單背景漸變',
 		threeTitle: '介面設定',
 		threeIsCollapse: '選單水准折疊',
 		threeIsUniqueOpened: '選單手風琴',
@@ -131,6 +154,7 @@ export default {
 		fourIsTagsviewIcon: '開啟 Tagsview 圖標',
 		fourIsCacheTagsView: '開啟 TagsView 緩存',
 		fourIsSortableTagsView: '開啟 TagsView 拖拽',
+		fourIsShareTagsView: '開啟 TagsView 共用',
 		fourIsFooter: '開啟 Footer',
 		fourIsGrayscale: '灰色模式',
 		fourIsInvert: '色弱模式',
@@ -147,18 +171,10 @@ export default {
 		sixClassic: '經典',
 		sixTransverse: '橫向',
 		sixColumns: '分欄',
-		tipText: '點擊下方按鈕，複製佈局配寘去`src/store/modules/themeConfig.js`中修改。',
+		tipText: '點擊下方按鈕，複製佈局配寘去`src/stores/themeConfig.ts`中修改。',
 		copyText: '一鍵複製配寘',
 		resetText: '一鍵恢復默認',
 		copyTextSuccess: '複製成功！',
 		copyTextError: '複製失敗！',
 	},
-	upgrade: {
-		title: '新版本陞級',
-		msg: '新版本來啦，馬上更新嘗鮮吧！ 不用擔心，更新很快的哦！',
-		desc: '提示：更新會還原默認配寘',
-		btnOne: '殘忍拒絕',
-		btnTwo: '馬上更新',
-		btnTwoLoading: '更新中',
-	},
 };

src/i18n/pages/formI18n/en.ts

@@ -0,0 +1,13 @@
+// 定义内容
+export default {
+	formI18nLabel: {
+		name: 'name',
+		email: 'email',
+		autograph: 'autograph',
+	},
+	formI18nPlaceholder: {
+		name: 'Please enter your name',
+		email: 'Please enter the users Department',
+		autograph: 'Please enter the login account name',
+	},
+};

src/i18n/pages/formI18n/zh-cn.ts

@@ -0,0 +1,13 @@
+// 定义内容
+export default {
+	formI18nLabel: {
+		name: '姓名',
+		email: '用户归属部门',
+		autograph: '登陆账户名',
+	},
+	formI18nPlaceholder: {
+		name: '请输入姓名',
+		email: '请输入用户归属部门',
+		autograph: '请输入登陆账户名',
+	},
+};

src/i18n/pages/formI18n/zh-tw.ts

@@ -0,0 +1,13 @@
+// 定义内容
+export default {
+	formI18nLabel: {
+		name: '姓名',
+		email: '用戶歸屬部門',
+		autograph: '登入帳戶名',
+	},
+	formI18nPlaceholder: {
+		name: '請輸入姓名',
+		email: '請輸入用戶歸屬部門',
+		autograph: '請輸入登入帳戶名',
+	},
+};

src/i18n/pages/home/en.js

@@ -1,14 +0,0 @@
-// 定义内容
-export default {
-	card: {
-		title1: 'My desk',
-		title2: 'Message notification',
-		title3: 'more',
-		title4: 'Marketing recommendation',
-		title5: 'more',
-		title6: 'Inventory operations',
-		title7: 'Performance',
-		title8: 'Out of stock monitoring',
-		title9: 'Performance overtime warning',
-	},
-};

src/i18n/pages/home/zh-cn.js

@@ -1,14 +0,0 @@
-// 定义内容
-export default {
-	card: {
-		title1: '我的工作台',
-		title2: '消息通知',
-		title3: '更多',
-		title4: '营销推荐',
-		title5: '更多',
-		title6: '库存作业',
-		title7: '履约情况',
-		title8: '缺货监控',
-		title9: '履约超时预警',
-	},
-};

src/i18n/pages/home/zh-tw.js

@@ -1,14 +0,0 @@
-// 定义内容
-export default {
-	card: {
-		title1: '我的工作臺',
-		title2: '消息通知',
-		title3: '更多',
-		title4: '行銷推薦',
-		title5: '更多',
-		title6: '庫存工作',
-		title7: '履約情况',
-		title8: '缺貨監控',
-		title9: '履約超時預警',
-	},
-};

src/i18n/pages/login/en.js

@@ -1,18 +0,0 @@
-// 定义内容
-export default {
-	login: {
-		placeholder1: 'The user name admin or not is test',
-		placeholder2: 'Password: 123456',
-		placeholder3: 'Please enter the verification code',
-		btnText: 'Sign in',
-		link: {
-			one1: 'Third party login',
-			one2: 'Links',
-		},
-		signInText: 'welcome back!',
-		copyright: {
-			one5: 'Copyright: Shenzhen XXX Software Technology Co., Ltd',
-			two6: 'Copyright: Shenzhen XXX software technology Guangdong ICP preparation no.05010000',
-		},
-	},
-};

src/i18n/pages/login/en.ts

@@ -0,0 +1,29 @@
+// 定义内容
+export default {
+	label: {
+		one1: 'User name login',
+		two2: 'Mobile number',
+	},
+	link: {
+		one3: 'Third party login',
+		two4: 'Links',
+	},
+	account: {
+		accountPlaceholder1: 'The user name admin or not is common',
+		accountPlaceholder2: 'Password: 123456',
+		accountPlaceholder3: 'Please enter the verification code',
+		accountBtnText: 'Sign in',
+	},
+	mobile: {
+		placeholder1: 'Please input mobile phone number',
+		placeholder2: 'Please enter the verification code',
+		codeText: 'Get code',
+		btnText: 'Sign in',
+		msgText:
+			'Warm tip: it is recommended to use Google, Microsoft edge, version 79.0.1072.62 and above browsers, and 360 browser, please use speed mode',
+	},
+	scan: {
+		text: 'Open the mobile phone to scan and quickly log in / register',
+	},
+	signInText: 'welcome back!',
+};

src/i18n/pages/login/zh-cn.js

@@ -1,18 +0,0 @@
-// 定义内容
-export default {
-	login: {
-		placeholder1: '用户名 admin 或不输均为 test',
-		placeholder2: '密码：123456',
-		placeholder3: '请输入验证码',
-		btnText: '登 录',
-		link: {
-			one1: '第三方登录',
-			one2: '友情链接',
-		},
-		signInText: '欢迎回来！',
-		copyright: {
-			one5: '版权所有：深圳市xxx软件科技有限公司',
-			two6: 'Copyright: Shenzhen XXX Software Technology 粤ICP备05010000号',
-		},
-	},
-};

src/i18n/pages/login/zh-cn.ts

@@ -0,0 +1,28 @@
+// 定义内容
+export default {
+	label: {
+		one1: '用户名登录',
+		two2: '手机号登录',
+	},
+	link: {
+		one3: '第三方登录',
+		two4: '友情链接',
+	},
+	account: {
+		accountPlaceholder1: '用户名 admin 或不输均为 common',
+		accountPlaceholder2: '密码：123456',
+		accountPlaceholder3: '请输入验证码',
+		accountBtnText: '登 录',
+	},
+	mobile: {
+		placeholder1: '请输入手机号',
+		placeholder2: '请输入验证码',
+		codeText: '获取验证码',
+		btnText: '登 录',
+		msgText: '* 温馨提示：建议使用谷歌、Microsoft Edge，版本 79.0.1072.62 及以上浏览器，360浏览器请使用极速模式',
+	},
+	scan: {
+		text: '打开手机扫一扫，快速登录/注册',
+	},
+	signInText: '欢迎回来！',
+};

src/i18n/pages/login/zh-tw.js

@@ -1,18 +0,0 @@
-// 定义内容
-export default {
-	login: {
-		placeholder1: '用戶名admin或不輸均為test',
-		placeholder2: '密碼：123456',
-		placeholder3: '請輸入驗證碼',
-		btnText: '登 录',
-		link: {
-			one1: '協力廠商登入',
-			one2: '友情連結',
-		},
-		signInText: '歡迎回來！',
-		copyright: {
-			one5: '版權所有：深圳市xxx軟件科技有限公司',
-			two6: 'Copyright: Shenzhen XXX Software Technology 粵ICP備05010000號',
-		},
-	},
-};

src/i18n/pages/login/zh-tw.ts

@@ -0,0 +1,28 @@
+// 定义内容
+export default {
+	label: {
+		one1: '用戶名登入',
+		two2: '手機號登入',
+	},
+	link: {
+		one3: '協力廠商登入',
+		two4: '友情連結',
+	},
+	account: {
+		accountPlaceholder1: '用戶名admin或不輸均為common',
+		accountPlaceholder2: '密碼：123456',
+		accountPlaceholder3: '請輸入驗證碼',
+		accountBtnText: '登入',
+	},
+	mobile: {
+		placeholder1: '請輸入手機號',
+		placeholder2: '請輸入驗證碼',
+		codeText: '獲取驗證碼',
+		btnText: '登入',
+		msgText: '* 溫馨提示：建議使用穀歌、Microsoft Edge，版本79.0.1072.62及以上瀏覽器，360瀏覽器請使用極速模式',
+	},
+	scan: {
+		text: '打開手機掃一掃，快速登錄/注册',
+	},
+	signInText: '歡迎回來！',
+};

src/layout/component/aside.vue

@@ -1,106 +1,163 @@
 <template>
-	<el-aside class="layout-aside" :class="setCollapseWidth" v-if="clientWidth > 1000">
-		<Logo v-if="setShowLogo" />
-		<el-scrollbar class="flex-auto" ref="layoutAsideRef">
-			<Vertical :menuList="menuList" :class="setCollapseWidth" />
-		</el-scrollbar>
-	</el-aside>
-	<el-drawer :visible.sync="getThemeConfig.isCollapse" :with-header="false" direction="ltr" size="220px" v-else>
-		<el-aside class="layout-aside w100 h100">
+	<div class="h100" v-show="!isTagsViewCurrenFull">
+		<el-aside class="layout-aside" :class="setCollapseStyle">
 			<Logo v-if="setShowLogo" />
-			<el-scrollbar class="flex-auto" ref="layoutAsideRef">
+			<el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef" @mouseenter="onAsideEnterLeave(true)" @mouseleave="onAsideEnterLeave(false)">
 				<Vertical :menuList="menuList" />
 			</el-scrollbar>
 		</el-aside>
-	</el-drawer>
+	</div>
 </template>
 
-<script>
-import Vertical from '@/layout/navMenu/vertical.vue';
-import Logo from '@/layout/logo/index.vue';
-export default {
-	name: 'layoutAside',
-	components: { Vertical, Logo },
-	data() {
-		return {
-			menuList: [],
-			clientWidth: '',
-		};
-	},
-	computed: {
-		// 设置左侧菜单的具体宽度
-		setCollapseWidth() {
-			let { layout, isCollapse } = this.$store.state.themeConfig.themeConfig;
-			let asideBrColor = '';
-			layout === 'classic' || layout === 'columns' ? (asideBrColor = 'layout-el-aside-br-color') : '';
+<script lang="ts">
+import { toRefs, reactive, computed, watch, getCurrentInstance, onBeforeMount, defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import pinia from '/@/stores/index';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import Logo from '/@/layout/logo/index.vue';
+import Vertical from '/@/layout/navMenu/vertical.vue';
 
-			if (layout === 'columns') {
-				// 分栏布局，菜单收起时宽度给 1px
+export default defineComponent({
+	name: 'layoutAside',
+	components: { Logo, Vertical },
+	setup() {
+		const { proxy } = <any>getCurrentInstance();
+		const stores = useRoutesList();
+		const storesThemeConfig = useThemeConfig();
+		const storesTagsViewRoutes = useTagsViewRoutes();
+		const { routesList } = storeToRefs(stores);
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+		const state = reactive({
+			menuList: [],
+			clientWidth: 0,
+		});
+		// 设置菜单展开/收起时的宽度
+		const setCollapseStyle = computed(() => {
+			const { layout, isCollapse, menuBar } = themeConfig.value;
+			const asideBrTheme = ['#FFFFFF', '#FFF', '#fff', '#ffffff'];
+			const asideBrColor = asideBrTheme.includes(menuBar) ? 'layout-el-aside-br-color' : '';
+			// 判断是否是手机端
+			if (state.clientWidth <= 1000) {
 				if (isCollapse) {
-					return ['layout-aside-width1', asideBrColor];
+					document.body.setAttribute('class', 'el-popup-parent--hidden');
+					const asideEle = document.querySelector('.layout-container') as HTMLElement;
+					const modeDivs = document.createElement('div');
+					modeDivs.setAttribute('class', 'layout-aside-mobile-mode');
+					asideEle.appendChild(modeDivs);
+					modeDivs.addEventListener('click', closeLayoutAsideMobileMode);
+					return [asideBrColor, 'layout-aside-mobile', 'layout-aside-mobile-open'];
 				} else {
-					return ['layout-aside-width-default', asideBrColor];
+					// 关闭弹窗
+					closeLayoutAsideMobileMode();
+					return [asideBrColor, 'layout-aside-mobile', 'layout-aside-mobile-close'];
 				}
 			} else {
-				// 其它布局给 64px
-				if (isCollapse) {
-					return ['layout-aside-width64', asideBrColor];
+				if (layout === 'columns') {
+					// 分栏布局，菜单收起时宽度给 1px
+					if (isCollapse) return [asideBrColor, 'layout-aside-pc-1'];
+					else return [asideBrColor, 'layout-aside-pc-220'];
 				} else {
-					return ['layout-aside-width-default', asideBrColor];
+					// 其它布局给 64px
+					if (isCollapse) return [asideBrColor, 'layout-aside-pc-64'];
+					else return [asideBrColor, 'layout-aside-pc-220'];
 				}
 			}
-		},
-		// 设置 logo 是否显示
-		setShowLogo() {
-			let { layout, isShowLogo } = this.$store.state.themeConfig.themeConfig;
-			return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
-		},
-		// 获取布局配置信息
-		getThemeConfig() {
-			return this.$store.state.themeConfig.themeConfig;
-		},
-	},
-	created() {
-		this.initMenuFixed(document.body.clientWidth);
-		this.setFilterRoutes();
-		this.bus.$on('setSendColumnsChildren', (res) => {
-			this.menuList = res.children;
 		});
-		this.bus.$on('layoutMobileResize', (res) => {
-			this.initMenuFixed(res.clientWidth);
-		});
-		// 菜单滚动条监听
-		this.bus.$on('updateElScrollBar', () => {
+		// 关闭移动端蒙版
+		const closeLayoutAsideMobileMode = () => {
+			const el = document.querySelector('.layout-aside-mobile-mode');
+			el?.setAttribute('style', 'animation: error-img-two 0.3s');
 			setTimeout(() => {
-				this.$refs.layoutAsideRef.update();
+				el?.parentNode?.removeChild(el);
 			}, 300);
+			const clientWidth = document.body.clientWidth;
+			if (clientWidth < 1000) themeConfig.value.isCollapse = false;
+			document.body.setAttribute('class', '');
+		};
+		// 设置显示/隐藏 logo
+		const setShowLogo = computed(() => {
+			let { layout, isShowLogo } = themeConfig.value;
+			return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
 		});
-	},
-	methods: {
 		// 设置/过滤路由（非静态路由/是否显示在菜单中）
-		setFilterRoutes() {
-			if (this.$store.state.themeConfig.themeConfig.layout === 'columns') return false;
-			this.menuList = this.filterRoutesFun(this.$store.state.routesList.routesList);
-		},
-		// 设置/过滤路由 递归函数
-		filterRoutesFun(arr) {
+		const setFilterRoutes = () => {
+			if (themeConfig.value.layout === 'columns') return false;
+			(state.menuList as any) = filterRoutesFun(routesList.value);
+		};
+		// 路由过滤递归函数
+		const filterRoutesFun = (arr: Array<string>) => {
 			return arr
-				.filter((item) => !item.meta.isHide)
-				.map((item) => {
+				.filter((item: any) => !item.meta.isHide)
+				.map((item: any) => {
 					item = Object.assign({}, item);
-					if (item.children) item.children = this.filterRoutesFun(item.children);
+					if (item.children) item.children = filterRoutesFun(item.children);
 					return item;
 				});
-		},
+		};
 		// 设置菜单导航是否固定（移动端）
-		initMenuFixed(clientWidth) {
-			this.clientWidth = clientWidth;
-		},
+		const initMenuFixed = (clientWidth: number) => {
+			state.clientWidth = clientWidth;
+		};
+		// 鼠标移入、移出
+		const onAsideEnterLeave = (bool: Boolean) => {
+			let { layout } = themeConfig.value;
+			if (layout !== 'columns') return false;
+			if (!bool) proxy.mittBus.emit('restoreDefault');
+			stores.setColumnsMenuHover(bool);
+		};
+		// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
+		watch(themeConfig.value, (val) => {
+			if (val.isShowLogoChange !== val.isShowLogo) {
+				if (!proxy.$refs.layoutAsideScrollbarRef) return false;
+				proxy.$refs.layoutAsideScrollbarRef.update();
+			}
+		});
+		// 监听vuex值的变化，动态赋值给菜单中
+		watch(
+			pinia.state,
+			(val) => {
+				let { layout, isClassicSplitMenu } = val.themeConfig.themeConfig;
+				if (layout === 'classic' && isClassicSplitMenu) return false;
+				setFilterRoutes();
+			},
+			{
+				deep: true,
+			}
+		);
+		// 页面加载前
+		onBeforeMount(() => {
+			initMenuFixed(document.body.clientWidth);
+			setFilterRoutes();
+			// 此界面不需要取消监听(proxy.mittBus.off('setSendColumnsChildren))
+			// 因为切换布局时有的监听需要使用，取消了监听，某些操作将不生效
+			proxy.mittBus.on('setSendColumnsChildren', (res: any) => {
+				state.menuList = res.children;
+			});
+			proxy.mittBus.on('setSendClassicChildren', (res: any) => {
+				let { layout, isClassicSplitMenu } = themeConfig.value;
+				if (layout === 'classic' && isClassicSplitMenu) {
+					state.menuList = [];
+					state.menuList = res.children;
+				}
+			});
+			proxy.mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
+				setFilterRoutes();
+			});
+			proxy.mittBus.on('layoutMobileResize', (res: any) => {
+				initMenuFixed(res.clientWidth);
+				closeLayoutAsideMobileMode();
+			});
+		});
+		return {
+			setCollapseStyle,
+			setShowLogo,
+			isTagsViewCurrenFull,
+			onAsideEnterLeave,
+			...toRefs(state),
+		};
 	},
-	// 页面销毁时
-	destroyed() {
-		// 取消菜单滚动条监听
-		this.bus.$off('updateElScrollBar', () => {});
-	},
-};
+});
 </script>

src/layout/component/columnsAside.vue

@@ -1,115 +1,138 @@
 <template>
 	<div class="layout-columns-aside">
 		<el-scrollbar>
-			<ul>
+			<ul @mouseleave="onColumnsAsideMenuMouseleave()">
 				<li
 					v-for="(v, k) in columnsAsideList"
 					:key="k"
-					@click="onColumnsAsideMenuClick(v)"
-					ref="columnsAsideOffsetTopRefs"
-					:class="{ 'layout-columns-active': liIndex === k }"
+					@click="onColumnsAsideMenuClick(v, k)"
+					@mouseenter="onColumnsAsideMenuMouseenter(v, k)"
+					:ref="
+						(el) => {
+							if (el) columnsAsideOffsetTopRefs[k] = el;
+						}
+					"
+					:class="{ 'layout-columns-active': liIndex === k, 'layout-columns-hover': liHoverIndex === k }"
 					:title="$t(v.meta.title)"
 				>
-					<div :class="setColumnsAsidelayout" v-if="!v.meta.isLink || (v.meta.isLink && v.meta.isIframe)">
-						<i :class="v.meta.icon"></i>
-						<div class="font12">
+					<div :class="themeConfig.columnsAsideLayout" v-if="!v.meta.isLink || (v.meta.isLink && v.meta.isIframe)">
+						<SvgIcon :name="v.meta.icon" />
+						<div class="columns-vertical-title font12">
 							{{
 								$t(v.meta.title) && $t(v.meta.title).length >= 4
-									? $t(v.meta.title).substr(0, setColumnsAsidelayout === 'columns-vertical' ? 4 : 3)
+									? $t(v.meta.title).substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
 									: $t(v.meta.title)
 							}}
 						</div>
 					</div>
-					<div :class="setColumnsAsidelayout" v-else>
+					<div :class="themeConfig.columnsAsideLayout" v-else>
 						<a :href="v.meta.isLink" target="_blank">
-							<i :class="v.meta.icon"></i>
-							<div class="font12">
+							<SvgIcon :name="v.meta.icon" />
+							<div class="columns-vertical-title font12">
 								{{
 									$t(v.meta.title) && $t(v.meta.title).length >= 4
-										? $t(v.meta.title).substr(0, setColumnsAsidelayout === 'columns-vertical' ? 4 : 3)
+										? $t(v.meta.title).substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
 										: $t(v.meta.title)
 								}}
 							</div>
 						</a>
 					</div>
 				</li>
-				<div ref="columnsAsideActiveRef" :class="setColumnsAsideStyle"></div>
+				<div ref="columnsAsideActiveRef" :class="themeConfig.columnsAsideStyle"></div>
 			</ul>
 		</el-scrollbar>
 	</div>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import { reactive, toRefs, ref, onMounted, nextTick, getCurrentInstance, watch, onUnmounted, defineComponent } from 'vue';
+import { useRoute, useRouter, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import pinia from '/@/stores/index';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+
+// 定义接口来定义对象的类型
+interface ColumnsAsideState {
+	columnsAsideList: any[];
+	liIndex: number;
+	liOldIndex: null | number;
+	liHoverIndex: null | number;
+	liOldPath: null | string;
+	difference: number;
+	routeSplit: string[];
+}
+
+export default defineComponent({
 	name: 'layoutColumnsAside',
-	data() {
-		return {
+	setup() {
+		const columnsAsideOffsetTopRefs: any = ref([]);
+		const columnsAsideActiveRef = ref();
+		const { proxy } = <any>getCurrentInstance();
+		const stores = useRoutesList();
+		const storesThemeConfig = useThemeConfig();
+		const { routesList, isColumnsMenuHover, isColumnsNavHover } = storeToRefs(stores);
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const route = useRoute();
+		const router = useRouter();
+		const state = reactive<ColumnsAsideState>({
 			columnsAsideList: [],
 			liIndex: 0,
+			liOldIndex: null,
+			liHoverIndex: null,
+			liOldPath: null,
 			difference: 0,
 			routeSplit: [],
-		};
-	},
-	computed: {
-		// 设置分栏高亮风格
-		setColumnsAsideStyle() {
-			return this.$store.state.themeConfig.themeConfig.columnsAsideStyle;
-		},
-		// 设置分栏布局风格
-		setColumnsAsidelayout() {
-			return this.$store.state.themeConfig.themeConfig.columnsAsideLayout;
-		},
-	},
-	mounted() {
-		this.setFilterRoutes();
-	},
-	methods: {
+		});
 		// 设置菜单高亮位置移动
-		setColumnsAsideMove(k) {
-			if (k === undefined) return false;
-			const els = this.$refs.columnsAsideOffsetTopRefs;
-			this.liIndex = k;
-			this.$refs.columnsAsideActiveRef.style.top = `${els[k].offsetTop + this.difference}px`;
-		},
+		const setColumnsAsideMove = (k: number) => {
+			state.liIndex = k;
+			columnsAsideActiveRef.value.style.top = `${columnsAsideOffsetTopRefs.value[k].offsetTop + state.difference}px`;
+		};
 		// 菜单高亮点击事件
-		onColumnsAsideMenuClick(v) {
-			let { path, redirect } = v;
-			if (redirect) this.$router.push(redirect);
-			else this.$router.push(path);
-			// 一个路由设置自动收起菜单
-			// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
-			if (!v.children || v.children.length <= 1) this.$store.state.themeConfig.themeConfig.isCollapse = true;
-			else if (v.children.length > 1) this.$store.state.themeConfig.themeConfig.isCollapse = false;
-		},
+		const onColumnsAsideMenuClick = (v: Object, k: number) => {
+			setColumnsAsideMove(k);
+			let { path, redirect } = v as any;
+			if (redirect) router.push(redirect);
+			else router.push(path);
+		};
+		// 鼠标移入时，显示当前的子级菜单
+		const onColumnsAsideMenuMouseenter = (v: RouteRecordRaw, k: number) => {
+			let { path } = v;
+			state.liOldPath = path;
+			state.liOldIndex = k;
+			state.liHoverIndex = k;
+			proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(path));
+			stores.setColumnsMenuHover(false);
+			stores.setColumnsNavHover(true);
+		};
+		// 鼠标移走时，显示原来的子级菜单
+		const onColumnsAsideMenuMouseleave = async () => {
+			await stores.setColumnsNavHover(false);
+			// 添加延时器，防止拿到的 store.state.routesList 值不是最新的
+			setTimeout(() => {
+				if (!isColumnsMenuHover && !isColumnsNavHover) proxy.mittBus.emit('restoreDefault');
+			}, 100);
+		};
 		// 设置高亮动态位置
-		onColumnsAsideDown(k) {
-			this.$nextTick(() => {
-				this.setColumnsAsideMove(k);
+		const onColumnsAsideDown = (k: number) => {
+			nextTick(() => {
+				setColumnsAsideMove(k);
 			});
-		},
-		// 设置只有一个路由时设置自动收起菜单
-		// https://gitee.com/lyt-top/vue-next-admin/issues/I6UW2I
-		setMenuAutoCollaps(path) {
-			const resData = this.setSendChildren(path);
-			// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
-			resData.children.length <= 1
-				? (this.$store.state.themeConfig.themeConfig.isCollapse = true)
-				: (this.$store.state.themeConfig.themeConfig.isCollapse = false);
-			return resData;
-		},
+		};
 		// 设置/过滤路由（非静态路由/是否显示在菜单中）
-		setFilterRoutes() {
-			if (this.$store.state.routesList.routesList.length <= 0) return false;
-			this.columnsAsideList = this.filterRoutesFun(this.$store.state.routesList.routesList);
-			const resData = this.setMenuAutoCollaps(this.$route.path);
-			this.onColumnsAsideDown(resData.item[0].k);
-			this.bus.$emit('setSendColumnsChildren', resData);
-		},
+		const setFilterRoutes = () => {
+			state.columnsAsideList = filterRoutesFun(routesList.value);
+			const resData: any = setSendChildren(route.path);
+			if (Object.keys(resData).length <= 0) return false;
+			onColumnsAsideDown(resData.item[0].k);
+			proxy.mittBus.emit('setSendColumnsChildren', resData);
+		};
 		// 传送当前子级数据到菜单中
-		setSendChildren(path) {
+		const setSendChildren = (path: string) => {
 			const currentPathSplit = path.split('/');
-			let currentData = {};
-			this.columnsAsideList.map((v, k) => {
+			let currentData: any = {};
+			state.columnsAsideList.map((v: any, k: number) => {
 				if (v.path === `/${currentPathSplit[1]}`) {
 					v['k'] = k;
 					currentData['item'] = [{ ...v }];
@@ -118,62 +141,88 @@ export default {
 				}
 			});
 			return currentData;
-		},
+		};
 		// 路由过滤递归函数
-		filterRoutesFun(arr) {
+		const filterRoutesFun = (arr: Array<string>) => {
 			return arr
-				.filter((item) => !item.meta.isHide)
-				.map((item) => {
+				.filter((item: any) => !item.meta.isHide)
+				.map((item: any) => {
 					item = Object.assign({}, item);
-					if (item.children) item.children = this.filterRoutesFun(item.children);
+					if (item.children) item.children = filterRoutesFun(item.children);
 					return item;
 				});
-		},
+		};
 		// tagsView 点击时，根据路由查找下标 columnsAsideList，实现左侧菜单高亮
-		setColumnsMenuHighlight(path) {
-			this.routeSplit = path.split('/');
-			this.routeSplit.shift();
-			const routeFirst = `/${this.routeSplit[0]}`;
-			const currentSplitRoute = this.columnsAsideList.find((v) => v.path === routeFirst);
+		const setColumnsMenuHighlight = (path: string) => {
+			state.routeSplit = path.split('/');
+			state.routeSplit.shift();
+			const routeFirst = `/${state.routeSplit[0]}`;
+			const currentSplitRoute = state.columnsAsideList.find((v: any) => v.path === routeFirst);
 			if (!currentSplitRoute) return false;
 			// 延迟拿值，防止取不到
 			setTimeout(() => {
-				this.onColumnsAsideDown(currentSplitRoute.k);
+				onColumnsAsideDown((<any>currentSplitRoute).k);
 			}, 0);
-		},
-	},
-	watch: {
-		// 监听 vuex 数据变化
-		'$store.state': {
-			handler(val) {
-				val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (this.difference = 3) : (this.difference = 0);
-				if (val.routesList.routesList.length === this.columnsAsideList.length) return false;
-				this.setFilterRoutes();
+		};
+		// 监听布局配置信息的变化，动态增加菜单高亮位置移动像素
+		watch(
+			pinia.state,
+			(val) => {
+				val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
+				if (!val.routesList.isColumnsMenuHover && !val.routesList.isColumnsNavHover) {
+					state.liHoverIndex = null;
+					proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(route.path));
+				} else {
+					state.liHoverIndex = state.liOldIndex;
+					if (!state.liOldPath) return false;
+					proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(state.liOldPath));
+				}
 			},
-			deep: true,
-		},
-		// 监听路由的变化
-		$route: {
-			handler(to) {
-				const resData = this.setMenuAutoCollaps(to.path);
-				this.setColumnsMenuHighlight(to.path);
-				this.bus.$emit('setSendColumnsChildren', resData);
-			},
-			deep: true,
-		},
+			{
+				deep: true,
+			}
+		);
+		// 页面加载时
+		onMounted(() => {
+			setFilterRoutes();
+			// 销毁变量，防止鼠标再次移入时，保留了上次的记录
+			proxy.mittBus.on('restoreDefault', () => {
+				state.liOldIndex = null;
+				state.liOldPath = null;
+			});
+		});
+		// 页面卸载时
+		onUnmounted(() => {
+			proxy.mittBus.off('restoreDefault', () => {});
+		});
+		// 路由更新时
+		onBeforeRouteUpdate((to) => {
+			setColumnsMenuHighlight(to.path);
+			proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(to.path));
+		});
+		return {
+			themeConfig,
+			columnsAsideOffsetTopRefs,
+			columnsAsideActiveRef,
+			onColumnsAsideDown,
+			onColumnsAsideMenuClick,
+			onColumnsAsideMenuMouseenter,
+			onColumnsAsideMenuMouseleave,
+			...toRefs(state),
+		};
 	},
-};
+});
 </script>
 
 <style scoped lang="scss">
 .layout-columns-aside {
 	width: 70px;
 	height: 100%;
-	background: var(--prev-bg-columnsMenuBar);
+	background: var(--next-bg-columnsMenuBar);
 	ul {
 		position: relative;
 		li {
-			color: var(--prev-bg-columnsMenuBarColor);
+			color: var(--next-bg-columnsMenuBarColor);
 			width: 100%;
 			height: 50px;
 			text-align: center;
@@ -205,21 +254,26 @@ export default {
 			}
 			a {
 				text-decoration: none;
-				color: var(--prev-bg-columnsMenuBarColor);
+				color: var(--next-bg-columnsMenuBarColor);
 			}
 		}
-		.layout-columns-active,
-		.layout-columns-active a {
-			color: var(--prev-color-text-white);
+		.layout-columns-active {
+			color: var(--next-bg-columnsMenuBarColor) !important;
 			transition: 0.3s ease-in-out;
 		}
+		.layout-columns-hover {
+			color: var(--el-color-primary);
+			a {
+				color: var(--el-color-primary);
+			}
+		}
 		.columns-round {
-			background: var(--prev-color-primary);
-			color: var(--prev-color-text-white);
+			background: var(--el-color-primary);
+			color: var(--el-color-white);
 			position: absolute;
 			left: 50%;
 			top: 2px;
-			height: 50px;
+			height: 44px;
 			width: 65px;
 			transform: translateX(-50%);
 			z-index: 0;

src/layout/component/header.vue

@@ -1,24 +1,34 @@
 <template>
-	<el-header class="layout-header" :height="setHeaderHeight">
+	<el-header class="layout-header" :height="setHeaderHeight" v-show="!isTagsViewCurrenFull">
 		<NavBarsIndex />
 	</el-header>
 </template>
 
-<script>
-import NavBarsIndex from '@/layout/navBars/index.vue';
-export default {
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import NavBarsIndex from '/@/layout/navBars/index.vue';
+
+export default defineComponent({
 	name: 'layoutHeader',
 	components: { NavBarsIndex },
-	data() {
-		return {};
-	},
-	computed: {
-		// 设置顶部 header 的具体高度
-		setHeaderHeight() {
-			let { isTagsview, layout } = this.$store.state.themeConfig.themeConfig;
+	setup() {
+		const storesTagsViewRoutes = useTagsViewRoutes();
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+		// 设置 header 的高度
+		const setHeaderHeight = computed(() => {
+			let { isTagsview, layout } = themeConfig.value;
 			if (isTagsview && layout !== 'classic') return '84px';
 			else return '50px';
-		},
+		});
+		return {
+			setHeaderHeight,
+			isTagsViewCurrenFull,
+		};
 	},
-};
+});
 </script>

src/layout/component/main.vue

@@ -1,93 +1,101 @@
 <template>
 	<el-main class="layout-main">
 		<el-scrollbar
-			class="layout-scrollbar"
 			ref="layoutScrollbarRef"
-			v-show="!currentRouteMeta.isLink && !currentRouteMeta.isIframe"
-			:style="{ minHeight: `calc(100vh - ${headerHeight}` }"
+			:class="{
+				'layout-scrollbar':
+					(!isClassicOrTransverse && !currentRouteMeta.isLink && !currentRouteMeta.isIframe) ||
+					(!isClassicOrTransverse && currentRouteMeta.isLink && !currentRouteMeta.isIframe),
+			}"
 		>
-			<LayoutParentView />
-			<Footers v-if="getThemeConfig.isFooter" />
+			<LayoutParentView
+				:style="{
+					padding: !isClassicOrTransverse || (currentRouteMeta.isLink && currentRouteMeta.isIframe) ? '0' : '15px',
+					transition: 'padding 0.3s ease-in-out',
+				}"
+			/>
+			<Footer v-if="themeConfig.isFooter" />
 		</el-scrollbar>
-		<Links
-			:style="{ height: `calc(100vh - ${headerHeight}` }"
-			:meta="currentRouteMeta"
-			v-if="currentRouteMeta.isLink && !currentRouteMeta.isIframe"
-		/>
-		<Iframes
-			:style="{ height: `calc(100vh - ${headerHeight}` }"
-			:meta="currentRouteMeta"
-			v-if="currentRouteMeta.isLink && currentRouteMeta.isIframe && isShowLink"
-			@getCurrentRouteMeta="onGetCurrentRouteMeta"
-		/>
 	</el-main>
 </template>
 
-<script>
-import LayoutParentView from '@/layout/routerView/parent.vue';
-import Footers from '@/layout/footer/index.vue';
-import Links from '@/layout/routerView/link.vue';
-import Iframes from '@/layout/routerView/iframes.vue';
-export default {
+<script lang="ts">
+import { defineComponent, toRefs, reactive, getCurrentInstance, watch, onMounted, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { NextLoading } from '/@/utils/loading';
+import LayoutParentView from '/@/layout/routerView/parent.vue';
+import Footer from '/@/layout/footer/index.vue';
+
+// 定义接口来定义对象的类型
+interface MainState {
+	headerHeight: string | number;
+	currentRouteMeta: any;
+}
+
+export default defineComponent({
 	name: 'layoutMain',
-	components: { LayoutParentView, Footers, Links, Iframes },
-	data() {
-		return {
+	components: { LayoutParentView, Footer },
+	setup() {
+		const { proxy } = <any>getCurrentInstance();
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const route = useRoute();
+		const state = reactive<MainState>({
 			headerHeight: '',
 			currentRouteMeta: {},
-			isShowLink: false,
+		});
+		// 判断布局
+		const isClassicOrTransverse = computed(() => {
+			const { layout } = themeConfig.value;
+			return layout === 'classic' || layout === 'transverse';
+		});
+		// 设置 main 的高度
+		const initHeaderHeight = () => {
+			const bool = state.currentRouteMeta.isLink && state.currentRouteMeta.isIframe;
+			let { isTagsview } = themeConfig.value;
+			if (isTagsview) return (state.headerHeight = bool ? `86px` : `115px`);
+			else return (state.headerHeight = `80px`);
+		};
+		// 初始化获取当前路由 meta，用于设置 iframes padding
+		const initGetMeta = () => {
+			state.currentRouteMeta = route.meta;
+		};
+		// 页面加载前
+		onMounted(async () => {
+			await initGetMeta();
+			initHeaderHeight();
+			NextLoading.done();
+		});
+		// 监听路由变化
+		watch(
+			() => route.path,
+			() => {
+				state.currentRouteMeta = route.meta;
+				const bool = state.currentRouteMeta.isLink && state.currentRouteMeta.isIframe;
+				state.headerHeight = bool ? `86px` : `115px`;
+				proxy.$refs.layoutScrollbarRef.update();
+			}
+		);
+		// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
+		watch(
+			themeConfig,
+			(val) => {
+				state.currentRouteMeta = route.meta;
+				const bool = state.currentRouteMeta.isLink && state.currentRouteMeta.isIframe;
+				state.headerHeight = val.isTagsview ? (bool ? `86px` : `115px`) : '51px';
+				proxy.$refs?.layoutScrollbarRef?.update();
+			},
+			{
+				deep: true,
+			}
+		);
+		return {
+			themeConfig,
+			isClassicOrTransverse,
+			...toRefs(state),
 		};
 	},
-	computed: {
-		// 获取布局配置信息
-		getThemeConfig() {
-			return this.$store.state.themeConfig.themeConfig;
-		},
-	},
-	mounted() {
-		this.initHeaderHeight();
-		this.initCurrentRouteMeta(this.$route.meta);
-	},
-	methods: {
-		// 初始化当前路由 meta 信息
-		initCurrentRouteMeta(meta) {
-			this.isShowLink = false;
-			this.currentRouteMeta = meta;
-			setTimeout(() => {
-				this.isShowLink = true;
-			}, 100);
-		},
-		// 设置 main 的高度
-		initHeaderHeight() {
-			let { isTagsview } = this.$store.state.themeConfig.themeConfig;
-			if (isTagsview) return (this.headerHeight = `84px`);
-			else return (this.headerHeight = `50px`);
-		},
-		// 子组件触发更新
-		onGetCurrentRouteMeta() {
-			this.initCurrentRouteMeta(this.$route.meta);
-		},
-	},
-	watch: {
-		// 监听 vuex 数据变化
-		'$store.state.themeConfig.themeConfig': {
-			handler(val) {
-				this.headerHeight = val.isTagsview ? '84px' : '50px';
-				if (val.isFixedHeaderChange !== val.isFixedHeader) {
-					if (!this.$refs.layoutScrollbarRef) return false;
-					this.$refs.layoutScrollbarRef.update();
-				}
-			},
-			deep: true,
-		},
-		// 监听路由的变化
-		$route: {
-			handler(to) {
-				this.initCurrentRouteMeta(to.meta);
-				this.$refs.layoutScrollbarRef.wrap.scrollTop = 0;
-			},
-			deep: true,
-		},
-	},
-};
+});
 </script>

src/layout/footer/index.vue

@@ -1,19 +1,36 @@
 <template>
-	<div class="layout-footer mt15">
+	<div class="layout-footer mt15" v-show="isDelayFooter">
 		<div class="layout-footer-warp">
-			<div>vue-prev-admin，Made by lyt with ❤️</div>
-			<div class="mt5">{{ $t('message.login.copyright.one5') }}</div>
+			<div>vue-next-admin，Made by lyt with ❤️</div>
+			<div class="mt5">深圳市 xxx 公司版权所有</div>
 		</div>
 	</div>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import { toRefs, reactive, defineComponent } from 'vue';
+import { onBeforeRouteUpdate } from 'vue-router';
+
+export default defineComponent({
 	name: 'layoutFooter',
-	data() {
-		return {};
+	setup() {
+		const state = reactive({
+			isDelayFooter: true,
+		});
+		// 路由改变时，等主界面动画加载完毕再显示 footer
+		onBeforeRouteUpdate(() => {
+			setTimeout(() => {
+				state.isDelayFooter = false;
+				setTimeout(() => {
+					state.isDelayFooter = true;
+				}, 800);
+			}, 0);
+		});
+		return {
+			...toRefs(state),
+		};
 	},
-};
+});
 </script>
 
 <style scoped lang="scss">
@@ -22,8 +39,9 @@ export default {
 	display: flex;
 	&-warp {
 		margin: auto;
-		color: var(--prev-color-text-secondary);
+		color: var(--el-text-color-secondary);
 		text-align: center;
+		animation: error-num 1s ease-in-out;
 	}
 }
 </style>

src/layout/index.vue

@@ -1,51 +1,54 @@
 <template>
-	<Defaults v-if="getThemeConfig.layout === 'defaults'" />
-	<Classic v-else-if="getThemeConfig.layout === 'classic'" />
-	<Transverse v-else-if="getThemeConfig.layout === 'transverse'" />
-	<Columns v-else-if="getThemeConfig.layout === 'columns'" />
+	<component :is="themeConfig.layout" />
 </template>
 
-<script>
-import { Local } from '@/utils/storage.js';
-export default {
+<script lang="ts">
+import { onBeforeMount, onUnmounted, getCurrentInstance, defineComponent, defineAsyncComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { Local } from '/@/utils/storage';
+
+export default defineComponent({
 	name: 'layout',
 	components: {
-		Defaults: () => import('@/layout/main/defaults.vue'),
-		Classic: () => import('@/layout/main/classic.vue'),
-		Transverse: () => import('@/layout/main/transverse.vue'),
-		Columns: () => import('@/layout/main/columns.vue'),
+		defaults: defineAsyncComponent(() => import('/@/layout/main/defaults.vue')),
+		classic: defineAsyncComponent(() => import('/@/layout/main/classic.vue')),
+		transverse: defineAsyncComponent(() => import('/@/layout/main/transverse.vue')),
+		columns: defineAsyncComponent(() => import('/@/layout/main/columns.vue')),
 	},
-	computed: {
-		// 获取布局配置信息
-		getThemeConfig() {
-			return this.$store.state.themeConfig.themeConfig;
-		},
-	},
-	created() {
-		this.onLayoutResize();
-		window.addEventListener('resize', this.onLayoutResize);
-	},
-	methods: {
+	setup() {
+		const { proxy } = <any>getCurrentInstance();
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
 		// 窗口大小改变时(适配移动端)
-		onLayoutResize() {
-			if (!Local.get('oldLayout')) Local.set('oldLayout', this.$store.state.themeConfig.themeConfig.layout);
+		const onLayoutResize = () => {
+			if (!Local.get('oldLayout')) Local.set('oldLayout', themeConfig.value.layout);
 			const clientWidth = document.body.clientWidth;
 			if (clientWidth < 1000) {
-				this.$store.state.themeConfig.themeConfig.isCollapse = false;
-				this.bus.$emit('layoutMobileResize', {
+				themeConfig.value.isCollapse = false;
+				proxy.mittBus.emit('layoutMobileResize', {
 					layout: 'defaults',
 					clientWidth,
 				});
 			} else {
-				this.bus.$emit('layoutMobileResize', {
-					layout: Local.get('oldLayout') ? Local.get('oldLayout') : this.$store.state.themeConfig.themeConfig.layout,
+				proxy.mittBus.emit('layoutMobileResize', {
+					layout: Local.get('oldLayout') ? Local.get('oldLayout') : themeConfig.value.layout,
 					clientWidth,
 				});
 			}
-		},
+		};
+		// 页面加载前
+		onBeforeMount(() => {
+			onLayoutResize();
+			window.addEventListener('resize', onLayoutResize);
+		});
+		// 页面卸载时
+		onUnmounted(() => {
+			window.removeEventListener('resize', onLayoutResize);
+		});
+		return {
+			themeConfig,
+		};
 	},
-	distroyed() {
-		window.removeEventListener('resize', this.onLayoutResize);
-	},
-};
+});
 </script>

src/layout/lockScreen/index.vue

@@ -0,0 +1,372 @@
+<template>
+	<div v-show="isShowLockScreen">
+		<div class="layout-lock-screen-mask"></div>
+		<div class="layout-lock-screen-img" :class="{ 'layout-lock-screen-filter': isShowLoockLogin }"></div>
+		<div class="layout-lock-screen">
+			<div
+				class="layout-lock-screen-date"
+				ref="layoutLockScreenDateRef"
+				@mousedown="onDown"
+				@mousemove="onMove"
+				@mouseup="onEnd"
+				@touchstart.stop="onDown"
+				@touchmove.stop="onMove"
+				@touchend.stop="onEnd"
+			>
+				<div class="layout-lock-screen-date-box">
+					<div class="layout-lock-screen-date-box-time">
+						{{ time.hm }}<span class="layout-lock-screen-date-box-minutes">{{ time.s }}</span>
+					</div>
+					<div class="layout-lock-screen-date-box-info">{{ time.mdq }}</div>
+				</div>
+				<div class="layout-lock-screen-date-top">
+					<SvgIcon name="ele-Top" />
+					<div class="layout-lock-screen-date-top-text">上滑解锁</div>
+				</div>
+			</div>
+			<transition name="el-zoom-in-center">
+				<div v-show="isShowLoockLogin" class="layout-lock-screen-login">
+					<div class="layout-lock-screen-login-box">
+						<div class="layout-lock-screen-login-box-img">
+							<img src="https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500" />
+						</div>
+						<div class="layout-lock-screen-login-box-name">Administrator</div>
+						<div class="layout-lock-screen-login-box-value">
+							<el-input
+								placeholder="请输入密码"
+								ref="layoutLockScreenInputRef"
+								v-model="lockScreenPassword"
+								@keyup.enter.native.stop="onLockScreenSubmit()"
+							>
+								<template #append>
+									<el-button @click="onLockScreenSubmit">
+										<el-icon class="el-input__icon">
+											<ele-Right />
+										</el-icon>
+									</el-button>
+								</template>
+							</el-input>
+						</div>
+					</div>
+					<div class="layout-lock-screen-login-icon">
+						<SvgIcon name="ele-Microphone" :size="20" />
+						<SvgIcon name="ele-AlarmClock" :size="20" />
+						<SvgIcon name="ele-SwitchButton" :size="20" />
+					</div>
+				</div>
+			</transition>
+		</div>
+	</div>
+</template>
+
+<script lang="ts">
+import { nextTick, onMounted, reactive, toRefs, ref, onUnmounted, getCurrentInstance, defineComponent } from 'vue';
+import { formatDate } from '/@/utils/formatTime';
+import { Local } from '/@/utils/storage';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+
+// 定义接口来定义对象的类型
+interface LockScreenState {
+	transparency: number;
+	downClientY: number;
+	moveDifference: number;
+	isShowLoockLogin: boolean;
+	isFlags: boolean;
+	querySelectorEl: HTMLElement | string;
+	time: {
+		hm: string;
+		s: string;
+		mdq: string;
+	};
+	setIntervalTime: number;
+	isShowLockScreen: boolean;
+	isShowLockScreenIntervalTime: number;
+	lockScreenPassword: string;
+}
+
+export default defineComponent({
+	name: 'layoutLockScreen',
+	setup() {
+		const { proxy } = <any>getCurrentInstance();
+		const layoutLockScreenInputRef = ref();
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const state = reactive<LockScreenState>({
+			transparency: 1,
+			downClientY: 0,
+			moveDifference: 0,
+			isShowLoockLogin: false,
+			isFlags: false,
+			querySelectorEl: '',
+			time: {
+				hm: '',
+				s: '',
+				mdq: '',
+			},
+			setIntervalTime: 0,
+			isShowLockScreen: false,
+			isShowLockScreenIntervalTime: 0,
+			lockScreenPassword: '',
+		});
+		// 鼠标按下
+		const onDown = (down: any) => {
+			state.isFlags = true;
+			state.downClientY = down.touches ? down.touches[0].clientY : down.clientY;
+		};
+		// 鼠标移动
+		const onMove = (move: any) => {
+			if (state.isFlags) {
+				const el = <HTMLElement>state.querySelectorEl;
+				const opacitys = (state.transparency -= 1 / 200);
+				if (move.touches) {
+					state.moveDifference = move.touches[0].clientY - state.downClientY;
+				} else {
+					state.moveDifference = move.clientY - state.downClientY;
+				}
+				if (state.moveDifference >= 0) return false;
+				el.setAttribute('style', `top:${state.moveDifference}px;cursor:pointer;opacity:${opacitys};`);
+				if (state.moveDifference < -400) {
+					el.setAttribute('style', `top:${-el.clientHeight}px;cursor:pointer;transition:all 0.3s ease;`);
+					state.moveDifference = -el.clientHeight;
+					setTimeout(() => {
+						el && el.parentNode?.removeChild(el);
+					}, 300);
+				}
+				if (state.moveDifference === -el.clientHeight) {
+					state.isShowLoockLogin = true;
+					layoutLockScreenInputRef.value.focus();
+				}
+			}
+		};
+		// 鼠标松开
+		const onEnd = () => {
+			state.isFlags = false;
+			state.transparency = 1;
+			if (state.moveDifference >= -400) {
+				(<HTMLElement>state.querySelectorEl).setAttribute('style', `top:0px;opacity:1;transition:all 0.3s ease;`);
+			}
+		};
+		// 获取要拖拽的初始元素
+		const initGetElement = () => {
+			nextTick(() => {
+				state.querySelectorEl = proxy.$refs.layoutLockScreenDateRef;
+			});
+		};
+		// 时间初始化
+		const initTime = () => {
+			state.time.hm = formatDate(new Date(), 'HH:MM');
+			state.time.s = formatDate(new Date(), 'SS');
+			state.time.mdq = formatDate(new Date(), 'mm月dd日，WWW');
+		};
+		// 时间初始化定时器
+		const initSetTime = () => {
+			initTime();
+			state.setIntervalTime = window.setInterval(() => {
+				initTime();
+			}, 1000);
+		};
+		// 锁屏时间定时器
+		const initLockScreen = () => {
+			if (themeConfig.value.isLockScreen) {
+				state.isShowLockScreenIntervalTime = window.setInterval(() => {
+					if (themeConfig.value.lockScreenTime <= 1) {
+						state.isShowLockScreen = true;
+						setLocalThemeConfig();
+						return false;
+					}
+					themeConfig.value.lockScreenTime--;
+				}, 1000);
+			} else {
+				clearInterval(state.isShowLockScreenIntervalTime);
+			}
+		};
+		// 存储布局配置
+		const setLocalThemeConfig = () => {
+			themeConfig.value.isDrawer = false;
+			Local.set('themeConfig', themeConfig.value);
+		};
+		// 密码输入点击事件
+		const onLockScreenSubmit = () => {
+			themeConfig.value.isLockScreen = false;
+			themeConfig.value.lockScreenTime = 30;
+			setLocalThemeConfig();
+		};
+		// 页面加载时
+		onMounted(() => {
+			initGetElement();
+			initSetTime();
+			initLockScreen();
+		});
+		// 页面卸载时
+		onUnmounted(() => {
+			window.clearInterval(state.setIntervalTime);
+			window.clearInterval(state.isShowLockScreenIntervalTime);
+		});
+		return {
+			layoutLockScreenInputRef,
+			onDown,
+			onMove,
+			onEnd,
+			onLockScreenSubmit,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.layout-lock-screen-fixed {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.layout-lock-screen-filter {
+	filter: blur(1px);
+}
+.layout-lock-screen-mask {
+	background: var(--el-color-white);
+	@extend .layout-lock-screen-fixed;
+	z-index: 9999990;
+}
+.layout-lock-screen-img {
+	@extend .layout-lock-screen-fixed;
+	background-image: url('https://img-blog.csdnimg.cn/afa9c317667f47d5bea34b85af45979e.png#pic_center');
+	background-size: 100% 100%;
+	z-index: 9999991;
+}
+.layout-lock-screen {
+	@extend .layout-lock-screen-fixed;
+	z-index: 9999992;
+	&-date {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		color: var(--el-color-white);
+		z-index: 9999993;
+		user-select: none;
+		&-box {
+			position: absolute;
+			left: 30px;
+			bottom: 50px;
+			&-time {
+				font-size: 100px;
+				color: var(--el-color-white);
+			}
+			&-info {
+				font-size: 40px;
+				color: var(--el-color-white);
+			}
+			&-minutes {
+				font-size: 16px;
+			}
+		}
+		&-top {
+			width: 40px;
+			height: 40px;
+			line-height: 40px;
+			border-radius: 100%;
+			border: 1px solid var(--el-border-color-light, #ebeef5);
+			background: rgba(255, 255, 255, 0.1);
+			color: var(--el-color-white);
+			opacity: 0.8;
+			position: absolute;
+			right: 30px;
+			bottom: 50px;
+			text-align: center;
+			overflow: hidden;
+			transition: all 0.3s ease;
+			i {
+				transition: all 0.3s ease;
+			}
+			&-text {
+				opacity: 0;
+				position: absolute;
+				top: 150%;
+				font-size: 12px;
+				color: var(--el-color-white);
+				left: 50%;
+				line-height: 1.2;
+				transform: translate(-50%, -50%);
+				transition: all 0.3s ease;
+				width: 35px;
+			}
+			&:hover {
+				border: 1px solid rgba(255, 255, 255, 0.5);
+				background: rgba(255, 255, 255, 0.2);
+				box-shadow: 0 0 12px 0 rgba(255, 255, 255, 0.5);
+				color: var(--el-color-white);
+				opacity: 1;
+				transition: all 0.3s ease;
+				i {
+					transform: translateY(-40px);
+					transition: all 0.3s ease;
+				}
+				.layout-lock-screen-date-top-text {
+					opacity: 1;
+					top: 50%;
+					transition: all 0.3s ease;
+				}
+			}
+		}
+	}
+	&-login {
+		position: relative;
+		z-index: 9999994;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		color: var(--el-color-white);
+		&-box {
+			text-align: center;
+			margin: auto;
+			&-img {
+				width: 180px;
+				height: 180px;
+				margin: auto;
+				img {
+					width: 100%;
+					height: 100%;
+					border-radius: 100%;
+				}
+			}
+			&-name {
+				font-size: 26px;
+				margin: 15px 0 30px;
+			}
+		}
+		&-icon {
+			position: absolute;
+			right: 30px;
+			bottom: 30px;
+			i {
+				font-size: 20px;
+				margin-left: 15px;
+				cursor: pointer;
+				opacity: 0.8;
+				&:hover {
+					opacity: 1;
+				}
+			}
+		}
+	}
+}
+:deep(.el-input-group__append) {
+	background: var(--el-color-white);
+	padding: 0px 15px;
+}
+:deep(.el-input__inner) {
+	border-right-color: var(--el-border-color-extra-light);
+	&:hover {
+		border-color: var(--el-border-color-extra-light);
+	}
+}
+</style>

src/layout/logo/index.vue

@@ -1,40 +1,43 @@
 <template>
 	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
-		<img :src="logo" class="layout-logo-medium-img" />
-		<span>{{ getThemeConfig.globalTitle }}</span>
+		<img :src="logoMini" class="layout-logo-medium-img" />
+		<span>{{ themeConfig.globalTitle }}</span>
 	</div>
 	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
-		<img :src="logo" class="layout-logo-size-img" />
+		<img :src="logoMini" class="layout-logo-size-img" />
 	</div>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+
+import logoMini from '/@/assets/logo-mini.svg';
+
+export default defineComponent({
 	name: 'layoutLogo',
-	data() {
+	setup() {
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		// 设置 logo 的显示。classic 经典布局默认显示 logo
+		const setShowLogo = computed(() => {
+			let { isCollapse, layout } = themeConfig.value;
+			return !isCollapse || layout === 'classic' || document.body.clientWidth < 1000;
+		});
+		// logo 点击实现菜单展开/收起
+		const onThemeConfigChange = () => {
+			if (themeConfig.value.layout === 'transverse') return false;
+			themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
+		};
 		return {
-			logo: require('@/assets/logo-mini.svg'),
+			logoMini,
+			setShowLogo,
+			themeConfig,
+			onThemeConfigChange,
 		};
 	},
-	computed: {
-		// 获取布局配置信息
-		getThemeConfig() {
-			return this.$store.state.themeConfig.themeConfig;
-		},
-		// 设置 logo 是否显示
-		setShowLogo() {
-			let { isCollapse, layout } = this.$store.state.themeConfig.themeConfig;
-			return !isCollapse || layout === 'classic' || document.body.clientWidth < 1000;
-		},
-	},
-	methods: {
-		// logo 点击实现菜单展开/收起
-		onThemeConfigChange() {
-			if (this.$store.state.themeConfig.themeConfig.layout === 'transverse') return false;
-			this.$store.state.themeConfig.themeConfig.isCollapse = !this.$store.state.themeConfig.themeConfig.isCollapse;
-		},
-	},
-};
+});
 </script>
 
 <style scoped lang="scss">
@@ -45,20 +48,22 @@ export default {
 	align-items: center;
 	justify-content: center;
 	box-shadow: rgb(0 21 41 / 2%) 0px 1px 4px;
-	color: var(--prev-color-primary);
+	color: var(--el-color-primary);
 	font-size: 16px;
 	cursor: pointer;
 	animation: logoAnimation 0.3s ease-in-out;
+	span {
+		white-space: nowrap;
+		display: inline-block;
+	}
 	&:hover {
 		span {
-			opacity: 0.9;
+			color: var(--color-primary-light-2);
 		}
 	}
 	&-medium-img {
 		width: 20px;
 		margin-right: 5px;
-		position: relative;
-		top: 2px;
 	}
 }
 .layout-logo-size {
@@ -66,10 +71,15 @@ export default {
 	height: 50px;
 	display: flex;
 	cursor: pointer;
+	animation: logoAnimation 0.3s ease-in-out;
 	&-img {
 		width: 20px;
 		margin: auto;
-		animation: logoAnimation 0.3s ease-in-out;
+	}
+	&:hover {
+		img {
+			animation: logoAnimation 0.3s ease-in-out;
+		}
 	}
 }
 </style>

src/layout/main/classic.vue

@@ -1,30 +1,35 @@
 <template>
 	<el-container class="layout-container flex-center">
-		<Headers />
+		<Header />
 		<el-container class="layout-mian-height-50">
-			<Asides />
+			<Aside />
 			<div class="flex-center layout-backtop">
-				<TagsView v-if="getThemeConfig.isTagsview" />
-				<Mains />
+				<TagsView v-if="themeConfig.isTagsview" />
+				<Main />
 			</div>
 		</el-container>
 		<el-backtop target=".layout-backtop .el-main .el-scrollbar__wrap"></el-backtop>
 	</el-container>
 </template>
 
-<script>
-import Asides from '@/layout/component/aside.vue';
-import Headers from '@/layout/component/header.vue';
-import Mains from '@/layout/component/main.vue';
-import TagsView from '@/layout/navBars/tagsView/tagsView.vue';
-export default {
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import Aside from '/@/layout/component/aside.vue';
+import Header from '/@/layout/component/header.vue';
+import Main from '/@/layout/component/main.vue';
+import TagsView from '/@/layout/navBars/tagsView/tagsView.vue';
+
+export default defineComponent({
 	name: 'layoutClassic',
-	components: { Asides, Headers, Mains, TagsView },
-	computed: {
-		// 获取布局配置信息
-		getThemeConfig() {
-			return this.$store.state.themeConfig.themeConfig;
-		},
+	components: { Aside, Header, Main, TagsView },
+	setup() {
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		return {
+			themeConfig,
+		};
 	},
-};
+});
 </script>

src/layout/main/columns.vue

@@ -2,12 +2,12 @@
 	<el-container class="layout-container">
 		<ColumnsAside />
 		<div class="layout-columns-warp">
-			<Asides />
-			<el-container class="flex-center layout-backtop">
-				<Headers v-if="isFixedHeader" />
-				<el-scrollbar>
-					<Headers v-if="!isFixedHeader" />
-					<Mains />
+			<Aside />
+			<el-container class="flex-center layout-backtop" :class="{ 'layout-backtop': !isFixedHeader }">
+				<Header v-if="isFixedHeader" />
+				<el-scrollbar :class="{ 'layout-backtop': isFixedHeader }">
+					<Header v-if="!isFixedHeader" />
+					<Main />
 				</el-scrollbar>
 			</el-container>
 		</div>
@@ -15,19 +15,27 @@
 	</el-container>
 </template>
 
-<script>
-import Asides from '@/layout/component/aside.vue';
-import Headers from '@/layout/component/header.vue';
-import Mains from '@/layout/component/main.vue';
-import ColumnsAside from '@/layout/component/columnsAside.vue';
-export default {
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import Aside from '/@/layout/component/aside.vue';
+import Header from '/@/layout/component/header.vue';
+import Main from '/@/layout/component/main.vue';
+import ColumnsAside from '/@/layout/component/columnsAside.vue';
+
+export default defineComponent({
 	name: 'layoutColumns',
-	components: { Asides, Headers, Mains, ColumnsAside },
-	computed: {
-		// 是否开启固定 header
-		isFixedHeader() {
-			return this.$store.state.themeConfig.themeConfig.isFixedHeader;
-		},
+	components: { Aside, Header, Main, ColumnsAside },
+	setup() {
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const isFixedHeader = computed(() => {
+			return themeConfig.value.isFixedHeader;
+		});
+		return {
+			isFixedHeader,
+		};
 	},
-};
+});
 </script>

src/layout/main/defaults.vue

@@ -1,41 +1,47 @@
 <template>
 	<el-container class="layout-container">
-		<Asides />
-		<el-container class="flex-center layout-backtop">
-			<Headers v-if="isFixedHeader" />
-			<el-scrollbar ref="layoutDefaultsScrollbarRef">
-				<Headers v-if="!isFixedHeader" />
-				<Mains />
+		<Aside />
+		<el-container class="flex-center" :class="{ 'layout-backtop': !isFixedHeader }">
+			<Header v-if="isFixedHeader" />
+			<el-scrollbar ref="layoutDefaultsScrollbarRef" :class="{ 'layout-backtop': isFixedHeader }">
+				<Header v-if="!isFixedHeader" />
+				<Main />
 			</el-scrollbar>
 		</el-container>
 		<el-backtop target=".layout-backtop .el-scrollbar__wrap"></el-backtop>
 	</el-container>
 </template>
 
-<script>
-import Asides from '@/layout/component/aside.vue';
-import Headers from '@/layout/component/header.vue';
-import Mains from '@/layout/component/main.vue';
-export default {
+<script lang="ts">
+import { computed, getCurrentInstance, watch, defineComponent } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import Aside from '/@/layout/component/aside.vue';
+import Header from '/@/layout/component/header.vue';
+import Main from '/@/layout/component/main.vue';
+
+export default defineComponent({
 	name: 'layoutDefaults',
-	components: { Asides, Headers, Mains },
-	data() {
-		return {};
-	},
-	computed: {
-		// 是否开启固定 header
-		isFixedHeader() {
-			return this.$store.state.themeConfig.themeConfig.isFixedHeader;
-		},
-	},
-	watch: {
+	components: { Aside, Header, Main },
+	setup() {
+		const { proxy } = <any>getCurrentInstance();
+		const route = useRoute();
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const isFixedHeader = computed(() => {
+			return themeConfig.value.isFixedHeader;
+		});
 		// 监听路由的变化
-		$route: {
-			handler() {
-				this.$refs.layoutDefaultsScrollbarRef.wrap.scrollTop = 0;
-			},
-			deep: true,
-		},
+		watch(
+			() => route.path,
+			() => {
+				proxy.$refs.layoutDefaultsScrollbarRef.wrap$.scrollTop = 0;
+			}
+		);
+		return {
+			isFixedHeader,
+		};
 	},
-};
+});
 </script>

src/layout/main/transverse.vue

@@ -1,16 +1,17 @@
 <template>
 	<el-container class="layout-container flex-center layout-backtop">
-		<Headers />
-		<Mains />
+		<Header />
+		<Main />
 		<el-backtop target=".layout-backtop .el-main .el-scrollbar__wrap"></el-backtop>
 	</el-container>
 </template>
 
-<script>
-import Headers from '@/layout/component/header.vue';
-import Mains from '@/layout/component/main.vue';
+<script lang="ts">
+import Header from '/@/layout/component/header.vue';
+import Main from '/@/layout/component/main.vue';
+
 export default {
 	name: 'layoutTransverse',
-	components: { Headers, Mains },
+	components: { Header, Main },
 };
 </script>

src/layout/navBars/breadcrumb/breadcrumb.vue

@@ -0,0 +1,163 @@
+<template>
+	<div v-if="isShowBreadcrumb" class="layout-navbars-breadcrumb">
+		<SvgIcon
+			class="layout-navbars-breadcrumb-icon"
+			:name="themeConfig.isCollapse ? 'ele-Expand' : 'ele-Fold'"
+			:size="16"
+			@click="onThemeConfigChange"
+		/>
+		<el-breadcrumb class="layout-navbars-breadcrumb-hide">
+			<transition-group name="breadcrumb">
+				<el-breadcrumb-item v-for="(v, k) in breadcrumbList" :key="!v.meta.tagsViewName ? v.meta.title : v.meta.tagsViewName">
+					<span v-if="k === breadcrumbList.length - 1" class="layout-navbars-breadcrumb-span">
+						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="themeConfig.isBreadcrumbIcon" />
+						<div v-if="!v.meta.tagsViewName">{{ $t(v.meta.title) }}</div>
+						<div v-else>{{ v.meta.tagsViewName }}</div>
+					</span>
+					<a v-else @click.prevent="onBreadcrumbClick(v)">
+						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="themeConfig.isBreadcrumbIcon" />{{ $t(v.meta.title) }}
+					</a>
+				</el-breadcrumb-item>
+			</transition-group>
+		</el-breadcrumb>
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, computed, onMounted, defineComponent } from 'vue';
+import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
+import { Local } from '/@/utils/storage';
+import other from '/@/utils/other';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useRoutesList } from '/@/stores/routesList';
+
+// 定义接口来定义对象的类型
+interface BreadcrumbState {
+	breadcrumbList: Array<any>;
+	routeSplit: Array<string>;
+	routeSplitFirst: string;
+	routeSplitIndex: number;
+}
+
+export default defineComponent({
+	name: 'layoutBreadcrumb',
+	setup() {
+		const stores = useRoutesList();
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const { routesList } = storeToRefs(stores);
+		const route = useRoute();
+		const router = useRouter();
+		const state = reactive<BreadcrumbState>({
+			breadcrumbList: [],
+			routeSplit: [],
+			routeSplitFirst: '',
+			routeSplitIndex: 1,
+		});
+		// 动态设置经典、横向布局不显示
+		const isShowBreadcrumb = computed(() => {
+			initRouteSplit(route.path);
+			const { layout, isBreadcrumb } = themeConfig.value;
+			if (layout === 'classic' || layout === 'transverse') return false;
+			else return isBreadcrumb ? true : false;
+		});
+		// 面包屑点击时
+		const onBreadcrumbClick = (v: any) => {
+			const { redirect, path } = v;
+			if (redirect) router.push(redirect);
+			else router.push(path);
+		};
+		// 展开/收起左侧菜单点击
+		const onThemeConfigChange = () => {
+			themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
+			setLocalThemeConfig();
+		};
+		// 存储布局配置
+		const setLocalThemeConfig = () => {
+			Local.remove('themeConfig');
+			Local.set('themeConfig', themeConfig.value);
+		};
+		// 处理面包屑数据
+		const getBreadcrumbList = (arr: Array<string>) => {
+			arr.forEach((item: any) => {
+				state.routeSplit.forEach((v: any, k: number, arrs: any) => {
+					if (state.routeSplitFirst === item.path) {
+						state.routeSplitFirst += `/${arrs[state.routeSplitIndex]}`;
+						state.breadcrumbList.push(item);
+						state.routeSplitIndex++;
+						if (item.children) getBreadcrumbList(item.children);
+					}
+				});
+			});
+		};
+		// 当前路由字符串切割成数组，并删除第一项空内容
+		const initRouteSplit = (path: string) => {
+			if (!themeConfig.value.isBreadcrumb) return false;
+			state.breadcrumbList = [routesList.value[0]];
+			state.routeSplit = path.split('/');
+			state.routeSplit.shift();
+			state.routeSplitFirst = `/${state.routeSplit[0]}`;
+			state.routeSplitIndex = 1;
+			getBreadcrumbList(routesList.value);
+			if (route.name === 'home' || (route.name === 'notFound' && state.breadcrumbList.length > 1)) state.breadcrumbList.shift();
+			if (state.breadcrumbList.length > 0) state.breadcrumbList[state.breadcrumbList.length - 1].meta.tagsViewName = other.setTagsViewNameI18n(route);
+		};
+		// 页面加载时
+		onMounted(() => {
+			initRouteSplit(route.path);
+		});
+		// 路由更新时
+		onBeforeRouteUpdate((to) => {
+			initRouteSplit(to.path);
+		});
+		return {
+			onThemeConfigChange,
+			isShowBreadcrumb,
+			themeConfig,
+			onBreadcrumbClick,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-breadcrumb {
+	flex: 1;
+	height: inherit;
+	display: flex;
+	align-items: center;
+	.layout-navbars-breadcrumb-icon {
+		cursor: pointer;
+		font-size: 18px;
+		color: var(--next-bg-topBarColor);
+		height: 100%;
+		width: 40px;
+		opacity: 0.8;
+		&:hover {
+			opacity: 1;
+		}
+	}
+	.layout-navbars-breadcrumb-span {
+		display: flex;
+		opacity: 0.7;
+		color: var(--next-bg-topBarColor);
+	}
+	.layout-navbars-breadcrumb-iconfont {
+		font-size: 14px;
+		margin-right: 5px;
+	}
+	:deep(.el-breadcrumb__separator) {
+		opacity: 0.7;
+		color: var(--next-bg-topBarColor);
+	}
+	:deep(.el-breadcrumb__inner a, .el-breadcrumb__inner.is-link) {
+		font-weight: unset !important;
+		color: var(--next-bg-topBarColor);
+		&:hover {
+			color: var(--el-color-primary) !important;
+		}
+	}
+}
+</style>

src/layout/navBars/breadcrumb/closeFull.vue

@@ -0,0 +1,61 @@
+<template>
+	<div class="layout-navbars-close-full" v-if="isTagsViewCurrenFull">
+		<div class="layout-navbars-close-full-icon">
+			<SvgIcon name="ele-Close" :title="$t('message.tagsView.closeFullscreen')" @click="onCloseFullscreen" />
+		</div>
+	</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
+export default defineComponent({
+	name: 'layoutCloseFull',
+	setup() {
+		const stores = useTagsViewRoutes();
+		const { isTagsViewCurrenFull } = storeToRefs(stores);
+		// 关闭当前全屏
+		const onCloseFullscreen = () => {
+			stores.setCurrenFullscreen(false);
+		};
+		return {
+			isTagsViewCurrenFull,
+			onCloseFullscreen,
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-close-full {
+	position: fixed;
+	z-index: 9999999999;
+	right: -30px;
+	top: -30px;
+	.layout-navbars-close-full-icon {
+		width: 60px;
+		height: 60px;
+		border-radius: 100%;
+		cursor: pointer;
+		background: rgba(0, 0, 0, 0.1);
+		transition: all 0.3s ease;
+		position: relative;
+		:deep(i) {
+			position: absolute;
+			left: 10px;
+			top: 35px;
+			color: #333333;
+			transition: all 0.3s ease;
+		}
+	}
+	&:hover {
+		transition: all 0.3s ease;
+		:deep(i) {
+			color: var(--el-color-primary);
+			transition: all 0.3s ease;
+		}
+	}
+}
+</style>

src/layout/navBars/breadcrumb/index.vue

@@ -0,0 +1,119 @@
+<template>
+	<div class="layout-navbars-breadcrumb-index">
+		<Logo v-if="setIsShowLogo" />
+		<Breadcrumb />
+		<Horizontal :menuList="menuList" v-if="isLayoutTransverse" />
+		<User />
+	</div>
+</template>
+
+<script lang="ts">
+import { computed, reactive, toRefs, onMounted, onUnmounted, getCurrentInstance, defineComponent } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import Breadcrumb from '/@/layout/navBars/breadcrumb/breadcrumb.vue';
+import User from '/@/layout/navBars/breadcrumb/user.vue';
+import Logo from '/@/layout/logo/index.vue';
+import Horizontal from '/@/layout/navMenu/horizontal.vue';
+
+// 定义接口来定义对象的类型
+interface IndexState {
+	menuList: object[];
+}
+
+export default defineComponent({
+	name: 'layoutBreadcrumbIndex',
+	components: { Breadcrumb, User, Logo, Horizontal },
+	setup() {
+		const { proxy } = <any>getCurrentInstance();
+		const stores = useRoutesList();
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const { routesList } = storeToRefs(stores);
+		const route = useRoute();
+		const state = reactive<IndexState>({
+			menuList: [],
+		});
+		// 设置 logo 显示/隐藏
+		const setIsShowLogo = computed(() => {
+			let { isShowLogo, layout } = themeConfig.value;
+			return (isShowLogo && layout === 'classic') || (isShowLogo && layout === 'transverse');
+		});
+		// 设置是否显示横向导航菜单
+		const isLayoutTransverse = computed(() => {
+			let { layout, isClassicSplitMenu } = themeConfig.value;
+			return layout === 'transverse' || (isClassicSplitMenu && layout === 'classic');
+		});
+		// 设置/过滤路由（非静态路由/是否显示在菜单中）
+		const setFilterRoutes = () => {
+			let { layout, isClassicSplitMenu } = themeConfig.value;
+			if (layout === 'classic' && isClassicSplitMenu) {
+				state.menuList = delClassicChildren(filterRoutesFun(routesList.value));
+				const resData = setSendClassicChildren(route.path);
+				proxy.mittBus.emit('setSendClassicChildren', resData);
+			} else {
+				state.menuList = filterRoutesFun(routesList.value);
+			}
+		};
+		// 设置了分割菜单时，删除底下 children
+		const delClassicChildren = (arr: Array<object>) => {
+			arr.map((v: any) => {
+				if (v.children) delete v.children;
+			});
+			return arr;
+		};
+		// 路由过滤递归函数
+		const filterRoutesFun = (arr: Array<string>) => {
+			return arr
+				.filter((item: any) => !item.meta.isHide)
+				.map((item: any) => {
+					item = Object.assign({}, item);
+					if (item.children) item.children = filterRoutesFun(item.children);
+					return item;
+				});
+		};
+		// 传送当前子级数据到菜单中
+		const setSendClassicChildren = (path: string) => {
+			const currentPathSplit = path.split('/');
+			let currentData: any = {};
+			filterRoutesFun(routesList.value).map((v, k) => {
+				if (v.path === `/${currentPathSplit[1]}`) {
+					v['k'] = k;
+					currentData['item'] = [{ ...v }];
+					currentData['children'] = [{ ...v }];
+					if (v.children) currentData['children'] = v.children;
+				}
+			});
+			return currentData;
+		};
+		// 页面加载时
+		onMounted(() => {
+			setFilterRoutes();
+			proxy.mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
+				setFilterRoutes();
+			});
+		});
+		// 页面卸载时
+		onUnmounted(() => {
+			proxy.mittBus.off('getBreadcrumbIndexSetFilterRoutes', () => {});
+		});
+		return {
+			setIsShowLogo,
+			isLayoutTransverse,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-breadcrumb-index {
+	height: 50px;
+	display: flex;
+	align-items: center;
+	background: var(--next-bg-topBar);
+	border-bottom: 1px solid var(--next-border-color-light);
+}
+</style>

src/layout/navBars/breadcrumb/search.vue

@@ -0,0 +1,138 @@
+<template>
+	<div class="layout-search-dialog">
+		<el-dialog v-model="isShowSearch" width="300px" destroy-on-close :modal="false" fullscreen :show-close="false">
+			<el-autocomplete
+				v-model="menuQuery"
+				:fetch-suggestions="menuSearch"
+				:placeholder="$t('message.user.searchPlaceholder')"
+				ref="layoutMenuAutocompleteRef"
+				@select="onHandleSelect"
+				@blur="onSearchBlur"
+			>
+				<template #prefix>
+					<el-icon class="el-input__icon">
+						<ele-Search />
+					</el-icon>
+				</template>
+				<template #default="{ item }">
+					<div>
+						<SvgIcon :name="item.meta.icon" class="mr5" />
+						{{ $t(item.meta.title) }}
+					</div>
+				</template>
+			</el-autocomplete>
+		</el-dialog>
+	</div>
+</template>
+
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, nextTick } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
+// 定义接口来定义对象的类型
+interface SearchState {
+	isShowSearch: boolean;
+	menuQuery: string;
+	tagsViewList: object[];
+}
+interface Restaurant {
+	path: string;
+	meta: {
+		title: string;
+	};
+}
+
+export default defineComponent({
+	name: 'layoutBreadcrumbSearch',
+	setup() {
+		const storesTagsViewRoutes = useTagsViewRoutes();
+		const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
+		const layoutMenuAutocompleteRef = ref();
+		const { t } = useI18n();
+		const router = useRouter();
+		const state = reactive<SearchState>({
+			isShowSearch: false,
+			menuQuery: '',
+			tagsViewList: [],
+		});
+		// 搜索弹窗打开
+		const openSearch = () => {
+			state.menuQuery = '';
+			state.isShowSearch = true;
+			initTageView();
+			nextTick(() => {
+				setTimeout(() => {
+					layoutMenuAutocompleteRef.value.focus();
+				});
+			});
+		};
+		// 搜索弹窗关闭
+		const closeSearch = () => {
+			state.isShowSearch = false;
+		};
+		// 菜单搜索数据过滤
+		const menuSearch = (queryString: string, cb: Function) => {
+			let results = queryString ? state.tagsViewList.filter(createFilter(queryString)) : state.tagsViewList;
+			cb(results);
+		};
+		// 菜单搜索过滤
+		const createFilter: any = (queryString: string) => {
+			return (restaurant: Restaurant) => {
+				return (
+					restaurant.path.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
+					restaurant.meta.title.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
+					t(restaurant.meta.title).indexOf(queryString.toLowerCase()) > -1
+				);
+			};
+		};
+		// 初始化菜单数据
+		const initTageView = () => {
+			if (state.tagsViewList.length > 0) return false;
+			tagsViewRoutes.value.map((v: any) => {
+				if (!v.meta.isHide) state.tagsViewList.push({ ...v });
+			});
+		};
+		// 当前菜单选中时
+		const onHandleSelect = (item: any) => {
+			let { path, redirect } = item;
+			if (item.meta.isLink && !item.meta.isIframe) window.open(item.meta.isLink);
+			else if (redirect) router.push(redirect);
+			else router.push(path);
+			closeSearch();
+		};
+		// input 失去焦点时
+		const onSearchBlur = () => {
+			closeSearch();
+		};
+		return {
+			layoutMenuAutocompleteRef,
+			openSearch,
+			closeSearch,
+			menuSearch,
+			onHandleSelect,
+			onSearchBlur,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.layout-search-dialog {
+	:deep(.el-dialog) {
+		box-shadow: unset !important;
+		border-radius: 0 !important;
+		background: rgba(0, 0, 0, 0.5);
+	}
+	:deep(.el-autocomplete) {
+		width: 560px;
+		position: absolute;
+		top: 100px;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+</style>

src/layout/navBars/breadcrumb/setings.vue

@@ -0,0 +1,816 @@
+<template>
+	<div class="layout-breadcrumb-seting">
+		<el-drawer
+			:title="$t('message.layout.configTitle')"
+			v-model="getThemeConfig.isDrawer"
+			direction="rtl"
+			destroy-on-close
+			size="260px"
+			@close="onDrawerClose"
+		>
+			<el-scrollbar class="layout-breadcrumb-seting-bar">
+				<!-- 全局主题 -->
+				<el-divider content-position="left">{{ $t('message.layout.oneTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">primary</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.primary" size="default" @change="onColorPickerChange"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsDark') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isIsDark" size="small" @change="onAddDarkChange"></el-switch>
+					</div>
+				</div>
+
+				<!-- 顶栏设置 -->
+				<el-divider content-position="left">{{ $t('message.layout.twoTopTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBar') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.topBar" size="default" @change="onBgColorPickerChange('topBar')"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBarColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.topBarColor" size="default" @change="onBgColorPickerChange('topBarColor')"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt10">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsTopBarColorGradual') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isTopBarColorGradual" size="small" @change="onTopBarGradualChange"></el-switch>
+					</div>
+				</div>
+
+				<!-- 菜单设置 -->
+				<el-divider content-position="left">{{ $t('message.layout.twoMenuTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBar') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.menuBar" size="default" @change="onBgColorPickerChange('menuBar')"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBarColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.menuBarColor" size="default" @change="onBgColorPickerChange('menuBarColor')"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt14">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsMenuBarColorGradual') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isMenuBarColorGradual" size="small" @change="onMenuBarGradualChange"></el-switch>
+					</div>
+				</div>
+
+				<!-- 分栏设置 -->
+				<el-divider content-position="left" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">{{
+					$t('message.layout.twoColumnsTitle')
+				}}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBar') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker
+							v-model="getThemeConfig.columnsMenuBar"
+							size="default"
+							@change="onBgColorPickerChange('columnsMenuBar')"
+							:disabled="getThemeConfig.layout !== 'columns'"
+						>
+						</el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBarColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker
+							v-model="getThemeConfig.columnsMenuBarColor"
+							size="default"
+							@change="onBgColorPickerChange('columnsMenuBarColor')"
+							:disabled="getThemeConfig.layout !== 'columns'"
+						>
+						</el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt14" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsColumnsMenuBarColorGradual') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isColumnsMenuBarColorGradual"
+							size="small"
+							@change="onColumnsMenuBarGradualChange"
+							:disabled="getThemeConfig.layout !== 'columns'"
+						></el-switch>
+					</div>
+				</div>
+
+				<!-- 界面设置 -->
+				<el-divider content-position="left">{{ $t('message.layout.threeTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout === 'transverse' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsCollapse') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isCollapse"
+							:disabled="getThemeConfig.layout === 'transverse'"
+							size="small"
+							@change="onThemeConfigChange"
+						></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout === 'transverse' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsUniqueOpened') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isUniqueOpened"
+							:disabled="getThemeConfig.layout === 'transverse'"
+							size="small"
+							@change="setLocalThemeConfig"
+						></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsFixedHeader') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isFixedHeader" size="small" @change="onIsFixedHeaderChange"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout !== 'classic' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsClassicSplitMenu') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isClassicSplitMenu"
+							:disabled="getThemeConfig.layout !== 'classic'"
+							size="small"
+							@change="onClassicSplitMenuChange"
+						>
+						</el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsLockScreen') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isLockScreen" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt11">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeLockScreenTime') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-input-number
+							v-model="getThemeConfig.lockScreenTime"
+							controls-position="right"
+							:min="1"
+							:max="9999"
+							@change="setLocalThemeConfig"
+							size="default"
+							style="width: 90px"
+						>
+						</el-input-number>
+					</div>
+				</div>
+
+				<!-- 界面显示 -->
+				<el-divider content-position="left">{{ $t('message.layout.fourTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsShowLogo') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isShowLogo" size="small" @change="onIsShowLogoChange"></el-switch>
+					</div>
+				</div>
+				<div
+					class="layout-breadcrumb-seting-bar-flex mt15"
+					:style="{ opacity: getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse' ? 0.5 : 1 }"
+				>
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsBreadcrumb') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isBreadcrumb"
+							:disabled="getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse'"
+							size="small"
+							@change="onIsBreadcrumbChange"
+						></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsBreadcrumbIcon') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isBreadcrumbIcon" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsview') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isTagsview" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsviewIcon') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isTagsviewIcon" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsCacheTagsView') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isCacheTagsView" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: isMobile ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsSortableTagsView') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isSortableTagsView"
+							:disabled="isMobile ? true : false"
+							size="small"
+							@change="onSortableTagsViewChange"
+						></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsShareTagsView') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isShareTagsView" size="small" @change="onShareTagsViewChange"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsFooter') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isFooter" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsGrayscale') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isGrayscale" size="small" @change="onAddFilterChange('grayscale')"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsInvert') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isInvert" size="small" @change="onAddFilterChange('invert')"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsWartermark') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isWartermark" size="small" @change="onWartermarkChange"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt14">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourWartermarkText') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-input v-model="getThemeConfig.wartermarkText" size="default" style="width: 90px" @input="onWartermarkTextInput($event)"></el-input>
+					</div>
+				</div>
+
+				<!-- 其它设置 -->
+				<el-divider content-position="left">{{ $t('message.layout.fiveTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveTagsStyle') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-select v-model="getThemeConfig.tagsStyle" placeholder="请选择" size="default" style="width: 90px" @change="setLocalThemeConfig">
+							<el-option label="风格1" value="tags-style-one"></el-option>
+							<el-option label="风格4" value="tags-style-four"></el-option>
+							<el-option label="风格5" value="tags-style-five"></el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveAnimation') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-select v-model="getThemeConfig.animation" placeholder="请选择" size="default" style="width: 90px" @change="setLocalThemeConfig">
+							<el-option label="slide-right" value="slide-right"></el-option>
+							<el-option label="slide-left" value="slide-left"></el-option>
+							<el-option label="opacitys" value="opacitys"></el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideStyle') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-select
+							v-model="getThemeConfig.columnsAsideStyle"
+							placeholder="请选择"
+							size="default"
+							style="width: 90px"
+							:disabled="getThemeConfig.layout !== 'columns' ? true : false"
+							@change="setLocalThemeConfig"
+						>
+							<el-option label="圆角" value="columns-round"></el-option>
+							<el-option label="卡片" value="columns-card"></el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15 mb27" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideLayout') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-select
+							v-model="getThemeConfig.columnsAsideLayout"
+							placeholder="请选择"
+							size="default"
+							style="width: 90px"
+							:disabled="getThemeConfig.layout !== 'columns' ? true : false"
+							@change="setLocalThemeConfig"
+						>
+							<el-option label="水平" value="columns-horizontal"></el-option>
+							<el-option label="垂直" value="columns-vertical"></el-option>
+						</el-select>
+					</div>
+				</div>
+
+				<!-- 布局切换 -->
+				<el-divider content-position="left">{{ $t('message.layout.sixTitle') }}</el-divider>
+				<div class="layout-drawer-content-flex">
+					<!-- defaults 布局 -->
+					<div class="layout-drawer-content-item" @click="onSetLayout('defaults')">
+						<section class="el-container el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'defaults' }">
+							<aside class="el-aside" style="width: 20px"></aside>
+							<section class="el-container is-vertical">
+								<header class="el-header" style="height: 10px"></header>
+								<main class="el-main"></main>
+							</section>
+						</section>
+						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'defaults' }">
+							<div class="layout-tips-box">
+								<p class="layout-tips-txt">{{ $t('message.layout.sixDefaults') }}</p>
+							</div>
+						</div>
+					</div>
+					<!-- classic 布局 -->
+					<div class="layout-drawer-content-item" @click="onSetLayout('classic')">
+						<section class="el-container is-vertical el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'classic' }">
+							<header class="el-header" style="height: 10px"></header>
+							<section class="el-container">
+								<aside class="el-aside" style="width: 20px"></aside>
+								<section class="el-container is-vertical">
+									<main class="el-main"></main>
+								</section>
+							</section>
+						</section>
+						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'classic' }">
+							<div class="layout-tips-box">
+								<p class="layout-tips-txt">{{ $t('message.layout.sixClassic') }}</p>
+							</div>
+						</div>
+					</div>
+					<!-- transverse 布局 -->
+					<div class="layout-drawer-content-item" @click="onSetLayout('transverse')">
+						<section class="el-container is-vertical el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'transverse' }">
+							<header class="el-header" style="height: 10px"></header>
+							<section class="el-container">
+								<section class="el-container is-vertical">
+									<main class="el-main"></main>
+								</section>
+							</section>
+						</section>
+						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'transverse' }">
+							<div class="layout-tips-box">
+								<p class="layout-tips-txt">{{ $t('message.layout.sixTransverse') }}</p>
+							</div>
+						</div>
+					</div>
+					<!-- columns 布局 -->
+					<div class="layout-drawer-content-item" @click="onSetLayout('columns')">
+						<section class="el-container el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'columns' }">
+							<aside class="el-aside-dark" style="width: 10px"></aside>
+							<aside class="el-aside" style="width: 20px"></aside>
+							<section class="el-container is-vertical">
+								<header class="el-header" style="height: 10px"></header>
+								<main class="el-main"></main>
+							</section>
+						</section>
+						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'columns' }">
+							<div class="layout-tips-box">
+								<p class="layout-tips-txt">{{ $t('message.layout.sixColumns') }}</p>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="copy-config">
+					<el-alert :title="$t('message.layout.tipText')" type="warning" :closable="false"> </el-alert>
+					<el-button size="default" class="copy-config-btn" type="primary" ref="copyConfigBtnRef" @click="onCopyConfigClick">
+						<el-icon class="mr5">
+							<ele-CopyDocument />
+						</el-icon>
+						{{ $t('message.layout.copyText') }}
+					</el-button>
+					<el-button size="default" class="copy-config-btn-reset" type="info" @click="onResetConfigClick">
+						<el-icon class="mr5">
+							<ele-RefreshRight />
+						</el-icon>
+						{{ $t('message.layout.resetText') }}
+					</el-button>
+				</div>
+			</el-scrollbar>
+		</el-drawer>
+	</div>
+</template>
+
+<script lang="ts">
+import { nextTick, onUnmounted, onMounted, getCurrentInstance, defineComponent, computed, reactive, toRefs } from 'vue';
+import { ElMessage } from 'element-plus';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { getLightColor, getDarkColor } from '/@/utils/theme';
+import { verifyAndSpace } from '/@/utils/toolsValidate';
+import { Local } from '/@/utils/storage';
+import Watermark from '/@/utils/wartermark';
+import commonFunction from '/@/utils/commonFunction';
+import other from '/@/utils/other';
+
+export default defineComponent({
+	name: 'layoutBreadcrumbSeting',
+	setup() {
+		const { proxy } = <any>getCurrentInstance();
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const { copyText } = commonFunction();
+		const state = reactive({
+			isMobile: false,
+		});
+		// 获取布局配置信息
+		const getThemeConfig = computed(() => {
+			return themeConfig.value;
+		});
+		// 1、全局主题
+		const onColorPickerChange = () => {
+			if (!getThemeConfig.value.primary) return ElMessage.warning('全局主题 primary 颜色值不能为空');
+			// 颜色加深
+			document.documentElement.style.setProperty('--el-color-primary-dark-2', `${getDarkColor(getThemeConfig.value.primary, 0.1)}`);
+			document.documentElement.style.setProperty('--el-color-primary', getThemeConfig.value.primary);
+			// 颜色变浅
+			for (let i = 1; i <= 9; i++) {
+				document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, `${getLightColor(getThemeConfig.value.primary, i / 10)}`);
+			}
+			setDispatchThemeConfig();
+		};
+		// 2、菜单 / 顶栏
+		const onBgColorPickerChange = (bg: string) => {
+			document.documentElement.style.setProperty(`--next-bg-${bg}`, (<any>getThemeConfig.value)[bg]);
+			if (bg === 'menuBar') {
+				document.documentElement.style.setProperty(`--next-bg-menuBar-light-1`, <any>getLightColor(getThemeConfig.value.menuBar, 0.05));
+			}
+			onTopBarGradualChange();
+			onMenuBarGradualChange();
+			onColumnsMenuBarGradualChange();
+			setDispatchThemeConfig();
+		};
+		// 2、菜单 / 顶栏 --> 顶栏背景渐变
+		const onTopBarGradualChange = () => {
+			setGraduaFun('.layout-navbars-breadcrumb-index', getThemeConfig.value.isTopBarColorGradual, getThemeConfig.value.topBar);
+		};
+		// 2、菜单 / 顶栏 --> 菜单背景渐变
+		const onMenuBarGradualChange = () => {
+			setGraduaFun('.layout-container .el-aside', getThemeConfig.value.isMenuBarColorGradual, getThemeConfig.value.menuBar);
+		};
+		// 2、菜单 / 顶栏 --> 分栏菜单背景渐变
+		const onColumnsMenuBarGradualChange = () => {
+			setGraduaFun('.layout-container .layout-columns-aside', getThemeConfig.value.isColumnsMenuBarColorGradual, getThemeConfig.value.columnsMenuBar);
+		};
+		// 2、菜单 / 顶栏 --> 背景渐变函数
+		const setGraduaFun = (el: string, bool: boolean, color: string) => {
+			setTimeout(() => {
+				let els = document.querySelector(el);
+				if (!els) return false;
+				document.documentElement.style.setProperty('--el-menu-bg-color', document.documentElement.style.getPropertyValue('--next-bg-menuBar'));
+				if (bool) els.setAttribute('style', `background:linear-gradient(to bottom left , ${color}, ${getLightColor(color, 0.6)}) !important;`);
+				else els.setAttribute('style', ``);
+				setLocalThemeConfig();
+			}, 200);
+		};
+		// 3、界面设置 --> 菜单水平折叠
+		const onThemeConfigChange = () => {
+			setDispatchThemeConfig();
+		};
+		// 3、界面设置 --> 固定 Header
+		const onIsFixedHeaderChange = () => {
+			getThemeConfig.value.isFixedHeaderChange = getThemeConfig.value.isFixedHeader ? false : true;
+			setLocalThemeConfig();
+		};
+		// 3、界面设置 --> 经典布局分割菜单
+		const onClassicSplitMenuChange = () => {
+			getThemeConfig.value.isBreadcrumb = false;
+			setLocalThemeConfig();
+			proxy.mittBus.emit('getBreadcrumbIndexSetFilterRoutes');
+		};
+		// 4、界面显示 --> 侧边栏 Logo
+		const onIsShowLogoChange = () => {
+			getThemeConfig.value.isShowLogoChange = getThemeConfig.value.isShowLogo ? false : true;
+			setLocalThemeConfig();
+		};
+		// 4、界面显示 --> 面包屑 Breadcrumb
+		const onIsBreadcrumbChange = () => {
+			if (getThemeConfig.value.layout === 'classic') {
+				getThemeConfig.value.isClassicSplitMenu = false;
+			}
+			setLocalThemeConfig();
+		};
+		// 4、界面显示 --> 开启 TagsView 拖拽
+		const onSortableTagsViewChange = () => {
+			proxy.mittBus.emit('openOrCloseSortable');
+			setLocalThemeConfig();
+		};
+		// 4、界面显示 --> 开启 TagsView 共用
+		const onShareTagsViewChange = () => {
+			proxy.mittBus.emit('openShareTagsView');
+			setLocalThemeConfig();
+		};
+		// 4、界面显示 --> 灰色模式/色弱模式
+		const onAddFilterChange = (attr: string) => {
+			if (attr === 'grayscale') {
+				if (getThemeConfig.value.isGrayscale) getThemeConfig.value.isInvert = false;
+			} else {
+				if (getThemeConfig.value.isInvert) getThemeConfig.value.isGrayscale = false;
+			}
+			const cssAttr =
+				attr === 'grayscale' ? `grayscale(${getThemeConfig.value.isGrayscale ? 1 : 0})` : `invert(${getThemeConfig.value.isInvert ? '80%' : '0%'})`;
+			const appEle: any = document.body;
+			appEle.setAttribute('style', `filter: ${cssAttr}`);
+			setLocalThemeConfig();
+		};
+		// 4、界面显示 --> 深色模式
+		const onAddDarkChange = () => {
+			const body = document.documentElement as HTMLElement;
+			if (getThemeConfig.value.isIsDark) body.setAttribute('data-theme', 'dark');
+			else body.setAttribute('data-theme', '');
+		};
+		// 4、界面显示 --> 开启水印
+		const onWartermarkChange = () => {
+			getThemeConfig.value.isWartermark ? Watermark.set(getThemeConfig.value.wartermarkText) : Watermark.del();
+			setLocalThemeConfig();
+		};
+		// 4、界面显示 --> 水印文案
+		const onWartermarkTextInput = (val: any) => {
+			getThemeConfig.value.wartermarkText = verifyAndSpace(val);
+			if (getThemeConfig.value.wartermarkText === '') return false;
+			if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.wartermarkText);
+			setLocalThemeConfig();
+		};
+		// 5、布局切换
+		const onSetLayout = (layout: string) => {
+			Local.set('oldLayout', layout);
+			if (getThemeConfig.value.layout === layout) return false;
+			if (layout === 'transverse') getThemeConfig.value.isCollapse = false;
+			getThemeConfig.value.layout = layout;
+			getThemeConfig.value.isDrawer = false;
+			initLayoutChangeFun();
+		};
+		// 设置布局切换函数
+		const initLayoutChangeFun = () => {
+			onBgColorPickerChange('menuBar');
+			onBgColorPickerChange('menuBarColor');
+			onBgColorPickerChange('topBar');
+			onBgColorPickerChange('topBarColor');
+			onBgColorPickerChange('columnsMenuBar');
+			onBgColorPickerChange('columnsMenuBarColor');
+		};
+		// 关闭弹窗时，初始化变量。变量用于处理 proxy.$refs.layoutScrollbarRef.update()
+		const onDrawerClose = () => {
+			getThemeConfig.value.isFixedHeaderChange = false;
+			getThemeConfig.value.isShowLogoChange = false;
+			getThemeConfig.value.isDrawer = false;
+			setLocalThemeConfig();
+		};
+		// 布局配置弹窗打开
+		const openDrawer = () => {
+			getThemeConfig.value.isDrawer = true;
+		};
+		// 触发 store 布局配置更新
+		const setDispatchThemeConfig = () => {
+			setLocalThemeConfig();
+			setLocalThemeConfigStyle();
+		};
+		// 存储布局配置
+		const setLocalThemeConfig = () => {
+			Local.remove('themeConfig');
+			Local.set('themeConfig', getThemeConfig.value);
+		};
+		// 存储布局配置全局主题样式（html根标签）
+		const setLocalThemeConfigStyle = () => {
+			Local.set('themeConfigStyle', document.documentElement.style.cssText);
+		};
+		// 一键复制配置
+		const onCopyConfigClick = () => {
+			let copyThemeConfig = Local.get('themeConfig');
+			copyThemeConfig.isDrawer = false;
+			copyText(JSON.stringify(copyThemeConfig)).then(() => {
+				getThemeConfig.value.isDrawer = false;
+			});
+		};
+		// 一键恢复默认
+		const onResetConfigClick = () => {
+			Local.clear();
+			window.location.reload();
+		};
+		// 初始化菜单样式等
+		const initSetStyle = () => {
+			// 2、菜单 / 顶栏 --> 顶栏背景渐变
+			onTopBarGradualChange();
+			// 2、菜单 / 顶栏 --> 菜单背景渐变
+			onMenuBarGradualChange();
+			// 2、菜单 / 顶栏 --> 分栏菜单背景渐变
+			onColumnsMenuBarGradualChange();
+		};
+		onMounted(() => {
+			nextTick(() => {
+				// 判断当前布局是否不相同，不相同则初始化当前布局的样式，防止监听窗口大小改变时，布局配置logo、菜单背景等部分布局失效问题
+				if (!Local.get('frequency')) initLayoutChangeFun();
+				Local.set('frequency', 1);
+				// 监听窗口大小改变，非默认布局，设置成默认布局（适配移动端）
+				proxy.mittBus.on('layoutMobileResize', (res: any) => {
+					getThemeConfig.value.layout = res.layout;
+					getThemeConfig.value.isDrawer = false;
+					initLayoutChangeFun();
+					state.isMobile = other.isMobile();
+				});
+				setTimeout(() => {
+					// 默认样式
+					onColorPickerChange();
+					// 灰色模式
+					if (getThemeConfig.value.isGrayscale) onAddFilterChange('grayscale');
+					// 色弱模式
+					if (getThemeConfig.value.isInvert) onAddFilterChange('invert');
+					// 深色模式
+					if (getThemeConfig.value.isIsDark) onAddDarkChange();
+					// 开启水印
+					onWartermarkChange();
+					// 语言国际化
+					if (Local.get('themeConfig')) proxy.$i18n.locale = Local.get('themeConfig').globalI18n;
+					// 初始化菜单样式等
+					initSetStyle();
+				}, 100);
+			});
+		});
+		onUnmounted(() => {
+			proxy.mittBus.off('layoutMobileResize', () => {});
+		});
+		return {
+			openDrawer,
+			onColorPickerChange,
+			onBgColorPickerChange,
+			onTopBarGradualChange,
+			onMenuBarGradualChange,
+			onColumnsMenuBarGradualChange,
+			onThemeConfigChange,
+			onIsFixedHeaderChange,
+			onIsShowLogoChange,
+			getThemeConfig,
+			onDrawerClose,
+			onAddFilterChange,
+			onAddDarkChange,
+			onWartermarkChange,
+			onWartermarkTextInput,
+			onSetLayout,
+			setLocalThemeConfig,
+			onClassicSplitMenuChange,
+			onIsBreadcrumbChange,
+			onSortableTagsViewChange,
+			onShareTagsViewChange,
+			onCopyConfigClick,
+			onResetConfigClick,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.layout-breadcrumb-seting-bar {
+	height: calc(100vh - 50px);
+	padding: 0 15px;
+	:deep(.el-scrollbar__view) {
+		overflow-x: hidden !important;
+	}
+	.layout-breadcrumb-seting-bar-flex {
+		display: flex;
+		align-items: center;
+		margin-bottom: 5px;
+		&-label {
+			flex: 1;
+			color: var(--el-text-color-primary);
+		}
+	}
+	.layout-drawer-content-flex {
+		overflow: hidden;
+		display: flex;
+		flex-wrap: wrap;
+		align-content: flex-start;
+		margin: 0 -5px;
+		.layout-drawer-content-item {
+			width: 50%;
+			height: 70px;
+			cursor: pointer;
+			border: 1px solid transparent;
+			position: relative;
+			padding: 5px;
+			.el-container {
+				height: 100%;
+				.el-aside-dark {
+					background-color: var(--next-color-seting-header);
+				}
+				.el-aside {
+					background-color: var(--next-color-seting-aside);
+				}
+				.el-header {
+					background-color: var(--next-color-seting-header);
+				}
+				.el-main {
+					background-color: var(--next-color-seting-main);
+				}
+			}
+			.el-circular {
+				border-radius: 2px;
+				overflow: hidden;
+				border: 1px solid transparent;
+				transition: all 0.3s ease-in-out;
+			}
+			.drawer-layout-active {
+				border: 1px solid;
+				border-color: var(--el-color-primary);
+			}
+			.layout-tips-warp,
+			.layout-tips-warp-active {
+				transition: all 0.3s ease-in-out;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%, -50%);
+				border: 1px solid;
+				border-color: var(--el-color-primary-light-5);
+				border-radius: 100%;
+				padding: 4px;
+				.layout-tips-box {
+					transition: inherit;
+					width: 30px;
+					height: 30px;
+					z-index: 9;
+					border: 1px solid;
+					border-color: var(--el-color-primary-light-5);
+					border-radius: 100%;
+					.layout-tips-txt {
+						transition: inherit;
+						position: relative;
+						top: 5px;
+						font-size: 12px;
+						line-height: 1;
+						letter-spacing: 2px;
+						white-space: nowrap;
+						color: var(--el-color-primary-light-5);
+						text-align: center;
+						transform: rotate(30deg);
+						left: -1px;
+						background-color: var(--next-color-seting-main);
+						width: 32px;
+						height: 17px;
+						line-height: 17px;
+					}
+				}
+			}
+			.layout-tips-warp-active {
+				border: 1px solid;
+				border-color: var(--el-color-primary);
+				.layout-tips-box {
+					border: 1px solid;
+					border-color: var(--el-color-primary);
+					.layout-tips-txt {
+						color: var(--el-color-primary) !important;
+						background-color: var(--next-color-seting-main) !important;
+					}
+				}
+			}
+			&:hover {
+				.el-circular {
+					transition: all 0.3s ease-in-out;
+					border: 1px solid;
+					border-color: var(--el-color-primary);
+				}
+				.layout-tips-warp {
+					transition: all 0.3s ease-in-out;
+					border-color: var(--el-color-primary);
+					.layout-tips-box {
+						transition: inherit;
+						border-color: var(--el-color-primary);
+						.layout-tips-txt {
+							transition: inherit;
+							color: var(--el-color-primary) !important;
+							background-color: var(--next-color-seting-main) !important;
+						}
+					}
+				}
+			}
+		}
+	}
+	.copy-config {
+		margin: 10px 0;
+		.copy-config-btn {
+			width: 100%;
+			margin-top: 15px;
+		}
+		.copy-config-btn-reset {
+			width: 100%;
+			margin: 10px 0 0;
+		}
+	}
+}
+</style>

src/layout/navBars/breadcrumb/user.vue

@@ -0,0 +1,299 @@
+<template>
+	<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
+		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
+			<div class="layout-navbars-breadcrumb-user-icon">
+				<i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
+			</div>
+			<template #dropdown>
+				<el-dropdown-menu>
+					<el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
+					<el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
+					<el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
+				</el-dropdown-menu>
+			</template>
+		</el-dropdown>
+		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
+			<div class="layout-navbars-breadcrumb-user-icon">
+				<i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>
+			</div>
+			<template #dropdown>
+				<el-dropdown-menu>
+					<el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
+					<el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>
+					<el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>
+				</el-dropdown-menu>
+			</template>
+		</el-dropdown>
+		<div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
+			<el-icon :title="$t('message.user.title2')">
+				<ele-Search />
+			</el-icon>
+		</div>
+		<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
+			<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
+		</div>
+		<div class="layout-navbars-breadcrumb-user-icon">
+			<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
+				<template #reference>
+					<el-badge :is-dot="true">
+						<el-icon :title="$t('message.user.title4')">
+							<ele-Bell />
+						</el-icon>
+					</el-badge>
+				</template>
+				<template #default>
+					<UserNews />
+				</template>
+			</el-popover>
+		</div>
+		<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
+			<i
+				class="iconfont"
+				:title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
+				:class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
+			></i>
+		</div>
+		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
+			<span class="layout-navbars-breadcrumb-user-link">
+				<img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+				{{ userInfos.userName === '' ? 'common' : userInfos.userName }}
+				<el-icon class="el-icon--right">
+					<ele-ArrowDown />
+				</el-icon>
+			</span>
+			<template #dropdown>
+				<el-dropdown-menu>
+					<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
+					<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
+					<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
+					<el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
+					<el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>
+					<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
+				</el-dropdown-menu>
+			</template>
+		</el-dropdown>
+		<Search ref="searchRef" />
+	</div>
+</template>
+
+<script lang="ts">
+import { ref, getCurrentInstance, computed, reactive, toRefs, onMounted, defineComponent } from 'vue';
+import { useRouter } from 'vue-router';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import screenfull from 'screenfull';
+import { useI18n } from 'vue-i18n';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '/@/stores/userInfo';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import other from '/@/utils/other';
+import { Session, Local } from '/@/utils/storage';
+import UserNews from '/@/layout/navBars/breadcrumb/userNews.vue';
+import Search from '/@/layout/navBars/breadcrumb/search.vue';
+
+export default defineComponent({
+	name: 'layoutBreadcrumbUser',
+	components: { UserNews, Search },
+	setup() {
+		const { t } = useI18n();
+		const { proxy } = <any>getCurrentInstance();
+		const router = useRouter();
+		const stores = useUserInfo();
+		const storesThemeConfig = useThemeConfig();
+		const { userInfos } = storeToRefs(stores);
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const searchRef = ref();
+		const state = reactive({
+			isScreenfull: false,
+			disabledI18n: 'zh-cn',
+			disabledSize: 'large',
+		});
+		// 设置分割样式
+		const layoutUserFlexNum = computed(() => {
+			let num: string | number = '';
+			const { layout, isClassicSplitMenu } = themeConfig.value;
+			const layoutArr: string[] = ['defaults', 'columns'];
+			if (layoutArr.includes(layout) || (layout === 'classic' && !isClassicSplitMenu)) num = '1';
+			else num = '';
+			return num;
+		});
+		// 全屏点击时
+		const onScreenfullClick = () => {
+			if (!screenfull.isEnabled) {
+				ElMessage.warning('暂不不支持全屏');
+				return false;
+			}
+			screenfull.toggle();
+			screenfull.on('change', () => {
+				if (screenfull.isFullscreen) state.isScreenfull = true;
+				else state.isScreenfull = false;
+			});
+		};
+		// 布局配置 icon 点击时
+		const onLayoutSetingClick = () => {
+			proxy.mittBus.emit('openSetingsDrawer');
+		};
+		// 下拉菜单点击时
+		const onHandleCommandClick = (path: string) => {
+			if (path === 'logOut') {
+				ElMessageBox({
+					closeOnClickModal: false,
+					closeOnPressEscape: false,
+					title: t('message.user.logOutTitle'),
+					message: t('message.user.logOutMessage'),
+					showCancelButton: true,
+					confirmButtonText: t('message.user.logOutConfirm'),
+					cancelButtonText: t('message.user.logOutCancel'),
+					buttonSize: 'default',
+					beforeClose: (action, instance, done) => {
+						if (action === 'confirm') {
+							instance.confirmButtonLoading = true;
+							instance.confirmButtonText = t('message.user.logOutExit');
+							setTimeout(() => {
+								done();
+								setTimeout(() => {
+									instance.confirmButtonLoading = false;
+								}, 300);
+							}, 700);
+						} else {
+							done();
+						}
+					},
+				})
+					.then(async () => {
+						// 清除缓存/token等
+						Session.clear();
+						// 使用 reload 时，不需要调用 resetRoute() 重置路由
+						window.location.reload();
+					})
+					.catch(() => {});
+			} else if (path === 'wareHouse') {
+				window.open('https://gitee.com/lyt-top/vue-next-admin');
+			} else {
+				router.push(path);
+			}
+		};
+		// 菜单搜索点击
+		const onSearchClick = () => {
+			searchRef.value.openSearch();
+		};
+		// 组件大小改变
+		const onComponentSizeChange = (size: string) => {
+			Local.remove('themeConfig');
+			themeConfig.value.globalComponentSize = size;
+			Local.set('themeConfig', themeConfig.value);
+			initComponentSize();
+			window.location.reload();
+		};
+		// 语言切换
+		const onLanguageChange = (lang: string) => {
+			Local.remove('themeConfig');
+			themeConfig.value.globalI18n = lang;
+			Local.set('themeConfig', themeConfig.value);
+			proxy.$i18n.locale = lang;
+			initI18n();
+			other.useTitle();
+		};
+		// 设置 element plus 组件的国际化
+		const setI18nConfig = (locale: string) => {
+			proxy.mittBus.emit('getI18nConfig', proxy.$i18n.messages[locale]);
+		};
+		// 初始化言语国际化
+		const initI18n = () => {
+			switch (Local.get('themeConfig').globalI18n) {
+				case 'zh-cn':
+					state.disabledI18n = 'zh-cn';
+					setI18nConfig('zh-cn');
+					break;
+				case 'en':
+					state.disabledI18n = 'en';
+					setI18nConfig('en');
+					break;
+				case 'zh-tw':
+					state.disabledI18n = 'zh-tw';
+					setI18nConfig('zh-tw');
+					break;
+			}
+		};
+		// 初始化全局组件大小
+		const initComponentSize = () => {
+			switch (Local.get('themeConfig').globalComponentSize) {
+				case 'large':
+					state.disabledSize = 'large';
+					break;
+				case 'default':
+					state.disabledSize = 'default';
+					break;
+				case 'small':
+					state.disabledSize = 'small';
+					break;
+			}
+		};
+		// 页面加载时
+		onMounted(() => {
+			if (Local.get('themeConfig')) {
+				initI18n();
+				initComponentSize();
+			}
+		});
+		return {
+			userInfos,
+			onLayoutSetingClick,
+			onHandleCommandClick,
+			onScreenfullClick,
+			onSearchClick,
+			onComponentSizeChange,
+			onLanguageChange,
+			searchRef,
+			layoutUserFlexNum,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-breadcrumb-user {
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	&-link {
+		height: 100%;
+		display: flex;
+		align-items: center;
+		white-space: nowrap;
+		&-photo {
+			width: 25px;
+			height: 25px;
+			border-radius: 100%;
+		}
+	}
+	&-icon {
+		padding: 0 10px;
+		cursor: pointer;
+		color: var(--next-bg-topBarColor);
+		height: 50px;
+		line-height: 50px;
+		display: flex;
+		align-items: center;
+		&:hover {
+			background: var(--next-color-user-hover);
+			i {
+				display: inline-block;
+				animation: logoAnimation 0.3s ease-in-out;
+			}
+		}
+	}
+	:deep(.el-dropdown) {
+		color: var(--next-bg-topBarColor);
+	}
+	:deep(.el-badge) {
+		height: 40px;
+		line-height: 40px;
+		display: flex;
+		align-items: center;
+	}
+	:deep(.el-badge__content.is-fixed) {
+		top: 12px;
+	}
+}
+</style>

src/layout/navBars/breadcrumb/userNews.vue

@@ -14,61 +14,61 @@
 					<div class="content-box-time">{{ v.time }}</div>
 				</div>
 			</template>
-			<div class="content-box-empty" v-else>
-				<div class="content-box-empty-margin">
-					<i class="el-icon-s-promotion"></i>
-					<div class="mt15">{{ $t('message.user.newDesc') }}</div>
-				</div>
-			</div>
+			<el-empty :description="$t('message.user.newDesc')" v-else></el-empty>
 		</div>
 		<div class="foot-box" @click="onGoToGiteeClick" v-if="newsList.length > 0">{{ $t('message.user.newGo') }}</div>
 	</div>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import { reactive, toRefs, defineComponent } from 'vue';
+
+export default defineComponent({
 	name: 'layoutBreadcrumbUserNews',
-	data() {
-		return {
+	setup() {
+		const state = reactive({
 			newsList: [
 				{
 					label: '关于版本发布的通知',
-					value: '基于 vue2.x + element ui，正式发布时间：2020年11月15日！',
-					time: '2020-11-15',
+					value: 'vue-next-admin，基于 vue3 + CompositionAPI + typescript + vite + element plus，正式发布时间：2021年02月28日！',
+					time: '2020-12-08',
 				},
 				{
 					label: '关于学习交流的通知',
 					value: 'QQ群号码 665452019，欢迎小伙伴入群学习交流探讨！',
-					time: '2020-11-15',
+					time: '2020-12-08',
 				},
 			],
+		});
+		// 全部已读点击
+		const onAllReadClick = () => {
+			state.newsList = [];
+		};
+		// 前往通知中心点击
+		const onGoToGiteeClick = () => {
+			window.open('https://gitee.com/lyt-top/vue-next-admin');
+		};
+		return {
+			onAllReadClick,
+			onGoToGiteeClick,
+			...toRefs(state),
 		};
 	},
-	methods: {
-		// 全部已读点击
-		onAllReadClick() {
-			this.newsList = [];
-		},
-		// 前往通知中心点击
-		onGoToGiteeClick() {
-			window.open('https://gitee.com/lyt-top/vue-next-admin');
-		},
-	},
-};
+});
 </script>
 
 <style scoped lang="scss">
 .layout-navbars-breadcrumb-user-news {
 	.head-box {
 		display: flex;
-		border-bottom: 1px solid var(--prev-border-color-lighter);
+		border-bottom: 1px solid var(--el-border-color-lighter);
 		box-sizing: border-box;
-		color: var(--prev-color-text-primary);
+		color: var(--el-text-color-primary);
 		justify-content: space-between;
 		height: 35px;
 		align-items: center;
 		.head-box-btn {
-			color: var(--prev-color-primary);
+			color: var(--el-color-primary);
 			font-size: 13px;
 			cursor: pointer;
 			opacity: 0.8;
@@ -85,41 +85,30 @@ export default {
 				padding-bottom: 12px;
 			}
 			.content-box-msg {
-				color: var(--prev-color-text-secondary);
+				color: var(--el-text-color-secondary);
 				margin-top: 5px;
 				margin-bottom: 5px;
 			}
 			.content-box-time {
-				color: var(--prev-color-text-secondary);
-			}
-		}
-		.content-box-empty {
-			height: 260px;
-			display: flex;
-			.content-box-empty-margin {
-				margin: auto;
-				text-align: center;
-				i {
-					font-size: 60px;
-				}
+				color: var(--el-text-color-secondary);
 			}
 		}
 	}
 	.foot-box {
 		height: 35px;
-		color: var(--prev-color-primary);
+		color: var(--el-color-primary);
 		font-size: 13px;
 		cursor: pointer;
 		opacity: 0.8;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		border-top: 1px solid var(--prev-border-color-lighter);
+		border-top: 1px solid var(--el-border-color-lighter);
 		&:hover {
 			opacity: 1;
 		}
 	}
-	::v-deep(.el-empty__description p) {
+	:deep(.el-empty__description p) {
 		font-size: 13px;
 	}
 }

src/layout/navBars/index.vue

@@ -5,23 +5,29 @@
 	</div>
 </template>
 
-<script>
-import BreadcrumbIndex from '@/layout/navBars/topBar/index.vue';
-import TagsView from '@/layout/navBars/tagsView/tagsView.vue';
-export default {
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import BreadcrumbIndex from '/@/layout/navBars/breadcrumb/index.vue';
+import TagsView from '/@/layout/navBars/tagsView/tagsView.vue';
+
+export default defineComponent({
 	name: 'layoutNavBars',
 	components: { BreadcrumbIndex, TagsView },
-	data() {
-		return {};
-	},
-	computed: {
-		// 设置是否显示 tagsView
-		setShowTagsView() {
-			let { layout, isTagsview } = this.$store.state.themeConfig.themeConfig;
+	setup() {
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		// 是否显示 tagsView
+		const setShowTagsView = computed(() => {
+			let { layout, isTagsview } = themeConfig.value;
 			return layout !== 'classic' && isTagsview;
-		},
+		});
+		return {
+			setShowTagsView,
+		};
 	},
-};
+});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/tagsView/contextmenu.vue

@@ -1,97 +1,125 @@
 <template>
-	<div>
-		<transition name="el-zoom-in-center">
-			<ul
-				class="el-dropdown-menu el-popper el-dropdown-menu--medium custom-contextmenu"
-				:style="`top: ${dropdowns.y}px;left: ${dropdowns.x}px;`"
-				x-placement="bottom-end"
-				id="contextmenu"
-				v-show="isShow"
-			>
-				<li class="el-dropdown-menu__item" v-for="(v, k) in dropdownList" :key="k" @click="onCurrentContextmenuClick(v.id)">
-					<template v-if="!v.affix">
-						<i :class="v.icon"></i>
+	<transition name="el-zoom-in-center">
+		<div
+			aria-hidden="true"
+			class="el-dropdown__popper el-popper is-light is-pure custom-contextmenu"
+			role="tooltip"
+			data-popper-placement="bottom"
+			:style="`top: ${dropdowns.y + 5}px;left: ${dropdowns.x}px;`"
+			:key="Math.random()"
+			v-show="isShow"
+		>
+			<ul class="el-dropdown-menu">
+				<template v-for="(v, k) in dropdownList">
+					<li
+						class="el-dropdown-menu__item"
+						aria-disabled="false"
+						tabindex="-1"
+						:key="k"
+						v-if="!v.affix"
+						@click="onCurrentContextmenuClick(v.contextMenuClickId)"
+					>
+						<SvgIcon :name="v.icon" />
 						<span>{{ $t(v.txt) }}</span>
-					</template>
-				</li>
-				<div x-arrow class="popper__arrow" :style="{ left: `${arrowLeft}px` }"></div>
+					</li>
+				</template>
 			</ul>
-		</transition>
-	</div>
+			<div class="el-popper__arrow" :style="{ left: `${arrowLeft}px` }"></div>
+		</div>
+	</transition>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import { computed, defineComponent, reactive, toRefs, onMounted, onUnmounted, watch } from 'vue';
+
+export default defineComponent({
 	name: 'layoutTagsViewContextmenu',
 	props: {
 		dropdown: {
 			type: Object,
+			default: () => {
+				return {
+					x: 0,
+					y: 0,
+				};
+			},
 		},
 	},
-	data() {
-		return {
+	setup(props, { emit }) {
+		const state = reactive({
 			isShow: false,
 			dropdownList: [
-				{ id: 0, txt: 'message.tagsView.refresh', affix: false, icon: 'el-icon-refresh-right' },
-				{ id: 1, txt: 'message.tagsView.close', affix: false, icon: 'el-icon-close' },
-				{ id: 2, txt: 'message.tagsView.closeOther', affix: false, icon: 'el-icon-circle-close' },
-				{ id: 3, txt: 'message.tagsView.closeAll', affix: false, icon: 'el-icon-folder-delete' },
+				{ contextMenuClickId: 0, txt: 'message.tagsView.refresh', affix: false, icon: 'ele-RefreshRight' },
+				{ contextMenuClickId: 1, txt: 'message.tagsView.close', affix: false, icon: 'ele-Close' },
+				{ contextMenuClickId: 2, txt: 'message.tagsView.closeOther', affix: false, icon: 'ele-CircleClose' },
+				{ contextMenuClickId: 3, txt: 'message.tagsView.closeAll', affix: false, icon: 'ele-FolderDelete' },
+				{
+					contextMenuClickId: 4,
+					txt: 'message.tagsView.fullscreen',
+					affix: false,
+					icon: 'iconfont icon-fullscreen',
+				},
 			],
-			path: {},
-			arrowLeft: 5,
-		};
-	},
-	computed: {
-		dropdowns() {
-			// 99 为 `Dropdown 下拉菜单` 的宽度
-			if (this.dropdown.x + 99 > document.documentElement.clientWidth) {
+			item: {},
+			arrowLeft: 10,
+		});
+		// 父级传过来的坐标 x,y 值
+		const dropdowns = computed(() => {
+			// 117 为 `Dropdown 下拉菜单` 的宽度
+			if (props.dropdown.x + 117 > document.documentElement.clientWidth) {
 				return {
-					x: document.documentElement.clientWidth - 99 - 5,
-					y: this.dropdown.y,
+					x: document.documentElement.clientWidth - 117 - 5,
+					y: props.dropdown.y,
 				};
 			} else {
-				return this.dropdown;
+				return props.dropdown;
 			}
-		},
-	},
-	mounted() {
-		// 监听页面监听进行右键菜单的关闭
-		document.body.addEventListener('click', this.closeContextmenu);
-	},
-	methods: {
+		});
 		// 当前项菜单点击
-		onCurrentContextmenuClick(id) {
-			this.$emit('currentContextmenuClick', { id, path: this.path });
-		},
+		const onCurrentContextmenuClick = (contextMenuClickId: number) => {
+			emit('currentContextmenuClick', Object.assign({}, { contextMenuClickId }, state.item));
+		};
 		// 打开右键菜单：判断是否固定，固定则不显示关闭按钮
-		openContextmenu(item) {
-			this.path = item.path;
-			item.meta.isAffix ? (this.dropdownList[1].affix = true) : (this.dropdownList[1].affix = false);
-			this.closeContextmenu();
+		const openContextmenu = (item: any) => {
+			state.item = item;
+			item.meta.isAffix ? (state.dropdownList[1].affix = true) : (state.dropdownList[1].affix = false);
+			closeContextmenu();
 			setTimeout(() => {
-				this.isShow = true;
-			}, 80);
-		},
+				state.isShow = true;
+			}, 10);
+		};
 		// 关闭右键菜单
-		closeContextmenu() {
-			this.isShow = false;
-		},
-	},
-	destroyed() {
+		const closeContextmenu = () => {
+			state.isShow = false;
+		};
+		// 监听页面监听进行右键菜单的关闭
+		onMounted(() => {
+			document.body.addEventListener('click', closeContextmenu);
+		});
 		// 页面卸载时，移除右键菜单监听事件
-		document.body.removeEventListener('click', this.closeContextmenu);
-	},
-	// 监听下拉菜单位置
-	watch: {
-		dropdown: {
-			handler({ x }) {
-				if (x + 99 > document.documentElement.clientWidth) this.arrowLeft = 99 - (document.documentElement.clientWidth - x);
-				else this.arrowLeft = 10;
+		onUnmounted(() => {
+			document.body.removeEventListener('click', closeContextmenu);
+		});
+		// 监听下拉菜单位置
+		watch(
+			() => props.dropdown,
+			({ x }) => {
+				if (x + 117 > document.documentElement.clientWidth) state.arrowLeft = 117 - (document.documentElement.clientWidth - x);
+				else state.arrowLeft = 10;
 			},
-			deep: true,
-		},
+			{
+				deep: true,
+			}
+		);
+		return {
+			dropdowns,
+			openContextmenu,
+			closeContextmenu,
+			onCurrentContextmenuClick,
+			...toRefs(state),
+		};
 	},
-};
+});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/topBar/breadcrumb.vue

@@ -1,139 +0,0 @@
-<template>
-	<div class="layout-navbars-breadcrumb" :style="{ display: isShowBreadcrumb }">
-		<i
-			class="layout-navbars-breadcrumb-icon"
-			:class="getThemeConfig.isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'"
-			@click="onThemeConfigChange"
-		></i>
-		<el-breadcrumb class="layout-navbars-breadcrumb-hide">
-			<transition-group name="breadcrumb" mode="out-in">
-				<el-breadcrumb-item v-for="(v, k) in breadcrumbList" :key="v.path">
-					<span v-if="k === breadcrumbList.length - 1" class="layout-navbars-breadcrumb-span">
-						<i :class="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="getThemeConfig.isBreadcrumbIcon"></i>{{ $t(v.meta.title) }}
-					</span>
-					<a v-else @click.prevent="onBreadcrumbClick(v)">
-						<i :class="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="getThemeConfig.isBreadcrumbIcon"></i>{{ $t(v.meta.title) }}
-					</a>
-				</el-breadcrumb-item>
-			</transition-group>
-		</el-breadcrumb>
-	</div>
-</template>
-
-<script>
-import { Local } from '@/utils/storage.js';
-export default {
-	name: 'layoutBreadcrumb',
-	data() {
-		return {
-			breadcrumbList: [],
-			routeSplit: [],
-			routeSplitFirst: '',
-			routeSplitIndex: 1,
-		};
-	},
-	computed: {
-		// 获取布局配置信息
-		getThemeConfig() {
-			return this.$store.state.themeConfig.themeConfig;
-		},
-		// 动态设置经典、横向布局不显示
-		isShowBreadcrumb() {
-			const { layout, isBreadcrumb } = this.$store.state.themeConfig.themeConfig;
-			if (layout === 'classic' || layout === 'transverse') {
-				return 'none';
-			} else {
-				return isBreadcrumb ? '' : 'none';
-			}
-		},
-	},
-	mounted() {
-		this.initRouteSplit(this.$route.path);
-	},
-	methods: {
-		// breadcrumb 当前项点击时
-		onBreadcrumbClick(v) {
-			const { redirect, path } = v;
-			if (redirect) this.$router.push(redirect);
-			else this.$router.push(path);
-		},
-		// breadcrumb icon 点击菜单展开与收起
-		onThemeConfigChange() {
-			this.$store.state.themeConfig.themeConfig.isCollapse = !this.$store.state.themeConfig.themeConfig.isCollapse;
-			this.setLocalThemeConfig();
-		},
-		// 存储布局配置
-		setLocalThemeConfig() {
-			Local.remove('themeConfigPrev');
-			Local.set('themeConfigPrev', this.$store.state.themeConfig.themeConfig);
-		},
-		// 递归设置 breadcrumb
-		getBreadcrumbList(arr) {
-			arr.map((item) => {
-				this.routeSplit.map((v, k, arrs) => {
-					if (this.routeSplitFirst === item.path) {
-						this.routeSplitFirst += `/${arrs[this.routeSplitIndex]}`;
-						this.breadcrumbList.push(item);
-						this.routeSplitIndex++;
-						if (item.children) this.getBreadcrumbList(item.children);
-					}
-				});
-			});
-		},
-		// 当前路由分割处理
-		initRouteSplit(path) {
-			this.breadcrumbList = [
-				{
-					path: '/',
-					meta: {
-						title: this.$store.state.routesList.routesList[0].meta.title,
-						icon: this.$store.state.routesList.routesList[0].meta.icon,
-					},
-				},
-			];
-			this.routeSplit = path.split('/');
-			this.routeSplit.shift();
-			this.routeSplitFirst = `/${this.routeSplit[0]}`;
-			this.routeSplitIndex = 1;
-			this.getBreadcrumbList(this.$store.state.routesList.routesList);
-		},
-	},
-	// 监听路由的变化
-	watch: {
-		$route: {
-			handler(newVal) {
-				this.initRouteSplit(newVal.path);
-			},
-			deep: true,
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.layout-navbars-breadcrumb {
-	flex: 1;
-	height: inherit;
-	display: flex;
-	align-items: center;
-	padding-left: 15px;
-	.layout-navbars-breadcrumb-icon {
-		cursor: pointer;
-		font-size: 18px;
-		margin-right: 15px;
-		color: var(--prev-bg-topBarColor);
-		opacity: 0.8;
-		&:hover {
-			opacity: 1;
-		}
-	}
-	.layout-navbars-breadcrumb-span {
-		opacity: 0.7;
-		color: var(--prev-bg-topBarColor);
-	}
-	.layout-navbars-breadcrumb-iconfont {
-		font-size: 14px;
-		margin-right: 5px;
-	}
-}
-</style>

src/layout/navBars/topBar/index.vue

@@ -1,77 +0,0 @@
-<template>
-	<div class="layout-navbars-breadcrumb-index">
-		<Logo v-if="setIsShowLogo" />
-		<Breadcrumb />
-		<Horizontal :menuList="menuList" v-if="isLayoutTransverse" />
-		<User />
-	</div>
-</template>
-
-<script>
-import Breadcrumb from '@/layout/navBars/topBar/breadcrumb.vue';
-import User from '@/layout/navBars/topBar/user.vue';
-import Logo from '@/layout/logo/index.vue';
-import Horizontal from '@/layout/navMenu/horizontal.vue';
-export default {
-	name: 'layoutNavBars',
-	components: { Breadcrumb, User, Logo, Horizontal },
-	data() {
-		return {
-			menuList: [],
-		};
-	},
-	computed: {
-		// 设置 logo 是否显示
-		setIsShowLogo() {
-			let { isShowLogo, layout } = this.$store.state.themeConfig.themeConfig;
-			return (isShowLogo && layout === 'classic') || (isShowLogo && layout === 'transverse');
-		},
-		// 设置是否显示横向菜单
-		isLayoutTransverse() {
-			let { layout, isClassicSplitMenu } = this.$store.state.themeConfig.themeConfig;
-			return layout === 'transverse' || (isClassicSplitMenu && layout === 'classic');
-		},
-	},
-	mounted() {
-		this.setFilterRoutes();
-	},
-	methods: {
-		// 设置路由的过滤
-		setFilterRoutes() {
-			this.menuList = this.filterRoutesFun(this.$store.state.routesList.routesList);
-		},
-		// 设置路由的过滤递归函数
-		filterRoutesFun(arr) {
-			return arr
-				.filter((item) => !item.meta.isHide)
-				.map((item) => {
-					item = Object.assign({}, item);
-					if (item.children) item.children = this.filterRoutesFun(item.children);
-					return item;
-				});
-		},
-	},
-	watch: {
-		// 监听 vuex 数据变化
-		'$store.state': {
-			handler(val) {
-				if (val.routesList.routesList.length === this.menuList.length) return false;
-				this.setFilterRoutes();
-			},
-			deep: true,
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.layout-navbars-breadcrumb-index {
-	height: 50px;
-	display: flex;
-	align-items: center;
-	padding-right: 15px;
-	overflow: hidden;
-	background: var(--prev-bg-topBar);
-	border-bottom: 1px solid var(--prev-border-color-lighter);
-}
-</style>

src/layout/navBars/topBar/search.vue

@@ -1,100 +0,0 @@
-<template>
-	<div class="layout-search-dialog">
-		<el-dialog :visible.sync="isShowSearch" width="300px" destroy-on-close :modal="false" fullscreen :show-close="false">
-			<el-autocomplete
-				v-model="menuQuery"
-				:fetch-suggestions="menuSearch"
-				:placeholder="$t('message.user.searchPlaceholder')"
-				prefix-icon="el-icon-search"
-				ref="layoutMenuAutocompleteRef"
-				@select="onHandleSelect"
-				@blur="onSearchBlur"
-			>
-				<template slot-scope="{ item }">
-					<div><i :class="item.meta.icon" class="mr10"></i>{{ $t(item.meta.title) }}</div>
-				</template>
-			</el-autocomplete>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'layoutBreadcrumbSearch',
-	data() {
-		return {
-			isShowSearch: false,
-			menuQuery: '',
-			tagsViewList: [],
-		};
-	},
-	methods: {
-		// 搜索弹窗打开
-		openSearch() {
-			this.menuQuery = '';
-			this.isShowSearch = true;
-			this.initTageView();
-			this.$nextTick(() => {
-				this.$refs.layoutMenuAutocompleteRef.focus();
-			});
-		},
-		// 搜索弹窗关闭
-		closeSearch() {
-			setTimeout(() => {
-				this.isShowSearch = false;
-			}, 150);
-		},
-		// 菜单搜索数据过滤
-		menuSearch(queryString, cb) {
-			let results = queryString ? this.tagsViewList.filter(this.createFilter(queryString)) : this.tagsViewList;
-			cb(results);
-		},
-		// 菜单搜索过滤
-		createFilter(queryString) {
-			return (restaurant) => {
-				return (
-					restaurant.path.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
-					restaurant.meta.title.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
-					this.$t(restaurant.meta.title).toLowerCase().indexOf(queryString.toLowerCase()) > -1
-				);
-			};
-		},
-		// 初始化菜单数据
-		initTageView() {
-			if (this.tagsViewList.length > 0) return false;
-			this.$store.state.tagsViewRoutes.tagsViewRoutes.map((v) => {
-				if (!v.meta.isHide) this.tagsViewList.push({ ...v });
-			});
-		},
-		// 当前菜单选中时
-		onHandleSelect(item) {
-			let { path, redirect } = item;
-			if (item.meta.isLink && !item.meta.isIframe) window.open(item.meta.isLink);
-			else if (redirect) this.$router.push(redirect);
-			else this.$router.push(path);
-			this.closeSearch();
-		},
-		// input 失去焦点时
-		onSearchBlur() {
-			this.closeSearch();
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.layout-search-dialog {
-	::v-deep .el-dialog {
-		box-shadow: unset !important;
-		border-radius: 0 !important;
-		background: rgba(0, 0, 0, 0.5);
-	}
-	::v-deep .el-autocomplete {
-		width: 560px;
-		position: absolute;
-		top: 100px;
-		left: 50%;
-		transform: translateX(-50%);
-	}
-}
-</style>

src/layout/navBars/topBar/setings.vue

@@ -1,538 +0,0 @@
-<template>
-	<div class="layout-breadcrumb-seting">
-		<el-drawer
-			:title="$t('message.layout.configTitle')"
-			:visible.sync="getThemeConfig.isDrawer"
-			direction="rtl"
-			destroy-on-close
-			size="240px"
-			@close="onDrawerClose"
-		>
-			<el-scrollbar class="layout-breadcrumb-seting-bar">
-				<!-- 全局主题 -->
-				<el-divider content-position="left">{{ $t('message.layout.oneTitle') }}</el-divider>
-				<div class="layout-breadcrumb-seting-bar-flex">
-					<div class="layout-breadcrumb-seting-bar-flex-label">primary</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-color-picker v-model="getThemeConfig.primary" size="small" @change="onColorPickerChange"> </el-color-picker>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsDark') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isIsDark" :width="35" @change="onAddDarkChange"></el-switch>
-					</div>
-				</div>
-
-				<!-- 界面设置 -->
-				<el-divider content-position="left">{{ $t('message.layout.threeTitle') }}</el-divider>
-				<div class="layout-breadcrumb-seting-bar-flex">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsCollapse') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isCollapse" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsUniqueOpened') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isUniqueOpened" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsFixedHeader') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isFixedHeader" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-
-				<!-- 界面显示 -->
-				<el-divider content-position="left">{{ $t('message.layout.fourTitle') }}</el-divider>
-				<div class="layout-breadcrumb-seting-bar-flex">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsShowLogo') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isShowLogo" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-				<div
-					class="layout-breadcrumb-seting-bar-flex mt15"
-					:style="{ opacity: getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse' ? 0.5 : 1 }"
-				>
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsBreadcrumb') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch
-							v-model="getThemeConfig.isBreadcrumb"
-							:disabled="getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse'"
-							:width="35"
-							@change="setLocalThemeConfig"
-						></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsBreadcrumbIcon') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isBreadcrumbIcon" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsview') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isTagsview" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsviewIcon') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isTagsviewIcon" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsCacheTagsView') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isCacheTagsView" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsFooter') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isFooter" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsGrayscale') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isGrayscale" :width="35" @change="onAddFilterChange('grayscale')"></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsInvert') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isInvert" :width="35" @change="onAddFilterChange('invert')"></el-switch>
-					</div>
-				</div>
-
-				<!-- 其它设置 -->
-				<el-divider content-position="left">{{ $t('message.layout.fiveTitle') }}</el-divider>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveTagsStyle') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-select v-model="getThemeConfig.tagsStyle" placeholder="请选择" size="mini" style="width: 90px" @change="setLocalThemeConfig">
-							<el-option label="风格1" value="tags-style-one"></el-option>
-						</el-select>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveAnimation') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-select v-model="getThemeConfig.animation" placeholder="请选择" size="mini" style="width: 90px" @change="setLocalThemeConfig">
-							<el-option label="slide-right" value="slide-right"></el-option>
-							<el-option label="slide-left" value="slide-left"></el-option>
-							<el-option label="opacitys" value="opacitys"></el-option>
-						</el-select>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideStyle') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-select v-model="getThemeConfig.columnsAsideStyle" placeholder="请选择" size="mini" style="width: 90px" @change="setLocalThemeConfig">
-							<el-option label="圆角" value="columns-round"></el-option>
-							<el-option label="卡片" value="columns-card"></el-option>
-						</el-select>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15 mb28">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideLayout') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-select v-model="getThemeConfig.columnsAsideLayout" placeholder="请选择" size="mini" style="width: 90px" @change="setLocalThemeConfig">
-							<el-option label="水平" value="columns-horizontal"></el-option>
-							<el-option label="垂直" value="columns-vertical"></el-option>
-						</el-select>
-					</div>
-				</div>
-
-				<!-- 布局切换 -->
-				<el-divider content-position="left">{{ $t('message.layout.sixTitle') }}</el-divider>
-				<div class="layout-drawer-content-flex">
-					<!-- defaults 布局 -->
-					<div class="layout-drawer-content-item" @click="onSetLayout('defaults')">
-						<section class="el-container el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'defaults' }">
-							<aside class="el-aside" style="width: 20px"></aside>
-							<section class="el-container is-vertical">
-								<header class="el-header" style="height: 10px"></header>
-								<main class="el-main"></main>
-							</section>
-						</section>
-						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'defaults' }">
-							<div class="layout-tips-box">
-								<p class="layout-tips-txt">{{ $t('message.layout.sixDefaults') }}</p>
-							</div>
-						</div>
-					</div>
-					<!-- classic 布局 -->
-					<div class="layout-drawer-content-item" @click="onSetLayout('classic')">
-						<section class="el-container is-vertical el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'classic' }">
-							<header class="el-header" style="height: 10px"></header>
-							<section class="el-container">
-								<aside class="el-aside" style="width: 20px"></aside>
-								<section class="el-container is-vertical">
-									<main class="el-main"></main>
-								</section>
-							</section>
-						</section>
-						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'classic' }">
-							<div class="layout-tips-box">
-								<p class="layout-tips-txt">{{ $t('message.layout.sixClassic') }}</p>
-							</div>
-						</div>
-					</div>
-					<!-- transverse 布局 -->
-					<div class="layout-drawer-content-item" @click="onSetLayout('transverse')">
-						<section class="el-container is-vertical el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'transverse' }">
-							<header class="el-header" style="height: 10px"></header>
-							<section class="el-container">
-								<section class="el-container is-vertical">
-									<main class="el-main"></main>
-								</section>
-							</section>
-						</section>
-						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'transverse' }">
-							<div class="layout-tips-box">
-								<p class="layout-tips-txt">{{ $t('message.layout.sixTransverse') }}</p>
-							</div>
-						</div>
-					</div>
-					<!-- columns 布局 -->
-					<div class="layout-drawer-content-item" @click="onSetLayout('columns')">
-						<section class="el-container el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'columns' }">
-							<aside class="el-aside-dark" style="width: 10px"></aside>
-							<aside class="el-aside" style="width: 20px"></aside>
-							<section class="el-container is-vertical">
-								<header class="el-header" style="height: 10px"></header>
-								<main class="el-main"></main>
-							</section>
-						</section>
-						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'columns' }">
-							<div class="layout-tips-box">
-								<p class="layout-tips-txt">{{ $t('message.layout.sixColumns') }}</p>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="copy-config">
-					<el-alert :title="$t('message.layout.tipText')" type="warning" :closable="false"> </el-alert>
-					<el-button
-						size="small"
-						class="copy-config-btn"
-						icon="el-icon-document-copy"
-						type="primary"
-						ref="copyConfigBtnRef"
-						@click="onCopyConfigClick"
-						>{{ $t('message.layout.copyText') }}
-					</el-button>
-					<el-button size="small" class="copy-config-btn-reset" type="info" icon="el-icon-refresh-right" @click="onResetConfigClick">
-						{{ $t('message.layout.resetText') }}
-					</el-button>
-				</div>
-			</el-scrollbar>
-		</el-drawer>
-	</div>
-</template>
-
-<script>
-import ClipboardJS from 'clipboard';
-import { Local } from '@/utils/storage.js';
-import { useChangeColor } from '@/utils/theme.js';
-import config from '/package.json';
-export default {
-	name: 'layoutBreadcrumbSeting',
-	computed: {
-		// 获取布局配置信息
-		getThemeConfig() {
-			return this.$store.state.themeConfig.themeConfig;
-		},
-	},
-	created() {
-		// 判断当前布局是否不相同，不相同则初始化当前布局的样式，防止监听窗口大小改变时，布局配置logo、菜单背景等部分布局失效问题
-		if (!Local.get('frequency')) this.initSetLayoutChange();
-		Local.set('frequency', 1);
-		// 监听窗口大小改变，非默认布局，设置成默认布局（适配移动端）
-		this.bus.$on('layoutMobileResize', (res) => {
-			if (this.$store.state.themeConfig.themeConfig.layout === res.layout) return false;
-			this.$store.state.themeConfig.themeConfig.layout = res.layout;
-			this.$store.state.themeConfig.themeConfig.isDrawer = false;
-			this.$store.state.themeConfig.themeConfig.isCollapse = false;
-			this.initSetLayoutChange();
-		});
-	},
-	mounted() {
-		this.initLayoutConfig();
-	},
-	methods: {
-		// 全局主题
-		onColorPickerChange() {
-			if (!this.getThemeConfig.primary) return;
-			// 颜色加深
-			document.documentElement.style.setProperty('--prev-color-primary', this.getThemeConfig.primary);
-			// 颜色变浅
-			for (let i = 1; i <= 9; i++) {
-				document.documentElement.style.setProperty(
-					`--prev-color-primary-light-${i}`,
-					`${useChangeColor().getLightColor(this.getThemeConfig.primary, i / 10)}`
-				);
-			}
-			this.setLocalThemeConfig();
-		},
-		// 深色模式
-		onAddDarkChange() {
-			const body = document.documentElement;
-			if (this.getThemeConfig.isIsDark) body.setAttribute('data-theme', 'dark');
-			else body.setAttribute('data-theme', '');
-			this.setLocalThemeConfig();
-		},
-		// 初始化：刷新页面时，设置了值，直接取缓存中的值进行初始化
-		initLayoutConfig() {
-			window.addEventListener('load', () => {
-				// 默认样式
-				this.onColorPickerChange();
-				// 灰色模式
-				if (this.$store.state.themeConfig.themeConfig.isGrayscale) this.onAddFilterChange('grayscale');
-				// 色弱模式
-				if (this.$store.state.themeConfig.themeConfig.isInvert) this.onAddFilterChange('invert');
-				// 深色模式
-				if (this.$store.state.themeConfig.themeConfig.isIsDark) this.onAddDarkChange();
-				// 语言国际化
-				if (Local.get('themeConfigPrev')) this.$i18n.locale = Local.get('themeConfigPrev').globalI18n;
-			});
-		},
-		// 存储布局配置
-		setLocalThemeConfig() {
-			Local.remove('themeConfigPrev');
-			Local.set('themeConfigPrev', this.$store.state.themeConfig.themeConfig);
-			this.setLocalThemeConfigStyle();
-		},
-		// 存储布局配置全局主题样式（html根标签）
-		setLocalThemeConfigStyle() {
-			Local.set('themeConfigStyle', document.documentElement.style.cssText);
-		},
-		// 布局配置弹窗打开
-		openDrawer() {
-			this.$store.state.themeConfig.themeConfig.isDrawer = true;
-		},
-		// 关闭弹窗时，初始化变量
-		onDrawerClose() {
-			this.$store.state.themeConfig.themeConfig.isDrawer = false;
-			this.setLocalThemeConfig();
-		},
-		// 灰色模式/色弱模式
-		onAddFilterChange(attr) {
-			if (attr === 'grayscale') {
-				if (this.$store.state.themeConfig.themeConfig.isGrayscale) this.$store.state.themeConfig.themeConfig.isInvert = false;
-			} else {
-				if (this.$store.state.themeConfig.themeConfig.isInvert) this.$store.state.themeConfig.themeConfig.isGrayscale = false;
-			}
-			const cssAttr =
-				attr === 'grayscale'
-					? `grayscale(${this.$store.state.themeConfig.themeConfig.isGrayscale ? 1 : 0})`
-					: `invert(${this.$store.state.themeConfig.themeConfig.isInvert ? '80%' : '0%'})`;
-			const appEle = document.body;
-			appEle.setAttribute('style', `filter: ${cssAttr};`);
-			this.setLocalThemeConfig();
-		},
-		// 布局切换
-		onSetLayout(layout) {
-			Local.set('oldLayout', layout);
-			if (this.$store.state.themeConfig.themeConfig.layout === layout) return false;
-			this.$store.state.themeConfig.themeConfig.layout = layout;
-			this.$store.state.themeConfig.themeConfig.isDrawer = false;
-			this.initSetLayoutChange();
-		},
-		// 设置布局切换，重置主题样式
-		initSetLayoutChange() {
-			if (this.$store.state.themeConfig.themeConfig.layout === 'classic') {
-				this.onBgColorPickerChange('menuBar', '#ffffff');
-				this.onBgColorPickerChange('menuBarColor', '#606266');
-				this.onBgColorPickerChange('topBar', '#ffffff');
-				this.onBgColorPickerChange('topBarColor', '#606266');
-			} else if (this.$store.state.themeConfig.themeConfig.layout === 'transverse') {
-				this.onBgColorPickerChange('menuBarColor', '#ffffff');
-				this.onBgColorPickerChange('topBar', '#545c64');
-				this.onBgColorPickerChange('topBarColor', '#ffffff');
-			} else if (this.$store.state.themeConfig.themeConfig.layout === 'columns') {
-				this.onBgColorPickerChange('menuBar', '#ffffff');
-				this.onBgColorPickerChange('menuBarColor', '#606266');
-				this.onBgColorPickerChange('topBar', '#ffffff');
-				this.onBgColorPickerChange('topBarColor', '#606266');
-			} else {
-				this.onBgColorPickerChange('menuBar', '#545c64');
-				this.onBgColorPickerChange('menuBarColor', '#eaeaea');
-				this.onBgColorPickerChange('topBar', '#ffffff');
-				this.onBgColorPickerChange('topBarColor', '#606266');
-			}
-		},
-		// 菜单 / 顶栏背景等
-		onBgColorPickerChange(bg, rgb) {
-			document.documentElement.style.setProperty(`--prev-bg-${bg}`, rgb);
-			this.setLocalThemeConfigStyle();
-		},
-		// 一键复制配置
-		onCopyConfigClick() {
-			this.$store.state.themeConfig.themeConfig.isDrawer = false;
-			let clipboardJS = new ClipboardJS('.copy-config-btn', {
-				text: () => JSON.stringify(this.$store.state.themeConfig.themeConfig),
-			});
-			clipboardJS.on('success', () => {
-				this.$message.success('配置复制成功');
-				this.isDrawer = false;
-				clipboardJS.destroy();
-			});
-			clipboardJS.on('error', () => {
-				this.$message.error('配置复制失败');
-			});
-		},
-		// 一键恢复默认
-		onResetConfigClick() {
-			Local.clear();
-			window.location.reload();
-			Local.set('version', config.version);
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.layout-breadcrumb-seting-bar {
-	height: calc(100vh - 50px);
-	padding: 0 15px;
-	::v-deep .el-scrollbar__view {
-		overflow-x: hidden !important;
-	}
-	.layout-breadcrumb-seting-bar-flex {
-		display: flex;
-		align-items: center;
-		&-label {
-			flex: 1;
-			color: var(--prev-color-text-primary);
-		}
-	}
-	.layout-drawer-content-flex {
-		overflow: hidden;
-		display: flex;
-		flex-wrap: wrap;
-		align-content: flex-start;
-		margin: 0 -5px;
-		.layout-drawer-content-item {
-			width: 50%;
-			height: 70px;
-			cursor: pointer;
-			border: 1px solid transparent;
-			position: relative;
-			padding: 5px;
-			.el-container {
-				height: 100%;
-				.el-aside-dark {
-					background-color: var(--prev-color-seting-header);
-				}
-				.el-aside {
-					background-color: var(--prev-color-seting-aside);
-				}
-				.el-header {
-					background-color: var(--prev-color-seting-header);
-				}
-				.el-main {
-					background-color: var(--prev-color-seting-main);
-				}
-			}
-			.el-circular {
-				border-radius: 2px;
-				overflow: hidden;
-				border: 1px solid transparent;
-				transition: all 0.3s ease-in-out;
-			}
-			.drawer-layout-active {
-				border: 1px solid;
-				border-color: var(--prev-color-primary);
-			}
-			.layout-tips-warp,
-			.layout-tips-warp-active {
-				transition: all 0.3s ease-in-out;
-				position: absolute;
-				left: 50%;
-				top: 50%;
-				transform: translate(-50%, -50%);
-				border: 1px solid;
-				border-color: var(--prev-color-primary-light-5);
-				border-radius: 100%;
-				padding: 4px;
-				.layout-tips-box {
-					transition: inherit;
-					width: 30px;
-					height: 30px;
-					z-index: 9;
-					border: 1px solid;
-					border-color: var(--prev-color-primary-light-5);
-					border-radius: 100%;
-					.layout-tips-txt {
-						transition: inherit;
-						position: relative;
-						top: 5px;
-						font-size: 12px;
-						line-height: 1;
-						letter-spacing: 2px;
-						white-space: nowrap;
-						color: var(--prev-color-primary-light-5);
-						text-align: center;
-						transform: rotate(30deg);
-						left: -1px;
-						background-color: var(--prev-color-seting-main);
-						width: 32px;
-						height: 17px;
-						line-height: 17px;
-					}
-				}
-			}
-			.layout-tips-warp-active {
-				border: 1px solid;
-				border-color: var(--prev-color-primary);
-				.layout-tips-box {
-					border: 1px solid;
-					border-color: var(--prev-color-primary);
-					.layout-tips-txt {
-						color: var(--prev-color-primary) !important;
-						background-color: var(--prev-color-seting-main) !important;
-					}
-				}
-			}
-			&:hover {
-				.el-circular {
-					transition: all 0.3s ease-in-out;
-					border: 1px solid;
-					border-color: var(--prev-color-primary);
-				}
-				.layout-tips-warp {
-					transition: all 0.3s ease-in-out;
-					border-color: var(--prev-color-primary);
-					.layout-tips-box {
-						transition: inherit;
-						border-color: var(--prev-color-primary);
-						.layout-tips-txt {
-							transition: inherit;
-							color: var(--prev-color-primary) !important;
-							background-color: var(--prev-color-seting-main) !important;
-						}
-					}
-				}
-			}
-		}
-	}
-	.copy-config {
-		margin: 10px 0;
-		.copy-config-btn {
-			width: 100%;
-			margin-top: 15px;
-		}
-		.copy-config-btn-reset {
-			width: 100%;
-			margin: 10px 0 0;
-		}
-	}
-}
-</style>

src/layout/navBars/topBar/user.vue

@@ -1,265 +0,0 @@
-<template>
-	<div class="layout-navbars-breadcrumb-user" :style="{ flex: layoutUserFlexNum }">
-		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
-			<div class="layout-navbars-breadcrumb-user-icon">
-				<i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
-			</div>
-			<template #dropdown>
-				<el-dropdown-menu>
-					<el-dropdown-item command="" :disabled="disabledSize === ''">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
-					<el-dropdown-item command="medium" :disabled="disabledSize === 'medium'">{{ $t('message.user.dropdownMedium') }}</el-dropdown-item>
-					<el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
-					<el-dropdown-item command="mini" :disabled="disabledSize === 'mini'">{{ $t('message.user.dropdownMini') }}</el-dropdown-item>
-				</el-dropdown-menu>
-			</template>
-		</el-dropdown>
-		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
-			<div class="layout-navbars-breadcrumb-user-icon">
-				<i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>
-			</div>
-			<el-dropdown-menu slot="dropdown">
-				<el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
-				<el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>
-				<el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>
-			</el-dropdown-menu>
-		</el-dropdown>
-		<div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
-			<i class="el-icon-search" :title="$t('message.user.title2')"></i>
-		</div>
-		<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
-			<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
-		</div>
-		<div class="layout-navbars-breadcrumb-user-icon" @click.stop="isShowUserNewsPopover = !isShowUserNewsPopover">
-			<el-popover placement="bottom" trigger="click" v-model="isShowUserNewsPopover" :width="300" popper-class="el-popover-pupop-user-news">
-				<el-badge :is-dot="true" slot="reference">
-					<i class="el-icon-bell" :title="$t('message.user.title4')"></i>
-				</el-badge>
-				<transition name="el-zoom-in-top">
-					<UserNews v-show="isShowUserNewsPopover" />
-				</transition>
-			</el-popover>
-		</div>
-		<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
-			<i
-				class="iconfont"
-				:title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
-				:class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
-			></i>
-		</div>
-		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onDropdownCommand">
-			<span class="layout-navbars-breadcrumb-user-link">
-				<img :src="getUserInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
-				{{ getUserInfos.userName === '' ? 'test' : getUserInfos.userName }}
-				<i class="el-icon-arrow-down el-icon--right"></i>
-			</span>
-			<el-dropdown-menu slot="dropdown">
-				<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
-				<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
-				<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
-				<el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
-				<el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>
-				<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
-			</el-dropdown-menu>
-		</el-dropdown>
-		<Search ref="searchRef" />
-	</div>
-</template>
-
-<script>
-import screenfull from 'screenfull';
-import { Session, Local } from '@/utils/storage.js';
-import UserNews from '@/layout/navBars/topBar/userNews.vue';
-import Search from '@/layout/navBars/topBar/search.vue';
-export default {
-	name: 'layoutBreadcrumbUser',
-	components: { UserNews, Search },
-	data() {
-		return {
-			isScreenfull: false,
-			isShowUserNewsPopover: false,
-			disabledI18n: 'zh-cn',
-			disabledSize: '',
-		};
-	},
-	computed: {
-		// 获取用户信息
-		getUserInfos() {
-			return this.$store.state.userInfos.userInfos;
-		},
-		// 设置弹性盒子布局 flex
-		layoutUserFlexNum() {
-			let { layout, isClassicSplitMenu } = this.$store.state.themeConfig.themeConfig;
-			let num = '';
-			if (layout === 'defaults' || (layout === 'classic' && !isClassicSplitMenu) || layout === 'columns') num = 1;
-			else num = null;
-			return num;
-		},
-	},
-	mounted() {
-		if (Local.get('themeConfigPrev')) {
-			this.initI18n();
-			this.initComponentSize();
-		}
-	},
-	methods: {
-		// 搜索点击
-		onSearchClick() {
-			this.$refs.searchRef.openSearch();
-		},
-		// 布局配置点击
-		onLayoutSetingClick() {
-			this.bus.$emit('openSetingsDrawer');
-		},
-		// 全屏点击
-		onScreenfullClick() {
-			if (!screenfull.isEnabled) {
-				this.$message.warning('暂不不支持全屏');
-				return false;
-			}
-			screenfull.toggle();
-			screenfull.on('change', () => {
-				if (screenfull.isFullscreen) this.isScreenfull = true;
-				else this.isScreenfull = false;
-			});
-			// 监听菜单 horizontal.vue 滚动条高度更新
-			this.bus.$emit('updateElScrollBar');
-		},
-		// 组件大小改变
-		onComponentSizeChange(size) {
-			Local.remove('themeConfigPrev');
-			this.$store.state.themeConfig.themeConfig.globalComponentSize = size;
-			Local.set('themeConfigPrev', this.$store.state.themeConfig.themeConfig);
-			this.$ELEMENT.size = size;
-			this.initComponentSize();
-			window.location.reload();
-		},
-		// 语言切换
-		onLanguageChange(lang) {
-			Local.remove('themeConfigPrev');
-			this.$store.state.themeConfig.themeConfig.globalI18n = lang;
-			Local.set('themeConfigPrev', this.$store.state.themeConfig.themeConfig);
-			this.$i18n.locale = lang;
-			this.initI18n();
-		},
-		// 初始化言语国际化
-		initI18n() {
-			switch (Local.get('themeConfigPrev').globalI18n) {
-				case 'zh-cn':
-					this.disabledI18n = 'zh-cn';
-					break;
-				case 'en':
-					this.disabledI18n = 'en';
-					break;
-				case 'zh-tw':
-					this.disabledI18n = 'zh-tw';
-					break;
-			}
-		},
-		// 初始化全局组件大小
-		initComponentSize() {
-			switch (Local.get('themeConfigPrev').globalComponentSize) {
-				case '':
-					this.disabledSize = '';
-					break;
-				case 'medium':
-					this.disabledSize = 'medium';
-					break;
-				case 'small':
-					this.disabledSize = 'small';
-					break;
-				case 'mini':
-					this.disabledSize = 'mini';
-					break;
-			}
-		},
-		// `dropdown 下拉菜单` 当前项点击
-		onDropdownCommand(path) {
-			if (path === 'logOut') {
-				setTimeout(() => {
-					this.$msgbox({
-						closeOnClickModal: false,
-						closeOnPressEscape: false,
-						title: this.$t('message.user.logOutTitle'),
-						message: this.$t('message.user.logOutMessage'),
-						showCancelButton: true,
-						confirmButtonText: this.$t('message.user.logOutConfirm'),
-						cancelButtonText: this.$t('message.user.logOutCancel'),
-						beforeClose: (action, instance, done) => {
-							if (action === 'confirm') {
-								instance.confirmButtonLoading = true;
-								instance.confirmButtonText = this.$t('message.user.logOutExit');
-								setTimeout(() => {
-									done();
-									setTimeout(() => {
-										instance.confirmButtonLoading = false;
-									}, 300);
-								}, 700);
-							} else {
-								done();
-							}
-						},
-					})
-						.then(() => {
-							// 清除缓存/token等
-							Session.clear();
-							// 使用 reload 时，不需要调用 resetRoute() 重置路由
-							window.location.reload();
-						})
-						.catch(() => {});
-				}, 150);
-			} else if (path === 'wareHouse') {
-				window.open('https://gitee.com/lyt-top/vue-next-admin');
-			} else {
-				this.$router.push(path);
-			}
-		},
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.layout-navbars-breadcrumb-user {
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-	&-link {
-		height: 100%;
-		display: flex;
-		align-items: center;
-		white-space: nowrap;
-		&-photo {
-			width: 25px;
-			height: 25px;
-			border-radius: 100%;
-		}
-	}
-	&-icon {
-		padding: 0 10px;
-		cursor: pointer;
-		color: var(--prev-bg-topBarColor);
-		height: 50px;
-		line-height: 50px;
-		display: flex;
-		align-items: center;
-		&:hover {
-			background: var(--prev-color-hover);
-			i {
-				display: inline-block;
-				animation: logoAnimation 0.3s ease-in-out;
-			}
-		}
-	}
-	& ::v-deep .el-dropdown {
-		color: var(--prev-bg-topBarColor);
-	}
-	& ::v-deep .el-badge {
-		height: 40px;
-		line-height: 40px;
-		display: flex;
-		align-items: center;
-	}
-	& ::v-deep .el-badge__content.is-fixed {
-		top: 12px;
-	}
-}
-</style>

src/layout/navMenu/horizontal.vue

@@ -1,24 +1,24 @@
 <template>
 	<div class="el-menu-horizontal-warp">
 		<el-scrollbar @wheel.native.prevent="onElMenuHorizontalScroll" ref="elMenuHorizontalScrollRef">
-			<el-menu router :default-active="defaultActive" background-color="transparent" mode="horizontal" @select="onHorizontalSelect">
-				<template v-for="val in menuList">
-					<el-submenu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
-						<template slot="title">
-							<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+			<el-menu router :default-active="defaultActive" :ellipsis="false" background-color="transparent" mode="horizontal">
+				<template v-for="val in menuLists">
+					<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
+						<template #title>
+							<SvgIcon :name="val.meta.icon" />
 							<span>{{ $t(val.meta.title) }}</span>
 						</template>
 						<SubItem :chil="val.children" />
-					</el-submenu>
+					</el-sub-menu>
 					<template v-else>
 						<el-menu-item :index="val.path" :key="val.path">
-							<template slot="title" v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
-								<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+							<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
+								<SvgIcon :name="val.meta.icon" />
 								{{ $t(val.meta.title) }}
 							</template>
-							<template slot="title" v-else>
-								<a :href="val.meta.isLink" target="_blank">
-									<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+							<template #title v-else>
+								<a :href="val.meta.isLink" target="_blank" rel="opener" class="w100">
+									<SvgIcon :name="val.meta.icon" />
 									{{ $t(val.meta.title) }}
 								</a>
 							</template>
@@ -30,9 +30,15 @@
 	</div>
 </template>
 
-<script>
-import SubItem from '@/layout/navMenu/subItem.vue';
-export default {
+<script lang="ts">
+import { toRefs, reactive, computed, defineComponent, getCurrentInstance, onMounted, nextTick, onBeforeMount } from 'vue';
+import { useRoute, onBeforeRouteUpdate } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import SubItem from '/@/layout/navMenu/subItem.vue';
+
+export default defineComponent({
 	name: 'navMenuHorizontal',
 	components: { SubItem },
 	props: {
@@ -41,44 +47,48 @@ export default {
 			default: () => [],
 		},
 	},
-	data() {
-		return {
+	setup(props) {
+		const { proxy } = <any>getCurrentInstance();
+		const stores = useRoutesList();
+		const storesThemeConfig = useThemeConfig();
+		const { routesList } = storeToRefs(stores);
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const route = useRoute();
+		const state = reactive({
 			defaultActive: null,
-		};
-	},
-	mounted() {
-		this.initElMenuOffsetLeft();
-		this.setCurrentRouterHighlight(this.$route.path);
-	},
-	methods: {
+		});
+		// 获取父级菜单数据
+		const menuLists = computed(() => {
+			return <any>props.menuList;
+		});
 		// 设置横向滚动条可以鼠标滚轮滚动
-		onElMenuHorizontalScroll(e) {
+		const onElMenuHorizontalScroll = (e: any) => {
 			const eventDelta = e.wheelDelta || -e.deltaY * 40;
-			this.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft = this.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft + eventDelta / 4;
-		},
+			proxy.$refs.elMenuHorizontalScrollRef.$refs.wrap$.scrollLeft = proxy.$refs.elMenuHorizontalScrollRef.$refs.wrap$.scrollLeft + eventDelta / 4;
+		};
 		// 初始化数据，页面刷新时，滚动条滚动到对应位置
-		initElMenuOffsetLeft() {
-			this.$nextTick(() => {
-				let els = document.querySelector('.el-menu.el-menu--horizontal li.is-active');
+		const initElMenuOffsetLeft = () => {
+			nextTick(() => {
+				let els: any = document.querySelector('.el-menu.el-menu--horizontal li.is-active');
 				if (!els) return false;
-				this.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft = els.offsetLeft;
+				proxy.$refs.elMenuHorizontalScrollRef.$refs.wrap$.scrollLeft = els.offsetLeft;
 			});
-		},
+		};
 		// 路由过滤递归函数
-		filterRoutesFun(arr) {
+		const filterRoutesFun = (arr: Array<string>) => {
 			return arr
-				.filter((item) => !item.meta.isHide)
-				.map((item) => {
+				.filter((item: any) => !item.meta.isHide)
+				.map((item: any) => {
 					item = Object.assign({}, item);
-					if (item.children) item.children = this.filterRoutesFun(item.children);
+					if (item.children) item.children = filterRoutesFun(item.children);
 					return item;
 				});
-		},
+		};
 		// 传送当前子级数据到菜单中
-		setSendClassicChildren(path) {
+		const setSendClassicChildren = (path: string) => {
 			const currentPathSplit = path.split('/');
-			let currentData = {};
-			this.filterRoutesFun(this.$store.state.routesList.routesList).map((v, k) => {
+			let currentData: any = {};
+			filterRoutesFun(routesList.value).map((v, k) => {
 				if (v.path === `/${currentPathSplit[1]}`) {
 					v['k'] = k;
 					currentData['item'] = [{ ...v }];
@@ -87,31 +97,43 @@ export default {
 				}
 			});
 			return currentData;
-		},
-		// 菜单激活回调
-		onHorizontalSelect(path) {
-			this.bus.$emit('setSendClassicChildren', this.setSendClassicChildren(path));
-		},
+		};
 		// 设置页面当前路由高亮
-		setCurrentRouterHighlight(path) {
-			const currentPathSplit = path.split('/');
-			if (this.$store.state.themeConfig.themeConfig.layout === 'classic') {
-				this.defaultActive = `/${currentPathSplit[1]}`;
+		const setCurrentRouterHighlight = (currentRoute: any) => {
+			const { path, meta } = currentRoute;
+			if (themeConfig.value.layout === 'classic') {
+				(<any>state.defaultActive) = `/${path.split('/')[1]}`;
 			} else {
-				this.defaultActive = path;
+				const pathSplit = meta.isDynamic ? meta.isDynamicPath.split('/') : path.split('/');
+				if (pathSplit.length >= 4 && meta.isHide) state.defaultActive = pathSplit.splice(0, 3).join('/');
+				else state.defaultActive = path;
 			}
-		},
+		};
+		// 页面加载前
+		onBeforeMount(() => {
+			setCurrentRouterHighlight(route);
+		});
+		// 页面加载时
+		onMounted(() => {
+			initElMenuOffsetLeft();
+		});
+		// 路由更新时
+		onBeforeRouteUpdate((to) => {
+			// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
+			setCurrentRouterHighlight(to);
+			// 修复经典布局开启切割菜单时，点击tagsView后左侧导航菜单数据不变的问题
+			let { layout, isClassicSplitMenu } = themeConfig.value;
+			if (layout === 'classic' && isClassicSplitMenu) {
+				proxy.mittBus.emit('setSendClassicChildren', setSendClassicChildren(to.path));
+			}
+		});
+		return {
+			menuLists,
+			onElMenuHorizontalScroll,
+			...toRefs(state),
+		};
 	},
-	watch: {
-		// 监听路由的变化
-		$route: {
-			handler(to) {
-				this.setCurrentRouterHighlight(to.path);
-			},
-			deep: true,
-		},
-	},
-};
+});
 </script>
 
 <style scoped lang="scss">
@@ -119,13 +141,10 @@ export default {
 	flex: 1;
 	overflow: hidden;
 	margin-right: 30px;
-	::v-deep .el-scrollbar__bar.is-vertical {
+	:deep(.el-scrollbar__bar.is-vertical) {
 		display: none;
 	}
-	::v-deep .el-scrollbar__wrap {
-		overflow-y: hidden !important;
-	}
-	::v-deep a {
+	:deep(a) {
 		width: 100%;
 	}
 	.el-menu.el-menu--horizontal {

src/layout/navMenu/subItem.vue

@@ -1,41 +1,48 @@
 <template>
-	<div>
-		<template v-for="val in chil">
-			<el-submenu :index="val.path" :key="val.path" v-if="val.children && val.children.length > 0">
-				<template slot="title">
-					<i :class="val.meta.icon"></i>
+	<template v-for="val in chils">
+		<el-sub-menu :index="val.path" :key="val.path" v-if="val.children && val.children.length > 0">
+			<template #title>
+				<SvgIcon :name="val.meta.icon" />
+				<span>{{ $t(val.meta.title) }}</span>
+			</template>
+			<sub-item :chil="val.children" />
+		</el-sub-menu>
+		<template v-else>
+			<el-menu-item :index="val.path" :key="val.path">
+				<template v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
+					<SvgIcon :name="val.meta.icon" />
 					<span>{{ $t(val.meta.title) }}</span>
 				</template>
-				<sub-item :chil="val.children" />
-			</el-submenu>
-			<template v-else>
-				<el-menu-item :index="val.path" :key="val.path">
-					<template v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
-						<i :class="val.meta.icon ? val.meta.icon : ''"></i>
-						<span>{{ $t(val.meta.title) }}</span>
-					</template>
-					<template v-else>
-						<a :href="val.meta.isLink" target="_blank">
-							<i :class="val.meta.icon ? val.meta.icon : ''"></i>
-							{{ $t(val.meta.title) }}
-						</a>
-					</template>
-				</el-menu-item>
-			</template>
+				<template v-else>
+					<a :href="val.meta.isLink" target="_blank" rel="opener" class="w100">
+						<SvgIcon :name="val.meta.icon" />
+						{{ $t(val.meta.title) }}
+					</a>
+				</template>
+			</el-menu-item>
 		</template>
-	</div>
+	</template>
 </template>
 
-<script>
-export default {
-	name: 'subItem',
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+
+export default defineComponent({
+	name: 'navMenuSubItem',
 	props: {
 		chil: {
 			type: Array,
-			default() {
-				return [];
-			},
+			default: () => [],
 		},
 	},
-};
+	setup(props) {
+		// 获取父级菜单数据
+		const chils = computed(() => {
+			return <any>props.chil;
+		});
+		return {
+			chils,
+		};
+	},
+});
 </script>

src/layout/navMenu/vertical.vue

@@ -1,28 +1,28 @@
 <template>
 	<el-menu
 		router
-		background-color="transparent"
 		:default-active="defaultActive"
-		:collapse="setIsCollapse"
+		background-color="transparent"
+		:collapse="isCollapse"
 		:unique-opened="getThemeConfig.isUniqueOpened"
 		:collapse-transition="false"
 	>
-		<template v-for="val in menuList">
-			<el-submenu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
-				<template slot="title">
-					<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+		<template v-for="val in menuLists">
+			<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
+				<template #title>
+					<SvgIcon :name="val.meta.icon" />
 					<span>{{ $t(val.meta.title) }}</span>
 				</template>
 				<SubItem :chil="val.children" />
-			</el-submenu>
+			</el-sub-menu>
 			<template v-else>
 				<el-menu-item :index="val.path" :key="val.path">
-					<i :class="val.meta.icon ? val.meta.icon : ''"></i>
-					<template slot="title" v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
+					<SvgIcon :name="val.meta.icon" />
+					<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
 						<span>{{ $t(val.meta.title) }}</span>
 					</template>
-					<template slot="title" v-else>
-						<a :href="val.meta.isLink" target="_blank">{{ $t(val.meta.title) }}</a>
+					<template #title v-else>
+						<a :href="val.meta.isLink" target="_blank" rel="opener" class="w100">{{ $t(val.meta.title) }}</a>
 					</template>
 				</el-menu-item>
 			</template>
@@ -30,44 +30,72 @@
 	</el-menu>
 </template>
 
-<script>
-import SubItem from '@/layout/navMenu/subItem.vue';
-export default {
+<script lang="ts">
+import { toRefs, reactive, computed, defineComponent, onMounted, watch } from 'vue';
+import { useRoute, onBeforeRouteUpdate } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import SubItem from '/@/layout/navMenu/subItem.vue';
+
+export default defineComponent({
 	name: 'navMenuVertical',
 	components: { SubItem },
 	props: {
 		menuList: {
 			type: Array,
-			default() {
-				return [];
-			},
+			default: () => [],
 		},
 	},
-	data() {
+	setup(props) {
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const route = useRoute();
+		const state = reactive({
+			// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
+			defaultActive: route.meta.isDynamic ? route.meta.isDynamicPath : route.path,
+			isCollapse: false,
+		});
+		// 获取父级菜单数据
+		const menuLists = computed(() => {
+			return <any>props.menuList;
+		});
+		// 获取布局配置信息
+		const getThemeConfig = computed(() => {
+			return themeConfig.value;
+		});
+		// 菜单高亮（详情时，父级高亮）
+		const setParentHighlight = (currentRoute: any) => {
+			const { path, meta } = currentRoute;
+			const pathSplit = meta.isDynamic ? meta.isDynamicPath.split('/') : path.split('/');
+			if (pathSplit.length >= 4 && meta.isHide) return pathSplit.splice(0, 3).join('/');
+			else return path;
+		};
+		// 设置菜单的收起/展开
+		watch(
+			themeConfig.value,
+			() => {
+				document.body.clientWidth <= 1000 ? (state.isCollapse = false) : (state.isCollapse = themeConfig.value.isCollapse);
+			},
+			{
+				immediate: true,
+			}
+		);
+		// 页面加载时
+		onMounted(() => {
+			state.defaultActive = setParentHighlight(route);
+		});
+		// 路由更新时
+		onBeforeRouteUpdate((to) => {
+			// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
+			state.defaultActive = setParentHighlight(to);
+			const clientWidth = document.body.clientWidth;
+			if (clientWidth < 1000) themeConfig.value.isCollapse = false;
+		});
 		return {
-			defaultActive: this.$route.path,
+			menuLists,
+			getThemeConfig,
+			...toRefs(state),
 		};
 	},
-	computed: {
-		// 获取布局配置信息
-		getThemeConfig() {
-			return this.$store.state.themeConfig.themeConfig;
-		},
-		// 设置左侧菜单是否展开/收起
-		setIsCollapse() {
-			return document.body.clientWidth < 1000 ? false : this.$store.state.themeConfig.themeConfig.isCollapse;
-		},
-	},
-	watch: {
-		// 监听路由的变化
-		$route: {
-			handler(to) {
-				this.defaultActive = to.path;
-				const clientWidth = document.body.clientWidth;
-				if (clientWidth < 1000) this.$store.state.themeConfig.themeConfig.isCollapse = false;
-			},
-			deep: true,
-		},
-	},
-};
+});
 </script>

src/layout/routerView/iframes.vue

@@ -1,46 +1,66 @@
 <template>
-	<div>
-		<div class="layout-view-bg-white flex h100" v-loading="iframeLoading">
-			<iframe :src="meta.isLink" frameborder="0" height="100%" width="100%" id="iframe"></iframe>
-		</div>
+	<div class="layout-view-bg-white flex mt1" :style="{ height: `calc(100vh - ${setIframeHeight}`, border: 'none' }" v-loading="iframeLoading">
+		<iframe :src="iframeUrl" frameborder="0" height="100%" width="100%" ref="iframeDom" v-show="!iframeLoading"></iframe>
 	</div>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import { defineComponent, reactive, toRefs, onMounted, nextTick, watch, computed } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useRoute } from 'vue-router';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
+export default defineComponent({
 	name: 'layoutIfameView',
-	props: {
-		meta: {
-			type: Object,
-			default: () => {},
-		},
-	},
-	data() {
-		return {
+	setup() {
+		const storesThemeConfig = useThemeConfig();
+		const storesTagsViewRoutes = useTagsViewRoutes();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+		const route = useRoute();
+		const state = reactive({
+			iframeDom: null as HTMLIFrameElement | null,
 			iframeLoading: true,
-		};
-	},
-	created() {
-		this.bus.$on('onTagsViewRefreshRouterView', (path) => {
-			if (this.$route.path !== path) return false;
-			this.$emit('getCurrentRouteMeta');
+			iframeUrl: '',
 		});
-	},
-	mounted() {
-		this.initIframeLoad();
-	},
-	methods: {
 		// 初始化页面加载 loading
-		initIframeLoad() {
-			this.$nextTick(() => {
-				this.iframeLoading = true;
-				const iframe = document.getElementById('iframe');
+		const initIframeLoad = () => {
+			state.iframeUrl = <any>route.meta.isLink;
+			nextTick(() => {
+				state.iframeLoading = true;
+				const iframe = state.iframeDom;
 				if (!iframe) return false;
 				iframe.onload = () => {
-					this.iframeLoading = false;
+					state.iframeLoading = false;
 				};
 			});
-		},
+		};
+		// 设置 iframe 的高度
+		const setIframeHeight = computed(() => {
+			let { isTagsview } = themeConfig.value;
+			if (isTagsViewCurrenFull.value) {
+				return `1px`;
+			} else {
+				if (isTagsview) return `86px`;
+				else return `51px`;
+			}
+		});
+		// 页面加载时
+		onMounted(() => {
+			initIframeLoad();
+		});
+		// 监听路由变化，多个 iframe 时使用
+		watch(
+			() => route.path,
+			() => {
+				initIframeLoad();
+			}
+		);
+		return {
+			setIframeHeight,
+			...toRefs(state),
+		};
 	},
-};
+});
 </script>

src/layout/routerView/link.vue

@@ -1,83 +1,61 @@
 <template>
-	<div class="layout-scrollbar layout-link-container">
-		<div class="layout-view-bg-white flex layout-view-link">
-			<div class="layout-link-warp">
-				<i class="layout-link-icon iconfont icon-xingqiu"></i>
-				<div class="layout-link-msg">页面 "{{ $t(meta.title) }}" 已在新窗口中打开</div>
-				<el-button class="mt30" round size="small" @click="onGotoFullPage">
-					<i class="iconfont icon-lianjie"></i>
-					<span>立即前往体验</span>
-				</el-button>
-			</div>
-		</div>
+	<div class="layout-view-bg-white flex layout-view-link" :style="{ height: `calc(100vh - ${setLinkHeight}` }">
+		<a :href="currentRouteMeta.isLink" target="_blank" rel="opener" class="flex-margin">
+			{{ $t(currentRouteMeta.title) }}：{{ currentRouteMeta.isLink }}
+		</a>
 	</div>
 </template>
 
-<script>
-import { verifyUrl } from '@/utils/toolsValidate';
-export default {
-	name: 'layoutLinkView',
-	props: {
-		meta: {
-			type: Object,
-			default: () => {},
-		},
-	},
-	methods: {
-		// 立即前往
-		onGotoFullPage() {
-			const { origin, pathname } = window.location;
-			if (verifyUrl(this.meta.isLink)) window.open(this.meta.isLink);
-			else window.open(`${origin}${pathname}#${this.meta.isLink}`);
-		},
-	},
-};
-</script>
+<script lang="ts">
+import { defineComponent, toRefs, reactive, computed, watch } from 'vue';
+import { useRoute, RouteMeta } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 
-<style scoped lang="scss">
-.layout-link-container {
-	.layout-link-warp {
-		margin: auto;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		i.layout-link-icon {
-			position: relative;
-			font-size: 100px;
-			color: var(--prev-color-primary);
-			&::after {
-				content: '';
-				position: absolute;
-				left: 50px;
-				top: 0;
-				width: 15px;
-				height: 100px;
-				background: linear-gradient(
-					rgba(255, 255, 255, 0.01),
-					rgba(255, 255, 255, 0.01),
-					rgba(255, 255, 255, 0.01),
-					rgba(255, 255, 255, 0.05),
-					rgba(255, 255, 255, 0.05),
-					rgba(255, 255, 255, 0.05),
-					rgba(235, 255, 255, 0.5),
-					rgba(255, 255, 255, 0.05),
-					rgba(255, 255, 255, 0.05),
-					rgba(255, 255, 255, 0.05),
-					rgba(255, 255, 255, 0.01),
-					rgba(255, 255, 255, 0.01),
-					rgba(255, 255, 255, 0.01)
-				);
-				transform: rotate(-15deg);
-				animation: toRight 5s linear infinite;
-			}
-		}
-		.layout-link-msg {
-			font-size: 12px;
-			color: var(--prev-bg-topBarColor);
-			opacity: 0.7;
-			margin-top: 15px;
-		}
-	}
+// 定义接口来定义对象的类型
+interface LinkViewState {
+	currentRouteMeta: {
+		isLink: string;
+		title: string;
+	};
 }
-</style>
+interface LinkViewRouteMeta extends RouteMeta {
+	isLink: string;
+	title: string;
+}
+
+export default defineComponent({
+	name: 'layoutLinkView',
+	setup() {
+		const storesThemeConfig = useThemeConfig();
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const route = useRoute();
+		const state = reactive<LinkViewState>({
+			currentRouteMeta: {
+				isLink: '',
+				title: '',
+			},
+		});
+		// 设置 link 的高度
+		const setLinkHeight = computed(() => {
+			let { isTagsview } = themeConfig.value;
+			if (isTagsview) return `115px`;
+			else return `80px`;
+		});
+		// 监听路由的变化，设置内容
+		watch(
+			() => route.path,
+			() => {
+				state.currentRouteMeta = <LinkViewRouteMeta>route.meta;
+			},
+			{
+				immediate: true,
+			}
+		);
+		return {
+			setLinkHeight,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/layout/routerView/parent.vue

@@ -1,47 +1,88 @@
 <template>
 	<div class="h100">
-		<transition :name="setTransitionName" mode="out-in">
-			<keep-alive :include="keepAliveNameList">
-				<router-view :key="refreshRouterViewKey" />
-			</keep-alive>
-		</transition>
+		<router-view v-slot="{ Component }">
+			<transition :name="setTransitionName" mode="out-in">
+				<keep-alive :include="getKeepAliveNames">
+					<component :is="Component" :key="refreshRouterViewKey" class="w100" />
+				</keep-alive>
+			</transition>
+		</router-view>
 	</div>
 </template>
 
-<script>
-export default {
-	name: 'parent',
-	data() {
-		return {
+<script lang="ts">
+import { computed, defineComponent, toRefs, reactive, getCurrentInstance, onBeforeMount, onUnmounted, nextTick, watch, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useKeepALiveNames } from '/@/stores/keepAliveNames';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { Session } from '/@/utils/storage';
+
+// 定义接口来定义对象的类型
+interface ParentViewState {
+	refreshRouterViewKey: null | string;
+	keepAliveNameList: string[];
+}
+
+export default defineComponent({
+	name: 'layoutParentView',
+	setup() {
+		const { proxy } = <any>getCurrentInstance();
+		const route = useRoute();
+		const storesKeepAliveNames = useKeepALiveNames();
+		const storesThemeConfig = useThemeConfig();
+		const { keepAliveNames, cachedViews } = storeToRefs(storesKeepAliveNames);
+		const { themeConfig } = storeToRefs(storesThemeConfig);
+		const state = reactive<ParentViewState>({
 			refreshRouterViewKey: null,
 			keepAliveNameList: [],
-			keepAliveNameNewList: [],
-		};
-	},
-	created() {
+		});
+		// 设置主界面切换动画
+		const setTransitionName = computed(() => {
+			return themeConfig.value.animation;
+		});
+		// 获取组件缓存列表(name值)
+		const getKeepAliveNames = computed(() => {
+			return themeConfig.value.isTagsview ? cachedViews.value : state.keepAliveNameList;
+		});
 		// 页面加载前，处理缓存，页面刷新时路由缓存处理
-		this.keepAliveNameList = this.getKeepAliveNames();
-		this.bus.$on('onTagsViewRefreshRouterView', (path) => {
-			if (this.$route.path !== path) return false;
-			this.keepAliveNameList = this.getKeepAliveNames().filter((name) => this.$route.name !== name);
-			this.refreshRouterViewKey = this.$route.path;
-			this.$nextTick(() => {
-				this.refreshRouterViewKey = null;
-				this.keepAliveNameList = this.getKeepAliveNames();
+		onBeforeMount(() => {
+			state.keepAliveNameList = keepAliveNames.value;
+			proxy.mittBus.on('onTagsViewRefreshRouterView', (fullPath: string) => {
+				state.keepAliveNameList = keepAliveNames.value.filter((name: string) => route.name !== name);
+				state.refreshRouterViewKey = null;
+				nextTick(() => {
+					state.refreshRouterViewKey = fullPath;
+					state.keepAliveNameList = keepAliveNames.value;
+				});
 			});
 		});
+		// 页面加载时
+		onMounted(() => {
+			// https://gitee.com/lyt-top/vue-next-admin/issues/I58U75
+			// https://gitee.com/lyt-top/vue-next-admin/issues/I59RXK
+			nextTick(() => {
+				setTimeout(() => {
+					if (themeConfig.value.isCacheTagsView) cachedViews.value = Session.get('tagsViewList')?.map((item: any) => item.name);
+				}, 0);
+			});
+		});
+		// 页面卸载时
+		onUnmounted(() => {
+			proxy.mittBus.off('onTagsViewRefreshRouterView', () => {});
+		});
+		// 监听路由变化，防止 tagsView 多标签时，切换动画消失
+		watch(
+			() => route.fullPath,
+			() => {
+				state.refreshRouterViewKey = decodeURI(route.fullPath);
+			}
+		);
+		return {
+			setTransitionName,
+			getKeepAliveNames,
+			...toRefs(state),
+		};
 	},
-	computed: {
-		// 设置主界面切换动画
-		setTransitionName() {
-			return this.$store.state.themeConfig.themeConfig.animation;
-		},
-	},
-	methods: {
-		// 获取路由缓存列表（name），默认路由全部缓存
-		getKeepAliveNames() {
-			return this.$store.state.keepAliveNames.keepAliveNames;
-		},
-	},
-};
+});
 </script>

src/layout/sponsors/index.vue

@@ -1,113 +0,0 @@
-<template>
-	<div class="sponsors-container" title="点击前往体验" v-show="sponsors.isShow" @click="onSponsorsClick">
-		<el-carousel height="240px" indicator-position="none" :arrow="setCarouselShow" @change="onCarouselChange">
-			<el-carousel-item v-for="(v, k) in sponsors.list" :key="k">
-				<img :src="v.url" class="sponsors-img" />
-				<div class="sponsors-text" v-html="v.text"></div>
-			</el-carousel-item>
-		</el-carousel>
-		<div class="sponsors-close" title="关闭赞助商" @click.stop="onCloseSponsors">
-			<i class="el-icon-close"></i>
-		</div>
-	</div>
-</template>
-
-<script>
-import sponsorsOne from '@/assets/ccflowRightNextAdmin.png';
-export default {
-	name: 'layoutSponsors',
-	data() {
-		return {
-			sponsors: {
-				list: [
-					{
-						url: sponsorsOne,
-						text: `驰骋BPM系统包含表单引擎+流程引擎+权限控制,方便集成,配置灵活,功能强大,适合中国国情的工作流引擎.演示:http://demo.ccflow.org。右上角点star方可加群: 1060674395`,
-						link: 'http://www.ccflow.org/',
-					},
-				],
-				isShow: false,
-				index: 0,
-			},
-		};
-	},
-	computed: {
-		// 设置轮播图箭头显示
-		setCarouselShow() {
-			return this.sponsors.list.length <= 1 ? 'never' : 'hover';
-		},
-	},
-	methods: {
-		// 关闭赞助商
-		onCloseSponsors() {
-			this.sponsors.isShow = false;
-		},
-		// 轮播图改变时
-		onCarouselChange(e) {
-			this.sponsors.index = e;
-		},
-		// 当前项内容点击
-		onSponsorsClick() {
-			window.open(this.sponsors.list[this.sponsors.index].link);
-		},
-		// 延迟显示，防止影响其它界面加载
-		delayShow() {
-			setTimeout(() => {
-				this.sponsors.isShow = true;
-			}, 3000);
-		},
-	},
-	mounted() {
-		this.delayShow();
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.sponsors-container {
-	position: fixed;
-	right: 15px;
-	bottom: 15px;
-	z-index: 3;
-	width: 200px;
-	background-color: var(--prev-bg-main-color);
-	box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
-	border-radius: 5px;
-	overflow: hidden;
-	cursor: pointer;
-	.sponsors-img {
-		width: 100%;
-		height: 80px;
-	}
-	.sponsors-text {
-		padding: 10px;
-		color: var(--prev-color-text-regular);
-		font-size: 14px;
-	}
-	.sponsors-close {
-		width: 60px;
-		height: 60px;
-		border-radius: 100%;
-		background: rgba(0, 0, 0, 0.05);
-		transition: all 0.3s ease;
-		position: absolute;
-		right: -35px;
-		bottom: -35px;
-		z-index: 5;
-		i {
-			position: absolute;
-			left: 9px;
-			top: 9px;
-			color: #afafaf;
-			transition: all 0.3s ease;
-		}
-		&:hover {
-			transition: all 0.3s ease;
-			i {
-				color: var(--prev-color-primary);
-				transition: all 0.3s ease;
-			}
-		}
-	}
-}
-</style>

src/layout/upgrade/index.vue

@@ -1,149 +0,0 @@
-<template>
-	<div class="upgrade-dialog">
-		<el-dialog
-			:visible.sync="isUpgrade"
-			width="300px"
-			destroy-on-close
-			:show-close="false"
-			:close-on-click-modal="false"
-			:close-on-press-escape="false"
-		>
-			<div class="upgrade-title">
-				<div class="upgrade-title-warp">
-					<span class="upgrade-title-warp-txt">{{ $t('message.upgrade.title') }}</span>
-					<span class="upgrade-title-warp-version">v{{ version }}</span>
-				</div>
-			</div>
-			<div class="upgrade-content">
-				{{ getThemeConfig.globalTitle }} {{ $t('message.upgrade.msg') }}
-				<div class="mt5">
-					<el-link type="primary" class="font12" href="https://gitee.com/lyt-top/vue-next-admin/blob/vue-prev-admin/CHANGELOG.md" target="_black">
-						CHANGELOG.md
-					</el-link>
-				</div>
-				<div class="upgrade-content-desc mt5">{{ $t('message.upgrade.desc') }}</div>
-			</div>
-			<div class="upgrade-btn">
-				<el-button round size="small" @click="onCancel">{{ $t('message.upgrade.btnOne') }}</el-button>
-				<el-button type="primary" round size="small" @click="onUpgrade" :loading="isLoading">{{ btnTxt }}</el-button>
-			</div>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-import { Local } from '@/utils/storage';
-import config from '/package.json';
-export default {
-	data() {
-		return {
-			isUpgrade: false,
-			version: config.version,
-			isLoading: false,
-			btnTxt: '',
-		};
-	},
-	computed: {
-		// 获取布局配置信息
-		getThemeConfig() {
-			return this.$store.state.themeConfig.themeConfig;
-		},
-	},
-	methods: {
-		// 残忍拒绝
-		onCancel() {
-			this.isUpgrade = false;
-		},
-		// 马上更新
-		onUpgrade() {
-			this.isLoading = true;
-			this.btnTxt = this.$t('message.upgrade.btnTwoLoading');
-			setTimeout(() => {
-				Local.clear();
-				window.location.reload();
-				Local.set('version', this.version);
-			}, 2000);
-		},
-		// 延迟显示，防止刷新时界面显示太快
-		delayShow() {
-			setTimeout(() => {
-				this.isUpgrade = true;
-			}, 2000);
-		},
-	},
-	mounted() {
-		this.delayShow();
-		setTimeout(() => {
-			this.btnTxt = this.$t('message.upgrade.btnTwo');
-		}, 200);
-	},
-};
-</script>
-
-<style scoped lang="scss">
-.upgrade-dialog {
-	& ::v-deep .el-dialog {
-		.el-dialog__body {
-			padding: 0 !important;
-		}
-		.el-dialog__header {
-			display: none !important;
-		}
-		.upgrade-title {
-			text-align: center;
-			height: 130px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			position: relative;
-			&::after {
-				content: '';
-				position: absolute;
-				background-color: var(--prev-color-primary-light-1);
-				width: 130%;
-				height: 130px;
-				border-bottom-left-radius: 100%;
-				border-bottom-right-radius: 100%;
-			}
-			.upgrade-title-warp {
-				z-index: 1;
-				position: relative;
-				.upgrade-title-warp-txt {
-					color: var(--prev-color-text-white);
-					font-size: 22px;
-					letter-spacing: 3px;
-				}
-				.upgrade-title-warp-version {
-					background-color: var(--prev-color-primary-light-4);
-					color: var(--prev-color-text-white);
-					font-size: 12px;
-					position: absolute;
-					display: flex;
-					top: -2px;
-					right: -50px;
-					padding: 2px 4px;
-					border-radius: 2px;
-				}
-			}
-		}
-		.upgrade-content {
-			padding: 20px;
-			line-height: 22px;
-			color: var(--prev-color-text-regular);
-			.upgrade-content-desc {
-				color: var(--prev-color-text-placeholder);
-				font-size: 12px;
-			}
-		}
-		.upgrade-btn {
-			border-top: 1px solid var(--prev-border-color-lighter);
-			display: flex;
-			justify-content: space-around;
-			padding: 15px 20px;
-			.el-button {
-				width: 100%;
-			}
-		}
-	}
-}
-</style>

src/main.js

@@ -1,24 +0,0 @@
-import Vue from 'vue';
-import App from './App.vue';
-import router from './router';
-import store from './store';
-
-import Particles from 'vue-particles';
-import Element from 'element-ui';
-import 'element-ui/lib/theme-chalk/index.css';
-import '@/theme/index.scss';
-import { i18n } from '@/i18n/index.js';
-import { globalComponentSize } from '@/utils/componentSize.js';
-
-Vue.use(Particles);
-Vue.use(Element, { i18n: (key, value) => i18n.t(key, value), size: globalComponentSize });
-
-Vue.config.productionTip = false;
-Vue.prototype.bus = new Vue();
-
-new Vue({
-	router,
-	store,
-	i18n,
-	render: (h) => h(App),
-}).$mount('#app');

src/main.ts

@@ -0,0 +1,22 @@
+import { createApp } from 'vue';
+import pinia from '/@/stores/index';
+import App from './App.vue';
+import router from './router';
+import { directive } from '/@/utils/directive';
+import { i18n } from '/@/i18n/index';
+import other from '/@/utils/other';
+
+import ElementPlus from 'element-plus';
+import 'element-plus/dist/index.css';
+import '/@/theme/index.scss';
+import mitt from 'mitt';
+import VueGridLayout from 'vue-grid-layout';
+
+const app = createApp(App);
+
+directive(app);
+other.elSvg(app);
+
+app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t }).use(i18n).use(VueGridLayout).mount('#app');
+
+app.config.globalProperties.mittBus = mitt();

src/router/backEnd.ts

@@ -0,0 +1,157 @@
+import { RouteRecordRaw } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import pinia from '/@/stores/index';
+import { useUserInfo } from '/@/stores/userInfo';
+import { useRequestOldRoutes } from '/@/stores/requestOldRoutes';
+import { Session } from '/@/utils/storage';
+import { NextLoading } from '/@/utils/loading';
+import { dynamicRoutes, notFoundAndNoPower } from '/@/router/route';
+import { formatTwoStageRoutes, formatFlatteningRoutes, router } from '/@/router/index';
+import { useRoutesList } from '/@/stores/routesList';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import { useMenuApi } from '/@/api/menu/index';
+
+const menuApi = useMenuApi();
+
+const layouModules: any = import.meta.glob('../layout/routerView/*.{vue,tsx}');
+const viewsModules: any = import.meta.glob('../views/**/*.{vue,tsx}');
+
+// 后端控制路由
+
+/**
+ * 获取目录下的 .vue、.tsx 全部文件
+ * @method import.meta.glob
+ * @link 参考：https://cn.vitejs.dev/guide/features.html#json
+ */
+const dynamicViewsModules: Record<string, Function> = Object.assign({}, { ...layouModules }, { ...viewsModules });
+
+/**
+ * 后端控制路由：初始化方法，防止刷新时路由丢失
+ * @method NextLoading 界面 loading 动画开始执行
+ * @method useUserInfo().setUserInfos() 触发初始化用户信息 pinia
+ * @method useRequestOldRoutes().setRequestOldRoutes() 存储接口原始路由（未处理component），根据需求选择使用
+ * @method setAddRoute 添加动态路由
+ * @method setFilterMenuAndCacheTagsViewRoutes 设置路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+ */
+export async function initBackEndControlRoutes() {
+	// 界面 loading 动画开始执行
+	if (window.nextLoading === undefined) NextLoading.start();
+	// 无 token 停止执行下一步
+	if (!Session.get('token')) return false;
+	// 触发初始化用户信息 pinia
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
+	await useUserInfo().setUserInfos();
+	// 获取路由菜单数据
+	const res = await getBackEndControlRoutes();
+	// 存储接口原始路由（未处理component），根据需求选择使用
+	useRequestOldRoutes().setRequestOldRoutes(JSON.parse(JSON.stringify(res.data)));
+	// 处理路由（component），替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
+	dynamicRoutes[0].children = await backEndComponent(res.data);
+	// 添加动态路由
+	await setAddRoute();
+	// 设置路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+	await setFilterMenuAndCacheTagsViewRoutes();
+}
+
+/**
+ * 设置路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+ * @description 用于左侧菜单、横向菜单的显示
+ * @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
+ */
+export function setFilterMenuAndCacheTagsViewRoutes() {
+	const storesRoutesList = useRoutesList(pinia);
+	storesRoutesList.setRoutesList(dynamicRoutes[0].children as any);
+	setCacheTagsViewRoutes();
+}
+
+/**
+ * 缓存多级嵌套数组处理后的一维数组
+ * @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
+ */
+export function setCacheTagsViewRoutes() {
+	const storesTagsView = useTagsViewRoutes(pinia);
+	storesTagsView.setTagsViewRoutes(formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes))[0].children);
+}
+
+/**
+ * 处理路由格式及添加捕获所有路由或 404 Not found 路由
+ * @description 替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
+ * @returns 返回替换后的路由数组
+ */
+export function setFilterRouteEnd() {
+	let filterRouteEnd: any = formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes));
+	filterRouteEnd[0].children = [...filterRouteEnd[0].children, ...notFoundAndNoPower];
+	return filterRouteEnd;
+}
+
+/**
+ * 添加动态路由
+ * @method router.addRoute
+ * @description 此处循环为 dynamicRoutes（/@/router/route）第一个顶级 children 的路由一维数组，非多级嵌套
+ * @link 参考：https://next.router.vuejs.org/zh/api/#addroute
+ */
+export async function setAddRoute() {
+	await setFilterRouteEnd().forEach((route: RouteRecordRaw) => {
+		router.addRoute(route);
+	});
+}
+
+/**
+ * 请求后端路由菜单接口
+ * @description isRequestRoutes 为 true，则开启后端控制路由
+ * @returns 返回后端路由菜单数据
+ */
+export function getBackEndControlRoutes() {
+	// 模拟 admin 与 test
+	const stores = useUserInfo(pinia);
+	const { userInfos } = storeToRefs(stores);
+	const auth = userInfos.value.roles[0];
+	// 管理员 admin
+	if (auth === 'admin') return menuApi.getMenuAdmin();
+	// 其它用户 test
+	else return menuApi.getMenuTest();
+}
+
+/**
+ * 重新请求后端路由菜单接口
+ * @description 用于菜单管理界面刷新菜单（未进行测试）
+ * @description 路径：/src/views/system/menu/component/addMenu.vue
+ */
+export function setBackEndControlRefreshRoutes() {
+	getBackEndControlRoutes();
+}
+
+/**
+ * 后端路由 component 转换
+ * @param routes 后端返回的路由表数组
+ * @returns 返回处理成函数后的 component
+ */
+export function backEndComponent(routes: any) {
+	if (!routes) return;
+	return routes.map((item: any) => {
+		if (item.component) item.component = dynamicImport(dynamicViewsModules, item.component as string);
+		item.children && backEndComponent(item.children);
+		return item;
+	});
+}
+
+/**
+ * 后端路由 component 转换函数
+ * @param dynamicViewsModules 获取目录下的 .vue、.tsx 全部文件
+ * @param component 当前要处理项 component
+ * @returns 返回处理成函数后的 component
+ */
+export function dynamicImport(dynamicViewsModules: Record<string, Function>, component: string) {
+	const keys = Object.keys(dynamicViewsModules);
+	const matchKeys = keys.filter((key) => {
+		const k = key.replace(/..\/views|../, '');
+		return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
+	});
+	if (matchKeys?.length === 1) {
+		const matchKey = matchKeys[0];
+		return dynamicViewsModules[matchKey];
+	}
+	if (matchKeys?.length > 1) {
+		return false;
+	}
+}

src/router/frontEnd.ts

@@ -0,0 +1,148 @@
+import { RouteRecordRaw } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { formatTwoStageRoutes, formatFlatteningRoutes, router } from '/@/router/index';
+import { dynamicRoutes, notFoundAndNoPower } from '/@/router/route';
+import pinia from '/@/stores/index';
+import { Session } from '/@/utils/storage';
+import { useUserInfo } from '/@/stores/userInfo';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import { useRoutesList } from '/@/stores/routesList';
+import { NextLoading } from '/@/utils/loading';
+
+// 前端控制路由
+
+/**
+ * 前端控制路由：初始化方法，防止刷新时路由丢失
+ * @method  NextLoading 界面 loading 动画开始执行
+ * @method useUserInfo(pinia).setUserInfos() 触发初始化用户信息 pinia
+ * @method setAddRoute 添加动态路由
+ * @method setFilterMenuAndCacheTagsViewRoutes 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+ */
+export async function initFrontEndControlRoutes() {
+	// 界面 loading 动画开始执行
+	if (window.nextLoading === undefined) NextLoading.start();
+	// 无 token 停止执行下一步
+	if (!Session.get('token')) return false;
+	// 触发初始化用户信息 pinia
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
+	await useUserInfo(pinia).setUserInfos();
+	// 添加动态路由
+	await setAddRoute();
+	// 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+	await setFilterMenuAndCacheTagsViewRoutes();
+}
+
+/**
+ * 添加动态路由
+ * @method router.addRoute
+ * @description 此处循环为 dynamicRoutes（/@/router/route）第一个顶级 children 的路由一维数组，非多级嵌套
+ * @link 参考：https://next.router.vuejs.org/zh/api/#addroute
+ */
+export async function setAddRoute() {
+	await setFilterRouteEnd().forEach((route: RouteRecordRaw) => {
+		router.addRoute(route);
+	});
+}
+
+/**
+ * 删除/重置路由
+ * @method router.removeRoute
+ * @description 此处循环为 dynamicRoutes（/@/router/route）第一个顶级 children 的路由一维数组，非多级嵌套
+ * @link 参考：https://next.router.vuejs.org/zh/api/#push
+ */
+export async function frontEndsResetRoute() {
+	await setFilterRouteEnd().forEach((route: RouteRecordRaw) => {
+		const routeName: any = route.name;
+		router.hasRoute(routeName) && router.removeRoute(routeName);
+	});
+}
+
+/**
+ * 获取有当前用户权限标识的路由数组，进行对原路由的替换
+ * @description 替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
+ * @returns 返回替换后的路由数组
+ */
+export function setFilterRouteEnd() {
+	let filterRouteEnd: any = formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes));
+	filterRouteEnd[0].children = [...setFilterRoute(filterRouteEnd[0].children), ...notFoundAndNoPower];
+	return filterRouteEnd;
+}
+
+/**
+ * 获取当前用户权限标识去比对路由表（未处理成多级嵌套路由）
+ * @description 这里主要用于动态路由的添加，router.addRoute
+ * @link 参考：https://next.router.vuejs.org/zh/api/#addroute
+ * @param chil dynamicRoutes（/@/router/route）第一个顶级 children 的下路由集合
+ * @returns 返回有当前用户权限标识的路由数组
+ */
+export function setFilterRoute(chil: any) {
+	const stores = useUserInfo(pinia);
+	const { userInfos } = storeToRefs(stores);
+	let filterRoute: any = [];
+	chil.forEach((route: any) => {
+		if (route.meta.roles) {
+			route.meta.roles.forEach((metaRoles: any) => {
+				userInfos.value.roles.forEach((roles: any) => {
+					if (metaRoles === roles) filterRoute.push({ ...route });
+				});
+			});
+		}
+	});
+	return filterRoute;
+}
+
+/**
+ * 缓存多级嵌套数组处理后的一维数组
+ * @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
+ */
+export function setCacheTagsViewRoutes() {
+	// 获取有权限的路由，否则 tagsView、菜单搜索中无权限的路由也将显示
+	const stores = useUserInfo(pinia);
+	const storesTagsView = useTagsViewRoutes(pinia);
+	const { userInfos } = storeToRefs(stores);
+	let rolesRoutes = setFilterHasRolesMenu(dynamicRoutes, userInfos.value.roles);
+	// 添加到 pinia setTagsViewRoutes 中
+	storesTagsView.setTagsViewRoutes(formatTwoStageRoutes(formatFlatteningRoutes(rolesRoutes))[0].children);
+}
+
+/**
+ * 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+ * @description 用于左侧菜单、横向菜单的显示
+ * @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
+ */
+export function setFilterMenuAndCacheTagsViewRoutes() {
+	const stores = useUserInfo(pinia);
+	const storesRoutesList = useRoutesList(pinia);
+	const { userInfos } = storeToRefs(stores);
+	storesRoutesList.setRoutesList(setFilterHasRolesMenu(dynamicRoutes[0].children, userInfos.value.roles));
+	setCacheTagsViewRoutes();
+}
+
+/**
+ * 判断路由 `meta.roles` 中是否包含当前登录用户权限字段
+ * @param roles 用户权限标识，在 userInfos（用户信息）的 roles（登录页登录时缓存到浏览器）数组
+ * @param route 当前循环时的路由项
+ * @returns 返回对比后有权限的路由项
+ */
+export function hasRoles(roles: any, route: any) {
+	if (route.meta && route.meta.roles) return roles.some((role: any) => route.meta.roles.includes(role));
+	else return true;
+}
+
+/**
+ * 获取当前用户权限标识去比对路由表，设置递归过滤有权限的路由
+ * @param routes 当前路由 children
+ * @param roles 用户权限标识，在 userInfos（用户信息）的 roles（登录页登录时缓存到浏览器）数组
+ * @returns 返回有权限的路由数组 `meta.roles` 中控制
+ */
+export function setFilterHasRolesMenu(routes: any, roles: any) {
+	const menu: any = [];
+	routes.forEach((route: any) => {
+		const item = { ...route };
+		if (hasRoles(roles, item)) {
+			if (item.children) item.children = setFilterHasRolesMenu(item.children, roles);
+			menu.push(item);
+		}
+	});
+	return menu;
+}

src/router/index.js

@@ -1,275 +0,0 @@
-import Vue from 'vue';
-import store from '../store';
-import VueRouter from 'vue-router';
-import NProgress from 'nprogress';
-import 'nprogress/nprogress.css';
-import { Session } from '@/utils/storage';
-import { PrevLoading } from '@/utils/loading.js';
-import { useMenuApi } from '@/api/menu';
-
-const menuApi = useMenuApi();
-
-// 解决 `element ui` 导航栏重复点菜单报错问题
-const originalPush = VueRouter.prototype.push;
-VueRouter.prototype.push = function push(location) {
-	return originalPush.call(this, location).catch((err) => err);
-};
-
-// 安装 VueRouter 插件
-Vue.use(VueRouter);
-
-// 定义动态路由
-const dynamicRoutes = [
-	{
-		path: '/',
-		name: '/',
-		component: 'layout/index',
-		redirect: '/home',
-		meta: {
-			isKeepAlive: true,
-		},
-		children: [],
-	},
-];
-
-// 定义静态路由
-const staticRoutes = [
-	{
-		path: '/login',
-		name: 'login',
-		component: () => import('@/views/login'),
-		meta: {
-			title: '登录',
-		},
-	},
-	{
-		path: '/404',
-		name: 'notFound',
-		component: () => import('@/views/error/404.vue'),
-		meta: {
-			title: 'message.staticRoutes.notFound',
-		},
-	},
-	{
-		path: '/401',
-		name: 'noPower',
-		component: () => import('@/views/error/401.vue'),
-		meta: {
-			title: 'message.staticRoutes.noPower',
-		},
-	},
-];
-
-// 加载静态路由
-const createRouter = () =>
-	new VueRouter({
-		routes: staticRoutes,
-	});
-
-// 创建路由
-const router = createRouter();
-
-// 加载 loading
-PrevLoading.start();
-
-// 多级嵌套数组处理成一维数组
-export function formatFlatteningRoutes(arr) {
-	if (arr.length <= 0) return false;
-	for (let i = 0; i < arr.length; i++) {
-		if (arr[i].children) {
-			arr = arr.slice(0, i + 1).concat(arr[i].children, arr.slice(i + 1));
-		}
-	}
-	return arr;
-}
-
-// 处理 tagsViewList 数据，默认路由全部缓存
-// isKeepAlive 处理 `name` 值，进行路由缓存
-export function formatTwoStageRoutes(arr) {
-	if (arr.length <= 0) return false;
-	const newArr = [];
-	const cacheList = [];
-	arr.forEach((v) => {
-		newArr.push({ ...v });
-		cacheList.push(v.name);
-		store.dispatch('keepAliveNames/setCacheKeepAlive', cacheList);
-	});
-	return newArr;
-}
-
-// 判断路由 meta.roles 中是否包含当前登录用户权限字段
-export function hasAuth(roles, route) {
-	if (route.meta && route.meta.roles) return roles.some((role) => route.meta.roles.includes(role));
-	else return true;
-}
-
-// 递归过滤有权限的路由
-export function setFilterMenuFun(routes, role) {
-	const menu = [];
-	routes.forEach((route) => {
-		const item = { ...route };
-		if (hasAuth(role, item)) {
-			if (item.children) item.children = setFilterMenuFun(item.children, role);
-			menu.push(item);
-		}
-	});
-	return menu;
-}
-
-// 缓存多级嵌套数组处理后的一维数组(tagsView、菜单搜索中使用：未过滤隐藏的(isHide))
-export function setCacheTagsViewRoutes(arr) {
-	// 先处理有权限的路由，否则 tagsView、菜单搜索中无权限的路由也将显示
-	let rolesRoutes = setFilterMenuFun(arr, store.state.userInfos.userInfos.roles);
-	// 添加到 vuex setTagsViewRoutes 中
-	store.dispatch('tagsViewRoutes/setTagsViewRoutes', formatTwoStageRoutes(formatFlatteningRoutes(rolesRoutes)));
-}
-
-// 递归处理多余的 layout : <router-view>，让需要访问的组件保持在第一层 layout 层。
-// 因为 `keep-alive` 只能缓存二级路由
-// 默认初始化时就执行
-export function keepAliveSplice(to) {
-	if (to.matched && to.matched.length > 2) {
-		to.matched.map((v, k) => {
-			if (v.components.default instanceof Function) {
-				v.components.default().then((components) => {
-					if (components.default.name === 'parent') {
-						to.matched.splice(k, 1);
-						router.push({ path: to.path, query: to.query });
-						keepAliveSplice(to);
-					}
-				});
-			} else {
-				if (v.components.default.name === 'parent') {
-					to.matched.splice(k, 1);
-					keepAliveSplice(to);
-				}
-			}
-		});
-	}
-}
-
-// 处理后端返回的 `component` 路径，拼装实现懒加载
-export function loadView(path) {
-	/**
-	 * 打包成一个 js、一个 css
-	 */
-	// if (path.indexOf('layout') > -1) return () => Promise.resolve(require(`@/${path}`));
-	// else return () => Promise.resolve(require(`@/views/${path}`));
-
-	/**
-	 * 打包成多个 js、多个 css
-	 */
-	if (path.indexOf('layout') > -1) return () => import(`@/${path}`);
-	else return () => import(`@/views/${path}`);
-}
-
-// 递归处理每一项 `component` 中的路径
-export function dynamicRouter(routes) {
-	return routes.map((view) => {
-		if (view.component) view.component = loadView(view.component);
-		if (view.children) dynamicRouter(view.children);
-		return view;
-	});
-}
-
-// 添加路由，模拟数据与方法，可自行进行修改 admin
-// 添加动态路由，`{ path: '*', redirect: '/404' }` 防止页面刷新，静态路由丢失问题
-// next({ ...to, replace: true }) 动态路由 addRoute 完毕后才放行，防止刷新时 NProgress 进度条加载2次
-// 文档地址：https://router.vuejs.org/zh/api/#router-addroutes
-export function adminUser(router, to, next) {
-	resetRouter();
-	menuApi
-		.getMenuAdmin()
-		.then(async (res) => {
-			// 读取用户信息，获取对应权限进行判断
-			store.dispatch('userInfos/setUserInfos');
-			store.dispatch('routesList/setRoutesList', setFilterMenuFun(res.data, store.state.userInfos.userInfos.roles));
-			dynamicRoutes[0].children = res.data;
-			const awaitRoute = await dynamicRouter(dynamicRoutes);
-			[...awaitRoute, { path: '*', redirect: '/404' }].forEach((route) => {
-				router.addRoute({ ...route });
-			});
-			setCacheTagsViewRoutes(JSON.parse(JSON.stringify(res.data)));
-			next({ ...to, replace: true });
-		})
-		.catch(() => {});
-}
-
-// 添加路由，模拟数据与方法，可自行进行修改 test
-// 添加动态路由，`{ path: '*', redirect: '/404' }` 防止页面刷新，静态路由丢失问题
-export function testUser(router, to, next) {
-	resetRouter();
-	menuApi
-		.getMenuTest()
-		.then(async (res) => {
-			// 读取用户信息，获取对应权限进行判断
-			store.dispatch('userInfos/setUserInfos');
-			store.dispatch('routesList/setRoutesList', setFilterMenuFun(res.data, store.state.userInfos.userInfos.roles));
-			dynamicRoutes[0].children = res.data;
-			const awaitRoute = await dynamicRouter(dynamicRoutes);
-			[...awaitRoute, { path: '*', redirect: '/404' }].forEach((route) => {
-				router.addRoute({ ...route });
-			});
-			setCacheTagsViewRoutes(JSON.parse(JSON.stringify(res.data)));
-			next({ ...to, replace: true });
-		})
-		.catch(() => {});
-}
-
-// 重置路由
-export function resetRouter() {
-	router.matcher = createRouter().matcher;
-}
-
-// 延迟关闭进度条
-export function delayNProgressDone(time = 300) {
-	setTimeout(() => {
-		NProgress.done();
-	}, time);
-}
-
-// 动态加载后端返回路由路由(模拟数据)
-export function getRouterList(router, to, next) {
-	if (!Session.get('userInfo')) return false;
-	if (Session.get('userInfo').userName === 'admin') adminUser(router, to, next);
-	else if (Session.get('userInfo').userName === 'test') testUser(router, to, next);
-}
-
-// 路由加载前
-router.beforeEach((to, from, next) => {
-	keepAliveSplice(to);
-	NProgress.configure({ showSpinner: false });
-	if (to.meta.title && to.path !== '/login') NProgress.start();
-	let token = Session.get('token');
-	if (to.path === '/login' && !token) {
-		NProgress.start();
-		next();
-		delayNProgressDone();
-	} else {
-		if (!token) {
-			NProgress.start();
-			next('/login');
-			Session.clear();
-			delayNProgressDone();
-		} else if (token && to.path === '/login') {
-			next('/home');
-			delayNProgressDone();
-		} else {
-			if (Object.keys(store.state.routesList.routesList).length <= 0) {
-				getRouterList(router, to, next);
-			} else {
-				next();
-				delayNProgressDone(0);
-			}
-		}
-	}
-});
-
-// 路由加载后
-router.afterEach(() => {
-	PrevLoading.done();
-	delayNProgressDone();
-});
-
-// 导出路由
-export default router;

src/router/index.ts

@@ -0,0 +1,132 @@
+import { createRouter, createWebHashHistory } from 'vue-router';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import pinia from '/@/stores/index';
+import { storeToRefs } from 'pinia';
+import { useKeepALiveNames } from '/@/stores/keepAliveNames';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { Session } from '/@/utils/storage';
+import { staticRoutes } from '/@/router/route';
+import { initFrontEndControlRoutes } from '/@/router/frontEnd';
+import { initBackEndControlRoutes } from '/@/router/backEnd';
+
+/**
+ * 1、前端控制路由时：isRequestRoutes 为 false，需要写 roles，需要走 setFilterRoute 方法。
+ * 2、后端控制路由时：isRequestRoutes 为 true，不需要写 roles，不需要走 setFilterRoute 方法），
+ * 相关方法已拆解到对应的 `backEnd.ts` 与 `frontEnd.ts`（他们互不影响，不需要同时改 2 个文件）。
+ * 特别说明：
+ * 1、前端控制：路由菜单由前端去写（无菜单管理界面，有角色管理界面），角色管理中有 roles 属性，需返回到 userInfo 中。
+ * 2、后端控制：路由菜单由后端返回（有菜单管理界面、有角色管理界面）
+ */
+
+// 读取 `/src/stores/themeConfig.ts` 是否开启后端控制路由配置
+const storesThemeConfig = useThemeConfig(pinia);
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { isRequestRoutes } = themeConfig.value;
+if (isRequestRoutes) staticRoutes.splice(0, 1);
+
+/**
+ * 创建一个可以被 Vue 应用程序使用的路由实例
+ * @method createRouter(options: RouterOptions): Router
+ * @link 参考：https://next.router.vuejs.org/zh/api/#createrouter
+ */
+export const router = createRouter({
+	history: createWebHashHistory(),
+	routes: staticRoutes,
+});
+
+/**
+ * 路由多级嵌套数组处理成一维数组
+ * @param arr 传入路由菜单数据数组
+ * @returns 返回处理后的一维路由菜单数组
+ */
+export function formatFlatteningRoutes(arr: any) {
+	if (arr.length <= 0) return false;
+	for (let i = 0; i < arr.length; i++) {
+		if (arr[i].children) {
+			arr = arr.slice(0, i + 1).concat(arr[i].children, arr.slice(i + 1));
+		}
+	}
+	return arr;
+}
+
+/**
+ * 一维数组处理成多级嵌套数组（只保留二级：也就是二级以上全部处理成只有二级，keep-alive 支持二级缓存）
+ * @description isKeepAlive 处理 `name` 值，进行缓存。顶级关闭，全部不缓存
+ * @link 参考：https://v3.cn.vuejs.org/api/built-in-components.html#keep-alive
+ * @param arr 处理后的一维路由菜单数组
+ * @returns 返回将一维数组重新处理成 `定义动态路由（dynamicRoutes）` 的格式
+ */
+export function formatTwoStageRoutes(arr: any) {
+	if (arr.length <= 0) return false;
+	const newArr: any = [];
+	const cacheList: Array<string> = [];
+	arr.forEach((v: any) => {
+		if (v.path === '/') {
+			newArr.push({ component: v.component, name: v.name, path: v.path, redirect: v.redirect, meta: v.meta, children: [] });
+		} else {
+			// 判断是否是动态路由（xx/:id/:name），用于 tagsView 等中使用
+			// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
+			if (v.path.indexOf('/:') > -1) {
+				v.meta['isDynamic'] = true;
+				v.meta['isDynamicPath'] = v.path;
+			}
+			newArr[0].children.push({ ...v });
+			// 存 name 值，keep-alive 中 include 使用，实现路由的缓存
+			// 路径：/@/layout/routerView/parent.vue
+			if (newArr[0].meta.isKeepAlive && v.meta.isKeepAlive) {
+				cacheList.push(v.name);
+				const stores = useKeepALiveNames(pinia);
+				stores.setCacheKeepAlive(cacheList);
+			}
+		}
+	});
+	return newArr;
+}
+
+// 路由加载前
+router.beforeEach(async (to, from, next) => {
+	NProgress.configure({ showSpinner: false });
+	if (to.meta.title) NProgress.start();
+	const token = Session.get('token');
+	if (to.path === '/login' && !token) {
+		next();
+		NProgress.done();
+	} else {
+		if (!token) {
+			next(`/login?redirect=${to.path}&params=${JSON.stringify(to.query ? to.query : to.params)}`);
+			Session.clear();
+			NProgress.done();
+		} else if (token && to.path === '/login') {
+			next('/home');
+			NProgress.done();
+		} else {
+			const storesRoutesList = useRoutesList(pinia);
+			const { routesList } = storeToRefs(storesRoutesList);
+			if (routesList.value.length === 0) {
+				if (isRequestRoutes) {
+					// 后端控制路由：路由数据初始化，防止刷新时丢失
+					await initBackEndControlRoutes();
+					// 动态添加路由：防止非首页刷新时跳转回首页的问题
+					// 确保 addRoute() 时动态添加的路由已经被完全加载上去
+					next({ ...to, replace: true });
+				} else {
+					// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
+					await initFrontEndControlRoutes();
+					next({ ...to, replace: true });
+				}
+			} else {
+				next();
+			}
+		}
+	}
+});
+
+// 路由加载后
+router.afterEach(() => {
+	NProgress.done();
+});
+
+// 导出路由
+export default router;

src/store/index.js

@@ -1,15 +0,0 @@
-import Vue from 'vue';
-import Vuex from 'vuex';
-
-Vue.use(Vuex);
-
-let moduleFn = require.context('./modules', false, /\.js$/);
-let modules = moduleFn.keys().reduce((p, c) => {
-	let mod = moduleFn(c).default;
-	mod = { ...mod, namespaced: true };
-	let modName = c.match(/\.\/(\w+)\.js$/)[1];
-	p[modName] = mod;
-	return p;
-}, {});
-
-export default new Vuex.Store({ modules });

src/store/modules/keepAliveNames.js

@@ -1,20 +0,0 @@
-const keepAliveNamesModule = {
-	namespaced: true,
-	state: {
-		keepAliveNames: [],
-	},
-	mutations: {
-		// 设置路由缓存（name字段）
-		getCacheKeepAlive(state, data) {
-			state.keepAliveNames = data;
-		},
-	},
-	actions: {
-		// 设置路由缓存（name字段）
-		async setCacheKeepAlive({ commit }, data) {
-			commit('getCacheKeepAlive', data);
-		},
-	},
-};
-
-export default keepAliveNamesModule;

src/store/modules/routesList.js

@@ -1,20 +0,0 @@
-const routesListModule = {
-	namespaced: true,
-	state: {
-		routesList: [],
-	},
-	mutations: {
-		// 设置路由，菜单中使用到
-		getRoutesList(state, data) {
-			state.routesList = data;
-		},
-	},
-	actions: {
-		// 设置路由，菜单中使用到
-		async setRoutesList({ commit }, data) {
-			commit('getRoutesList', data);
-		},
-	},
-};
-
-export default routesListModule;

src/store/modules/tagsViewRoutes.js

@@ -1,20 +0,0 @@
-const tagsViewRoutesModule = {
-	namespaced: true,
-	state: {
-		tagsViewRoutes: [],
-	},
-	mutations: {
-		// 设置 TagsView 路由
-		getTagsViewRoutes(state, data) {
-			state.tagsViewRoutes = data;
-		},
-	},
-	actions: {
-		// 设置 TagsView 路由
-		async setTagsViewRoutes({ commit }, data) {
-			commit('getTagsViewRoutes', data);
-		},
-	},
-};
-
-export default tagsViewRoutesModule;

src/store/modules/themeConfig.js

@@ -1,122 +0,0 @@
-/**
- * 2020.05.28 by lyt 优化
- * 修改一下配置时，需要每次都清理 `window.localStorage` 浏览器永久缓存，配置才会生效
- */
-const themeConfigModule = {
-	namespaced: true,
-	state: {
-		themeConfig: {
-			// 是否开启布局配置抽屉
-			isDrawer: false,
-
-			/**
-			 * 全局主题
-			 */
-			// 默认 primary 主题颜色
-			primary: '#409eff',
-			// 是否开启深色模式
-			isIsDark: false,
-
-			/**
-			 * 菜单 / 顶栏
-			 * 请注意：
-			 * 需要同时修改 `/@/theme/common/var.scss` 对应的值，
-			 * 不提供像 vue-next-admin 一样的实现
-			 */
-			// 默认顶栏导航背景颜色
-			topBar: '#ffffff',
-			// 默认顶栏导航字体颜色
-			topBarColor: '#606266',
-			// 默认菜单导航背景颜色
-			menuBar: '#545c64',
-			// 默认菜单导航字体颜色
-			menuBarColor: '#eaeaea',
-			// 默认分栏菜单背景颜色
-			columnsMenuBar: '#545c64',
-			// 默认分栏菜单字体颜色
-			columnsMenuBarColor: '#e6e6e6',
-
-			/**
-			 * 界面设置
-			 */
-			// 是否开启菜单水平折叠效果
-			isCollapse: false,
-			// 是否开启菜单手风琴效果
-			isUniqueOpened: false,
-			// 是否开启固定 Header
-			isFixedHeader: false,
-
-			/**
-			 * 界面显示
-			 */
-			// 是否开启侧边栏 Logo
-			isShowLogo: false,
-			// 是否开启 Breadcrumb
-			isBreadcrumb: true,
-			// 是否开启 Breadcrumb 图标
-			isBreadcrumbIcon: false,
-			// 是否开启 Tagsview
-			isTagsview: true,
-			// 是否开启 Tagsview 图标
-			isTagsviewIcon: false,
-			// 是否开启 TagsView 缓存
-			isCacheTagsView: false,
-			// 是否开启 Footer 底部版权信息
-			isFooter: false,
-			// 是否开启灰色模式
-			isGrayscale: false,
-			// 是否开启色弱模式
-			isInvert: false,
-
-			/**
-			 * 其它设置
-			 */
-			// 默认 Tagsview 风格，可选 1、 tags-style-one，自行扩展：
-			// 1、需修改 @/layout/navBars/topBar/setings.vue `getThemeConfig.tagsStyle` el-option
-			// 2、需修改 @/layout/navBars/tagsView/tagsView.vue 代码最底部注释部分 css 样式
-			tagsStyle: 'tags-style-one',
-			// 主页面切换动画：可选值"<slide-right|slide-left|opacitys>"，默认 slide-right
-			animation: 'slide-right',
-			// 分栏高亮风格：可选值"<columns-round|columns-card>"，默认 columns-round
-			columnsAsideStyle: 'columns-round',
-			// 分栏布局风格：可选值"<columns-horizontal|columns-vertical>"，默认 columns-horizontal
-			columnsAsideLayout: 'columns-vertical',
-
-			/**
-			 * 布局切换
-			 * 注意：为了演示，切换布局时，颜色会被还原成默认，代码位置：/@/layout/navBars/topBar/setings.vue
-			 * 中的 `initSetLayoutChange(设置布局切换，重置主题样式)` 方法
-			 */
-			// 布局切换：可选值"<defaults|classic|transverse|columns>"，默认 defaults
-			layout: 'defaults',
-
-			/**
-			 * 全局网站标题 / 副标题
-			 */
-			// 网站主标题（菜单导航、浏览器当前网页标题）
-			globalTitle: 'vue-prev-admin',
-			// 网站副标题（登录页顶部文字）
-			globalViceTitle: 'SMALL@小柒',
-			// 网站描述（登录页顶部文字）
-			globalViceDes: 'vue2.x后台管理系统免费开源模板',
-			// 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn
-			globalI18n: 'zh-cn',
-			// 默认全局组件大小，可选值"<|medium|small|mini>"，默认 ''
-			globalComponentSize: '',
-		},
-	},
-	mutations: {
-		// 设置布局配置
-		getThemeConfig(state, data) {
-			state.themeConfig = data;
-		},
-	},
-	actions: {
-		// 设置布局配置
-		setThemeConfig({ commit }, data) {
-			commit('getThemeConfig', data);
-		},
-	},
-};
-
-export default themeConfigModule;