'admin-23.04.12:发布v1.2.3版本，更新日志查看CHNAGELOG.md'

.env

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

.env.development

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

.env.production

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

.eslintignore

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

.eslintrc.js

@@ -1,76 +1,22 @@
 module.exports = {
 	root: true,
 	env: {
-		browser: true,
-		es2021: true,
 		node: true,
 	},
-	parser: 'vue-eslint-parser',
 	parserOptions: {
-		ecmaVersion: 12,
+		parser: '@babel/eslint-parser',
-		parser: '@typescript-eslint/parser',
-		sourceType: 'module',
 	},
-	extends: ['plugin:vue/vue3-essential', 'plugin:vue/essential', 'eslint:recommended'],
+	plugins: ['vue'],
-	plugins: ['vue', '@typescript-eslint'],
+	extends: ['plugin:vue/essential', 'eslint:recommended'],
-	overrides: [
-		{
-			files: ['*.ts', '*.tsx', '*.vue'],
-			rules: {
-				'no-undef': 'off',
-			},
-		},
-	],
 	rules: {
 		// http://eslint.cn/docs/rules/
-		// https://eslint.vuejs.org/rules/
-		// https://typescript-eslint.io/rules/no-unused-vars/
-		'@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',
-		'@typescript-eslint/no-redeclare': 'error',
-		'@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
-		'@typescript-eslint/no-unused-vars': [2],
-		'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',
-		'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-dupe-args': 'error',
-		'no-case-declarations': 'off',
+		'no-empty': 'off',
+		'no-extra-semi': 'off',
+		'no-constant-condition': 'off',
 		'no-console': 'error',
-		'no-redeclare': 'off',
+		'vue/multi-word-component-names': 'off',
 	},
 };

.gitignore

@@ -1,8 +1,7 @@
-.DS_Store
 node_modules
+.DS_Store
 /dist
 
-
 # local env files
 .env.local
 .env.*.local

CHANGELOG.md

@@ -1,490 +1,124 @@
-# <a href="https://gitee.com/lyt-top/vue-next-admin" target="_blank">vue-next-admin 更新日志</a>
+# <a href="https://gitee.com/lyt-top/vue-next-admin/tree/vue-prev-admin" target="_blank">vue-prev-admin 更新日志</a>
 
-🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）
+🎉🎉🔥 `vue-prev-admin` 基于 vue2.x + webpack + element ui，适配手机、平板、pc 的后台开源免费模板库（vue3.x 请切换 master 分支）
 
-## 2.4.33
+## 1.2.3
 
-`2023.04.11`
+`2023.04.12`
 
-- 🌟 更新 依赖更新最新版本
+- 🐞 修复 [#I6UW2I 关闭标签页后，分栏没有消失，需要手动点击首页才会消失](https://gitee.com/lyt-top/vue-next-admin/issues/I6UW2I)，感谢[@小菜鸟儿](https://gitee.com/cainiaoer)
-- 🎉 新增 `/make/tableDemo` 中添加打印、图片预览功能
+- 🎯 优化 `layout/navBars/breadcrumb` 文件夹名称改成 `layout/navBars/topBar` 更易理解（可全局替换），感谢群友@傲世盛唐
-- 🐞 修复 菜单收起时（isCollapse），图标不居中问题
+- 🎯 优化 `layout/navBars/topBar/user.vue` 组件，`UserNews` 点击消息图标触发范围，防止点击消息通知背景色时不触发 Popover 弹出框
-- 🐞 修复 演示 `权限管理 -> 前端控制 -> 页面权限` 切换不生效，感谢群友@傲世盛唐
-- 🐞 修复 `"typescript": "5.x"` 中 `tsconfig.json`，`compilerOptions.suppressImplicitAnyIndexErrors` 弃用问题 [TypeScript/issues/51909](https://github.com/microsoft/TypeScript/issues/51909)、[suppressImplicitAnyIndexErrors](https://www.typescriptlang.org/tsconfig#suppressImplicitAnyIndexErrors)
-- 🎨 合并 [!47cdn 打包支持 pnpm，消除无 external 的报错](https://gitee.com/lyt-top/vue-next-admin/commit/8de54a844bb54468d0bdccca158bf9bcb449f270)，感谢[@yujiacheng](https://gitee.com/YujiaCheng1996)
-- 🎯 优化 `layout/navBars/breadcrumb` 文件夹名称改成 `layout/navBars/topBar` 更易理解（`可全局替换`），感谢群友@傲世盛唐
-- 🎯 优化 `layout/navBars/topBar/user.vue` 组件，`UserNews` 点击消息图标触发范围，改用 [element plus Popover 气泡卡片 虚拟触发方式](https://element-plus.org/zh-CN/component/popover.html#%E8%99%9A%E6%8B%9F%E8%A7%A6%E5%8F%91)，防止点击消息通知背景色时不触发 `Popover` 弹出框
-
-## 2.4.32
-
-💔💔💔 图片不显示问题（README.md、演示中使用的图片，[vue-next-admin-images](https://gitee.com/lyt-top/vue-next-admin-images)），通过网站 [https://www.hd-r.cn/](https://www.hd-r.cn/) 转在线链接，如若侵权请联系作者 qq：1105290566
-
-`2023.03.26`
-
-- 🌟 更新 依赖更新最新版本
-- 🐞 修复 [关于开发环境 sourceMap 的问题](https://gitee.com/lyt-top/vue-next-admin/issues/I6DNDQ)，感谢[@XiaoSongJiang](https://gitee.com/XiaoSongJiang)
-- 🐞 修复 打包提示 `[@vue/compiler-sfc] ::v-deep usage as a combinator has been deprecated. Use :deep(<inner-selector>) instead.`，不能使用 `:deep {}`，而应使用 `:deep() {}`
-- 🎨 合并 [feat: 一级菜单重定向为空，分栏模式下，点击一次菜单时现在会切换子菜单列表，而不是打开空白页](https://gitee.com/lyt-top/vue-next-admin/commit/a91f84e3a1a86d8d303a5b46171622913d9d0737)，感谢[@写意](https://gitee.com/xjj_0906)
-- 🎯 优化 经典布局分割菜单只有一项子级时，收起左侧导航菜单
-- 🎯 优化 watch 监听范围
-- 🎯 优化 打包：分包（manualChunks）、gzip 压缩、cdn 加速 `默认关闭 .env 中开启`（可查看文章[vue-next-admin vue3 + vite 打包 gzip 压缩、cdn 加速](https://blog.csdn.net/qq_34450741/article/details/129766676)）
-
-## 2.4.31
-
-`2023.03.10`
-
-- 🌟 更新 依赖更新最新版本
-- 🐞 修复 顶栏背景渐变设置不生效
-- 🐞 修复 顶栏背景渐变、菜单背景渐变时，深色主题不生效
-- 🐞 修复 顶栏搜索框移动端显示问题
-- 🎯 优化 `main.ts`，相关 issues [#I6KNFH](https://gitee.com/lyt-top/vue-next-admin/issues/I6KNFH)、[#I6JRH6](https://gitee.com/lyt-top/vue-next-admin/issues/I6JRH6)
-- 🎯 优化 菜单横向模式显示（horizontal）
-- 🎯 优化 分栏布局，[希望分栏布局做一下优化，在没有二级菜单的时候，直接全屏展示一级菜单链接](https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H)，感谢[@jiuping](https://gitee.com/jiuping)，`tagsview` 点击时处理 `收起/展开` 菜单
-
-## 2.4.3
-
-`2023.02.22`
-
-🚩🚩🚩 感谢 [驰骋工作流引擎-表单引擎-低代码开发平台](http://www.ccflow.org/) 赞助商的赞助。驰骋公司为社会提供流程引擎+表单引擎+低代码开发平台一体的开源软件解决方案，欢迎广大开发者前去体验！
-
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 赞助商组件（`/src/layout/sponsors`），[项目目录结构查看](https://lyt-top.gitee.io/vue-next-admin-doc-preview/config/)
-- 🐞 修复 [过滤筛选组件展开点击不了](https://gitee.com/lyt-top/vue-next-admin/issues/I688WG)
-- 🐞 修复 [设置锁屏时间时直接白屏了不能恢复，除非删除主题配置才会重新加载](https://gitee.com/lyt-top/vue-next-admin/issues/I6AF8P)，感谢[@baizunxian](https://gitee.com/xb_xiaobai)
-- 🐞 修复 `分栏布局` 地址栏输入不存在的路由报错问题
-- 🎨 合并 [!44 tagsViewName 正则匹配错误，匹配到含 en 单词](https://gitee.com/lyt-top/vue-next-admin/pulls/44/files)，感谢[@tony 星](https://gitee.com/tony_tong_xin)
-- 🎨 合并 [!45 fix 地址栏出现 false 问题](https://gitee.com/lyt-top/vue-next-admin/pulls/45)，感谢[@随心](https://gitee.com/jiangqiang1996)
-- 🎯 优化 `/src/utils/storage` 下 `key` 编写成 `${__NEXT_NAME__}:${key}`，防止部署多套系统到同一域名不同目录时，变量共用的问题（`__NEXT_NAME__`为 `package.json` 中的 `name`）
-- 🎯 优化 watermark 单词拼写错误
-
-## 2.4.21
-
-`2022.12.12`
-
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 菜单背景高亮颜色可自定义，通过 `布局配置 -> 菜单设置 -> 菜单高亮背景色` 进行设置
-- 🐞 修复 `分栏布局` 二级导航菜单内容多时，无法滚动问题，感谢群友@静雨轩主人
-- 🐞 修复 [!42 修复 工作流无法添加新节点问题](https://gitee.com/lyt-top/vue-next-admin/pulls/42)，感谢[@beta](https://gitee.com/beta_dz)
-- 🎯 优化 `/make/tableDemo` 表头很多时，无法滚动问题，感谢群友@糊涂涂涂
-
-## 2.4.2
-
-`2022.12.09`
-
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 国际化自动导入文件功能，只需在 `/src/i18n/pages` 下新建文件夹定义即可
-- 🎉 新增 `/make/tableDemo` 中 [搜索框展开，收缩功能，高级筛选组件 有计划做吗](https://gitee.com/lyt-top/vue-next-admin/issues/I6511L)
-- 🐞 修复 [!40 开启 TagsView 缓存后，刷新后所有的路由都变成组件缓存了](https://gitee.com/lyt-top/vue-next-admin/pulls/40)，感谢[@mrjimin](https://gitee.com/mrjimin)
-- 🐞 修复 [!41 修复 get 请求传递嵌套对象或数组时无法正常编码问题](https://gitee.com/lyt-top/vue-next-admin/pulls/41)，感谢[@随心](https://gitee.com/jiangqiang1996)
-- 🐞 修复 组件 wangEditor 回显值的问题
-- 🐞 修复 `/fun/echartsMap`（地理坐标/地图）、`visualizingDemo2`（数据可视化演示 2） 演示报错问题
-- 🎯 优化 版本升级提示
-- 🎯 优化 无权限登录时增加提示信息，[BUG：因前端加载路由(initFrontEndControlRoutes)中当前用户角色为一个陌生角色, 导致 router.beforeEach 会死循环 浏览器崩溃](https://gitee.com/lyt-top/vue-next-admin/issues/I64HVO)，感谢[@canroc](https://gitee.com/canroc)、[@随心](https://gitee.com/jiangqiang1996)
-- 🌈 重构 `/views/system` 新增修改组件合并。[可以把新增修改组件合并成一个吧](https://gitee.com/lyt-top/vue-next-admin/issues/I64WES)
-- 🌈 重构 图标选择器，[图标选择器没办法筛选，只能筛选 ali 的](https://gitee.com/lyt-top/vue-next-admin/issues/I64HZD)，感谢[@随心](https://gitee.com/jiangqiang1996)
-
-## 2.4.1
-
-`2022.11.30`
-
-- 🎉 新增 版本升级提示
-- 🐞 修复 [先打开 F12 再登录进去，然后改变浏览器大小 js 报错](https://gitee.com/lyt-top/vue-next-admin/issues/I63ZZT)，感谢[@Quber](https://gitee.com/quber)
-
-## 2.4.0
-
-`2022.11.29`
-
-⚡⚡⚡ 此版为破坏性更新，应群友建议 `script lang="ts"` 改 `script lang="ts" setup 语法糖`。
-
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 表格封装演示，路径：`组件封装 -> 表格封装演示`
-- 🎉 新增 master 分支 script lang="ts" 改成 script lang="ts" setup 语法糖，将同步基础分支
-- 🐞 修复 [v2.3.0 版本报错问题处理](https://gitee.com/lyt-top/vue-next-admin/issues/I623RP)
-- 🐞 修复 [el-backtop 滚动高度不触发（固定了 header）](https://gitee.com/lyt-top/vue-next-admin/issues/I63N0D)，感谢[@dejavuuuuu](https://gitee.com/zc19951010)
-- 🎯 优化 完善 ts 类型，删除根目录 `plugins.d.ts、shim.d.ts、source.d.ts`，移入到 `/src/types/global.d.ts`
-- 🎯 优化 代码 `watch` 移动到 `生命周期钩子` 最后，文字注释等
-
-## 2.3.0
-
-`2022.11.16`
-
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 新版登录页
-- 🎉 新增 tagsview 鼠标中键 `关闭当前 tagsview`
-- 🎉 新增 `分栏菜单鼠标悬停预加载`。[分栏模式如何去掉鼠标悬浮父级菜单，分栏菜单自动加载的功能啊](https://gitee.com/lyt-top/vue-next-admin/issues/I5RUY7)。操作路径：`布局配置 -> 分栏设置`
-- 🐞 修复 [vue-i18n](https://vue-i18n.intlify.dev/api/general.html#createi18n) 报错，[!39 修复 i18n 兼容性问题](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/39/files)，感谢[@随心](https://toscode.gitee.com/jiangqiang1996)
-- 🐞 修复 顶栏搜索功能点击蒙蔽弹窗不关闭
-- 🐞 修复 [!38 fix: bug refreshRouterViewKey 值为 null 导致路由缓存第一次无效](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/38/files)，感谢[@P)](https://toscode.gitee.com/foxp8y)
-- 🐞 修复 `路由参数 -> 普通路由/动态路由` 国际化演示时，`tagsView` 和 `浏览器标题` 显示异常。[演示中：路由参数界面 -> 动态路由，国际化显示时面包屑、浏览器标题有 bug](https://gitee.com/lyt-top/vue-next-admin/issues/I5JRJG)
-- 🐞 修复 `路由参数 -> 普通路由/动态路由` 动态设置 `tagsViewName` 时，`tagsView 右键菜单刷新` 功能失效（也就是路由后面有参数时，query、params）。[普通或动态路由新建页面后点击 tagview 刷新无效](https://gitee.com/lyt-top/vue-next-admin/issues/I5K3YO)，感谢[@dejavuuuuu](https://gitee.com/zc19951010)
-- 🐞 修复 [表单（el-form）中，字体图标偏移问题](https://gitee.com/lyt-top/vue-next-admin/issues/I5K1PM)
-- 🐞 修复 路由 `router.addRoute` 时，一直提示 `No match found for location with path 'xxx'`
-- 🎯 优化 全局 `getCurrentInstance` 替换成 [`provide/inject`](https://cn.vuejs.org/api/application.html#app-provide) 或通过 `ref` 处理
-- 🎯 优化 引入组件方式 `(import xxx from xxx)` 改成 `defineAsyncComponent(() => import(xxx))`
-- 🎯 优化 页面高度 100% 问题，重写布局配置 `界面设置 -> 固定 Header` 多余的 `el-scrollbar` 逻辑、重写各界面需 `计算属性 computed` 设置动态高度问题（改为 css `flex` 设置自适应高度，具体查看文档：[设置可视区高度 100%](https://lyt-top.gitee.io/vue-next-admin-doc-preview/config/otherIssues/#%E8%AE%BE%E7%BD%AE%E5%8F%AF%E8%A7%86%E5%8C%BA%E9%AB%98%E5%BA%A6-100)。[!31 修复页面样式无法通过百分比设置的问题](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/31)，感谢[@LostDeer](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/31/files)。`（改动较大，删除多余代码）`
-- 🎯 优化 [wangeditor](https://www.wangeditor.com/) 组件，`@wangeditor/editor-for-vue`。可自行修改，组件位置：`/src/components/editor`。相关 Issues：[wangeditor 编辑器多个菜单不能回弹](https://gitee.com/lyt-top/vue-next-admin/issues/I5M5H7)
-- 🌈 重构 外链、内嵌 iframe 逻辑 + 美化，iframe 支持缓存
-
-## 2.2.0
-
-`2022.07.10`
-
-⚡⚡⚡ [/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/topBar/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
 
-`2021.12.21`
+`2023.02.23`
 
-- 🌟 更新 依赖更新最新版本
+🚩🚩🚩 感谢 [驰骋工作流引擎-表单引擎-低代码开发平台](http://www.ccflow.org/) 赞助商的赞助。驰骋公司为社会提供流程引擎+表单引擎+低代码开发平台一体的开源软件解决方案，欢迎广大开发者前去体验！
-- 🎯 优化 iframes 滚动条问题
+
-- 🎯 优化 部署后每次都要强制刷新清浏览器缓存问题
+- 🎉 新增 赞助商组件（`/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`）
-- 🐞 修复 [tag-view 标签右键会超出浏览器 #I4KN78](https://gitee.com/lyt-top/vue-next-admin/issues/I4KN78)
 
 ## 1.2.1
 
-`2021.12.12`
+`2022.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
 
-`2021.11.28`
+`2022.12.06`
 
-- 🌟 更新 依赖更新最新版本
+- 🎉 新增 版本升级提示
-- 🎯 优化 深色模式
+- 🎉 新增 主题色修改
-- 🎯 优化 `/@/utils` 文件夹，合并删除单一内容
+- 🎉 新增 深色模式
-- 🎯 优化 系统设置：菜单管理（新增、修改）、角色管理（新增菜单权限）、用户管理、部门管理、字典管理
+- 🐞 优化 外链界面 `/src/layout/routerView/link.vue`
-- 🎯 优化 登录界面逻辑、权限管理逻辑
+- 🐞 修复 `菜单水平折叠` 刷新界面还原默认值问题
-- 🎯 优化 同步 [vue-next-admin-images](https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu) 后端控制菜单模拟数据
+- 💔 移除 `vue.config.js` 打包加时间戳方法，因为打包报错了
-- 🎉 新增 适配 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
 
-`2021.09.25`
+`2022.11.17`
 
-- 🌟 更新 依赖更新最新版本（`"element-plus": "^1.1.0-beta.13"` 版本运行错误，`^1.1.0-beta.16`修复横向菜单卡死问题）
+- 🐞 优化 [vue2 版本打包出来配置路由懒加载无效。](https://gitee.com/lyt-top/vue-next-admin/issues/I5RFQT)，感谢[@林建生](https://gitee.com/ljsshuai)
-- 🐞 修复 Dialog 弹窗位置错误、Drawer 抽屉内边距、el-menu 菜单收起时背景色问题
-- 🎯 优化 锁屏界面自动锁屏(s/秒)必须设置至少 1 秒
-- 🎉 新增 分栏布局，鼠标移入当前项时，显示当前项菜单内容
-- 🎉 新增 工作流（未完成）
 
 ## 1.1.0
 
-`2021.09.10`
+`2022.06.12`
 
-- 🌟 更新 依赖更新最新版本
+- 🐞 优化 部分界面演示图片不出来问题
-- 🎯 优化 小屏模式下登录页二维码遮挡标题问题
+- 🐞 修复 [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.07.02`
+`2021.12.22`
 
-- 🌟 更新 依赖更新最新版本
+- 🎯 优化 部署后每次都要强制刷新清浏览器缓存问题
-- 🎯 优化 图标选择器设置宽度、v-model 等问题
+- 🎉 新增 工具类百分比验证演示
-- 🎯 优化 滚动通知栏在手机上的体验
+- 🐞 修复 tag-view 标签右键会超出浏览器
-- 🎯 优化 系统管理/新增菜单（编辑菜单），使用 `图标选择器` 进行模拟
-- 🎯 优化 字体图标(自动载入) 逻辑
-- 🐞 修复 screenfull 全屏时，按键盘 esc 键图标不改变问题，感谢群友@伯牙已遇钟子期
 
 ## 1.0.8
 
-`2021.06.29`
+`2021.12.16`
 
 - 🌟 更新 依赖更新最新版本
-- 🎉 新增 表单中英文切换演示
+- 🎯 优化 登录界面逻辑、权限管理逻辑
-- 🎯 优化 登录页查看密码 icon 图标
+- 🎯 优化 同步 vue-next-admin-images 后端控制菜单模拟数据
-- 🎯 优化 图标选择器
+- 🎯 优化 菜单格式（对象改数组）
-- 🎯 优化 拖动指令
+- 🐞 修复 登录页手机端样式问题
-- 🐞 修复 form 表单在页面小于 576px 时的排版问题
 
 ## 1.0.7
 
-`2021.06.24`
+`2021.11.27`
 
 - 🌟 更新 依赖更新最新版本
-- 🎉 新增 拖动指令及其演示界面
+- 🐞 修复 登录问题 [#I4GIKU](https://gitee.com/lyt-top/vue-next-admin/issues/I4GIKU)
-- 🎯 优化 锁屏界面，解锁提示
-- 🎯 优化 登录页在手机上显示的效果
 
 ## 1.0.6
 
-`2021.06.23`
+`2021.11.08`
 
-- 🎯 优化 去掉内嵌 iframe 内边距（padding）
+- 🌟 更新 依赖更新最新版本
-- 🎯 优化 城市多级联动组件
+- 🎯 优化 目录移动 `@/views/layout` 移动 `@/layout` （可全局替换）
-- 🎯 优化 Tree 树形控件改成表格组件
+- 🎯 优化 eslint 语法检测问题，`@babel/eslint-parser` 替换已废弃的 `babel-eslint`，出现报错，请尝试降级 eslint
-- 🐞 修复 Cascader 级联选择器高度问题
+- 🎯 优化 vuex 文件自动导入
 
 ## 1.0.5
 
-`2021.06.22`
+`2021.06.30`
 
-- 🌟 更新 vite 降级为@vite2.3.7，降级方法 `cnpm install vite@2.3.7`，防止 element plus 字体图标消失
+- 🌟 更新 依赖更新最新版本
-- 🐞 修复 开启后端控制路由（isRequestRoutes = true）时，内嵌 iframe、外链不可使用的问题
+- 🎉 新增 表单自适应演示界面
+- 🎯 优化 去掉内嵌 iframe 内边距（padding）
 
 ## 1.0.4
 
 `2021.06.19`
 
-- 🌟 更新 依赖更新最新版本（"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 小学生-第五君
+- 🎯 优化 移除 utils/storage.ts 下的旧写法（改动较大）
-- 🎯 优化 类型定义提高编码体验，修复不能将类型“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` 左侧菜单数据不变问题

README.md

@@ -1,20 +1,17 @@
 <div align="center">
-	<img src="https://i.hd-r.cn/6ce52e5724fae609444b5b48bdc4accb.png">
+	<img src="https://i.hd-r.cn/07fd893a28d4f62926fe6ad895af96a2.png">
 	<p align="center">
-		<a href="https://v3.vuejs.org/" target="_blank">
+		<a href="https://cn.vuejs.org/" target="_blank">
-			<img src="https://img.shields.io/badge/vue.js-vue3.x-green" alt="vue">
+			<img src="https://img.shields.io/badge/vue.js-vue2.x-green" alt="vue">
 		</a>
-		<a href="https://element-plus.gitee.io/#/zh-CN/component/changelog" target="_blank">
+		<a href="https://element.eleme.cn/#/zh-CN/component/changelog" target="_blank">
-			<img src="https://img.shields.io/badge/element--plus-%3E1.0.0-blue" alt="element plus">
+			<img src="https://img.shields.io/badge/element--ui-%3E1.0.0-blue" alt="element ui">
 		</a>
-		<a href="https://www.tslang.cn/" target="_blank">
+		<a href="https://v4.webpack.docschina.org/concepts/" target="_blank">
-	    <img src="https://img.shields.io/badge/typescript-%3E4.0.0-blue" alt="typescript">
+		  <img src="https://img.shields.io/badge/webpack-%3E1.0.0-success" alt="webpack">
-	  </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://gitee.com/lyt-top/vue-next-admin/blob/master/LICENSE" target="_blank">
+		<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-success" alt="license">
+		  <img src="https://img.shields.io/badge/license-MIT-yellow" alt="license">
 		</a>
 	</p>
 	<p>&nbsp;</p>
@@ -28,7 +25,7 @@
 
 #### 🌈 介绍
 
-基于 vue3.x + CompositionAPI setup 语法糖 + typescript + vite + element plus + vue-router-next + pinia 技术，适配手机、平板、pc 的后台开源免费模板，希望减少工作量，帮助大家实现快速开发。
+基于 vue2.x + webpack + element ui，适配手机、平板、pc 的后台开源免费模板，希望减少工作量，帮助大家实现快速开发。
 
 #### ⛱️ 线上预览
 
@@ -46,19 +43,11 @@
 - 复制代码(桌面 cmd 运行) `npm install -g cnpm --registry=https://registry.npm.taobao.org`
 - 复制代码(桌面 cmd 运行) `npm install -g yarn`
 
-#### 🏭 环境支持
-
-| Edge      | Firefox      | Chrome      | Safari      |
-| --------- | ------------ | ----------- | ----------- |
-| Edge ≥ 88 | Firefox ≥ 78 | Chrome ≥ 87 | Safari ≥ 13 |
-
-> 由于 Vue3 不再支持 IE11，故而 ElementPlus 也不支持 IE11 及之前版本。
-
 #### ⚡ 使用说明
 
-建议使用 cnpm，因为 yarn 有时会报错。<a href="http://nodejs.cn/" target="_blank">node 版本 > 14.18+/16+</a>
+建议使用 cnpm，因为 yarn 有时会报错。`npm install` 安装报错的话，请使用 `cnpm install`。
 
-> Vite 不再支持 Node 12 / 13 / 15，因为上述版本已经进入了 EOL 阶段。现在你必须使用 Node 14.18+ / 16+ 版本。
+> 注意：`node` 需大于 `12.xxx` 小于等于 `v16.14.0`，否则安装依赖将报错。
 
 ```bash
 # 克隆项目
@@ -67,6 +56,9 @@ git clone https://gitee.com/lyt-top/vue-next-admin.git
 # 进入项目
 cd vue-next-admin
 
+# 切换分支
+git checkout vue-prev-admin
+
 # 安装依赖
 cnpm install
 
@@ -83,9 +75,9 @@ cnpm run build
 
 #### 💯 学习交流加 QQ 群
 
-> 1 - 5 交流群已满，请加 vue-next-admin 交流群 6
+> 1 - 4 交流群已满，请加 vue-next-admin 交流群 5
 
-群号：761442083
+群号：556254895
 
 其它交流群请查看文档首页 [vueNextAdmin 解疑问](https://lyt-top.gitee.io/vue-next-admin-doc-preview/)
 
@@ -100,7 +92,6 @@ 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>
 
 #### ❤️ 鸣谢列表
 
@@ -108,37 +99,19 @@ 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-next</a>
+- <a href="https://github.com/vuejs/vue-router-next" target="_blank">vue-router-nex</a>
-- <a href="https://github.com/vuejs/pinia" target="_blank">pinia</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/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://github.com/hxj9102/table2excel" target="_blank">js-table2excel</a>
-- <a href="https://github.com/mmf-fe/vite-plugin-cdn-import" target="_blank">vite-plugin-cdn-import</a>
-- <a href="https://github.com/js-cookie/js-cookie" target="_blank">js-cookie</a>
-- <a href="https://github.com/davidshimjs/qrcodejs" target="_blank">qrcodejs2-fixes</a>
-- <a href="https://github.com/ljharb/qs" target="_blank">qs</a>
-- <a href="https://github.com/JamieCurnow/vue-clipboard3" target="_blank">vue-clipboard3</a>
-- <a href="https://github.com/intlify/vue-i18n-next" target="_blank">vue-i18n</a>
-- <a href="https://github.com/vbenjs/vite-plugin-compression" target="_blank">vite-plugin-compression</a>
-- <a href="https://github.com/chenxch/vite-plugin-vue-setup-extend-plus" target="_blank">vite-plugin-vue-setup-extend-plus</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

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

jsconfig.json

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

package.json

@@ -1,62 +1,45 @@
 {
-	"name": "vue-next-admin",
+	"name": "vue-prev-admin",
-	"version": "2.4.33",
+	"version": "1.2.3",
-	"description": "vue3 vite next admin template",
+	"private": true,
+	"description": "vue2 webpack admin template",
 	"author": "lyt_20201208",
 	"license": "MIT",
 	"scripts": {
-		"dev": "vite",
+		"dev": "vue-cli-service serve",
-		"build": "vite build",
+		"build": "vue-cli-service build",
-		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
+		"lint": "vue-cli-service lint",
+		"webpack": "webpack --version"
 	},
 	"dependencies": {
-		"@element-plus/icons-vue": "^2.1.0",
+		"axios": "0.24.0",
-		"@wangeditor/editor": "^5.1.23",
+		"clipboard": "2.0.8",
-		"@wangeditor/editor-for-vue": "^5.1.12",
+		"countup.js": "2.0.8",
-		"axios": "^1.3.5",
+		"echarts": "5.2.2",
-		"countup.js": "^2.6.0",
+		"element-ui": "2.15.6",
-		"cropperjs": "^1.5.13",
+		"nprogress": "0.2.0",
-		"echarts": "^5.4.2",
+		"screenfull": "5.2.0",
-		"echarts-gl": "^2.0.9",
+		"sign-canvas": "1.1.4",
-		"echarts-wordcloud": "^2.1.0",
+		"vue": "2.6.14",
-		"element-plus": "^2.3.3",
+		"vue-i18n": "8.26.7",
-		"js-cookie": "^3.0.1",
+		"vue-particles": "1.0.9",
-		"js-table2excel": "^1.0.3",
+		"vue-router": "3.5.3",
-		"jsplumb": "^2.15.6",
+		"vue-seamless-scroll": "1.1.23",
-		"mitt": "^3.0.0",
+		"vuex": "3.6.2"
-		"nprogress": "^0.2.0",
-		"pinia": "^2.0.34",
-		"print-js": "^1.6.0",
-		"qrcodejs2-fixes": "^0.0.2",
-		"qs": "^6.11.1",
-		"screenfull": "^6.0.2",
-		"sortablejs": "^1.15.0",
-		"splitpanes": "^3.1.5",
-		"vue": "^3.2.47",
-		"vue-clipboard3": "^2.0.0",
-		"vue-demi": "^0.13.11",
-		"vue-grid-layout": "^3.0.0-beta1",
-		"vue-i18n": "^9.2.2",
-		"vue-router": "^4.1.6"
 	},
 	"devDependencies": {
-		"@types/node": "^18.15.11",
+		"@babel/eslint-parser": "7.16.5",
-		"@types/nprogress": "^0.2.0",
+		"@babel/plugin-proposal-optional-chaining": "7.17.12",
-		"@types/sortablejs": "^1.15.1",
+		"@vue/cli-plugin-babel": "4.5.15",
-		"@typescript-eslint/eslint-plugin": "^5.58.0",
+		"@vue/cli-plugin-eslint": "4.5.15",
-		"@typescript-eslint/parser": "^5.58.0",
+		"@vue/cli-plugin-router": "4.5.15",
-		"@vitejs/plugin-vue": "^4.1.0",
+		"@vue/cli-plugin-vuex": "4.5.15",
-		"@vue/compiler-sfc": "^3.2.47",
+		"@vue/cli-service": "4.5.15",
-		"eslint": "^8.38.0",
+		"eslint": "8.4.1",
-		"eslint-plugin-vue": "^9.10.0",
+		"eslint-plugin-vue": "8.2.0",
-		"prettier": "^2.8.7",
+		"sass": "1.45.0",
-		"sass": "^1.61.0",
+		"sass-loader": "10.1.1",
-		"typescript": "^5.0.4",
+		"vue-template-compiler": "2.6.14"
-		"vite": "^4.2.1",
-		"vite-plugin-cdn-import": "^0.3.5",
-		"vite-plugin-compression": "^0.5.1",
-		"vite-plugin-vue-setup-extend-plus": "^0.1.0",
-		"vue-eslint-parser": "^9.1.1"
 	},
 	"browserslist": [
 		"> 1%",
@@ -67,8 +50,8 @@
 		"url": "https://gitee.com/lyt-top/vue-next-admin/issues"
 	},
 	"engines": {
-		"node": ">=16.0.0",
+		"node": ">=12.0.0",
-		"npm": ">= 7.0.0"
+		"npm": ">= 6.0.0"
 	},
 	"keywords": [
 		"vue",

public/admin.json

@@ -0,0 +1,290 @@
+{
+	"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/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html lang="zh-CN">
+<html lang="en">
 	<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,21 +12,19 @@
 			name="description"
 			content="vue-next-admin，基于 vue3 + CompositionAPI + typescript + vite + element plus，适配手机、平板、pc 的后台开源免费管理系统模板！vue-prev-admin，基于 vue2 +  element ui，适配手机、平板、pc 的后台开源免费管理系统模板！"
 		/>
-		<link rel="icon" href="/favicon.ico" />
+		<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-		<title>vue-next-admin</title>
+		<title>vue-prev-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?d9c8b87d10717013641458b300c552e4';
+				hm.src = 'https://hm.baidu.com/hm.js?9d1e524198ede8205ac7c938c243344c';
 				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>

public/test.json

@@ -0,0 +1,227 @@
+{
+	"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"
+			}
+		}
+	]
+}

src/App.vue

@@ -1,101 +1,78 @@
 <template>
-	<el-config-provider :size="getGlobalComponentSize" :locale="getGlobalI18n">
+	<div id="app">
-		<router-view v-show="setLockScreen" />
+		<router-view />
-		<LockScreen v-if="themeConfig.isLockScreen" />
+		<Setings ref="setingsRef" />
-		<Setings ref="setingsRef" v-show="setLockScreen" />
-		<CloseFull v-if="!themeConfig.isLockScreen" />
 		<Upgrade v-if="getVersion" />
 		<Sponsors />
-	</el-config-provider>
+	</div>
 </template>
 
-<script setup lang="ts" name="app">
+<script>
-import { defineAsyncComponent, computed, ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
+import config from '/package.json';
-import { useRoute } from 'vue-router';
+import setIntroduction from '@/utils/setIconfont.js';
-import { useI18n } from 'vue-i18n';
+import { Local } from '@/utils/storage.js';
-import { storeToRefs } from 'pinia';
+import Setings from '@/layout/navBars/topBar/setings.vue';
-import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import Upgrade from '@/layout/upgrade/index.vue';
-import { useThemeConfig } from '/@/stores/themeConfig';
+import Sponsors from '@/layout/sponsors/index.vue';
-import other from '/@/utils/other';
+export default {
-import { Local, Session } from '/@/utils/storage';
+	name: 'App',
-import mittBus from '/@/utils/mitt';
+	components: { Setings, Upgrade, Sponsors },
-import setIntroduction from '/@/utils/setIconfont';
+	mounted() {
-
+		this.initSetIconfont();
-// 引入组件
+		this.openSetingsDrawer();
-const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue'));
+		this.getLayoutThemeConfig();
-const Setings = defineAsyncComponent(() => import('/@/layout/navBars/topBar/setings.vue'));
-const CloseFull = defineAsyncComponent(() => import('/@/layout/navBars/topBar/closeFull.vue'));
-const Upgrade = defineAsyncComponent(() => import('/@/layout/upgrade/index.vue'));
-const Sponsors = defineAsyncComponent(() => import('/@/layout/sponsors/index.vue'));
-
-// 定义变量内容
-const { messages, locale } = useI18n();
-const setingsRef = ref();
-const route = useRoute();
-const stores = useTagsViewRoutes();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-
-// 设置锁屏时组件显示隐藏
-const setLockScreen = computed(() => {
-	// 防止锁屏后，刷新出现不相关界面
-	// https://gitee.com/lyt-top/vue-next-admin/issues/I6AF8P
-	return themeConfig.value.isLockScreen ? themeConfig.value.lockScreenTime > 1 : themeConfig.value.lockScreenTime >= 0;
-});
-// 获取版本号
-const getVersion = computed(() => {
-	let isVersion = false;
-	if (route.path !== '/login') {
-		// @ts-ignore
-		if ((Local.get('version') && Local.get('version') !== __NEXT_VERSION__) || !Local.get('version')) isVersion = true;
-	}
-	return isVersion;
-});
-// 获取全局组件大小
-const getGlobalComponentSize = computed(() => {
-	return other.globalComponentSize();
-});
-// 获取全局 i18n
-const getGlobalI18n = computed(() => {
-	return messages.value[locale.value];
-});
-// 设置初始化，防止刷新时恢复默认
-onBeforeMount(() => {
-	// 设置批量第三方 icon 图标
-	setIntroduction.cssCdn();
-	// 设置批量第三方 js
-	setIntroduction.jsCdn();
-});
-// 页面加载时
-onMounted(() => {
-	nextTick(() => {
-		// 监听布局配'置弹窗点击打开
-		mittBus.on('openSetingsDrawer', () => {
-			setingsRef.value.openDrawer();
-		});
-		// 获取缓存中的布局配置
-		if (Local.get('themeConfig')) {
-			storesThemeConfig.setThemeConfig({ themeConfig: Local.get('themeConfig') });
-			document.documentElement.style.cssText = Local.get('themeConfigStyle');
-		}
-		// 获取缓存中的全屏配置
-		if (Session.get('isTagsViewCurrenFull')) {
-			stores.setCurrenFullscreen(Session.get('isTagsViewCurrenFull'));
-		}
-	});
-});
-// 页面销毁时，关闭监听布局配置/i18n监听
-onUnmounted(() => {
-	mittBus.off('openSetingsDrawer', () => {});
-});
-// 监听路由的变化，设置网站标题
-watch(
-	() => route.path,
-	() => {
-		other.useTitle();
 	},
-	{
+	computed: {
-		deep: true,
+		// 获取版本号
-	}
+		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: {
+		// 设置初始化，防止刷新时恢复默认
+		initSetIconfont() {
+			// 设置批量第三方 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;
+				});
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	destroyed() {
+		this.bus.$off('openSetingsDrawer');
+	},
+};
 </script>

src/api/login/index.js

@@ -1,26 +1,24 @@
-import request from '/@/utils/request';
+import request from '@/utils/request';
 
 /**
- * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
- *
  * 登录api接口集合
  * @method signIn 用户登录
  * @method signOut 用户退出登录
  */
 export function useLoginApi() {
 	return {
-		signIn: (data: object) => {
+		signIn: (params) => {
 			return request({
 				url: '/user/signIn',
 				method: 'post',
-				data,
+				data: params,
 			});
 		},
-		signOut: (data: object) => {
+		signOut: (params) => {
 			return request({
 				url: '/user/signOut',
 				method: 'post',
-				data,
+				data: params,
 			});
 		},
 	};

src/api/menu/index.js

@@ -0,0 +1,48 @@
+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

@@ -1,30 +0,0 @@
-import request from '/@/utils/request';
-
-/**
- * 以下为模拟接口地址，gitee 的不通，就换自己的真实接口地址
- *
- * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
- *
- * 后端控制菜单模拟json，路径在 https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu
- * 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
- * @method getAdminMenu 获取后端动态路由菜单(admin)
- * @method getTestMenu 获取后端动态路由菜单(test)
- */
-export function useMenuApi() {
-	return {
-		getAdminMenu: (params?: object) => {
-			return request({
-				url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/adminMenu.json',
-				method: 'get',
-				params,
-			});
-		},
-		getTestMenu: (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,9 +1,6 @@
 <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>
-	<use id="Background" href="#img1" x="0" y="0" />
+	<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" />
 </svg>

src/components/auth/auth.vue

@@ -1,26 +0,0 @@
-<template>
-	<slot v-if="getUserAuthBtnList" />
-</template>
-
-<script setup lang="ts" name="auth">
-import { computed } from 'vue';
-import { storeToRefs } from 'pinia';
-import { useUserInfo } from '/@/stores/userInfo';
-
-// 定义父组件传过来的值
-const props = defineProps({
-	value: {
-		type: String,
-		default: () => '',
-	},
-});
-
-// 定义变量内容
-const stores = useUserInfo();
-const { userInfos } = storeToRefs(stores);
-
-// 获取 pinia 中的用户权限
-const getUserAuthBtnList = computed(() => {
-	return userInfos.value.authBtnList.some((v: string) => v === props.value);
-});
-</script>

src/components/auth/authAll.vue

@@ -1,27 +0,0 @@
-<template>
-	<slot v-if="getUserAuthBtnList" />
-</template>
-
-<script setup lang="ts" name="authAll">
-import { computed } from 'vue';
-import { storeToRefs } from 'pinia';
-import { useUserInfo } from '/@/stores/userInfo';
-import { judementSameArr } from '/@/utils/arrayOperation';
-
-// 定义父组件传过来的值
-const props = defineProps({
-	value: {
-		type: Array,
-		default: () => [],
-	},
-});
-
-// 定义变量内容
-const stores = useUserInfo();
-const { userInfos } = storeToRefs(stores);
-
-// 获取 pinia 中的用户权限
-const getUserAuthBtnList = computed(() => {
-	return judementSameArr(props.value, userInfos.value.authBtnList);
-});
-</script>

src/components/auth/auths.vue

@@ -1,32 +0,0 @@
-<template>
-	<slot v-if="getUserAuthBtnList" />
-</template>
-
-<script setup lang="ts" name="auths">
-import { computed } from 'vue';
-import { storeToRefs } from 'pinia';
-import { useUserInfo } from '/@/stores/userInfo';
-
-// 定义父组件传过来的值
-const props = defineProps({
-	value: {
-		type: Array,
-		default: () => [],
-	},
-});
-
-// 定义变量内容
-const stores = useUserInfo();
-const { userInfos } = storeToRefs(stores);
-
-// 获取 pinia 中的用户权限
-const getUserAuthBtnList = computed(() => {
-	let flag = false;
-	userInfos.value.authBtnList.map((val: string) => {
-		props.value.map((v) => {
-			if (val === v) flag = true;
-		});
-	});
-	return flag;
-});
-</script>

src/components/cropper/index.vue

@@ -1,143 +0,0 @@
-<template>
-	<div>
-		<el-dialog title="更换头像" v-model="state.isShowDialog" width="769px">
-			<div class="cropper-warp">
-				<div class="cropper-warp-left">
-					<img :src="state.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="state.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="state.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 setup lang="ts" name="cropper">
-import { reactive, nextTick } from 'vue';
-import Cropper from 'cropperjs';
-import 'cropperjs/dist/cropper.css';
-
-// 定义变量内容
-const state = reactive({
-	isShowDialog: false,
-	cropperImg: '',
-	cropperImgBase64: '',
-	cropper: '' as RefType,
-});
-
-// 打开弹窗
-const openDialog = (imgs: string) => {
-	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 = <HTMLImageElement>document.querySelector('.cropper-warp-left-img');
-	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 = state.cropper.getCroppedCanvas().toDataURL('image/jpeg');
-		},
-	});
-};
-
-// 暴露变量
-defineExpose({
-	openDialog,
-});
-</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

@@ -1,101 +0,0 @@
-<template>
-	<div class="editor-container">
-		<Toolbar :editor="editorRef" :mode="mode" />
-		<Editor
-			:mode="mode"
-			:defaultConfig="state.editorConfig"
-			:style="{ height }"
-			v-model="state.editorVal"
-			@onCreated="handleCreated"
-			@onChange="handleChange"
-		/>
-	</div>
-</template>
-
-<script setup lang="ts" name="wngEditor">
-// https://www.wangeditor.com/v5/for-frame.html#vue3
-import '@wangeditor/editor/dist/css/style.css';
-import { reactive, shallowRef, watch, onBeforeUnmount } from 'vue';
-import { IDomEditor } from '@wangeditor/editor';
-import { Toolbar, Editor } from '@wangeditor/editor-for-vue';
-
-// 定义父组件传过来的值
-const props = defineProps({
-	// 是否禁用
-	disable: {
-		type: Boolean,
-		default: () => false,
-	},
-	// 内容框默认 placeholder
-	placeholder: {
-		type: String,
-		default: () => '请输入内容...',
-	},
-	// 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',
-	},
-	// 双向绑定，用于获取 editor.getHtml()
-	getHtml: String,
-	// 双向绑定，用于获取 editor.getText()
-	getText: String,
-});
-
-// 定义子组件向父组件传值/事件
-const emit = defineEmits(['update:getHtml', 'update:getText']);
-
-// 定义变量内容
-const editorRef = shallowRef();
-const state = reactive({
-	editorConfig: {
-		placeholder: props.placeholder,
-	},
-	editorVal: props.getHtml,
-});
-
-// 编辑器回调函数
-const handleCreated = (editor: IDomEditor) => {
-	editorRef.value = editor;
-};
-// 编辑器内容改变时
-const handleChange = (editor: IDomEditor) => {
-	emit('update:getHtml', editor.getHtml());
-	emit('update:getText', editor.getText());
-};
-// 页面销毁时
-onBeforeUnmount(() => {
-	const editor = editorRef.value;
-	if (editor == null) return;
-	editor.destroy();
-});
-// 监听是否禁用改变
-// https://gitee.com/lyt-top/vue-next-admin/issues/I4LM7I
-watch(
-	() => props.disable,
-	(bool) => {
-		const editor = editorRef.value;
-		if (editor == null) return;
-		bool ? editor.disable() : editor.enable();
-	},
-	{
-		deep: true,
-	}
-);
-// 监听双向绑定值改变，用于回显
-watch(
-	() => props.getHtml,
-	(val) => {
-		state.editorVal = val;
-	},
-	{
-		deep: true,
-	}
-);
-</script>

src/components/iconSelector/index.vue

@@ -1,241 +0,0 @@
-<template>
-	<div class="icon-selector w100 h100">
-		<el-input
-			v-model="state.fontIconSearch"
-			:placeholder="state.fontIconPlaceholder"
-			:clearable="clearable"
-			:disabled="disabled"
-			:size="size"
-			ref="inputWidthRef"
-			@clear="onClearFontIcon"
-			@focus="onIconFocus"
-			@blur="onIconBlur"
-		>
-			<template #prepend>
-				<SvgIcon
-					:name="state.fontIconPrefix === '' ? prepend : state.fontIconPrefix"
-					class="font14"
-					v-if="state.fontIconPrefix === '' ? prepend?.indexOf('ele-') > -1 : state.fontIconPrefix?.indexOf('ele-') > -1"
-				/>
-				<i v-else :class="state.fontIconPrefix === '' ? prepend : state.fontIconPrefix" class="font14"></i>
-			</template>
-		</el-input>
-		<el-popover
-			placement="bottom"
-			:width="state.fontIconWidth"
-			transition="el-zoom-in-top"
-			popper-class="icon-selector-popper"
-			trigger="click"
-			:virtual-ref="inputWidthRef"
-			virtual-triggering
-		>
-			<template #default>
-				<div class="icon-selector-warp">
-					<div class="icon-selector-warp-title">{{ title }}</div>
-					<el-tabs v-model="state.fontIconTabActive" @tab-click="onIconClick">
-						<el-tab-pane lazy label="ali" name="ali">
-							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
-						</el-tab-pane>
-						<el-tab-pane lazy label="ele" name="ele">
-							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
-						</el-tab-pane>
-						<el-tab-pane lazy label="awe" name="awe">
-							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
-						</el-tab-pane>
-					</el-tabs>
-				</div>
-			</template>
-		</el-popover>
-	</div>
-</template>
-
-<script setup lang="ts" name="iconSelector">
-import { defineAsyncComponent, ref, reactive, onMounted, nextTick, computed, watch } from 'vue';
-import type { TabsPaneContext } from 'element-plus';
-import initIconfont from '/@/utils/getStyleSheets';
-import '/@/theme/iconSelector.scss';
-
-// 定义父组件传过来的值
-const props = defineProps({
-	// 输入框前置内容
-	prepend: {
-		type: String,
-		default: () => 'ele-Pointer',
-	},
-	// 输入框占位文本
-	placeholder: {
-		type: String,
-		default: () => '请输入内容搜索图标或者选择图标',
-	},
-	// 输入框占位文本
-	size: {
-		type: String,
-		default: () => 'default',
-	},
-	// 弹窗标题
-	title: {
-		type: String,
-		default: () => '请选择图标',
-	},
-	// 禁用
-	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,
-});
-
-// 定义子组件向父组件传值/事件
-const emit = defineEmits(['update:modelValue', 'get', 'clear']);
-
-// 引入组件
-const IconList = defineAsyncComponent(() => import('/@/components/iconSelector/list.vue'));
-
-// 定义变量内容
-const inputWidthRef = ref();
-const state = reactive({
-	fontIconPrefix: '',
-	fontIconWidth: 0,
-	fontIconSearch: '',
-	fontIconPlaceholder: '',
-	fontIconTabActive: 'ali',
-	fontIconList: {
-		ali: [],
-		ele: [],
-		awe: [],
-	},
-});
-
-// 处理 input 获取焦点时，modelValue 有值时，改变 input 的 placeholder 值
-const onIconFocus = () => {
-	if (!props.modelValue) return false;
-	state.fontIconSearch = '';
-	state.fontIconPlaceholder = props.modelValue;
-};
-// 处理 input 失去焦点时，为空将清空 input 值，为点击选中图标时，将取原先值
-const onIconBlur = () => {
-	const list = fontIconTabNameList();
-	setTimeout(() => {
-		const icon = list.filter((icon: string) => icon === state.fontIconSearch);
-		if (icon.length <= 0) state.fontIconSearch = '';
-	}, 300);
-};
-// 图标搜索及图标数据显示
-const fontIconSheetsFilterList = computed(() => {
-	const list = fontIconTabNameList();
-	if (!state.fontIconSearch) return list;
-	let search = state.fontIconSearch.trim().toLowerCase();
-	return list.filter((item: string) => {
-		if (item.toLowerCase().indexOf(search) !== -1) return item;
-	});
-});
-// 根据 tab name 类型设置图标
-const fontIconTabNameList = () => {
-	let iconList: any = [];
-	if (state.fontIconTabActive === 'ali') iconList = state.fontIconList.ali;
-	else if (state.fontIconTabActive === 'ele') iconList = state.fontIconList.ele;
-	else if (state.fontIconTabActive === 'awe') iconList = state.fontIconList.awe;
-	return iconList;
-};
-// 处理 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 类型，用于回显时，tab 高亮与初始化数据
-const initFontIconName = () => {
-	let name = 'ali';
-	if (props.modelValue!.indexOf('iconfont') > -1) name = 'ali';
-	else if (props.modelValue!.indexOf('ele-') > -1) name = 'ele';
-	else if (props.modelValue!.indexOf('fa') > -1) name = 'awe';
-	// 初始化 tab 高亮回显
-	state.fontIconTabActive = name;
-	return name;
-};
-// 初始化数据
-const initFontIconData = async (name: string) => {
-	if (name === 'ali') {
-		// 阿里字体图标使用 `iconfont xxx`
-		if (state.fontIconList.ali.length > 0) return;
-		await initIconfont.ali().then((res: any) => {
-			state.fontIconList.ali = res.map((i: string) => `iconfont ${i}`);
-		});
-	} else if (name === 'ele') {
-		// element plus 图标
-		if (state.fontIconList.ele.length > 0) return;
-		await initIconfont.ele().then((res: any) => {
-			state.fontIconList.ele = res;
-		});
-	} else if (name === 'awe') {
-		// fontawesome字体图标使用 `fa xxx`
-		if (state.fontIconList.awe.length > 0) return;
-		await initIconfont.awe().then((res: any) => {
-			state.fontIconList.awe = 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 onIconClick = (pane: TabsPaneContext) => {
-	initFontIconData(pane.paneName as string);
-	inputWidthRef.value.focus();
-};
-// 获取当前点击的 icon 图标
-const onColClick = (v: string) => {
-	state.fontIconPlaceholder = v;
-	state.fontIconPrefix = v;
-	emit('get', state.fontIconPrefix);
-	emit('update:modelValue', state.fontIconPrefix);
-	inputWidthRef.value.focus();
-};
-// 清空当前点击的 icon 图标
-const onClearFontIcon = () => {
-	state.fontIconPrefix = '';
-	emit('clear', state.fontIconPrefix);
-	emit('update:modelValue', state.fontIconPrefix);
-};
-// 获取 input 的宽度
-const getInputWidth = () => {
-	nextTick(() => {
-		state.fontIconWidth = inputWidthRef.value.$el.offsetWidth;
-	});
-};
-// 监听页面宽度改变
-const initResize = () => {
-	window.addEventListener('resize', () => {
-		getInputWidth();
-	});
-};
-// 页面加载时
-onMounted(() => {
-	initFontIconData(initFontIconName());
-	initResize();
-	getInputWidth();
-});
-// 监听双向绑定 modelValue 的变化
-watch(
-	() => props.modelValue,
-	() => {
-		initModeValueEcho();
-		initFontIconName();
-	}
-);
-</script>

src/components/iconSelector/list.vue

@@ -1,84 +0,0 @@
-<template>
-	<div class="icon-selector-warp-row">
-		<el-scrollbar ref="selectorScrollbarRef">
-			<el-row :gutter="10" v-if="props.list.length > 0">
-				<el-col :xs="6" :sm="4" :md="4" :lg="4" :xl="4" v-for="(v, k) in list" :key="k" @click="onColClick(v)">
-					<div class="icon-selector-warp-item" :class="{ 'icon-selector-active': prefix === v }">
-						<SvgIcon :name="v" />
-					</div>
-				</el-col>
-			</el-row>
-			<el-empty :image-size="100" v-if="list.length <= 0" :description="empty"></el-empty>
-		</el-scrollbar>
-	</div>
-</template>
-
-<script setup lang="ts" name="iconSelectorList">
-// 定义父组件传过来的值
-const props = defineProps({
-	// 图标列表数据
-	list: {
-		type: Array,
-		default: () => [],
-	},
-	// 自定义空状态描述文字
-	empty: {
-		type: String,
-		default: () => '无相关图标',
-	},
-	// 高亮当前选中图标
-	prefix: {
-		type: String,
-		default: () => '',
-	},
-});
-
-// 定义子组件向父组件传值/事件
-const emit = defineEmits(['get-icon']);
-
-// 当前 icon 图标点击时
-const onColClick = (v: unknown | string) => {
-	emit('get-icon', v);
-};
-</script>
-
-<style scoped lang="scss">
-.icon-selector-warp-row {
-	height: 230px;
-	overflow: hidden;
-	.el-row {
-		padding: 15px;
-	}
-	.el-scrollbar__bar.is-horizontal {
-		display: none;
-	}
-	.icon-selector-warp-item {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border: 1px solid var(--el-border-color);
-		border-radius: 5px;
-		margin-bottom: 10px;
-		height: 30px;
-		i {
-			font-size: 20px;
-			color: var(--el-text-color-regular);
-		}
-		&:hover {
-			cursor: pointer;
-			background-color: var(--el-color-primary-light-9);
-			border: 1px solid var(--el-color-primary-light-5);
-			i {
-				color: var(--el-color-primary);
-			}
-		}
-	}
-	.icon-selector-active {
-		background-color: var(--el-color-primary-light-9);
-		border: 1px solid var(--el-color-primary-light-5);
-		i {
-			color: var(--el-color-primary);
-		}
-	}
-}
-</style>

src/components/noticeBar/index.vue

@@ -1,191 +0,0 @@
-<template>
-	<div class="notice-bar" :style="{ background, height: `${height}px` }" v-show="!state.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 setup lang="ts" name="noticeBar">
-import { reactive, ref, onMounted, nextTick } from 'vue';
-
-// 定义父组件传过来的值
-const props = defineProps({
-	// 通知栏模式，可选值为 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: () => '',
-	},
-});
-
-// 定义子组件向父组件传值/事件
-const emit = defineEmits(['close', 'link']);
-
-// 定义变量内容
-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();
-});
-</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

@@ -1,63 +0,0 @@
-<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 setup lang="ts" name="svgIcon">
-import { computed } from 'vue';
-
-// 定义父组件传过来的值
-const props = defineProps({
-	// svg 图标组件名字
-	name: {
-		type: String,
-	},
-	// svg 大小
-	size: {
-		type: Number,
-		default: () => 14,
-	},
-	// svg 颜色
-	color: {
-		type: String,
-	},
-});
-
-// 在线链接、本地引入地址前缀
-// https://gitee.com/lyt-top/vue-next-admin/issues/I62OVL
-const linesString = ['https', 'http', '/src', '/assets', 'data:image', 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('')}`;
-});
-</script>

src/components/table/index.vue

@@ -1,301 +0,0 @@
-<template>
-	<div class="table-container">
-		<el-table
-			:data="data"
-			:border="setBorder"
-			v-bind="$attrs"
-			row-key="id"
-			stripe
-			style="width: 100%"
-			v-loading="config.loading"
-			@selection-change="onSelectionChange"
-		>
-			<el-table-column type="selection" :reserve-selection="true" width="30" v-if="config.isSelection" />
-			<el-table-column type="index" label="序号" width="60" v-if="config.isSerialNo" />
-			<el-table-column
-				v-for="(item, index) in setHeader"
-				:key="index"
-				show-overflow-tooltip
-				:prop="item.key"
-				:width="item.colWidth"
-				:label="item.title"
-			>
-				<template v-slot="scope">
-					<template v-if="item.type === 'image'">
-						<el-image
-							:style="{ width: `${item.width}px`, height: `${item.height}px` }"
-							:src="scope.row[item.key]"
-							:zoom-rate="1.2"
-							:preview-src-list="[scope.row[item.key]]"
-							preview-teleported
-							fit="cover"
-						/>
-					</template>
-					<template v-else>
-						{{ scope.row[item.key] }}
-					</template>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作" width="100" v-if="config.isOperate">
-				<template v-slot="scope">
-					<el-popconfirm title="确定删除吗？" @confirm="onDelRow(scope.row)">
-						<template #reference>
-							<el-button text type="primary">删除</el-button>
-						</template>
-					</el-popconfirm>
-				</template>
-			</el-table-column>
-			<template #empty>
-				<el-empty description="暂无数据" />
-			</template>
-		</el-table>
-		<div class="table-footer mt15">
-			<el-pagination
-				v-model:current-page="state.page.pageNum"
-				v-model:page-size="state.page.pageSize"
-				:pager-count="5"
-				:page-sizes="[10, 20, 30]"
-				:total="config.total"
-				layout="total, sizes, prev, pager, next, jumper"
-				background
-				@size-change="onHandleSizeChange"
-				@current-change="onHandleCurrentChange"
-			>
-			</el-pagination>
-			<div class="table-footer-tool">
-				<SvgIcon name="iconfont icon-dayin" :size="19" title="打印" @click="onPrintTable" />
-				<SvgIcon name="iconfont icon-yunxiazai_o" :size="22" title="导出" @click="onImportTable" />
-				<SvgIcon name="iconfont icon-shuaxin" :size="22" title="刷新" @click="onRefreshTable" />
-				<el-popover
-					placement="top-end"
-					trigger="click"
-					transition="el-zoom-in-top"
-					popper-class="table-tool-popper"
-					:width="300"
-					:persistent="false"
-					@show="onSetTable"
-				>
-					<template #reference>
-						<SvgIcon name="iconfont icon-quanjushezhi_o" :size="22" title="设置" />
-					</template>
-					<template #default>
-						<div class="tool-box">
-							<el-tooltip content="拖动进行排序" placement="top-start">
-								<SvgIcon name="fa fa-question-circle-o" :size="17" class="ml11" color="#909399" />
-							</el-tooltip>
-							<el-checkbox
-								v-model="state.checkListAll"
-								:indeterminate="state.checkListIndeterminate"
-								class="ml10 mr1"
-								label="列显示"
-								@change="onCheckAllChange"
-							/>
-							<el-checkbox v-model="getConfig.isSerialNo" class="ml12 mr1" label="序号" />
-							<el-checkbox v-model="getConfig.isSelection" class="ml12 mr1" label="多选" />
-						</div>
-						<el-scrollbar>
-							<div ref="toolSetRef" class="tool-sortable">
-								<div class="tool-sortable-item" v-for="v in header" :key="v.key" :data-key="v.key">
-									<i class="fa fa-arrows-alt handle cursor-pointer"></i>
-									<el-checkbox v-model="v.isCheck" size="default" class="ml12 mr8" :label="v.title" @change="onCheckChange" />
-								</div>
-							</div>
-						</el-scrollbar>
-					</template>
-				</el-popover>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts" name="netxTable">
-import { reactive, computed, nextTick, ref } from 'vue';
-import { ElMessage } from 'element-plus';
-import printJs from 'print-js';
-import table2excel from 'js-table2excel';
-import Sortable from 'sortablejs';
-import { storeToRefs } from 'pinia';
-import { useThemeConfig } from '/@/stores/themeConfig';
-import '/@/theme/tableTool.scss';
-
-// 定义父组件传过来的值
-const props = defineProps({
-	// 列表内容
-	data: {
-		type: Array<EmptyObjectType>,
-		default: () => [],
-	},
-	// 表头内容
-	header: {
-		type: Array<EmptyObjectType>,
-		default: () => [],
-	},
-	// 配置项
-	config: {
-		type: Object,
-		default: () => {},
-	},
-	// 打印标题
-	printName: {
-		type: String,
-		default: () => '',
-	},
-});
-
-// 定义子组件向父组件传值/事件
-const emit = defineEmits(['delRow', 'pageChange', 'sortHeader']);
-
-// 定义变量内容
-const toolSetRef = ref();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-const state = reactive({
-	page: {
-		pageNum: 1,
-		pageSize: 10,
-	},
-	selectlist: [] as EmptyObjectType[],
-	checkListAll: true,
-	checkListIndeterminate: false,
-});
-
-// 设置边框显示/隐藏
-const setBorder = computed(() => {
-	return props.config.isBorder ? true : false;
-});
-// 获取父组件 配置项（必传）
-const getConfig = computed(() => {
-	return props.config;
-});
-// 设置 tool header 数据
-const setHeader = computed(() => {
-	return props.header.filter((v) => v.isCheck);
-});
-// tool 列显示全选改变时
-const onCheckAllChange = <T>(val: T) => {
-	if (val) props.header.forEach((v) => (v.isCheck = true));
-	else props.header.forEach((v) => (v.isCheck = false));
-	state.checkListIndeterminate = false;
-};
-// tool 列显示当前项改变时
-const onCheckChange = () => {
-	const headers = props.header.filter((v) => v.isCheck).length;
-	state.checkListAll = headers === props.header.length;
-	state.checkListIndeterminate = headers > 0 && headers < props.header.length;
-};
-// 表格多选改变时，用于导出
-const onSelectionChange = (val: EmptyObjectType[]) => {
-	state.selectlist = val;
-};
-// 删除当前项
-const onDelRow = (row: EmptyObjectType) => {
-	emit('delRow', row);
-};
-// 分页改变
-const onHandleSizeChange = (val: number) => {
-	state.page.pageSize = val;
-	emit('pageChange', state.page);
-};
-// 分页改变
-const onHandleCurrentChange = (val: number) => {
-	state.page.pageNum = val;
-	emit('pageChange', state.page);
-};
-// 搜索时，分页还原成默认
-const pageReset = () => {
-	state.page.pageNum = 1;
-	state.page.pageSize = 10;
-	emit('pageChange', state.page);
-};
-// 打印
-const onPrintTable = () => {
-	// https://printjs.crabbly.com/#documentation
-	// 自定义打印
-	let tableTh = '';
-	let tableTrTd = '';
-	let tableTd: any = {};
-	// 表头
-	props.header.forEach((v) => {
-		tableTh += `<th class="table-th">${v.title}</th>`;
-	});
-	// 表格内容
-	props.data.forEach((val, key) => {
-		if (!tableTd[key]) tableTd[key] = [];
-		props.header.forEach((v) => {
-			if (v.type === 'text') {
-				tableTd[key].push(`<td class="table-th table-center">${val[v.key]}</td>`);
-			} else if (v.type === 'image') {
-				tableTd[key].push(`<td class="table-th table-center"><img src="${val[v.key]}" style="width:${v.width}px;height:${v.height}px;"/></td>`);
-			}
-		});
-		tableTrTd += `<tr>${tableTd[key].join('')}</tr>`;
-	});
-	// 打印
-	printJs({
-		printable: `<div style=display:flex;flex-direction:column;text-align:center><h3>${props.printName}</h3></div><table border=1 cellspacing=0><tr>${tableTh}${tableTrTd}</table>`,
-		type: 'raw-html',
-		css: ['//at.alicdn.com/t/c/font_2298093_rnp72ifj3ba.css', '//unpkg.com/element-plus/dist/index.css'],
-		style: `@media print{.mb15{margin-bottom:15px;}.el-button--small i.iconfont{font-size: 12px !important;margin-right: 5px;}}; .table-th{word-break: break-all;white-space: pre-wrap;}.table-center{text-align: center;}`,
-	});
-};
-// 导出
-const onImportTable = () => {
-	if (state.selectlist.length <= 0) return ElMessage.warning('请先选择要导出的数据');
-	table2excel(props.header, state.selectlist, `${themeConfig.value.globalTitle} ${new Date().toLocaleString()}`);
-};
-// 刷新
-const onRefreshTable = () => {
-	emit('pageChange', state.page);
-};
-// 设置
-const onSetTable = () => {
-	nextTick(() => {
-		const sortable = Sortable.create(toolSetRef.value, {
-			handle: '.handle',
-			dataIdAttr: 'data-key',
-			animation: 150,
-			onEnd: () => {
-				const headerList: EmptyObjectType[] = [];
-				sortable.toArray().forEach((val: string) => {
-					props.header.forEach((v) => {
-						if (v.key === val) headerList.push({ ...v });
-					});
-				});
-				emit('sortHeader', headerList);
-			},
-		});
-	});
-};
-
-// 暴露变量
-defineExpose({
-	pageReset,
-});
-</script>
-
-<style scoped lang="scss">
-.table-container {
-	display: flex;
-	flex-direction: column;
-	.el-table {
-		flex: 1;
-	}
-	.table-footer {
-		display: flex;
-		.table-footer-tool {
-			flex: 1;
-			display: flex;
-			align-items: center;
-			justify-content: flex-end;
-			i {
-				margin-right: 10px;
-				cursor: pointer;
-				color: var(--el-text-color-regular);
-				&:last-of-type {
-					margin-right: 0;
-				}
-			}
-		}
-	}
-}
-</style>

src/directive/authDirective.ts

@@ -1,40 +0,0 @@
-import type { App } from 'vue';
-import { useUserInfo } from '/@/stores/userInfo';
-import { judementSameArr } from '/@/utils/arrayOperation';
-
-/**
- * 用户权限指令
- * @directive 单个权限验证（v-auth="xxx"）
- * @directive 多个权限验证，满足一个则显示（v-auths="[xxx,xxx]"）
- * @directive 多个权限验证，全部满足则显示（v-auth-all="[xxx,xxx]"）
- */
-export function authDirective(app: App) {
-	// 单个权限验证（v-auth="xxx"）
-	app.directive('auth', {
-		mounted(el, binding) {
-			const stores = useUserInfo();
-			if (!stores.userInfos.authBtnList.some((v: string) => v === binding.value)) el.parentNode.removeChild(el);
-		},
-	});
-	// 多个权限验证，满足一个则显示（v-auths="[xxx,xxx]"）
-	app.directive('auths', {
-		mounted(el, binding) {
-			let flag = false;
-			const stores = useUserInfo();
-			stores.userInfos.authBtnList.map((val: string) => {
-				binding.value.map((v: string) => {
-					if (val === v) flag = true;
-				});
-			});
-			if (!flag) el.parentNode.removeChild(el);
-		},
-	});
-	// 多个权限验证，全部满足则显示（v-auth-all="[xxx,xxx]"）
-	app.directive('auth-all', {
-		mounted(el, binding) {
-			const stores = useUserInfo();
-			const flag = judementSameArr(binding.value, stores.userInfos.authBtnList);
-			if (!flag) el.parentNode.removeChild(el);
-		},
-	});
-}

src/directive/customDirective.ts

@@ -1,178 +0,0 @@
-import type { App } from 'vue';
-
-/**
- * 按钮波浪指令
- * @directive 默认方式：v-waves，如 `<div v-waves></div>`
- * @directive 参数方式：v-waves=" |light|red|orange|purple|green|teal"，如 `<div v-waves="'light'"></div>`
- */
-export function wavesDirective(app: App) {
-	app.directive('waves', {
-		mounted(el, binding) {
-			el.classList.add('waves-effect');
-			binding.value && el.classList.add(`waves-${binding.value}`);
-			function setConvertStyle(obj: { [key: string]: unknown }) {
-				let style: string = '';
-				for (let i in obj) {
-					if (obj.hasOwnProperty(i)) style += `${i}:${obj[i]};`;
-				}
-				return style;
-			}
-			function onCurrentClick(e: { [key: string]: unknown }) {
-				let elDiv = document.createElement('div');
-				elDiv.classList.add('waves-ripple');
-				el.appendChild(elDiv);
-				let styles = {
-					left: `${e.layerX}px`,
-					top: `${e.layerY}px`,
-					opacity: 1,
-					transform: `scale(${(el.clientWidth / 100) * 10})`,
-					'transition-duration': `750ms`,
-					'transition-timing-function': `cubic-bezier(0.250, 0.460, 0.450, 0.940)`,
-				};
-				elDiv.setAttribute('style', setConvertStyle(styles));
-				setTimeout(() => {
-					elDiv.setAttribute(
-						'style',
-						setConvertStyle({
-							opacity: 0,
-							transform: styles.transform,
-							left: styles.left,
-							top: styles.top,
-						})
-					);
-					setTimeout(() => {
-						elDiv && el.removeChild(elDiv);
-					}, 750);
-				}, 450);
-			}
-			el.addEventListener('mousedown', onCurrentClick, false);
-		},
-		unmounted(el) {
-			el.addEventListener('mousedown', () => {});
-		},
-	});
-}
-
-/**
- * 自定义拖动指令
- * @description  使用方式：v-drag="[dragDom,dragHeader]"，如 `<div v-drag="['.drag-container .el-dialog', '.drag-container .el-dialog__header']"></div>`
- * @description dragDom 要拖动的元素，dragHeader 要拖动的 Header 位置
- * @link 注意：https://github.com/element-plus/element-plus/issues/522
- * @lick 参考：https://blog.csdn.net/weixin_46391323/article/details/105228020?utm_medium=distribute.pc_relevant.none-task-blog-baidujs_title-10&spm=1001.2101.3001.4242
- */
-export function dragDirective(app: App) {
-	app.directive('drag', {
-		mounted(el, binding) {
-			if (!binding.value) return false;
-
-			const dragDom = document.querySelector(binding.value[0]) as HTMLElement;
-			const dragHeader = document.querySelector(binding.value[1]) as HTMLElement;
-
-			dragHeader.onmouseover = () => (dragHeader.style.cursor = `move`);
-
-			function down(e: any, type: string) {
-				// 鼠标按下，计算当前元素距离可视区的距离
-				const disX = type === 'pc' ? e.clientX - dragHeader.offsetLeft : e.touches[0].clientX - dragHeader.offsetLeft;
-				const disY = type === 'pc' ? e.clientY - dragHeader.offsetTop : e.touches[0].clientY - dragHeader.offsetTop;
-
-				// body当前宽度
-				const screenWidth = document.body.clientWidth;
-				// 可见区域高度(应为body高度，可某些环境下无法获取)
-				const screenHeight = document.documentElement.clientHeight;
-
-				// 对话框宽度
-				const dragDomWidth = dragDom.offsetWidth;
-				// 对话框高度
-				const dragDomheight = dragDom.offsetHeight;
-
-				const minDragDomLeft = dragDom.offsetLeft;
-				const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth;
-
-				const minDragDomTop = dragDom.offsetTop;
-				const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomheight;
-
-				// 获取到的值带px 正则匹配替换
-				let styL: any = getComputedStyle(dragDom).left;
-				let styT: any = getComputedStyle(dragDom).top;
-
-				// 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
-				if (styL.includes('%')) {
-					styL = +document.body.clientWidth * (+styL.replace(/\%/g, '') / 100);
-					styT = +document.body.clientHeight * (+styT.replace(/\%/g, '') / 100);
-				} else {
-					styL = +styL.replace(/\px/g, '');
-					styT = +styT.replace(/\px/g, '');
-				}
-
-				return {
-					disX,
-					disY,
-					minDragDomLeft,
-					maxDragDomLeft,
-					minDragDomTop,
-					maxDragDomTop,
-					styL,
-					styT,
-				};
-			}
-
-			function move(e: any, type: string, obj: any) {
-				let { disX, disY, minDragDomLeft, maxDragDomLeft, minDragDomTop, maxDragDomTop, styL, styT } = obj;
-
-				// 通过事件委托，计算移动的距离
-				let left = type === 'pc' ? e.clientX - disX : e.touches[0].clientX - disX;
-				let top = type === 'pc' ? e.clientY - disY : e.touches[0].clientY - disY;
-
-				// 边界处理
-				if (-left > minDragDomLeft) {
-					left = -minDragDomLeft;
-				} else if (left > maxDragDomLeft) {
-					left = maxDragDomLeft;
-				}
-
-				if (-top > minDragDomTop) {
-					top = -minDragDomTop;
-				} else if (top > maxDragDomTop) {
-					top = maxDragDomTop;
-				}
-
-				// 移动当前元素
-				dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`;
-			}
-
-			/**
-			 * pc端
-			 * onmousedown 鼠标按下触发事件
-			 * onmousemove 鼠标按下时持续触发事件
-			 * onmouseup 鼠标抬起触发事件
-			 */
-			dragHeader.onmousedown = (e) => {
-				const obj = down(e, 'pc');
-				document.onmousemove = (e) => {
-					move(e, 'pc', obj);
-				};
-				document.onmouseup = () => {
-					document.onmousemove = null;
-					document.onmouseup = null;
-				};
-			};
-
-			/**
-			 * 移动端
-			 * ontouchstart 当按下手指时，触发ontouchstart
-			 * ontouchmove 当移动手指时，触发ontouchmove
-			 * ontouchend 当移走手指时，触发ontouchend
-			 */
-			dragHeader.ontouchstart = (e) => {
-				const obj = down(e, 'app');
-				document.ontouchmove = (e) => {
-					move(e, 'app', obj);
-				};
-				document.ontouchend = () => {
-					document.ontouchmove = null;
-					document.ontouchend = null;
-				};
-			};
-		},
-	});
-}

src/directive/index.ts

@@ -1,18 +0,0 @@
-import type { App } from 'vue';
-import { authDirective } from '/@/directive/authDirective';
-import { wavesDirective, dragDirective } from '/@/directive/customDirective';
-
-/**
- * 导出指令方法：v-xxx
- * @methods authDirective 用户权限指令，用法：v-auth
- * @methods wavesDirective 按钮波浪指令，用法：v-waves
- * @methods dragDirective 自定义拖动指令，用法：v-drag
- */
-export function directive(app: App) {
-	// 用户权限指令
-	authDirective(app);
-	// 按钮波浪指令
-	wavesDirective(app);
-	// 自定义拖动指令
-	dragDirective(app);
-}

src/i18n/index.js

@@ -0,0 +1,60 @@
+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

@@ -1,68 +0,0 @@
-import { createI18n } from 'vue-i18n';
-import pinia from '/@/stores/index';
-import { storeToRefs } from 'pinia';
-import { useThemeConfig } from '/@/stores/themeConfig';
-
-// 定义语言国际化内容
-
-/**
- * 说明：
- * 须在 pages 下新建文件夹（建议 `要国际化界面目录` 与 `i18n 目录` 相同，方便查找），
- * 注意国际化定义的字段，不要与原有的定义字段相同。
- * 1、/src/i18n/lang 下的 ts 为框架的国际化内容
- * 2、/src/i18n/pages 下的 ts 为各界面的国际化内容
- */
-
-// element plus 自带国际化
-import enLocale from 'element-plus/lib/locale/lang/en';
-import zhcnLocale from 'element-plus/lib/locale/lang/zh-cn';
-import zhtwLocale from 'element-plus/lib/locale/lang/zh-tw';
-
-// 定义变量内容
-const messages = {};
-const element = { en: enLocale, 'zh-cn': zhcnLocale, 'zh-tw': zhtwLocale };
-const itemize = { en: [], 'zh-cn': [], 'zh-tw': [] };
-const modules: Record<string, any> = import.meta.glob('./**/*.ts', { eager: true });
-
-// 对自动引入的 modules 进行分类 en、zh-cn、zh-tw
-// https://vitejs.cn/vite3-cn/guide/features.html#glob-import
-for (const path in modules) {
-	const key = path.match(/(\S+)\/(\S+).ts/);
-	if (itemize[key![2]]) itemize[key![2]].push(modules[path].default);
-	else itemize[key![2]] = modules[path];
-}
-
-// 合并数组对象（非标准数组对象，数组中对象的每项 key、value 都不同）
-function mergeArrObj<T>(list: T, key: string) {
-	let obj = {};
-	list[key].forEach((i: EmptyObjectType) => {
-		obj = Object.assign({}, obj, i);
-	});
-	return obj;
-}
-
-// 处理最终格式
-for (const key in itemize) {
-	messages[key] = {
-		name: key,
-		el: element[key].el,
-		message: mergeArrObj(itemize, key),
-	};
-}
-
-// 读取 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({
-	legacy: false,
-	silentTranslationWarn: true,
-	missingWarn: false,
-	silentFallbackWarn: true,
-	fallbackWarn: false,
-	locale: themeConfig.value.globalI18n,
-	fallbackLocale: zhcnLocale.name,
-	messages,
-});

src/i18n/lang/en.js

@@ -4,10 +4,7 @@ export default {
 		home: 'home',
 		system: 'system',
 		systemMenu: 'systemMenu',
-		systemRole: 'systemRole',
 		systemUser: 'systemUser',
-		systemDept: 'systemDept',
-		systemDic: 'systemDic',
 		limits: 'limits',
 		limitsFrontEnd: 'FrontEnd',
 		limitsFrontEndPage: 'FrontEndPage',
@@ -24,16 +21,18 @@ 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',
-		funGridLayout: 'Drag layout',
+		funScreenShort: 'screenCapture',
-		funSplitpanes: 'Pane splitter',
-		funDragVerify: 'Validator',
 		pagesIndex: 'pages',
 		pagesFiltering: 'Filtering',
 		pagesFilteringDetails: 'FilteringDetails',
@@ -41,39 +40,16 @@ 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',
-		makeTableDemo: 'table 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',
-		layoutIframeViewOne: 'IframeViewOne',
+		layoutIfameView: 'IfameView',
-		layoutIframeViewTwo: 'IframeViewTwo',
 	},
 	staticRoutes: {
 		signIn: 'signIn',
@@ -88,9 +64,10 @@ 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',
@@ -107,6 +84,7 @@ export default {
 		logOutConfirm: 'determine',
 		logOutCancel: 'cancel',
 		logOutExit: 'Exiting',
+		logOutSuccess: 'Exit successfully!',
 	},
 	tagsView: {
 		refresh: 'refresh',
@@ -114,7 +92,6 @@ export default {
 		closeOther: 'closeOther',
 		closeAll: 'closeAll',
 		fullscreen: 'fullscreen',
-		closeFullscreen: 'closeFullscreen',
 	},
 	notFound: {
 		foundTitle: 'Wrong address input, please re-enter the address~',
@@ -129,20 +106,16 @@ export default {
 	layout: {
 		configTitle: 'Layout configuration',
 		oneTitle: 'Global Themes',
-		twoTopTitle: 'top bar set up',
+		twoTitle: 'Menu / top bar',
-		twoMenuTitle: 'Menu set up',
-		twoColumnsTitle: 'Columns set up',
 		twoTopBar: 'Top bar background',
-		twoTopBarColor: 'Top bar default font color',
-		twoIsTopBarColorGradual: 'Top bar gradient',
 		twoMenuBar: 'Menu background',
-		twoMenuBarColor: 'Menu default font color',
-		twoMenuBarActiveColor: 'Menu Highlight Color',
-		twoIsMenuBarColorGradual: 'Menu gradient',
 		twoColumnsMenuBar: 'Column menu background',
+		twoTopBarColor: 'Top bar default font color',
+		twoMenuBarColor: 'Menu default font color',
 		twoColumnsMenuBarColor: 'Default font color bar menu',
-		twoIsColumnsMenuBarColorGradual: 'Column gradient',
+		twoIsTopBarColorGradual: 'Top bar gradient',
-		twoIsColumnsMenuHoverPreload: 'Column Menu Hover Preload',
+		twoIsMenuBarColorGradual: 'Menu gradient',
+		twoIsMenuBarColorHighlight: 'Menu font highlight',
 		threeTitle: 'Interface settings',
 		threeIsCollapse: 'Menu horizontal collapse',
 		threeIsUniqueOpened: 'Menu accordion',
@@ -158,7 +131,6 @@ 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',
@@ -175,7 +147,7 @@ export default {
 		sixClassic: 'Two',
 		sixTransverse: 'Three',
 		sixColumns: 'Four',
-		tipText: 'Click the button below to copy the layout configuration to `/src/stores/themeConfig.ts` It has been modified in.',
+		tipText: 'Click the button below to copy the layout configuration to `/src/store/modules/themeConfig.js` It has been modified in.',
 		copyText: 'replication configuration',
 		resetText: 'restore default',
 		copyTextSuccess: 'Copy succeeded!',

src/i18n/lang/zh-cn.js

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

src/i18n/lang/zh-tw.js

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

src/i18n/pages/formI18n/en.ts

@@ -1,13 +0,0 @@
-// 定义内容
-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

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

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

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

src/i18n/pages/home/en.js

@@ -0,0 +1,14 @@
+// 定义内容
+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

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

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

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

src/i18n/pages/login/en.js

@@ -0,0 +1,18 @@
+// 定义内容
+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

@@ -1,29 +0,0 @@
-// 定义内容
-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

@@ -0,0 +1,18 @@
+// 定义内容
+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

@@ -1,28 +0,0 @@
-// 定义内容
-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

@@ -0,0 +1,18 @@
+// 定义内容
+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

@@ -1,28 +0,0 @@
-// 定义内容
-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,158 +1,106 @@
 <template>
-	<div class="h100" v-show="!isTagsViewCurrenFull">
+	<el-aside class="layout-aside" :class="setCollapseWidth" v-if="clientWidth > 1000">
-		<el-aside class="layout-aside" :class="setCollapseStyle">
+		<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">
 			<Logo v-if="setShowLogo" />
-			<el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef" @mouseenter="onAsideEnterLeave(true)" @mouseleave="onAsideEnterLeave(false)">
+			<el-scrollbar class="flex-auto" ref="layoutAsideRef">
-				<Vertical :menuList="state.menuList" />
+				<Vertical :menuList="menuList" />
 			</el-scrollbar>
 		</el-aside>
-	</div>
+	</el-drawer>
 </template>
 
-<script setup lang="ts" name="layoutAside">
+<script>
-import { defineAsyncComponent, reactive, computed, watch, onBeforeMount, ref } from 'vue';
+import Vertical from '@/layout/navMenu/vertical.vue';
-import { storeToRefs } from 'pinia';
+import Logo from '@/layout/logo/index.vue';
-import { useRoutesList } from '/@/stores/routesList';
+export default {
-import { useThemeConfig } from '/@/stores/themeConfig';
+	name: 'layoutAside',
-import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+	components: { Vertical, Logo },
-import mittBus from '/@/utils/mitt';
+	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') : '';
 
-// 引入组件
+			if (layout === 'columns') {
-const Logo = defineAsyncComponent(() => import('/@/layout/logo/index.vue'));
+				// 分栏布局，菜单收起时宽度给 1px
-const Vertical = defineAsyncComponent(() => import('/@/layout/navMenu/vertical.vue'));
+				if (isCollapse) {
-
+					return ['layout-aside-width1', asideBrColor];
-// 定义变量内容
+				} else {
-const layoutAsideScrollbarRef = ref();
+					return ['layout-aside-width-default', asideBrColor];
-const stores = useRoutesList();
+				}
-const storesThemeConfig = useThemeConfig();
+			} else {
-const storesTagsViewRoutes = useTagsViewRoutes();
+				// 其它布局给 64px
-const { routesList } = storeToRefs(stores);
+				if (isCollapse) {
-const { themeConfig } = storeToRefs(storesThemeConfig);
+					return ['layout-aside-width64', asideBrColor];
-const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+				} else {
-const state = reactive<AsideState>({
+					return ['layout-aside-width-default', asideBrColor];
-	menuList: [],
+				}
-	clientWidth: 0,
+			}
-});
+		},
-
+		// 设置 logo 是否显示
-// 设置菜单展开/收起时的宽度
+		setShowLogo() {
-const setCollapseStyle = computed(() => {
+			let { layout, isShowLogo } = this.$store.state.themeConfig.themeConfig;
-	const { layout, isCollapse, menuBar } = themeConfig.value;
+			return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
-	const asideBrTheme = ['#FFFFFF', '#FFF', '#fff', '#ffffff'];
+		},
-	const asideBrColor = asideBrTheme.includes(menuBar) ? 'layout-el-aside-br-color' : '';
+		// 获取布局配置信息
-	// 判断是否是手机端
+		getThemeConfig() {
-	if (state.clientWidth <= 1000) {
+			return this.$store.state.themeConfig.themeConfig;
-		if (isCollapse) {
+		},
-			document.body.setAttribute('class', 'el-popup-parent--hidden');
+	},
-			const asideEle = document.querySelector('.layout-container') as HTMLElement;
+	created() {
-			const modeDivs = document.createElement('div');
+		this.initMenuFixed(document.body.clientWidth);
-			modeDivs.setAttribute('class', 'layout-aside-mobile-mode');
+		this.setFilterRoutes();
-			asideEle.appendChild(modeDivs);
+		this.bus.$on('setSendColumnsChildren', (res) => {
-			modeDivs.addEventListener('click', closeLayoutAsideMobileMode);
+			this.menuList = res.children;
-			return [asideBrColor, 'layout-aside-mobile', 'layout-aside-mobile-open'];
-		} else {
-			// 关闭弹窗
-			closeLayoutAsideMobileMode();
-			return [asideBrColor, 'layout-aside-mobile', 'layout-aside-mobile-close'];
-		}
-	} else {
-		if (layout === 'columns' || layout === 'classic') {
-			// 分栏布局、经典布局，菜单收起时宽度给 1px，防止切换动画消失
-			if (isCollapse) return [asideBrColor, 'layout-aside-pc-1'];
-			else return [asideBrColor, 'layout-aside-pc-220'];
-		} else {
-			// 其它布局给 64px
-			if (isCollapse) return [asideBrColor, 'layout-aside-pc-64'];
-			else return [asideBrColor, 'layout-aside-pc-220'];
-		}
-	}
-});
-// 设置显示/隐藏 logo
-const setShowLogo = computed(() => {
-	let { layout, isShowLogo } = themeConfig.value;
-	return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
-});
-// 关闭移动端蒙版
-const closeLayoutAsideMobileMode = () => {
-	const el = document.querySelector('.layout-aside-mobile-mode');
-	el?.setAttribute('style', 'animation: error-img-two 0.3s');
-	setTimeout(() => {
-		el?.parentNode?.removeChild(el);
-	}, 300);
-	const clientWidth = document.body.clientWidth;
-	if (clientWidth < 1000) themeConfig.value.isCollapse = false;
-	document.body.setAttribute('class', '');
-};
-// 设置/过滤路由（非静态路由/是否显示在菜单中）
-const setFilterRoutes = () => {
-	if (themeConfig.value.layout === 'columns') return false;
-	state.menuList = filterRoutesFun(routesList.value);
-};
-// 路由过滤递归函数
-const filterRoutesFun = <T extends RouteItem>(arr: T[]): T[] => {
-	return arr
-		.filter((item: T) => !item.meta?.isHide)
-		.map((item: T) => {
-			item = Object.assign({}, item);
-			if (item.children) item.children = filterRoutesFun(item.children);
-			return item;
 		});
+		this.bus.$on('layoutMobileResize', (res) => {
+			this.initMenuFixed(res.clientWidth);
+		});
+		// 菜单滚动条监听
+		this.bus.$on('updateElScrollBar', () => {
+			setTimeout(() => {
+				this.$refs.layoutAsideRef.update();
+			}, 300);
+		});
+	},
+	methods: {
+		// 设置/过滤路由（非静态路由/是否显示在菜单中）
+		setFilterRoutes() {
+			if (this.$store.state.themeConfig.themeConfig.layout === 'columns') return false;
+			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;
+				});
+		},
+		// 设置菜单导航是否固定（移动端）
+		initMenuFixed(clientWidth) {
+			this.clientWidth = clientWidth;
+		},
+	},
+	// 页面销毁时
+	destroyed() {
+		// 取消菜单滚动条监听
+		this.bus.$off('updateElScrollBar', () => {});
+	},
 };
-// 设置菜单导航是否固定（移动端）
-const initMenuFixed = (clientWidth: number) => {
-	state.clientWidth = clientWidth;
-};
-// 鼠标移入、移出
-const onAsideEnterLeave = (bool: Boolean) => {
-	let { layout } = themeConfig.value;
-	if (layout !== 'columns') return false;
-	if (!bool) mittBus.emit('restoreDefault');
-	// 开启 `分栏菜单鼠标悬停预加载` 才设置，防止 columnsAside.vue 监听 pinia.state
-	if (themeConfig.value.isColumnsMenuHoverPreload) stores.setColumnsMenuHover(bool);
-};
-// 页面加载前
-onBeforeMount(() => {
-	initMenuFixed(document.body.clientWidth);
-	setFilterRoutes();
-	// 此界面不需要取消监听(mittBus.off('setSendColumnsChildren))
-	// 因为切换布局时有的监听需要使用，取消了监听，某些操作将不生效
-	mittBus.on('setSendColumnsChildren', (res: MittMenu) => {
-		state.menuList = res.children;
-	});
-	// 开启经典布局分割菜单时，设置菜单数据
-	mittBus.on('setSendClassicChildren', (res: MittMenu) => {
-		let { layout, isClassicSplitMenu } = themeConfig.value;
-		if (layout === 'classic' && isClassicSplitMenu) {
-			// 经典布局分割菜单只要一项子级时，收起左侧导航菜单
-			res.children.length <= 1 ? (themeConfig.value.isCollapse = true) : (themeConfig.value.isCollapse = false);
-			state.menuList = [];
-			state.menuList = res.children;
-		}
-	});
-	// 开启经典布局分割菜单时，重新处理菜单数据
-	mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
-		setFilterRoutes();
-	});
-	// 监听窗口大小改变时(适配移动端)
-	mittBus.on('layoutMobileResize', (res: LayoutMobileResize) => {
-		initMenuFixed(res.clientWidth);
-		closeLayoutAsideMobileMode();
-	});
-});
-// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-watch(
-	() => [themeConfig.value.isShowLogoChange, themeConfig.value.isShowLogo, themeConfig.value.layout, themeConfig.value.isClassicSplitMenu],
-	([isShowLogoChange, isShowLogo, layout, isClassicSplitMenu]) => {
-		if (isShowLogoChange !== isShowLogo) {
-			if (layoutAsideScrollbarRef.value) layoutAsideScrollbarRef.value.update();
-		}
-		if (layout === 'classic' && isClassicSplitMenu) return false;
-	}
-);
-// 监听用户权限切换，用于演示 `权限管理 -> 前端控制 -> 页面权限` 权限切换不生效
-watch(
-	() => routesList.value,
-	() => {
-		setFilterRoutes();
-	}
-);
 </script>

src/layout/component/columnsAside.vue

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

src/layout/component/header.vue

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

src/layout/component/main.vue

@@ -1,65 +1,93 @@
 <template>
-	<el-main class="layout-main" :style="isFixedHeader ? `height: calc(100% - ${setMainHeight})` : `minHeight: calc(100% - ${setMainHeight})`">
+	<el-main class="layout-main">
 		<el-scrollbar
-			ref="layoutMainScrollbarRef"
+			class="layout-scrollbar"
-			class="layout-main-scroll layout-backtop-header-fixed"
+			ref="layoutScrollbarRef"
-			wrap-class="layout-main-scroll"
+			v-show="!currentRouteMeta.isLink && !currentRouteMeta.isIframe"
-			view-class="layout-main-scroll"
+			:style="{ minHeight: `calc(100vh - ${headerHeight}` }"
 		>
 			<LayoutParentView />
-			<LayoutFooter v-if="isFooter" />
+			<Footers v-if="getThemeConfig.isFooter" />
 		</el-scrollbar>
-		<el-backtop :target="setBacktopClass" />
+		<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 setup lang="ts" name="layoutMain">
+<script>
-import { defineAsyncComponent, onMounted, computed, ref } from 'vue';
+import LayoutParentView from '@/layout/routerView/parent.vue';
-import { useRoute } from 'vue-router';
+import Footers from '@/layout/footer/index.vue';
-import { storeToRefs } from 'pinia';
+import Links from '@/layout/routerView/link.vue';
-import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import Iframes from '@/layout/routerView/iframes.vue';
-import { useThemeConfig } from '/@/stores/themeConfig';
+export default {
-import { NextLoading } from '/@/utils/loading';
+	name: 'layoutMain',
-
+	components: { LayoutParentView, Footers, Links, Iframes },
-// 引入组件
+	data() {
-const LayoutParentView = defineAsyncComponent(() => import('/@/layout/routerView/parent.vue'));
+		return {
-const LayoutFooter = defineAsyncComponent(() => import('/@/layout/footer/index.vue'));
+			headerHeight: '',
-
+			currentRouteMeta: {},
-// 定义变量内容
+			isShowLink: false,
-const layoutMainScrollbarRef = ref();
+		};
-const route = useRoute();
+	},
-const storesTagsViewRoutes = useTagsViewRoutes();
+	computed: {
-const storesThemeConfig = useThemeConfig();
+		// 获取布局配置信息
-const { themeConfig } = storeToRefs(storesThemeConfig);
+		getThemeConfig() {
-const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+			return this.$store.state.themeConfig.themeConfig;
-
+		},
-// 设置 footer 显示/隐藏
+	},
-const isFooter = computed(() => {
+	mounted() {
-	return themeConfig.value.isFooter && !route.meta.isIframe;
+		this.initHeaderHeight();
-});
+		this.initCurrentRouteMeta(this.$route.meta);
-// 设置 header 固定
+	},
-const isFixedHeader = computed(() => {
+	methods: {
-	return themeConfig.value.isFixedHeader;
+		// 初始化当前路由 meta 信息
-});
+		initCurrentRouteMeta(meta) {
-// 设置 Backtop 回到顶部
+			this.isShowLink = false;
-const setBacktopClass = computed(() => {
+			this.currentRouteMeta = meta;
-	if (themeConfig.value.isFixedHeader) return `.layout-backtop-header-fixed .el-scrollbar__wrap`;
+			setTimeout(() => {
-	else return `.layout-backtop .el-scrollbar__wrap`;
+				this.isShowLink = true;
-});
+			}, 100);
-// 设置主内容区的高度
+		},
-const setMainHeight = computed(() => {
+		// 设置 main 的高度
-	if (isTagsViewCurrenFull.value) return '0px';
+		initHeaderHeight() {
-	const { isTagsview, layout } = themeConfig.value;
+			let { isTagsview } = this.$store.state.themeConfig.themeConfig;
-	if (isTagsview && layout !== 'classic') return '85px';
+			if (isTagsview) return (this.headerHeight = `84px`);
-	else return '51px';
+			else return (this.headerHeight = `50px`);
-});
+		},
-// 页面加载前
+		// 子组件触发更新
-onMounted(() => {
+		onGetCurrentRouteMeta() {
-	NextLoading.done(600);
+			this.initCurrentRouteMeta(this.$route.meta);
-});
+		},
-
+	},
-// 暴露变量
+	watch: {
-defineExpose({
+		// 监听 vuex 数据变化
-	layoutMainScrollbarRef,
+		'$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,14 +1,19 @@
 <template>
-	<div class="layout-footer pb15">
+	<div class="layout-footer mt15">
 		<div class="layout-footer-warp">
-			<div>vue-next-admin，Made by lyt with ❤️</div>
+			<div>vue-prev-admin，Made by lyt with ❤️</div>
-			<div class="mt5">深圳市 xxx 公司版权所有</div>
+			<div class="mt5">{{ $t('message.login.copyright.one5') }}</div>
 		</div>
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutFooter">
+<script>
-// 此处需有内容（注释也得），否则缓存将失败
+export default {
+	name: 'layoutFooter',
+	data() {
+		return {};
+	},
+};
 </script>
 
 <style scoped lang="scss">
@@ -17,9 +22,8 @@
 	display: flex;
 	&-warp {
 		margin: auto;
-		color: var(--el-text-color-secondary);
+		color: var(--prev-color-text-secondary);
 		text-align: center;
-		animation: error-num 0.3s ease;
 	}
 }
 </style>

src/layout/index.vue

@@ -1,50 +1,51 @@
 <template>
-	<component :is="layouts[themeConfig.layout]" />
+	<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'" />
 </template>
 
-<script setup lang="ts" name="layout">
+<script>
-import { onBeforeMount, onUnmounted, defineAsyncComponent } from 'vue';
+import { Local } from '@/utils/storage.js';
-import { storeToRefs } from 'pinia';
+export default {
-import { useThemeConfig } from '/@/stores/themeConfig';
+	name: 'layout',
-import { Local } from '/@/utils/storage';
+	components: {
-import mittBus from '/@/utils/mitt';
+		Defaults: () => import('@/layout/main/defaults.vue'),
-
+		Classic: () => import('@/layout/main/classic.vue'),
-// 引入组件
+		Transverse: () => import('@/layout/main/transverse.vue'),
-const layouts: any = {
+		Columns: () => import('@/layout/main/columns.vue'),
-	defaults: defineAsyncComponent(() => import('/@/layout/main/defaults.vue')),
+	},
-	classic: defineAsyncComponent(() => import('/@/layout/main/classic.vue')),
+	computed: {
-	transverse: defineAsyncComponent(() => import('/@/layout/main/transverse.vue')),
+		// 获取布局配置信息
-	columns: defineAsyncComponent(() => import('/@/layout/main/columns.vue')),
+		getThemeConfig() {
+			return this.$store.state.themeConfig.themeConfig;
+		},
+	},
+	created() {
+		this.onLayoutResize();
+		window.addEventListener('resize', this.onLayoutResize);
+	},
+	methods: {
+		// 窗口大小改变时(适配移动端)
+		onLayoutResize() {
+			if (!Local.get('oldLayout')) Local.set('oldLayout', this.$store.state.themeConfig.themeConfig.layout);
+			const clientWidth = document.body.clientWidth;
+			if (clientWidth < 1000) {
+				this.$store.state.themeConfig.themeConfig.isCollapse = false;
+				this.bus.$emit('layoutMobileResize', {
+					layout: 'defaults',
+					clientWidth,
+				});
+			} else {
+				this.bus.$emit('layoutMobileResize', {
+					layout: Local.get('oldLayout') ? Local.get('oldLayout') : this.$store.state.themeConfig.themeConfig.layout,
+					clientWidth,
+				});
+			}
+		},
+	},
+	distroyed() {
+		window.removeEventListener('resize', this.onLayoutResize);
+	},
 };
-
-// 定义变量内容
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-
-// 窗口大小改变时(适配移动端)
-const onLayoutResize = () => {
-	if (!Local.get('oldLayout')) Local.set('oldLayout', themeConfig.value.layout);
-	const clientWidth = document.body.clientWidth;
-	if (clientWidth < 1000) {
-		themeConfig.value.isCollapse = false;
-		mittBus.emit('layoutMobileResize', {
-			layout: 'defaults',
-			clientWidth,
-		});
-	} else {
-		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);
-});
 </script>

src/layout/lockScreen/index.vue

@@ -1,352 +0,0 @@
-<template>
-	<div v-show="state.isShowLockScreen">
-		<div class="layout-lock-screen-mask"></div>
-		<div class="layout-lock-screen-img" :class="{ 'layout-lock-screen-filter': state.isShowLoockLogin }"></div>
-		<div class="layout-lock-screen">
-			<div
-				class="layout-lock-screen-date"
-				ref="layoutLockScreenDateRef"
-				@mousedown="onDownPc"
-				@mousemove="onMovePc"
-				@mouseup="onEnd"
-				@touchstart.stop="onDownApp"
-				@touchmove.stop="onMoveApp"
-				@touchend.stop="onEnd"
-			>
-				<div class="layout-lock-screen-date-box">
-					<div class="layout-lock-screen-date-box-time">
-						{{ state.time.hm }}<span class="layout-lock-screen-date-box-minutes">{{ state.time.s }}</span>
-					</div>
-					<div class="layout-lock-screen-date-box-info">{{ state.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="state.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="state.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 setup lang="ts" name="layoutLockScreen">
-import { nextTick, onMounted, reactive, ref, onUnmounted } from 'vue';
-import { formatDate } from '/@/utils/formatTime';
-import { Local } from '/@/utils/storage';
-import { storeToRefs } from 'pinia';
-import { useThemeConfig } from '/@/stores/themeConfig';
-
-// 定义变量内容
-const layoutLockScreenDateRef = ref<HtmlType>();
-const layoutLockScreenInputRef = ref();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-const state = reactive({
-	transparency: 1,
-	downClientY: 0,
-	moveDifference: 0,
-	isShowLoockLogin: false,
-	isFlags: false,
-	querySelectorEl: '' as HtmlType,
-	time: {
-		hm: '',
-		s: '',
-		mdq: '',
-	},
-	setIntervalTime: 0,
-	isShowLockScreen: false,
-	isShowLockScreenIntervalTime: 0,
-	lockScreenPassword: '',
-});
-
-// 鼠标按下 pc
-const onDownPc = (down: MouseEvent) => {
-	state.isFlags = true;
-	state.downClientY = down.clientY;
-};
-// 鼠标按下 app
-const onDownApp = (down: TouchEvent) => {
-	state.isFlags = true;
-	state.downClientY = down.touches[0].clientY;
-};
-// 鼠标移动 pc
-const onMovePc = (move: MouseEvent) => {
-	state.moveDifference = move.clientY - state.downClientY;
-	onMove();
-};
-// 鼠标移动 app
-const onMoveApp = (move: TouchEvent) => {
-	state.moveDifference = move.touches[0].clientY - state.downClientY;
-	onMove();
-};
-// 鼠标移动事件
-const onMove = () => {
-	if (state.isFlags) {
-		const el = <HTMLElement>state.querySelectorEl;
-		const opacitys = (state.transparency -= 1 / 200);
-		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 = layoutLockScreenDateRef.value;
-	});
-};
-// 时间初始化
-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);
-});
-</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://i.hd-r.cn/e4a19d84364f185266666765ac21a5db.jpg');
-	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,32 +1,39 @@
 <template>
 	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
-		<img :src="logoMini" class="layout-logo-medium-img" />
+		<img :src="logo" class="layout-logo-medium-img" />
-		<span>{{ themeConfig.globalTitle }}</span>
+		<span>{{ getThemeConfig.globalTitle }}</span>
 	</div>
 	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
-		<img :src="logoMini" class="layout-logo-size-img" />
+		<img :src="logo" class="layout-logo-size-img" />
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutLogo">
+<script>
-import { computed } from 'vue';
+export default {
-import { storeToRefs } from 'pinia';
+	name: 'layoutLogo',
-import { useThemeConfig } from '/@/stores/themeConfig';
+	data() {
-import logoMini from '/@/assets/logo-mini.svg';
+		return {
-
+			logo: require('@/assets/logo-mini.svg'),
-// 定义变量内容
+		};
-const storesThemeConfig = useThemeConfig();
+	},
-const { themeConfig } = storeToRefs(storesThemeConfig);
+	computed: {
-
+		// 获取布局配置信息
-// 设置 logo 的显示。classic 经典布局默认显示 logo
+		getThemeConfig() {
-const setShowLogo = computed(() => {
+			return this.$store.state.themeConfig.themeConfig;
-	let { isCollapse, layout } = themeConfig.value;
+		},
-	return !isCollapse || layout === 'classic' || document.body.clientWidth < 1000;
+		// 设置 logo 是否显示
-});
+		setShowLogo() {
-// logo 点击实现菜单展开/收起
+			let { isCollapse, layout } = this.$store.state.themeConfig.themeConfig;
-const onThemeConfigChange = () => {
+			return !isCollapse || layout === 'classic' || document.body.clientWidth < 1000;
-	if (themeConfig.value.layout === 'transverse') return false;
+		},
-	themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
+	},
+	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>
 
@@ -38,22 +45,20 @@ const onThemeConfigChange = () => {
 	align-items: center;
 	justify-content: center;
 	box-shadow: rgb(0 21 41 / 2%) 0px 1px 4px;
-	color: var(--el-color-primary);
+	color: var(--prev-color-primary);
 	font-size: 16px;
 	cursor: pointer;
 	animation: logoAnimation 0.3s ease-in-out;
-	span {
-		white-space: nowrap;
-		display: inline-block;
-	}
 	&:hover {
 		span {
-			color: var(--color-primary-light-2);
+			opacity: 0.9;
 		}
 	}
 	&-medium-img {
 		width: 20px;
 		margin-right: 5px;
+		position: relative;
+		top: 2px;
 	}
 }
 .layout-logo-size {
@@ -61,15 +66,10 @@ const onThemeConfigChange = () => {
 	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,73 +1,30 @@
 <template>
 	<el-container class="layout-container flex-center">
-		<LayoutHeader />
+		<Headers />
 		<el-container class="layout-mian-height-50">
-			<LayoutAside />
+			<Asides />
 			<div class="flex-center layout-backtop">
-				<LayoutTagsView v-if="isTagsview" />
+				<TagsView v-if="getThemeConfig.isTagsview" />
-				<LayoutMain ref="layoutMainRef" />
+				<Mains />
 			</div>
 		</el-container>
+		<el-backtop target=".layout-backtop .el-main .el-scrollbar__wrap"></el-backtop>
 	</el-container>
 </template>
 
-<script setup lang="ts" name="layoutClassic">
+<script>
-import { defineAsyncComponent, computed, ref, watch, nextTick, onMounted } from 'vue';
+import Asides from '@/layout/component/aside.vue';
-import { useRoute } from 'vue-router';
+import Headers from '@/layout/component/header.vue';
-import { storeToRefs } from 'pinia';
+import Mains from '@/layout/component/main.vue';
-import { useThemeConfig } from '/@/stores/themeConfig';
+import TagsView from '@/layout/navBars/tagsView/tagsView.vue';
-
+export default {
-// 引入组件
+	name: 'layoutClassic',
-const LayoutAside = defineAsyncComponent(() => import('/@/layout/component/aside.vue'));
+	components: { Asides, Headers, Mains, TagsView },
-const LayoutHeader = defineAsyncComponent(() => import('/@/layout/component/header.vue'));
+	computed: {
-const LayoutMain = defineAsyncComponent(() => import('/@/layout/component/main.vue'));
+		// 获取布局配置信息
-const LayoutTagsView = defineAsyncComponent(() => import('/@/layout/navBars/tagsView/tagsView.vue'));
+		getThemeConfig() {
-
+			return this.$store.state.themeConfig.themeConfig;
-// 定义变量内容
+		},
-const layoutMainRef = ref<InstanceType<typeof LayoutMain>>();
-const route = useRoute();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-
-// 判断是否显示 tasgview
-const isTagsview = computed(() => {
-	return themeConfig.value.isTagsview;
-});
-// 重置滚动条高度，更新子级 scrollbar
-const updateScrollbar = () => {
-	layoutMainRef.value?.layoutMainScrollbarRef.update();
-};
-// 重置滚动条高度，由于组件是异步引入的
-const initScrollBarHeight = () => {
-	nextTick(() => {
-		setTimeout(() => {
-			updateScrollbar();
-			// '!' not null 断言操作符，不执行运行时检查
-			if (layoutMainRef.value) layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
-		}, 500);
-	});
-};
-// 页面加载时
-onMounted(() => {
-	initScrollBarHeight();
-});
-// 监听路由的变化，切换界面时，滚动条置顶
-watch(
-	() => route.path,
-	() => {
-		initScrollBarHeight();
-	}
-);
-// 监听 themeConfig  isTagsview 配置文件的变化，更新菜单 el-scrollbar 的高度
-watch(
-	() => themeConfig.value.isTagsview,
-	() => {
-		nextTick(() => {
-			updateScrollbar();
-		});
 	},
-	{
+};
-		deep: true,
-	}
-);
 </script>

src/layout/main/columns.vue

@@ -1,73 +1,33 @@
 <template>
 	<el-container class="layout-container">
 		<ColumnsAside />
-		<el-container class="layout-columns-warp layout-container-view h100">
+		<div class="layout-columns-warp">
-			<LayoutAside />
+			<Asides />
-			<el-scrollbar ref="layoutScrollbarRef" class="layout-backtop">
+			<el-container class="flex-center layout-backtop">
-				<LayoutHeader />
+				<Headers v-if="isFixedHeader" />
-				<LayoutMain ref="layoutMainRef" />
+				<el-scrollbar>
-			</el-scrollbar>
+					<Headers v-if="!isFixedHeader" />
-		</el-container>
+					<Mains />
+				</el-scrollbar>
+			</el-container>
+		</div>
+		<el-backtop target=".layout-backtop .el-scrollbar__wrap"></el-backtop>
 	</el-container>
 </template>
 
-<script setup lang="ts" name="layoutColumns">
+<script>
-import { defineAsyncComponent, watch, onMounted, nextTick, ref } from 'vue';
+import Asides from '@/layout/component/aside.vue';
-import { useRoute } from 'vue-router';
+import Headers from '@/layout/component/header.vue';
-import { storeToRefs } from 'pinia';
+import Mains from '@/layout/component/main.vue';
-import { useThemeConfig } from '/@/stores/themeConfig';
+import ColumnsAside from '@/layout/component/columnsAside.vue';
-
+export default {
-// 引入组件
+	name: 'layoutColumns',
-const LayoutAside = defineAsyncComponent(() => import('/@/layout/component/aside.vue'));
+	components: { Asides, Headers, Mains, ColumnsAside },
-const LayoutHeader = defineAsyncComponent(() => import('/@/layout/component/header.vue'));
+	computed: {
-const LayoutMain = defineAsyncComponent(() => import('/@/layout/component/main.vue'));
+		// 是否开启固定 header
-const ColumnsAside = defineAsyncComponent(() => import('/@/layout/component/columnsAside.vue'));
+		isFixedHeader() {
-
+			return this.$store.state.themeConfig.themeConfig.isFixedHeader;
-// 定义变量内容
+		},
-const layoutScrollbarRef = ref<RefType>('');
-const layoutMainRef = ref<InstanceType<typeof LayoutMain>>();
-const route = useRoute();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-
-// 重置滚动条高度
-const updateScrollbar = () => {
-	// 更新父级 scrollbar
-	layoutScrollbarRef.value.update();
-	// 更新子级 scrollbar
-	layoutMainRef.value && layoutMainRef.value!.layoutMainScrollbarRef.update();
-};
-// 重置滚动条高度，由于组件是异步引入的
-const initScrollBarHeight = () => {
-	nextTick(() => {
-		setTimeout(() => {
-			updateScrollbar();
-			layoutScrollbarRef.value.wrapRef.scrollTop = 0;
-			layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
-		}, 500);
-	});
-};
-// 页面加载时
-onMounted(() => {
-	initScrollBarHeight();
-});
-// 监听路由的变化，切换界面时，滚动条置顶
-watch(
-	() => route.path,
-	() => {
-		initScrollBarHeight();
-	}
-);
-// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-watch(
-	() => [themeConfig.value.isTagsview, themeConfig.value.isFixedHeader],
-	() => {
-		nextTick(() => {
-			updateScrollbar();
-		});
 	},
-	{
+};
-		deep: true,
-	}
-);
 </script>

src/layout/main/defaults.vue

@@ -1,73 +1,41 @@
 <template>
 	<el-container class="layout-container">
-		<LayoutAside />
+		<Asides />
-		<el-container class="layout-container-view h100">
+		<el-container class="flex-center layout-backtop">
-			<el-scrollbar ref="layoutScrollbarRef" class="layout-backtop">
+			<Headers v-if="isFixedHeader" />
-				<LayoutHeader />
+			<el-scrollbar ref="layoutDefaultsScrollbarRef">
-				<LayoutMain ref="layoutMainRef" />
+				<Headers v-if="!isFixedHeader" />
+				<Mains />
 			</el-scrollbar>
 		</el-container>
+		<el-backtop target=".layout-backtop .el-scrollbar__wrap"></el-backtop>
 	</el-container>
 </template>
 
-<script setup lang="ts" name="layoutDefaults">
+<script>
-import { defineAsyncComponent, watch, onMounted, nextTick, ref } from 'vue';
+import Asides from '@/layout/component/aside.vue';
-import { useRoute } from 'vue-router';
+import Headers from '@/layout/component/header.vue';
-import { storeToRefs } from 'pinia';
+import Mains from '@/layout/component/main.vue';
-import { useThemeConfig } from '/@/stores/themeConfig';
+export default {
-import { NextLoading } from '/@/utils/loading';
+	name: 'layoutDefaults',
-
+	components: { Asides, Headers, Mains },
-// 引入组件
+	data() {
-const LayoutAside = defineAsyncComponent(() => import('/@/layout/component/aside.vue'));
+		return {};
-const LayoutHeader = defineAsyncComponent(() => import('/@/layout/component/header.vue'));
-const LayoutMain = defineAsyncComponent(() => import('/@/layout/component/main.vue'));
-
-// 定义变量内容
-const layoutScrollbarRef = ref<RefType>('');
-const layoutMainRef = ref<InstanceType<typeof LayoutMain>>();
-const route = useRoute();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-
-// 重置滚动条高度
-const updateScrollbar = () => {
-	// 更新父级 scrollbar
-	layoutScrollbarRef.value.update();
-	// 更新子级 scrollbar
-	layoutMainRef.value!.layoutMainScrollbarRef.update();
-};
-// 重置滚动条高度，由于组件是异步引入的
-const initScrollBarHeight = () => {
-	nextTick(() => {
-		setTimeout(() => {
-			updateScrollbar();
-			layoutScrollbarRef.value.wrapRef.scrollTop = 0;
-			layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
-		}, 500);
-	});
-};
-// 页面加载时
-onMounted(() => {
-	initScrollBarHeight();
-	NextLoading.done(600);
-});
-// 监听路由的变化，切换界面时，滚动条置顶
-watch(
-	() => route.path,
-	() => {
-		initScrollBarHeight();
-	}
-);
-// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-watch(
-	() => [themeConfig.value.isTagsview, themeConfig.value.isFixedHeader],
-	() => {
-		nextTick(() => {
-			updateScrollbar();
-		});
 	},
-	{
+	computed: {
-		deep: true,
+		// 是否开启固定 header
-	}
+		isFixedHeader() {
-);
+			return this.$store.state.themeConfig.themeConfig.isFixedHeader;
+		},
+	},
+	watch: {
+		// 监听路由的变化
+		$route: {
+			handler() {
+				this.$refs.layoutDefaultsScrollbarRef.wrap.scrollTop = 0;
+			},
+			deep: true,
+		},
+	},
+};
 </script>

src/layout/main/transverse.vue

@@ -1,60 +1,16 @@
 <template>
 	<el-container class="layout-container flex-center layout-backtop">
-		<LayoutHeader />
+		<Headers />
-		<LayoutMain ref="layoutMainRef" />
+		<Mains />
+		<el-backtop target=".layout-backtop .el-main .el-scrollbar__wrap"></el-backtop>
 	</el-container>
 </template>
 
-<script setup lang="ts" name="layoutTransverse">
+<script>
-import { defineAsyncComponent, ref, watch, nextTick, onMounted } from 'vue';
+import Headers from '@/layout/component/header.vue';
-import { useRoute } from 'vue-router';
+import Mains from '@/layout/component/main.vue';
-import { storeToRefs } from 'pinia';
+export default {
-import { useThemeConfig } from '/@/stores/themeConfig';
+	name: 'layoutTransverse',
-
+	components: { Headers, Mains },
-// 引入组件
-const LayoutHeader = defineAsyncComponent(() => import('/@/layout/component/header.vue'));
-const LayoutMain = defineAsyncComponent(() => import('/@/layout/component/main.vue'));
-
-// 定义变量内容
-const layoutMainRef = ref<InstanceType<typeof LayoutMain>>();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-const route = useRoute();
-
-// 重置滚动条高度，更新子级 scrollbar
-const updateScrollbar = () => {
-	layoutMainRef.value!.layoutMainScrollbarRef.update();
 };
-// 重置滚动条高度，由于组件是异步引入的
-const initScrollBarHeight = () => {
-	nextTick(() => {
-		setTimeout(() => {
-			updateScrollbar();
-			layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
-		}, 500);
-	});
-};
-// 页面加载时
-onMounted(() => {
-	initScrollBarHeight();
-});
-// 监听路由的变化，切换界面时，滚动条置顶
-watch(
-	() => route.path,
-	() => {
-		initScrollBarHeight();
-	}
-);
-// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-watch(
-	() => themeConfig.value.isTagsview,
-	() => {
-		nextTick(() => {
-			updateScrollbar();
-		});
-	},
-	{
-		deep: true,
-	}
-);
 </script>

src/layout/navBars/index.vue

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

src/layout/navBars/tagsView/contextmenu.vue

@@ -1,125 +1,97 @@
 <template>
-	<transition name="el-zoom-in-center">
+	<div>
-		<div
+		<transition name="el-zoom-in-center">
-			aria-hidden="true"
+			<ul
-			class="el-dropdown__popper el-popper is-light is-pure custom-contextmenu"
+				class="el-dropdown-menu el-popper el-dropdown-menu--medium custom-contextmenu"
-			role="tooltip"
+				:style="`top: ${dropdowns.y}px;left: ${dropdowns.x}px;`"
-			data-popper-placement="bottom"
+				x-placement="bottom-end"
-			:style="`top: ${dropdowns.y + 5}px;left: ${dropdowns.x}px;`"
+				id="contextmenu"
-			:key="Math.random()"
+				v-show="isShow"
-			v-show="state.isShow"
+			>
-		>
+				<li class="el-dropdown-menu__item" v-for="(v, k) in dropdownList" :key="k" @click="onCurrentContextmenuClick(v.id)">
-			<ul class="el-dropdown-menu">
+					<template v-if="!v.affix">
-				<template v-for="(v, k) in state.dropdownList">
+						<i :class="v.icon"></i>
-					<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>
-					</li>
+					</template>
-				</template>
+				</li>
+				<div x-arrow class="popper__arrow" :style="{ left: `${arrowLeft}px` }"></div>
 			</ul>
-			<div class="el-popper__arrow" :style="{ left: `${state.arrowLeft}px` }"></div>
+		</transition>
-		</div>
+	</div>
-	</transition>
 </template>
 
-<script setup lang="ts" name="layoutTagsViewContextmenu">
+<script>
-import { computed, reactive, onMounted, onUnmounted, watch } from 'vue';
+export default {
-
+	name: 'layoutTagsViewContextmenu',
-// 定义父组件传过来的值
+	props: {
-const props = defineProps({
+		dropdown: {
-	dropdown: {
+			type: Object,
-		type: Object,
-		default: () => {
-			return {
-				x: 0,
-				y: 0,
-			};
 		},
 	},
-});
+	data() {
-
-// 定义子组件向父组件传值/事件
-const emit = defineEmits(['currentContextmenuClick']);
-
-// 定义变量内容
-const state = reactive({
-	isShow: false,
-	dropdownList: [
-		{ 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',
-		},
-	],
-	item: {},
-	arrowLeft: 10,
-});
-
-// 父级传过来的坐标 x,y 值
-const dropdowns = computed(() => {
-	// 117 为 `Dropdown 下拉菜单` 的宽度
-	if (props.dropdown.x + 117 > document.documentElement.clientWidth) {
 		return {
-			x: document.documentElement.clientWidth - 117 - 5,
+			isShow: false,
-			y: props.dropdown.y,
+			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' },
+			],
+			path: {},
+			arrowLeft: 5,
 		};
-	} else {
-		return props.dropdown;
-	}
-});
-// 当前项菜单点击
-const onCurrentContextmenuClick = (contextMenuClickId: number) => {
-	emit('currentContextmenuClick', Object.assign({}, { contextMenuClickId }, state.item));
-};
-// 打开右键菜单：判断是否固定，固定则不显示关闭按钮
-const openContextmenu = (item: RouteItem) => {
-	state.item = item;
-	item.meta?.isAffix ? (state.dropdownList[1].affix = true) : (state.dropdownList[1].affix = false);
-	closeContextmenu();
-	setTimeout(() => {
-		state.isShow = true;
-	}, 10);
-};
-// 关闭右键菜单
-const closeContextmenu = () => {
-	state.isShow = false;
-};
-// 监听页面监听进行右键菜单的关闭
-onMounted(() => {
-	document.body.addEventListener('click', closeContextmenu);
-});
-// 页面卸载时，移除右键菜单监听事件
-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;
 	},
-	{
+	computed: {
-		deep: true,
+		dropdowns() {
-	}
+			// 99 为 `Dropdown 下拉菜单` 的宽度
-);
+			if (this.dropdown.x + 99 > document.documentElement.clientWidth) {
-
+				return {
-// 暴露变量
+					x: document.documentElement.clientWidth - 99 - 5,
-defineExpose({
+					y: this.dropdown.y,
-	openContextmenu,
+				};
-});
+			} else {
+				return this.dropdown;
+			}
+		},
+	},
+	mounted() {
+		// 监听页面监听进行右键菜单的关闭
+		document.body.addEventListener('click', this.closeContextmenu);
+	},
+	methods: {
+		// 当前项菜单点击
+		onCurrentContextmenuClick(id) {
+			this.$emit('currentContextmenuClick', { id, path: this.path });
+		},
+		// 打开右键菜单：判断是否固定，固定则不显示关闭按钮
+		openContextmenu(item) {
+			this.path = item.path;
+			item.meta.isAffix ? (this.dropdownList[1].affix = true) : (this.dropdownList[1].affix = false);
+			this.closeContextmenu();
+			setTimeout(() => {
+				this.isShow = true;
+			}, 80);
+		},
+		// 关闭右键菜单
+		closeContextmenu() {
+			this.isShow = false;
+		},
+	},
+	destroyed() {
+		// 页面卸载时，移除右键菜单监听事件
+		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;
+			},
+			deep: true,
+		},
+	},
+};
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/topBar/breadcrumb.vue

@@ -1,21 +1,18 @@
 <template>
-	<div v-if="isShowBreadcrumb" class="layout-navbars-breadcrumb">
+	<div class="layout-navbars-breadcrumb" :style="{ display: isShowBreadcrumb }">
-		<SvgIcon
+		<i
 			class="layout-navbars-breadcrumb-icon"
-			:name="themeConfig.isCollapse ? 'ele-Expand' : 'ele-Fold'"
+			:class="getThemeConfig.isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'"
-			:size="16"
 			@click="onThemeConfigChange"
-		/>
+		></i>
 		<el-breadcrumb class="layout-navbars-breadcrumb-hide">
-			<transition-group name="breadcrumb">
+			<transition-group name="breadcrumb" mode="out-in">
-				<el-breadcrumb-item v-for="(v, k) in state.breadcrumbList" :key="!v.meta.tagsViewName ? v.meta.title : v.meta.tagsViewName">
+				<el-breadcrumb-item v-for="(v, k) in breadcrumbList" :key="v.path">
-					<span v-if="k === state.breadcrumbList.length - 1" class="layout-navbars-breadcrumb-span">
+					<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" />
+						<i :class="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="getThemeConfig.isBreadcrumbIcon"></i>{{ $t(v.meta.title) }}
-						<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) }}
+						<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>
@@ -23,86 +20,94 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutBreadcrumb">
+<script>
-import { reactive, computed, onMounted } from 'vue';
+import { Local } from '@/utils/storage.js';
-import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
+export default {
-import { Local } from '/@/utils/storage';
+	name: 'layoutBreadcrumb',
-import other from '/@/utils/other';
+	data() {
-import { storeToRefs } from 'pinia';
+		return {
-import { useThemeConfig } from '/@/stores/themeConfig';
+			breadcrumbList: [],
-import { useRoutesList } from '/@/stores/routesList';
+			routeSplit: [],
-
+			routeSplitFirst: '',
-// 定义变量内容
+			routeSplitIndex: 1,
-const stores = useRoutesList();
+		};
-const storesThemeConfig = useThemeConfig();
+	},
-const { themeConfig } = storeToRefs(storesThemeConfig);
+	computed: {
-const { routesList } = storeToRefs(stores);
+		// 获取布局配置信息
-const route = useRoute();
+		getThemeConfig() {
-const router = useRouter();
+			return this.$store.state.themeConfig.themeConfig;
-const state = reactive<BreadcrumbState>({
+		},
-	breadcrumbList: [],
+		// 动态设置经典、横向布局不显示
-	routeSplit: [],
+		isShowBreadcrumb() {
-	routeSplitFirst: '',
+			const { layout, isBreadcrumb } = this.$store.state.themeConfig.themeConfig;
-	routeSplitIndex: 1,
+			if (layout === 'classic' || layout === 'transverse') {
-});
+				return 'none';
-
+			} else {
-// 动态设置经典、横向布局不显示
+				return isBreadcrumb ? '' : 'none';
-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: RouteItem) => {
-	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: RouteItems) => {
-	arr.forEach((item: RouteItem) => {
-		state.routeSplit.forEach((v: string, k: number, arrs: string[]) => {
-			if (state.routeSplitFirst === item.path) {
-				state.routeSplitFirst += `/${arrs[state.routeSplitIndex]}`;
-				state.breadcrumbList.push(item);
-				state.routeSplitIndex++;
-				if (item.children) getBreadcrumbList(item.children);
 			}
-		});
+		},
-	});
+	},
+	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,
+		},
+	},
 };
-// 当前路由字符串切割成数组，并删除第一项空内容
-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(<RouteToFrom>route);
-};
-// 页面加载时
-onMounted(() => {
-	initRouteSplit(route.path);
-});
-// 路由更新时
-onBeforeRouteUpdate((to) => {
-	initRouteSplit(to.path);
-});
 </script>
 
 <style scoped lang="scss">
@@ -111,36 +116,24 @@ onBeforeRouteUpdate((to) => {
 	height: inherit;
 	display: flex;
 	align-items: center;
+	padding-left: 15px;
 	.layout-navbars-breadcrumb-icon {
 		cursor: pointer;
 		font-size: 18px;
-		color: var(--next-bg-topBarColor);
+		margin-right: 15px;
-		height: 100%;
+		color: var(--prev-bg-topBarColor);
-		width: 40px;
 		opacity: 0.8;
 		&:hover {
 			opacity: 1;
 		}
 	}
 	.layout-navbars-breadcrumb-span {
-		display: flex;
 		opacity: 0.7;
-		color: var(--next-bg-topBarColor);
+		color: var(--prev-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/topBar/closeFull.vue

@@ -1,53 +0,0 @@
-<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 setup lang="ts" name="layoutCloseFull">
-import { storeToRefs } from 'pinia';
-import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
-
-// 定义变量内容
-const stores = useTagsViewRoutes();
-const { isTagsViewCurrenFull } = storeToRefs(stores);
-
-// 关闭当前全屏
-const onCloseFullscreen = () => {
-	stores.setCurrenFullscreen(false);
-};
-</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/topBar/index.vue

@@ -2,98 +2,66 @@
 	<div class="layout-navbars-breadcrumb-index">
 		<Logo v-if="setIsShowLogo" />
 		<Breadcrumb />
-		<Horizontal :menuList="state.menuList" v-if="isLayoutTransverse" />
+		<Horizontal :menuList="menuList" v-if="isLayoutTransverse" />
 		<User />
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutBreadcrumbIndex">
+<script>
-import { defineAsyncComponent, computed, reactive, onMounted, onUnmounted } from 'vue';
+import Breadcrumb from '@/layout/navBars/topBar/breadcrumb.vue';
-import { useRoute } from 'vue-router';
+import User from '@/layout/navBars/topBar/user.vue';
-import { storeToRefs } from 'pinia';
+import Logo from '@/layout/logo/index.vue';
-import { useRoutesList } from '/@/stores/routesList';
+import Horizontal from '@/layout/navMenu/horizontal.vue';
-import { useThemeConfig } from '/@/stores/themeConfig';
+export default {
-import mittBus from '/@/utils/mitt';
+	name: 'layoutNavBars',
-
+	components: { Breadcrumb, User, Logo, Horizontal },
-// 引入组件
+	data() {
-const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/topBar/breadcrumb.vue'));
+		return {
-const User = defineAsyncComponent(() => import('/@/layout/navBars/topBar/user.vue'));
+			menuList: [],
-const Logo = defineAsyncComponent(() => import('/@/layout/logo/index.vue'));
+		};
-const Horizontal = defineAsyncComponent(() => import('/@/layout/navMenu/horizontal.vue'));
+	},
-
+	computed: {
-// 定义变量内容
+		// 设置 logo 是否显示
-const stores = useRoutesList();
+		setIsShowLogo() {
-const storesThemeConfig = useThemeConfig();
+			let { isShowLogo, layout } = this.$store.state.themeConfig.themeConfig;
-const { themeConfig } = storeToRefs(storesThemeConfig);
+			return (isShowLogo && layout === 'classic') || (isShowLogo && layout === 'transverse');
-const { routesList } = storeToRefs(stores);
+		},
-const route = useRoute();
+		// 设置是否显示横向菜单
-const state = reactive({
+		isLayoutTransverse() {
-	menuList: [] as RouteItems,
+			let { layout, isClassicSplitMenu } = this.$store.state.themeConfig.themeConfig;
-});
+			return layout === 'transverse' || (isClassicSplitMenu && layout === 'classic');
-
+		},
-// 设置 logo 显示/隐藏
+	},
-const setIsShowLogo = computed(() => {
+	mounted() {
-	let { isShowLogo, layout } = themeConfig.value;
+		this.setFilterRoutes();
-	return (isShowLogo && layout === 'classic') || (isShowLogo && layout === 'transverse');
+	},
-});
+	methods: {
-// 设置是否显示横向导航菜单
+		// 设置路由的过滤
-const isLayoutTransverse = computed(() => {
+		setFilterRoutes() {
-	let { layout, isClassicSplitMenu } = themeConfig.value;
+			this.menuList = this.filterRoutesFun(this.$store.state.routesList.routesList);
-	return layout === 'transverse' || (isClassicSplitMenu && layout === 'classic');
+		},
-});
+		// 设置路由的过滤递归函数
-// 设置/过滤路由（非静态路由/是否显示在菜单中）
+		filterRoutesFun(arr) {
-const setFilterRoutes = () => {
+			return arr
-	let { layout, isClassicSplitMenu } = themeConfig.value;
+				.filter((item) => !item.meta.isHide)
-	if (layout === 'classic' && isClassicSplitMenu) {
+				.map((item) => {
-		state.menuList = delClassicChildren(filterRoutesFun(routesList.value));
+					item = Object.assign({}, item);
-		const resData = setSendClassicChildren(route.path);
+					if (item.children) item.children = this.filterRoutesFun(item.children);
-		mittBus.emit('setSendClassicChildren', resData);
+					return item;
-	} else {
+				});
-		state.menuList = filterRoutesFun(routesList.value);
+		},
-	}
+	},
+	watch: {
+		// 监听 vuex 数据变化
+		'$store.state': {
+			handler(val) {
+				if (val.routesList.routesList.length === this.menuList.length) return false;
+				this.setFilterRoutes();
+			},
+			deep: true,
+		},
+	},
 };
-// 设置了分割菜单时，删除底下 children
-const delClassicChildren = <T extends ChilType>(arr: T[]): T[] => {
-	arr.map((v: T) => {
-		if (v.children) delete v.children;
-	});
-	return arr;
-};
-// 路由过滤递归函数
-const filterRoutesFun = <T extends RouteItem>(arr: T[]): T[] => {
-	return arr
-		.filter((item: T) => !item.meta?.isHide)
-		.map((item: T) => {
-			item = Object.assign({}, item);
-			if (item.children) item.children = filterRoutesFun(item.children);
-			return item;
-		});
-};
-// 传送当前子级数据到菜单中
-const setSendClassicChildren = (path: string) => {
-	const currentPathSplit = path.split('/');
-	let currentData: MittMenu = { children: [] };
-	filterRoutesFun(routesList.value).map((v: RouteItem, k: number) => {
-		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();
-	mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
-		setFilterRoutes();
-	});
-});
-// 页面卸载时
-onUnmounted(() => {
-	mittBus.off('getBreadcrumbIndexSetFilterRoutes', () => {});
-});
 </script>
 
 <style scoped lang="scss">
@@ -101,7 +69,9 @@ onUnmounted(() => {
 	height: 50px;
 	display: flex;
 	align-items: center;
-	background: var(--next-bg-topBar);
+	padding-right: 15px;
-	border-bottom: 1px solid var(--next-border-color-light);
+	overflow: hidden;
+	background: var(--prev-bg-topBar);
+	border-bottom: 1px solid var(--prev-border-color-lighter);
 }
 </style>

src/layout/navBars/topBar/search.vue

@@ -1,123 +1,98 @@
 <template>
 	<div class="layout-search-dialog">
-		<el-dialog v-model="state.isShowSearch" destroy-on-close :show-close="false">
+		<el-dialog :visible.sync="isShowSearch" width="300px" destroy-on-close :modal="false" fullscreen :show-close="false">
-			<template #footer>
+			<el-autocomplete
-				<el-autocomplete
+				v-model="menuQuery"
-					v-model="state.menuQuery"
+				:fetch-suggestions="menuSearch"
-					:fetch-suggestions="menuSearch"
+				:placeholder="$t('message.user.searchPlaceholder')"
-					:placeholder="$t('message.user.searchPlaceholder')"
+				prefix-icon="el-icon-search"
-					ref="layoutMenuAutocompleteRef"
+				ref="layoutMenuAutocompleteRef"
-					@select="onHandleSelect"
+				@select="onHandleSelect"
-					:fit-input-width="true"
+				@blur="onSearchBlur"
-				>
+			>
-					<template #prefix>
+				<template slot-scope="{ item }">
-						<el-icon class="el-input__icon">
+					<div><i :class="item.meta.icon" class="mr10"></i>{{ $t(item.meta.title) }}</div>
-							<ele-Search />
+				</template>
-						</el-icon>
+			</el-autocomplete>
-					</template>
-					<template #default="{ item }">
-						<div>
-							<SvgIcon :name="item.meta.icon" class="mr5" />
-							{{ $t(item.meta.title) }}
-						</div>
-					</template>
-				</el-autocomplete>
-			</template>
 		</el-dialog>
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutBreadcrumbSearch">
+<script>
-import { reactive, ref, nextTick } from 'vue';
+export default {
-import { useRouter } from 'vue-router';
+	name: 'layoutBreadcrumbSearch',
-import { useI18n } from 'vue-i18n';
+	data() {
-import { storeToRefs } from 'pinia';
+		return {
-import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+			isShowSearch: false,
-
+			menuQuery: '',
-// 定义变量内容
+			tagsViewList: [],
-const storesTagsViewRoutes = useTagsViewRoutes();
+		};
-const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
+	},
-const layoutMenuAutocompleteRef = ref();
+	methods: {
-const { t } = useI18n();
+		// 搜索弹窗打开
-const router = useRouter();
+		openSearch() {
-const state = reactive<SearchState>({
+			this.menuQuery = '';
-	isShowSearch: false,
+			this.isShowSearch = true;
-	menuQuery: '',
+			this.initTageView();
-	tagsViewList: [],
+			this.$nextTick(() => {
-});
+				this.$refs.layoutMenuAutocompleteRef.focus();
-
+			});
-// 搜索弹窗打开
+		},
-const openSearch = () => {
+		// 搜索弹窗关闭
-	state.menuQuery = '';
+		closeSearch() {
-	state.isShowSearch = true;
+			setTimeout(() => {
-	initTageView();
+				this.isShowSearch = false;
-	nextTick(() => {
+			}, 150);
-		setTimeout(() => {
+		},
-			layoutMenuAutocompleteRef.value.focus();
+		// 菜单搜索数据过滤
-		});
+		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();
+		},
+	},
 };
-// 搜索弹窗关闭
-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 = (queryString: string) => {
-	return (restaurant: RouteItem) => {
-		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: RouteItem) => {
-		if (!v.meta?.isHide) state.tagsViewList.push({ ...v });
-	});
-};
-// 当前菜单选中时
-const onHandleSelect = (item: RouteItem) => {
-	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();
-};
-
-// 暴露变量
-defineExpose({
-	openSearch,
-});
 </script>
 
 <style scoped lang="scss">
 .layout-search-dialog {
-	position: relative;
+	::v-deep .el-dialog {
-	:deep(.el-dialog) {
+		box-shadow: unset !important;
-		.el-dialog__header,
+		border-radius: 0 !important;
-		.el-dialog__body {
+		background: rgba(0, 0, 0, 0.5);
-			display: none;
-		}
-		.el-dialog__footer {
-			width: 100%;
-			position: absolute;
-			left: 50%;
-			transform: translateX(-50%);
-			top: -53vh;
-		}
 	}
-	:deep(.el-autocomplete) {
+	::v-deep .el-autocomplete {
 		width: 560px;
 		position: absolute;
-		top: 150px;
+		top: 100px;
 		left: 50%;
 		transform: translateX(-50%);
 	}

src/layout/navBars/topBar/setings.vue

@@ -2,10 +2,10 @@
 	<div class="layout-breadcrumb-seting">
 		<el-drawer
 			:title="$t('message.layout.configTitle')"
-			v-model="getThemeConfig.isDrawer"
+			:visible.sync="getThemeConfig.isDrawer"
 			direction="rtl"
 			destroy-on-close
-			size="260px"
+			size="240px"
 			@close="onDrawerClose"
 		>
 			<el-scrollbar class="layout-breadcrumb-seting-bar">
@@ -14,190 +14,43 @@
 				<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>
+						<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" size="small" @change="onAddDarkChange"></el-switch>
+						<el-switch v-model="getThemeConfig.isIsDark" :width="35" @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">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBarActiveColor') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-color-picker
-							v-model="getThemeConfig.menuBarActiveColor"
-							size="default"
-							show-alpha
-							@change="onBgColorPickerChange('menuBarActiveColor')"
-						/>
-					</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>
-				<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.twoIsColumnsMenuHoverPreload') }}</div>
-					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch
-							v-model="getThemeConfig.isColumnsMenuHoverPreload"
-							size="small"
-							@change="onColumnsMenuHoverPreloadChange"
-							: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">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsCollapse') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch
+						<el-switch v-model="getThemeConfig.isCollapse" :width="35" @change="setLocalThemeConfig"></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 mt15">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsUniqueOpened') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch
+						<el-switch v-model="getThemeConfig.isUniqueOpened" :width="35" @change="setLocalThemeConfig"></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>
+						<el-switch v-model="getThemeConfig.isFixedHeader" :width="35" @change="setLocalThemeConfig"></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">
 					<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>
+						<el-switch v-model="getThemeConfig.isShowLogo" :width="35" @change="setLocalThemeConfig"></el-switch>
 					</div>
 				</div>
 				<div
@@ -209,80 +62,51 @@
 						<el-switch
 							v-model="getThemeConfig.isBreadcrumb"
 							:disabled="getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse'"
-							size="small"
+							:width="35"
-							@change="onIsBreadcrumbChange"
+							@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" size="small" @change="setLocalThemeConfig"></el-switch>
+						<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" size="small" @change="setLocalThemeConfig"></el-switch>
+						<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" size="small" @change="setLocalThemeConfig"></el-switch>
+						<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" size="small" @change="setLocalThemeConfig"></el-switch>
+						<el-switch v-model="getThemeConfig.isCacheTagsView" :width="35" @change="setLocalThemeConfig"></el-switch>
-					</div>
-				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: state.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="state.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>
+						<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" size="small" @change="onAddFilterChange('grayscale')"></el-switch>
+						<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" size="small" @change="onAddFilterChange('invert')"></el-switch>
+						<el-switch v-model="getThemeConfig.isInvert" :width="35" @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"></el-input>
 					</div>
 				</div>
 
@@ -291,50 +115,34 @@
 				<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-select v-model="getThemeConfig.tagsStyle" placeholder="请选择" size="mini" 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-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" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+				<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
+						<el-select v-model="getThemeConfig.columnsAsideStyle" placeholder="请选择" size="mini" style="width: 90px" @change="setLocalThemeConfig">
-							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 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
+						<el-select v-model="getThemeConfig.columnsAsideLayout" placeholder="请选择" size="mini" style="width: 90px" @change="setLocalThemeConfig">
-							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>
@@ -411,16 +219,16 @@
 				</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-button
-						<el-icon class="mr5">
+						size="small"
-							<ele-CopyDocument />
+						class="copy-config-btn"
-						</el-icon>
+						icon="el-icon-document-copy"
-						{{ $t('message.layout.copyText') }}
+						type="primary"
+						ref="copyConfigBtnRef"
+						@click="onCopyConfigClick"
+						>{{ $t('message.layout.copyText') }}
 					</el-button>
-					<el-button size="default" class="copy-config-btn-reset" type="info" @click="onResetConfigClick">
+					<el-button size="small" class="copy-config-btn-reset" type="info" icon="el-icon-refresh-right" @click="onResetConfigClick">
-						<el-icon class="mr5">
-							<ele-RefreshRight />
-						</el-icon>
 						{{ $t('message.layout.resetText') }}
 					</el-button>
 				</div>
@@ -429,276 +237,180 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutBreadcrumbSeting">
+<script>
-import { nextTick, onUnmounted, onMounted, computed, reactive } from 'vue';
+import ClipboardJS from 'clipboard';
-import { ElMessage } from 'element-plus';
+import { Local } from '@/utils/storage.js';
-import { useI18n } from 'vue-i18n';
+import { useChangeColor } from '@/utils/theme.js';
-import { storeToRefs } from 'pinia';
+import config from '/package.json';
-import { useThemeConfig } from '/@/stores/themeConfig';
+export default {
-import { useChangeColor } from '/@/utils/theme';
+	name: 'layoutBreadcrumbSeting',
-import { verifyAndSpace } from '/@/utils/toolsValidate';
+	computed: {
-import { Local } from '/@/utils/storage';
+		// 获取布局配置信息
-import Watermark from '/@/utils/watermark';
+		getThemeConfig() {
-import commonFunction from '/@/utils/commonFunction';
+			return this.$store.state.themeConfig.themeConfig;
-import other from '/@/utils/other';
+		},
-import mittBus from '/@/utils/mitt';
+	},
-
+	created() {
-// 定义变量内容
-const { locale } = useI18n();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-const { copyText } = commonFunction();
-const { getLightColor, getDarkColor } = useChangeColor();
-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}`, themeConfig.value[bg]);
-	if (bg === 'menuBar') {
-		document.documentElement.style.setProperty(`--next-bg-menuBar-light-1`, 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) => {
-	nextTick(() => {
-		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 , ${color}, ${getLightColor(color, 0.5)})`);
-			else els.setAttribute('style', ``);
-			setLocalThemeConfig();
-		}, 300);
-	});
-};
-// 2、分栏设置 ->
-const onColumnsMenuHoverPreloadChange = () => {
-	setLocalThemeConfig();
-};
-// 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();
-	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 = () => {
-	mittBus.emit('openOrCloseSortable');
-	setLocalThemeConfig();
-};
-// 4、界面显示 --> 开启 TagsView 共用
-const onShareTagsViewChange = () => {
-	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 = 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: string) => {
-	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('menuBarActiveColor');
-	onBgColorPickerChange('topBar');
-	onBgColorPickerChange('topBarColor');
-	onBgColorPickerChange('columnsMenuBar');
-	onBgColorPickerChange('columnsMenuBarColor');
-};
-// 关闭弹窗时，初始化变量。变量用于处理 layoutScrollbarRef.value.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();
-	// @ts-ignore
-	Local.set('version', __NEXT_VERSION__);
-};
-// 初始化菜单样式等
-const initSetStyle = () => {
-	// 2、菜单 / 顶栏 --> 顶栏背景渐变
-	onTopBarGradualChange();
-	// 2、菜单 / 顶栏 --> 菜单背景渐变
-	onMenuBarGradualChange();
-	// 2、菜单 / 顶栏 --> 分栏菜单背景渐变
-	onColumnsMenuBarGradualChange();
-};
-onMounted(() => {
-	nextTick(() => {
 		// 判断当前布局是否不相同，不相同则初始化当前布局的样式，防止监听窗口大小改变时，布局配置logo、菜单背景等部分布局失效问题
-		if (!Local.get('frequency')) initLayoutChangeFun();
+		if (!Local.get('frequency')) this.initSetLayoutChange();
 		Local.set('frequency', 1);
 		// 监听窗口大小改变，非默认布局，设置成默认布局（适配移动端）
-		mittBus.on('layoutMobileResize', (res: LayoutMobileResize) => {
+		this.bus.$on('layoutMobileResize', (res) => {
-			getThemeConfig.value.layout = res.layout;
+			if (this.$store.state.themeConfig.themeConfig.layout === res.layout) return false;
-			getThemeConfig.value.isDrawer = false;
+			this.$store.state.themeConfig.themeConfig.layout = res.layout;
-			initLayoutChangeFun();
+			this.$store.state.themeConfig.themeConfig.isDrawer = false;
-			state.isMobile = other.isMobile();
+			this.$store.state.themeConfig.themeConfig.isCollapse = false;
+			this.initSetLayoutChange();
 		});
-		setTimeout(() => {
+	},
-			// 默认样式
+	mounted() {
-			onColorPickerChange();
+		this.initLayoutConfig();
-			// 灰色模式
+	},
-			if (getThemeConfig.value.isGrayscale) onAddFilterChange('grayscale');
+	methods: {
-			// 色弱模式
+		// 全局主题
-			if (getThemeConfig.value.isInvert) onAddFilterChange('invert');
+		onColorPickerChange() {
-			// 深色模式
+			if (!this.getThemeConfig.primary) return;
-			if (getThemeConfig.value.isIsDark) onAddDarkChange();
+			// 颜色加深
-			// 开启水印
+			document.documentElement.style.setProperty('--prev-color-primary', this.getThemeConfig.primary);
-			onWartermarkChange();
+			// 颜色变浅
-			// 语言国际化
+			for (let i = 1; i <= 9; i++) {
-			if (Local.get('themeConfig')) locale.value = Local.get('themeConfig').globalI18n;
+				document.documentElement.style.setProperty(
-			// 初始化菜单样式等
+					`--prev-color-primary-light-${i}`,
-			initSetStyle();
+					`${useChangeColor().getLightColor(this.getThemeConfig.primary, i / 10)}`
-		}, 100);
+				);
-	});
+			}
-});
+			this.setLocalThemeConfig();
-onUnmounted(() => {
+		},
-	mittBus.off('layoutMobileResize', () => {});
+		// 深色模式
-});
+		onAddDarkChange() {
-
+			const body = document.documentElement;
-// 暴露变量
+			if (this.getThemeConfig.isIsDark) body.setAttribute('data-theme', 'dark');
-defineExpose({
+			else body.setAttribute('data-theme', '');
-	openDrawer,
+			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;
-	:deep(.el-scrollbar__view) {
+	::v-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);
+			color: var(--prev-color-text-primary);
 		}
 	}
 	.layout-drawer-content-flex {
@@ -717,16 +429,16 @@ defineExpose({
 			.el-container {
 				height: 100%;
 				.el-aside-dark {
-					background-color: var(--next-color-seting-header);
+					background-color: var(--prev-color-seting-header);
 				}
 				.el-aside {
-					background-color: var(--next-color-seting-aside);
+					background-color: var(--prev-color-seting-aside);
 				}
 				.el-header {
-					background-color: var(--next-color-seting-header);
+					background-color: var(--prev-color-seting-header);
 				}
 				.el-main {
-					background-color: var(--next-color-seting-main);
+					background-color: var(--prev-color-seting-main);
 				}
 			}
 			.el-circular {
@@ -737,7 +449,7 @@ defineExpose({
 			}
 			.drawer-layout-active {
 				border: 1px solid;
-				border-color: var(--el-color-primary);
+				border-color: var(--prev-color-primary);
 			}
 			.layout-tips-warp,
 			.layout-tips-warp-active {
@@ -747,7 +459,7 @@ defineExpose({
 				top: 50%;
 				transform: translate(-50%, -50%);
 				border: 1px solid;
-				border-color: var(--el-color-primary-light-5);
+				border-color: var(--prev-color-primary-light-5);
 				border-radius: 100%;
 				padding: 4px;
 				.layout-tips-box {
@@ -756,7 +468,7 @@ defineExpose({
 					height: 30px;
 					z-index: 9;
 					border: 1px solid;
-					border-color: var(--el-color-primary-light-5);
+					border-color: var(--prev-color-primary-light-5);
 					border-radius: 100%;
 					.layout-tips-txt {
 						transition: inherit;
@@ -766,11 +478,11 @@ defineExpose({
 						line-height: 1;
 						letter-spacing: 2px;
 						white-space: nowrap;
-						color: var(--el-color-primary-light-5);
+						color: var(--prev-color-primary-light-5);
 						text-align: center;
 						transform: rotate(30deg);
 						left: -1px;
-						background-color: var(--next-color-seting-main);
+						background-color: var(--prev-color-seting-main);
 						width: 32px;
 						height: 17px;
 						line-height: 17px;
@@ -779,13 +491,13 @@ defineExpose({
 			}
 			.layout-tips-warp-active {
 				border: 1px solid;
-				border-color: var(--el-color-primary);
+				border-color: var(--prev-color-primary);
 				.layout-tips-box {
 					border: 1px solid;
-					border-color: var(--el-color-primary);
+					border-color: var(--prev-color-primary);
 					.layout-tips-txt {
-						color: var(--el-color-primary) !important;
+						color: var(--prev-color-primary) !important;
-						background-color: var(--next-color-seting-main) !important;
+						background-color: var(--prev-color-seting-main) !important;
 					}
 				}
 			}
@@ -793,18 +505,18 @@ defineExpose({
 				.el-circular {
 					transition: all 0.3s ease-in-out;
 					border: 1px solid;
-					border-color: var(--el-color-primary);
+					border-color: var(--prev-color-primary);
 				}
 				.layout-tips-warp {
 					transition: all 0.3s ease-in-out;
-					border-color: var(--el-color-primary);
+					border-color: var(--prev-color-primary);
 					.layout-tips-box {
 						transition: inherit;
-						border-color: var(--el-color-primary);
+						border-color: var(--prev-color-primary);
 						.layout-tips-txt {
 							transition: inherit;
-							color: var(--el-color-primary) !important;
+							color: var(--prev-color-primary) !important;
-							background-color: var(--next-color-seting-main) !important;
+							background-color: var(--prev-color-seting-main) !important;
 						}
 					}
 				}

src/layout/navBars/topBar/user.vue

@@ -1,224 +1,220 @@
 <template>
-	<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
+	<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="large" :disabled="state.disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
+					<el-dropdown-item command="" :disabled="disabledSize === ''">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
-					<el-dropdown-item command="default" :disabled="state.disabledSize === 'default'">{{ $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="state.disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</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
+				<i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>
-					class="iconfont"
-					:class="state.disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'"
-					:title="$t('message.user.title1')"
-				></i>
 			</div>
-			<template #dropdown>
+			<el-dropdown-menu slot="dropdown">
-				<el-dropdown-menu>
+				<el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
-					<el-dropdown-item command="zh-cn" :disabled="state.disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
+				<el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>
-					<el-dropdown-item command="en" :disabled="state.disabledI18n === 'en'">English</el-dropdown-item>
+				<el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>
-					<el-dropdown-item command="zh-tw" :disabled="state.disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>
+			</el-dropdown-menu>
-				</el-dropdown-menu>
-			</template>
 		</el-dropdown>
 		<div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
-			<el-icon :title="$t('message.user.title2')">
+			<i class="el-icon-search" :title="$t('message.user.title2')"></i>
-				<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" ref="userNewsBadgeRef" v-click-outside="onUserNewsClick">
+		<div class="layout-navbars-breadcrumb-user-icon" @click.stop="isShowUserNewsPopover = !isShowUserNewsPopover">
-			<el-badge :is-dot="true">
+			<el-popover placement="bottom" trigger="click" v-model="isShowUserNewsPopover" :width="300" popper-class="el-popover-pupop-user-news">
-				<el-icon :title="$t('message.user.title4')">
+				<el-badge :is-dot="true" slot="reference">
-					<ele-Bell />
+					<i class="el-icon-bell" :title="$t('message.user.title4')"></i>
-				</el-icon>
+				</el-badge>
-			</el-badge>
+				<transition name="el-zoom-in-top">
+					<UserNews v-show="isShowUserNewsPopover" />
+				</transition>
+			</el-popover>
 		</div>
-		<el-popover
-			ref="userNewsRef"
-			:virtual-ref="userNewsBadgeRef"
-			placement="bottom"
-			trigger="click"
-			transition="el-zoom-in-top"
-			virtual-triggering
-			:width="300"
-			:persistent="false"
-		>
-			<UserNews />
-		</el-popover>
 		<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
 			<i
 				class="iconfont"
-				:title="state.isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
+				:title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
-				:class="!state.isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
+				:class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
 			></i>
 		</div>
-		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
+		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onDropdownCommand">
 			<span class="layout-navbars-breadcrumb-user-link">
-				<img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+				<img :src="getUserInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
-				{{ userInfos.userName === '' ? 'common' : userInfos.userName }}
+				{{ getUserInfos.userName === '' ? 'test' : getUserInfos.userName }}
-				<el-icon class="el-icon--right">
+				<i class="el-icon-arrow-down el-icon--right"></i>
-					<ele-ArrowDown />
-				</el-icon>
 			</span>
-			<template #dropdown>
+			<el-dropdown-menu slot="dropdown">
-				<el-dropdown-menu>
+				<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
-					<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="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
+				<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</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="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
+				<el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</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-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
+			</el-dropdown-menu>
-				</el-dropdown-menu>
-			</template>
 		</el-dropdown>
 		<Search ref="searchRef" />
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutBreadcrumbUser">
+<script>
-import { defineAsyncComponent, ref, unref, computed, reactive, onMounted } from 'vue';
-import { useRouter } from 'vue-router';
-import { ElMessageBox, ElMessage, ClickOutside as vClickOutside } from 'element-plus';
 import screenfull from 'screenfull';
-import { useI18n } from 'vue-i18n';
+import { Session, Local } from '@/utils/storage.js';
-import { storeToRefs } from 'pinia';
+import UserNews from '@/layout/navBars/topBar/userNews.vue';
-import { useUserInfo } from '/@/stores/userInfo';
+import Search from '@/layout/navBars/topBar/search.vue';
-import { useThemeConfig } from '/@/stores/themeConfig';
+export default {
-import other from '/@/utils/other';
+	name: 'layoutBreadcrumbUser',
-import mittBus from '/@/utils/mitt';
+	components: { UserNews, Search },
-import { Session, Local } from '/@/utils/storage';
+	data() {
-
+		return {
-// 引入组件
+			isScreenfull: false,
-const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/topBar/userNews.vue'));
+			isShowUserNewsPopover: false,
-const Search = defineAsyncComponent(() => import('/@/layout/navBars/topBar/search.vue'));
+			disabledI18n: 'zh-cn',
-
+			disabledSize: '',
-// 定义变量内容
+		};
-const userNewsRef = ref();
+	},
-const userNewsBadgeRef = ref();
+	computed: {
-const { locale, t } = useI18n();
+		// 获取用户信息
-const router = useRouter();
+		getUserInfos() {
-const stores = useUserInfo();
+			return this.$store.state.userInfos.userInfos;
-const storesThemeConfig = useThemeConfig();
+		},
-const { userInfos } = storeToRefs(stores);
+		// 设置弹性盒子布局 flex
-const { themeConfig } = storeToRefs(storesThemeConfig);
+		layoutUserFlexNum() {
-const searchRef = ref();
+			let { layout, isClassicSplitMenu } = this.$store.state.themeConfig.themeConfig;
-const state = reactive({
+			let num = '';
-	isScreenfull: false,
+			if (layout === 'defaults' || (layout === 'classic' && !isClassicSplitMenu) || layout === 'columns') num = 1;
-	disabledI18n: 'zh-cn',
+			else num = null;
-	disabledSize: 'large',
+			return num;
-});
+		},
-
+	},
-// 设置分割样式
+	mounted() {
-const layoutUserFlexNum = computed(() => {
+		if (Local.get('themeConfigPrev')) {
-	let num: string | number = '';
+			this.initI18n();
-	const { layout, isClassicSplitMenu } = themeConfig.value;
+			this.initComponentSize();
-	const layoutArr: string[] = ['defaults', 'columns'];
+		}
-	if (layoutArr.includes(layout) || (layout === 'classic' && !isClassicSplitMenu)) num = '1';
+	},
-	else num = '';
+	methods: {
-	return num;
+		// 搜索点击
-});
+		onSearchClick() {
-// 全屏点击时
+			this.$refs.searchRef.openSearch();
-const onScreenfullClick = () => {
+		},
-	if (!screenfull.isEnabled) {
+		// 布局配置点击
-		ElMessage.warning('暂不不支持全屏');
+		onLayoutSetingClick() {
-		return false;
+			this.bus.$emit('openSetingsDrawer');
-	}
+		},
-	screenfull.toggle();
+		// 全屏点击
-	screenfull.on('change', () => {
+		onScreenfullClick() {
-		if (screenfull.isFullscreen) state.isScreenfull = true;
+			if (!screenfull.isEnabled) {
-		else state.isScreenfull = false;
+				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);
+			}
+		},
+	},
 };
-// 消息通知点击时
-const onUserNewsClick = () => {
-	unref(userNewsRef).popperRef?.delayHide?.();
-};
-// 布局配置 icon 点击时
-const onLayoutSetingClick = () => {
-	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);
-	initI18nOrSize('globalComponentSize', 'disabledSize');
-	window.location.reload();
-};
-// 语言切换
-const onLanguageChange = (lang: string) => {
-	Local.remove('themeConfig');
-	themeConfig.value.globalI18n = lang;
-	Local.set('themeConfig', themeConfig.value);
-	locale.value = lang;
-	other.useTitle();
-	initI18nOrSize('globalI18n', 'disabledI18n');
-};
-// 初始化组件大小/i18n
-const initI18nOrSize = (value: string, attr: string) => {
-	(<any>state)[attr] = Local.get('themeConfig')[value];
-};
-// 页面加载时
-onMounted(() => {
-	if (Local.get('themeConfig')) {
-		initI18nOrSize('globalComponentSize', 'disabledSize');
-		initI18nOrSize('globalI18n', 'disabledI18n');
-	}
-});
 </script>
 
 <style scoped lang="scss">
@@ -240,29 +236,29 @@ onMounted(() => {
 	&-icon {
 		padding: 0 10px;
 		cursor: pointer;
-		color: var(--next-bg-topBarColor);
+		color: var(--prev-bg-topBarColor);
 		height: 50px;
 		line-height: 50px;
 		display: flex;
 		align-items: center;
 		&:hover {
-			background: var(--next-color-user-hover);
+			background: var(--prev-color-hover);
 			i {
 				display: inline-block;
 				animation: logoAnimation 0.3s ease-in-out;
 			}
 		}
 	}
-	:deep(.el-dropdown) {
+	& ::v-deep .el-dropdown {
-		color: var(--next-bg-topBarColor);
+		color: var(--prev-bg-topBarColor);
 	}
-	:deep(.el-badge) {
+	& ::v-deep .el-badge {
 		height: 40px;
 		line-height: 40px;
 		display: flex;
 		align-items: center;
 	}
-	:deep(.el-badge__content.is-fixed) {
+	& ::v-deep .el-badge__content.is-fixed {
 		top: 12px;
 	}
 }

src/layout/navBars/topBar/userNews.vue

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

src/layout/navMenu/horizontal.vue

@@ -1,121 +1,117 @@
 <template>
 	<div class="el-menu-horizontal-warp">
-		<el-menu router :default-active="state.defaultActive" background-color="transparent" mode="horizontal">
+		<el-scrollbar @wheel.native.prevent="onElMenuHorizontalScroll" ref="elMenuHorizontalScrollRef">
-			<template v-for="val in menuLists">
+			<el-menu router :default-active="defaultActive" background-color="transparent" mode="horizontal" @select="onHorizontalSelect">
-				<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
+				<template v-for="val in menuList">
-					<template #title>
+					<el-submenu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
-						<SvgIcon :name="val.meta.icon" />
+						<template slot="title">
-						<span>{{ $t(val.meta.title) }}</span>
+							<i :class="val.meta.icon ? val.meta.icon : ''"></i>
-					</template>
+							<span>{{ $t(val.meta.title) }}</span>
-					<SubItem :chil="val.children" />
-				</el-sub-menu>
-				<template v-else>
-					<el-menu-item :index="val.path" :key="val.path">
-						<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
-							<SvgIcon :name="val.meta.icon" />
-							{{ $t(val.meta.title) }}
 						</template>
-						<template #title v-else>
+						<SubItem :chil="val.children" />
-							<a class="w100" @click.prevent="onALinkClick(val)">
+					</el-submenu>
-								<SvgIcon :name="val.meta.icon" />
+					<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>
 								{{ $t(val.meta.title) }}
-							</a>
+							</template>
-						</template>
+							<template slot="title" v-else>
-					</el-menu-item>
+								<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>
-			</template>
+			</el-menu>
-		</el-menu>
+		</el-scrollbar>
 	</div>
 </template>
 
-<script setup lang="ts" name="navMenuHorizontal">
+<script>
-import { defineAsyncComponent, reactive, computed, onBeforeMount } from 'vue';
+import SubItem from '@/layout/navMenu/subItem.vue';
-import { useRoute, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
+export default {
-import { storeToRefs } from 'pinia';
+	name: 'navMenuHorizontal',
-import { useRoutesList } from '/@/stores/routesList';
+	components: { SubItem },
-import { useThemeConfig } from '/@/stores/themeConfig';
+	props: {
-import other from '/@/utils/other';
+		menuList: {
-import mittBus from '/@/utils/mitt';
+			type: Array,
-
+			default: () => [],
-// 引入组件
+		},
-const SubItem = defineAsyncComponent(() => import('/@/layout/navMenu/subItem.vue'));
+	},
-
+	data() {
-// 定义父组件传过来的值
+		return {
-const props = defineProps({
+			defaultActive: null,
-	// 菜单列表
+		};
-	menuList: {
+	},
-		type: Array<RouteRecordRaw>,
+	mounted() {
-		default: () => [],
+		this.initElMenuOffsetLeft();
+		this.setCurrentRouterHighlight(this.$route.path);
+	},
+	methods: {
+		// 设置横向滚动条可以鼠标滚轮滚动
+		onElMenuHorizontalScroll(e) {
+			const eventDelta = e.wheelDelta || -e.deltaY * 40;
+			this.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft = this.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft + eventDelta / 4;
+		},
+		// 初始化数据，页面刷新时，滚动条滚动到对应位置
+		initElMenuOffsetLeft() {
+			this.$nextTick(() => {
+				let els = document.querySelector('.el-menu.el-menu--horizontal li.is-active');
+				if (!els) return false;
+				this.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft = els.offsetLeft;
+			});
+		},
+		// 路由过滤递归函数
+		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;
+				});
+		},
+		// 传送当前子级数据到菜单中
+		setSendClassicChildren(path) {
+			const currentPathSplit = path.split('/');
+			let currentData = {};
+			this.filterRoutesFun(this.$store.state.routesList.routesList).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;
+		},
+		// 菜单激活回调
+		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]}`;
+			} else {
+				this.defaultActive = path;
+			}
+		},
+	},
+	watch: {
+		// 监听路由的变化
+		$route: {
+			handler(to) {
+				this.setCurrentRouterHighlight(to.path);
+			},
+			deep: true,
+		},
 	},
-});
-
-// 定义变量内容
-const stores = useRoutesList();
-const storesThemeConfig = useThemeConfig();
-const { routesList } = storeToRefs(stores);
-const { themeConfig } = storeToRefs(storesThemeConfig);
-const route = useRoute();
-const state = reactive({
-	defaultActive: '' as string | undefined,
-});
-
-// 获取父级菜单数据
-const menuLists = computed(() => {
-	return <RouteItems>props.menuList;
-});
-// 路由过滤递归函数
-const filterRoutesFun = <T extends RouteItem>(arr: T[]): T[] => {
-	return arr
-		.filter((item: T) => !item.meta?.isHide)
-		.map((item: T) => {
-			item = Object.assign({}, item);
-			if (item.children) item.children = filterRoutesFun(item.children);
-			return item;
-		});
 };
-// 传送当前子级数据到菜单中
-const setSendClassicChildren = (path: string) => {
-	const currentPathSplit = path.split('/');
-	let currentData: MittMenu = { children: [] };
-	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;
-};
-// 设置页面当前路由高亮
-const setCurrentRouterHighlight = (currentRoute: RouteToFrom) => {
-	const { path, meta } = currentRoute;
-	if (themeConfig.value.layout === 'classic') {
-		state.defaultActive = `/${path?.split('/')[1]}`;
-	} else {
-		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;
-	}
-};
-// 打开外部链接
-const onALinkClick = (val: RouteItem) => {
-	other.handleOpenLink(val);
-};
-// 页面加载前
-onBeforeMount(() => {
-	setCurrentRouterHighlight(route);
-});
-// 路由更新时
-onBeforeRouteUpdate((to) => {
-	// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
-	setCurrentRouterHighlight(to);
-	// 修复经典布局开启切割菜单时，点击tagsView后左侧导航菜单数据不变的问题
-	let { layout, isClassicSplitMenu } = themeConfig.value;
-	if (layout === 'classic' && isClassicSplitMenu) {
-		mittBus.emit('setSendClassicChildren', setSendClassicChildren(to.path));
-	}
-});
 </script>
 
 <style scoped lang="scss">
@@ -123,10 +119,13 @@ onBeforeRouteUpdate((to) => {
 	flex: 1;
 	overflow: hidden;
 	margin-right: 30px;
-	:deep(.el-scrollbar__bar.is-vertical) {
+	::v-deep .el-scrollbar__bar.is-vertical {
 		display: none;
 	}
-	:deep(a) {
+	::v-deep .el-scrollbar__wrap {
+		overflow-y: hidden !important;
+	}
+	::v-deep a {
 		width: 100%;
 	}
 	.el-menu.el-menu--horizontal {

src/layout/navMenu/subItem.vue

@@ -1,49 +1,41 @@
 <template>
-	<template v-for="val in chils">
+	<div>
-		<el-sub-menu :index="val.path" :key="val.path" v-if="val.children && val.children.length > 0">
+		<template v-for="val in chil">
-			<template #title>
+			<el-submenu :index="val.path" :key="val.path" v-if="val.children && val.children.length > 0">
-				<SvgIcon :name="val.meta.icon" />
+				<template slot="title">
-				<span>{{ $t(val.meta.title) }}</span>
+					<i :class="val.meta.icon"></i>
-			</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>
-				<template v-else>
+				<sub-item :chil="val.children" />
-					<a class="w100" @click.prevent="onALinkClick(val)">
+			</el-submenu>
-						<SvgIcon :name="val.meta.icon" />
+			<template v-else>
-						{{ $t(val.meta.title) }}
+				<el-menu-item :index="val.path" :key="val.path">
-					</a>
+					<template v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
-				</template>
+						<i :class="val.meta.icon ? val.meta.icon : ''"></i>
-			</el-menu-item>
+						<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>
-	</template>
+	</div>
 </template>
 
-<script setup lang="ts" name="navMenuSubItem">
+<script>
-import { computed } from 'vue';
+export default {
-import { RouteRecordRaw } from 'vue-router';
+	name: 'subItem',
-import other from '/@/utils/other';
+	props: {
-
+		chil: {
-// 定义父组件传过来的值
+			type: Array,
-const props = defineProps({
+			default() {
-	// 菜单列表
+				return [];
-	chil: {
+			},
-		type: Array<RouteRecordRaw>,
+		},
-		default: () => [],
 	},
-});
-
-// 获取父级菜单数据
-const chils = computed(() => {
-	return <RouteItems>props.chil;
-});
-// 打开外部链接
-const onALinkClick = (val: RouteItem) => {
-	other.handleOpenLink(val);
 };
 </script>

src/layout/navMenu/vertical.vue

@@ -1,28 +1,28 @@
 <template>
 	<el-menu
 		router
-		:default-active="state.defaultActive"
 		background-color="transparent"
-		:collapse="state.isCollapse"
+		:default-active="defaultActive"
+		:collapse="setIsCollapse"
 		:unique-opened="getThemeConfig.isUniqueOpened"
 		:collapse-transition="false"
 	>
-		<template v-for="val in menuLists">
+		<template v-for="val in menuList">
-			<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
+			<el-submenu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
-				<template #title>
+				<template slot="title">
-					<SvgIcon :name="val.meta.icon" />
+					<i :class="val.meta.icon ? val.meta.icon : ''"></i>
 					<span>{{ $t(val.meta.title) }}</span>
 				</template>
 				<SubItem :chil="val.children" />
-			</el-sub-menu>
+			</el-submenu>
 			<template v-else>
 				<el-menu-item :index="val.path" :key="val.path">
-					<SvgIcon :name="val.meta.icon" />
+					<i :class="val.meta.icon ? val.meta.icon : ''"></i>
-					<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
+					<template slot="title" v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
 						<span>{{ $t(val.meta.title) }}</span>
 					</template>
-					<template #title v-else>
+					<template slot="title" v-else>
-						<a class="w100" @click.prevent="onALinkClick(val)">{{ $t(val.meta.title) }}</a>
+						<a :href="val.meta.isLink" target="_blank">{{ $t(val.meta.title) }}</a>
 					</template>
 				</el-menu-item>
 			</template>
@@ -30,73 +30,44 @@
 	</el-menu>
 </template>
 
-<script setup lang="ts" name="navMenuVertical">
+<script>
-import { defineAsyncComponent, reactive, computed, onMounted, watch } from 'vue';
+import SubItem from '@/layout/navMenu/subItem.vue';
-import { useRoute, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
+export default {
-import { storeToRefs } from 'pinia';
+	name: 'navMenuVertical',
-import { useThemeConfig } from '/@/stores/themeConfig';
+	components: { SubItem },
-import other from '/@/utils/other';
+	props: {
-
+		menuList: {
-// 引入组件
+			type: Array,
-const SubItem = defineAsyncComponent(() => import('/@/layout/navMenu/subItem.vue'));
+			default() {
-
+				return [];
-// 定义父组件传过来的值
+			},
-const props = defineProps({
+		},
-	// 菜单列表
-	menuList: {
-		type: Array<RouteRecordRaw>,
-		default: () => [],
 	},
-});
+	data() {
-
+		return {
-// 定义变量内容
+			defaultActive: this.$route.path,
-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 <RouteItems>props.menuList;
-});
-// 获取布局配置信息
-const getThemeConfig = computed(() => {
-	return themeConfig.value;
-});
-// 菜单高亮（详情时，父级高亮）
-const setParentHighlight = (currentRoute: RouteToFrom) => {
-	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;
-};
-// 打开外部链接
-const onALinkClick = (val: RouteItem) => {
-	other.handleOpenLink(val);
-};
-// 页面加载时
-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;
-});
-// 设置菜单的收起/展开
-watch(
-	() => themeConfig.value.isCollapse,
-	(isCollapse) => {
-		document.body.clientWidth <= 1000 ? (state.isCollapse = false) : (state.isCollapse = isCollapse);
 	},
-	{
+	computed: {
-		immediate: true,
+		// 获取布局配置信息
-	}
+		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,101 +1,46 @@
 <template>
-	<div class="layout-padding layout-padding-unset layout-iframe">
+	<div>
-		<div class="layout-padding-auto layout-padding-view">
+		<div class="layout-view-bg-white flex h100" v-loading="iframeLoading">
-			<div class="w100" v-for="v in setIframeList" :key="v.path" v-loading="v.meta.loading" element-loading-background="white">
+			<iframe :src="meta.isLink" frameborder="0" height="100%" width="100%" id="iframe"></iframe>
-				<transition-group :name="name">
-					<iframe
-						:src="v.meta.isLink"
-						:key="v.path"
-						frameborder="0"
-						height="100%"
-						width="100%"
-						style="position: absolute"
-						:data-url="v.path"
-						v-show="getRoutePath === v.path"
-						ref="iframeRef"
-					/>
-				</transition-group>
-			</div>
 		</div>
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutIframeView">
+<script>
-import { computed, watch, ref, nextTick } from 'vue';
+export default {
-import { useRoute } from 'vue-router';
+	name: 'layoutIfameView',
-
+	props: {
-// 定义父组件传过来的值
+		meta: {
-const props = defineProps({
+			type: Object,
-	// 刷新 iframe
+			default: () => {},
-	refreshKey: {
+		},
-		type: String,
-		default: () => '',
 	},
-	// 过渡动画 name
+	data() {
-	name: {
+		return {
-		type: String,
+			iframeLoading: true,
-		default: () => 'slide-right',
+		};
 	},
-	// iframe 列表
+	created() {
-	list: {
+		this.bus.$on('onTagsViewRefreshRouterView', (path) => {
-		type: Array,
+			if (this.$route.path !== path) return false;
-		default: () => [],
+			this.$emit('getCurrentRouteMeta');
+		});
 	},
-});
+	mounted() {
-
+		this.initIframeLoad();
-// 定义变量内容
+	},
-const iframeRef = ref();
+	methods: {
-const route = useRoute();
+		// 初始化页面加载 loading
-
+		initIframeLoad() {
-// 处理 list 列表，当打开时，才进行加载
+			this.$nextTick(() => {
-const setIframeList = computed(() => {
+				this.iframeLoading = true;
-	return (<RouteItems>props.list).filter((v: RouteItem) => v.meta?.isIframeOpen);
+				const iframe = document.getElementById('iframe');
-});
+				if (!iframe) return false;
-// 获取 iframe 当前路由 path
+				iframe.onload = () => {
-const getRoutePath = computed(() => {
+					this.iframeLoading = false;
-	return route.path;
-});
-// 关闭 iframe loading
-const closeIframeLoading = (val: string, item: RouteItem) => {
-	nextTick(() => {
-		if (!iframeRef.value) return false;
-		iframeRef.value.forEach((v: HTMLElement) => {
-			if (v.dataset.url === val) {
-				v.onload = () => {
-					if (item.meta?.isIframeOpen && item.meta.loading) item.meta.loading = false;
 				};
-			}
+			});
-		});
+		},
-	});
+	},
 };
-// 监听路由变化，初始化 iframe 数据，防止多个 iframe 时，切换不生效
-watch(
-	() => route.fullPath,
-	(val) => {
-		const item: any = props.list.find((v: any) => v.path === val);
-		if (!item) return false;
-		if (!item.meta.isIframeOpen) item.meta.isIframeOpen = true;
-		closeIframeLoading(val, item);
-	},
-	{
-		immediate: true,
-	}
-);
-// 监听 iframe refreshKey 变化，用于 tagsview 右键菜单刷新
-watch(
-	() => props.refreshKey,
-	() => {
-		const item: any = props.list.find((v: any) => v.path === route.path);
-		if (!item) return false;
-		if (item.meta.isIframeOpen) item.meta.isIframeOpen = false;
-		setTimeout(() => {
-			item.meta.isIframeOpen = true;
-			item.meta.loading = true;
-			closeIframeLoading(route.fullPath, item);
-		});
-	},
-	{
-		deep: true,
-	}
-);
 </script>

src/layout/routerView/link.vue

@@ -1,10 +1,10 @@
 <template>
-	<div class="layout-padding layout-link-container">
+	<div class="layout-scrollbar layout-link-container">
-		<div class="layout-padding-auto layout-padding-view">
+		<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(state.title) }}" 已在新窗口中打开</div>
+				<div class="layout-link-msg">页面 "{{ $t(meta.title) }}" 已在新窗口中打开</div>
-				<el-button class="mt30" round size="default" @click="onGotoFullPage">
+				<el-button class="mt30" round size="small" @click="onGotoFullPage">
 					<i class="iconfont icon-lianjie"></i>
 					<span>立即前往体验</span>
 				</el-button>
@@ -13,35 +13,25 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutLinkView">
+<script>
-import { reactive, watch } from 'vue';
+import { verifyUrl } from '@/utils/toolsValidate';
-import { useRoute } from 'vue-router';
+export default {
-import { verifyUrl } from '/@/utils/toolsValidate';
+	name: 'layoutLinkView',
-
+	props: {
-// 定义变量内容
+		meta: {
-const route = useRoute();
+			type: Object,
-const state = reactive<LinkViewState>({
+			default: () => {},
-	title: '',
+		},
-	isLink: '',
-});
-
-// 立即前往
-const onGotoFullPage = () => {
-	const { origin, pathname } = window.location;
-	if (verifyUrl(<string>state.isLink)) window.open(state.isLink);
-	else window.open(`${origin}${pathname}#${state.isLink}`);
-};
-// 监听路由的变化，设置内容
-watch(
-	() => route.path,
-	() => {
-		state.title = <string>route.meta.title;
-		state.isLink = <string>route.meta.isLink;
 	},
-	{
+	methods: {
-		immediate: true,
+		// 立即前往
-	}
+		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>
 
 <style scoped lang="scss">
@@ -55,7 +45,7 @@ watch(
 		i.layout-link-icon {
 			position: relative;
 			font-size: 100px;
-			color: var(--el-color-primary);
+			color: var(--prev-color-primary);
 			&::after {
 				content: '';
 				position: absolute;
@@ -84,7 +74,7 @@ watch(
 		}
 		.layout-link-msg {
 			font-size: 12px;
-			color: var(--next-bg-topBarColor);
+			color: var(--prev-bg-topBarColor);
 			opacity: 0.7;
 			margin-top: 15px;
 		}

src/layout/routerView/parent.vue

@@ -1,108 +1,47 @@
 <template>
-	<div class="layout-parent">
+	<div class="h100">
-		<router-view v-slot="{ Component }">
-			<transition :name="setTransitionName" mode="out-in">
-				<keep-alive :include="getKeepAliveNames">
-					<component :is="Component" :key="state.refreshRouterViewKey" class="w100" v-show="!isIframePage" />
-				</keep-alive>
-			</transition>
-		</router-view>
 		<transition :name="setTransitionName" mode="out-in">
-			<Iframes class="w100" v-show="isIframePage" :refreshKey="state.iframeRefreshKey" :name="setTransitionName" :list="state.iframeList" />
+			<keep-alive :include="keepAliveNameList">
+				<router-view :key="refreshRouterViewKey" />
+			</keep-alive>
 		</transition>
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutParentView">
+<script>
-import { defineAsyncComponent, computed, reactive, onBeforeMount, onUnmounted, nextTick, watch, onMounted } from 'vue';
+export default {
-import { useRoute, useRouter } from 'vue-router';
+	name: 'parent',
-import { storeToRefs } from 'pinia';
+	data() {
-import { useKeepALiveNames } from '/@/stores/keepAliveNames';
+		return {
-import { useThemeConfig } from '/@/stores/themeConfig';
+			refreshRouterViewKey: null,
-import { Session } from '/@/utils/storage';
+			keepAliveNameList: [],
-import mittBus from '/@/utils/mitt';
+			keepAliveNameNewList: [],
-
+		};
-// 引入组件
-const Iframes = defineAsyncComponent(() => import('/@/layout/routerView/iframes.vue'));
-
-// 定义变量内容
-const route = useRoute();
-const router = useRouter();
-const storesKeepAliveNames = useKeepALiveNames();
-const storesThemeConfig = useThemeConfig();
-const { keepAliveNames, cachedViews } = storeToRefs(storesKeepAliveNames);
-const { themeConfig } = storeToRefs(storesThemeConfig);
-const state = reactive<ParentViewState>({
-	refreshRouterViewKey: '', // 非 iframe tagsview 右键菜单刷新时
-	iframeRefreshKey: '', // iframe tagsview 右键菜单刷新时
-	keepAliveNameList: [],
-	iframeList: [],
-});
-
-// 设置主界面切换动画
-const setTransitionName = computed(() => {
-	return themeConfig.value.animation;
-});
-// 获取组件缓存列表(name值)
-const getKeepAliveNames = computed(() => {
-	return themeConfig.value.isTagsview ? cachedViews.value : state.keepAliveNameList;
-});
-// 设置 iframe 显示/隐藏
-const isIframePage = computed(() => {
-	return route.meta.isIframe;
-});
-// 获取 iframe 组件列表(未进行渲染)
-const getIframeListRoutes = async () => {
-	router.getRoutes().forEach((v) => {
-		if (v.meta.isIframe) {
-			v.meta.isIframeOpen = false;
-			v.meta.loading = true;
-			state.iframeList.push({ ...v });
-		}
-	});
-};
-// 页面加载前，处理缓存，页面刷新时路由缓存处理
-onBeforeMount(() => {
-	state.keepAliveNameList = keepAliveNames.value;
-	mittBus.on('onTagsViewRefreshRouterView', (fullPath: string) => {
-		state.keepAliveNameList = keepAliveNames.value.filter((name: string) => route.name !== name);
-		state.refreshRouterViewKey = '';
-		state.iframeRefreshKey = '';
-		nextTick(() => {
-			state.refreshRouterViewKey = fullPath;
-			state.iframeRefreshKey = fullPath;
-			state.keepAliveNameList = keepAliveNames.value;
-		});
-	});
-});
-// 页面加载时
-onMounted(() => {
-	getIframeListRoutes();
-	// https://gitee.com/lyt-top/vue-next-admin/issues/I58U75
-	// https://gitee.com/lyt-top/vue-next-admin/issues/I59RXK
-	// https://gitee.com/lyt-top/vue-next-admin/pulls/40
-	nextTick(() => {
-		setTimeout(() => {
-			if (themeConfig.value.isCacheTagsView) {
-				let tagsViewArr: RouteItem[] = Session.get('tagsViewList') || [];
-				cachedViews.value = tagsViewArr.filter((item) => item.meta?.isKeepAlive).map((item) => item.name as string);
-			}
-		}, 0);
-	});
-});
-// 页面卸载时
-onUnmounted(() => {
-	mittBus.off('onTagsViewRefreshRouterView', () => {});
-});
-// 监听路由变化，防止 tagsView 多标签时，切换动画消失
-// https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/38/files
-watch(
-	() => route.fullPath,
-	() => {
-		state.refreshRouterViewKey = decodeURI(route.fullPath);
 	},
-	{
+	created() {
-		immediate: true,
+		// 页面加载前，处理缓存，页面刷新时路由缓存处理
-	}
+		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();
+			});
+		});
+	},
+	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,62 +1,66 @@
 <template>
-	<div class="sponsors-container" title="点击前往体验" v-show="state.sponsors.isShow" @click="onSponsorsClick">
+	<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 state.sponsors.list" :key="k">
+			<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">
+		<div class="sponsors-close" title="关闭赞助商" @click.stop="onCloseSponsors">
-			<SvgIcon name="ele-Close" :size="12" title="关闭赞助商" @click.stop="onCloseSponsors" />
+			<i class="el-icon-close"></i>
 		</div>
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutSponsors">
+<script>
-import { reactive, computed, onMounted } from 'vue';
+import sponsorsOne from '@/assets/ccflowRightNextAdmin.png';
-import sponsorsOne from '/@/assets/ccflowRightNextAdmin.png';
+export default {
-
+	name: 'layoutSponsors',
-// 定义变量内容
+	data() {
-const state = reactive({
+		return {
-	sponsors: {
+			sponsors: {
-		list: [
+				list: [
-			{
+					{
-				url: sponsorsOne,
+						url: sponsorsOne,
-				text: `驰骋BPM系统包含表单引擎+流程引擎+权限控制,方便集成,配置灵活,功能强大,适合中国国情的工作流引擎.演示:http://demo.ccflow.org。右上角点star方可加群: 1060674395`,
+						text: `驰骋BPM系统包含表单引擎+流程引擎+权限控制,方便集成,配置灵活,功能强大,适合中国国情的工作流引擎.演示:http://demo.ccflow.org。右上角点star方可加群: 1060674395`,
-				link: 'http://www.ccflow.org/',
+						link: 'http://www.ccflow.org/',
+					},
+				],
+				isShow: false,
+				index: 0,
 			},
-		],
+		};
-		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();
 	},
-});
-
-// 设置轮播图箭头显示
-const setCarouselShow = computed(() => {
-	return state.sponsors.list.length <= 1 ? 'never' : 'hover';
-});
-// 关闭赞助商
-const onCloseSponsors = () => {
-	state.sponsors.isShow = false;
 };
-// 轮播图改变时
-const onCarouselChange = (e: number) => {
-	state.sponsors.index = e;
-};
-// 当前项内容点击
-const onSponsorsClick = () => {
-	window.open(state.sponsors.list[state.sponsors.index].link);
-};
-// 延迟显示，防止影响其它界面加载
-const delayShow = () => {
-	setTimeout(() => {
-		state.sponsors.isShow = true;
-	}, 3000);
-};
-// 页面加载时
-onMounted(() => {
-	delayShow();
-});
 </script>
 
 <style scoped lang="scss">
@@ -66,8 +70,8 @@ onMounted(() => {
 	bottom: 15px;
 	z-index: 3;
 	width: 200px;
-	background-color: var(--next-bg-main-color);
+	background-color: var(--prev-bg-main-color);
-	box-shadow: var(--el-box-shadow-lighter);
+	box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
 	border-radius: 5px;
 	overflow: hidden;
 	cursor: pointer;
@@ -77,8 +81,8 @@ onMounted(() => {
 	}
 	.sponsors-text {
 		padding: 10px;
-		color: var(--el-text-color-regular);
+		color: var(--prev-color-text-regular);
-		font-size: var(--el-dialog-content-font-size);
+		font-size: 14px;
 	}
 	.sponsors-close {
 		width: 60px;
@@ -89,7 +93,8 @@ onMounted(() => {
 		position: absolute;
 		right: -35px;
 		bottom: -35px;
-		:deep(i) {
+		z-index: 5;
+		i {
 			position: absolute;
 			left: 9px;
 			top: 9px;
@@ -98,8 +103,8 @@ onMounted(() => {
 		}
 		&:hover {
 			transition: all 0.3s ease;
-			:deep(i) {
+			i {
-				color: var(--el-color-primary);
+				color: var(--prev-color-primary);
 				transition: all 0.3s ease;
 			}
 		}

src/layout/upgrade/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="upgrade-dialog">
 		<el-dialog
-			v-model="state.isUpgrade"
+			:visible.sync="isUpgrade"
 			width="300px"
 			destroy-on-close
 			:show-close="false"
@@ -11,81 +11,78 @@
 			<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{{ state.version }}</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/master/CHANGELOG.md" target="_black">
+					<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="default" type="info" text @click="onCancel">{{ $t('message.upgrade.btnOne') }}</el-button>
+				<el-button round size="small" @click="onCancel">{{ $t('message.upgrade.btnOne') }}</el-button>
-				<el-button type="primary" round size="default" @click="onUpgrade" :loading="state.isLoading">{{ state.btnTxt }}</el-button>
+				<el-button type="primary" round size="small" @click="onUpgrade" :loading="isLoading">{{ btnTxt }}</el-button>
 			</div>
 		</el-dialog>
 	</div>
 </template>
 
-<script setup lang="ts" name="layoutUpgrade">
+<script>
-import { reactive, computed, onMounted } from 'vue';
+import { Local } from '@/utils/storage';
-import { useI18n } from 'vue-i18n';
+import config from '/package.json';
-import { storeToRefs } from 'pinia';
+export default {
-import { useThemeConfig } from '/@/stores/themeConfig';
+	data() {
-import { Local } from '/@/utils/storage';
+		return {
-
+			isUpgrade: false,
-// 定义变量内容
+			version: config.version,
-const { t } = useI18n();
+			isLoading: false,
-const storesThemeConfig = useThemeConfig();
+			btnTxt: '',
-const { themeConfig } = storeToRefs(storesThemeConfig);
+		};
-const state = reactive({
+	},
-	isUpgrade: false,
+	computed: {
-	// @ts-ignore
+		// 获取布局配置信息
-	version: __NEXT_VERSION__,
+		getThemeConfig() {
-	isLoading: false,
+			return this.$store.state.themeConfig.themeConfig;
-	btnTxt: '',
+		},
-});
+	},
-
+	methods: {
-// 获取布局配置信息
+		// 残忍拒绝
-const getThemeConfig = computed(() => {
+		onCancel() {
-	return themeConfig.value;
+			this.isUpgrade = false;
-});
+		},
-// 残忍拒绝
+		// 马上更新
-const onCancel = () => {
+		onUpgrade() {
-	state.isUpgrade = false;
+			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);
+	},
 };
-// 马上更新
-const onUpgrade = () => {
-	state.isLoading = true;
-	state.btnTxt = t('message.upgrade.btnTwoLoading');
-	setTimeout(() => {
-		Local.clear();
-		window.location.reload();
-		Local.set('version', state.version);
-	}, 2000);
-};
-// 延迟显示，防止刷新时界面显示太快
-const delayShow = () => {
-	setTimeout(() => {
-		state.isUpgrade = true;
-	}, 2000);
-};
-// 页面加载时
-onMounted(() => {
-	delayShow();
-	setTimeout(() => {
-		state.btnTxt = t('message.upgrade.btnTwo');
-	}, 200);
-});
 </script>
 
 <style scoped lang="scss">
 .upgrade-dialog {
-	:deep(.el-dialog) {
+	& ::v-deep .el-dialog {
 		.el-dialog__body {
 			padding: 0 !important;
 		}
@@ -102,7 +99,7 @@ onMounted(() => {
 			&::after {
 				content: '';
 				position: absolute;
-				background-color: var(--el-color-primary-light-1);
+				background-color: var(--prev-color-primary-light-1);
 				width: 130%;
 				height: 130px;
 				border-bottom-left-radius: 100%;
@@ -112,13 +109,13 @@ onMounted(() => {
 				z-index: 1;
 				position: relative;
 				.upgrade-title-warp-txt {
-					color: var(--next-color-white);
+					color: var(--prev-color-text-white);
 					font-size: 22px;
 					letter-spacing: 3px;
 				}
 				.upgrade-title-warp-version {
-					color: var(--next-color-white);
+					background-color: var(--prev-color-primary-light-4);
-					background-color: var(--el-color-primary-light-4);
+					color: var(--prev-color-text-white);
 					font-size: 12px;
 					position: absolute;
 					display: flex;
@@ -132,13 +129,14 @@ onMounted(() => {
 		.upgrade-content {
 			padding: 20px;
 			line-height: 22px;
+			color: var(--prev-color-text-regular);
 			.upgrade-content-desc {
-				color: var(--el-color-info-light-5);
+				color: var(--prev-color-text-placeholder);
 				font-size: 12px;
 			}
 		}
 		.upgrade-btn {
-			border-top: 1px solid var(--el-border-color-lighter, #ebeef5);
+			border-top: 1px solid var(--prev-border-color-lighter);
 			display: flex;
 			justify-content: space-around;
 			padding: 15px 20px;

src/main.js

@@ -0,0 +1,24 @@
+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

@@ -1,18 +0,0 @@
-import { createApp } from 'vue';
-import pinia from '/@/stores/index';
-import App from '/@/App.vue';
-import router from '/@/router';
-import { directive } from '/@/directive/index';
-import { i18n } from '/@/i18n/index';
-import other from '/@/utils/other';
-
-import ElementPlus from 'element-plus';
-import '/@/theme/index.scss';
-import VueGridLayout from 'vue-grid-layout';
-
-const app = createApp(App);
-
-directive(app);
-other.elSvg(app);
-
-app.use(pinia).use(router).use(ElementPlus).use(i18n).use(VueGridLayout).mount('#app');

src/router/backEnd.ts

@@ -1,162 +0,0 @@
-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';
-
-// 后端控制路由
-
-// 引入 api 请求接口
-const menuApi = useMenuApi();
-
-/**
- * 获取目录下的 .vue、.tsx 全部文件
- * @method import.meta.glob
- * @link 参考：https://cn.vitejs.dev/guide/features.html#json
- */
-const layouModules: any = import.meta.glob('../layout/routerView/*.{vue,tsx}');
-const viewsModules: any = import.meta.glob('../views/**/*.{vue,tsx}');
-const dynamicViewsModules: Record<string, Function> = Object.assign({}, { ...layouModules }, { ...viewsModules });
-
-/**
- * 后端控制路由：初始化方法，防止刷新时路由丢失
- * @method NextLoading 界面 loading 动画开始执行
- * @method useUserInfo().setUserInfos() 触发初始化用户信息 pinia
- * @method useRequestOldRoutes().setRequestOldRoutes() 存储接口原始路由（未处理component），根据需求选择使用
- * @method setAddRoute 添加动态路由
- * @method setFilterMenuAndCacheTagsViewRoutes 设置路由到 pinia 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();
-	// 无登录权限时，添加判断
-	// https://gitee.com/lyt-top/vue-next-admin/issues/I64HVO
-	if (res.data.length <= 0) return Promise.resolve(true);
-	// 存储接口原始路由（未处理component），根据需求选择使用
-	useRequestOldRoutes().setRequestOldRoutes(JSON.parse(JSON.stringify(res.data)));
-	// 处理路由（component），替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
-	dynamicRoutes[0].children = await backEndComponent(res.data);
-	// 添加动态路由
-	await setAddRoute();
-	// 设置路由到 pinia routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
-	setFilterMenuAndCacheTagsViewRoutes();
-}
-
-/**
- * 设置路由到 pinia routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
- * @description 用于左侧菜单、横向菜单的显示
- * @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
- */
-export async 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));
-	// notFoundAndNoPower 防止 404、401 不在 layout 布局中，不设置的话，404、401 界面将全屏显示
-	// 关联问题 No match found for location with path 'xxx'
-	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.getAdminMenu();
-	// 其它用户 test
-	else return menuApi.getTestMenu();
-}
-
-/**
- * 重新请求后端路由菜单接口
- * @description 用于菜单管理界面刷新菜单（未进行测试）
- * @description 路径：/src/views/system/menu/component/addMenu.vue
- */
-export async function setBackEndControlRefreshRoutes() {
-	await 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

@@ -1,153 +0,0 @@
-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 设置递归过滤有权限的路由到 pinia 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();
-	// 无登录权限时，添加判断
-	// https://gitee.com/lyt-top/vue-next-admin/issues/I64HVO
-	if (useUserInfo().userInfos.roles.length <= 0) return Promise.resolve(true);
-	// 添加动态路由
-	await setAddRoute();
-	// 设置递归过滤有权限的路由到 pinia routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
-	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));
-	// notFoundAndNoPower 防止 404、401 不在 layout 布局中，不设置的话，404、401 界面将全屏显示
-	// 关联问题 No match found for location with path 'xxx'
-	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);
-}
-
-/**
- * 设置递归过滤有权限的路由到 pinia 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

@@ -0,0 +1,275 @@
+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

@@ -1,137 +0,0 @@
-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, notFoundAndNoPower } 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;
-
-/**
- * 创建一个可以被 Vue 应用程序使用的路由实例
- * @method createRouter(options: RouterOptions): Router
- * @link 参考：https://next.router.vuejs.org/zh/api/#createrouter
- */
-export const router = createRouter({
-	history: createWebHashHistory(),
-	/**
-	 * 说明：
-	 * 1、notFoundAndNoPower 默认添加 404、401 界面，防止一直提示 No match found for location with path 'xxx'
-	 * 2、backEnd.ts(后端控制路由)、frontEnd.ts(前端控制路由) 中也需要加 notFoundAndNoPower 404、401 界面。
-	 *    防止 404、401 不在 layout 布局中，不设置的话，404、401 界面将全屏显示
-	 */
-	routes: [...notFoundAndNoPower, ...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();
-					// 解决刷新时，一直跳 404 页面问题，关联问题 No match found for location with path 'xxx'
-					// to.query 防止页面刷新时，普通路由带参数时，参数丢失。动态路由（xxx/:id/:name"）isDynamic 无需处理
-					next({ path: to.path, query: to.query });
-				} else {
-					// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
-					await initFrontEndControlRoutes();
-					next({ path: to.path, query: to.query });
-				}
-			} else {
-				next();
-			}
-		}
-	}
-});
-
-// 路由加载后
-router.afterEach(() => {
-	NProgress.done();
-});
-
-// 导出路由
-export default router;

src/store/index.js

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,122 @@
+/**
+ * 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;

src/store/modules/userInfos.js

@@ -0,0 +1,26 @@
+import { Session } from '@/utils/storage.js';
+
+const userInfosModule = {
+	namespaced: true,
+	state: {
+		userInfos: {},
+	},
+	mutations: {
+		// 设置用户信息
+		getUserInfos(state, data) {
+			state.userInfos = data;
+		},
+	},
+	actions: {
+		// 设置用户信息
+		async setUserInfos({ commit }, data) {
+			if (data) {
+				commit('getUserInfos', data);
+			} else {
+				if (Session.get('userInfo')) commit('getUserInfos', Session.get('userInfo'));
+			}
+		},
+	},
+};
+
+export default userInfosModule;

src/stores/index.ts

@@ -1,8 +0,0 @@
-// https://pinia.vuejs.org/
-import { createPinia } from 'pinia';
-
-// 创建
-const pinia = createPinia();
-
-// 导出
-export default pinia;

src/stores/keepAliveNames.ts

@@ -1,35 +0,0 @@
-import { defineStore } from 'pinia';
-
-/**
- * 路由缓存列表
- * @methods setCacheKeepAlive 设置要缓存的路由 names（开启 Tagsview）
- * @methods addCachedView 添加要缓存的路由 names（关闭 Tagsview）
- * @methods delCachedView 删除要缓存的路由 names（关闭 Tagsview）
- * @methods delOthersCachedViews 右键菜单`关闭其它`，删除要缓存的路由 names（关闭 Tagsview）
- * @methods delAllCachedViews 右键菜单`全部关闭`，删除要缓存的路由 names（关闭 Tagsview）
- */
-export const useKeepALiveNames = defineStore('keepALiveNames', {
-	state: (): KeepAliveNamesState => ({
-		keepAliveNames: [],
-		cachedViews: [],
-	}),
-	actions: {
-		async setCacheKeepAlive(data: Array<string>) {
-			this.keepAliveNames = data;
-		},
-		async addCachedView(view: any) {
-			if (view.meta.isKeepAlive) this.cachedViews?.push(view.name);
-		},
-		async delCachedView(view: any) {
-			const index = this.cachedViews.indexOf(view.name);
-			index > -1 && this.cachedViews.splice(index, 1);
-		},
-		async delOthersCachedViews(view: any) {
-			if (view.meta.isKeepAlive) this.cachedViews = [view.name];
-			else this.cachedViews = [];
-		},
-		async delAllCachedViews() {
-			this.cachedViews = [];
-		},
-	},
-});

src/stores/requestOldRoutes.ts

@@ -1,16 +0,0 @@
-import { defineStore } from 'pinia';
-
-/**
- * 后端返回原始路由(未处理时)
- * @methods setCacheKeepAlive 设置接口原始路由数据
- */
-export const useRequestOldRoutes = defineStore('requestOldRoutes', {
-	state: (): RequestOldRoutesState => ({
-		requestOldRoutes: [],
-	}),
-	actions: {
-		async setRequestOldRoutes(routes: Array<string>) {
-			this.requestOldRoutes = routes;
-		},
-	},
-});