'admin-21.12.12:更新修复查看CHANGELOG.md文件'

Merge pull request !15 from Rehmet/master

.env

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

.env.development

@@ -2,4 +2,4 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://localhost:10000/'
+VITE_API_URL = 'http://localhost:8888/'

.env.production

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

.eslintrc.js

@@ -11,7 +11,7 @@ module.exports = {
 		parser: '@typescript-eslint/parser',
 		sourceType: 'module',
 	},
-	extends: ['plugin:vue/essential'],
+	extends: ['plugin:vue/vue3-essential', 'plugin:vue/essential', 'eslint:recommended'],
 	plugins: ['vue', '@typescript-eslint'],
 	rules: {
 		// http://eslint.cn/docs/rules/
@@ -42,6 +42,13 @@ module.exports = {
 		'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',
@@ -50,5 +57,7 @@ module.exports = {
 		'no-multiple-template-root': 'off',
 		'no-unused-vars': 'error',
 		'no-v-model-argument': 'off',
+		'no-case-declarations': 'off',
+		'no-console': 'error',
 	},
 };

.gitignore

@@ -1,6 +1,23 @@
-node_modules
 .DS_Store
-dist
-dist-ssr
-*.local
-.vscode
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

CHANGELOG.md

@@ -0,0 +1,250 @@
+# <a href="https://gitee.com/lyt-top/vue-next-admin" target="_blank">vue-next-admin 更新日志</a>
+
+🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）
+
+## 1.2.1
+
+`2021.12.12`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 cropper 裁剪时卡顿问题 [#I4M2VQ](https://gitee.com/lyt-top/vue-next-admin/issues/I4M2VQ)
+- 🎯 优化 Wangeditor 富文本编辑器的问题 [#I4LPC1](https://gitee.com/lyt-top/vue-next-admin/issues/I4LPC1)、[#I4LM7I](https://gitee.com/lyt-top/vue-next-admin/issues/I4LM7I)
+- 🐞 修复 浏览器标题问题
+- 🐞 修复 element plus svg 图标引入
+- 🐞 修复 工作流不可以拖线连接问题
+
+## 1.2.0
+
+`2021.11.28`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 深色模式
+- 🎯 优化 `/@/utils` 文件夹，合并删除单一内容
+- 🎯 优化 系统设置：菜单管理（新增、修改）、角色管理（新增菜单权限）、用户管理、部门管理、字典管理
+- 🎯 优化 登录界面逻辑、权限管理逻辑
+- 🎯 优化 同步 [vue-next-admin-images](https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu) 后端控制菜单模拟数据
+- 🎉 新增 适配 Font Icon 向 SVG Icon 迁移（改动大，"element-plus": "^1.2.0-beta.4" 谨慎更新）
+- 🐞 修复 热更新问题，感谢@甜蜜蜜
+- 🐞 修复 页面/element 字体图标演示
+- 🐞 修复 功能/图标选择器演示，新增高级功能 [issues #I4GJXQ](https://gitee.com/lyt-top/vue-next-admin/issues/I4GJXQ)
+
+## 1.1.2
+
+`2021.10.17`
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 开启全屏时，刷新界面被还原成未全屏的状态
+- 🎯 优化 tagsView 右键菜单关闭逻辑
+- 🎯 优化 wangeditor 富文本编辑器（增加双向绑定）
+- 🎉 新增 工作流（暂不开源）
+- 🎉 新增 基础版 ts（不带国际化），切换 `vue-next-admin-template` 分支
+
+## 1.1.1
+
+`2021.09.25`
+
+- 🌟 更新 依赖更新最新版本（`"element-plus": "^1.1.0-beta.13"` 版本运行错误，`^1.1.0-beta.16`修复横向菜单卡死问题）
+- 🐞 修复 Dialog 弹窗位置错误、Drawer 抽屉内边距、el-menu 菜单收起时背景色问题
+- 🎯 优化 锁屏界面自动锁屏(s/秒)必须设置至少 1 秒
+- 🎉 新增 分栏布局，鼠标移入当前项时，显示当前项菜单内容
+- 🎉 新增 工作流（未完成）
+
+## 1.1.0
+
+`2021.09.10`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 小屏模式下登录页二维码遮挡标题问题
+- 🎉 新增 图片验证器
+- 🎉 新增 动态复杂表单
+- 🎉 新增 工作流（未完成）
+- 🎉 新增 深色主题(伪深色，样式变动大，谨慎更新)
+
+## 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`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 图标选择器设置宽度、v-model 等问题
+- 🎯 优化 滚动通知栏在手机上的体验
+- 🎯 优化 系统管理/新增菜单（编辑菜单），使用 `图标选择器` 进行模拟
+- 🎯 优化 字体图标(自动载入) 逻辑
+- 🐞 修复 screenfull 全屏时，按键盘 esc 键图标不改变问题，感谢群友@伯牙已遇钟子期
+
+## 1.0.8
+
+`2021.06.29`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 表单中英文切换演示
+- 🎯 优化 登录页查看密码 icon 图标
+- 🎯 优化 图标选择器
+- 🎯 优化 拖动指令
+- 🐞 修复 form 表单在页面小于 576px 时的排版问题
+
+## 1.0.7
+
+`2021.06.24`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 拖动指令及其演示界面
+- 🎯 优化 锁屏界面，解锁提示
+- 🎯 优化 登录页在手机上显示的效果
+
+## 1.0.6
+
+`2021.06.23`
+
+- 🎯 优化 去掉内嵌 iframe 内边距（padding）
+- 🎯 优化 城市多级联动组件
+- 🎯 优化 Tree 树形控件改成表格组件
+- 🐞 修复 Cascader 级联选择器高度问题
+
+## 1.0.5
+
+`2021.06.22`
+
+- 🌟 更新 vite 降级为@vite2.3.7，降级方法 `cnpm install vite@2.3.7`，防止 element plus 字体图标消失
+- 🐞 修复 开启后端控制路由（isRequestRoutes = true）时，内嵌 iframe、外链不可使用的问题
+
+## 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 小学生-第五君
+- 🎯 优化 类型定义提高编码体验，修复不能将类型“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、@芭芭拉
+- 🐞 修复 经典布局点击 `tagsView` 左侧菜单数据不变问题

README.md

@@ -10,44 +10,46 @@
 		<a href="https://www.tslang.cn/" target="_blank">
 	        <img src="https://img.shields.io/badge/typescript-%3E4.0.0-blue" alt="typescript">
 	    </a>
-		<a href="https://gitee.com/lyt-top/vue-next-admin/blob/master/LICENSE" target="_blank">
-		    <img src="https://img.shields.io/badge/vite-%3E2.0.0-yellow" alt="license">
-		</a>
 		<a href="https://vitejs.dev/" target="_blank">
-		    <img src="https://img.shields.io/badge/license-MIT-success" alt="vite">
+		    <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">
+		    <img src="https://img.shields.io/badge/license-MIT-success" alt="license">
 		</a>
 	</p>
 	<p>&nbsp;</p>
 </div>
 
-#### 介绍
+#### 🌈 介绍
 
 基于 vue3.x + CompositionAPI + typescript + vite + element plus + vue-router-next + next.vuex，适配手机、平板、pc 的后台开源免费模板，希望减少工作量，帮助大家实现快速开发。
 
-#### 线上预览
+#### ⛱️ 线上预览
 
-###### vue3.x 版本
+- vue3.x 版本预览（vue-next-admin）<a href="https://lyt-top.gitee.io/vue-next-admin-preview/#/login" target="_blank">https://lyt-top.gitee.io/vue-next-admin-preview/#/login</a>
+- vue2.x 版本预览（vue-prev-admin）<a href="https://lyt-top.gitee.io/vue-prev-admin-preview/#/login" target="_blank">https://lyt-top.gitee.io/vue-prev-admin-preview/#/login</a>
 
-- vue-next-admin 版本预览 <a href="https://lyt-top.gitee.io/vue-next-admin-preview/#/login" target="_blank">https://lyt-top.gitee.io/vue-next-admin-preview/#/login</a>
-
-###### vue2.x 版本
-
-- pro 版本预览 <a href="http://lyt-top.gitee.io/vue-admin-wonderful-preview" target="_blank">http://lyt-top.gitee.io/vue-admin-wonderful-preview</a>
-- fashion 版本预览 <a href="http://lyt-top.gitee.io/vue-admin-wonderful-fashion-preview" target="_blank">http://lyt-top.gitee.io/vue-admin-wonderful-fashion-preview</a>
-- classic 版本预览 <a href="http://lyt-top.gitee.io/vue-admin-wonderful-classic-preview" target="_blank">http://lyt-top.gitee.io/vue-admin-wonderful-classic-preview</a>
-- elegant 版本预览 <a href="http://lyt-top.gitee.io/vue-admin-wonderful-elegant-preview" target="_blank">http://lyt-top.gitee.io/vue-admin-wonderful-elegant-preview</a>
-- strange 版本预览 <a href="http://lyt-top.gitee.io/vue-admin-wonderful-strange-preview" target="_blank">http://lyt-top.gitee.io/vue-admin-wonderful-strange-preview</a>
-
-#### 代码仓库
+#### 💒 代码仓库
 
 - vue3.x 版本 <a href="https://gitee.com/lyt-top/vue-next-admin" target="_blank">https://gitee.com/lyt-top/vue-next-admin</a>
-- vue2.x 版本 <a href="https://gitee.com/lyt-top/vue-admin-wonderful" target="_blank">https://gitee.com/lyt-top/vue-admin-wonderful</a>
+- vue2.x 版本 <a href="https://gitee.com/lyt-top/vue-next-admin/tree/vue-prev-admin" target="_blank">https://gitee.com/lyt-top/vue-next-admin/tree/vue-prev-admin</a>
 
-#### 安装 cnpm
+#### 🚧 安装 cnpm、yarn
 
 - 复制代码(桌面 cmd 运行) `npm install -g cnpm --registry=https://registry.npm.taobao.org`
+- 复制代码(桌面 cmd 运行) `npm install -g yarn`
 
-#### 使用说明(vue3.x 版本)
+#### 🏭 环境支持
+
+| Edge                                                                     | last 2 versions                                                                   | last 2 versions                                                                | last 2 versions                                                                |
+| ------------------------------------------------------------------------ | --------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------ |
+| ![Edge](https://cdn.jsdelivr.net/npm/@browser-logos/edge/edge_32x32.png) | ![Firefox](https://cdn.jsdelivr.net/npm/@browser-logos/firefox/firefox_32x32.png) | ![Chrome](https://cdn.jsdelivr.net/npm/@browser-logos/chrome/chrome_32x32.png) | ![Safari](https://cdn.jsdelivr.net/npm/@browser-logos/safari/safari_32x32.png) |
+
+> 由于 Vue3 不再支持 IE11，故而 ElementPlus 也不支持 IE11 及之前版本。
+
+#### ⚡ 使用说明
+
+建议使用 cnpm，因为 yarn 有时会报错。<a href="http://nodejs.cn/" target="_blank">node 版本 > 12xx.xx.x</a>
 
 ```bash
 # 克隆项目
@@ -66,43 +68,39 @@ cnpm run dev
 cnpm run build
 ```
 
-#### 使用说明(vue2.x 版本)
+#### 🍉 git 命令
 
-```bash
-# 克隆项目
-git clone https://gitee.com/lyt-top/vue-admin-wonderful.git
+- 在本地新建一个分支：`git branch newBranch`
+- 切换到你的新分支：`git checkout newBranch`
+- 将新分支发布在 github、gitee 上：`git push origin newBranch`
+- 在本地删除一个分支：`git branch -d newBranch`
+- 在 github 远程端删除一个分支：`git push origin :newBranch (分支名前的冒号代表删除)`
+- 注意删除远程分支后，如果有对应的本地分支，本地分支并不会同步删除！
 
-# 进入项目
-cd vue-admin-wonderful
+#### 💯 学习交流加 QQ 群
 
-# 安装依赖
-cnpm install
+- 若加群了没同意（一般不会超过一天），那就是群满了，请换一个群试试
+- 查看开发文档、<a href="https://lyt-top.gitee.io/vue-next-admin-preview/#/login" target="_blank">vue-next-admin</a> 开发文档正在编写中...
+- 群号码：
+  1 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">665452019</a>
+  2 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=zVfy3gNy7pNWVK3kMduDzwU369PZg2fw&jump_from=webapi">766356862</a>
 
-# 运行项目
-cnpm run serve
+  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">
+  	<img src="https://gitee.com/lyt-top/vue-next-admin-images/raw/master/user/qq1.png" width="220" height="220" alt="vue-next-admin 讨论群" title="vue-next-admin 讨论群1"/>
+  </a>
+  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=zVfy3gNy7pNWVK3kMduDzwU369PZg2fw&jump_from=webapi">
+  	<img src="https://gitee.com/lyt-top/vue-next-admin-images/raw/master/user/qq2.png" width="220" height="220" alt="vue-next-admin 讨论群" title="vue-next-admin 讨论群2"/>
+  </a>
 
-# 打包发布
-cnpm run build
-```
-
-#### 学习交流加 QQ 群
-
-- 加群下载基础模板、查看开发文档、<a href="https://lyt-top.gitee.io/vue-next-admin-preview/#/login" target="_blank">vue-next-admin</a> 开发文档正在编写中...
-- 群号码：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">665452019</a>
-
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">
-<img src="https://gitee.com/lyt-top/vue-next-admin-images/raw/master/user/qqs.png" width="220" alt="vue-next-admin 讨论群" title="vue-next-admin 讨论群"/></a>
-
-#### 鸣谢列表
+#### ❤️ 鸣谢列表
 
 - <a href="https://github.com/vuejs/vue" target="_blank">vue</a>
 - <a href="https://github.com/vuejs/vue-next" target="_blank">vue-next</a>
 - <a href="https://github.com/ElemeFE/element" target="_blank">element-ui</a>
 - <a href="https://github.com/element-plus/element-plus" target="_blank">element-plus</a>
-- <a href="https://github.com/vuejs/vue-router-next" target="_blank">vue-router-nex</a>
+- <a href="https://github.com/vuejs/vue-router-next" target="_blank">vue-router-next</a>
 - <a href="https://github.com/vuejs/vuex" target="_blank">vuex</a>
 - <a href="https://github.com/apache/echarts" target="_blank">echarts</a>
-- <a href="https://github.com/PanJiaChen/vue-element-admin" target="_blank">vue-element-admin</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>
@@ -115,21 +113,23 @@ cnpm run build
 - <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/antvis/g6" target="_blank">@antv/g6</a>
 - <a href="https://github.com/davidshimjs/qrcodejs" target="_blank">qrcodejs</a>
 - <a href="https://github.com/crabbly/Print.js" target="_blank">print-js</a>
 - <a href="https://github.com/likaia/screen-shot" target="_blank">vue-web-screen-shot</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/yimijianfang/vue-drag-verify" target="_blank">vue-drag-verify</a>
+- <a href="https://github.com/jsplumb/jsplumb" target="_blank">jsplumb</a>
 
-#### 特别感谢
+#### 💕 特别感谢
 
-特别感谢群里老哥的建议、指导与帮忙，谢谢！
+特别感谢老哥们的建议、指导与帮忙。谢谢！
 
 - <a href="https://gitee.com/click33/sa-plus" target="_blank">@省长</a>
 - <a href="https://gitee.com/jskz/Jskz-SpringCloud" target="_blank">@唐参
 - <a href="https://gitee.com/chuange" target="_blank">@川歌</a>
 
-#### 其他事项
+#### 💌 支持作者
 
-- <a href="https://lyt-top.gitee.io/vue-next-admin-preview/#/login" target="_blank">vue3.x vue-next-admin 版本</a>，基于 vue3.x + CompositionAPI + typescript + vite + element plus。
-- <a href="http://lyt-top.gitee.io/vue-admin-wonderful-preview/#/login" target="_blank">vue2.x vue-prev-admin 版本</a>，基于 vue2.x + element ui。
-- 喜欢用就帮忙 <a href="https://gitee.com/lyt-top/vue-next-admin" target="_blank">gitee star</a> 下，不喜欢用也没关系，出来打工、创业，大家都不容易，感谢大家的支持，谢谢！
+如果觉得框架不错，或者已经在使用了，希望你可以去 <a target="_blank" href="https://github.com/lyt-Top/vue-next-admin">Github</a> 或者
+<a target="_blank" href="https://gitee.com/lyt-top/vue-next-admin">Gitee</a> 帮我点个 ⭐ Star，这将是对我极大的鼓励与支持。

package.json

@@ -1,51 +1,83 @@
 {
 	"name": "vue-next-admin",
-	"version": "1.0.0",
+	"version": "1.2.0",
+	"description": "vue3 vite next admin template",
+	"author": "lyt_20201208",
+	"license": "MIT",
 	"scripts": {
-		"dev": "vite",
+		"dev": "vite --force",
 		"build": "vite build",
 		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
 	},
 	"dependencies": {
-		"@antv/g6": "^4.2.5",
-		"axios": "^0.21.1",
-		"clipboard": "^2.0.8",
-		"countup.js": "^2.0.7",
-		"cropperjs": "^1.5.11",
-		"echarts": "^5.0.2",
+		"@element-plus/icons-vue": "^0.2.4",
+		"axios": "^0.24.0",
+		"countup.js": "^2.0.8",
+		"cropperjs": "^1.5.12",
+		"echarts": "^5.2.2",
+		"echarts-gl": "^2.0.8",
 		"echarts-wordcloud": "^2.0.0",
-		"element-plus": "^1.0.2-beta.39",
-		"mitt": "^2.1.0",
+		"element-plus": "^1.2.0-beta.6",
+		"jsplumb": "^2.15.6",
+		"mitt": "^3.0.0",
 		"nprogress": "^0.2.0",
 		"print-js": "^1.6.0",
 		"qrcodejs2-fixes": "^0.0.2",
-		"screenfull": "^5.1.0",
-		"sortablejs": "^1.13.0",
-		"vue": "^3.0.5",
-		"vue-i18n": "^9.1.3",
-		"vue-router": "^4.0.2",
-		"vue-web-screen-shot": "^1.1.8",
-		"vuex": "^4.0.0-rc.2",
-		"wangeditor": "^4.6.14"
+		"screenfull": "^6.0.0",
+		"sortablejs": "^1.14.0",
+		"splitpanes": "^3.0.4",
+		"vue": "^3.2.20",
+		"vue-clipboard3": "^1.0.1",
+		"vue-grid-layout": "^3.0.0-beta1",
+		"vue-i18n": "^9.1.9",
+		"vue-router": "^4.0.12",
+		"vue-web-screen-shot": "^1.3.2",
+		"vuex": "^4.0.2",
+		"wangeditor": "^4.7.10"
 	},
 	"devDependencies": {
 		"@types/axios": "^0.14.0",
 		"@types/clipboard": "^2.0.1",
-		"@types/node": "^14.14.37",
+		"@types/node": "^16.11.12",
 		"@types/nprogress": "^0.2.0",
-		"@types/sortablejs": "^1.10.6",
-		"@typescript-eslint/eslint-plugin": "^4.21.0",
-		"@typescript-eslint/parser": "^4.21.0",
-		"@vitejs/plugin-vue": "^1.2.1",
-		"@vue/compiler-sfc": "^3.0.11",
-		"dotenv": "^8.2.0",
-		"eslint": "^7.23.0",
-		"eslint-plugin-vue": "^7.8.0",
-		"prettier": "^2.2.1",
-		"sass": "^1.32.8",
-		"sass-loader": "^11.0.1",
-		"typescript": "^4.2.4",
-		"vite": "^2.1.5",
-		"vue-eslint-parser": "^7.6.0"
+		"@types/sortablejs": "^1.10.7",
+		"@typescript-eslint/eslint-plugin": "^5.6.0",
+		"@typescript-eslint/parser": "^5.6.0",
+		"@vitejs/plugin-vue": "^2.0.0",
+		"@vue/compiler-sfc": "^3.2.26",
+		"dotenv": "^10.0.0",
+		"eslint": "^8.4.1",
+		"eslint-plugin-vue": "^8.2.0",
+		"prettier": "^2.5.1",
+		"sass": "^1.45.0",
+		"sass-loader": "^12.4.0",
+		"typescript": "^4.5.3",
+		"vite": "^2.7.1",
+		"vue-eslint-parser": "^8.0.1"
+	},
+	"browserslist": [
+		"> 1%",
+		"last 2 versions",
+		"not dead"
+	],
+	"bugs": {
+		"url": "https://gitee.com/lyt-top/vue-next-admin/issues"
+	},
+	"engines": {
+		"node": ">=12.0.0",
+		"npm": ">= 6.0.0"
+	},
+	"keywords": [
+		"vue",
+		"vue3",
+		"vuejs/vue-next",
+		"element-ui",
+		"element-plus",
+		"vue-next-admin",
+		"next-admin"
+	],
+	"repository": {
+		"type": "git",
+		"url": "https://gitee.com/lyt-top/vue-next-admin.git"
 	}
 }

plugins.d.ts

@@ -0,0 +1 @@
+declare module 'vue-grid-layout';

shim.d.ts

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

src/App.vue

@@ -1,27 +1,33 @@
 <template>
-	<router-view v-show="getThemeConfig.lockScreenTime !== 0" />
-	<LockScreen v-if="getThemeConfig.isLockScreen" />
-	<Setings ref="setingsRef" v-show="getThemeConfig.lockScreenTime !== 0" />
+	<el-config-provider :locale="i18nLocale">
+		<router-view v-show="getThemeConfig.lockScreenTime !== 0" />
+		<LockScreen v-if="getThemeConfig.isLockScreen" />
+		<Setings ref="setingsRef" v-show="getThemeConfig.lockScreenTime !== 0" />
+		<CloseFull />
+	</el-config-provider>
 </template>
 
 <script lang="ts">
-import { computed, ref, getCurrentInstance, onBeforeMount, onMounted, onUnmounted, nextTick, defineComponent, watch } from 'vue';
+import { computed, ref, getCurrentInstance, onBeforeMount, onMounted, onUnmounted, nextTick, defineComponent, watch, reactive, toRefs } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { useStore } from '/@/store/index.ts';
-import { getLocal } from '/@/utils/storage.ts';
-import setIntroduction from '/@/utils/setIconfont.ts';
-import LockScreen from '/@/views/layout/lockScreen/index.vue';
-import Setings from '/@/views/layout/navBars/breadcrumb/setings.vue';
+import { useStore } from '/@/store/index';
+import other from '/@/utils/other';
+import { Local, Session } from '/@/utils/storage';
+import setIntroduction from '/@/utils/setIconfont';
+import LockScreen from '/@/layout/lockScreen/index.vue';
+import Setings from '/@/layout/navBars/breadcrumb/setings.vue';
+import CloseFull from '/@/layout/navBars/breadcrumb/closeFull.vue';
 export default defineComponent({
 	name: 'app',
-	components: { LockScreen, Setings },
+	components: { LockScreen, Setings, CloseFull },
 	setup() {
-		const { t } = useI18n();
 		const { proxy } = getCurrentInstance() as any;
 		const setingsRef = ref();
 		const route = useRoute();
 		const store = useStore();
+		const state = reactive({
+			i18nLocale: null,
+		});
 		// 获取布局配置信息
 		const getThemeConfig = computed(() => {
 			return store.state.themeConfig.themeConfig;
@@ -44,31 +50,37 @@ export default defineComponent({
 				proxy.mittBus.on('openSetingsDrawer', () => {
 					openSetingsDrawer();
 				});
+				// 设置 i18n，App.vue 中的 el-config-provider
+				proxy.mittBus.on('getI18nConfig', (locale: string) => {
+					state.i18nLocale = locale;
+				});
 				// 获取缓存中的布局配置
-				if (getLocal('themeConfig')) {
-					store.dispatch('themeConfig/setThemeConfig', getLocal('themeConfig'));
-					document.documentElement.style.cssText = getLocal('themeConfigStyle');
+				if (Local.get('themeConfig')) {
+					store.dispatch('themeConfig/setThemeConfig', Local.get('themeConfig'));
+					document.documentElement.style.cssText = Local.get('themeConfigStyle');
+				}
+				// 获取缓存中的全屏配置
+				if (Session.get('isTagsViewCurrenFull')) {
+					store.dispatch('tagsViewRoutes/setCurrenFullscreen', Session.get('isTagsViewCurrenFull'));
 				}
 			});
 		});
-		// 页面销毁时，关闭监听布局配置
+		// 页面销毁时，关闭监听布局配置/i18n监听
 		onUnmounted(() => {
 			proxy.mittBus.off('openSetingsDrawer', () => {});
+			proxy.mittBus.off('getI18nConfig', () => {});
 		});
 		// 监听路由的变化，设置网站标题
 		watch(
 			() => route.path,
 			() => {
-				nextTick(() => {
-					let webTitle = '';
-					route.path === '/login' ? (webTitle = route.meta.title) : (webTitle = t(route.meta.title));
-					document.title = `${webTitle} - ${getThemeConfig.value.globalTitle}` || getThemeConfig.value.globalTitle;
-				});
+				other.useTitle();
 			}
 		);
 		return {
 			setingsRef,
 			getThemeConfig,
+			...toRefs(state),
 		};
 	},
 });

src/api/login/index.ts

@@ -1,6 +1,10 @@
-import request from '/@/utils/request.ts';
+import request from '/@/utils/request';
 
-// 用户登录
+/**
+ * 用户登录
+ * @param params 要传的参数值
+ * @returns 返回接口数据
+ */
 export function signIn(params: object) {
 	return request({
 		url: '/user/signIn',
@@ -9,7 +13,11 @@ export function signIn(params: object) {
 	});
 }
 
-// 用户退出登录
+/**
+ * 用户退出登录
+ * @param params 要传的参数值
+ * @returns 返回接口数据
+ */
 export function signOut(params: object) {
 	return request({
 		url: '/user/signOut',

src/api/menu/index.ts

@@ -1,10 +1,16 @@
-import request from '/@/utils/request.ts';
+import request from '/@/utils/request';
 
 /**
  * 后端控制菜单模拟json，路径在 https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu
  * 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
  */
-// 获取后端动态路由菜单(admin)
+
+/**
+ * 获取后端动态路由菜单(admin)
+ * @link 参考：https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu
+ * @param params 要传的参数值，非必传
+ * @returns 返回接口数据
+ */
 export function getMenuAdmin(params?: object) {
 	return request({
 		url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/adminMenu.json',
@@ -13,7 +19,12 @@ export function getMenuAdmin(params?: object) {
 	});
 }
 
-// 获取后端动态路由菜单(test)
+/**
+ * 获取后端动态路由菜单(test)
+ * @link 参考：https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu
+ * @param params 要传的参数值，非必传
+ * @returns 返回接口数据
+ */
 export function getMenuTest(params?: object) {
 	return request({
 		url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/testMenu.json',

src/components/auth/auth.vue

@@ -1,12 +1,10 @@
 <template>
-	<div v-if="getUserAuthBtnList">
-		<slot />
-	</div>
+	<slot v-if="getUserAuthBtnList" />
 </template>
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
+import { useStore } from '/@/store/index';
 export default {
 	name: 'auth',
 	props: {

src/components/auth/authAll.vue

@@ -1,13 +1,11 @@
 <template>
-	<div v-if="getUserAuthBtnList">
-		<slot />
-	</div>
+	<slot v-if="getUserAuthBtnList" />
 </template>
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
-import { judementSameArr } from '/@/utils/arrayOperation.ts';
+import { useStore } from '/@/store/index';
+import { judementSameArr } from '/@/utils/arrayOperation';
 export default {
 	name: 'authAll',
 	props: {

src/components/auth/auths.vue

@@ -1,12 +1,10 @@
 <template>
-	<div v-if="getUserAuthBtnList">
-		<slot />
-	</div>
+	<slot v-if="getUserAuthBtnList" />
 </template>
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
+import { useStore } from '/@/store/index';
 export default {
 	name: 'auths',
 	props: {

src/components/cropper/index.vue

@@ -42,6 +42,7 @@ export default {
 			isShowDialog: false,
 			cropperImg: '',
 			cropperImgBase64: '',
+			cropper: null,
 		});
 		// 打开弹窗
 		const openDialog = (imgs: any) => {
@@ -59,12 +60,14 @@ export default {
 		const onCancel = () => {
 			closeDialog();
 		};
-		// 新增
-		const onSubmit = () => {};
+		// 更换
+		const onSubmit = () => {
+			// state.cropperImgBase64 = state.cropper.getCroppedCanvas().toDataURL('image/jpeg');
+		};
 		// 初始化cropperjs图片裁剪
 		const initCropper = () => {
 			const letImg: any = document.querySelector('.cropper-warp-left-img');
-			const cropper = new Cropper(letImg, {
+			state.cropper = new Cropper(letImg, {
 				viewMode: 1,
 				dragMode: 'none',
 				initialAspectRatio: 1,
@@ -74,7 +77,7 @@ export default {
 				autoCropArea: 0.6,
 				zoomOnWheel: false,
 				crop: () => {
-					state.cropperImgBase64 = cropper.getCroppedCanvas().toDataURL('image/jpeg');
+					state.cropperImgBase64 = state.cropper.getCroppedCanvas().toDataURL('image/jpeg');
 				},
 			});
 		};
@@ -98,12 +101,12 @@ export default {
 		display: inline-block;
 		height: 350px;
 		flex: 1;
-		border: 1px solid #ebeef5;
-		background: #fff;
+		border: var(--el-border-base);
+		background: var(--color-whites);
 		overflow: hidden;
 		background-repeat: no-repeat;
 		cursor: move;
-		border-radius: 3px;
+		border-radius: var(--el-border-radius-base);
 		.cropper-warp-left-img {
 			width: 100%;
 			height: 100%;
@@ -124,7 +127,7 @@ export default {
 				.cropper-warp-right-value-img {
 					width: 100px;
 					height: 100px;
-					border-radius: 100%;
+					border-radius: var(--el-border-radius-circle);
 					margin: auto;
 				}
 				.cropper-size {
@@ -135,7 +138,7 @@ export default {
 			.cropper-warp-right-label {
 				text-align: center;
 				font-size: 12px;
-				color: #666666;
+				color: var(--el-text-color-primary);
 				height: 30px;
 				line-height: 30px;
 			}

src/components/dragVerify/dragVerify.vue

@@ -0,0 +1,296 @@
+<template>
+	<div
+		ref="dragVerify"
+		class="drag_verify"
+		:style="dragVerifyStyle"
+		@mousemove="dragMoving"
+		@mouseup="dragFinish"
+		@mouseleave="dragFinish"
+		@touchmove="dragMoving"
+		@touchend="dragFinish"
+	>
+		<div class="dv_progress_bar" :class="{ goFirst2: isOk }" ref="progressBar" :style="progressBarStyle"></div>
+		<div class="dv_text" :style="textStyle" ref="message">
+			<slot name="textBefore" v-if="$slots.textBefore"></slot>
+			{{ message }}
+			<slot name="textAfter" v-if="$slots.textAfter"></slot>
+		</div>
+
+		<div
+			class="dv_handler dv_handler_bg"
+			:class="{ goFirst: isOk }"
+			@mousedown="dragStart"
+			@touchstart="dragStart"
+			ref="handler"
+			:style="handlerStyle"
+		>
+			<i :class="handlerIcon"></i>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'dragVerify',
+	props: {
+		isPassing: {
+			type: Boolean,
+			default: false,
+		},
+		width: {
+			type: Number,
+			default: 250,
+		},
+		height: {
+			type: Number,
+			default: 40,
+		},
+		text: {
+			type: String,
+			default: 'swiping to the right side',
+		},
+		successText: {
+			type: String,
+			default: 'success',
+		},
+		background: {
+			type: String,
+			default: '#eee',
+		},
+		progressBarBg: {
+			type: String,
+			default: '#76c61d',
+		},
+		completedBg: {
+			type: String,
+			default: '#76c61d',
+		},
+		circle: {
+			type: Boolean,
+			default: false,
+		},
+		radius: {
+			type: String,
+			default: '4px',
+		},
+		handlerIcon: {
+			type: String,
+		},
+		successIcon: {
+			type: String,
+		},
+		handlerBg: {
+			type: String,
+			default: '#fff',
+		},
+		textSize: {
+			type: String,
+			default: '14px',
+		},
+		textColor: {
+			type: String,
+			default: '#333',
+		},
+	},
+	mounted: function () {
+		const dragEl = this.$refs.dragVerify;
+		dragEl.style.setProperty('--textColor', this.textColor);
+		dragEl.style.setProperty('--width', Math.floor(this.width / 2) + 'px');
+		dragEl.style.setProperty('--pwidth', -Math.floor(this.width / 2) + 'px');
+		console.log(this.$slots);
+	},
+	computed: {
+		handlerStyle: function () {
+			return {
+				width: this.height + 'px',
+				height: this.height + 'px',
+				background: this.handlerBg,
+			};
+		},
+		message: function () {
+			return this.isPassing ? this.successText : this.text;
+		},
+		dragVerifyStyle: function () {
+			return {
+				width: this.width + 'px',
+				height: this.height + 'px',
+				lineHeight: this.height + 'px',
+				background: this.background,
+				borderRadius: this.circle ? this.height / 2 + 'px' : this.radius,
+			};
+		},
+		progressBarStyle: function () {
+			return {
+				background: this.progressBarBg,
+				height: this.height + 'px',
+				borderRadius: this.circle ? this.height / 2 + 'px 0 0 ' + this.height / 2 + 'px' : this.radius,
+			};
+		},
+		textStyle: function () {
+			return {
+				height: this.height + 'px',
+				width: this.width + 'px',
+				fontSize: this.textSize,
+			};
+		},
+	},
+	data() {
+		return {
+			isMoving: false,
+			x: 0,
+			isOk: false,
+		};
+	},
+	methods: {
+		dragStart: function (e) {
+			if (!this.isPassing) {
+				this.isMoving = true;
+				this.x = e.pageX || e.touches[0].pageX;
+			}
+			this.$emit('handlerMove');
+		},
+		dragMoving: function (e) {
+			if (this.isMoving && !this.isPassing) {
+				var _x = (e.pageX || e.touches[0].pageX) - this.x;
+				var handler = this.$refs.handler;
+				if (_x > 0 && _x <= this.width - this.height) {
+					handler.style.left = _x + 'px';
+					this.$refs.progressBar.style.width = _x + this.height / 2 + 'px';
+				} else if (_x > this.width - this.height) {
+					handler.style.left = this.width - this.height + 'px';
+					this.$refs.progressBar.style.width = this.width - this.height / 2 + 'px';
+					this.passVerify();
+				}
+			}
+		},
+		dragFinish: function (e) {
+			if (this.isMoving && !this.isPassing) {
+				var _x = (e.pageX || e.changedTouches[0].pageX) - this.x;
+				if (_x < this.width - this.height) {
+					this.isOk = true;
+					var that = this;
+					setTimeout(function () {
+						that.$refs.handler.style.left = '0';
+						that.$refs.progressBar.style.width = '0';
+						that.isOk = false;
+					}, 500);
+					this.$emit('passfail');
+				} else {
+					var handler = this.$refs.handler;
+					handler.style.left = this.width - this.height + 'px';
+					this.$refs.progressBar.style.width = this.width - this.height / 2 + 'px';
+					this.passVerify();
+				}
+				this.isMoving = false;
+			}
+		},
+		passVerify: function () {
+			this.$emit('update:isPassing', true);
+			this.isMoving = false;
+			var handler = this.$refs.handler;
+			handler.children[0].className = this.successIcon;
+			this.$refs.progressBar.style.background = this.completedBg;
+			this.$refs.message.style['-webkit-text-fill-color'] = 'unset';
+			this.$refs.message.style.animation = 'slidetounlock2 3s infinite';
+			this.$refs.message.style.color = '#fff';
+			this.$emit('passcallback');
+		},
+		reset: function () {
+			const oriData = this.$options.data();
+			for (const key in oriData) {
+				if (Object.prototype.hasOwnProperty.call(oriData, key)) {
+					this[key] = oriData[key];
+				}
+			}
+			var handler = this.$refs.handler;
+			var message = this.$refs.message;
+			handler.style.left = '0';
+			this.$refs.progressBar.style.width = '0';
+			handler.children[0].className = this.handlerIcon;
+			message.style['-webkit-text-fill-color'] = 'transparent';
+			message.style.animation = 'slidetounlock 3s infinite';
+			message.style.color = this.background;
+		},
+	},
+};
+</script>
+<style scoped>
+.drag_verify {
+	position: relative;
+	background-color: #e8e8e8;
+	text-align: center;
+	overflow: hidden;
+}
+.drag_verify .dv_handler {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	cursor: move;
+}
+.drag_verify .dv_handler i {
+	color: #666;
+	padding-left: 0;
+	font-size: 16px;
+}
+.drag_verify .dv_handler .el-icon-circle-check {
+	color: #6c6;
+	margin-top: 9px;
+}
+.drag_verify .dv_progress_bar {
+	position: absolute;
+	height: 34px;
+	width: 0px;
+}
+.drag_verify .dv_text {
+	position: absolute;
+	top: 0px;
+	color: transparent;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+	user-select: none;
+	-o-user-select: none;
+	-ms-user-select: none;
+	background: -webkit-gradient(
+		linear,
+		left top,
+		right top,
+		color-stop(0, var(--textColor)),
+		color-stop(0.4, var(--textColor)),
+		color-stop(0.5, #fff),
+		color-stop(0.6, var(--textColor)),
+		color-stop(1, var(--textColor))
+	);
+	-webkit-background-clip: text;
+	-webkit-text-fill-color: transparent;
+	-webkit-text-size-adjust: none;
+	animation: slidetounlock 3s infinite;
+}
+.drag_verify .dv_text * {
+	-webkit-text-fill-color: var(--textColor);
+}
+.goFirst {
+	left: 0px !important;
+	transition: left 0.5s;
+}
+.goFirst2 {
+	width: 0px !important;
+	transition: width 0.5s;
+}
+</style>
+<style>
+@-webkit-keyframes slidetounlock {
+	0% {
+		background-position: var(--pwidth) 0;
+	}
+	100% {
+		background-position: var(--width) 0;
+	}
+}
+@-webkit-keyframes slidetounlock2 {
+	0% {
+		background-position: var(--pwidth) 0;
+	}
+	100% {
+		background-position: var(--pwidth) 0;
+	}
+}
+</style>

src/components/dragVerify/dragVerifyImg.vue

@@ -0,0 +1,453 @@
+<template>
+	<div class="drag-verify-container">
+		<div :style="dragVerifyImgStyle">
+			<img ref="checkImg" :src="imgsrc" @load="checkimgLoaded" style="width: 100%" alt="" />
+			<div class="move-bar" :class="{ goFirst: isOk, goKeep: isKeep }" :style="movebarStyle" ref="moveBar" v-show="showBar"></div>
+			<div class="clip-bar" :style="clipbarStyle" ref="clipBar"></div>
+			<div class="refresh" v-if="showRefresh && !isPassing">
+				<i :class="refreshIcon" @click="refreshimg"></i>
+			</div>
+			<div class="tips success" v-if="showTips && isPassing">{{ successTip }}</div>
+			<div class="tips danger" v-if="showTips && !isPassing && showErrorTip">{{ failTip }}</div>
+		</div>
+		<div
+			ref="dragVerify"
+			class="drag_verify"
+			:style="dragVerifyStyle"
+			@mousemove="dragMoving"
+			@mouseup="dragFinish"
+			@mouseleave="dragFinish"
+			@touchmove="dragMoving"
+			@touchend="dragFinish"
+		>
+			<div class="dv_progress_bar" :class="{ goFirst2: isOk }" ref="progressBar" :style="progressBarStyle">
+				{{ successMessage }}
+			</div>
+			<div class="dv_text" :style="textStyle" ref="message">
+				{{ message }}
+			</div>
+
+			<div
+				class="dv_handler dv_handler_bg"
+				:class="{ goFirst: isOk }"
+				@mousedown="dragStart"
+				@touchstart="dragStart"
+				ref="handler"
+				:style="handlerStyle"
+			>
+				<i :class="handlerIcon"></i>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'dragVerify',
+	props: {
+		isPassing: {
+			type: Boolean,
+			default: false,
+		},
+		width: {
+			type: Number,
+			default: 250,
+		},
+		height: {
+			type: Number,
+			default: 40,
+		},
+		text: {
+			type: String,
+			default: 'swiping to the right side',
+		},
+		successText: {
+			type: String,
+			default: 'success',
+		},
+		background: {
+			type: String,
+			default: '#eee',
+		},
+		progressBarBg: {
+			type: String,
+			default: '#76c61d',
+		},
+		completedBg: {
+			type: String,
+			default: '#76c61d',
+		},
+		circle: {
+			type: Boolean,
+			default: false,
+		},
+		radius: {
+			type: String,
+			default: '4px',
+		},
+		handlerIcon: {
+			type: String,
+		},
+		successIcon: {
+			type: String,
+		},
+		handlerBg: {
+			type: String,
+			default: '#fff',
+		},
+		textSize: {
+			type: String,
+			default: '14px',
+		},
+		textColor: {
+			type: String,
+			default: '#333',
+		},
+		imgsrc: {
+			type: String,
+		},
+		barWidth: {
+			type: Number,
+			default: 70,
+		},
+		barHeight: {
+			type: Number,
+			default: 40,
+		},
+		barRadius: {
+			type: Number,
+			default: 2,
+		},
+		showRefresh: {
+			type: Boolean,
+			default: false,
+		},
+		refreshIcon: {
+			type: String,
+		},
+		showTips: {
+			type: Boolean,
+			default: true,
+		},
+		successTip: {
+			type: String,
+			default: '验证通过，超过80%用户',
+		},
+		failTip: {
+			type: String,
+			default: '验证未通过，拖动滑块将悬浮图像正确合并',
+		},
+		diffWidth: {
+			type: Number,
+			default: 20,
+		},
+	},
+	mounted: function () {
+		const dragEl = this.$refs.dragVerify;
+		dragEl.style.setProperty('--textColor', this.textColor);
+		dragEl.style.setProperty('--width', Math.floor(this.width / 2) + 'px');
+		dragEl.style.setProperty('--pwidth', -Math.floor(this.width / 2) + 'px');
+	},
+	computed: {
+		handlerStyle: function () {
+			return {
+				width: this.height + 'px',
+				height: this.height + 'px',
+				background: this.handlerBg,
+			};
+		},
+		message: function () {
+			return this.isPassing ? '' : this.text;
+		},
+		successMessage: function () {
+			return this.isPassing ? this.successText : '';
+		},
+		dragVerifyStyle: function () {
+			console.log(this.width, 'width');
+			return {
+				width: this.width + 'px',
+				height: this.height + 'px',
+				lineHeight: this.height + 'px',
+				background: this.background,
+				borderRadius: this.circle ? this.height / 2 + 'px' : this.radius,
+			};
+		},
+		dragVerifyImgStyle: function () {
+			return {
+				width: this.width + 'px',
+				position: 'relative',
+				overflow: 'hidden',
+			};
+		},
+		progressBarStyle: function () {
+			return {
+				background: this.progressBarBg,
+				height: this.height + 'px',
+				borderRadius: this.circle ? this.height / 2 + 'px 0 0 ' + this.height / 2 + 'px' : this.radius,
+			};
+		},
+		textStyle: function () {
+			return {
+				height: this.height + 'px',
+				width: this.width + 'px',
+				fontSize: this.textSize,
+			};
+		},
+	},
+	data() {
+		return {
+			isMoving: false,
+			x: 0,
+			isOk: false,
+			isKeep: false,
+			movebarStyle: {},
+			clipbarStyle: {},
+			showBar: false,
+			clipBarx: 0,
+			showErrorTip: false,
+		};
+	},
+	methods: {
+		checkimgLoaded: function () {
+			//生成图片缺失位置
+			var barWidth = this.barWidth;
+			var barHeight = this.barHeight;
+			var imgHeight = this.$refs.checkImg.height;
+			var halfWidth = Math.floor(this.width / 2);
+			var refreshHeigth = 25;
+			var tipHeight = 20;
+			var x = halfWidth + Math.ceil(Math.random() * (halfWidth - barWidth));
+			var y = refreshHeigth + Math.floor(Math.random() * (imgHeight - barHeight - refreshHeigth - tipHeight));
+			this.clipbarStyle = {
+				width: barWidth + 'px',
+				height: barHeight + 'px',
+				top: y + 'px',
+				left: x + 'px',
+				'border-radius': this.barRadius + 'px',
+			};
+			this.clipBarx = x;
+			var imgsrc = this.imgsrc;
+			var width = this.width;
+			this.movebarStyle = {
+				background: `url(${imgsrc})`,
+				'background-position': `-${x}px -${y}px`,
+				'background-size': `${width}px`,
+				width: barWidth + 'px',
+				height: barHeight + 'px',
+				top: y + 'px',
+				'border-radius': this.barRadius + 'px',
+			};
+		},
+		dragStart: function (e) {
+			if (!this.isPassing) {
+				this.isMoving = true;
+				this.x = e.pageX || e.touches[0].pageX;
+			}
+			this.showBar = true;
+			this.showErrorTip = false;
+			this.$emit('handlerMove');
+		},
+		dragMoving: function (e) {
+			if (this.isMoving && !this.isPassing) {
+				var _x = (e.pageX || e.touches[0].pageX) - this.x;
+				var handler = this.$refs.handler;
+				handler.style.left = _x + 'px';
+				this.$refs.progressBar.style.width = _x + this.height / 2 + 'px';
+				this.$refs.moveBar.style.left = _x + 'px';
+			}
+		},
+		dragFinish: function (e) {
+			if (this.isMoving && !this.isPassing) {
+				var _x = (e.pageX || e.changedTouches[0].pageX) - this.x;
+				if (Math.abs(_x - this.clipBarx) > this.diffWidth) {
+					this.isOk = true;
+					var that = this;
+					setTimeout(function () {
+						that.$refs.handler.style.left = '0';
+						that.$refs.progressBar.style.width = '0';
+						that.$refs.moveBar.style.left = '0';
+						that.isOk = false;
+					}, 500);
+					this.showErrorTip = true;
+					this.$emit('passfail');
+				} else {
+					this.passVerify();
+				}
+				this.isMoving = false;
+			}
+		},
+		passVerify: function () {
+			this.$emit('update:isPassing', true);
+			this.isMoving = false;
+			var handler = this.$refs.handler;
+			handler.children[0].className = this.successIcon;
+			this.$refs.progressBar.style.background = this.completedBg;
+			this.$refs.message.style['-webkit-text-fill-color'] = 'unset';
+			this.$refs.message.style.animation = 'slidetounlock2 3s infinite';
+			this.$refs.progressBar.style.color = '#fff';
+			this.$refs.progressBar.style.fontSize = this.textSize;
+			this.isKeep = true;
+			setTimeout(() => {
+				this.$refs.moveBar.style.left = this.clipBarx + 'px';
+				setTimeout(() => {
+					this.isKeep = false;
+				}, 200);
+			}, 100);
+			this.$emit('passcallback');
+		},
+		reset: function () {
+			this.reImg();
+			this.checkimgLoaded();
+		},
+		reImg: function () {
+			this.$emit('update:isPassing', false);
+			const oriData = this.$options.data();
+			for (const key in oriData) {
+				if (Object.prototype.hasOwnProperty.call(oriData, key)) {
+					this[key] = oriData[key];
+				}
+			}
+			var handler = this.$refs.handler;
+			var message = this.$refs.message;
+			handler.style.left = '0';
+			this.$refs.progressBar.style.width = '0';
+			handler.children[0].className = this.handlerIcon;
+			message.style['-webkit-text-fill-color'] = 'transparent';
+			message.style.animation = 'slidetounlock 3s infinite';
+			message.style.color = this.background;
+		},
+		refreshimg: function () {
+			this.$emit('refresh');
+		},
+	},
+	watch: {
+		imgsrc: {
+			immediate: false,
+			handler: function () {
+				this.reImg();
+			},
+		},
+	},
+};
+</script>
+<style scoped>
+.drag_verify {
+	position: relative;
+	background-color: #e8e8e8;
+	text-align: center;
+	overflow: hidden;
+}
+.drag_verify .dv_handler {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	cursor: move;
+}
+.drag_verify .dv_handler i {
+	color: #666;
+	padding-left: 0;
+	font-size: 16px;
+}
+.drag_verify .dv_handler .el-icon-circle-check {
+	color: #6c6;
+	margin-top: 9px;
+}
+.drag_verify .dv_progress_bar {
+	position: absolute;
+	height: 34px;
+	width: 0px;
+}
+.drag_verify .dv_text {
+	position: absolute;
+	top: 0px;
+	color: transparent;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+	user-select: none;
+	-o-user-select: none;
+	-ms-user-select: none;
+	background: -webkit-gradient(
+		linear,
+		left top,
+		right top,
+		color-stop(0, var(--textColor)),
+		color-stop(0.4, var(--textColor)),
+		color-stop(0.5, #fff),
+		color-stop(0.6, var(--textColor)),
+		color-stop(1, var(--textColor))
+	);
+	-webkit-background-clip: text;
+	-webkit-text-fill-color: transparent;
+	-webkit-text-size-adjust: none;
+	animation: slidetounlock 3s infinite;
+}
+.drag_verify .dv_text * {
+	-webkit-text-fill-color: var(--textColor);
+}
+.goFirst {
+	left: 0px !important;
+	transition: left 0.5s;
+}
+.goKeep {
+	transition: left 0.2s;
+}
+.goFirst2 {
+	width: 0px !important;
+	transition: width 0.5s;
+}
+.drag-verify-container {
+	position: relative;
+	line-height: 0;
+}
+.move-bar {
+	position: absolute;
+	z-index: 100;
+}
+.clip-bar {
+	position: absolute;
+	background: rgba(255, 255, 255, 0.8);
+}
+.refresh {
+	position: absolute;
+	right: 5px;
+	top: 5px;
+	cursor: pointer;
+	font-size: 20px;
+	z-index: 200;
+}
+.tips {
+	position: absolute;
+	bottom: 0;
+	height: 20px;
+	line-height: 20px;
+	text-align: center;
+	width: 100%;
+	font-size: 12px;
+	z-index: 200;
+}
+.tips.success {
+	background: rgba(255, 255, 255, 0.6);
+	color: green;
+}
+.tips.danger {
+	background: rgba(0, 0, 0, 0.6);
+	color: yellow;
+}
+</style>
+<style>
+@-webkit-keyframes slidetounlock {
+	0% {
+		background-position: var(--pwidth) 0;
+	}
+	100% {
+		background-position: var(--width) 0;
+	}
+}
+@-webkit-keyframes slidetounlock2 {
+	0% {
+		background-position: var(--pwidth) 0;
+	}
+	100% {
+		background-position: var(--pwidth) 0;
+	}
+}
+</style>

src/components/dragVerify/dragVerifyImgChip.vue

@@ -0,0 +1,473 @@
+<template>
+	<div class="drag-verify-container">
+		<div :style="dragVerifyImgStyle">
+			<img ref="checkImg" crossOrigin="anonymous" :src="imgsrc" @load="checkimgLoaded" style="width: 100%" alt="" />
+			<canvas ref="maincanvas" class="main-canvas"></canvas>
+			<canvas ref="movecanvas" :class="{ goFirst: isOk, goKeep: isKeep }" class="move-canvas"></canvas>
+			<div class="refresh" v-if="showRefresh && !isPassing">
+				<i :class="refreshIcon" @click="refreshimg"></i>
+			</div>
+			<div class="tips success" v-if="showTips && isPassing">{{ successTip }}</div>
+			<div class="tips danger" v-if="showTips && !isPassing && showErrorTip">{{ failTip }}</div>
+		</div>
+		<div
+			ref="dragVerify"
+			class="drag_verify"
+			:style="dragVerifyStyle"
+			@mousemove="dragMoving"
+			@mouseup="dragFinish"
+			@mouseleave="dragFinish"
+			@touchmove="dragMoving"
+			@touchend="dragFinish"
+		>
+			<div class="dv_progress_bar" :class="{ goFirst2: isOk }" ref="progressBar" :style="progressBarStyle">
+				{{ successMessage }}
+			</div>
+			<div class="dv_text" :style="textStyle" ref="message">
+				{{ message }}
+			</div>
+
+			<div
+				class="dv_handler dv_handler_bg"
+				:class="{ goFirst: isOk }"
+				@mousedown="dragStart"
+				@touchstart="dragStart"
+				ref="handler"
+				:style="handlerStyle"
+			>
+				<i :class="handlerIcon"></i>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'dragVerifyImgChip',
+	props: {
+		isPassing: {
+			type: Boolean,
+			default: false,
+		},
+		width: {
+			type: Number,
+			default: 250,
+		},
+		height: {
+			type: Number,
+			default: 40,
+		},
+		text: {
+			type: String,
+			default: 'swiping to the right side',
+		},
+		successText: {
+			type: String,
+			default: 'success',
+		},
+		background: {
+			type: String,
+			default: '#eee',
+		},
+		progressBarBg: {
+			type: String,
+			default: '#76c61d',
+		},
+		completedBg: {
+			type: String,
+			default: '#76c61d',
+		},
+		circle: {
+			type: Boolean,
+			default: false,
+		},
+		radius: {
+			type: String,
+			default: '4px',
+		},
+		handlerIcon: {
+			type: String,
+		},
+		successIcon: {
+			type: String,
+		},
+		handlerBg: {
+			type: String,
+			default: '#fff',
+		},
+		textSize: {
+			type: String,
+			default: '14px',
+		},
+		textColor: {
+			type: String,
+			default: '#333',
+		},
+		imgsrc: {
+			type: String,
+		},
+		barWidth: {
+			type: Number,
+			default: 40,
+		},
+		barRadius: {
+			type: Number,
+			default: 8,
+		},
+		showRefresh: {
+			type: Boolean,
+			default: false,
+		},
+		refreshIcon: {
+			type: String,
+		},
+		showTips: {
+			type: Boolean,
+			default: true,
+		},
+		successTip: {
+			type: String,
+			default: '验证通过，超过80%用户',
+		},
+		failTip: {
+			type: String,
+			default: '验证未通过，拖动滑块将悬浮图像正确合并',
+		},
+		diffWidth: {
+			type: Number,
+			default: 20,
+		},
+	},
+	mounted: function () {
+		const dragEl = this.$refs.dragVerify;
+		dragEl.style.setProperty('--textColor', this.textColor);
+		dragEl.style.setProperty('--width', Math.floor(this.width / 2) + 'px');
+		dragEl.style.setProperty('--pwidth', -Math.floor(this.width / 2) + 'px');
+	},
+	computed: {
+		handlerStyle: function () {
+			return {
+				width: this.height + 'px',
+				height: this.height + 'px',
+				background: this.handlerBg,
+			};
+		},
+		message: function () {
+			return this.isPassing ? '' : this.text;
+		},
+		successMessage: function () {
+			return this.isPassing ? this.successText : '';
+		},
+		dragVerifyStyle: function () {
+			return {
+				width: this.width + 'px',
+				height: this.height + 'px',
+				lineHeight: this.height + 'px',
+				background: this.background,
+				borderRadius: this.circle ? this.height / 2 + 'px' : this.radius,
+			};
+		},
+		dragVerifyImgStyle: function () {
+			return {
+				width: this.width + 'px',
+				position: 'relative',
+				overflow: 'hidden',
+			};
+		},
+		progressBarStyle: function () {
+			return {
+				background: this.progressBarBg,
+				height: this.height + 'px',
+				borderRadius: this.circle ? this.height / 2 + 'px 0 0 ' + this.height / 2 + 'px' : this.radius,
+			};
+		},
+		textStyle: function () {
+			return {
+				height: this.height + 'px',
+				width: this.width + 'px',
+				fontSize: this.textSize,
+			};
+		},
+	},
+	data() {
+		return {
+			isMoving: false,
+			x: 0,
+			isOk: false,
+			isKeep: false,
+			clipBarx: 0,
+			showErrorTip: false,
+		};
+	},
+	methods: {
+		draw: function (ctx, x, y, operation) {
+			var l = this.barWidth;
+			var r = this.barRadius;
+			const PI = Math.PI;
+			ctx.beginPath();
+			ctx.moveTo(x, y);
+			ctx.arc(x + l / 2, y - r + 2, r, 0.72 * PI, 2.26 * PI);
+			ctx.lineTo(x + l, y);
+			ctx.arc(x + l + r - 2, y + l / 2, r, 1.21 * PI, 2.78 * PI);
+			ctx.lineTo(x + l, y + l);
+			ctx.lineTo(x, y + l);
+			ctx.arc(x + r - 2, y + l / 2, r + 0.4, 2.76 * PI, 1.24 * PI, true);
+			ctx.lineTo(x, y);
+			ctx.lineWidth = 2;
+			ctx.fillStyle = 'rgba(255, 255, 255, 0.8)';
+			ctx.strokeStyle = 'rgba(255, 255, 255, 0.8)';
+			ctx.stroke();
+			ctx[operation]();
+			ctx.globalCompositeOperation = 'destination-over';
+		},
+		checkimgLoaded: function () {
+			// 生成图片缺失位置
+			var barWidth = this.barWidth;
+			var imgHeight = this.$refs.checkImg.height;
+			var imgWidth = this.$refs.checkImg.width;
+			var halfWidth = Math.floor(this.width / 2);
+			var refreshHeigth = 25;
+			var tipHeight = 20;
+			var x = halfWidth + Math.ceil(Math.random() * (halfWidth - barWidth - this.barRadius - 5));
+			var y = refreshHeigth + Math.floor(Math.random() * (imgHeight - barWidth - refreshHeigth - tipHeight));
+			this.$refs.maincanvas.setAttribute('width', imgWidth);
+			this.$refs.maincanvas.setAttribute('height', imgHeight);
+			this.$refs.maincanvas.style.display = 'block';
+			var canvasCtx = this.$refs.maincanvas.getContext('2d');
+			this.draw(canvasCtx, x, y, 'fill');
+			this.clipBarx = x;
+			var moveCanvas = this.$refs.movecanvas;
+			moveCanvas.setAttribute('width', imgWidth);
+			moveCanvas.setAttribute('height', imgHeight);
+			this.$refs.movecanvas.style.display = 'block';
+			const L = barWidth + this.barRadius * 2 + 3; //实际宽度
+			var moveCtx = this.$refs.movecanvas.getContext('2d');
+			moveCtx.clearRect(0, 0, imgWidth, imgHeight);
+			this.draw(moveCtx, x, y, 'clip');
+			moveCtx.drawImage(this.$refs.checkImg, 0, 0, imgWidth, imgHeight);
+			var y = y - this.barRadius * 2 - 1;
+			const ImageData = moveCtx.getImageData(x, y, L, L);
+			moveCanvas.setAttribute('width', L);
+			moveCanvas.setAttribute('height', imgHeight);
+			moveCtx.putImageData(ImageData, 0, y);
+		},
+		dragStart: function (e) {
+			if (!this.isPassing) {
+				this.isMoving = true;
+				this.x = e.pageX || e.touches[0].pageX;
+			}
+			this.showBar = true;
+			this.showErrorTip = false;
+			this.$emit('handlerMove');
+		},
+		dragMoving: function (e) {
+			if (this.isMoving && !this.isPassing) {
+				var _x = (e.pageX || e.touches[0].pageX) - this.x;
+				var handler = this.$refs.handler;
+				handler.style.left = _x + 'px';
+				this.$refs.progressBar.style.width = _x + this.height / 2 + 'px';
+				this.$refs.movecanvas.style.left = _x + 'px';
+			}
+		},
+		dragFinish: function (e) {
+			if (this.isMoving && !this.isPassing) {
+				var _x = (e.pageX || e.changedTouches[0].pageX) - this.x;
+				if (Math.abs(_x - this.clipBarx) > this.diffWidth) {
+					this.isOk = true;
+					var that = this;
+					setTimeout(function () {
+						that.$refs.handler.style.left = '0';
+						that.$refs.progressBar.style.width = '0';
+						that.$refs.movecanvas.style.left = '0';
+						that.isOk = false;
+					}, 500);
+					this.$emit('passfail');
+					this.showErrorTip = true;
+				} else {
+					this.passVerify();
+				}
+				this.isMoving = false;
+			}
+		},
+		passVerify: function () {
+			this.$emit('update:isPassing', true);
+			this.isMoving = false;
+			var handler = this.$refs.handler;
+			handler.children[0].className = this.successIcon;
+			this.$refs.progressBar.style.background = this.completedBg;
+			this.$refs.message.style['-webkit-text-fill-color'] = 'unset';
+			this.$refs.message.style.animation = 'slidetounlock2 3s infinite';
+			this.$refs.progressBar.style.color = '#fff';
+			this.$refs.progressBar.style.fontSize = this.textSize;
+			this.isKeep = true;
+			setTimeout(() => {
+				this.$refs.movecanvas.style.left = this.clipBarx + 'px';
+				setTimeout(() => {
+					this.isKeep = false;
+					this.$refs.maincanvas.style.display = 'none';
+					this.$refs.movecanvas.style.display = 'none';
+				}, 200);
+			}, 100);
+			this.$emit('passcallback');
+		},
+		reset: function () {
+			this.reImg();
+			this.checkimgLoaded();
+		},
+		reImg: function () {
+			this.$emit('update:isPassing', false);
+			const oriData = this.$options.data();
+			for (const key in oriData) {
+				if (Object.prototype.hasOwnProperty.call(oriData, key)) {
+					this[key] = oriData[key];
+				}
+			}
+			var handler = this.$refs.handler;
+			var message = this.$refs.message;
+			handler.style.left = '0';
+			this.$refs.progressBar.style.width = '0';
+			handler.children[0].className = this.handlerIcon;
+			message.style['-webkit-text-fill-color'] = 'transparent';
+			message.style.animation = 'slidetounlock 3s infinite';
+			message.style.color = this.background;
+			this.$refs.movecanvas.style.left = '0px';
+		},
+		refreshimg: function () {
+			this.$emit('refresh');
+		},
+	},
+	watch: {
+		imgsrc: {
+			immediate: false,
+			handler: function () {
+				this.reImg();
+			},
+		},
+	},
+};
+</script>
+<style scoped>
+.drag_verify {
+	position: relative;
+	background-color: #e8e8e8;
+	text-align: center;
+	overflow: hidden;
+}
+.drag_verify .dv_handler {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	cursor: move;
+}
+.drag_verify .dv_handler i {
+	color: #666;
+	padding-left: 0;
+	font-size: 16px;
+}
+.drag_verify .dv_handler .el-icon-circle-check {
+	color: #6c6;
+	margin-top: 9px;
+}
+.drag_verify .dv_progress_bar {
+	position: absolute;
+	height: 34px;
+	width: 0px;
+}
+.drag_verify .dv_text {
+	position: absolute;
+	top: 0px;
+	color: transparent;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+	user-select: none;
+	-o-user-select: none;
+	-ms-user-select: none;
+	background: -webkit-gradient(
+		linear,
+		left top,
+		right top,
+		color-stop(0, var(--textColor)),
+		color-stop(0.4, var(--textColor)),
+		color-stop(0.5, #fff),
+		color-stop(0.6, var(--textColor)),
+		color-stop(1, var(--textColor))
+	);
+	-webkit-background-clip: text;
+	-webkit-text-fill-color: transparent;
+	-webkit-text-size-adjust: none;
+	animation: slidetounlock 3s infinite;
+}
+.drag_verify .dv_text * {
+	-webkit-text-fill-color: var(--textColor);
+}
+.goFirst {
+	left: 0px !important;
+	transition: left 0.5s;
+}
+.goKeep {
+	transition: left 0.2s;
+}
+.goFirst2 {
+	width: 0px !important;
+	transition: width 0.5s;
+}
+.drag-verify-container {
+	position: relative;
+	line-height: 0;
+}
+.refresh {
+	position: absolute;
+	right: 5px;
+	top: 5px;
+	cursor: pointer;
+	font-size: 20px;
+	z-index: 200;
+}
+.tips {
+	position: absolute;
+	bottom: 0;
+	height: 20px;
+	line-height: 20px;
+	text-align: center;
+	width: 100%;
+	font-size: 12px;
+	z-index: 200;
+}
+.tips.success {
+	background: rgba(255, 255, 255, 0.6);
+	color: green;
+}
+.tips.danger {
+	background: rgba(0, 0, 0, 0.6);
+	color: yellow;
+}
+.main-canvas {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+.move-canvas {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+</style>
+<style>
+@-webkit-keyframes slidetounlock {
+	0% {
+		background-position: var(--pwidth) 0;
+	}
+	100% {
+		background-position: var(--width) 0;
+	}
+}
+@-webkit-keyframes slidetounlock2 {
+	0% {
+		background-position: var(--pwidth) 0;
+	}
+	100% {
+		background-position: var(--pwidth) 0;
+	}
+}
+</style>

src/components/dragVerify/dragVerifyImgRotate.vue

@@ -0,0 +1,434 @@
+<template>
+	<div class="drag-verify-container">
+		<div :style="dragVerifyImgStyle">
+			<img ref="checkImg" :src="imgsrc" class="check-img" :class="{ goOrigin: isOk }" @load="checkimgLoaded" :style="imgStyle" alt="" />
+			<div class="tips success" v-if="showTips && isPassing">{{ successTip }}</div>
+			<div class="tips danger" v-if="showTips && !isPassing && showErrorTip">{{ failTip }}</div>
+		</div>
+		<div
+			ref="dragVerify"
+			class="drag_verify"
+			:style="dragVerifyStyle"
+			@mousemove="dragMoving"
+			@mouseup="dragFinish"
+			@mouseleave="dragFinish"
+			@touchmove="dragMoving"
+			@touchend="dragFinish"
+		>
+			<div class="dv_progress_bar" :class="{ goFirst2: isOk }" ref="progressBar" :style="progressBarStyle">
+				{{ successMessage }}
+			</div>
+			<div class="dv_text" :style="textStyle" ref="message">
+				{{ message }}
+			</div>
+
+			<div
+				class="dv_handler dv_handler_bg"
+				:class="{ goFirst: isOk }"
+				@mousedown="dragStart"
+				@touchstart="dragStart"
+				ref="handler"
+				:style="handlerStyle"
+			>
+				<i :class="handlerIcon"></i>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'dragVerify',
+	props: {
+		isPassing: {
+			type: Boolean,
+			default: false,
+		},
+		width: {
+			type: Number,
+			default: 250,
+		},
+		height: {
+			type: Number,
+			default: 40,
+		},
+		text: {
+			type: String,
+			default: 'swiping to the right side',
+		},
+		successText: {
+			type: String,
+			default: 'success',
+		},
+		background: {
+			type: String,
+			default: '#eee',
+		},
+		progressBarBg: {
+			type: String,
+			default: '#76c61d',
+		},
+		completedBg: {
+			type: String,
+			default: '#76c61d',
+		},
+		circle: {
+			type: Boolean,
+			default: false,
+		},
+		radius: {
+			type: String,
+			default: '4px',
+		},
+		handlerIcon: {
+			type: String,
+		},
+		successIcon: {
+			type: String,
+		},
+		handlerBg: {
+			type: String,
+			default: '#fff',
+		},
+		textSize: {
+			type: String,
+			default: '14px',
+		},
+		textColor: {
+			type: String,
+			default: '#333',
+		},
+		imgsrc: {
+			type: String,
+		},
+		showTips: {
+			type: Boolean,
+			default: true,
+		},
+		successTip: {
+			type: String,
+			default: '验证通过',
+		},
+		failTip: {
+			type: String,
+			default: '验证失败',
+		},
+		diffDegree: {
+			type: Number,
+			default: 10,
+		},
+		minDegree: {
+			type: Number,
+			default: 90,
+		},
+		maxDegree: {
+			type: Number,
+			default: 270,
+		},
+	},
+	mounted: function () {
+		const dragEl = this.$refs.dragVerify;
+		dragEl.style.setProperty('--textColor', this.textColor);
+		dragEl.style.setProperty('--width', Math.floor(this.width / 2) + 'px');
+		dragEl.style.setProperty('--pwidth', -Math.floor(this.width / 2) + 'px');
+	},
+	computed: {
+		handlerStyle: function () {
+			return {
+				width: this.height + 'px',
+				height: this.height + 'px',
+				background: this.handlerBg,
+			};
+		},
+		message: function () {
+			return this.isPassing ? '' : this.text;
+		},
+		successMessage: function () {
+			return this.isPassing ? this.successText : '';
+		},
+		dragVerifyStyle: function () {
+			return {
+				width: this.width + 'px',
+				height: this.height + 'px',
+				lineHeight: this.height + 'px',
+				background: this.background,
+				borderRadius: this.circle ? this.height / 2 + 'px' : this.radius,
+			};
+		},
+		dragVerifyImgStyle: function () {
+			return {
+				width: this.width + 'px',
+				height: this.width + 'px',
+				position: 'relative',
+				overflow: 'hidden',
+				'border-radius': '50%',
+			};
+		},
+		progressBarStyle: function () {
+			return {
+				background: this.progressBarBg,
+				height: this.height + 'px',
+				borderRadius: this.circle ? this.height / 2 + 'px 0 0 ' + this.height / 2 + 'px' : this.radius,
+			};
+		},
+		textStyle: function () {
+			return {
+				height: this.height + 'px',
+				width: this.width + 'px',
+				fontSize: this.textSize,
+			};
+		},
+		factor: function () {
+			//避免指定旋转角度时一直拖动到最右侧才验证通过
+			if (this.minDegree == this.maxDegree) {
+				return Math.floor(1 + Math.random() * 6) / 10 + 1;
+			}
+			return 1;
+		},
+	},
+	data() {
+		return {
+			isMoving: false,
+			x: 0,
+			isOk: false,
+			showBar: false,
+			showErrorTip: false,
+			ranRotate: 0,
+			cRotate: 0,
+			imgStyle: {},
+		};
+	},
+	methods: {
+		checkimgLoaded: function () {
+			//生成旋转角度
+			var minDegree = this.minDegree;
+			var maxDegree = this.maxDegree;
+			var ranRotate = Math.floor(minDegree + Math.random() * (maxDegree - minDegree)); //生成随机角度
+			this.ranRotate = ranRotate;
+			console.log('旋转' + ranRotate);
+			this.imgStyle = {
+				transform: `rotateZ(${ranRotate}deg)`,
+			};
+		},
+		dragStart: function (e) {
+			if (!this.isPassing) {
+				this.isMoving = true;
+				this.x = e.pageX || e.touches[0].pageX;
+			}
+			this.showBar = true;
+			this.showErrorTip = false;
+			this.$emit('handlerMove');
+		},
+		dragMoving: function (e) {
+			if (this.isMoving && !this.isPassing) {
+				var _x = (e.pageX || e.touches[0].pageX) - this.x;
+				console.log(_x, '_x');
+				var handler = this.$refs.handler;
+				handler.style.left = _x + 'px';
+				this.$refs.progressBar.style.width = _x + this.height / 2 + 'px';
+				var cRotate = Math.ceil((_x / (this.width - this.height)) * this.maxDegree * this.factor);
+				console.log(cRotate, 'cRotate');
+				this.cRotate = cRotate;
+				var rotate = this.ranRotate - cRotate;
+				this.imgStyle = {
+					transform: `rotateZ(${rotate}deg)`,
+				};
+			}
+		},
+		dragFinish: function (e) {
+			if (this.isMoving && !this.isPassing) {
+				if (Math.abs(this.ranRotate - this.cRotate) > this.diffDegree) {
+					this.isOk = true;
+					this.imgStyle = {
+						transform: `rotateZ(${this.ranRotate}deg)`,
+					};
+					var that = this;
+					setTimeout(function () {
+						that.$refs.handler.style.left = '0';
+						that.$refs.progressBar.style.width = '0';
+						that.isOk = false;
+					}, 500);
+					this.showErrorTip = true;
+					this.$emit('passfail');
+				} else {
+					this.passVerify();
+				}
+				this.isMoving = false;
+			}
+		},
+		passVerify: function () {
+			this.$emit('update:isPassing', true);
+			this.isMoving = false;
+			var handler = this.$refs.handler;
+			handler.children[0].className = this.successIcon;
+			this.$refs.progressBar.style.background = this.completedBg;
+			this.$refs.message.style['-webkit-text-fill-color'] = 'unset';
+			this.$refs.message.style.animation = 'slidetounlock2 3s infinite';
+			this.$refs.progressBar.style.color = '#fff';
+			this.$refs.progressBar.style.fontSize = this.textSize;
+			this.$emit('passcallback');
+		},
+		reset: function () {
+			this.reImg();
+			this.checkimgLoaded();
+		},
+		reImg: function () {
+			this.$emit('update:isPassing', false);
+			const oriData = this.$options.data();
+			for (const key in oriData) {
+				if (Object.prototype.hasOwnProperty.call(oriData, key)) {
+					this[key] = oriData[key];
+				}
+			}
+			var handler = this.$refs.handler;
+			var message = this.$refs.message;
+			handler.style.left = '0';
+			this.$refs.progressBar.style.width = '0';
+			handler.children[0].className = this.handlerIcon;
+			message.style['-webkit-text-fill-color'] = 'transparent';
+			message.style.animation = 'slidetounlock 3s infinite';
+			message.style.color = this.background;
+		},
+		refreshimg: function () {
+			this.$emit('refresh');
+		},
+	},
+	watch: {
+		imgsrc: {
+			immediate: false,
+			handler: function () {
+				this.reImg();
+			},
+		},
+	},
+};
+</script>
+<style scoped>
+.drag_verify {
+	position: relative;
+	background-color: #e8e8e8;
+	text-align: center;
+	overflow: hidden;
+}
+.drag_verify .dv_handler {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	cursor: move;
+}
+.drag_verify .dv_handler i {
+	color: #666;
+	padding-left: 0;
+	font-size: 16px;
+}
+.drag_verify .dv_handler .el-icon-circle-check {
+	color: #6c6;
+	margin-top: 9px;
+}
+.drag_verify .dv_progress_bar {
+	position: absolute;
+	height: 34px;
+	width: 0px;
+}
+.drag_verify .dv_text {
+	position: absolute;
+	top: 0px;
+	color: transparent;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+	user-select: none;
+	-o-user-select: none;
+	-ms-user-select: none;
+	background: -webkit-gradient(
+		linear,
+		left top,
+		right top,
+		color-stop(0, var(--textColor)),
+		color-stop(0.4, var(--textColor)),
+		color-stop(0.5, #fff),
+		color-stop(0.6, var(--textColor)),
+		color-stop(1, var(--textColor))
+	);
+	-webkit-background-clip: text;
+	-webkit-text-fill-color: transparent;
+	-webkit-text-size-adjust: none;
+	animation: slidetounlock 3s infinite;
+}
+.drag_verify .dv_text * {
+	-webkit-text-fill-color: var(--textColor);
+}
+.goFirst {
+	left: 0px !important;
+	transition: left 0.5s;
+}
+.goOrigin {
+	transition: transform 0.5s;
+}
+.goKeep {
+	transition: left 0.2s;
+}
+.goFirst2 {
+	width: 0px !important;
+	transition: width 0.5s;
+}
+.drag-verify-container {
+	position: relative;
+	line-height: 0;
+	border-radius: 50%;
+}
+.move-bar {
+	position: absolute;
+	z-index: 100;
+}
+.clip-bar {
+	position: absolute;
+	background: rgba(255, 255, 255, 0.8);
+}
+.refresh {
+	position: absolute;
+	right: 5px;
+	top: 5px;
+	cursor: pointer;
+	font-size: 20px;
+	z-index: 200;
+}
+.tips {
+	position: absolute;
+	bottom: 25px;
+	height: 20px;
+	line-height: 20px;
+	text-align: center;
+	width: 100%;
+	font-size: 12px;
+	z-index: 200;
+}
+.tips.success {
+	background: rgba(255, 255, 255, 0.6);
+	color: green;
+}
+.tips.danger {
+	background: rgba(0, 0, 0, 0.6);
+	color: yellow;
+}
+.check-img {
+	width: 100%;
+	border-radius: 50%;
+}
+</style>
+<style>
+@-webkit-keyframes slidetounlock {
+	0% {
+		background-position: var(--pwidth) 0;
+	}
+	100% {
+		background-position: var(--width) 0;
+	}
+}
+@-webkit-keyframes slidetounlock2 {
+	0% {
+		background-position: var(--pwidth) 0;
+	}
+	100% {
+		background-position: var(--pwidth) 0;
+	}
+}
+</style>

src/components/editor/index.vue

@@ -0,0 +1,73 @@
+<template>
+	<div class="editor-container">
+		<div :id="id"></div>
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, watch } from 'vue';
+import wangeditor from 'wangeditor';
+export default {
+	name: 'wngEditor',
+	props: {
+		// 节点 id
+		id: {
+			type: String,
+			default: () => 'wangeditor',
+		},
+		// 是否禁用
+		isDisable: {
+			type: Boolean,
+			default: () => false,
+		},
+		// 内容框默认 placeholder
+		placeholder: {
+			type: String,
+			default: () => '请输入内容',
+		},
+		// 双向绑定
+		// 双向绑定值，字段名为固定，改了之后将不生效
+		// 参考：https://v3.cn.vuejs.org/guide/migration/v-model.html#%E8%BF%81%E7%A7%BB%E7%AD%96%E7%95%A5
+		modelValue: String,
+	},
+	setup(props, { emit }) {
+		const state = reactive({
+			editor: null,
+		});
+		// 初始化富文本
+		// https://doc.wangeditor.com/
+		const initWangeditor = () => {
+			state.editor = new wangeditor(`#${props.id}`);
+			state.editor.config.zIndex = 1;
+			state.editor.config.placeholder = props.placeholder;
+			state.editor.config.uploadImgShowBase64 = true;
+			state.editor.config.showLinkImg = false;
+			onWangeditorChange();
+			state.editor.create();
+			state.editor.txt.html(props.modelValue);
+			props.isDisable ? state.editor.disable() : state.editor.enable();
+		};
+		// 内容改变时
+		const onWangeditorChange = () => {
+			state.editor.config.onchange = (html: string) => {
+				emit('update:modelValue', html);
+			};
+		};
+		// 页面加载时
+		onMounted(() => {
+			initWangeditor();
+		});
+		// 监听双向绑定值的改变
+		// https://gitee.com/lyt-top/vue-next-admin/issues/I4LM7I
+		watch(
+			() => props.modelValue,
+			(value) => {
+				state.editor.txt.html(value);
+			}
+		);
+		return {
+			...toRefs(state),
+		};
+	},
+};
+</script>

src/components/iconSelector/index.vue

@@ -1,57 +1,53 @@
 <template>
 	<div class="icon-selector">
-		<el-popover :placement="placement" :width="fontIconWidth" v-model:visible="fontIconVisible" popper-class="icon-selector-popper">
+		<el-popover placement="bottom" :width="fontIconWidth" v-model:visible="fontIconVisible" popper-class="icon-selector-popper">
 			<template #reference>
 				<el-input
-					v-model="fontIcon"
-					placeholder="请点击选择图标"
-					clearable
-					size="small"
+					v-model="fontIconSearch"
+					:placeholder="fontIconPlaceholder"
+					:clearable="clearable"
+					:disabled="disabled"
+					:size="size"
 					ref="inputWidthRef"
-					:prefix-icon="fontIconPrefix"
 					@clear="onClearFontIcon"
-				></el-input>
+					@focus="onIconFocus"
+					@blur="onIconBlur"
+				>
+					<template #prepend>
+						<SvgIcon
+							:name="fontIconPrefix === '' ? prepend : fontIconPrefix"
+							class="font14"
+							v-if="fontIconPrefix === '' ? prepend?.indexOf('element') > -1 : fontIconPrefix?.indexOf('element') > -1"
+						/>
+						<i v-else :class="fontIconPrefix === '' ? prepend : fontIconPrefix" class="font14"></i>
+					</template>
+				</el-input>
 			</template>
 			<transition name="el-zoom-in-top">
 				<div class="icon-selector-warp" v-show="fontIconVisible">
-					<div class="icon-selector-warp-title">请选择一个图标</div>
-					<div v-if="isAllOn" class="icon-selector-all">
-						<el-input v-model="fontIconSearch" placeholder="请输入内容进行搜索" size="small"></el-input>
-						<div class="icon-selector-all-tabs">
-							<div
-								class="icon-selector-all-tabs-item"
-								v-for="(v, k) in fontIconTabsList"
-								:key="k"
-								@click="onFontIconTabsClick(v, k)"
-								:class="{ 'icon-selector-all-tabs-active': fontIconTabsIndex === k }"
-							>
-								<div class="label">{{ v.label }}</div>
-							</div>
+					<div class="icon-selector-warp-title flex">
+						<div class="flex-auto">{{ title }}</div>
+						<div class="icon-selector-warp-title-tab" v-if="type === 'all'">
+							<span :class="{ 'span-active': fontIconType === 'ali' }" @click="onIconChange('ali')" class="ml10" title="iconfont 图标">ali</span>
+							<span :class="{ 'span-active': fontIconType === 'ele' }" @click="onIconChange('ele')" class="ml10" title="elementPlus 图标">ele</span>
+							<span :class="{ 'span-active': fontIconType === 'awe' }" @click="onIconChange('awe')" class="ml10" title="fontawesome 图标">awe</span>
 						</div>
 					</div>
 					<div class="icon-selector-warp-row">
-						<el-row :gutter="10">
-							<el-col
-								:xs="4"
-								:sm="4"
-								:md="2"
-								:lg="2"
-								:xl="1"
-								:class="`${fontIconTabsIcon}-col`"
-								@click="onColClick(v, k)"
-								v-for="(v, k) in fontIconSheetsFilterList"
-								:key="k"
-							>
-								<div class="icon-selector-warp-item" :class="{ 'icon-selector-active': fontIconIndex === k }">
-									<div class="flex-margin">
-										<div class="icon-selector-warp-item-value">
-											<i :class="[fontIconTabsIcon, v]"></i>
+						<el-scrollbar ref="selectorScrollbarRef">
+							<el-row :gutter="10" v-if="fontIconSheetsFilterList.length > 0">
+								<el-col :xs="6" :sm="4" :md="4" :lg="4" :xl="4" @click="onColClick(v)" v-for="(v, k) in fontIconSheetsFilterList" :key="k">
+									<div class="icon-selector-warp-item" :class="{ 'icon-selector-active': fontIconPrefix === v }">
+										<div class="flex-margin">
+											<div class="icon-selector-warp-item-value">
+												<SvgIcon :name="v" />
+											</div>
 										</div>
 									</div>
-								</div>
-							</el-col>
-						</el-row>
-						<el-empty :image-size="100" v-if="fontIconSheetsFilterList.length <= 0"></el-empty>
+								</el-col>
+							</el-row>
+							<el-empty :image-size="100" v-if="fontIconSheetsFilterList.length <= 0" :description="emptyDescription"></el-empty>
+						</el-scrollbar>
 					</div>
 				</div>
 			</transition>
@@ -60,40 +56,90 @@
 </template>
 
 <script lang="ts">
-import { ref, toRefs, reactive, onMounted, nextTick, computed } from 'vue';
-import initIconfont from '/@/utils/getStyleSheets.ts';
+import { ref, toRefs, reactive, onMounted, nextTick, computed, watch } from 'vue';
+import initIconfont from '/@/utils/getStyleSheets';
 export default {
 	name: 'iconSelector',
+	emits: ['update:modelValue', 'get', 'clear'],
 	props: {
-		// 是否开启高级功能
-		isAllOn: {
+		// 输入框前置内容
+		prepend: {
+			type: String,
+			default: () => 'elementPointer',
+		},
+		// 输入框占位文本
+		placeholder: {
+			type: String,
+			default: () => '请输入内容搜索图标或者选择图标',
+		},
+		// 输入框占位文本
+		size: {
+			type: String,
+			default: () => 'small',
+		},
+		// 弹窗标题
+		title: {
+			type: String,
+			default: () => '请选择图标',
+		},
+		// icon 图标类型
+		type: {
+			type: String,
+			default: () => 'ele',
+		},
+		// 禁用
+		disabled: {
 			type: Boolean,
 			default: () => false,
 		},
-		// 出现位置
-		placement: {
-			type: String,
-			default: () => 'bottom',
+		// 是否可清空
+		clearable: {
+			type: Boolean,
+			default: () => true,
 		},
+		// 自定义空状态描述文字
+		emptyDescription: {
+			type: String,
+			default: () => '无相关图标',
+		},
+		// 双向绑定值，字段名为固定，改了之后将不生效
+		// 参考：https://v3.cn.vuejs.org/guide/migration/v-model.html#%E8%BF%81%E7%A7%BB%E7%AD%96%E7%95%A5
+		modelValue: String,
 	},
 	setup(props, { emit }) {
 		const inputWidthRef = ref();
+		const selectorScrollbarRef = ref();
 		const state: any = reactive({
-			fontIcon: '',
 			fontIconPrefix: '',
 			fontIconVisible: false,
 			fontIconWidth: 0,
-			fontIconIndex: '',
 			fontIconSearch: '',
 			fontIconTabsIndex: 0,
-			fontIconTabsIcon: 'iconfont ali',
-			fontIconTabsList: [{ label: 'iconfont' }, { label: 'element' }, { label: 'awesome' }],
 			fontIconSheetsList: [],
-			fontIconSheetsListAli: [],
-			fontIconSheetsListEle: [],
-			fontIconSheetsListAwe: [],
+			fontIconPlaceholder: '',
+			fontIconType: 'ali',
+			fontIconShow: true,
 		});
-		// 设置无数据时的空状态
+		// 处理 input 获取焦点时，modelValue 有值时，改变 input 的 placeholder 值
+		const onIconFocus = () => {
+			if (!props.modelValue) return false;
+			state.fontIconSearch = '';
+			state.fontIconPlaceholder = props.modelValue;
+		};
+		// 处理 input 失去焦点时，为空将清空 input 值，为点击选中图标时，将取原先值
+		const onIconBlur = () => {
+			setTimeout(() => {
+				const icon = state.fontIconSheetsList.filter((icon: string) => icon === state.fontIconSearch);
+				if (icon.length <= 0) state.fontIconSearch = '';
+			}, 300);
+		};
+		// 处理 icon 双向绑定数值回显
+		const initModeValueEcho = () => {
+			if (props.modelValue === '') return false;
+			state.fontIconPlaceholder = props.modelValue;
+			state.fontIconPrefix = props.modelValue;
+		};
+		// 图标搜索及图标数据显示
 		const fontIconSheetsFilterList = computed(() => {
 			if (!state.fontIconSearch) return state.fontIconSheetsList;
 			let search = state.fontIconSearch.trim().toLowerCase();
@@ -114,56 +160,80 @@ export default {
 			});
 		};
 		// 初始化数据
-		const initFontIconData = () => {
-			initIconfont.ali().then((res: any) => {
-				state.fontIconSheetsList = res;
-				state.fontIconSheetsListAli = res;
-			});
-			initIconfont.ele().then((res: any) => {
-				state.fontIconSheetsListEle = res;
-			});
-			initIconfont.awe().then((res: any) => {
-				state.fontIconSheetsListAwe = res;
-			});
+		const initFontIconData = async (type: string) => {
+			state.fontIconSheetsList = [];
+			if (type === 'ali') {
+				await initIconfont.ali().then((res: any) => {
+					// 阿里字体图标使用 `iconfont xxx`
+					state.fontIconSheetsList = res.map((i) => `iconfont ${i}`);
+				});
+			} else if (type === 'ele') {
+				await initIconfont.ele().then((res: any) => {
+					state.fontIconSheetsList = res;
+				});
+			} else if (type === 'awe') {
+				await initIconfont.awe().then((res: any) => {
+					// fontawesome字体图标使用 `fa xxx`
+					state.fontIconSheetsList = res.map((i) => `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();
+			// 切换时，滚动条置顶。感兴趣可以使用 keep-alive <component :is="xxx"/> 进行缓存
+			selectorScrollbarRef.value.wrap$.scrollTop = 0;
 		};
-		// 当前项点击
-		const onColClick = (v: any, k: number) => {
-			state.fontIconIndex = k;
-			state.fontIcon = v;
+		// 图标点击切换
+		const onIconChange = (type: string) => {
+			state.fontIconType = type;
+			initFontIconData(type);
+		};
+		// 获取当前点击的 icon 图标
+		const onColClick = (v: any) => {
+			state.fontIconPlaceholder = v;
 			state.fontIconVisible = false;
-			if (state.fontIconTabsIndex === 0) state.fontIconPrefix = `iconfont ali ${v}`;
-			else if (state.fontIconTabsIndex === 1) state.fontIconPrefix = `ele ${v}`;
-			else if (state.fontIconTabsIndex === 2) state.fontIconPrefix = `fa awe ${v}`;
+			state.fontIconPrefix = v;
 			emit('get', state.fontIconPrefix);
+			emit('update:modelValue', state.fontIconPrefix);
 		};
-		// input 点击清除按钮时
+		// 清空当前点击的 icon 图标
 		const onClearFontIcon = () => {
-			state.fontIconIndex = '';
 			state.fontIconPrefix = '';
-			emit('get', state.fontIconPrefix);
-		};
-		// tabs 点击
-		const onFontIconTabsClick = (v: any, k: number) => {
-			state.fontIconTabsIndex = k;
-			if (v.label === 'iconfont') state.fontIconSheetsList = state.fontIconSheetsListAli;
-			else if (v.label === 'element') state.fontIconSheetsList = state.fontIconSheetsListEle;
-			else if (v.label === 'awesome') state.fontIconSheetsList = state.fontIconSheetsListAwe;
-			if (k === 0) state.fontIconTabsIcon = `iconfont ali`;
-			else if (k === 1) state.fontIconTabsIcon = `ele`;
-			else if (k === 2) state.fontIconTabsIcon = `fa awe`;
+			emit('clear', state.fontIconPrefix);
+			emit('update:modelValue', state.fontIconPrefix);
 		};
 		// 页面加载时
 		onMounted(() => {
-			initFontIconData();
+			// 判断默认进来是什么类型图标，进行 tab 回显
+			if (props.type === 'all') {
+				if (props.modelValue?.indexOf('iconfont') > -1) onIconChange('ali');
+				else if (props.modelValue?.indexOf('element') > -1) onIconChange('ele');
+				else if (props.modelValue?.indexOf('fa') > -1) onIconChange('awe');
+				else onIconChange('ali');
+			} else {
+				onIconChange(props.type);
+			}
 			initResize();
 			getInputWidth();
 		});
+		// 监听双向绑定 modelValue 的变化
+		watch(
+			() => props.modelValue,
+			() => {
+				initModeValueEcho();
+			}
+		);
 		return {
 			inputWidthRef,
+			selectorScrollbarRef,
 			fontIconSheetsFilterList,
 			onColClick,
+			onIconChange,
 			onClearFontIcon,
-			onFontIconTabsClick,
+			onIconFocus,
+			onIconBlur,
 			...toRefs(state),
 		};
 	},

src/components/noticeBar/index.vue

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

src/components/svgIcon/index.vue

@@ -0,0 +1,28 @@
+<script lang="ts">
+// 渲染函数：https://v3.cn.vuejs.org/guide/render-function.html
+import { h, resolveComponent, defineComponent } from 'vue';
+export default defineComponent({
+	name: 'svgIcon',
+	props: {
+		// svg 图标组件名字
+		name: {
+			type: String,
+		},
+		// svg 大小
+		size: {
+			type: Number,
+		},
+		// svg 颜色
+		color: {
+			type: String,
+		},
+	},
+	setup(props) {
+		if (props.name?.indexOf('element') > -1) {
+			return () => h('i', { class: 'el-icon', style: `--font-size: ${props.size};--color: ${props.color}` }, [h(resolveComponent(props.name))]);
+		} else {
+			return () => h('i', { class: props.name, style: `font-size: ${props.size};color: ${props.color}` });
+		}
+	},
+});
+</script>

src/i18n/index.ts

@@ -2,18 +2,21 @@ import { createI18n } from 'vue-i18n';
 import zhcnLocale from 'element-plus/lib/locale/lang/zh-cn';
 import enLocale from 'element-plus/lib/locale/lang/en';
 import zhtwLocale from 'element-plus/lib/locale/lang/zh-tw';
-import { store } from '/@/store/index.ts';
+import { store } from '/@/store/index';
 
-import nextZhcn from '/@/i18n/lang/zh-cn.ts';
-import nextEn from '/@/i18n/lang/en.ts';
-import nextZhtw from '/@/i18n/lang/zh-tw.ts';
+import nextZhcn from '/@/i18n/lang/zh-cn';
+import nextEn from '/@/i18n/lang/en';
+import nextZhtw from '/@/i18n/lang/zh-tw';
 
-import pagesHomeZhcn from '/@/i18n/pages/home/zh-cn.ts';
-import pagesHomeEn from '/@/i18n/pages/home/en.ts';
-import pagesHomeZhtw from '/@/i18n/pages/home/zh-tw.ts';
-import pagesLoginZhcn from '/@/i18n/pages/login/zh-cn.ts';
-import pagesLoginEn from '/@/i18n/pages/login/en.ts';
-import pagesLoginZhtw from '/@/i18n/pages/login/zh-tw.ts';
+import pagesHomeZhcn from '/@/i18n/pages/home/zh-cn';
+import pagesHomeEn from '/@/i18n/pages/home/en';
+import pagesHomeZhtw from '/@/i18n/pages/home/zh-tw';
+import pagesLoginZhcn from '/@/i18n/pages/login/zh-cn';
+import pagesLoginEn from '/@/i18n/pages/login/en';
+import pagesLoginZhtw from '/@/i18n/pages/login/zh-tw';
+import pagesFormI18nZhcn from '/@/i18n/pages/formI18n/zh-cn';
+import pagesFormI18nEn from '/@/i18n/pages/formI18n/en';
+import pagesFormI18nZhtw from '/@/i18n/pages/formI18n/zh-tw';
 
 // 定义语言国际化内容
 /**
@@ -23,27 +26,30 @@ import pagesLoginZhtw from '/@/i18n/pages/login/zh-tw.ts';
  */
 const messages = {
 	[zhcnLocale.name]: {
-		el: zhcnLocale.el,
+		...zhcnLocale,
 		message: {
 			...nextZhcn,
 			...pagesHomeZhcn,
 			...pagesLoginZhcn,
+			...pagesFormI18nZhcn,
 		},
 	},
 	[enLocale.name]: {
-		el: enLocale.el,
+		...enLocale,
 		message: {
 			...nextEn,
 			...pagesHomeEn,
 			...pagesLoginEn,
+			...pagesFormI18nEn,
 		},
 	},
 	[zhtwLocale.name]: {
-		el: zhtwLocale.el,
+		...zhtwLocale,
 		message: {
 			...nextZhtw,
 			...pagesHomeZhtw,
 			...pagesLoginZhtw,
+			...pagesFormI18nZhtw,
 		},
 	},
 };

src/i18n/lang/en.ts

@@ -4,7 +4,10 @@ export default {
 		home: 'home',
 		system: 'system',
 		systemMenu: 'systemMenu',
+		systemRole: 'systemRole',
 		systemUser: 'systemUser',
+		systemDept: 'systemDept',
+		systemDic: 'systemDic',
 		limits: 'limits',
 		limitsFrontEnd: 'FrontEnd',
 		limitsFrontEndPage: 'FrontEndPage',
@@ -24,14 +27,17 @@ export default {
 		funCountup: 'countup',
 		funEchartsTree: 'echartsTree',
 		funSelector: 'funSelector',
+		funNoticeBar: 'ScrollingNoticeBar',
 		funWangEditor: 'wangEditor',
 		funCropper: 'cropper',
-		funMindMap: 'G6 MindMap',
 		funQrcode: 'qrcode',
 		funEchartsMap: 'EchartsMap',
 		funPrintJs: 'PrintJs',
 		funClipboard: 'Copy cut',
 		funScreenShort: 'screenCapture',
+		funGridLayout: 'Drag layout',
+		funSplitpanes: 'Pane splitter',
+		funDragVerify: 'Validator',
 		pagesIndex: 'pages',
 		pagesFiltering: 'Filtering',
 		pagesFilteringDetails: 'FilteringDetails',
@@ -41,27 +47,55 @@ export default {
 		pagesAwesome: 'awesome icon',
 		pagesCityLinkage: 'CityLinkage',
 		pagesFormAdapt: 'FormAdapt',
+		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',
+		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',
 		layoutIfameView: 'IfameView',
 	},
+	staticRoutes: {
+		signIn: 'signIn',
+		notFound: 'notFound',
+		noPower: 'noPower',
+	},
 	user: {
+		title0: 'Component size',
 		title1: 'Language switching',
 		title2: 'Menu search',
 		title3: 'Layout configuration',
 		title4: 'news',
 		title5: 'Full screen on',
 		title6: 'Full screen off',
+		dropdownDefault: 'default',
+		dropdownMedium: 'medium',
+		dropdownSmall: 'small',
+		dropdownMini: 'mini',
 		dropdown1: 'home page',
 		dropdown2: 'Personal Center',
 		dropdown3: '404',
 		dropdown4: '401',
 		dropdown5: 'Log out',
+		dropdown6: 'Code warehouse',
 		searchPlaceholder: 'Menu search: support Chinese, routing path',
 		newTitle: 'notice',
 		newBtn: 'All read',
@@ -80,6 +114,7 @@ export default {
 		closeOther: 'closeOther',
 		closeAll: 'closeAll',
 		fullscreen: 'fullscreen',
+		closeFullscreen: 'closeFullscreen',
 	},
 	notFound: {
 		foundTitle: 'Wrong address input, please re-enter the address~',
@@ -103,6 +138,7 @@ export default {
 		twoColumnsMenuBarColor: 'Default font color bar menu',
 		twoIsTopBarColorGradual: 'Top bar gradient',
 		twoIsMenuBarColorGradual: 'Menu gradient',
+		twoIsColumnsMenuBarColorGradual: 'Column gradient',
 		twoIsMenuBarColorHighlight: 'Menu font highlight',
 		threeTitle: 'Interface settings',
 		threeIsCollapse: 'Menu horizontal collapse',
@@ -119,15 +155,18 @@ 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',
+		fourIsDark: 'Dark Mode',
 		fourIsWartermark: 'Turn on watermark',
 		fourWartermarkText: 'Watermark copy',
 		fiveTitle: 'Other settings',
 		fiveTagsStyle: 'Tagsview style',
 		fiveAnimation: 'page animation',
 		fiveColumnsAsideStyle: 'Column style',
+		fiveColumnsAsideLayout: 'Column layout',
 		sixTitle: 'Layout switch',
 		sixDefaults: 'One',
 		sixClassic: 'Two',
@@ -135,6 +174,7 @@ export default {
 		sixColumns: 'Four',
 		tipText: 'Click the button below to copy the layout configuration to `/src/store/modules/themeConfig.ts` It has been modified in.',
 		copyText: 'replication configuration',
+		resetText: 'restore default',
 		copyTextSuccess: 'Copy succeeded!',
 		copyTextError: 'Copy failed!',
 	},

src/i18n/lang/zh-cn.ts

@@ -4,7 +4,10 @@ export default {
 		home: '首页',
 		system: '系统设置',
 		systemMenu: '菜单管理',
+		systemRole: '角色管理',
 		systemUser: '用户管理',
+		systemDept: '部门管理',
+		systemDic: '字典管理',
 		limits: '权限管理',
 		limitsFrontEnd: '前端控制',
 		limitsFrontEndPage: '页面权限',
@@ -24,14 +27,17 @@ export default {
 		funCountup: 'countup 数字滚动',
 		funEchartsTree: 'echartsTree 树图',
 		funSelector: '图标选择器',
+		funNoticeBar: '滚动通知栏',
 		funWangEditor: 'wangEditor 编辑器',
 		funCropper: 'cropper 图片裁剪',
-		funMindMap: 'G6 思维导图',
 		funQrcode: 'qrcode 二维码生成',
 		funEchartsMap: '地理坐标/地图',
 		funPrintJs: '页面打印',
 		funClipboard: '复制剪切',
 		funScreenShort: 'web端自定义截屏',
+		funGridLayout: '拖拽布局',
+		funSplitpanes: '窗格拆分器',
+		funDragVerify: '验证器',
 		pagesIndex: '页面',
 		pagesFiltering: '过滤筛选组件',
 		pagesFilteringDetails: '过滤筛选组件详情',
@@ -41,27 +47,55 @@ export default {
 		pagesAwesome: 'awesome 字体图标',
 		pagesCityLinkage: '城市多级联动',
 		pagesFormAdapt: '表单自适应',
+		pagesFormI18n: '表单国际化',
+		pagesFormRules: '多表单验证',
+		pagesDynamicForm: '动态复杂表单',
+		pagesWorkflow: '工作流',
 		pagesListAdapt: '列表自适应',
 		pagesWaterfall: '瀑布屏',
 		pagesSteps: '步骤条',
+		pagesPreview: '大图预览',
+		pagesWaves: '波浪效果',
+		pagesTree: '树形改表格',
+		pagesDrag: '拖动指令',
+		pagesLazyImg: '图片懒加载',
+		paramsIndex: '路由参数',
+		paramsCommon: '普通路由',
+		paramsDynamic: '动态路由',
+		paramsCommonDetails: '普通路由详情',
+		paramsDynamicDetails: '动态路由详情',
 		chartIndex: '大数据图表',
+		visualizingIndex: '数据可视化',
+		visualizingLinkDemo1: '数据可视化演示1',
+		visualizingLinkDemo2: '数据可视化演示2',
 		personal: '个人中心',
 		tools: '工具类集合',
 		layoutLinkView: '外链',
 		layoutIfameView: '内嵌 iframe',
 	},
+	staticRoutes: {
+		signIn: '登录',
+		notFound: '找不到此页面',
+		noPower: '没有权限',
+	},
 	user: {
+		title0: '组件大小',
 		title1: '语言切换',
 		title2: '菜单搜索',
 		title3: '布局配置',
 		title4: '消息',
 		title5: '开全屏',
 		title6: '关全屏',
+		dropdownDefault: '默认',
+		dropdownMedium: '中等',
+		dropdownSmall: '小型',
+		dropdownMini: '超小',
 		dropdown1: '首页',
 		dropdown2: '个人中心',
 		dropdown3: '404',
 		dropdown4: '401',
 		dropdown5: '退出登录',
+		dropdown6: '代码仓库',
 		searchPlaceholder: '菜单搜索：支持中文、路由路径',
 		newTitle: '通知',
 		newBtn: '全部已读',
@@ -80,6 +114,7 @@ export default {
 		closeOther: '关闭其它',
 		closeAll: '全部关闭',
 		fullscreen: '当前页全屏',
+		closeFullscreen: '关闭全屏',
 	},
 	notFound: {
 		foundTitle: '地址输入错误，请重新输入地址~',
@@ -103,6 +138,7 @@ export default {
 		twoColumnsMenuBarColor: '分栏菜单默认字体颜色',
 		twoIsTopBarColorGradual: '顶栏背景渐变',
 		twoIsMenuBarColorGradual: '菜单背景渐变',
+		twoIsColumnsMenuBarColorGradual: '分栏菜单背景渐变',
 		twoIsMenuBarColorHighlight: '菜单字体背景高亮',
 		threeTitle: '界面设置',
 		threeIsCollapse: '菜单水平折叠',
@@ -119,15 +155,18 @@ export default {
 		fourIsTagsviewIcon: '开启 Tagsview 图标',
 		fourIsCacheTagsView: '开启 TagsView 缓存',
 		fourIsSortableTagsView: '开启 TagsView 拖拽',
+		fourIsShareTagsView: '开启 TagsView 共用',
 		fourIsFooter: '开启 Footer',
 		fourIsGrayscale: '灰色模式',
 		fourIsInvert: '色弱模式',
+		fourIsDark: '深色模式',
 		fourIsWartermark: '开启水印',
 		fourWartermarkText: '水印文案',
 		fiveTitle: '其它设置',
 		fiveTagsStyle: 'Tagsview 风格',
 		fiveAnimation: '主页面切换动画',
 		fiveColumnsAsideStyle: '分栏高亮风格',
+		fiveColumnsAsideLayout: '分栏布局风格',
 		sixTitle: '布局切换',
 		sixDefaults: '默认',
 		sixClassic: '经典',
@@ -135,6 +174,7 @@ export default {
 		sixColumns: '分栏',
 		tipText: '点击下方按钮，复制布局配置去 `src/store/modules/themeConfig.ts` 中修改。',
 		copyText: '一键复制配置',
+		resetText: '一键恢复默认',
 		copyTextSuccess: '复制成功！',
 		copyTextError: '复制失败！',
 	},

src/i18n/lang/zh-tw.ts

@@ -4,7 +4,10 @@ export default {
 		home: '首頁',
 		system: '系統設置',
 		systemMenu: '選單管理',
+		systemRole: '角色管理',
 		systemUser: '用戶管理',
+		systemDept: '部門管理',
+		systemDic: '字典管理',
 		limits: '許可權管理',
 		limitsFrontEnd: '前端控制',
 		limitsFrontEndPage: '頁面許可權',
@@ -24,14 +27,17 @@ export default {
 		funCountup: 'countup 數位滾動',
 		funEchartsTree: 'echartsTree 樹圖',
 		funSelector: '圖標選擇器',
+		funNoticeBar: '滾動通知欄',
 		funWangEditor: 'wangEditor 編輯器',
 		funCropper: 'cropper 圖片裁剪',
-		funMindMap: 'G6 心智圖',
 		funQrcode: 'qrcode 二維碼生成',
 		funEchartsMap: '地理座標/地圖',
 		funPrintJs: '頁面列印',
 		funClipboard: '複製剪切',
 		funScreenShort: '自定義截圖',
+		funGridLayout: '拖拽佈局',
+		funSplitpanes: '窗格折開器',
+		funDragVerify: '驗證器',
 		pagesIndex: '頁面',
 		pagesFiltering: '過濾篩選組件',
 		pagesFilteringDetails: '過濾篩選組件詳情',
@@ -41,27 +47,55 @@ export default {
 		pagesAwesome: 'awesome 字體圖標',
 		pagesCityLinkage: '都市多級聯動',
 		pagesFormAdapt: '表單自我調整',
+		pagesFormI18n: '表單國際化',
+		pagesFormRules: '多表單驗證',
+		pagesDynamicForm: '動態複雜表單',
+		pagesWorkflow: '工作流',
 		pagesListAdapt: '清單自我調整',
 		pagesWaterfall: '瀑布屏',
 		pagesSteps: '步驟條',
+		pagesPreview: '大圖預覽',
+		pagesWaves: '波浪效果',
+		pagesTree: '樹形改表格',
+		pagesDrag: '拖動指令',
+		pagesLazyImg: '圖片懶加載',
+		paramsIndex: '路由參數',
+		paramsCommon: '普通路由',
+		paramsDynamic: '動態路由',
+		paramsCommonDetails: '普通路由詳情',
+		paramsDynamicDetails: '動態路由詳情',
 		chartIndex: '大資料圖表',
+		visualizingIndex: '數據視覺化',
+		visualizingLinkDemo1: '數據視覺化演示1',
+		visualizingLinkDemo2: '數據視覺化演示2',
 		personal: '個人中心',
 		tools: '工具類集合',
 		layoutLinkView: '外鏈',
 		layoutIfameView: '内嵌 iframe',
 	},
+	staticRoutes: {
+		signIn: '登入',
+		notFound: '找不到此頁面',
+		noPower: '沒有許可權',
+	},
 	user: {
+		title0: '組件大小',
 		title1: '語言切換',
 		title2: '選單蒐索',
 		title3: '佈局配寘',
 		title4: '消息',
 		title5: '開全屏',
 		title6: '關全屏',
+		dropdownDefault: '默認',
+		dropdownMedium: '中等',
+		dropdownSmall: '小型',
+		dropdownMini: '超小',
 		dropdown1: '首頁',
 		dropdown2: '個人中心',
 		dropdown3: '404',
 		dropdown4: '401',
 		dropdown5: '登出',
+		dropdown6: '程式碼倉庫',
 		searchPlaceholder: '選單蒐索：支援中文、路由路徑',
 		newTitle: '通知',
 		newBtn: '全部已讀',
@@ -80,6 +114,7 @@ export default {
 		closeOther: '關閉其它',
 		closeAll: '全部關閉',
 		fullscreen: '當前頁全屏',
+		closeFullscreen: '關閉全屏',
 	},
 	notFound: {
 		foundTitle: '地址輸入錯誤，請重新輸入地址~',
@@ -103,6 +138,7 @@ export default {
 		twoColumnsMenuBarColor: '分欄選單默認字體顏色',
 		twoIsTopBarColorGradual: '頂欄背景漸變',
 		twoIsMenuBarColorGradual: '選單背景漸變',
+		twoIsColumnsMenuBarColorGradual: '分欄選單背景漸變',
 		twoIsMenuBarColorHighlight: '選單字體背景高亮',
 		threeTitle: '介面設定',
 		threeIsCollapse: '選單水准折疊',
@@ -119,15 +155,18 @@ export default {
 		fourIsTagsviewIcon: '開啟 Tagsview 圖標',
 		fourIsCacheTagsView: '開啟 TagsView 緩存',
 		fourIsSortableTagsView: '開啟 TagsView 拖拽',
+		fourIsShareTagsView: '開啟 TagsView 共用',
 		fourIsFooter: '開啟 Footer',
 		fourIsGrayscale: '灰色模式',
 		fourIsInvert: '色弱模式',
+		fourIsDark: '深色模式',
 		fourIsWartermark: '開啟浮水印',
 		fourWartermarkText: '浮水印文案',
 		fiveTitle: '其它設定',
 		fiveTagsStyle: 'Tagsview 風格',
 		fiveAnimation: '主頁面切換動畫',
 		fiveColumnsAsideStyle: '分欄高亮風格',
+		fiveColumnsAsideLayout: '分欄佈局風格',
 		sixTitle: '佈局切換',
 		sixDefaults: '默認',
 		sixClassic: '經典',
@@ -135,6 +174,7 @@ export default {
 		sixColumns: '分欄',
 		tipText: '點擊下方按鈕，複製佈局配寘去`src/store/modules/themeConfig.ts`中修改。',
 		copyText: '一鍵複製配寘',
+		resetText: '一鍵恢復默認',
 		copyTextSuccess: '複製成功！',
 		copyTextError: '複製失敗！',
 	},

src/i18n/pages/formI18n/en.ts

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

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

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

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

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

src/layout/component/aside.vue

@@ -1,25 +1,19 @@
 <template>
-	<el-aside class="layout-aside" :class="setCollapseWidth" v-if="clientWidth > 1000">
-		<Logo v-if="setShowLogo" />
-		<el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef">
-			<Vertical :menuList="menuList" :class="setCollapseWidth" />
-		</el-scrollbar>
-	</el-aside>
-	<el-drawer v-model="getThemeConfig.isCollapse" :with-header="false" direction="ltr" size="220px" v-else>
-		<el-aside class="layout-aside w100 h100">
+	<div class="h100" v-show="!isTagsViewCurrenFull">
+		<el-aside class="layout-aside" :class="setCollapseStyle">
 			<Logo v-if="setShowLogo" />
-			<el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef">
+			<el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef" @mouseenter="onAsideEnterLeave(true)" @mouseleave="onAsideEnterLeave(false)">
 				<Vertical :menuList="menuList" />
 			</el-scrollbar>
 		</el-aside>
-	</el-drawer>
+	</div>
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, computed, watch, getCurrentInstance, onBeforeMount, onUnmounted } from 'vue';
-import { useStore } from '/@/store/index.ts';
-import Logo from '/@/views/layout/logo/index.vue';
-import Vertical from '/@/views/layout/navMenu/vertical.vue';
+import { toRefs, reactive, computed, watch, getCurrentInstance, onBeforeMount } from 'vue';
+import { useStore } from '/@/store/index';
+import Logo from '/@/layout/logo/index.vue';
+import Vertical from '/@/layout/navMenu/vertical.vue';
 export default {
 	name: 'layoutAside',
 	components: { Logo, Vertical },
@@ -34,26 +28,56 @@ export default {
 		const getThemeConfig = computed(() => {
 			return store.state.themeConfig.themeConfig;
 		});
+		// 获取卡片全屏信息
+		const isTagsViewCurrenFull = computed(() => {
+			return store.state.tagsViewRoutes.isTagsViewCurrenFull;
+		});
 		// 设置菜单展开/收起时的宽度
-		const setCollapseWidth = computed(() => {
-			let { layout, isCollapse, menuBar } = store.state.themeConfig.themeConfig;
-			let asideBrColor = menuBar === '#FFFFFF' || menuBar === '#FFF' || menuBar === '#fff' || menuBar === '#ffffff' ? 'layout-el-aside-br-color' : '';
-			if (layout === 'columns') {
-				// 分栏布局，菜单收起时宽度给 1px
+		const setCollapseStyle = computed(() => {
+			const { layout, isCollapse, menuBar } = store.state.themeConfig.themeConfig;
+			const asideBrColor =
+				menuBar === '#FFFFFF' || menuBar === '#FFF' || menuBar === '#fff' || menuBar === '#ffffff' ? 'layout-el-aside-br-color' : '';
+			// 判断是否是手机端
+			if (state.clientWidth <= 1000) {
 				if (isCollapse) {
-					return ['layout-aside-width1', asideBrColor];
+					document.body.setAttribute('class', 'el-popup-parent--hidden');
+					const asideEle = document.querySelector('.layout-container') as HTMLElement;
+					const modeDivs = document.createElement('div');
+					modeDivs.setAttribute('class', 'layout-aside-mobile-mode');
+					asideEle.appendChild(modeDivs);
+					modeDivs.addEventListener('click', closeLayoutAsideMobileMode);
+					return [asideBrColor, 'layout-aside-mobile', 'layout-aside-mobile-open'];
 				} else {
-					return ['layout-aside-width-default', asideBrColor];
+					// 关闭弹窗
+					closeLayoutAsideMobileMode();
+					return [asideBrColor, 'layout-aside-mobile', 'layout-aside-mobile-close'];
 				}
 			} else {
-				// 其它布局给 64px
-				if (isCollapse) {
-					return ['layout-aside-width64', asideBrColor];
+				if (layout === 'columns') {
+					// 分栏布局，菜单收起时宽度给 1px
+					if (isCollapse) {
+						return [asideBrColor, 'layout-aside-pc-1'];
+					} else {
+						return [asideBrColor, 'layout-aside-pc-220'];
+					}
 				} else {
-					return ['layout-aside-width-default', asideBrColor];
+					// 其它布局给 64px
+					if (isCollapse) {
+						return [asideBrColor, 'layout-aside-pc-64'];
+					} else {
+						return [asideBrColor, 'layout-aside-pc-220'];
+					}
 				}
 			}
 		});
+		// 关闭移动端蒙版
+		const closeLayoutAsideMobileMode = () => {
+			const el = document.querySelector('.layout-aside-mobile-mode');
+			el && el.parentNode?.removeChild(el);
+			const clientWidth = document.body.clientWidth;
+			if (clientWidth < 1000) store.state.themeConfig.themeConfig.isCollapse = false;
+			document.body.setAttribute('class', '');
+		};
 		// 设置显示/隐藏 logo
 		const setShowLogo = computed(() => {
 			let { layout, isShowLogo } = store.state.themeConfig.themeConfig;
@@ -78,6 +102,13 @@ export default {
 		const initMenuFixed = (clientWidth: number) => {
 			state.clientWidth = clientWidth;
 		};
+		// 鼠标移入、移出
+		const onAsideEnterLeave = (bool: Boolean) => {
+			let { layout } = store.state.themeConfig.themeConfig;
+			if (layout !== 'columns') return false;
+			if (!bool) proxy.mittBus.emit('restoreDefault');
+			store.dispatch('routesList/setColumnsMenuHover', bool);
+		};
 		// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
 		watch(store.state.themeConfig.themeConfig, (val) => {
 			if (val.isShowLogoChange !== val.isShowLogo) {
@@ -85,9 +116,8 @@ export default {
 				proxy.$refs.layoutAsideScrollbarRef.update();
 			}
 		});
-		// 监听路由的变化，动态赋值给菜单中
+		// 监听vuex值的变化，动态赋值给菜单中
 		watch(store.state, (val) => {
-			if (val.routesList.routesList.length === state.menuList.length) return false;
 			let { layout, isClassicSplitMenu } = val.themeConfig.themeConfig;
 			if (layout === 'classic' && isClassicSplitMenu) return false;
 			setFilterRoutes();
@@ -96,6 +126,8 @@ export default {
 		onBeforeMount(() => {
 			initMenuFixed(document.body.clientWidth);
 			setFilterRoutes();
+			// 此界面不需要取消监听(proxy.mittBus.off('setSendColumnsChildren))
+			// 因为切换布局时有的监听需要使用，取消了监听，某些操作将不生效
 			proxy.mittBus.on('setSendColumnsChildren', (res: any) => {
 				state.menuList = res.children;
 			});
@@ -111,19 +143,15 @@ export default {
 			});
 			proxy.mittBus.on('layoutMobileResize', (res: any) => {
 				initMenuFixed(res.clientWidth);
+				closeLayoutAsideMobileMode();
 			});
 		});
-		// 页面卸载时
-		onUnmounted(() => {
-			proxy.mittBus.off('setSendColumnsChildren');
-			proxy.mittBus.off('setSendClassicChildren');
-			proxy.mittBus.off('getBreadcrumbIndexSetFilterRoutes');
-			proxy.mittBus.off('layoutMobileResize');
-		});
 		return {
-			setCollapseWidth,
+			setCollapseStyle,
 			setShowLogo,
 			getThemeConfig,
+			isTagsViewCurrenFull,
+			onAsideEnterLeave,
 			...toRefs(state),
 		};
 	},

src/layout/component/columnsAside.vue

@@ -1,30 +1,39 @@
 <template>
 	<div class="layout-columns-aside">
 		<el-scrollbar>
-			<ul>
+			<ul @mouseleave="onColumnsAsideMenuMouseleave()">
 				<li
 					v-for="(v, k) in columnsAsideList"
 					:key="k"
 					@click="onColumnsAsideMenuClick(v, k)"
+					@mouseenter="onColumnsAsideMenuMouseenter(v, k)"
 					:ref="
 						(el) => {
 							if (el) columnsAsideOffsetTopRefs[k] = el;
 						}
 					"
-					:class="{ 'layout-columns-active': liIndex === k }"
+					:class="{ 'layout-columns-active': liIndex === k, 'layout-columns-hover': liHoverIndex === k }"
 					:title="$t(v.meta.title)"
 				>
-					<div class="layout-columns-aside-li-box" v-if="!v.meta.isLink || (v.meta.isLink && v.meta.isIframe)">
-						<i :class="v.meta.icon"></i>
-						<div class="layout-columns-aside-li-box-title font12">
-							{{ $t(v.meta.title) && $t(v.meta.title).length >= 4 ? $t(v.meta.title).substr(0, 4) : $t(v.meta.title) }}
+					<div :class="setColumnsAsidelayout" v-if="!v.meta.isLink || (v.meta.isLink && v.meta.isIframe)">
+						<SvgIcon :name="v.meta.icon" />
+						<div class="columns-vertical-title font12">
+							{{
+								$t(v.meta.title) && $t(v.meta.title).length >= 4
+									? $t(v.meta.title).substr(0, setColumnsAsidelayout === 'columns-vertical' ? 4 : 3)
+									: $t(v.meta.title)
+							}}
 						</div>
 					</div>
-					<div class="layout-columns-aside-li-box" v-else>
+					<div :class="setColumnsAsidelayout" v-else>
 						<a :href="v.meta.isLink" target="_blank">
-							<i :class="v.meta.icon"></i>
-							<div class="layout-columns-aside-li-box-title font12">
-								{{ $t(v.meta.title) && $t(v.meta.title).length >= 4 ? $t(v.meta.title).substr(0, 4) : $t(v.meta.title) }}
+							<SvgIcon :name="v.meta.icon" />
+							<div class="columns-vertical-title font12">
+								{{
+									$t(v.meta.title) && $t(v.meta.title).length >= 4
+										? $t(v.meta.title).substr(0, setColumnsAsidelayout === 'columns-vertical' ? 4 : 3)
+										: $t(v.meta.title)
+								}}
 							</div>
 						</a>
 					</div>
@@ -36,9 +45,9 @@
 </template>
 
 <script lang="ts">
-import { reactive, toRefs, ref, computed, onMounted, nextTick, getCurrentInstance, watch } from 'vue';
+import { reactive, toRefs, ref, computed, onMounted, nextTick, getCurrentInstance, watch, onUnmounted } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
-import { useStore } from '/@/store/index.ts';
+import { useStore } from '/@/store/index';
 export default {
 	name: 'layoutColumnsAside',
 	setup() {
@@ -51,13 +60,21 @@ export default {
 		const state: any = reactive({
 			columnsAsideList: [],
 			liIndex: 0,
+			liOldIndex: null,
+			liHoverIndex: null,
+			liOldPath: null,
 			difference: 0,
 			routeSplit: [],
+			isNavHover: false,
 		});
-		// 设置高亮样式
+		// 设置分栏高亮风格
 		const setColumnsAsideStyle = computed(() => {
 			return store.state.themeConfig.themeConfig.columnsAsideStyle;
 		});
+		// 设置分栏布局风格
+		const setColumnsAsidelayout = computed(() => {
+			return store.state.themeConfig.themeConfig.columnsAsideLayout;
+		});
 		// 设置菜单高亮位置移动
 		const setColumnsAsideMove = (k: number) => {
 			state.liIndex = k;
@@ -70,6 +87,27 @@ export default {
 			if (redirect) router.push(redirect);
 			else router.push(path);
 		};
+		// 鼠标移入时，显示当前的子级菜单
+		const onColumnsAsideMenuMouseenter = (v: Object, k: number) => {
+			let { path } = v;
+			state.liOldPath = path;
+			state.liOldIndex = k;
+			state.liHoverIndex = k;
+			proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(path));
+			store.dispatch('routesList/setColumnsMenuHover', false);
+			store.dispatch('routesList/setColumnsNavHover', true);
+			state.isNavHover = true;
+		};
+		// 鼠标移走时，显示原来的子级菜单
+		const onColumnsAsideMenuMouseleave = async () => {
+			await store.dispatch('routesList/setColumnsNavHover', false);
+			// 添加延时器，防止拿到的 store.state.routesList 值不是最新的
+			setTimeout(() => {
+				const { isColumnsMenuHover, isColumnsNavHover } = store.state.routesList;
+				if (!isColumnsMenuHover && !isColumnsNavHover) proxy.mittBus.emit('restoreDefault');
+			}, 100);
+			// state.isNavHover = false;
+		};
 		// 设置高亮动态位置
 		const onColumnsAsideDown = (k: number) => {
 			nextTick(() => {
@@ -80,6 +118,7 @@ export default {
 		const setFilterRoutes = () => {
 			state.columnsAsideList = filterRoutesFun(store.state.routesList.routesList);
 			const resData: any = setSendChildren(route.path);
+			if (Object.keys(resData).length <= 0) return false;
 			onColumnsAsideDown(resData.item[0].k);
 			proxy.mittBus.emit('setSendColumnsChildren', resData);
 		};
@@ -113,20 +152,36 @@ export default {
 			state.routeSplit.shift();
 			const routeFirst = `/${state.routeSplit[0]}`;
 			const currentSplitRoute = state.columnsAsideList.find((v: any) => v.path === routeFirst);
+			if (!currentSplitRoute) return false;
 			// 延迟拿值，防止取不到
 			setTimeout(() => {
 				onColumnsAsideDown(currentSplitRoute.k);
 			}, 0);
 		};
-		// 监听路由的变化，动态赋值给菜单中
+		// 监听布局配置信息的变化，动态增加菜单高亮位置移动像素
 		watch(store.state, (val) => {
 			val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
-			if (val.routesList.routesList.length === state.columnsAsideList.length) return false;
-			setFilterRoutes();
+			if (!val.routesList.isColumnsMenuHover && !val.routesList.isColumnsNavHover) {
+				state.liHoverIndex = null;
+				proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(route.path));
+			} else {
+				state.liHoverIndex = state.liOldIndex;
+				if (!state.liOldPath) return false;
+				proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(state.liOldPath));
+			}
 		});
 		// 页面加载时
 		onMounted(() => {
 			setFilterRoutes();
+			// 销毁变量，防止鼠标再次移入时，保留了上次的记录
+			proxy.mittBus.on('restoreDefault', () => {
+				state.liOldIndex = null;
+				state.liOldPath = null;
+			});
+		});
+		// 页面卸载时
+		onUnmounted(() => {
+			proxy.mittBus.off('restoreDefault', () => {});
 		});
 		// 路由更新时
 		onBeforeRouteUpdate((to) => {
@@ -138,7 +193,10 @@ export default {
 			columnsAsideActiveRef,
 			onColumnsAsideDown,
 			setColumnsAsideStyle,
+			setColumnsAsidelayout,
 			onColumnsAsideMenuClick,
+			onColumnsAsideMenuMouseenter,
+			onColumnsAsideMenuMouseleave,
 			...toRefs(state),
 		};
 	},
@@ -147,7 +205,7 @@ export default {
 
 <style scoped lang="scss">
 .layout-columns-aside {
-	width: 64px;
+	width: 70px;
 	height: 100%;
 	background: var(--bg-columnsMenuBar);
 	ul {
@@ -161,29 +219,51 @@ export default {
 			cursor: pointer;
 			position: relative;
 			z-index: 1;
-			.layout-columns-aside-li-box {
+			.columns-vertical {
 				margin: auto;
-				.layout-columns-aside-li-box-title {
+				.columns-vertical-title {
 					padding-top: 1px;
 				}
 			}
+			.columns-horizontal {
+				display: flex;
+				height: 50px;
+				width: 100%;
+				align-items: center;
+				padding: 0 5px;
+				i {
+					margin-right: 3px;
+				}
+				a {
+					display: flex;
+					.columns-horizontal-title {
+						padding-top: 1px;
+					}
+				}
+			}
 			a {
 				text-decoration: none;
 				color: var(--bg-columnsMenuBarColor);
 			}
 		}
 		.layout-columns-active {
-			color: #ffffff;
+			color: var(--color-whites) !important;
 			transition: 0.3s ease-in-out;
 		}
+		.layout-columns-hover {
+			color: var(--color-primary);
+			a {
+				color: var(--color-primary);
+			}
+		}
 		.columns-round {
 			background: var(--color-primary);
-			color: #ffffff;
+			color: var(--color-whites);
 			position: absolute;
 			left: 50%;
 			top: 2px;
 			height: 44px;
-			width: 58px;
+			width: 65px;
 			transform: translateX(-50%);
 			z-index: 0;
 			transition: 0.3s ease-in-out;

src/layout/component/header.vue

@@ -1,13 +1,13 @@
 <template>
-	<el-header class="layout-header" :height="setHeaderHeight">
+	<el-header class="layout-header" :height="setHeaderHeight" v-show="!isTagsViewCurrenFull">
 		<NavBarsIndex />
 	</el-header>
 </template>
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
-import NavBarsIndex from '/@/views/layout/navBars/index.vue';
+import { useStore } from '/@/store/index';
+import NavBarsIndex from '/@/layout/navBars/index.vue';
 export default {
 	name: 'layoutHeader',
 	components: { NavBarsIndex },
@@ -19,8 +19,13 @@ export default {
 			if (isTagsview && layout !== 'classic') return '84px';
 			else return '50px';
 		});
+		// 获取卡片全屏信息
+		const isTagsViewCurrenFull = computed(() => {
+			return store.state.tagsViewRoutes.isTagsViewCurrenFull;
+		});
 		return {
 			setHeaderHeight,
+			isTagsViewCurrenFull,
 		};
 	},
 };

src/layout/component/main.vue

@@ -3,68 +3,53 @@
 		<el-scrollbar
 			class="layout-scrollbar"
 			ref="layoutScrollbarRef"
-			v-show="!currentRouteMeta.isLink && !currentRouteMeta.isIframe"
-			:style="{ minHeight: `calc(100vh - ${headerHeight}` }"
+			:style="{
+				minHeight: `calc(100vh - ${headerHeight})`,
+				padding: currentRouteMeta.isLink && currentRouteMeta.isIframe ? 0 : '',
+				transition: 'padding 0.3s ease-in-out',
+			}"
 		>
 			<LayoutParentView />
 			<Footer v-if="getThemeConfig.isFooter" />
 		</el-scrollbar>
-		<Link :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 lang="ts">
 import { computed, defineComponent, toRefs, reactive, getCurrentInstance, watch, onBeforeMount } from 'vue';
+import { useStore } from '/@/store/index';
 import { useRoute } from 'vue-router';
-import { useStore } from '/@/store/index.ts';
-import LayoutParentView from '/@/views/layout/routerView/parent.vue';
-import Footer from '/@/views/layout/footer/index.vue';
-import Link from '/@/views/layout/routerView/link.vue';
-import Iframes from '/@/views/layout/routerView/iframes.vue';
+import LayoutParentView from '/@/layout/routerView/parent.vue';
+import Footer from '/@/layout/footer/index.vue';
 export default defineComponent({
 	name: 'layoutMain',
-	components: { LayoutParentView, Footer, Link, Iframes },
+	components: { LayoutParentView, Footer },
 	setup() {
 		const { proxy } = getCurrentInstance() as any;
-		const store = useStore();
 		const route = useRoute();
+		const store = useStore();
 		const state = reactive({
 			headerHeight: '',
 			currentRouteMeta: {},
-			isShowLink: false,
 		});
 		// 获取布局配置信息
 		const getThemeConfig = computed(() => {
 			return store.state.themeConfig.themeConfig;
 		});
-		// 子组件触发更新
-		const onGetCurrentRouteMeta = () => {
-			initCurrentRouteMeta(route.meta);
-		};
-		// 初始化当前路由 meta 信息
-		const initCurrentRouteMeta = (meta: object) => {
-			state.isShowLink = false;
-			state.currentRouteMeta = meta;
-			setTimeout(() => {
-				state.isShowLink = true;
-			}, 100);
-		};
 		// 设置 main 的高度
 		const initHeaderHeight = () => {
 			let { isTagsview } = store.state.themeConfig.themeConfig;
 			if (isTagsview) return (state.headerHeight = `84px`);
 			else return (state.headerHeight = `50px`);
 		};
+		// 初始化获取当前路由 meta，用于设置 iframes padding
+		const initGetMeta = () => {
+			state.currentRouteMeta = route.meta;
+		};
 		// 页面加载前
 		onBeforeMount(() => {
-			initCurrentRouteMeta(route.meta);
 			initHeaderHeight();
+			initGetMeta();
 		});
 		// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
 		watch(store.state.themeConfig.themeConfig, (val) => {
@@ -74,18 +59,15 @@ export default defineComponent({
 				proxy.$refs.layoutScrollbarRef.update();
 			}
 		});
-		// 监听路由的变化
+		// 监听路由变化
 		watch(
 			() => route.path,
 			() => {
-				initCurrentRouteMeta(route.meta);
-				proxy.$refs.layoutScrollbarRef.wrap.scrollTop = 0;
+				state.currentRouteMeta = route.meta;
 			}
 		);
 		return {
 			getThemeConfig,
-			initCurrentRouteMeta,
-			onGetCurrentRouteMeta,
 			...toRefs(state),
 		};
 	},

src/layout/footer/index.vue

@@ -2,7 +2,7 @@
 	<div class="layout-footer mt15" v-show="isDelayFooter">
 		<div class="layout-footer-warp">
 			<div>vue-next-admin，Made by lyt with ❤️</div>
-			<div class="mt5">Copyright 深圳市 xxx 软件科技有限公司</div>
+			<div class="mt5">{{ $t('message.copyright.one5') }}</div>
 		</div>
 	</div>
 </template>
@@ -36,7 +36,7 @@ export default {
 	display: flex;
 	&-warp {
 		margin: auto;
-		color: #9e9e9e;
+		color: var(--el-text-color-secondary);
 		text-align: center;
 		animation: logoAnimation 0.3s ease-in-out;
 	}

src/layout/index.vue

@@ -6,17 +6,16 @@
 </template>
 
 <script lang="ts">
-import { computed, onBeforeMount, onUnmounted, getCurrentInstance, defineAsyncComponent } from 'vue';
-import { useStore } from '/@/store/index.ts';
-import { getLocal } from '/@/utils/storage.ts';
+import { computed, onBeforeMount, onUnmounted, getCurrentInstance } from 'vue';
+import { useStore } from '/@/store/index';
+import { Local } from '/@/utils/storage';
+import Defaults from '/@/layout/main/defaults.vue';
+import Classic from '/@/layout/main/classic.vue';
+import Transverse from '/@/layout/main/transverse.vue';
+import Columns from '/@/layout/main/columns.vue';
 export default {
 	name: 'layout',
-	components: {
-		Defaults: defineAsyncComponent(() => import('/@/views/layout/main/defaults.vue')),
-		Classic: defineAsyncComponent(() => import('/@/views/layout/main/classic.vue')),
-		Transverse: defineAsyncComponent(() => import('/@/views/layout/main/transverse.vue')),
-		Columns: defineAsyncComponent(() => import('/@/views/layout/main/columns.vue')),
-	},
+	components: { Defaults, Classic, Transverse, Columns },
 	setup() {
 		const { proxy } = getCurrentInstance() as any;
 		const store = useStore();
@@ -26,6 +25,7 @@ export default {
 		});
 		// 窗口大小改变时(适配移动端)
 		const onLayoutResize = () => {
+			if (!Local.get('oldLayout')) Local.set('oldLayout', getThemeConfig.value.layout);
 			const clientWidth = document.body.clientWidth;
 			if (clientWidth < 1000) {
 				getThemeConfig.value.isCollapse = false;
@@ -35,7 +35,7 @@ export default {
 				});
 			} else {
 				proxy.mittBus.emit('layoutMobileResize', {
-					layout: getLocal('oldLayout') ? getLocal('oldLayout') : 'defaults',
+					layout: Local.get('oldLayout') ? Local.get('oldLayout') : getThemeConfig.value.layout,
 					clientWidth,
 				});
 			}

src/layout/lockScreen/index.vue

@@ -19,6 +19,10 @@
 					</div>
 					<div class="layout-lock-screen-date-box-info">{{ time.mdq }}</div>
 				</div>
+				<div class="layout-lock-screen-date-top">
+					<i class="el-icon-top"></i>
+					<div class="layout-lock-screen-date-top-text">上滑解锁</div>
+				</div>
 			</div>
 			<transition name="el-zoom-in-center">
 				<div v-show="isShowLoockLogin" class="layout-lock-screen-login">
@@ -52,11 +56,11 @@
 </template>
 
 <script lang="ts">
-import { nextTick, onMounted, reactive, toRefs, ref, onUnmounted, getCurrentInstance } from 'vue';
-import { useStore } from '/@/store/index.ts';
-import { formatDate } from '/@/utils/formatTime.ts';
-import { setLocal } from '/@/utils/storage.ts';
-export default {
+import { nextTick, onMounted, reactive, toRefs, ref, onUnmounted, getCurrentInstance, defineComponent } from 'vue';
+import { useStore } from '/@/store/index';
+import { formatDate } from '/@/utils/formatTime';
+import { Local } from '/@/utils/storage';
+export default defineComponent({
 	name: 'layoutLockScreen',
 	setup() {
 		const { proxy } = getCurrentInstance() as any;
@@ -140,7 +144,7 @@ export default {
 		const initLockScreen = () => {
 			if (store.state.themeConfig.themeConfig.isLockScreen) {
 				state.isShowLockScreenIntervalTime = window.setInterval(() => {
-					if (store.state.themeConfig.themeConfig.lockScreenTime <= 0) {
+					if (store.state.themeConfig.themeConfig.lockScreenTime <= 1) {
 						state.isShowLockScreen = true;
 						setLocalThemeConfig();
 						return false;
@@ -154,7 +158,7 @@ export default {
 		// 存储布局配置
 		const setLocalThemeConfig = () => {
 			store.state.themeConfig.themeConfig.isDrawer = false;
-			setLocal('themeConfig', store.state.themeConfig.themeConfig);
+			Local.set('themeConfig', store.state.themeConfig.themeConfig);
 		};
 		// 密码输入点击事件
 		const onLockScreenSubmit = () => {
@@ -182,7 +186,7 @@ export default {
 			...toRefs(state),
 		};
 	},
-};
+});
 </script>
 
 <style scoped lang="scss">
@@ -194,16 +198,16 @@ export default {
 	height: 100%;
 }
 .layout-lock-screen-filter {
-	filter: blur(5px);
+	filter: blur(1px);
 }
 .layout-lock-screen-mask {
-	background: rgba(255, 255, 255, 1);
+	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://img6.bdstatic.com/img/image/pcindex/sunjunpchuazhoutu.JPG');
+	background-image: url('https://gitee.com/lyt-top/vue-next-admin-images/raw/master/images/03.jpg');
 	background-size: 100% 100%;
 	z-index: 9999991;
 }
@@ -216,7 +220,7 @@ export default {
 		top: 0;
 		width: 100%;
 		height: 100%;
-		color: #ffffff;
+		color: var(--el-color-white);
 		z-index: 9999993;
 		user-select: none;
 		&-box {
@@ -225,14 +229,64 @@ export default {
 			bottom: 50px;
 			&-time {
 				font-size: 100px;
+				color: var(--color-whites);
 			}
 			&-info {
 				font-size: 40px;
+				color: var(--color-whites);
 			}
 			&-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(--color-whites);
+			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(--color-whites);
+				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(--color-whites);
+				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;
@@ -244,7 +298,7 @@ export default {
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-		color: #ffffff;
+		color: var(--color-whites);
 		&-box {
 			text-align: center;
 			margin: auto;
@@ -280,13 +334,13 @@ export default {
 	}
 }
 ::v-deep(.el-input-group__append) {
-	background: #ffffff;
+	background: var(--el-color-white);
 	padding: 0px 15px;
 }
 ::v-deep(.el-input__inner) {
-	border-right-color: #f6f6f6;
+	border-right-color: var(--el-border-color-extra-light);
 	&:hover {
-		border-color: #f6f6f6;
+		border-color: var(--el-border-color-extra-light);
 	}
 }
 </style>

src/layout/logo/index.vue

@@ -10,7 +10,7 @@
 
 <script lang="ts">
 import { computed, getCurrentInstance } from 'vue';
-import { useStore } from '/@/store/index.ts';
+import { useStore } from '/@/store/index';
 export default {
 	name: 'layoutLogo',
 	setup() {

src/layout/main/classic.vue

@@ -14,11 +14,11 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
-import Aside from '/@/views/layout/component/aside.vue';
-import Header from '/@/views/layout/component/header.vue';
-import Main from '/@/views/layout/component/main.vue';
-import TagsView from '/@/views/layout/navBars/tagsView/tagsView.vue';
+import { useStore } from '/@/store/index';
+import Aside from '/@/layout/component/aside.vue';
+import Header from '/@/layout/component/header.vue';
+import Main from '/@/layout/component/main.vue';
+import TagsView from '/@/layout/navBars/tagsView/tagsView.vue';
 export default {
 	name: 'layoutClassic',
 	components: { Aside, Header, Main, TagsView },

src/layout/main/columns.vue

@@ -3,9 +3,9 @@
 		<ColumnsAside />
 		<div class="layout-columns-warp">
 			<Aside />
-			<el-container class="flex-center layout-backtop">
+			<el-container class="flex-center layout-backtop" :class="{ 'layout-backtop': !isFixedHeader }">
 				<Header v-if="isFixedHeader" />
-				<el-scrollbar>
+				<el-scrollbar :class="{ 'layout-backtop': isFixedHeader }">
 					<Header v-if="!isFixedHeader" />
 					<Main />
 				</el-scrollbar>
@@ -17,11 +17,11 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
-import Aside from '/@/views/layout/component/aside.vue';
-import Header from '/@/views/layout/component/header.vue';
-import Main from '/@/views/layout/component/main.vue';
-import ColumnsAside from '/@/views/layout/component/columnsAside.vue';
+import { useStore } from '/@/store/index';
+import Aside from '/@/layout/component/aside.vue';
+import Header from '/@/layout/component/header.vue';
+import Main from '/@/layout/component/main.vue';
+import ColumnsAside from '/@/layout/component/columnsAside.vue';
 export default {
 	name: 'layoutColumns',
 	components: { Aside, Header, Main, ColumnsAside },

src/layout/main/defaults.vue

@@ -1,9 +1,9 @@
 <template>
 	<el-container class="layout-container">
 		<Aside />
-		<el-container class="flex-center layout-backtop">
+		<el-container class="flex-center" :class="{ 'layout-backtop': !isFixedHeader }">
 			<Header v-if="isFixedHeader" />
-			<el-scrollbar ref="layoutDefaultsScrollbarRef">
+			<el-scrollbar ref="layoutDefaultsScrollbarRef" :class="{ 'layout-backtop': isFixedHeader }">
 				<Header v-if="!isFixedHeader" />
 				<Main />
 			</el-scrollbar>
@@ -15,15 +15,15 @@
 <script lang="ts">
 import { computed, getCurrentInstance, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import { useStore } from '/@/store/index.ts';
-import Aside from '/@/views/layout/component/aside.vue';
-import Header from '/@/views/layout/component/header.vue';
-import Main from '/@/views/layout/component/main.vue';
+import { useStore } from '/@/store/index';
+import Aside from '/@/layout/component/aside.vue';
+import Header from '/@/layout/component/header.vue';
+import Main from '/@/layout/component/main.vue';
 export default {
 	name: 'layoutDefaults',
 	components: { Aside, Header, Main },
 	setup() {
-		const { proxy } = getCurrentInstance();
+		const { proxy } = getCurrentInstance() as any;
 		const store = useStore();
 		const route = useRoute();
 		const isFixedHeader = computed(() => {
@@ -33,7 +33,7 @@ export default {
 		watch(
 			() => route.path,
 			() => {
-				proxy.$refs.layoutDefaultsScrollbarRef.wrap.scrollTop = 0;
+				proxy.$refs.layoutDefaultsScrollbarRef.wrap$.scrollTop = 0;
 			}
 		);
 		return {

src/layout/main/transverse.vue

@@ -7,8 +7,8 @@
 </template>
 
 <script lang="ts">
-import Header from '/@/views/layout/component/header.vue';
-import Main from '/@/views/layout/component/main.vue';
+import Header from '/@/layout/component/header.vue';
+import Main from '/@/layout/component/main.vue';
 export default {
 	name: 'layoutTransverse',
 	components: { Header, Main },

src/layout/navBars/breadcrumb/breadcrumb.vue

@@ -1,18 +1,18 @@
 <template>
-	<div class="layout-navbars-breadcrumb" v-show="getThemeConfig.isBreadcrumb">
-		<i
+	<div class="layout-navbars-breadcrumb" :style="{ display: isShowBreadcrumb }">
+		<SvgIcon
 			class="layout-navbars-breadcrumb-icon"
-			:class="getThemeConfig.isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'"
+			:name="getThemeConfig.isCollapse ? 'elementExpand' : 'elementFold'"
 			@click="onThemeConfigChange"
-		></i>
+		/>
 		<el-breadcrumb class="layout-navbars-breadcrumb-hide">
 			<transition-group name="breadcrumb" mode="out-in">
 				<el-breadcrumb-item v-for="(v, k) in breadcrumbList" :key="v.meta.title">
 					<span v-if="k === breadcrumbList.length - 1" class="layout-navbars-breadcrumb-span">
-						<i :class="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="getThemeConfig.isBreadcrumbIcon"></i>{{ $t(v.meta.title) }}
+						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="getThemeConfig.isBreadcrumbIcon" />{{ $t(v.meta.title) }}
 					</span>
 					<a v-else @click.prevent="onBreadcrumbClick(v)">
-						<i :class="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="getThemeConfig.isBreadcrumbIcon"></i>{{ $t(v.meta.title) }}
+						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="getThemeConfig.isBreadcrumbIcon" />{{ $t(v.meta.title) }}
 					</a>
 				</el-breadcrumb-item>
 			</transition-group>
@@ -23,7 +23,7 @@
 <script lang="ts">
 import { toRefs, reactive, computed, getCurrentInstance, onMounted } from 'vue';
 import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
-import { useStore } from '/@/store/index.ts';
+import { useStore } from '/@/store/index';
 export default {
 	name: 'layoutBreadcrumb',
 	setup() {
@@ -41,6 +41,16 @@ export default {
 		const getThemeConfig = computed(() => {
 			return store.state.themeConfig.themeConfig;
 		});
+		// 动态设置经典、横向布局不显示
+		const isShowBreadcrumb = computed(() => {
+			initRouteSplit(route.path);
+			const { layout, isBreadcrumb } = store.state.themeConfig.themeConfig;
+			if (layout === 'classic' || layout === 'transverse') {
+				return 'none';
+			} else {
+				return isBreadcrumb ? '' : 'none';
+			}
+		});
 		// 面包屑点击时
 		const onBreadcrumbClick = (v: any) => {
 			const { redirect, path } = v;
@@ -85,6 +95,7 @@ export default {
 		});
 		return {
 			onThemeConfigChange,
+			isShowBreadcrumb,
 			getThemeConfig,
 			onBreadcrumbClick,
 			...toRefs(state),

src/layout/navBars/breadcrumb/closeFull.vue

@@ -0,0 +1,65 @@
+<template>
+	<div class="layout-navbars-close-full" v-if="isTagsViewCurrenFull">
+		<div class="layout-navbars-close-full-box" :title="$t('message.tagsView.closeFullscreen')" @click="onCloseFullscreen">
+			<SvgIcon name="elementClose" />
+		</div>
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, computed } from 'vue';
+import { useStore } from '/@/store/index';
+export default {
+	name: 'layoutCloseFull',
+	setup() {
+		const store = useStore();
+		const state: any = reactive({});
+		// 获取卡片全屏信息
+		const isTagsViewCurrenFull = computed(() => {
+			return store.state.tagsViewRoutes.isTagsViewCurrenFull;
+		});
+		// 关闭当前全屏
+		const onCloseFullscreen = () => {
+			store.dispatch('tagsViewRoutes/setCurrenFullscreen', false);
+		};
+		return {
+			isTagsViewCurrenFull,
+			onCloseFullscreen,
+			...toRefs(state),
+		};
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-close-full {
+	position: fixed;
+	z-index: 9999999999;
+	right: -30px;
+	top: -30px;
+	.layout-navbars-close-full-box {
+		width: 60px;
+		height: 60px;
+		border-radius: 100%;
+		position: relative;
+		cursor: pointer;
+		background: rgba(0, 0, 0, 0.1);
+		transition: all 0.3s ease;
+		i {
+			position: absolute;
+			left: 11px;
+			top: 35px;
+			color: #333333;
+			transition: all 0.3s ease;
+		}
+		&:hover {
+			background: rgba(0, 0, 0, 0.2);
+			transition: all 0.3s ease;
+			i {
+				color: var(--color-primary);
+				transition: all 0.3s ease;
+			}
+		}
+	}
+}
+</style>

src/layout/navBars/breadcrumb/index.vue

@@ -8,13 +8,13 @@
 </template>
 
 <script lang="ts">
-import { computed, reactive, toRefs, onMounted, onUnmounted, getCurrentInstance, watch } from 'vue';
+import { computed, reactive, toRefs, onMounted, onUnmounted, getCurrentInstance } from 'vue';
 import { useRoute } from 'vue-router';
-import { useStore } from '/@/store/index.ts';
-import Breadcrumb from '/@/views/layout/navBars/breadcrumb/breadcrumb.vue';
-import User from '/@/views/layout/navBars/breadcrumb/user.vue';
-import Logo from '/@/views/layout/logo/index.vue';
-import Horizontal from '/@/views/layout/navMenu/horizontal.vue';
+import { useStore } from '/@/store/index';
+import Breadcrumb from '/@/layout/navBars/breadcrumb/breadcrumb.vue';
+import User from '/@/layout/navBars/breadcrumb/user.vue';
+import Logo from '/@/layout/logo/index.vue';
+import Horizontal from '/@/layout/navMenu/horizontal.vue';
 export default {
 	name: 'layoutBreadcrumbIndex',
 	components: { Breadcrumb, User, Logo, Horizontal },
@@ -81,11 +81,6 @@ export default {
 			});
 			return currentData;
 		};
-		// 监听路由的变化，动态赋值给菜单中
-		watch(store.state, (val) => {
-			if (val.routesList.routesList.length === state.menuList.length) return false;
-			setFilterRoutes();
-		});
 		// 页面加载时
 		onMounted(() => {
 			setFilterRoutes();
@@ -114,7 +109,6 @@ export default {
 	align-items: center;
 	padding-right: 15px;
 	background: var(--bg-topBar);
-	overflow: hidden;
 	border-bottom: 1px solid #f1f2f3;
 }
 </style>

src/layout/navBars/breadcrumb/search.vue

@@ -5,13 +5,20 @@
 				v-model="menuQuery"
 				:fetch-suggestions="menuSearch"
 				:placeholder="$t('message.user.searchPlaceholder')"
-				prefix-icon="el-icon-search"
 				ref="layoutMenuAutocompleteRef"
 				@select="onHandleSelect"
 				@blur="onSearchBlur"
 			>
+				<template #prefix>
+					<el-icon class="el-input__icon">
+						<elementSearch />
+					</el-icon>
+				</template>
 				<template #default="{ item }">
-					<div><i :class="item.meta.icon" class="mr10"></i>{{ $t(item.meta.title) }}</div>
+					<div>
+						<SvgIcon :name="item.meta.icon" class="mr5" />
+						{{ $t(item.meta.title) }}
+					</div>
 				</template>
 			</el-autocomplete>
 		</el-dialog>
@@ -21,11 +28,13 @@
 <script lang="ts">
 import { reactive, toRefs, defineComponent, ref, nextTick } from 'vue';
 import { useRouter } from 'vue-router';
-import { useStore } from '/@/store/index.ts';
+import { useI18n } from 'vue-i18n';
+import { useStore } from '/@/store/index';
 export default defineComponent({
 	name: 'layoutBreadcrumbSearch',
 	setup() {
 		const layoutMenuAutocompleteRef = ref();
+		const { t } = useI18n();
 		const store = useStore();
 		const router = useRouter();
 		const state: any = reactive({
@@ -56,7 +65,8 @@ export default defineComponent({
 			return (restaurant: any) => {
 				return (
 					restaurant.path.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
-					restaurant.meta.title.toLowerCase().indexOf(queryString.toLowerCase()) > -1
+					restaurant.meta.title.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
+					t(restaurant.meta.title).indexOf(queryString.toLowerCase()) > -1
 				);
 			};
 		};

src/layout/navBars/breadcrumb/setings.vue

@@ -94,6 +94,12 @@
 						<el-switch v-model="getThemeConfig.isMenuBarColorGradual" @change="onMenuBarGradualChange"></el-switch>
 					</div>
 				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt14">
+					<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" @change="onColumnsMenuBarGradualChange"></el-switch>
+					</div>
+				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt14">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsMenuBarColorHighlight') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
@@ -140,7 +146,7 @@
 						<el-input-number
 							v-model="getThemeConfig.lockScreenTime"
 							controls-position="right"
-							:min="0"
+							:min="1"
 							:max="9999"
 							@change="setLocalThemeConfig"
 							size="mini"
@@ -158,12 +164,15 @@
 						<el-switch v-model="getThemeConfig.isShowLogo" @change="onIsShowLogoChange"></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"
+					:style="{ opacity: getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse' ? 0.5 : 1 }"
+				>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsBreadcrumb') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch
 							v-model="getThemeConfig.isBreadcrumb"
-							:disabled="getThemeConfig.layout === 'transverse'"
+							:disabled="getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse'"
 							@change="onIsBreadcrumbChange"
 						></el-switch>
 					</div>
@@ -198,6 +207,12 @@
 						<el-switch v-model="getThemeConfig.isSortableTagsView" @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" @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">
@@ -216,6 +231,12 @@
 						<el-switch v-model="getThemeConfig.isInvert" @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.fourIsDark') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isIsDark" @change="onAddDarkChange"></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">
@@ -252,7 +273,7 @@
 						</el-select>
 					</div>
 				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15 mb28">
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideStyle') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-select v-model="getThemeConfig.columnsAsideStyle" placeholder="请选择" size="mini" style="width: 90px" @change="setLocalThemeConfig">
@@ -261,6 +282,15 @@
 						</el-select>
 					</div>
 				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15 mb27">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideLayout') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-select v-model="getThemeConfig.columnsAsideLayout" placeholder="请选择" size="mini" style="width: 90px" @change="setLocalThemeConfig">
+							<el-option label="水平" value="columns-horizontal"></el-option>
+							<el-option label="垂直" value="columns-vertical"></el-option>
+						</el-select>
+					</div>
+				</div>
 
 				<!-- 布局切换 -->
 				<el-divider content-position="left">{{ $t('message.layout.sixTitle') }}</el-divider>
@@ -332,14 +362,17 @@
 				</div>
 				<div class="copy-config">
 					<el-alert :title="$t('message.layout.tipText')" type="warning" :closable="false"> </el-alert>
-					<el-button
-						size="small"
-						class="copy-config-btn"
-						icon="el-icon-document-copy"
-						type="primary"
-						ref="copyConfigBtnRef"
-						@click="onCopyConfigClick($event.target)"
-						>{{ $t('message.layout.copyText') }}
+					<el-button size="small" class="copy-config-btn" type="primary" ref="copyConfigBtnRef" @click="onCopyConfigClick">
+						<el-icon>
+							<elementCopyDocument />
+						</el-icon>
+						{{ $t('message.layout.copyText') }}
+					</el-button>
+					<el-button size="small" class="copy-config-btn-reset" type="info" @click="onResetConfigClick">
+						<el-icon>
+							<elementRefreshRight />
+						</el-icon>
+						{{ $t('message.layout.resetText') }}
 					</el-button>
 				</div>
 			</el-scrollbar>
@@ -348,22 +381,19 @@
 </template>
 
 <script lang="ts">
-import { nextTick, onUnmounted, onMounted, getCurrentInstance, defineComponent, computed, ref } from 'vue';
-import { ElMessage } from 'element-plus';
-import ClipboardJS from 'clipboard';
-import { useI18n } from 'vue-i18n';
-import { useStore } from '/@/store/index.ts';
-import { getLightColor } from '/@/utils/theme.ts';
-import Watermark from '/@/utils/wartermark.ts';
-import { verifyAndSpace } from '/@/utils/toolsValidate.ts';
-import { setLocal, getLocal, removeLocal } from '/@/utils/storage.ts';
+import { nextTick, onUnmounted, onMounted, getCurrentInstance, defineComponent, computed } from 'vue';
+import { useStore } from '/@/store/index';
+import { getLightColor } from '/@/utils/theme';
+import { verifyAndSpace } from '/@/utils/toolsValidate';
+import { Local } from '/@/utils/storage';
+import Watermark from '/@/utils/wartermark';
+import commonFunction from '/@/utils/commonFunction';
 export default defineComponent({
 	name: 'layoutBreadcrumbSeting',
 	setup() {
-		const { t } = useI18n();
 		const { proxy } = getCurrentInstance() as any;
-		const copyConfigBtnRef = ref();
 		const store = useStore();
+		const { copyText } = commonFunction();
 		// 获取布局配置信息
 		const getThemeConfig = computed(() => {
 			return store.state.themeConfig.themeConfig;
@@ -385,6 +415,7 @@ export default defineComponent({
 			document.documentElement.style.setProperty(`--bg-${bg}`, getThemeConfig.value[bg]);
 			onTopBarGradualChange();
 			onMenuBarGradualChange();
+			onColumnsMenuBarGradualChange();
 			setDispatchThemeConfig();
 		};
 		// 2、菜单 / 顶栏 --> 顶栏背景渐变
@@ -395,6 +426,10 @@ export default defineComponent({
 		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(() => {
@@ -403,10 +438,6 @@ export default defineComponent({
 				if (bool) els.setAttribute('style', `background-image:linear-gradient(to bottom left , ${color}, ${getLightColor(color, 0.6)})`);
 				else els.setAttribute('style', `background-image:${color}`);
 				setLocalThemeConfig();
-				const elNavbars: any = document.querySelector('.layout-navbars-breadcrumb-index');
-				const elAside: any = document.querySelector('.layout-container .el-aside');
-				if (elNavbars) setLocal('navbarsBgStyle', elNavbars.style.cssText);
-				if (elAside) setLocal('asideBgStyle', elAside.style.cssText);
 			});
 		};
 		// 2、菜单 / 顶栏 --> 菜单字体背景高亮
@@ -419,7 +450,7 @@ export default defineComponent({
 					if (getThemeConfig.value.isMenuBarColorHighlight) {
 						elsItems.forEach((el: any) => el.setAttribute('id', ``));
 						elActive.setAttribute('id', `add-is-active`);
-						setLocal('menuBarHighlightId', elActive.getAttribute('id'));
+						Local.set('menuBarHighlightId', elActive.getAttribute('id'));
 					} else {
 						elActive.setAttribute('id', ``);
 					}
@@ -460,6 +491,11 @@ export default defineComponent({
 			proxy.mittBus.emit('openOrCloseSortable');
 			setLocalThemeConfig();
 		};
+		// 4、界面显示 --> 开启 TagsView 共用
+		const onShareTagsViewChange = () => {
+			proxy.mittBus.emit('openShareTagsView');
+			setLocalThemeConfig();
+		};
 		// 4、界面显示 --> 灰色模式/色弱模式
 		const onAddFilterChange = (attr: string) => {
 			if (attr === 'grayscale') {
@@ -469,10 +505,15 @@ export default defineComponent({
 			}
 			const cssAttr =
 				attr === 'grayscale' ? `grayscale(${getThemeConfig.value.isGrayscale ? 1 : 0})` : `invert(${getThemeConfig.value.isInvert ? '80%' : '0%'})`;
-			const appEle: any = document.querySelector('#app');
+			const appEle: any = document.body;
 			appEle.setAttribute('style', `filter: ${cssAttr}`);
 			setLocalThemeConfig();
-			setLocal('appFilterStyle', appEle.style.cssText);
+		};
+		// 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 = () => {
@@ -488,59 +529,13 @@ export default defineComponent({
 		};
 		// 5、布局切换
 		const onSetLayout = (layout: string) => {
-			setLocal('oldLayout', layout);
+			Local.set('oldLayout', layout);
 			if (getThemeConfig.value.layout === layout) return false;
 			getThemeConfig.value.layout = layout;
 			getThemeConfig.value.isDrawer = false;
-			initSetLayoutChange();
+			initLayoutChangeFun();
 			onMenuBarHighlightChange();
 		};
-		// 设置布局切换，重置主题样式
-		const initSetLayoutChange = () => {
-			if (getThemeConfig.value.layout === 'classic') {
-				getThemeConfig.value.isShowLogo = true;
-				getThemeConfig.value.isBreadcrumb = false;
-				getThemeConfig.value.isCollapse = false;
-				getThemeConfig.value.isClassicSplitMenu = false;
-				getThemeConfig.value.menuBar = '#FFFFFF';
-				getThemeConfig.value.menuBarColor = '#606266';
-				getThemeConfig.value.topBar = '#ffffff';
-				getThemeConfig.value.topBarColor = '#606266';
-				initLayoutChangeFun();
-			} else if (getThemeConfig.value.layout === 'transverse') {
-				getThemeConfig.value.isShowLogo = true;
-				getThemeConfig.value.isBreadcrumb = false;
-				getThemeConfig.value.isCollapse = false;
-				getThemeConfig.value.isTagsview = false;
-				getThemeConfig.value.isClassicSplitMenu = false;
-				getThemeConfig.value.menuBarColor = '#FFFFFF';
-				getThemeConfig.value.topBar = '#545c64';
-				getThemeConfig.value.topBarColor = '#FFFFFF';
-				initLayoutChangeFun();
-			} else if (getThemeConfig.value.layout === 'columns') {
-				getThemeConfig.value.isShowLogo = true;
-				getThemeConfig.value.isBreadcrumb = true;
-				getThemeConfig.value.isCollapse = false;
-				getThemeConfig.value.isTagsview = true;
-				getThemeConfig.value.isClassicSplitMenu = false;
-				getThemeConfig.value.menuBar = '#FFFFFF';
-				getThemeConfig.value.menuBarColor = '#606266';
-				getThemeConfig.value.topBar = '#ffffff';
-				getThemeConfig.value.topBarColor = '#606266';
-				initLayoutChangeFun();
-			} else {
-				getThemeConfig.value.isShowLogo = false;
-				getThemeConfig.value.isBreadcrumb = true;
-				getThemeConfig.value.isCollapse = false;
-				getThemeConfig.value.isTagsview = true;
-				getThemeConfig.value.isClassicSplitMenu = false;
-				getThemeConfig.value.menuBar = '#545c64';
-				getThemeConfig.value.menuBarColor = '#eaeaea';
-				getThemeConfig.value.topBar = '#FFFFFF';
-				getThemeConfig.value.topBarColor = '#606266';
-				initLayoutChangeFun();
-			}
-		};
 		// 设置布局切换函数
 		const initLayoutChangeFun = () => {
 			onBgColorPickerChange('menuBar');
@@ -558,10 +553,6 @@ export default defineComponent({
 		// 布局配置弹窗打开
 		const openDrawer = () => {
 			getThemeConfig.value.isDrawer = true;
-			nextTick(() => {
-				// 初始化复制功能，防止点击两次才可以复制
-				onCopyConfigClick(copyConfigBtnRef.value.$el);
-			});
 		};
 		// 触发 store 布局配置更新
 		const setDispatchThemeConfig = () => {
@@ -570,80 +561,79 @@ export default defineComponent({
 		};
 		// 存储布局配置
 		const setLocalThemeConfig = () => {
-			removeLocal('themeConfig');
-			setLocal('themeConfig', getThemeConfig.value);
+			Local.remove('themeConfig');
+			Local.set('themeConfig', getThemeConfig.value);
 		};
 		// 存储布局配置全局主题样式（html根标签）
 		const setLocalThemeConfigStyle = () => {
-			setLocal('themeConfigStyle', document.documentElement.style.cssText);
+			Local.set('themeConfigStyle', document.documentElement.style.cssText);
 		};
 		// 一键复制配置
-		const onCopyConfigClick = (target: any) => {
-			let copyThemeConfig = getLocal('themeConfig');
+		const onCopyConfigClick = () => {
+			let copyThemeConfig = Local.get('themeConfig');
 			copyThemeConfig.isDrawer = false;
-			const clipboard = new ClipboardJS(target, {
-				text: () => JSON.stringify(copyThemeConfig),
-			});
-			clipboard.on('success', () => {
+			copyText(JSON.stringify(copyThemeConfig)).then(() => {
 				getThemeConfig.value.isDrawer = false;
-				ElMessage.success(t('message.layout.copyTextSuccess'));
-				clipboard.destroy();
-			});
-			clipboard.on('error', () => {
-				ElMessage.error(t('message.layout.copyTextError'));
-				clipboard.destroy();
 			});
 		};
+		// 一键恢复默认
+		const onResetConfigClick = () => {
+			Local.clear();
+			window.location.reload();
+		};
+		// 修复防止退出登录再进入界面时，需要刷新样式才生效的问题，初始化布局样式等(登录的时候触发，目前方案)
+		const initSetStyle = () => {
+			setTimeout(() => {
+				// 2、菜单 / 顶栏 --> 顶栏背景渐变
+				onTopBarGradualChange();
+				// 2、菜单 / 顶栏 --> 菜单背景渐变
+				onMenuBarGradualChange();
+				// 2、菜单 / 顶栏 --> 分栏菜单背景渐变
+				onColumnsMenuBarGradualChange();
+				// 2、菜单 / 顶栏 --> 菜单字体背景高亮
+				onMenuBarHighlightChange();
+			}, 1300);
+		};
 		onMounted(() => {
 			nextTick(() => {
+				// 判断当前布局是否不相同，不相同则初始化当前布局的样式，防止监听窗口大小改变时，布局配置logo、菜单背景等部分布局失效问题
+				if (!Local.get('frequency')) initLayoutChangeFun();
+				Local.set('frequency', 1);
+				// 修复防止退出登录再进入界面时，需要刷新样式才生效的问题，初始化布局样式等(登录的时候触发，目前方案)
+				proxy.mittBus.on('onSignInClick', () => {
+					initSetStyle();
+				});
 				// 监听菜单点击，菜单字体背景高亮
 				proxy.mittBus.on('onMenuClick', () => {
 					onMenuBarHighlightChange();
 				});
 				// 监听窗口大小改变，非默认布局，设置成默认布局（适配移动端）
 				proxy.mittBus.on('layoutMobileResize', (res: any) => {
-					if (getThemeConfig.value.layout === res.layout) return false;
 					getThemeConfig.value.layout = res.layout;
 					getThemeConfig.value.isDrawer = false;
-					initSetLayoutChange();
+					initLayoutChangeFun();
 					onMenuBarHighlightChange();
-					getThemeConfig.value.isCollapse = false;
-				});
-				window.addEventListener('load', () => {
-					// 刷新页面时，设置了值，直接取缓存中的值进行初始化
-					setTimeout(() => {
-						// 顶栏背景渐变
-						if (getLocal('navbarsBgStyle') && getThemeConfig.value.isTopBarColorGradual) {
-							const breadcrumbIndexEl: any = document.querySelector('.layout-navbars-breadcrumb-index');
-							breadcrumbIndexEl.style.cssText = getLocal('navbarsBgStyle');
-						}
-						// 菜单背景渐变
-						if (getLocal('asideBgStyle') && getThemeConfig.value.isMenuBarColorGradual) {
-							const asideEl: any = document.querySelector('.layout-container .el-aside');
-							asideEl.style.cssText = getLocal('asideBgStyle');
-						}
-						// 菜单字体背景高亮
-						if (getLocal('menuBarHighlightId') && getThemeConfig.value.isMenuBarColorHighlight) {
-							let els = document.querySelector('.el-menu-item.is-active');
-							if (!els) return false;
-							els.setAttribute('id', getLocal('menuBarHighlightId'));
-						}
-						// 灰色模式/色弱模式
-						if (getLocal('appFilterStyle')) {
-							const appEl: any = document.querySelector('#app');
-							appEl.style.cssText = getLocal('appFilterStyle');
-						}
-						// 开启水印
-						onWartermarkChange();
-						// 语言国际化
-						if (getLocal('themeConfig')) proxy.$i18n.locale = getLocal('themeConfig').globalI18n;
-					}, 1000);
 				});
+				setTimeout(() => {
+					// 修复防止退出登录再进入界面时，需要刷新样式才生效的问题，初始化布局样式等(登录的时候触发，目前方案)
+					initSetStyle();
+					// 灰色模式
+					if (getThemeConfig.value.isGrayscale) onAddFilterChange('grayscale');
+					// 色弱模式
+					if (getThemeConfig.value.isInvert) onAddFilterChange('invert');
+					// 深色模式
+					if (getThemeConfig.value.isIsDark) onAddDarkChange();
+					// 开启水印
+					onWartermarkChange();
+					// 语言国际化
+					if (Local.get('themeConfig')) proxy.$i18n.locale = Local.get('themeConfig').globalI18n;
+				}, 100);
 			});
 		});
 		onUnmounted(() => {
 			// 取消监听菜单点击，菜单字体背景高亮
 			proxy.mittBus.off('onMenuClick');
+			proxy.mittBus.off('onSignInClick');
 			proxy.mittBus.off('layoutMobileResize');
 		});
 		return {
@@ -652,6 +642,7 @@ export default defineComponent({
 			onBgColorPickerChange,
 			onTopBarGradualChange,
 			onMenuBarGradualChange,
+			onColumnsMenuBarGradualChange,
 			onMenuBarHighlightChange,
 			onThemeConfigChange,
 			onIsFixedHeaderChange,
@@ -659,6 +650,7 @@ export default defineComponent({
 			getThemeConfig,
 			onDrawerClose,
 			onAddFilterChange,
+			onAddDarkChange,
 			onWartermarkChange,
 			onWartermarkTextInput,
 			onSetLayout,
@@ -666,8 +658,9 @@ export default defineComponent({
 			onClassicSplitMenuChange,
 			onIsBreadcrumbChange,
 			onSortableTagsViewChange,
-			copyConfigBtnRef,
+			onShareTagsViewChange,
 			onCopyConfigClick,
+			onResetConfigClick,
 		};
 	},
 });
@@ -804,7 +797,8 @@ export default defineComponent({
 			width: 100%;
 			margin-top: 15px;
 		}
-		.copy-config-last-btn {
+		.copy-config-btn-reset {
+			width: 100%;
 			margin: 10px 0 0;
 		}
 	}

src/layout/navBars/breadcrumb/user.vue

@@ -1,5 +1,18 @@
 <template>
 	<div class="layout-navbars-breadcrumb-user" :style="{ flex: layoutUserFlexNum }">
+		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
+			<div class="layout-navbars-breadcrumb-user-icon">
+				<i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
+			</div>
+			<template #dropdown>
+				<el-dropdown-menu>
+					<el-dropdown-item command="" :disabled="disabledSize === ''">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
+					<el-dropdown-item command="medium" :disabled="disabledSize === 'medium'">{{ $t('message.user.dropdownMedium') }}</el-dropdown-item>
+					<el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
+					<el-dropdown-item command="mini" :disabled="disabledSize === 'mini'">{{ $t('message.user.dropdownMini') }}</el-dropdown-item>
+				</el-dropdown-menu>
+			</template>
+		</el-dropdown>
 		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
 			<div class="layout-navbars-breadcrumb-user-icon">
 				<i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>
@@ -13,7 +26,9 @@
 			</template>
 		</el-dropdown>
 		<div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
-			<i class="el-icon-search" :title="$t('message.user.title2')"></i>
+			<el-icon :title="$t('message.user.title2')">
+				<elementSearch />
+			</el-icon>
 		</div>
 		<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
 			<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
@@ -22,7 +37,9 @@
 			<el-popover placement="bottom" trigger="click" v-model:visible="isShowUserNewsPopover" :width="300" popper-class="el-popover-pupop-user-news">
 				<template #reference>
 					<el-badge :is-dot="true" @click="isShowUserNewsPopover = !isShowUserNewsPopover">
-						<i class="el-icon-bell" :title="$t('message.user.title4')"></i>
+						<el-icon :title="$t('message.user.title4')">
+							<elementBell />
+						</el-icon>
 					</el-badge>
 				</template>
 				<transition name="el-zoom-in-top">
@@ -33,7 +50,7 @@
 		<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
 			<i
 				class="iconfont"
-				:title="isScreenfull ? $t('message.user.title5') : $t('message.user.title6')"
+				:title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
 				:class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
 			></i>
 		</div>
@@ -41,11 +58,14 @@
 			<span class="layout-navbars-breadcrumb-user-link">
 				<img :src="getUserInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
 				{{ getUserInfos.userName === '' ? 'test' : getUserInfos.userName }}
-				<i class="el-icon-arrow-down el-icon--right"></i>
+				<el-icon class="el-icon--right">
+					<elementArrowDown />
+				</el-icon>
 			</span>
 			<template #dropdown>
 				<el-dropdown-menu>
 					<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
+					<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
 					<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
 					<el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
 					<el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>
@@ -63,11 +83,12 @@ import { useRouter } from 'vue-router';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import screenfull from 'screenfull';
 import { useI18n } from 'vue-i18n';
-import { resetRoute } from '/@/router/index.ts';
-import { useStore } from '/@/store/index.ts';
-import { clearSession, setLocal, getLocal, removeLocal } from '/@/utils/storage.ts';
-import UserNews from '/@/views/layout/navBars/breadcrumb/userNews.vue';
-import Search from '/@/views/layout/navBars/breadcrumb/search.vue';
+import { resetRoute } from '/@/router/index';
+import { useStore } from '/@/store/index';
+import other from '/@/utils/other';
+import { Session, Local } from '/@/utils/storage';
+import UserNews from '/@/layout/navBars/breadcrumb/userNews.vue';
+import Search from '/@/layout/navBars/breadcrumb/search.vue';
 export default {
 	name: 'layoutBreadcrumbUser',
 	components: { UserNews, Search },
@@ -80,7 +101,8 @@ export default {
 		const state = reactive({
 			isScreenfull: false,
 			isShowUserNewsPopover: false,
-			disabledI18n: false,
+			disabledI18n: 'zh-cn',
+			disabledSize: '',
 		});
 		// 获取用户信息 vuex
 		const getUserInfos = computed(() => {
@@ -105,7 +127,10 @@ export default {
 				return false;
 			}
 			screenfull.toggle();
-			state.isScreenfull = !state.isScreenfull;
+			screenfull.on('change', () => {
+				if (screenfull.isFullscreen) state.isScreenfull = true;
+				else state.isScreenfull = false;
+			});
 		};
 		// 布局配置 icon 点击时
 		const onLayoutSetingClick = () => {
@@ -138,7 +163,7 @@ export default {
 					},
 				})
 					.then(() => {
-						clearSession(); // 清除缓存/token等
+						Session.clear(); // 清除缓存/token等
 						resetRoute(); // 删除/重置路由
 						router.push('/login');
 						setTimeout(() => {
@@ -146,6 +171,8 @@ export default {
 						}, 300);
 					})
 					.catch(() => {});
+			} else if (path === 'wareHouse') {
+				window.open('https://gitee.com/lyt-top/vue-next-admin');
 			} else {
 				router.push(path);
 			}
@@ -154,31 +181,68 @@ export default {
 		const onSearchClick = () => {
 			searchRef.value.openSearch();
 		};
+		// 组件大小改变
+		const onComponentSizeChange = (size: string) => {
+			Local.remove('themeConfig');
+			getThemeConfig.value.globalComponentSize = size;
+			Local.set('themeConfig', getThemeConfig.value);
+			proxy.$ELEMENT.size = size;
+			initComponentSize();
+			window.location.reload();
+		};
 		// 语言切换
 		const onLanguageChange = (lang: string) => {
-			removeLocal('themeConfig');
+			Local.remove('themeConfig');
 			getThemeConfig.value.globalI18n = lang;
-			setLocal('themeConfig', getThemeConfig.value);
+			Local.set('themeConfig', getThemeConfig.value);
 			proxy.$i18n.locale = lang;
 			initI18n();
+			other.useTitle();
+		};
+		// 设置 element plus 组件的国际化
+		const setI18nConfig = (locale: string) => {
+			proxy.mittBus.emit('getI18nConfig', proxy.$i18n.messages[locale]);
 		};
 		// 初始化言语国际化
 		const initI18n = () => {
-			switch (getLocal('themeConfig').globalI18n) {
+			switch (Local.get('themeConfig').globalI18n) {
 				case 'zh-cn':
 					state.disabledI18n = 'zh-cn';
+					setI18nConfig('zh-cn');
 					break;
 				case 'en':
 					state.disabledI18n = 'en';
+					setI18nConfig('en');
 					break;
 				case 'zh-tw':
 					state.disabledI18n = 'zh-tw';
+					setI18nConfig('zh-tw');
+					break;
+			}
+		};
+		// 初始化全局组件大小
+		const initComponentSize = () => {
+			switch (Local.get('themeConfig').globalComponentSize) {
+				case '':
+					state.disabledSize = '';
+					break;
+				case 'medium':
+					state.disabledSize = 'medium';
+					break;
+				case 'small':
+					state.disabledSize = 'small';
+					break;
+				case 'mini':
+					state.disabledSize = 'mini';
 					break;
 			}
 		};
 		// 页面加载时
 		onMounted(() => {
-			if (getLocal('themeConfig')) initI18n();
+			if (Local.get('themeConfig')) {
+				initI18n();
+				initComponentSize();
+			}
 		});
 		return {
 			getUserInfos,
@@ -186,6 +250,7 @@ export default {
 			onHandleCommandClick,
 			onScreenfullClick,
 			onSearchClick,
+			onComponentSizeChange,
 			onLanguageChange,
 			searchRef,
 			layoutUserFlexNum,

src/layout/navBars/index.vue

@@ -7,9 +7,9 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
-import BreadcrumbIndex from '/@/views/layout/navBars/breadcrumb/index.vue';
-import TagsView from '/@/views/layout/navBars/tagsView/tagsView.vue';
+import { useStore } from '/@/store/index';
+import BreadcrumbIndex from '/@/layout/navBars/breadcrumb/index.vue';
+import TagsView from '/@/layout/navBars/tagsView/tagsView.vue';
 export default {
 	name: 'layoutNavBars',
 	components: { BreadcrumbIndex, TagsView },

src/layout/navBars/tagsView/contextmenu.vue

@@ -11,8 +11,15 @@
 		>
 			<ul class="el-dropdown-menu">
 				<template v-for="(v, k) in dropdownList">
-					<li class="el-dropdown-menu__item" aria-disabled="false" tabindex="-1" :key="k" v-if="!v.affix" @click="onCurrentContextmenuClick(v.id)">
-						<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>
@@ -35,30 +42,30 @@ export default defineComponent({
 		const state = reactive({
 			isShow: false,
 			dropdownList: [
-				{ id: 0, txt: 'message.tagsView.refresh', affix: false, icon: 'el-icon-refresh-right' },
-				{ id: 1, txt: 'message.tagsView.close', affix: false, icon: 'el-icon-close' },
-				{ id: 2, txt: 'message.tagsView.closeOther', affix: false, icon: 'el-icon-circle-close' },
-				{ id: 3, txt: 'message.tagsView.closeAll', affix: false, icon: 'el-icon-folder-delete' },
+				{ contextMenuClickId: 0, txt: 'message.tagsView.refresh', affix: false, icon: 'elementRefreshRight' },
+				{ contextMenuClickId: 1, txt: 'message.tagsView.close', affix: false, icon: 'elementClose' },
+				{ contextMenuClickId: 2, txt: 'message.tagsView.closeOther', affix: false, icon: 'elementCircleClose' },
+				{ contextMenuClickId: 3, txt: 'message.tagsView.closeAll', affix: false, icon: 'elementFolderDelete' },
 				{
-					id: 4,
+					contextMenuClickId: 4,
 					txt: 'message.tagsView.fullscreen',
 					affix: false,
 					icon: 'iconfont icon-fullscreen',
 				},
 			],
-			path: {},
+			item: {},
 		});
 		// 父级传过来的坐标 x,y 值
 		const dropdowns = computed(() => {
 			return props.dropdown;
 		});
 		// 当前项菜单点击
-		const onCurrentContextmenuClick = (id: number) => {
-			emit('currentContextmenuClick', { id, path: state.path });
+		const onCurrentContextmenuClick = (contextMenuClickId: number) => {
+			emit('currentContextmenuClick', Object.assign({}, { contextMenuClickId }, state.item));
 		};
 		// 打开右键菜单：判断是否固定，固定则不显示关闭按钮
 		const openContextmenu = (item: any) => {
-			state.path = item.path;
+			state.item = item;
 			item.meta.isAffix ? (state.dropdownList[1].affix = true) : (state.dropdownList[1].affix = false);
 			closeContextmenu();
 			setTimeout(() => {
@@ -95,6 +102,7 @@ export default defineComponent({
 	position: fixed;
 	.el-dropdown-menu__item {
 		font-size: 12px !important;
+		white-space: nowrap;
 		i {
 			font-size: 12px !important;
 		}

src/layout/navBars/tagsView/tagsView.vue

@@ -0,0 +1,656 @@
+<template>
+	<div class="layout-navbars-tagsview" :class="{ 'layout-navbars-tagsview-shadow': getThemeConfig.layout === 'classic' }">
+		<el-scrollbar ref="scrollbarRef" @wheel.native.prevent="onHandleScroll">
+			<ul class="layout-navbars-tagsview-ul" :class="setTagsStyle" ref="tagsUlRef">
+				<li
+					v-for="(v, k) in tagsViewList"
+					:key="k"
+					class="layout-navbars-tagsview-ul-li"
+					:data-url="v.url"
+					:class="{ 'is-active': isActive(v) }"
+					@contextmenu.prevent="onContextmenu(v, $event)"
+					@click="onTagsClick(v, k)"
+					:ref="
+						(el) => {
+							if (el) tagsRefs[k] = el;
+						}
+					"
+				>
+					<i class="iconfont icon-webicon318 layout-navbars-tagsview-ul-li-iconfont font14" v-if="isActive(v)"></i>
+					<SvgIcon :name="v.meta.icon" class="layout-navbars-tagsview-ul-li-iconfont" v-if="!isActive(v) && getThemeConfig.isTagsviewIcon" />
+					<span>{{ $t(v.meta.title) }}</span>
+					<template v-if="isActive(v)">
+						<SvgIcon name="elementRefreshRight" class="ml5" @click.stop="refreshCurrentTagsView($route.fullPath)" />
+						<SvgIcon
+							name="elementClose"
+							class="layout-navbars-tagsview-ul-li-icon layout-icon-active"
+							v-if="!v.meta.isAffix"
+							@click.stop="closeCurrentTagsView(getThemeConfig.isShareTagsView ? v.path : v.url)"
+						/>
+					</template>
+					<SvgIcon
+						name="elementClose"
+						class="layout-navbars-tagsview-ul-li-icon layout-icon-three"
+						v-if="!v.meta.isAffix"
+						@click.stop="closeCurrentTagsView(getThemeConfig.isShareTagsView ? v.path : v.url)"
+					/>
+				</li>
+			</ul>
+		</el-scrollbar>
+		<Contextmenu :dropdown="dropdown" ref="contextmenuRef" @currentContextmenuClick="onCurrentContextmenuClick" />
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, computed, ref, nextTick, onBeforeUpdate, onBeforeMount, onUnmounted, getCurrentInstance, watch } from 'vue';
+import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
+import Sortable from 'sortablejs';
+import { ElMessage } from 'element-plus';
+import { useStore } from '/@/store/index';
+import { Session } from '/@/utils/storage';
+import { isObjectValueEqual } from '/@/utils/arrayOperation';
+import Contextmenu from '/@/layout/navBars/tagsView/contextmenu.vue';
+export default {
+	name: 'layoutTagsView',
+	components: { Contextmenu },
+	setup() {
+		const { proxy } = getCurrentInstance() as any;
+		const tagsRefs = ref([]);
+		const scrollbarRef = ref();
+		const contextmenuRef = ref();
+		const tagsUlRef = ref();
+		const store = useStore();
+		const route = useRoute();
+		const router = useRouter();
+		const state: any = reactive({
+			routeActive: '',
+			routePath: route.path,
+			dropdown: { x: '', y: '' },
+			tagsRefsIndex: 0,
+			tagsViewList: [],
+			sortable: '',
+			tagsViewRoutesList: [],
+		});
+		// 动态设置 tagsView 风格样式
+		const setTagsStyle = computed(() => {
+			return store.state.themeConfig.themeConfig.tagsStyle;
+		});
+		// 获取布局配置信息
+		const getThemeConfig = computed(() => {
+			return store.state.themeConfig.themeConfig;
+		});
+		// 设置 tagsView 高亮
+		const isActive = (v) => {
+			if (getThemeConfig.value.isShareTagsView) {
+				return v.path === state.routePath;
+			} else {
+				return v.url ? v.url === state.routeActive : v.path === state.routeActive;
+			}
+		};
+		// 存储 tagsViewList 到浏览器临时缓存中，页面刷新时，保留记录
+		const addBrowserSetSession = (tagsViewList: Array<object>) => {
+			Session.set('tagsViewList', tagsViewList);
+		};
+		// 获取 vuex 中的 tagsViewRoutes 列表
+		const getTagsViewRoutes = async () => {
+			state.routeActive = await setTagsViewHighlight(route);
+			state.routePath = (await route.meta.isDynamic) ? route.meta.isDynamicPath : route.path;
+			state.tagsViewList = [];
+			state.tagsViewRoutesList = store.state.tagsViewRoutes.tagsViewRoutes;
+			initTagsView();
+		};
+		// vuex 中获取路由信息：如果是设置了固定的（isAffix），进行初始化显示
+		const initTagsView = async () => {
+			if (Session.get('tagsViewList') && getThemeConfig.value.isCacheTagsView) {
+				state.tagsViewList = await Session.get('tagsViewList');
+			} else {
+				await state.tagsViewRoutesList.map((v: any) => {
+					if (v.meta.isAffix && !v.meta.isHide) {
+						v.url = setTagsViewHighlight(v);
+						state.tagsViewList.push({ ...v });
+					}
+				});
+				await addTagsView(route.path, route);
+			}
+			// 初始化当前元素(li)的下标
+			getTagsRefsIndex(getThemeConfig.value.isShareTagsView ? state.routePath : state.routeActive);
+		};
+		// 处理可开启多标签详情，单标签详情（动态路由（xxx/:id/:name"），普通路由处理）
+		const solveAddTagsView = async (path: string, to?: any) => {
+			let isDynamicPath = to.meta.isDynamic ? to.meta.isDynamicPath : path;
+			let current = state.tagsViewList.filter(
+				(v: any) =>
+					v.path === isDynamicPath &&
+					isObjectValueEqual(
+						to.meta.isDynamic ? (v.params ? v.params : null) : v.query ? v.query : null,
+						to.meta.isDynamic ? (to?.params ? to?.params : null) : to?.query ? to?.query : null
+					)
+			);
+			if (current.length <= 0) {
+				// 防止：Avoid app logic that relies on enumerating keys on a component instance. The keys will be empty in production mode to avoid performance overhead.
+				let findItem = state.tagsViewRoutesList.find((v: any) => v.path === isDynamicPath);
+				if (findItem.meta.isAffix) return false;
+				if (findItem.meta.isLink && !findItem.meta.isIframe) return false;
+				to.meta.isDynamic ? (findItem.params = to.params) : (findItem.query = to.query);
+				findItem.url = setTagsViewHighlight(findItem);
+				state.tagsViewList.push({ ...findItem });
+				addBrowserSetSession(state.tagsViewList);
+			}
+		};
+		// 处理单标签时，第二次的值未覆盖第一次的 tagsViewList 值（Session Storage）
+		const singleAddTagsView = (path: string, to?: any) => {
+			let isDynamicPath = to.meta.isDynamic ? to.meta.isDynamicPath : path;
+			state.tagsViewList.forEach((v) => {
+				if (
+					v.path === isDynamicPath &&
+					!isObjectValueEqual(
+						to.meta.isDynamic ? (v.params ? v.params : null) : v.query ? v.query : null,
+						to.meta.isDynamic ? (to?.params ? to?.params : null) : to?.query ? to?.query : null
+					)
+				) {
+					to.meta.isDynamic ? (v.params = to.params) : (v.query = to.query);
+					v.url = setTagsViewHighlight(v);
+					addBrowserSetSession(state.tagsViewList);
+				}
+			});
+		};
+		// 1、添加 tagsView：未设置隐藏（isHide）也添加到在 tagsView 中（可开启多标签详情，单标签详情）
+		const addTagsView = (path: string, to?: any) => {
+			// 防止拿取不到路由信息
+			nextTick(async () => {
+				// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
+				let item = '';
+				if (to && to.meta.isDynamic) {
+					// 动态路由（xxx/:id/:name"）：参数不同，开启多个 tagsview
+					if (!getThemeConfig.value.isShareTagsView) await solveAddTagsView(path, to);
+					else await singleAddTagsView(path, to);
+					if (state.tagsViewList.some((v: any) => v.path === to.meta.isDynamicPath)) return false;
+					item = state.tagsViewRoutesList.find((v: any) => v.path === to.meta.isDynamicPath);
+				} else {
+					// 普通路由：参数不同，开启多个 tagsview
+					if (!getThemeConfig.value.isShareTagsView) await solveAddTagsView(path, to);
+					else await singleAddTagsView(path, to);
+					if (state.tagsViewList.some((v: any) => v.path === path)) return false;
+					item = state.tagsViewRoutesList.find((v: any) => v.path === path);
+				}
+				if (item.meta.isLink && !item.meta.isIframe) return false;
+				if (to && to.meta.isDynamic) item.params = to?.params ? to?.params : route.params;
+				else item.query = to?.query ? to?.query : route.query;
+				item.url = setTagsViewHighlight(item);
+				await state.tagsViewList.push({ ...item });
+				await addBrowserSetSession(state.tagsViewList);
+			});
+		};
+		// 2、刷新当前 tagsView：
+		const refreshCurrentTagsView = (fullPath: string) => {
+			proxy.mittBus.emit('onTagsViewRefreshRouterView', fullPath);
+		};
+		// 3、关闭当前 tagsView：如果是设置了固定的（isAffix），不可以关闭
+		const closeCurrentTagsView = (path: string) => {
+			state.tagsViewList.map((v: any, k: number, arr: any) => {
+				if (!v.meta.isAffix) {
+					if (getThemeConfig.value.isShareTagsView ? v.path === path : v.url === path) {
+						state.tagsViewList.splice(k, 1);
+						setTimeout(() => {
+							if (state.tagsViewList.length === k && getThemeConfig.value.isShareTagsView ? state.routePath === path : state.routeActive === path) {
+								// 最后一个且高亮时
+								if (arr[arr.length - 1].meta.isDynamic) {
+									// 动态路由（xxx/:id/:name"）
+									if (k !== arr.length) router.push({ name: arr[k].name, params: arr[k].params });
+									else router.push({ name: arr[arr.length - 1].name, params: arr[arr.length - 1].params });
+								} else {
+									// 普通路由
+									if (k !== arr.length) router.push({ path: arr[k].path, query: arr[k].query });
+									else router.push({ path: arr[arr.length - 1].path, query: arr[arr.length - 1].query });
+								}
+							} else {
+								// 非最后一个且高亮时，跳转到下一个
+								if (state.tagsViewList.length !== k && getThemeConfig.value.isShareTagsView ? state.routePath === path : state.routeActive === path) {
+									if (arr[k].meta.isDynamic) {
+										// 动态路由（xxx/:id/:name"）
+										router.push({ name: arr[k].name, params: arr[k].params });
+									} else {
+										// 普通路由
+										router.push({ path: arr[k].path, query: arr[k].query });
+									}
+								}
+							}
+						}, 0);
+					}
+				}
+			});
+			addBrowserSetSession(state.tagsViewList);
+		};
+		// 4、关闭其它 tagsView：如果是设置了固定的（isAffix），不进行关闭
+		const closeOtherTagsView = (path: string) => {
+			state.tagsViewList = [];
+			state.tagsViewRoutesList.map((v: any) => {
+				if (v.meta.isAffix && !v.meta.isHide) state.tagsViewList.push({ ...v });
+			});
+			addTagsView(path, route);
+		};
+		// 5、关闭全部 tagsView：如果是设置了固定的（isAffix），不进行关闭
+		const closeAllTagsView = () => {
+			state.tagsViewList = [];
+			state.tagsViewRoutesList.map((v: any) => {
+				if (v.meta.isAffix && !v.meta.isHide) {
+					state.tagsViewList.push({ ...v });
+					router.push({ path: state.tagsViewList[state.tagsViewList.length - 1].path });
+				}
+			});
+			addBrowserSetSession(state.tagsViewList);
+		};
+		// 6、开启当前页面全屏
+		const openCurrenFullscreen = async (path: string) => {
+			const item = state.tagsViewList.find((v: any) => (getThemeConfig.value.isShareTagsView ? v.path === path : v.url === path));
+			if (item.meta.isDynamic) await router.push({ name: item.name, params: item.params });
+			else await router.push({ name: item.name, query: item.query });
+			store.dispatch('tagsViewRoutes/setCurrenFullscreen', true);
+		};
+		// 当前项右键菜单点击，拿当前点击的路由路径对比 浏览器缓存中的 tagsView 路由数组，取当前点击项的详细路由信息
+		// 防止 tagsView 非当前页演示时，操作异常
+		const getCurrentRouteItem = (path: string, cParams: { [key: string]: any }) => {
+			const itemRoute = Session.get('tagsViewList') ? Session.get('tagsViewList') : state.tagsViewList;
+			return itemRoute.find((v: any) => {
+				if (
+					v.path === path &&
+					isObjectValueEqual(
+						v.meta.isDynamic ? (v.params ? v.params : null) : v.query ? v.query : null,
+						cParams && Object.keys(cParams ? cParams : {}).length > 0 ? cParams : null
+					)
+				) {
+					return v;
+				} else if (v.path === path && Object.keys(cParams ? cParams : {}).length <= 0) {
+					return v;
+				}
+			});
+		};
+		// 当前项右键菜单点击
+		const onCurrentContextmenuClick = async (item) => {
+			const cParams = item.meta.isDynamic ? item.params : item.query;
+			if (!getCurrentRouteItem(item.path, cParams)) return ElMessage({ type: 'warning', message: '请正确输入路径及完整参数（query、params）' });
+			const { path, name, params, query, meta, url } = getCurrentRouteItem(item.path, cParams);
+			switch (item.contextMenuClickId) {
+				case 0:
+					// 刷新当前
+					if (meta.isDynamic) await router.push({ name, params });
+					else await router.push({ path, query });
+					refreshCurrentTagsView(route.fullPath);
+					break;
+				case 1:
+					// 关闭当前
+					closeCurrentTagsView(getThemeConfig.value.isShareTagsView ? path : url);
+					break;
+				case 2:
+					// 关闭其它
+					if (meta.isDynamic) await router.push({ name, params });
+					else await router.push({ path, query });
+					closeOtherTagsView(path);
+					break;
+				case 3:
+					// 关闭全部
+					closeAllTagsView();
+					break;
+				case 4:
+					// 开启当前页面全屏
+					openCurrenFullscreen(getThemeConfig.value.isShareTagsView ? path : url);
+					break;
+			}
+		};
+		// 右键点击时：传 x,y 坐标值到子组件中（props）
+		const onContextmenu = (v: any, e: any) => {
+			const { clientX, clientY } = e;
+			state.dropdown.x = clientX;
+			state.dropdown.y = clientY;
+			contextmenuRef.value.openContextmenu(v);
+		};
+		// 当前的 tagsView 项点击时
+		const onTagsClick = (v: any, k: number) => {
+			state.tagsRefsIndex = k;
+			router.push(v);
+		};
+		// 处理 tagsView 高亮（多标签详情时使用，单标签详情未使用）
+		const setTagsViewHighlight = (v: any) => {
+			let params = v.query && Object.keys(v.query).length > 0 ? v.query : v.params;
+			if (!params || Object.keys(params).length <= 0) return v.path;
+			let path = '';
+			for (let i in params) {
+				path += params[i];
+			}
+			// 判断是否是动态路由（xxx/:id/:name"）
+			return `${v.meta.isDynamic ? v.meta.isDynamicPath : v.path}-${path}`;
+		};
+		// 更新滚动条显示
+		const updateScrollbar = () => {
+			proxy.$refs.scrollbarRef.update();
+		};
+		// 鼠标滚轮滚动
+		const onHandleScroll = (e: any) => {
+			proxy.$refs.scrollbarRef.$refs.wrap$.scrollLeft += e.wheelDelta / 4;
+		};
+		// tagsView 横向滚动
+		const tagsViewmoveToCurrentTag = () => {
+			nextTick(() => {
+				if (tagsRefs.value.length <= 0) return false;
+				// 当前 li 元素
+				let liDom = tagsRefs.value[state.tagsRefsIndex];
+				// 当前 li 元素下标
+				let liIndex = state.tagsRefsIndex;
+				// 当前 ul 下 li 元素总长度
+				let liLength = tagsRefs.value.length;
+				// 最前 li
+				let liFirst: any = tagsRefs.value[0];
+				// 最后 li
+				let liLast: any = tagsRefs.value[tagsRefs.value.length - 1];
+				// 当前滚动条的值
+				let scrollRefs = proxy.$refs.scrollbarRef.$refs.wrap$;
+				// 当前滚动条滚动宽度
+				let scrollS = scrollRefs.scrollWidth;
+				// 当前滚动条偏移宽度
+				let offsetW = scrollRefs.offsetWidth;
+				// 当前滚动条偏移距离
+				let scrollL = scrollRefs.scrollLeft;
+				// 上一个 tags li dom
+				let liPrevTag: any = tagsRefs.value[state.tagsRefsIndex - 1];
+				// 下一个 tags li dom
+				let liNextTag: any = tagsRefs.value[state.tagsRefsIndex + 1];
+				// 上一个 tags li dom 的偏移距离
+				let beforePrevL: any = '';
+				// 下一个 tags li dom 的偏移距离
+				let afterNextL: any = '';
+				if (liDom === liFirst) {
+					// 头部
+					scrollRefs.scrollLeft = 0;
+				} else if (liDom === liLast) {
+					// 尾部
+					scrollRefs.scrollLeft = scrollS - offsetW;
+				} else {
+					// 非头/尾部
+					if (liIndex === 0) beforePrevL = liFirst.offsetLeft - 5;
+					else beforePrevL = liPrevTag?.offsetLeft - 5;
+					if (liIndex === liLength) afterNextL = liLast.offsetLeft + liLast.offsetWidth + 5;
+					else afterNextL = liNextTag.offsetLeft + liNextTag.offsetWidth + 5;
+					if (afterNextL > scrollL + offsetW) {
+						scrollRefs.scrollLeft = afterNextL - offsetW;
+					} else if (beforePrevL < scrollL) {
+						scrollRefs.scrollLeft = beforePrevL;
+					}
+				}
+				// 更新滚动条，防止不出现
+				updateScrollbar();
+			});
+		};
+		// 获取 tagsView 的下标：用于处理 tagsView 点击时的横向滚动
+		const getTagsRefsIndex = (path: string) => {
+			nextTick(async () => {
+				// await 使用该写法，防止拿取不到 tagsViewList 列表数据不完整
+				let tagsViewList = await state.tagsViewList;
+				state.tagsRefsIndex = tagsViewList.findIndex((v: any) => {
+					if (getThemeConfig.value.isShareTagsView) {
+						return v.path === path;
+					} else {
+						return v.url === path;
+					}
+				});
+				// 添加初始化横向滚动条移动到对应位置
+				tagsViewmoveToCurrentTag();
+			});
+		};
+		// 设置 tagsView 可以进行拖拽
+		const initSortable = () => {
+			const el = document.querySelector('.layout-navbars-tagsview-ul') as HTMLElement;
+			if (!el) return false;
+			state.sortable && state.sortable.destroy();
+			state.sortable = Sortable.create(el, {
+				animation: 300,
+				dataIdAttr: 'data-url',
+				disabled: getThemeConfig.value.isSortableTagsView ? false : true,
+				onEnd: () => {
+					const sortEndList: any = [];
+					state.sortable.toArray().map((val: any) => {
+						state.tagsViewList.map((v: any) => {
+							if (v.url === val) sortEndList.push({ ...v });
+						});
+					});
+					addBrowserSetSession(sortEndList);
+				},
+			});
+		};
+		// 拖动问题，https://gitee.com/lyt-top/vue-next-admin/issues/I3ZRRI
+		const onSortableResize = () => {
+			const clientWidth = document.body.clientWidth;
+			if (clientWidth < 1000) getThemeConfig.value.isSortableTagsView = false;
+			else getThemeConfig.value.isSortableTagsView = true;
+			initSortable();
+		};
+		// 页面加载前
+		onBeforeMount(() => {
+			// 初始化，防止手机端直接访问时还可以拖拽
+			onSortableResize();
+			// 拖动问题，https://gitee.com/lyt-top/vue-next-admin/issues/I3ZRRI
+			window.addEventListener('resize', onSortableResize);
+			// 监听非本页面调用 0 刷新当前，1 关闭当前，2 关闭其它，3 关闭全部 4 当前页全屏
+			proxy.mittBus.on('onCurrentContextmenuClick', (data: object) => {
+				onCurrentContextmenuClick(data);
+			});
+			// 监听布局配置界面开启/关闭拖拽
+			proxy.mittBus.on('openOrCloseSortable', () => {
+				initSortable();
+			});
+			// 监听布局配置开启 TagsView 共用，为了演示还原默认值
+			proxy.mittBus.on('openShareTagsView', () => {
+				if (getThemeConfig.value.isShareTagsView) {
+					router.push('/home');
+					state.tagsViewList = [];
+					state.tagsViewRoutesList.map((v: any) => {
+						if (v.meta.isAffix && !v.meta.isHide) {
+							v.url = setTagsViewHighlight(v);
+							state.tagsViewList.push({ ...v });
+						}
+					});
+				}
+			});
+		});
+		// 页面卸载时
+		onUnmounted(() => {
+			// 取消非本页面调用监听
+			proxy.mittBus.off('onCurrentContextmenuClick');
+			// 取消监听布局配置界面开启/关闭拖拽
+			proxy.mittBus.off('openOrCloseSortable');
+			// 取消监听布局配置开启 TagsView 共用
+			proxy.mittBus.off('openShareTagsView');
+			// 取消窗口 resize 监听
+			window.removeEventListener('resize', onSortableResize);
+		});
+		// 页面更新时
+		onBeforeUpdate(() => {
+			tagsRefs.value = [];
+		});
+		// 页面加载时
+		onMounted(() => {
+			// 初始化 vuex 中的 tagsViewRoutes 列表
+			getTagsViewRoutes();
+			initSortable();
+		});
+		// 路由更新时
+		onBeforeRouteUpdate(async (to) => {
+			state.routeActive = setTagsViewHighlight(to);
+			state.routePath = to.meta.isDynamic ? to.meta.isDynamicPath : to.path;
+			await addTagsView(to.path, to);
+			getTagsRefsIndex(getThemeConfig.value.isShareTagsView ? state.routePath : state.routeActive);
+		});
+		// 监听路由的变化，动态赋值给 tagsView
+		watch(store.state, (val) => {
+			if (val.tagsViewRoutes.tagsViewRoutes.length === state.tagsViewRoutesList.length) return false;
+			getTagsViewRoutes();
+		});
+		return {
+			isActive,
+			onContextmenu,
+			getTagsViewRoutes,
+			onTagsClick,
+			tagsRefs,
+			contextmenuRef,
+			scrollbarRef,
+			tagsUlRef,
+			onHandleScroll,
+			getThemeConfig,
+			setTagsStyle,
+			refreshCurrentTagsView,
+			closeCurrentTagsView,
+			onCurrentContextmenuClick,
+			...toRefs(state),
+		};
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-tagsview {
+	background-color: var(--el-color-white);
+	border-bottom: 1px solid #f1f2f3;
+	position: relative;
+	z-index: 4;
+	::v-deep(.el-scrollbar__wrap) {
+		overflow-x: auto !important;
+	}
+	&-ul {
+		list-style: none;
+		margin: 0;
+		padding: 0;
+		height: 34px;
+		display: flex;
+		align-items: center;
+		color: var(--el-text-color-regular);
+		font-size: 12px;
+		white-space: nowrap;
+		padding: 0 15px;
+		&-li {
+			height: 26px;
+			line-height: 26px;
+			display: flex;
+			align-items: center;
+			border: 1px solid #e6e6e6;
+			padding: 0 15px;
+			margin-right: 5px;
+			border-radius: 2px;
+			position: relative;
+			z-index: 0;
+			cursor: pointer;
+			justify-content: space-between;
+			&:hover {
+				background-color: var(--color-primary-light-9);
+				color: var(--color-primary);
+				border-color: var(--color-primary-light-6);
+			}
+			&-iconfont {
+				position: relative;
+				left: -5px;
+				font-size: 12px;
+			}
+			&-icon {
+				border-radius: 100%;
+				position: relative;
+				height: 14px;
+				width: 14px;
+				text-align: center;
+				line-height: 14px;
+				right: -5px;
+				&:hover {
+					color: var(--color-whites);
+					background-color: var(--color-primary-light-3);
+				}
+			}
+			.layout-icon-active {
+				display: block;
+			}
+			.layout-icon-three {
+				display: none;
+			}
+		}
+		.is-active {
+			color: var(--color-whites);
+			background: var(--color-primary);
+			border-color: var(--color-primary);
+			transition: border-color 3s ease;
+		}
+	}
+	// 风格2
+	.tags-style-two {
+		.layout-navbars-tagsview-ul-li {
+			height: 34px !important;
+			line-height: 34px !important;
+			border: none !important;
+			.layout-navbars-tagsview-ul-li-iconfont {
+				display: none;
+			}
+			.layout-icon-active {
+				display: none;
+			}
+			.layout-icon-three {
+				display: block;
+			}
+		}
+		.is-active {
+			background: none !important;
+			color: var(--color-primary) !important;
+			border-bottom: 2px solid !important;
+			border-color: var(--color-primary) !important;
+			border-radius: 0 !important;
+		}
+	}
+	// 风格3
+	.tags-style-three {
+		.layout-navbars-tagsview-ul-li {
+			height: 34px !important;
+			line-height: 34px !important;
+			border-right: 1px solid #f6f6f6 !important;
+			border-top: none !important;
+			border-bottom: none !important;
+			border-left: none !important;
+			border-radius: 0 !important;
+			margin-right: 0 !important;
+			&:first-of-type {
+				border-left: 1px solid #f6f6f6 !important;
+			}
+			.layout-icon-active {
+				display: none;
+			}
+			.layout-icon-three {
+				display: block;
+			}
+		}
+		.is-active {
+			background: var(--el-color-white) !important;
+			color: var(--color-primary) !important;
+			border-top: 1px solid !important;
+			border-top-color: var(--color-primary) !important;
+		}
+	}
+	// 风格4
+	.tags-style-four {
+		.layout-navbars-tagsview-ul-li {
+			margin-right: 0 !important;
+			border: none !important;
+			position: relative;
+			border-radius: 3px !important;
+			.layout-icon-active {
+				display: none;
+			}
+			.layout-icon-three {
+				display: block;
+			}
+			&:hover {
+				background: none !important;
+			}
+		}
+		.is-active {
+			background: none !important;
+			color: var(--color-primary) !important;
+		}
+	}
+}
+.layout-navbars-tagsview-shadow {
+	box-shadow: rgb(0 21 41 / 4%) 0px 1px 4px;
+}
+</style>

src/layout/navMenu/horizontal.vue

@@ -1,23 +1,23 @@
 <template>
 	<div class="el-menu-horizontal-warp">
 		<el-scrollbar @wheel.native.prevent="onElMenuHorizontalScroll" ref="elMenuHorizontalScrollRef">
-			<el-menu router :default-active="defaultActive" background-color="transparent" mode="horizontal" @select="onHorizontalSelect">
+			<el-menu router :default-active="defaultActive" background-color="transparent" mode="horizontal">
 				<template v-for="val in menuLists">
-					<el-submenu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
+					<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
 						<template #title>
-							<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+							<SvgIcon :name="val.meta.icon" />
 							<span>{{ $t(val.meta.title) }}</span>
 						</template>
 						<SubItem :chil="val.children" />
-					</el-submenu>
+					</el-sub-menu>
 					<el-menu-item :index="val.path" :key="val.path" v-else>
 						<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
-							<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+							<SvgIcon :name="val.meta.icon" />
 							{{ $t(val.meta.title) }}
 						</template>
 						<template #title v-else>
-							<a :href="val.meta.isLink" target="_blank">
-								<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+							<a :href="val.meta.isLink" target="_blank" rel="opener">
+								<SvgIcon :name="val.meta.icon" />
 								{{ $t(val.meta.title) }}
 							</a>
 						</template>
@@ -29,10 +29,10 @@
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, computed, defineComponent, getCurrentInstance, onMounted, nextTick } from 'vue';
+import { toRefs, reactive, computed, defineComponent, getCurrentInstance, onMounted, nextTick, onBeforeMount } from 'vue';
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useStore } from '/@/store/index.ts';
-import SubItem from '/@/views/layout/navMenu/subItem.vue';
+import { useStore } from '/@/store/index';
+import SubItem from '/@/layout/navMenu/subItem.vue';
 export default defineComponent({
 	name: 'navMenuHorizontal',
 	components: { SubItem },
@@ -46,7 +46,7 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance() as any;
 		const route = useRoute();
 		const store = useStore();
-		const state: any = reactive({
+		const state = reactive({
 			defaultActive: null,
 		});
 		// 获取父级菜单数据
@@ -66,15 +66,6 @@ export default defineComponent({
 				proxy.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft = els.offsetLeft;
 			});
 		};
-		// 设置页面当前路由高亮
-		const setCurrentRouterHighlight = (path: string) => {
-			const currentPathSplit = path.split('/');
-			if (store.state.themeConfig.themeConfig.layout === 'classic') {
-				state.defaultActive = `/${currentPathSplit[1]}`;
-			} else {
-				state.defaultActive = path;
-			}
-		};
 		// 路由过滤递归函数
 		const filterRoutesFun = (arr: Array<object>) => {
 			return arr
@@ -99,24 +90,39 @@ export default defineComponent({
 			});
 			return currentData;
 		};
-		// 菜单激活回调
-		const onHorizontalSelect = (path: string) => {
-			proxy.mittBus.emit('setSendClassicChildren', setSendClassicChildren(path));
+		// 设置页面当前路由高亮
+		const setCurrentRouterHighlight = (currentRoute) => {
+			const { path, meta } = currentRoute;
+			if (store.state.themeConfig.themeConfig.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;
+			}
 		};
+		// 页面加载前
+		onBeforeMount(() => {
+			setCurrentRouterHighlight(route);
+		});
 		// 页面加载时
 		onMounted(() => {
 			initElMenuOffsetLeft();
-			setCurrentRouterHighlight(route.path);
 		});
 		// 路由更新时
 		onBeforeRouteUpdate((to) => {
-			setCurrentRouterHighlight(to.path);
+			// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
+			setCurrentRouterHighlight(to);
 			proxy.mittBus.emit('onMenuClick');
+			// 修复经典布局开启切割菜单时，点击tagsView后左侧导航菜单数据不变的问题
+			let { layout, isClassicSplitMenu } = store.state.themeConfig.themeConfig;
+			if (layout === 'classic' && isClassicSplitMenu) {
+				proxy.mittBus.emit('setSendClassicChildren', setSendClassicChildren(to.path));
+			}
 		});
 		return {
 			menuLists,
 			onElMenuHorizontalScroll,
-			onHorizontalSelect,
 			...toRefs(state),
 		};
 	},

src/layout/navMenu/subItem.vue

@@ -1,20 +1,20 @@
 <template>
 	<template v-for="val in chils">
-		<el-submenu :index="val.path" :key="val.path" v-if="val.children && val.children.length > 0">
+		<el-sub-menu :index="val.path" :key="val.path" v-if="val.children && val.children.length > 0">
 			<template #title>
-				<i :class="val.meta.icon"></i>
+				<SvgIcon :name="val.meta.icon" />
 				<span>{{ $t(val.meta.title) }}</span>
 			</template>
 			<sub-item :chil="val.children" />
-		</el-submenu>
+		</el-sub-menu>
 		<el-menu-item :index="val.path" :key="val.path" v-else>
 			<template v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
-				<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+				<SvgIcon :name="val.meta.icon" />
 				<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>
+				<a :href="val.meta.isLink" target="_blank" rel="opener">
+					<SvgIcon :name="val.meta.icon" />
 					{{ $t(val.meta.title) }}
 				</a>
 			</template>

src/layout/navMenu/vertical.vue

@@ -3,36 +3,36 @@
 		router
 		:default-active="defaultActive"
 		background-color="transparent"
-		:collapse="setIsCollapse"
+		:collapse="isCollapse"
 		:unique-opened="getThemeConfig.isUniqueOpened"
 		:collapse-transition="false"
 	>
 		<template v-for="val in menuLists">
-			<el-submenu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
+			<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
 				<template #title>
-					<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+					<SvgIcon :name="val.meta.icon" />
 					<span>{{ $t(val.meta.title) }}</span>
 				</template>
 				<SubItem :chil="val.children" />
-			</el-submenu>
+			</el-sub-menu>
 			<el-menu-item :index="val.path" :key="val.path" v-else>
-				<i :class="val.meta.icon ? val.meta.icon : ''"></i>
+				<SvgIcon :name="val.meta.icon" />
 				<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
 					<span>{{ $t(val.meta.title) }}</span>
 				</template>
 				<template #title v-else>
-					<a :href="val.meta.isLink" target="_blank">{{ $t(val.meta.title) }}</a></template
-				>
+					<a :href="val.meta.isLink" target="_blank" rel="opener">{{ $t(val.meta.title) }}</a>
+				</template>
 			</el-menu-item>
 		</template>
 	</el-menu>
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, computed, defineComponent, getCurrentInstance } from 'vue';
+import { toRefs, reactive, computed, defineComponent, getCurrentInstance, onMounted, watch } from 'vue';
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useStore } from '/@/store/index.ts';
-import SubItem from '/@/views/layout/navMenu/subItem.vue';
+import { useStore } from '/@/store/index';
+import SubItem from '/@/layout/navMenu/subItem.vue';
 export default defineComponent({
 	name: 'navMenuVertical',
 	components: { SubItem },
@@ -47,7 +47,9 @@ export default defineComponent({
 		const store = useStore();
 		const route = useRoute();
 		const state = reactive({
-			defaultActive: route.path,
+			// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
+			defaultActive: route.meta.isDynamic ? route.meta.isDynamicPath : route.path,
+			isCollapse: false,
 		});
 		// 获取父级菜单数据
 		const menuLists = computed(() => {
@@ -57,13 +59,31 @@ export default defineComponent({
 		const getThemeConfig = computed(() => {
 			return store.state.themeConfig.themeConfig;
 		});
+		// 菜单高亮（详情时，父级高亮）
+		const setParentHighlight = (currentRoute) => {
+			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 setIsCollapse = computed(() => {
-			return document.body.clientWidth < 1000 ? false : getThemeConfig.value.isCollapse;
+		watch(
+			store.state.themeConfig.themeConfig,
+			() => {
+				document.body.clientWidth <= 1000 ? (state.isCollapse = false) : (state.isCollapse = getThemeConfig.value.isCollapse);
+			},
+			{
+				immediate: true,
+			}
+		);
+		// 页面加载时
+		onMounted(() => {
+			state.defaultActive = setParentHighlight(route);
 		});
 		// 路由更新时
 		onBeforeRouteUpdate((to) => {
-			state.defaultActive = to.path;
+			// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
+			state.defaultActive = setParentHighlight(to);
 			proxy.mittBus.emit('onMenuClick');
 			const clientWidth = document.body.clientWidth;
 			if (clientWidth < 1000) getThemeConfig.value.isCollapse = false;
@@ -71,7 +91,6 @@ export default defineComponent({
 		return {
 			menuLists,
 			getThemeConfig,
-			setIsCollapse,
 			...toRefs(state),
 		};
 	},

src/layout/routerView/iframes.vue

@@ -0,0 +1,60 @@
+<template>
+	<div class="layout-view-bg-white flex mt1" :style="{ height: `calc(100vh - ${setIframeHeight}`, border: 'none' }" v-loading="iframeLoading">
+		<iframe :src="iframeUrl" frameborder="0" height="100%" width="100%" id="iframe" v-show="!iframeLoading"></iframe>
+	</div>
+</template>
+
+<script lang="ts">
+import { defineComponent, reactive, toRefs, onMounted, nextTick, watch, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useStore } from '/@/store/index';
+export default defineComponent({
+	name: 'layoutIfameView',
+	setup() {
+		const route = useRoute();
+		const store = useStore();
+		const state = reactive({
+			iframeLoading: true,
+			iframeUrl: '',
+		});
+		// 初始化页面加载 loading
+		const initIframeLoad = () => {
+			state.iframeUrl = route.meta.isLink;
+			nextTick(() => {
+				state.iframeLoading = true;
+				const iframe = document.getElementById('iframe');
+				if (!iframe) return false;
+				iframe.onload = () => {
+					state.iframeLoading = false;
+				};
+			});
+		};
+		// 设置 iframe 的高度
+		const setIframeHeight = computed(() => {
+			let { isTagsview } = store.state.themeConfig.themeConfig;
+			let { isTagsViewCurrenFull } = store.state.tagsViewRoutes;
+			if (isTagsViewCurrenFull) {
+				return `0px`;
+			} else {
+				if (isTagsview) return `83px`;
+				else return `49px`;
+			}
+		});
+		// 页面加载时
+		onMounted(() => {
+			initIframeLoad();
+		});
+		// 监听路由变化，多个 iframe 时使用
+		watch(
+			() => route.path,
+			() => {
+				initIframeLoad();
+			}
+		);
+		return {
+			setIframeHeight,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/layout/routerView/link.vue

@@ -0,0 +1,43 @@
+<template>
+	<div class="layout-view-bg-white flex layout-view-link" :style="{ height: `calc(100vh - ${setLinkHeight}` }">
+		<a :href="currentRouteMeta.isLink" target="_blank" rel="opener" class="flex-margin"
+			>{{ $t(currentRouteMeta.title) }}：{{ currentRouteMeta.isLink }}</a
+		>
+	</div>
+</template>
+
+<script lang="ts">
+import { defineComponent, toRefs, reactive, computed, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { useStore } from '/@/store/index';
+export default defineComponent({
+	name: 'layoutLinkView',
+	setup() {
+		const route = useRoute();
+		const store = useStore();
+		const state = reactive({
+			currentRouteMeta: {},
+		});
+		// 设置 link 的高度
+		const setLinkHeight = computed(() => {
+			let { isTagsview } = store.state.themeConfig.themeConfig;
+			if (isTagsview) return `114px`;
+			else return `80px`;
+		});
+		// 监听路由的变化，设置内容
+		watch(
+			() => route.path,
+			() => {
+				state.currentRouteMeta = route.meta;
+			},
+			{
+				immediate: true,
+			}
+		);
+		return {
+			setLinkHeight,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/layout/routerView/parent.vue

@@ -11,9 +11,9 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, toRefs, reactive, getCurrentInstance, onBeforeMount, onUnmounted, nextTick } from 'vue';
+import { computed, defineComponent, toRefs, reactive, getCurrentInstance, onBeforeMount, onUnmounted, nextTick, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import { useStore } from '/@/store/index.ts';
+import { useStore } from '/@/store/index';
 export default defineComponent({
 	name: 'layoutParentView',
 	setup() {
@@ -40,12 +40,11 @@ export default defineComponent({
 		// 页面加载前，处理缓存，页面刷新时路由缓存处理
 		onBeforeMount(() => {
 			state.keepAliveNameList = getKeepAliveNames.value;
-			proxy.mittBus.on('onTagsViewRefreshRouterView', (path: string) => {
-				if (route.path !== path) return false;
+			proxy.mittBus.on('onTagsViewRefreshRouterView', (fullPath: string) => {
 				state.keepAliveNameList = getKeepAliveNames.value.filter((name: string) => route.name !== name);
-				state.refreshRouterViewKey = route.path;
+				state.refreshRouterViewKey = null;
 				nextTick(() => {
-					state.refreshRouterViewKey = null;
+					state.refreshRouterViewKey = fullPath;
 					state.keepAliveNameList = getKeepAliveNames.value;
 				});
 			});
@@ -54,6 +53,13 @@ export default defineComponent({
 		onUnmounted(() => {
 			proxy.mittBus.off('onTagsViewRefreshRouterView');
 		});
+		// 监听路由变化，防止 tagsView 多标签时，切换动画消失
+		watch(
+			() => route.fullPath,
+			() => {
+				state.refreshRouterViewKey = route.fullPath;
+			}
+		);
 		return {
 			getThemeConfig,
 			getKeepAliveNames,

src/main.ts

@@ -2,17 +2,29 @@ import { createApp } from 'vue';
 import App from './App.vue';
 import router from './router';
 import { store, key } from './store';
-import { authDirective } from '/@/utils/authDirective.ts';
-import { i18n } from '/@/i18n/index.ts';
+import { directive } from '/@/utils/directive';
+import { i18n } from '/@/i18n/index';
+import other from '/@/utils/other';
 
 import ElementPlus from 'element-plus';
-import 'element-plus/lib/theme-chalk/index.css';
+import 'element-plus/dist/index.css';
 import '/@/theme/index.scss';
 import mitt from 'mitt';
 import screenShort from 'vue-web-screen-shot';
+import VueGridLayout from 'vue-grid-layout';
 
 const app = createApp(App);
-app.use(router).use(store, key).use(ElementPlus, { i18n: i18n.global.t }).use(i18n).use(screenShort, { enableWebRtc: false }).mount('#app');
-app.config.globalProperties.mittBus = mitt();
 
-authDirective(app);
+directive(app);
+other.elSvg(app);
+
+app
+	.use(router)
+	.use(store, key)
+	.use(ElementPlus, { i18n: i18n.global.t, size: other.globalComponentSize })
+	.use(i18n)
+	.use(screenShort, { enableWebRtc: false })
+	.use(VueGridLayout)
+	.mount('#app');
+
+app.config.globalProperties.mittBus = mitt();

src/router/backEnd.ts

@@ -0,0 +1,100 @@
+import { store } from '/@/store/index.ts';
+import { Session } from '/@/utils/storage';
+import { NextLoading } from '/@/utils/loading';
+import { setAddRoute, setFilterMenuAndCacheTagsViewRoutes } from '/@/router/index';
+import { dynamicRoutes } from '/@/router/route';
+import { getMenuAdmin, getMenuTest } from '/@/api/menu/index';
+
+const layouModules: any = import.meta.glob('../layout/routerView/*.{vue,tsx}');
+const viewsModules: any = import.meta.glob('../views/**/*.{vue,tsx}');
+/**
+ * 获取目录下的 .vue、.tsx 全部文件
+ * @method import.meta.glob
+ * @link 参考：https://cn.vitejs.dev/guide/features.html#json
+ */
+const dynamicViewsModules: Record<string, Function> = Object.assign({}, { ...layouModules }, { ...viewsModules });
+
+/**
+ * 后端控制路由：初始化方法，防止刷新时路由丢失
+ * @method  NextLoading 界面 loading 动画开始执行
+ * @method store.dispatch('userInfos/setUserInfos') 触发初始化用户信息
+ * @method store.dispatch('requestOldRoutes/setBackEndControlRoutes') 存储接口原始路由（未处理component），根据需求选择使用
+ * @method setAddRoute 添加动态路由
+ * @method setFilterMenuAndCacheTagsViewRoutes 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+ */
+export async function initBackEndControlRoutes() {
+	// 界面 loading 动画开始执行
+	if (window.nextLoading === undefined) NextLoading.start();
+	// 无 token 停止执行下一步
+	if (!Session.get('token')) return false;
+	// 触发初始化用户信息
+	store.dispatch('userInfos/setUserInfos');
+	// 获取路由菜单数据
+	const res = await getBackEndControlRoutes();
+	// 存储接口原始路由（未处理component），根据需求选择使用
+	store.dispatch('requestOldRoutes/setBackEndControlRoutes', JSON.parse(JSON.stringify(res.data)));
+	// 处理路由（component），替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
+	dynamicRoutes[0].children = await backEndComponent(res.data);
+	// 添加动态路由
+	await setAddRoute();
+	// 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+	setFilterMenuAndCacheTagsViewRoutes();
+}
+
+/**
+ * 请求后端路由菜单接口
+ * @description isRequestRoutes 为 true，则开启后端控制路由
+ * @returns 返回后端路由菜单数据
+ */
+export function getBackEndControlRoutes() {
+	// 模拟 admin 与 test
+	const auth = store.state.userInfos.userInfos.roles[0];
+	// 管理员 admin
+	if (auth === 'admin') return getMenuAdmin();
+	// 其它用户 test
+	else return getMenuTest();
+}
+
+/**
+ * 重新请求后端路由菜单接口
+ * @description 用于菜单管理界面刷新菜单（未进行测试）
+ * @description 路径：/src/views/system/menu/component/addMenu.vue
+ */
+export function setBackEndControlRefreshRoutes() {
+	getBackEndControlRoutes();
+}
+
+/**
+ * 后端路由 component 转换
+ * @param routes 后端返回的路由表数组
+ * @returns 返回处理成函数后的 component
+ */
+export function backEndComponent(routes: any) {
+	if (!routes) return;
+	return routes.map((item: any) => {
+		if (item.component) item.component = dynamicImport(dynamicViewsModules, item.component as string);
+		item.children && backEndComponent(item.children);
+		return item;
+	});
+}
+
+/**
+ * 后端路由 component 转换函数
+ * @param dynamicViewsModules 获取目录下的 .vue、.tsx 全部文件
+ * @param component 当前要处理项 component
+ * @returns 返回处理成函数后的 component
+ */
+export function dynamicImport(dynamicViewsModules: Record<string, Function>, component: string) {
+	const keys = Object.keys(dynamicViewsModules);
+	const matchKeys = keys.filter((key) => {
+		const k = key.replace(/..\/views|../, '');
+		return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
+	});
+	if (matchKeys?.length === 1) {
+		const matchKey = matchKeys[0];
+		return dynamicViewsModules[matchKey];
+	}
+	if (matchKeys?.length > 1) {
+		return false;
+	}
+}

src/router/frontEnd.ts

@@ -0,0 +1,24 @@
+import { store } from '/@/store/index';
+import { Session } from '/@/utils/storage';
+import { NextLoading } from '/@/utils/loading';
+import { setAddRoute, setFilterMenuAndCacheTagsViewRoutes } from '/@/router/index';
+
+/**
+ * 前端控制路由：初始化方法，防止刷新时路由丢失
+ * @method  NextLoading 界面 loading 动画开始执行
+ * @method store.dispatch('userInfos/setUserInfos') 触发初始化用户信息
+ * @method setAddRoute 添加动态路由
+ * @method setFilterMenuAndCacheTagsViewRoutes 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+ */
+export async function initFrontEndControlRoutes() {
+	// 界面 loading 动画开始执行
+	if (window.nextLoading === undefined) NextLoading.start();
+	// 无 token 停止执行下一步
+	if (!Session.get('token')) return false;
+	// 触发初始化用户信息
+	store.dispatch('userInfos/setUserInfos');
+	// 添加动态路由
+	await setAddRoute();
+	// 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+	setFilterMenuAndCacheTagsViewRoutes();
+}

src/store/index.ts

@@ -1,24 +1,26 @@
 import { InjectionKey } from 'vue';
 import { createStore, useStore as baseUseStore, Store } from 'vuex';
-import themeConfig from '/@/store/modules/themeConfig.ts';
-import routesList from '/@/store/modules/routesList.ts';
-import keepAliveNames from '/@/store/modules/keepAliveNames.ts';
-import tagsViewRoutes from '/@/store/modules/tagsViewRoutes.ts';
-import userInfos from '/@/store/modules/userInfos.ts';
-import requestOldRoutes from '/@/store/modules/requestOldRoutes.ts';
+import { RootStateTypes } from '/@/store/interface/index';
+
+// Vite supports importing multiple modules from the file system using the special import.meta.glob function
+// see https://cn.vitejs.dev/guide/features.html#glob-import
+const modulesFiles = import.meta.globEager('./modules/*.ts');
+const pathList: string[] = [];
+
+for (const path in modulesFiles) {
+	pathList.push(path);
+}
+
+const modules = pathList.reduce((modules: { [x: string]: any }, modulePath: string) => {
+	const moduleName = modulePath.replace(/^\.\/modules\/(.*)\.\w+$/, '$1');
+	const value = modulesFiles[modulePath];
+	modules[moduleName] = value.default;
+	return modules;
+}, {});
 
 export const key: InjectionKey<Store<RootStateTypes>> = Symbol();
 
-export const store = createStore<RootStateTypes>({
-	modules: {
-		themeConfig,
-		routesList,
-		keepAliveNames,
-		tagsViewRoutes,
-		userInfos,
-		requestOldRoutes,
-	},
-});
+export const store = createStore<RootStateTypes>({ modules });
 
 export function useStore() {
 	return baseUseStore(key);

src/store/interface/index.ts

@@ -1,7 +1,7 @@
 // 接口类型声明
 
 // 布局配置
-declare interface ThemeConfigState {
+export interface ThemeConfigState {
 	themeConfig: {
 		isDrawer: boolean;
 		primary: string;
@@ -17,6 +17,7 @@ declare interface ThemeConfigState {
 		columnsMenuBarColor: string;
 		isTopBarColorGradual: boolean;
 		isMenuBarColorGradual: boolean;
+		isColumnsMenuBarColorGradual: boolean;
 		isMenuBarColorHighlight: boolean;
 		isCollapse: boolean;
 		isUniqueOpened: boolean;
@@ -33,49 +34,56 @@ declare interface ThemeConfigState {
 		isTagsviewIcon: boolean;
 		isCacheTagsView: boolean;
 		isSortableTagsView: boolean;
+		isShareTagsView: boolean;
 		isFooter: boolean;
 		isGrayscale: boolean;
 		isInvert: boolean;
+		isIsDark: boolean;
 		isWartermark: boolean;
 		wartermarkText: string;
 		tagsStyle: string;
 		animation: string;
 		columnsAsideStyle: string;
+		columnsAsideLayout: string;
 		layout: string;
 		isRequestRoutes: boolean;
 		globalTitle: string;
 		globalViceTitle: string;
 		globalI18n: string;
+		globalComponentSize: string;
 	};
 }
 
 // 路由列表
-declare interface RoutesListState {
+export interface RoutesListState {
 	routesList: Array<object>;
+	isColumnsMenuHover: Boolean;
+	isColumnsNavHover: Boolean;
 }
 
 // 路由缓存列表
-declare interface KeepAliveNamesState {
+export interface KeepAliveNamesState {
 	keepAliveNames: Array<string>;
 }
 
 // TagsView 路由列表
-declare interface TagsViewRoutesState {
+export interface TagsViewRoutesState {
 	tagsViewRoutes: Array<object>;
+	isTagsViewCurrenFull: Boolean;
 }
 
 // 用户信息
-declare interface UserInfosState {
+export interface UserInfosState {
 	userInfos: object;
 }
 
 // 后端返回原始路由(未处理时)
-declare interface RequestOldRoutesState {
+export interface RequestOldRoutesState {
 	requestOldRoutes: Array<object>;
 }
 
 // 主接口(顶级类型声明)
-declare interface RootStateTypes {
+export interface RootStateTypes {
 	themeConfig: ThemeConfigState;
 	routesList: RoutesListState;
 	keepAliveNames: KeepAliveNamesState;

src/store/modules/keepAliveNames.ts

@@ -1,4 +1,6 @@
 import { Module } from 'vuex';
+// 此处加上 `.ts` 后缀报错，具体原因不详
+import { KeepAliveNamesState, RootStateTypes } from '/@/store/interface/index';
 
 const keepAliveNamesModule: Module<KeepAliveNamesState, RootStateTypes> = {
 	namespaced: true,

src/store/modules/requestOldRoutes.ts

@@ -1,4 +1,6 @@
 import { Module } from 'vuex';
+// 此处加上 `.ts` 后缀报错，具体原因不详
+import { RequestOldRoutesState, RootStateTypes } from '/@/store/interface/index';
 
 const requestOldRoutesModule: Module<RequestOldRoutesState, RootStateTypes> = {
 	namespaced: true,

src/store/modules/routesList.ts

@@ -1,21 +1,41 @@
 import { Module } from 'vuex';
+// 此处加上 `.ts` 后缀报错，具体原因不详
+import { RoutesListState, RootStateTypes } from '/@/store/interface/index';
 
 const routesListModule: Module<RoutesListState, RootStateTypes> = {
 	namespaced: true,
 	state: {
 		routesList: [],
+		isColumnsMenuHover: false,
+		isColumnsNavHover: false,
 	},
 	mutations: {
 		// 设置路由，菜单中使用到
 		getRoutesList(state: any, data: Array<object>) {
 			state.routesList = data;
 		},
+		// 设置分栏布局，鼠标是否移入移出（菜单）
+		getColumnsMenuHover(state: any, bool: Boolean) {
+			state.isColumnsMenuHover = bool;
+		},
+		// 设置分栏布局，鼠标是否移入移出（导航）
+		getColumnsNavHover(state: any, bool: Boolean) {
+			state.isColumnsNavHover = bool;
+		},
 	},
 	actions: {
 		// 设置路由，菜单中使用到
 		async setRoutesList({ commit }, data: any) {
 			commit('getRoutesList', data);
 		},
+		// 设置分栏布局，鼠标是否移入移出（菜单）
+		async setColumnsMenuHover({ commit }, bool: Boolean) {
+			commit('getColumnsMenuHover', bool);
+		},
+		// 设置分栏布局，鼠标是否移入移出（菜单）
+		async setColumnsNavHover({ commit }, bool: Boolean) {
+			commit('getColumnsNavHover', bool);
+		},
 	},
 };
 

src/store/modules/tagsViewRoutes.ts

@@ -1,21 +1,34 @@
 import { Module } from 'vuex';
+// 此处加上 `.ts` 后缀报错，具体原因不详
+import { TagsViewRoutesState, RootStateTypes } from '/@/store/interface/index';
+import { Session } from '/@/utils/storage';
 
 const tagsViewRoutesModule: Module<TagsViewRoutesState, RootStateTypes> = {
 	namespaced: true,
 	state: {
 		tagsViewRoutes: [],
+		isTagsViewCurrenFull: false,
 	},
 	mutations: {
 		// 设置 TagsView 路由
 		getTagsViewRoutes(state: any, data: Array<string>) {
 			state.tagsViewRoutes = data;
 		},
+		// 设置卡片全屏
+		getCurrenFullscreen(state: any, bool: boolean) {
+			Session.set('isTagsViewCurrenFull', bool);
+			state.isTagsViewCurrenFull = bool;
+		},
 	},
 	actions: {
 		// 设置 TagsView 路由
 		async setTagsViewRoutes({ commit }, data: Array<string>) {
 			commit('getTagsViewRoutes', data);
 		},
+		// 设置卡片全屏
+		setCurrenFullscreen({ commit }, bool: Boolean) {
+			commit('getCurrenFullscreen', bool);
+		},
 	},
 };
 

src/store/modules/themeConfig.ts

@@ -1,5 +1,12 @@
 import { Module } from 'vuex';
+// 此处加上 `.ts` 后缀报错，具体原因不详
+import { ThemeConfigState, RootStateTypes } from '/@/store/interface/index';
 
+/**
+ * 2020.05.28 by lyt 优化
+ * 修改一下配置时，需要每次都清理 `window.localStorage` 浏览器永久缓存，配置才会生效
+ * 哪个大佬有解决办法，欢迎pr，感谢💕！
+ */
 const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
 	namespaced: true,
 	state: {
@@ -7,8 +14,9 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
 			// 是否开启布局配置抽屉
 			isDrawer: false,
 
-			/* 全局主题
-            ------------------------------- */
+			/**
+			 * 全局主题
+			 */
 			// 默认 primary 颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
 			primary: '#409eff',
 			// 默认 success 颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
@@ -20,8 +28,12 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
 			// 默认 danger 颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
 			danger: '#f56c6c',
 
-			/* 菜单 / 顶栏
-            ------------------------------- */
+			/**
+			 * 菜单 / 顶栏
+			 * 注意：v1.0.17 版本去除设置布局切换，重置主题样式（initSetLayoutChange），
+			 * 切换布局需手动设置样式，设置的样式自动同步各布局，
+			 * 代码位置：/@/layout/navBars/breadcrumb/setings.vue
+			 */
 			// 默认顶栏导航背景颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
 			topBar: '#ffffff',
 			// 默认菜单导航背景颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
@@ -38,12 +50,14 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
 			isTopBarColorGradual: false,
 			// 是否开启菜单背景颜色渐变
 			isMenuBarColorGradual: false,
+			// 是否开启分栏菜单背景颜色渐变
+			isColumnsMenuBarColorGradual: false,
 			// 是否开启菜单字体背景高亮
 			isMenuBarColorHighlight: false,
-			// 是否开启菜单字体背景高亮
 
-			/* 界面设置
-            ------------------------------- */
+			/**
+			 * 界面设置
+			 */
 			// 是否开启菜单水平折叠效果
 			isCollapse: false,
 			// 是否开启菜单手风琴效果
@@ -59,13 +73,14 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
 			// 开启自动锁屏倒计时(s/秒)
 			lockScreenTime: 30,
 
-			/* 界面显示
-            ------------------------------- */
+			/**
+			 * 界面显示
+			 */
 			// 是否开启侧边栏 Logo
 			isShowLogo: false,
 			// 初始化变量，用于 el-scrollbar 的高度更新，请勿删除
 			isShowLogoChange: false,
-			// 是否开启 Breadcrumb
+			// 是否开启 Breadcrumb，强制经典、横向布局不显示
 			isBreadcrumb: true,
 			// 是否开启 Tagsview
 			isTagsview: true,
@@ -77,44 +92,59 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
 			isCacheTagsView: false,
 			// 是否开启 TagsView 拖拽
 			isSortableTagsView: true,
+			// 是否开启 TagsView 共用
+			isShareTagsView: false,
 			// 是否开启 Footer 底部版权信息
 			isFooter: false,
 			// 是否开启灰色模式
 			isGrayscale: false,
 			// 是否开启色弱模式
 			isInvert: false,
+			// 是否开启深色模式
+			isIsDark: false,
 			// 是否开启水印
 			isWartermark: false,
 			// 水印文案
 			wartermarkText: 'small@小柒',
 
-			/* 其它设置
-            ------------------------------- */
-			// 默认 Tagsview 风格，可选 1、 tags-style-one 2、 tags-style-two 3、 tags-style-three 4、 tags-style-four
+			/**
+			 * 其它设置
+			 */
+			// Tagsview 风格：可选值"<tags-style-one|tags-style-two|tags-style-three|tags-style-four>"，默认 tags-style-one
+			// 定义的值与 `/src/layout/navBars/tagsView/tagsView.vue` 中的 class 同名
 			tagsStyle: 'tags-style-one',
-			// 默认主页面切换动画，可选 1、 slide-right 2、 slide-left 3、 opacitys
+			// 主页面切换动画：可选值"<slide-right|slide-left|opacitys>"，默认 slide-right
 			animation: 'slide-right',
-			// 默认分栏高亮风格，可选 1、 圆角 columns-round 2、 卡片 columns-card
+			// 分栏高亮风格：可选值"<columns-round|columns-card>"，默认 columns-round
 			columnsAsideStyle: 'columns-round',
+			// 分栏布局风格：可选值"<columns-horizontal|columns-vertical>"，默认 columns-horizontal
+			columnsAsideLayout: 'columns-vertical',
 
-			/* 布局切换
-            ------------------------------- */
-			// 默认布局，可选 1、默认 defaults 2、经典 classic 3、横向 transverse 4、分栏 columns
+			/**
+			 * 布局切换
+			 * 注意：为了演示，切换布局时，颜色会被还原成默认，代码位置：/@/layout/navBars/breadcrumb/setings.vue
+			 * 中的 `initSetLayoutChange(设置布局切换，重置主题样式)` 方法
+			 */
+			// 布局切换：可选值"<defaults|classic|transverse|columns>"，默认 defaults
 			layout: 'defaults',
 
-			/* 后端控制路由
-            ------------------------------- */
+			/**
+			 * 后端控制路由
+			 */
 			// 是否开启后端控制路由
 			isRequestRoutes: false,
 
-			/* 全局网站标题 / 副标题
-            ------------------------------- */
+			/**
+			 * 全局网站标题 / 副标题
+			 */
 			// 网站主标题（菜单导航、浏览器当前网页标题）
 			globalTitle: 'vue-next-admin',
 			// 网站副标题（登录页顶部文字）
 			globalViceTitle: 'SMALL@小柒',
 			// 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn
 			globalI18n: 'zh-cn',
+			// 默认全局组件大小，可选值"<|medium|small|mini>"，默认 ''
+			globalComponentSize: '',
 		},
 	},
 	mutations: {

src/store/modules/userInfos.ts

@@ -1,5 +1,7 @@
 import { Module } from 'vuex';
-import { getSession } from '/@/utils/storage.ts';
+import { Session } from '/@/utils/storage';
+// 此处加上 `.ts` 后缀报错，具体原因不详
+import { UserInfosState, RootStateTypes } from '/@/store/interface/index';
 
 const userInfosModule: Module<UserInfosState, RootStateTypes> = {
 	namespaced: true,
@@ -18,7 +20,7 @@ const userInfosModule: Module<UserInfosState, RootStateTypes> = {
 			if (data) {
 				commit('getUserInfos', data);
 			} else {
-				if (getSession('userInfo')) commit('getUserInfos', getSession('userInfo'));
+				if (Session.get('userInfo')) commit('getUserInfos', Session.get('userInfo'));
 			}
 		},
 	},

src/theme/app.scss

@@ -54,28 +54,56 @@ body,
 	.el-scrollbar {
 		width: 100%;
 	}
+	// 此字段多次用到，建议不删除，如需修改，请重写覆盖样式
 	.layout-view-bg-white {
-		background: white;
+		background: var(--el-color-white);
 		width: 100%;
 		height: 100%;
 		border-radius: 4px;
-		border: 1px solid #ebeef5;
+		border: 1px solid var(--el-border-color-light, #ebeef5);
 	}
 	.layout-el-aside-br-color {
 		border-right: 1px solid rgb(238, 238, 238);
 	}
-	.layout-aside-width-default {
+	// pc端左侧导航样式
+	.layout-aside-pc-220 {
 		width: 220px !important;
 		transition: width 0.3s ease;
 	}
-	.layout-aside-width64 {
+	.layout-aside-pc-64 {
 		width: 64px !important;
 		transition: width 0.3s ease;
 	}
-	.layout-aside-width1 {
+	.layout-aside-pc-1 {
 		width: 1px !important;
 		transition: width 0.3s ease;
 	}
+	// 手机端左侧导航样式
+	.layout-aside-mobile {
+		position: fixed;
+		top: 0;
+		left: -220px;
+		width: 220px;
+		z-index: 9999999;
+	}
+	.layout-aside-mobile-close {
+		left: -220px;
+		transition: all 0.3s cubic-bezier(1, -0.04, 0, 1.32);
+	}
+	.layout-aside-mobile-open {
+		left: 0;
+		transition: all 0.3s cubic-bezier(0.53, -0.26, 0.42, 1.18);
+	}
+	.layout-aside-mobile-mode {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 9999998;
+	}
 	.layout-scrollbar {
 		@extend .el-scrollbar;
 		padding: 15px;
@@ -96,14 +124,6 @@ body,
 /* element plus 全局样式
 ------------------------------- */
 .layout-breadcrumb-seting {
-	.el-drawer__header {
-		padding: 0 15px !important;
-		height: 50px;
-		display: flex;
-		align-items: center;
-		margin-bottom: 0 !important;
-		border-bottom: 1px solid rgb(230, 230, 230);
-	}
 	.el-divider {
 		background-color: rgb(230, 230, 230);
 	}
@@ -149,6 +169,25 @@ body,
 	}
 }
 
+/* cursor 鼠标形状
+------------------------------- */
+// 默认
+.cursor-default {
+	cursor: default !important;
+}
+// 帮助
+.cursor-help {
+	cursor: help !important;
+}
+// 手指
+.cursor-pointer {
+	cursor: pointer !important;
+}
+// 移动
+.cursor-move {
+	cursor: move !important;
+}
+
 /* 宽高 100%
 ------------------------------- */
 .w100 {

src/theme/common/var.scss

@@ -8,7 +8,6 @@
 ------------------------------- */
 $--color-primary: #409eff !default;
 $--color-whites: #ffffff !default;
-$--color-blacks: #000000 !default;
 $--color-primary-light-1: mix($--color-whites, $--color-primary, 10%) !default;
 $--color-primary-light-2: mix($--color-whites, $--color-primary, 20%) !default;
 $--color-primary-light-3: mix($--color-whites, $--color-primary, 30%) !default;
@@ -70,7 +69,6 @@ $--bg-columnsMenuBarColor: #e6e6e6;
 :root {
 	--color-primary: #{$--color-primary};
 	--color-whites: #{$--color-whites};
-	--color-blacks: #{$--color-blacks};
 	--color-primary-light-1: #{$--color-primary-light-1};
 	--color-primary-light-2: #{$--color-primary-light-2};
 	--color-primary-light-3: #{$--color-primary-light-3};

src/theme/dark.scss

@@ -0,0 +1,57 @@
+/* 深色模式样式
+------------------------------- */
+[data-theme='dark'] {
+	// 全局
+	filter: invert(0.9) hue-rotate(180deg);
+	img,
+	.layout-lock-screen-img,
+	.visualizing-demo2,
+	.w-e-panel-tab-content {
+		filter: invert(1) hue-rotate(180deg);
+	}
+	.error img {
+		filter: unset;
+	}
+
+	// element plus
+	.el-radio-button__original-radio:checked + .el-radio-button__inner,
+	.el-image-viewer__close,
+	.el-image-viewer__actions__inner,
+	.el-image-viewer__next,
+	.el-image-viewer__prev {
+		color: #000000 !important;
+	}
+	.el-overlay {
+		background-color: rgba(0, 0, 0, 0.05) !important;
+	}
+	.el-drawer {
+		box-shadow: 0 8px 10px -5px rgb(0 0 0 / 1%), 0 16px 24px 2px rgb(0 0 0 / 2%), 0 6px 30px 5px rgb(0 0 0 / 1%);
+	}
+
+	// 数据可视化演示
+	.visualizing-container-head {
+		background: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.02)) !important;
+		.visualizing-container-head-left-text-box {
+			color: #000000 !important;
+		}
+	}
+	.visualizing-container-content-left {
+		background: linear-gradient(to right, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.01)) !important;
+	}
+	.visualizing-container-content-center {
+		background: linear-gradient(to top, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.01)) !important;
+	}
+	.visualizing-container-content-right {
+		background: linear-gradient(to left, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.01)) !important;
+	}
+	.cropper-modal {
+		background-color: #ffffff;
+	}
+
+	// 其它菜单等
+	--bg-menuBar: #ffffff !important;
+	--bg-menuBarColor: #303133 !important;
+	--bg-columnsMenuBar: #ffffff !important;
+	--bg-columnsMenuBarColor: #303133 !important;
+	--color-whites: #000000 !important;
+}

src/theme/element.scss

@@ -1,5 +1,6 @@
 @import 'mixins/function.scss';
 @import 'mixins/element-mixins.scss';
+@import 'mixins/mixins.scss';
 
 /* Button 按钮
 ------------------------------- */
@@ -583,6 +584,25 @@
 	background-color: set-color(info);
 }
 
+/* Result 结果
+------------------------------- */
+// success
+.el-result .icon-success {
+	fill: set-color(success);
+}
+// warning
+.el-result .icon-warning {
+	fill: set-color(warning);
+}
+// error
+.el-result .icon-error {
+	fill: set-color(danger);
+}
+// info
+.el-result .icon-info {
+	fill: set-color(info);
+}
+
 /* Alert 警告
 ------------------------------- */
 // success
@@ -727,9 +747,14 @@
 // 默认样式修改
 .el-menu {
 	border-right: none !important;
+	width: 220px;
+}
+// 修复点击左侧菜单折叠再展开时，宽度不跟随问题
+.el-menu--collapse {
+	width: 64px !important;
 }
 .el-menu-item,
-.el-submenu__title {
+.el-sub-menu__title {
 	height: 50px !important;
 	line-height: 50px !important;
 	color: var(--bg-menuBarColor);
@@ -737,31 +762,31 @@
 }
 // horizontal 水平方向时
 .el-menu--horizontal > .el-menu-item.is-active,
-.el-menu--horizontal > .el-submenu.is-active .el-submenu__title {
+.el-menu--horizontal > .el-sub-menu.is-active .el-sub-menu__title {
 	border-bottom: 3px solid !important;
 	border-bottom-color: set-color(primary);
-	color: set-color(primary);
+	color: set-color(primary) !important;
 }
 .el-menu--horizontal .el-menu-item:not(.is-disabled):focus,
 .el-menu--horizontal .el-menu-item:not(.is-disabled):hover,
-.el-menu--horizontal > .el-submenu:focus .el-submenu__title,
-.el-menu--horizontal > .el-submenu:hover .el-submenu__title,
+.el-menu--horizontal > .el-sub-menu:focus .el-sub-menu__title,
+.el-menu--horizontal > .el-sub-menu:hover .el-sub-menu__title,
 .el-menu--horizontal .el-menu .el-menu-item.is-active,
-.el-menu--horizontal .el-menu .el-submenu.is-active > .el-submenu__title {
-	color: set-color(primary);
+.el-menu--horizontal .el-menu .el-sub-menu.is-active > .el-sub-menu__title {
+	color: set-color(primary) !important;
 }
 .el-menu.el-menu--horizontal {
 	border-bottom: none !important;
 }
 .el-menu--horizontal > .el-menu-item,
-.el-menu--horizontal > .el-submenu .el-submenu__title {
+.el-menu--horizontal > .el-sub-menu .el-sub-menu__title {
 	color: var(--bg-topBarColor);
 }
 // 外部链接时
 .el-menu-item a,
 .el-menu-item a:hover,
 .el-menu-item i,
-.el-submenu__title i {
+.el-sub-menu__title i {
 	color: inherit;
 	text-decoration: none;
 }
@@ -771,22 +796,23 @@
 }
 // 默认 hover 时
 .el-menu-item:hover,
-.el-submenu__title:hover {
+.el-sub-menu__title:hover {
 	color: set-color(primary) !important;
 	background-color: transparent !important;
 	i {
 		color: set-color(primary);
 	}
 }
-// 高亮时
-.el-menu-item.is-active {
+// 高亮时/菜单收起时
+.el-menu-item.is-active,
+.el-menu--collapse .el-sub-menu.is-active i {
 	color: set-color(primary);
 }
 .el-active-extend {
-	color: #ffffff !important;
+	color: var(--color-whites) !important;
 	background-color: set-color(primary) !important;
 	i {
-		color: #ffffff !important;
+		color: var(--color-whites) !important;
 	}
 }
 #add-is-active {
@@ -797,34 +823,37 @@
 }
 // 菜单收起时且是a链接
 .el-popper.is-dark a {
-	color: #ffffff !important;
+	color: var(--color-whites) !important;
 	text-decoration: none;
 }
 // 菜单收起时鼠标经过背景颜色/字体颜色
 .el-popper.is-light {
 	.el-menu--vertical {
-		background: var(--bg-menuBar);
+		.el-menu {
+			background: var(--bg-menuBar);
+		}
 	}
 	.el-menu--horizontal {
 		background: var(--bg-topBar);
+		.el-menu,
 		.el-menu-item,
-		.el-submenu__title {
+		.el-sub-menu__title {
 			color: var(--bg-topBarColor);
+			background: var(--bg-topBar);
 		}
 	}
 }
 // 第三方图标字体间距/大小设置
 .el-menu-item .iconfont,
-.el-submenu .iconfont {
-	font-size: 14px !important;
-	display: inline-block;
-	vertical-align: middle;
-	margin-right: 5px;
-	width: 24px;
-	text-align: center;
+.el-sub-menu .iconfont {
+	@include generalIcon;
+}
+.el-menu-item .fa,
+.el-sub-menu .fa {
+	@include generalIcon;
 }
 // element plus 本身字体图标
-.el-submenu [class^='el-icon-'] {
+.el-sub-menu .el-icon {
 	font-size: 14px !important;
 }
 // 去掉离开浏览器时，菜单的默认高亮
@@ -866,6 +895,9 @@
 	color: set-color(primary);
 	background-color: set-color(primary-light-9);
 }
+.el-dropdown-menu .el-dropdown-menu__item {
+	white-space: nowrap;
+}
 
 /* Steps 步骤条
 ------------------------------- */
@@ -909,18 +941,25 @@
 	color: set-color(primary);
 }
 .el-overlay {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	.el-dialog {
-		margin: 0 auto !important;
-		.el-dialog__body {
-			padding: 20px !important;
+	overflow: hidden;
+	.el-overlay-dialog {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: unset !important;
+		width: 100%;
+		height: 100%;
+		.el-dialog {
+			margin: 0 auto !important;
+			position: absolute;
+			.el-dialog__body {
+				padding: 20px !important;
+			}
 		}
 	}
 }
 .el-dialog__body {
-	max-height: 70vh !important;
+	max-height: calc(90vh - 111px) !important;
 	overflow-y: auto;
 	overflow-x: hidden;
 }
@@ -976,6 +1015,9 @@
 
 /* scrollbar
 ------------------------------- */
+.el-scrollbar__bar {
+	z-index: 4;
+}
 .el-scrollbar__wrap {
 	overflow-x: hidden !important;
 	max-height: 100%; /*防止页面切换时，滚动条高度不变的问题（滚动条高度非滚动条滚动高度）*/
@@ -986,13 +1028,27 @@
 .el-select-dropdown__wrap {
 	max-height: 274px !important; /*修复Select 选择器高度问题*/
 }
+.el-cascader-menu__wrap.el-scrollbar__wrap {
+	height: 204px !important; /*修复Cascader 级联选择器高度问题*/
+}
 
 /* Drawer 抽屉
 ------------------------------- */
-.el-drawer__body {
-	width: 100%;
-	height: 100%;
-	overflow: auto;
+.el-drawer {
+	--el-drawer-padding-primary: unset !important;
+	.el-drawer__header {
+		padding: 0 15px !important;
+		height: 50px;
+		display: flex;
+		align-items: center;
+		margin-bottom: 0 !important;
+		border-bottom: 1px solid rgb(230, 230, 230);
+	}
+	.el-drawer__body {
+		width: 100%;
+		height: 100%;
+		overflow: auto;
+	}
 }
 .el-drawer-fade-enter-active .el-drawer.rtl {
 	animation: rtl-drawer-animation 0.3s ease-in reverse !important;

src/theme/iconSelector.scss

@@ -3,51 +3,62 @@
 .icon-selector-popper {
 	padding: 0 !important;
 	.icon-selector-warp {
+		height: 260px;
+		overflow: hidden;
 		.icon-selector-warp-title {
 			height: 40px;
 			line-height: 40px;
 			padding: 0 15px;
+			.icon-selector-warp-title-tab {
+				span {
+					cursor: pointer;
+					&:hover {
+						color: var(--color-primary);
+						text-decoration: underline;
+					}
+				}
+				.span-active {
+					color: var(--color-primary);
+					text-decoration: underline;
+				}
+			}
 		}
 		.icon-selector-warp-row {
-			max-height: 260px;
-			overflow-y: auto;
-			padding: 15px 15px 5px;
-			border-top: 1px solid #ebeef5;
-			.ele-col:nth-last-child(1),
-			.ele-col:nth-last-child(2) {
-				display: none;
+			height: 230px;
+			overflow: hidden;
+			border-top: var(--el-border-base);
+			.el-row {
+				padding: 15px;
 			}
-			.awe-col:nth-child(-n + 24) {
+			.el-scrollbar__bar.is-horizontal {
 				display: none;
 			}
 			.icon-selector-warp-item {
 				display: flex;
-				border: 1px solid #ebeef5;
-				padding: 10px;
+				border: var(--el-border-base);
+				padding: 5px;
 				border-radius: 5px;
 				margin-bottom: 10px;
-				transition: all 0.3s ease;
 				.icon-selector-warp-item-value {
-					transition: all 0.3s ease;
 					i {
 						font-size: 20px;
-						color: #606266;
+						color: var(--el-text-color-regular);
 					}
 				}
 				&:hover {
-					border: 1px solid var(--color-primary);
 					cursor: pointer;
-					transition: all 0.3s ease;
+					background-color: var(--color-primary-light-9);
+					border: 1px solid var(--color-primary-light-6);
 					.icon-selector-warp-item-value {
 						i {
 							color: var(--color-primary);
-							transition: all 0.3s ease;
 						}
 					}
 				}
 			}
 			.icon-selector-active {
-				border: 1px solid var(--color-primary);
+				background-color: var(--color-primary-light-9);
+				border: 1px solid var(--color-primary-light-6);
 				.icon-selector-warp-item-value {
 					i {
 						color: var(--color-primary);
@@ -55,33 +66,5 @@
 				}
 			}
 		}
-		.icon-selector-all {
-			.el-input {
-				padding: 0 15px;
-				margin-bottom: 10px;
-			}
-			&-tabs {
-				display: flex;
-				height: 30px;
-				line-height: 30px;
-				padding: 0 15px;
-				margin-bottom: 5px;
-				&-item {
-					flex: 1;
-					text-align: center;
-					cursor: pointer;
-					&:hover {
-						color: var(--color-primary);
-					}
-				}
-				&-active {
-					background: var(--color-primary);
-					border-radius: 5px;
-					.label {
-						color: #ffffff;
-					}
-				}
-			}
-		}
 	}
 }

src/theme/index.scss

@@ -4,3 +4,5 @@
 @import './element.scss';
 @import './iconSelector.scss';
 @import './media/media.scss';
+@import './waves.scss';
+@import './dark.scss';

src/theme/media/form.scss

@@ -10,4 +10,7 @@
 	.el-form-item__content {
 		margin-left: 0 !important;
 	}
+	.el-form-item {
+		display: unset !important;
+	}
 }

src/theme/media/login.scss

@@ -4,18 +4,34 @@
 ------------------------------- */
 @media screen and (max-width: $xs) {
 	.login-container {
-		.login-content {
-			width: 90% !important;
-			padding: 20px 0 !important;
+		background: none !important;
+		.login-logo {
+			display: none;
 		}
-		.login-content-form-btn {
+		.login-content {
 			width: 100% !important;
-			padding: 12px 0 !important;
+			height: 100% !important;
+			padding: 20px 0 !important;
+			border-radius: 0 !important;
+			box-shadow: unset !important;
+			border: none !important;
 		}
 		.login-copyright {
-			.login-copyright-msg {
-				white-space: unset !important;
-			}
+			display: none !important;
+		}
+		.el-form-item {
+			display: flex !important;
+		}
+	}
+}
+
+/* 页面宽度小于375px
+------------------------------- */
+@media screen and (max-width: 376px) {
+	.login-container {
+		.login-content-title {
+			font-size: 18px !important;
+			transition: all 0.3s ease;
 		}
 	}
 }

src/theme/mixins/mixins.scss

@@ -1,3 +1,14 @@
+/* 第三方图标字体间距/大小设置
+------------------------------- */
+@mixin generalIcon {
+	font-size: 14px !important;
+	display: inline-block;
+	vertical-align: middle;
+	margin-right: 5px;
+	width: 24px;
+	text-align: center;
+}
+
 /* 文本不换行
 ------------------------------- */
 @mixin text-no-wrap() {

src/theme/waves.scss

@@ -0,0 +1,101 @@
+/* Waves v0.6.0
+* http://fian.my.id/Waves
+*
+* Copyright 2014 Alfiana E. Sibuea and other contributors
+* Released under the MIT license
+* https://github.com/fians/Waves/blob/master/LICENSE
+*/
+.waves-effect {
+	position: relative;
+	cursor: pointer;
+	display: inline-block;
+	overflow: hidden;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	-webkit-tap-highlight-color: transparent;
+	vertical-align: middle;
+	z-index: 1;
+	will-change: opacity, transform;
+	transition: all 0.3s ease-out;
+}
+.waves-effect .waves-ripple {
+	position: absolute;
+	border-radius: 50%;
+	width: 20px;
+	height: 20px;
+	margin-top: -10px;
+	margin-left: -10px;
+	opacity: 0;
+	background: rgba(0, 0, 0, 0.2);
+	transition: all 0.7s ease-out;
+	transition-property: opacity, -webkit-transform;
+	transition-property: transform, opacity;
+	transition-property: transform, opacity, -webkit-transform;
+	-webkit-transform: scale(0);
+	transform: scale(0);
+	pointer-events: none;
+}
+.waves-effect.waves-light .waves-ripple {
+	background-color: rgba(255, 255, 255, 0.45);
+}
+.waves-effect.waves-red .waves-ripple {
+	background-color: rgba(244, 67, 54, 0.7);
+}
+.waves-effect.waves-yellow .waves-ripple {
+	background-color: rgba(255, 235, 59, 0.7);
+}
+.waves-effect.waves-orange .waves-ripple {
+	background-color: rgba(255, 152, 0, 0.7);
+}
+.waves-effect.waves-purple .waves-ripple {
+	background-color: rgba(156, 39, 176, 0.7);
+}
+.waves-effect.waves-green .waves-ripple {
+	background-color: rgba(76, 175, 80, 0.7);
+}
+.waves-effect.waves-teal .waves-ripple {
+	background-color: rgba(0, 150, 136, 0.7);
+}
+.waves-effect input[type='button'],
+.waves-effect input[type='reset'],
+.waves-effect input[type='submit'] {
+	border: 0;
+	font-style: normal;
+	font-size: inherit;
+	text-transform: inherit;
+	background: none;
+}
+.waves-notransition {
+	transition: none !important;
+}
+.waves-circle {
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0);
+	-webkit-mask-image: -webkit-radial-gradient(circle, #fff 100%, #000 100%);
+}
+.waves-input-wrapper {
+	border-radius: 0.2em;
+	vertical-align: bottom;
+}
+.waves-input-wrapper .waves-button-input {
+	position: relative;
+	top: 0;
+	left: 0;
+	z-index: 1;
+}
+.waves-circle {
+	text-align: center;
+	width: 2.5em;
+	height: 2.5em;
+	line-height: 2.5em;
+	border-radius: 50%;
+	-webkit-mask-image: none;
+}
+.waves-block {
+	display: block;
+}
+a.waves-effect .waves-ripple {
+	z-index: -1;
+}

src/utils/arrayOperation.ts

@@ -1,5 +1,10 @@
-// 判断两数组是否相同
-export function judementSameArr(news: Array<string>, old: Array<string>) {
+/**
+ * 判断两数组是否相同
+ * @param news 新数据
+ * @param old 源数据
+ * @returns 两数组相同返回 `true`，反之则反
+ */
+export function judementSameArr(news: Array<string>, old: Array<string>): boolean {
 	let count = 0;
 	const leng = old.length;
 	for (let i in old) {
@@ -9,3 +14,28 @@ export function judementSameArr(news: Array<string>, old: Array<string>) {
 	}
 	return count === leng ? true : false;
 }
+
+/**
+ * 判断两个对象是否相同
+ * @param a 要比较的对象一
+ * @param b 要比较的对象二
+ * @returns 相同返回 true，反之则反
+ */
+export function isObjectValueEqual(a: { [key: string]: any }, b: { [key: string]: any }) {
+	if (!a || !b) return false;
+	let aProps = Object.getOwnPropertyNames(a);
+	let bProps = Object.getOwnPropertyNames(b);
+	if (aProps.length != bProps.length) return false;
+	for (let i = 0; i < aProps.length; i++) {
+		let propName = aProps[i];
+		let propA = a[propName];
+		let propB = b[propName];
+		if (!b.hasOwnProperty(propName)) return false;
+		if (propA instanceof Object) {
+			if (!isObjectValueEqual(propA, propB)) return false;
+		} else if (propA !== propB) {
+			return false;
+		}
+	}
+	return true;
+}

src/utils/authDirective.ts

@@ -1,20 +1,26 @@
 import type { App } from 'vue';
 import { store } from '/@/store/index.ts';
-import { judementSameArr } from '/@/utils/arrayOperation.ts';
+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) {
-			if (!store.state.userInfos.userInfos.authBtnList.some((v: any) => v === binding.value)) el.parentNode.removeChild(el);
+			if (!store.state.userInfos.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;
-			store.state.userInfos.userInfos.authBtnList.map((val: any) => {
-				binding.value.map((v: any) => {
+			store.state.userInfos.userInfos.authBtnList.map((val: string) => {
+				binding.value.map((v: string) => {
 					if (val === v) flag = true;
 				});
 			});

src/utils/authFunction.ts

@@ -1,23 +1,35 @@
 import { store } from '/@/store/index.ts';
-import { judementSameArr } from '/@/utils/arrayOperation.ts';
+import { judementSameArr } from '/@/utils/arrayOperation';
 
-// 单个权限验证
-export function auth(value: string) {
-	return store.state.userInfos.userInfos.authBtnList.some((v: any) => v === value);
+/**
+ * 单个权限验证
+ * @param value 权限值
+ * @returns 有权限，返回 `true`，反之则反
+ */
+export function auth(value: string): boolean {
+	return store.state.userInfos.userInfos.authBtnList.some((v: string) => v === value);
 }
 
-// 多个权限验证，满足一个则为 true
-export function auths(value: Array<string>) {
+/**
+ * 多个权限验证，满足一个则为 true
+ * @param value 权限值
+ * @returns 有权限，返回 `true`，反之则反
+ */
+export function auths(value: Array<string>): boolean {
 	let flag = false;
-	store.state.userInfos.userInfos.authBtnList.map((val: any) => {
-		value.map((v: any) => {
+	store.state.userInfos.userInfos.authBtnList.map((val: string) => {
+		value.map((v: string) => {
 			if (val === v) flag = true;
 		});
 	});
 	return flag;
 }
 
-// 多个权限验证，全部满足则为 true
-export function authAll(value: Array<string>) {
+/**
+ * 多个权限验证，全部满足则为 true
+ * @param value 权限值
+ * @returns 有权限，返回 `true`，反之则反
+ */
+export function authAll(value: Array<string>): boolean {
 	return judementSameArr(value, store.state.userInfos.userInfos.authBtnList);
 }

src/utils/commonFunction.ts

@@ -0,0 +1,65 @@
+// 通用函数
+import useClipboard from 'vue-clipboard3';
+import { ElMessage } from 'element-plus';
+import { formatDate } from '/@/utils/formatTime';
+import { useI18n } from 'vue-i18n';
+
+export default function () {
+	const { t } = useI18n();
+	const { toClipboard } = useClipboard();
+	//百分比格式化
+	const percentFormat = (row: any, column: number, cellValue: any) => {
+		return cellValue ? `${cellValue}%` : '-';
+	};
+	//列表日期时间格式化
+	const dateFormatYMD = (row: any, column: number, cellValue: any) => {
+		if (!cellValue) return '-';
+		return formatDate(new Date(cellValue), 'YYYY-mm-dd');
+	};
+	//列表日期时间格式化
+	const dateFormatYMDHMS = (row: any, column: number, cellValue: any) => {
+		if (!cellValue) return '-';
+		return formatDate(new Date(cellValue), 'YYYY-mm-dd HH:MM:SS');
+	};
+	//列表日期时间格式化
+	const dateFormatHMS = (row: any, column: number, cellValue: any) => {
+		if (!cellValue) return '-';
+		let time = 0;
+		if (typeof row === 'number') time = row;
+		if (typeof cellValue === 'number') time = cellValue;
+		return formatDate(new Date(time * 1000), 'HH:MM:SS');
+	};
+	// 小数格式化
+	const scaleFormat = (value: any = 0, scale: number = 4) => {
+		return Number.parseFloat(value).toFixed(scale);
+	};
+	// 小数格式化
+	const scale2Format = (value: any = 0) => {
+		return Number.parseFloat(value).toFixed(2);
+	};
+	// 点击复制文本
+	const copyText = (text: string) => {
+		return new Promise((resolve, reject) => {
+			try {
+				//复制
+				toClipboard(text);
+				//下面可以设置复制成功的提示框等操作
+				ElMessage.success(t('message.layout.copyTextSuccess'));
+				resolve(text);
+			} catch (e) {
+				//复制失败
+				ElMessage.error(t('message.layout.copyTextError'));
+				reject(e);
+			}
+		});
+	};
+	return {
+		percentFormat,
+		dateFormatYMD,
+		dateFormatYMDHMS,
+		dateFormatHMS,
+		scaleFormat,
+		scale2Format,
+		copyText,
+	};
+}

src/utils/customDirective.ts

@@ -0,0 +1,178 @@
+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/utils/directive.ts

@@ -0,0 +1,18 @@
+import type { App } from 'vue';
+import { authDirective } from '/@/utils/authDirective';
+import { wavesDirective, dragDirective } from '/@/utils/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/utils/formatTime.ts

@@ -1,20 +1,19 @@
-/*
- * 年(Y) 可用1-4个占位符
- * 月(m)、日(d)、小时(H)、分(M)、秒(S) 可用1-2个占位符
- * 星期(W) 可用1-3个占位符
- * 季度(q为阿拉伯数字，Q为中文数字)可用1或4个占位符
- *
- * let date = new Date()
- * formatDate(date, "YYYY-mm-dd HH:MM:SS")           // 2020-02-09 14:04:23
- * formatDate(date, "YYYY-mm-dd HH:MM:SS Q")         // 2020-02-09 14:09:03 一
- * formatDate(date, "YYYY-mm-dd HH:MM:SS WWW")       // 2020-02-09 14:45:12 星期日
- * formatDate(date, "YYYY-mm-dd HH:MM:SS QQQQ")      // 2020-02-09 14:09:36 第一季度
- * formatDate(date, "YYYY-mm-dd HH:MM:SS WWW QQQQ")  // 2020-02-09 14:46:12 星期日 第一季度
+/**
+ * 时间日期转换
+ * @param date 当前时间，new Date() 格式
+ * @param format 需要转换的时间格式字符串
+ * @description format 字符串随意，如 `YYYY-mm、YYYY-mm-dd`
+ * @description format 季度："YYYY-mm-dd HH:MM:SS QQQQ"
+ * @description format 星期："YYYY-mm-dd HH:MM:SS WWW"
+ * @description format 几周："YYYY-mm-dd HH:MM:SS ZZZ"
+ * @description format 季度 + 星期 + 几周："YYYY-mm-dd HH:MM:SS WWW QQQQ ZZZ"
+ * @returns 返回拼接后的时间字符串
  */
-export function formatDate(date: Date, format: string) {
+export function formatDate(date: Date, format: string): string {
 	let we = date.getDay(); // 星期
+	let z = getWeek(date); // 周
 	let qut = Math.floor((date.getMonth() + 3) / 3).toString(); // 季度
-	const opt: any = {
+	const opt: { [key: string]: string } = {
 		'Y+': date.getFullYear().toString(), // 年
 		'm+': (date.getMonth() + 1).toString(), // 月(月份从0开始，要+1)
 		'd+': date.getDate().toString(), // 日
@@ -24,7 +23,7 @@ export function formatDate(date: Date, format: string) {
 		'q+': qut, // 季度
 	};
 	// 中文数字 (星期)
-	const week: any = {
+	const week: { [key: string]: string } = {
 		'0': '日',
 		'1': '一',
 		'2': '二',
@@ -34,7 +33,7 @@ export function formatDate(date: Date, format: string) {
 		'6': '六',
 	};
 	// 中文数字（季度）
-	const quarter: any = {
+	const quarter: { [key: string]: string } = {
 		'1': '一',
 		'2': '二',
 		'3': '三',
@@ -43,6 +42,7 @@ export function formatDate(date: Date, format: string) {
 	if (/(W+)/.test(format))
 		format = format.replace(RegExp.$1, RegExp.$1.length > 1 ? (RegExp.$1.length > 2 ? '星期' + week[we] : '周' + week[we]) : week[we]);
 	if (/(Q+)/.test(format)) format = format.replace(RegExp.$1, RegExp.$1.length == 4 ? '第' + quarter[qut] + '季度' : quarter[qut]);
+	if (/(Z+)/.test(format)) format = format.replace(RegExp.$1, RegExp.$1.length == 3 ? '第' + z + '周' : z + '');
 	for (let k in opt) {
 		let r = new RegExp('(' + k + ')').exec(format);
 		// 若输入的长度不为1，则前面补零
@@ -52,27 +52,42 @@ export function formatDate(date: Date, format: string) {
 }
 
 /**
- * 10秒：  10 * 1000
- * 1分：   60 * 1000
- * 1小时： 60 * 60 * 1000
- * 24小时：60 * 60 * 24 * 1000
- * 3天：   60 * 60* 24 * 1000 * 3
- *
- * let data = new Date()
- * formatPast(data)                                           // 刚刚
- * formatPast(data - 11 * 1000)                               // 11秒前
- * formatPast(data - 2 * 60 * 1000)                           // 2分钟前
- * formatPast(data - 60 * 60 * 2 * 1000)                      // 2小时前
- * formatPast(data - 60 * 60 * 2 * 1000)                      // 2小时前
- * formatPast(data - 60 * 60 * 71 * 1000)                     // 2天前
- * formatPast("2020-06-01")                                   // 2020-06-01
- * formatPast("2020-06-01", "YYYY-mm-dd HH:MM:SS WWW QQQQ")   // 2020-06-01 08:00:00 星期一 第二季度
+ * 获取当前日期是第几周
+ * @param dateTime 当前传入的日期值
+ * @returns 返回第几周数字值
  */
-export function formatPast(param: any, format: string = 'YYYY-mm-dd') {
+export function getWeek(dateTime: Date): number {
+	let temptTime = new Date(dateTime.getTime());
+	// 周几
+	let weekday = temptTime.getDay() || 7;
+	// 周1+5天=周六
+	temptTime.setDate(temptTime.getDate() - weekday + 1 + 5);
+	let firstDay = new Date(temptTime.getFullYear(), 0, 1);
+	let dayOfWeek = firstDay.getDay();
+	let spendDay = 1;
+	if (dayOfWeek != 0) spendDay = 7 - dayOfWeek + 1;
+	firstDay = new Date(temptTime.getFullYear(), 0, 1 + spendDay);
+	let d = Math.ceil((temptTime.valueOf() - firstDay.valueOf()) / 86400000);
+	let result = Math.ceil(d / 7);
+	return result;
+}
+
+/**
+ * 将时间转换为 `几秒前`、`几分钟前`、`几小时前`、`几天前`
+ * @param param 当前时间，new Date() 格式或者字符串时间格式
+ * @param format 需要转换的时间格式字符串
+ * @description param 10秒：  10 * 1000
+ * @description param 1分：   60 * 1000
+ * @description param 1小时： 60 * 60 * 1000
+ * @description param 24小时：60 * 60 * 24 * 1000
+ * @description param 3天：   60 * 60* 24 * 1000 * 3
+ * @returns 返回拼接后的时间字符串
+ */
+export function formatPast(param: string | Date, format: string = 'YYYY-mm-dd'): string {
 	// 传入格式处理、存储转换值
-	let t: any, s: any;
+	let t: any, s: number;
 	// 获取js 时间戳
-	let time: any = new Date().getTime();
+	let time: number = new Date().getTime();
 	// 是否是对象
 	typeof param === 'string' || 'object' ? (t = new Date(param).getTime()) : (t = param);
 	// 当前时间戳 - 传入时间戳
@@ -104,9 +119,12 @@ export function formatPast(param: any, format: string = 'YYYY-mm-dd') {
 }
 
 /**
- * formatAxis(new Date())   // 上午好
+ * 时间问候语
+ * @param param 当前时间，new Date() 格式
+ * @description param 调用 `formatAxis(new Date())` 输出 `上午好`
+ * @returns 返回拼接后的时间字符串
  */
-export function formatAxis(param: any) {
+export function formatAxis(param: Date): string {
 	let hour: number = new Date(param).getHours();
 	if (hour < 6) return '凌晨好';
 	else if (hour < 9) return '早上好';

src/utils/getStyleSheets.ts

@@ -1,4 +1,5 @@
 import { nextTick } from 'vue';
+import * as svg from '@element-plus/icons-vue';
 
 // 获取阿里字体图标
 const getAlicdnIconfont = () => {
@@ -27,20 +28,14 @@ const getAlicdnIconfont = () => {
 	});
 };
 
-// 初始化获取 css 样式，获取 element plus 自带图标
-const elementPlusIconfont = () => {
+// 初始化获取 css 样式，获取 element plus 自带 svg 图标，增加了 element 前缀，使用时：elementAim
+const getElementPlusIconfont = () => {
 	return new Promise((resolve, reject) => {
 		nextTick(() => {
-			const styles: any = document.styleSheets;
-			let sheetsIconList = [];
-			for (let i = 0; i < styles.length; i++) {
-				for (let j = 0; j < styles[i].cssRules.length; j++) {
-					if (styles[i].cssRules[j].selectorText && styles[i].cssRules[j].selectorText.indexOf('.el-icon-') === 0) {
-						sheetsIconList.push(
-							`${styles[i].cssRules[j].selectorText.substring(1, styles[i].cssRules[j].selectorText.length).replace(/\:\:before/gi, '')}`
-						);
-					}
-				}
+			const icons = svg as any;
+			const sheetsIconList = [];
+			for (const i in icons) {
+				sheetsIconList.push(`element${icons[i].name}`);
 			}
 			if (sheetsIconList.length > 0) resolve(sheetsIconList);
 			else reject('未获取到值，请刷新重试');
@@ -49,7 +44,7 @@ const elementPlusIconfont = () => {
 };
 
 // 初始化获取 css 样式，这里使用 fontawesome 的图标
-const awesomeIconfont = () => {
+const getAwesomeIconfont = () => {
 	return new Promise((resolve, reject) => {
 		nextTick(() => {
 			const styles: any = document.styleSheets;
@@ -67,28 +62,38 @@ const awesomeIconfont = () => {
 						sheetsList[i].cssRules[j].selectorText.indexOf('.fa-') === 0 &&
 						sheetsList[i].cssRules[j].selectorText.indexOf(',') === -1
 					) {
-						sheetsIconList.push(
-							`${sheetsList[i].cssRules[j].selectorText.substring(1, sheetsList[i].cssRules[j].selectorText.length).replace(/\:\:before/gi, '')}`
-						);
+						if (/::before/.test(sheetsList[i].cssRules[j].selectorText)) {
+							sheetsIconList.push(
+								`${sheetsList[i].cssRules[j].selectorText.substring(1, sheetsList[i].cssRules[j].selectorText.length).replace(/\:\:before/gi, '')}`
+							);
+						}
 					}
 				}
 			}
-			if (sheetsIconList.length > 0) resolve(sheetsIconList);
+			if (sheetsIconList.length > 0) resolve(sheetsIconList.reverse());
 			else reject('未获取到值，请刷新重试');
 		});
 	});
 };
 
-// 定义导出方法集合
+/**
+ * 获取字体图标 `document.styleSheets`
+ * @method ali 获取阿里字体图标 `<i class="iconfont 图标类名"></i>`
+ * @method ele 获取 element plus 自带图标 `<i class="图标类名"></i>`
+ * @method ali 获取 fontawesome 的图标 `<i class="fa 图标类名"></i>`
+ */
 const initIconfont = {
+	// iconfont
 	ali: () => {
 		return getAlicdnIconfont();
 	},
+	// element plus
 	ele: () => {
-		return elementPlusIconfont();
+		return getElementPlusIconfont();
 	},
+	// fontawesome
 	awe: () => {
-		return awesomeIconfont();
+		return getAwesomeIconfont();
 	},
 };
 

src/utils/loading.ts

@@ -1,7 +1,12 @@
 import { nextTick } from 'vue';
 import loadingCss from '/@/theme/loading.scss';
 
-// 定义方法
+/**
+ * 页面全局 Loading
+ * @method setCss 载入 css
+ * @method start 创建 loading
+ * @method done 移除 loading
+ */
 export const NextLoading = {
 	// 载入 css
 	setCss: () => {
@@ -13,7 +18,7 @@ export const NextLoading = {
 	},
 	// 创建 loading
 	start: () => {
-		const bodys: any = document.body;
+		const bodys: Element = document.body;
 		const div = document.createElement('div');
 		div.setAttribute('class', 'loading-next');
 		const htmls = `
@@ -33,11 +38,13 @@ export const NextLoading = {
 		`;
 		div.innerHTML = htmls;
 		bodys.insertBefore(div, bodys.childNodes[0]);
+		window.nextLoading = true;
 	},
 	// 移除 loading
 	done: () => {
 		nextTick(() => {
 			setTimeout(() => {
+				window.nextLoading = false;
 				const el = document.querySelector('.loading-next');
 				el && el.parentNode?.removeChild(el);
 			}, 1000);

src/utils/other.ts

@@ -0,0 +1,119 @@
+import { nextTick } from 'vue';
+import type { App } from 'vue';
+import * as svg from '@element-plus/icons-vue';
+import router from '/@/router/index';
+import { store } from '/@/store/index';
+import { i18n } from '/@/i18n/index';
+import { Local } from '/@/utils/storage';
+import SvgIcon from '/@/components/svgIcon/index.vue';
+
+/**
+ * 导出全局注册 element plus svg 图标
+ * @param app vue 实例
+ * @description 使用：https://element-plus.gitee.io/zh-CN/component/icon.html
+ */
+export function elSvg(app: App) {
+	const icons = svg as any;
+	for (const i in icons) {
+		app.component(`element${icons[i].name}`, icons[i]);
+	}
+	app.component('SvgIcon', SvgIcon);
+}
+
+/**
+ * 设置浏览器标题国际化
+ * @method const title = useTitle(); ==> title()
+ */
+export function useTitle() {
+	nextTick(() => {
+		let webTitle = '';
+		let globalTitle: string = store.state.themeConfig.themeConfig.globalTitle;
+		router.currentRoute.value.path === '/login'
+			? (webTitle = router.currentRoute.value.meta.title as any)
+			: (webTitle = i18n.global.t(router.currentRoute.value.meta.title as any));
+		document.title = `${webTitle} - ${globalTitle}` || globalTitle;
+	});
+}
+
+/**
+ * 图片懒加载
+ * @param el dom 目标元素
+ * @param arr 列表数据
+ * @description data-xxx 属性用于存储页面或应用程序的私有自定义数据
+ */
+export const lazyImg = (el: any, arr: any) => {
+	const io = new IntersectionObserver((res) => {
+		res.forEach((v: any) => {
+			if (v.isIntersecting) {
+				const { img, key } = v.target.dataset;
+				v.target.src = img;
+				v.target.onload = () => {
+					io.unobserve(v.target);
+					arr[key]['loading'] = false;
+				};
+			}
+		});
+	});
+	nextTick(() => {
+		document.querySelectorAll(el).forEach((img) => io.observe(img));
+	});
+};
+
+/**
+ * 全局组件大小
+ * @returns 返回 `window.localStorage` 中读取的缓存值 `globalComponentSize`
+ */
+export function globalComponentSize() {
+	return Local.get('themeConfig')?.globalComponentSize;
+}
+
+/**
+ * 对象深克隆
+ * @param obj 源对象
+ * @returns 克隆后的对象
+ */
+export function deepClone(obj: any) {
+	let newObj: any;
+	try {
+		newObj = obj.push ? [] : {};
+	} catch (error) {
+		newObj = {};
+	}
+	for (let attr in obj) {
+		if (typeof obj[attr] === 'object') {
+			newObj[attr] = deepClone(obj[attr]);
+		} else {
+			newObj[attr] = obj[attr];
+		}
+	}
+	return newObj;
+}
+
+/**
+ * 统一批量导出
+ * @method elSvg 导出全局注册 element plus svg 图标
+ * @method useTitle 设置浏览器标题国际化
+ * @method lazyImg 图片懒加载
+ * @method globalComponentSize element plus 全局组件大小
+ * @method deepClone 对象深克隆
+ */
+const other = {
+	elSvg: (app: App) => {
+		elSvg(app);
+	},
+	useTitle: () => {
+		useTitle();
+	},
+	lazyImg: (el: any, arr: any) => {
+		lazyImg(el, arr);
+	},
+	globalComponentSize: () => {
+		globalComponentSize();
+	},
+	deepClone: (obj: any) => {
+		deepClone(obj);
+	},
+};
+
+// 统一批量导出
+export default other;

src/utils/request.ts

@@ -1,7 +1,6 @@
 import axios from 'axios';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { clearSession, getSession } from '/@/utils/storage.ts';
-import router, { resetRoute } from '/@/router/index.ts';
+import { Session } from '/@/utils/storage';
 
 // 配置新建一个 axios 实例
 const service = axios.create({
@@ -14,8 +13,8 @@ const service = axios.create({
 service.interceptors.request.use(
 	(config) => {
 		// 在发送请求之前做些什么 token
-		if (getSession('token')) {
-			config.headers.common['Authorization'] = `${getSession('token')}`;
+		if (Session.get('token')) {
+			config.headers.common['Authorization'] = `${Session.get('token')}`;
 		}
 		return config;
 	},
@@ -33,9 +32,8 @@ service.interceptors.response.use(
 		if (res.code && res.code !== 0) {
 			// `token` 过期或者账号已在别处登录
 			if (res.code === 401 || res.code === 4001) {
-				clearSession(); // 清除浏览器全部临时缓存
-				router.push('/login'); // 去登录页面
-				resetRoute(); // 删除/重置路由
+				Session.clear(); // 清除浏览器全部临时缓存
+				window.location.href = '/'; // 去登录页
 				ElMessageBox.alert('你已被登出，请重新登录', '提示', {})
 					.then(() => {})
 					.catch(() => {});
@@ -59,4 +57,5 @@ service.interceptors.response.use(
 	}
 );
 
+// 导出 axios 实例
 export default service;

src/utils/setIconfont.ts

@@ -1,12 +1,12 @@
 // 字体图标 url
 const cssCdnUrlList: Array<string> = [
-	'//at.alicdn.com/t/font_2298093_cl2h21rqdau.css',
+	'//at.alicdn.com/t/font_2298093_y6u00apwst.css',
 	'//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css',
 ];
 // 第三方 js url
 const jsCdnUrlList: Array<string> = [];
 
-// 动态设置字体图标
+// 动态批量设置字体图标
 export function setCssCdn() {
 	if (cssCdnUrlList.length <= 0) return false;
 	cssCdnUrlList.map((v) => {
@@ -18,7 +18,7 @@ export function setCssCdn() {
 	});
 }
 
-// 批量设置第三方js
+// 动态批量设置第三方js
 export function setJsCdn() {
 	if (jsCdnUrlList.length <= 0) return false;
 	jsCdnUrlList.map((v) => {
@@ -28,11 +28,17 @@ export function setJsCdn() {
 	});
 }
 
-// 设置执行函数
+/**
+ * 批量设置字体图标、动态js
+ * @method cssCdn 动态批量设置字体图标
+ * @method jsCdn 动态批量设置第三方js
+ */
 const setIntroduction = {
+	// 设置css
 	cssCdn: () => {
 		setCssCdn();
 	},
+	// 设置js
 	jsCdn: () => {
 		setJsCdn();
 	},

src/utils/storage.ts

@@ -1,37 +1,53 @@
-// 1. localStorage
-// 设置永久缓存
-export function setLocal(key: string, val: any) {
-	window.localStorage.setItem(key, JSON.stringify(val));
-}
-// 获取永久缓存
-export function getLocal(key: string) {
-	let json: any = window.localStorage.getItem(key);
-	return JSON.parse(json);
-}
-// 移除永久缓存
-export function removeLocal(key: string) {
-	window.localStorage.removeItem(key);
-}
-// 移除全部永久缓存
-export function clearLocal() {
-	window.localStorage.clear();
-}
+/**
+ * window.localStorage 浏览器永久缓存
+ * @method set 设置永久缓存
+ * @method get 获取永久缓存
+ * @method remove 移除永久缓存
+ * @method clear 移除全部永久缓存
+ */
+export const Local = {
+	// 设置永久缓存
+	set(key: string, val: any) {
+		window.localStorage.setItem(key, JSON.stringify(val));
+	},
+	// 获取永久缓存
+	get(key: string) {
+		let json: any = window.localStorage.getItem(key);
+		return JSON.parse(json);
+	},
+	// 移除永久缓存
+	remove(key: string) {
+		window.localStorage.removeItem(key);
+	},
+	// 移除全部永久缓存
+	clear() {
+		window.localStorage.clear();
+	},
+};
 
-// 2. sessionStorage
-// 设置临时缓存
-export function setSession(key: string, val: any) {
-	window.sessionStorage.setItem(key, JSON.stringify(val));
-}
-// 获取临时缓存
-export function getSession(key: string) {
-	let json: any = window.sessionStorage.getItem(key);
-	return JSON.parse(json);
-}
-// 移除临时缓存
-export function removeSession(key: string) {
-	window.sessionStorage.removeItem(key);
-}
-// 移除全部临时缓存
-export function clearSession() {
-	window.sessionStorage.clear();
-}
+/**
+ * window.sessionStorage 浏览器临时缓存
+ * @method set 设置临时缓存
+ * @method get 获取临时缓存
+ * @method remove 移除临时缓存
+ * @method clear 移除全部临时缓存
+ */
+export const Session = {
+	// 设置临时缓存
+	set(key: string, val: any) {
+		window.sessionStorage.setItem(key, JSON.stringify(val));
+	},
+	// 获取临时缓存
+	get(key: string) {
+		let json: any = window.sessionStorage.getItem(key);
+		return JSON.parse(json);
+	},
+	// 移除临时缓存
+	remove(key: string) {
+		window.sessionStorage.removeItem(key);
+	},
+	// 移除全部临时缓存
+	clear() {
+		window.sessionStorage.clear();
+	},
+};

src/utils/theme.ts

@@ -1,38 +1,58 @@
 import { ElMessage } from 'element-plus';
 
-// hex颜色转rgb颜色
+/**
+ * hex颜色转rgb颜色
+ * @param str 颜色值字符串
+ * @returns 返回处理后的颜色值
+ */
 export function hexToRgb(str: any) {
 	let hexs: any = '';
 	let reg = /^\#?[0-9A-Fa-f]{6}$/;
-	if (!reg.test(str)) return ElMessage({ type: 'warning', message: '输入错误的hex' });
+	if (!reg.test(str)) return ElMessage.warning('输入错误的hex');
 	str = str.replace('#', '');
 	hexs = str.match(/../g);
 	for (let i = 0; i < 3; i++) hexs[i] = parseInt(hexs[i], 16);
 	return hexs;
 }
 
-// rgb颜色转Hex颜色
+/**
+ * rgb颜色转Hex颜色
+ * @param r 代表红色
+ * @param g 代表绿色
+ * @param b 代表蓝色
+ * @returns 返回处理后的颜色值
+ */
 export function rgbToHex(r: any, g: any, b: any) {
 	let reg = /^\d{1,3}$/;
-	if (!reg.test(r) || !reg.test(g) || !reg.test(b)) return ElMessage({ type: 'warning', message: '输入错误的rgb颜色值' });
+	if (!reg.test(r) || !reg.test(g) || !reg.test(b)) return ElMessage.warning('输入错误的rgb颜色值');
 	let hexs = [r.toString(16), g.toString(16), b.toString(16)];
 	for (let i = 0; i < 3; i++) if (hexs[i].length == 1) hexs[i] = `0${hexs[i]}`;
 	return `#${hexs.join('')}`;
 }
 
-// 加深颜色值，level为加深的程度，限0-1之间
+/**
+ * 加深颜色值
+ * @param color 颜色值字符串
+ * @param level 加深的程度，限0-1之间
+ * @returns 返回处理后的颜色值
+ */
 export function getDarkColor(color: any, level: number) {
 	let reg = /^\#?[0-9A-Fa-f]{6}$/;
-	if (!reg.test(color)) return ElMessage({ type: 'warning', message: '输入错误的hex颜色值' });
+	if (!reg.test(color)) return ElMessage.warning('输入错误的hex颜色值');
 	let rgb = hexToRgb(color);
 	for (let i = 0; i < 3; i++) rgb[i] = Math.floor(rgb[i] * (1 - level));
 	return rgbToHex(rgb[0], rgb[1], rgb[2]);
 }
 
-// 变浅颜色值，level为加深的程度，限0-1之间
+/**
+ * 变浅颜色值
+ * @param color 颜色值字符串
+ * @param level 加深的程度，限0-1之间
+ * @returns 返回处理后的颜色值
+ */
 export function getLightColor(color: any, level: number) {
 	let reg = /^\#?[0-9A-Fa-f]{6}$/;
-	if (!reg.test(color)) return ElMessage({ type: 'warning', message: '输入错误的hex颜色值' });
+	if (!reg.test(color)) return ElMessage.warning('输入错误的hex颜色值');
 	let rgb = hexToRgb(color);
 	for (let i = 0; i < 3; i++) rgb[i] = Math.floor((255 - rgb[i]) * level + rgb[i]);
 	return rgbToHex(rgb[0], rgb[1], rgb[2]);

src/utils/toolsValidate.ts

@@ -1,9 +1,14 @@
 /**
  * 2020.11.29 lyt 整理
  * 工具类集合，适用于平时开发
+ * 新增多行注释信息，鼠标放到方法名即可查看
  */
 
-// 小数或整数(不可以负数)
+/**
+ * 小数或整数(不可以负数)
+ * @param val 当前值字符串
+ * @returns 返回处理后的字符串
+ */
 export function verifyNumberIntegerAndFloat(val: string) {
 	// 匹配空格
 	let v = val.replace(/(^\s*)|(\s*$)/g, '');
@@ -21,7 +26,11 @@ export function verifyNumberIntegerAndFloat(val: string) {
 	return v;
 }
 
-// 正整数验证
+/**
+ * 正整数验证
+ * @param val 当前值字符串
+ * @returns 返回处理后的字符串
+ */
 export function verifiyNumberInteger(val: string) {
 	// 匹配空格
 	let v = val.replace(/(^\s*)|(\s*$)/g, '');
@@ -37,7 +46,11 @@ export function verifiyNumberInteger(val: string) {
 	return v;
 }
 
-// 去掉中文及空格
+/**
+ * 去掉中文及空格
+ * @param val 当前值字符串
+ * @returns 返回处理后的字符串
+ */
 export function verifyCnAndSpace(val: string) {
 	// 匹配中文与空格
 	let v = val.replace(/[\u4e00-\u9fa5\s]+/g, '');
@@ -47,7 +60,11 @@ export function verifyCnAndSpace(val: string) {
 	return v;
 }
 
-// 去掉英文及空格
+/**
+ * 去掉英文及空格
+ * @param val 当前值字符串
+ * @returns 返回处理后的字符串
+ */
 export function verifyEnAndSpace(val: string) {
 	// 匹配英文与空格
 	let v = val.replace(/[a-zA-Z]+/g, '');
@@ -57,7 +74,11 @@ export function verifyEnAndSpace(val: string) {
 	return v;
 }
 
-// 禁止输入空格
+/**
+ * 禁止输入空格
+ * @param val 当前值字符串
+ * @returns 返回处理后的字符串
+ */
 export function verifyAndSpace(val: string) {
 	// 匹配空格
 	let v = val.replace(/(^\s*)|(\s*$)/g, '');
@@ -65,7 +86,11 @@ export function verifyAndSpace(val: string) {
 	return v;
 }
 
-// 金额用 `,` 区分开
+/**
+ * 金额用 `,` 区分开
+ * @param val 当前值字符串
+ * @returns 返回处理后的字符串
+ */
 export function verifyNumberComma(val: string) {
 	// 调用小数或整数(不可以负数)方法
 	let v: any = verifyNumberIntegerAndFloat(val);
@@ -79,7 +104,13 @@ export function verifyNumberComma(val: string) {
 	return v;
 }
 
-// 匹配文字变色（搜索时）
+/**
+ * 匹配文字变色（搜索时）
+ * @param val 当前值字符串
+ * @param text 要处理的字符串值
+ * @param color 搜索到时字体高亮颜色
+ * @returns 返回处理后的字符串
+ */
 export function verifyTextColor(val: string, text = '', color = 'red') {
 	// 返回内容，添加颜色
 	let v = text.replace(new RegExp(val, 'gi'), `<span style='color: ${color}'>${val}</span>`);
@@ -87,7 +118,12 @@ export function verifyTextColor(val: string, text = '', color = 'red') {
 	return v;
 }
 
-// 数字转中文大写
+/**
+ * 数字转中文大写
+ * @param val 当前值字符串
+ * @param unit 默认：仟佰拾亿仟佰拾万仟佰拾元角分
+ * @returns 返回处理后的字符串
+ */
 export function verifyNumberCnUppercase(val: any, unit = '仟佰拾亿仟佰拾万仟佰拾元角分', v = '') {
 	// 当前内容字符串添加 2个0，为什么??
 	val += '00';
@@ -114,7 +150,11 @@ export function verifyNumberCnUppercase(val: any, unit = '仟佰拾亿仟佰拾
 	return v;
 }
 
-// 手机号码
+/**
+ * 手机号码
+ * @param val 当前值字符串
+ * @returns 返回 true: 手机号码正确
+ */
 export function verifyPhone(val: string) {
 	// false: 手机号码不正确
 	if (!/^((12[0-9])|(13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\d{8}$/.test(val)) return false;
@@ -122,7 +162,11 @@ export function verifyPhone(val: string) {
 	else return true;
 }
 
-// 国内电话号码
+/**
+ * 国内电话号码
+ * @param val 当前值字符串
+ * @returns 返回 true: 国内电话号码正确
+ */
 export function verifyTelPhone(val: string) {
 	// false: 国内电话号码不正确
 	if (!/\d{3}-\d{8}|\d{4}-\d{7}/.test(val)) return false;
@@ -130,7 +174,11 @@ export function verifyTelPhone(val: string) {
 	else return true;
 }
 
-// 登录账号 (字母开头，允许5-16字节，允许字母数字下划线)
+/**
+ * 登录账号 (字母开头，允许5-16字节，允许字母数字下划线)
+ * @param val 当前值字符串
+ * @returns 返回 true: 登录账号正确
+ */
 export function verifyAccount(val: string) {
 	// false: 登录账号不正确
 	if (!/^[a-zA-Z][a-zA-Z0-9_]{4,15}$/.test(val)) return false;
@@ -138,7 +186,11 @@ export function verifyAccount(val: string) {
 	else return true;
 }
 
-// 密码 (以字母开头，长度在6~16之间，只能包含字母、数字和下划线)
+/**
+ * 密码 (以字母开头，长度在6~16之间，只能包含字母、数字和下划线)
+ * @param val 当前值字符串
+ * @returns 返回 true: 密码正确
+ */
 export function verifyPassword(val: string) {
 	// false: 密码不正确
 	if (!/^[a-zA-Z]\w{5,15}$/.test(val)) return false;
@@ -146,7 +198,11 @@ export function verifyPassword(val: string) {
 	else return true;
 }
 
-// 强密码 (字母+数字+特殊字符，长度在6-16之间)
+/**
+ * 强密码 (字母+数字+特殊字符，长度在6-16之间)
+ * @param val 当前值字符串
+ * @returns 返回 true: 强密码正确
+ */
 export function verifyPasswordPowerful(val: string) {
 	// false: 强密码不正确
 	if (!/^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&\.*]+$)(?![a-zA-z\d]+$)(?![a-zA-z!@#$%^&\.*]+$)(?![\d!@#$%^&\.*]+$)[a-zA-Z\d!@#$%^&\.*]{6,16}$/.test(val))
@@ -155,7 +211,14 @@ export function verifyPasswordPowerful(val: string) {
 	else return true;
 }
 
-// 密码强度
+/**
+ * 密码强度
+ * @param val 当前值字符串
+ * @description 弱：纯数字，纯字母，纯特殊字符
+ * @description 中：字母+数字，字母+特殊字符，数字+特殊字符
+ * @description 强：字母+数字+特殊字符
+ * @returns 返回处理后的字符串：弱、中、强
+ */
 export function verifyPasswordStrength(val: string) {
 	let v = '';
 	// 弱：纯数字，纯字母，纯特殊字符
@@ -169,7 +232,11 @@ export function verifyPasswordStrength(val: string) {
 	return v;
 }
 
-// IP地址
+/**
+ * IP地址
+ * @param val 当前值字符串
+ * @returns 返回 true: IP地址正确
+ */
 export function verifyIPAddress(val: string) {
 	// false: IP地址不正确
 	if (
@@ -182,7 +249,11 @@ export function verifyIPAddress(val: string) {
 	else return true;
 }
 
-// 邮箱
+/**
+ * 邮箱
+ * @param val 当前值字符串
+ * @returns 返回 true: 邮箱正确
+ */
 export function verifyEmail(val: string) {
 	// false: 邮箱不正确
 	if (
@@ -195,7 +266,11 @@ export function verifyEmail(val: string) {
 	else return true;
 }
 
-// 身份证
+/**
+ * 身份证
+ * @param val 当前值字符串
+ * @returns 返回 true: 身份证正确
+ */
 export function verifyIdCard(val: string) {
 	// false: 身份证不正确
 	if (!/^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(val)) return false;
@@ -203,7 +278,11 @@ export function verifyIdCard(val: string) {
 	else return true;
 }
 
-// 姓名
+/**
+ * 姓名
+ * @param val 当前值字符串
+ * @returns 返回 true: 姓名正确
+ */
 export function verifyFullName(val: string) {
 	// false: 姓名不正确
 	if (!/^[\u4e00-\u9fa5]{1,6}(·[\u4e00-\u9fa5]{1,6}){0,2}$/.test(val)) return false;
@@ -211,7 +290,11 @@ export function verifyFullName(val: string) {
 	else return true;
 }
 
-// 邮政编码
+/**
+ * 邮政编码
+ * @param val 当前值字符串
+ * @returns 返回 true: 邮政编码正确
+ */
 export function verifyPostalCode(val: string) {
 	// false: 邮政编码不正确
 	if (!/^[1-9][0-9]{5}$/.test(val)) return false;
@@ -219,7 +302,11 @@ export function verifyPostalCode(val: string) {
 	else return true;
 }
 
-// url
+/**
+ * url 处理
+ * @param val 当前值字符串
+ * @returns 返回 true: url 正确
+ */
 export function verifyUrl(val: string) {
 	// false: url不正确
 	if (
@@ -232,7 +319,11 @@ export function verifyUrl(val: string) {
 	else return true;
 }
 
-// 车牌号
+/**
+ * 车牌号
+ * @param val 当前值字符串
+ * @returns 返回 true：车牌号正确
+ */
 export function verifyCarNum(val: string) {
 	// false: 车牌号不正确
 	if (

src/utils/viteBuild.ts

@@ -1,20 +1,25 @@
-// vite 打包相关
 import dotenv from 'dotenv';
+
+// 定义接口类型声明
 export interface ViteEnv {
 	VITE_PORT: number;
 	VITE_OPEN: boolean;
 	VITE_PUBLIC_PATH: string;
 }
 
+/**
+ * vite 打包相关
+ * @link 参考：https://cn.vitejs.dev/guide/env-and-mode.html
+ * @returns 返回 `VITE_xxx` 环境变量和模式信息
+ */
 export function loadEnv(): ViteEnv {
 	const env = process.env.NODE_ENV;
 	const ret: any = {};
-	const envList = [`.env.${env}.local`, `.env.${env}`, '.env.local', '.env', ,];
+	const envList = [`.env.${env}.local`, `.env.${env}`, '.env.local', '.env'];
 	envList.forEach((e) => {
 		dotenv.config({ path: e });
 	});
 	for (const envName of Object.keys(process.env)) {
-		console.log(envName);
 		let realName = (process.env as any)[envName].replace(/\\n/g, '\n');
 		realName = realName === 'true' ? true : realName === 'false' ? false : realName;
 		if (envName === 'VITE_PORT') realName = Number(realName);