'admin-23.04.12:同步master分支v2.4.33版本内容'

Signed-off-by: lyt-Top <1105290566@qq.com>

.env

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

.env.development

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

.env.production

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

CHANGELOG.md

@@ -1,425 +1,94 @@
-# <a href="https://gitee.com/lyt-top/vue-next-admin" target="_blank">vue-next-admin 更新日志</a>
+# <a href="https://gitee.com/lyt-top/vue-next-admin" target="_blank">vue-next-admin-template（不带国际化） 更新日志</a>
 
-🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）
+🎉🎉🔥 `vue-next-admin-template` 基于 （vue-next-admin-v2.4.33 版本） vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）
+
+## 2.4.33
+
+`2023.04.12`
+
+- 🎉 同步 master 分支 v2.4.33 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
+
+## 2.4.32
+
+`2023.03.26`
+
+- 🎉 同步 master 分支 v2.4.32 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
+
+## 2.4.31
+
+`2023.03.10`
+
+- 🎉 同步 master 分支 v2.4.31 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
+
+## 2.4.3
+
+`2023.02.22`
+
+🚩🚩🚩 感谢 [驰骋工作流引擎-表单引擎-低代码开发平台](http://www.ccflow.org/) 赞助商的赞助。驰骋公司为社会提供流程引擎+表单引擎+低代码开发平台一体的开源软件解决方案，欢迎广大开发者前去体验！
+
+- 🎉 同步 master 分支 v2.4.3 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
+
+## 2.4.21
+
+`2022.12.12`
+
+- 🎉 同步 master 分支 v2.4.21 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
 
 ## 2.4.2
 
-`2022.12.09`
+`2022.12.10`
 
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 国际化自动导入文件功能，只需在 `/src/i18n/pages` 下新建文件夹定义即可
-- 🎉 新增 `/make/tableDemo` 中 [搜索框展开，收缩功能，高级筛选组件 有计划做吗](https://gitee.com/lyt-top/vue-next-admin/issues/I6511L)
-- 🐞 修复 [!40 开启 TagsView 缓存后，刷新后所有的路由都变成组件缓存了](https://gitee.com/lyt-top/vue-next-admin/pulls/40)，感谢[@mrjimin](https://gitee.com/mrjimin)
-- 🐞 修复 [!41 修复 get 请求传递嵌套对象或数组时无法正常编码问题](https://gitee.com/lyt-top/vue-next-admin/pulls/41)，感谢[@随心](https://gitee.com/jiangqiang1996)
-- 🐞 修复 组件 wangEditor 回显值的问题
-- 🐞 修复 `/fun/echartsMap`（地理坐标/地图）、`visualizingDemo2`（数据可视化演示 2） 演示报错问题
-- 🎯 优化 版本升级提示
-- 🎯 优化 无权限登录时增加提示信息，[BUG：因前端加载路由(initFrontEndControlRoutes)中当前用户角色为一个陌生角色, 导致 router.beforeEach 会死循环 浏览器崩溃](https://gitee.com/lyt-top/vue-next-admin/issues/I64HVO)，感谢[@canroc](https://gitee.com/canroc)、[@随心](https://gitee.com/jiangqiang1996)
-- 🌈 重构 `/views/system` 新增修改组件合并。[可以把新增修改组件合并成一个吧](https://gitee.com/lyt-top/vue-next-admin/issues/I64WES)
-- 🌈 重构 图标选择器，[图标选择器没办法筛选，只能筛选 ali 的](https://gitee.com/lyt-top/vue-next-admin/issues/I64HZD)，感谢[@随心](https://gitee.com/jiangqiang1996)
+- 🎉 同步 master 分支 v2.4.2 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
 
 ## 2.4.1
 
 `2022.11.30`
 
-- 🎉 新增 版本升级提示
-- 🐞 修复 [先打开 F12 再登录进去，然后改变浏览器大小 js 报错](https://gitee.com/lyt-top/vue-next-admin/issues/I63ZZT)，感谢[@Quber](https://gitee.com/quber)
-
-## 2.4.0
-
-`2022.11.29`
-
-⚡⚡⚡ 此版为破坏性更新，应群友建议 `script lang="ts"` 改 `script lang="ts" setup 语法糖`。
-
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 表格封装演示，路径：`组件封装 -> 表格封装演示`
-- 🎉 新增 master 分支 script lang="ts" 改成 script lang="ts" setup 语法糖，将同步基础分支
-- 🐞 修复 [v2.3.0 版本报错问题处理](https://gitee.com/lyt-top/vue-next-admin/issues/I623RP)
-- 🐞 修复 [el-backtop 滚动高度不触发（固定了 header）](https://gitee.com/lyt-top/vue-next-admin/issues/I63N0D)，感谢[@dejavuuuuu](https://gitee.com/zc19951010)
-- 🎯 优化 完善 ts 类型，删除根目录 `plugins.d.ts、shim.d.ts、source.d.ts`，移入到 `/src/types/global.d.ts`
-- 🎯 优化 代码 `watch` 移动到 `生命周期钩子` 最后，文字注释等
+- 🎉 同步 master 分支 v2.4.1 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
 
 ## 2.3.0
 
 `2022.11.16`
 
-- 🌟 更新 依赖更新最新版本
-- 🎉 新增 新版登录页
-- 🎉 新增 tagsview 鼠标中键 `关闭当前 tagsview`
-- 🎉 新增 `分栏菜单鼠标悬停预加载`。[分栏模式如何去掉鼠标悬浮父级菜单，分栏菜单自动加载的功能啊](https://gitee.com/lyt-top/vue-next-admin/issues/I5RUY7)。操作路径：`布局配置 -> 分栏设置`
-- 🐞 修复 [vue-i18n](https://vue-i18n.intlify.dev/api/general.html#createi18n) 报错，[!39 修复 i18n 兼容性问题](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/39/files)，感谢[@随心](https://toscode.gitee.com/jiangqiang1996)
-- 🐞 修复 顶栏搜索功能点击蒙蔽弹窗不关闭
-- 🐞 修复 [!38 fix: bug refreshRouterViewKey 值为 null 导致路由缓存第一次无效](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/38/files)，感谢[@P)](https://toscode.gitee.com/foxp8y)
-- 🐞 修复 `路由参数 -> 普通路由/动态路由` 国际化演示时，`tagsView` 和 `浏览器标题` 显示异常。[演示中：路由参数界面 -> 动态路由，国际化显示时面包屑、浏览器标题有 bug](https://gitee.com/lyt-top/vue-next-admin/issues/I5JRJG)
-- 🐞 修复 `路由参数 -> 普通路由/动态路由` 动态设置 `tagsViewName` 时，`tagsView 右键菜单刷新` 功能失效（也就是路由后面有参数时，query、params）。[普通或动态路由新建页面后点击 tagview 刷新无效](https://gitee.com/lyt-top/vue-next-admin/issues/I5K3YO)，感谢[@dejavuuuuu](https://gitee.com/zc19951010)
-- 🐞 修复 [表单（el-form）中，字体图标偏移问题](https://gitee.com/lyt-top/vue-next-admin/issues/I5K1PM)
-- 🐞 修复 路由 `router.addRoute` 时，一直提示 `No match found for location with path 'xxx'`
-- 🎯 优化 全局 `getCurrentInstance` 替换成 [`provide/inject`](https://cn.vuejs.org/api/application.html#app-provide) 或通过 `ref` 处理
-- 🎯 优化 引入组件方式 `(import xxx from xxx)` 改成 `defineAsyncComponent(() => import(xxx))`
-- 🎯 优化 页面高度 100% 问题，重写布局配置 `界面设置 -> 固定 Header` 多余的 `el-scrollbar` 逻辑、重写各界面需 `计算属性 computed` 设置动态高度问题（改为 css `flex` 设置自适应高度，具体查看文档：[设置可视区高度 100%](https://lyt-top.gitee.io/vue-next-admin-doc-preview/config/otherIssues/#%E8%AE%BE%E7%BD%AE%E5%8F%AF%E8%A7%86%E5%8C%BA%E9%AB%98%E5%BA%A6-100)。[!31 修复页面样式无法通过百分比设置的问题](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/31)，感谢[@LostDeer](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/31/files)。`（改动较大，删除多余代码）`
-- 🎯 优化 [wangeditor](https://www.wangeditor.com/) 组件，`@wangeditor/editor-for-vue`。可自行修改，组件位置：`/src/components/editor`。相关 Issues：[wangeditor 编辑器多个菜单不能回弹](https://gitee.com/lyt-top/vue-next-admin/issues/I5M5H7)
-- 🌈 重构 外链、内嵌 iframe 逻辑 + 美化，iframe 支持缓存
+- 🎉 同步 master 分支 v2.3.0 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
 
 ## 2.2.0
 
-`2022.07.10`
+`2022.07.11`
 
-⚡⚡⚡ [/sec/stores/userInfo.ts](https://gitee.com/lyt-top/vue-next-admin/blob/master/src/stores/userInfo.ts) 下添加了 `getApiUserInfo` 接口模拟数据 `setTimeout` 为 3 秒
-
-- 🌟 更新 依赖更新最新版本
-- 🐞 修复 [主界面重新授权按钮点击卡死不跳转登录界面#I5C3JS](https://gitee.com/lyt-top/vue-next-admin/issues/I5C3JS)，感谢[@Hero-Typ](https://gitee.com/tian_yu_peng)
-- 🐞 修复 编译警告[#I5CVSB](https://gitee.com/lyt-top/vue-next-admin/issues/I5CVSB)，全局替换成 `:deep(attr)`，感谢[@Linvas](https://gitee.com/linvas)。参考文档：[vue3 sfc-style](https://v3.cn.vuejs.org/api/sfc-style.html#style-scoped)。`node_modules\print-js\dist\print.js` 需 `print-js` 作者适配或去除 `package.json` 中的 `"print-js": "^1.6.0"`
-- 🐞 修复 [vue-next-admin-template-js 版本前端控制路由：userInfo.js 请求用户信息接口报错，加载不到路由 可以写个定时器模拟一下接口 一样的报错#I5F1HP](https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP)，感谢[@白开水](https://gitee.com/libin951223)
+- 🎉 同步 master 分支 v2.2.0 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
 
 ## 2.1.1
 
-`2022.05.27`
-
-- 🌟 更新 依赖更新最新版本
-- 🎯 优化 深色模式下，`<el-button text></el-button>` 时，`:active` 样式
-- 🎯 优化 [页面缓存在刷新之后失效 #I58U75](https://gitee.com/lyt-top/vue-next-admin/issues/I58U75))，感谢[@ls0428](https://gitee.com/ls0428)
-- 🎯 优化 [SvgIcon 对下载的 Svg 图像设置颜色无效 #I59ND0](https://gitee.com/lyt-top/vue-next-admin/issues/I59ND0))，感谢[@elus_z](https://gitee.com/elus_z)
-- 🎯 优化 `/src/utils/toolsValidate.ts` 工具类
-- 🐞 修复 [布局切换，TagsView 显示的 tab 会多一个出来 #I58WGM](https://gitee.com/lyt-top/vue-next-admin/issues/I58WGM)，感谢[@lg_boy](https://gitee.com/lg_boy)
-- 🐞 修复 [如果设置顶部面包屑导航开启图标 isBreadcrumbIcon=true 后，样式有点问题 如果不开启就是正常的 #I58VB8](https://gitee.com/lyt-top/vue-next-admin/issues/I58VB8)
-- 🐞 修复 地址栏路由地址输入错误时，返回首页后，再次输入路由地址错误时，不跳转 404 问题
-- 🐞 修复 [2.1.0 版本的图标选择组件多次点击后功能失效 #I590TH](https://gitee.com/lyt-top/vue-next-admin/issues/I590TH)，感谢[@quber](https://gitee.com/quber)
-
-## 2.1.0
-
-`2022.04.18`
-
-⚡⚡⚡ 此版本为破环性更新，优化内容如下：（谨慎更新！谨慎更新！！谨慎更新！！！）。因为 `vuex` 替换成 `pinia`
-
-- 🌟 更新 依赖更新最新版本
-- 🎯 优化 部分界面图片不显示问题（更换 gitee 在线图片地址源）
-- 🎯 优化 各界面方法引入与逻辑之间添加一行空行，方便区分内容
-- 🎯 优化 图标选择器 [#I4YAHB](https://gitee.com/lyt-top/vue-next-admin/issues/I4YAHB)，感谢[@真有你的](https://gitee.com/sunliusen)
-- 🎯 优化 图标选择器 icon type 类型为 all 时，类型 ali、ele、awe 回显问题
-- 🎯 优化 去掉开发环境 i18n 控制台警告，页面代码：[i18n/index.ts](https://gitee.com/lyt-top/vue-next-admin/blob/master/src/i18n/index.ts)
-- 🎯 优化 `NextLoading.start()` 方法，防止第一次进入界面时出现短暂空白
-- 🎯 优化 地址栏有参数退出登录，再次登录不跳之前界面问题 `src/layout/navBars/breadcrumb/user.vue`
-- 🎯 优化 `SvgIcon` 组件，防止 `开启 Tagsview 图标` 时，`tagsView 右键菜单关闭` 报错问题，工作流不可连线、全屏时关闭按钮消失问题
-- 🎯 优化 [如果 url 中有中文等特殊字符，第一次切换该 tab 时 keep-alive 失效#I55JS7](https://gitee.com/lyt-top/vue-next-admin/issues/I55JS7),感谢[yuyong1566](https://gitee.com/yuyong1566)
-- 🎯 优化 [wangEditor](https://www.wangeditor.com/) 更新到 v5，[vue3 版本线上示例中 wangeditor 富文本编辑器 demo 实例,无法换行#I5565B](https://gitee.com/lyt-top/vue-next-admin/issues/I5565B)，感谢@[jenchih](https://gitee.com/jenchih)
-- 🎯 优化 [在关闭 tagview 时，高度刷新时会会变化，出现滚动条](https://gitee.com/lyt-top/vue-next-admin/issues/I55FHM)，感谢[张松](https://gitee.com/zs310071113)
-- 🎯 优化 [路由参数](https://lyt-top.gitee.io/vue-next-admin-preview/#/params/common)演示
-- 🎉 新增 [vuex](https://vuex.vuejs.org/) 替换成 [pinia](https://pinia.vuejs.org/getting-started.html)
-- 🎉 新增 tagsView 支持自定义 tagsView 名称（文章详情时有用），前往体验：[路由参数/普通路由](https://lyt-top.gitee.io/vue-next-admin-preview/#/params/common)。新增 tagsView 支持自定义名称国际化，感谢[@q7but](https://gitee.com/q7but)、[!22 add 添加自定义 tagVIewName 拓展,支持国际化](https://gitee.com/lyt-top/vue-next-admin/pulls/22/files)、感谢[@tony_tong_xin](https://gitee.com/tony_tong_xin)
-- 🐞 修复 适配 `"element-plus": "^2.1.9"，2.2.0` 版本
-- 🐞 修复 [导航栏横向布局后，一级菜单显示问题#I4Z3M3](https://gitee.com/lyt-top/vue-next-admin/issues/I4Z3M3)
-- 🐞 修复 横向布局三级及以上导航菜单高亮、导航高度不统一问题
-- 🐞 修复 分栏模式下,选中的菜单是 primary 样式,鼠标移入字也变成 primary 色了，感谢群友@孤夜-流殇
-- 🐞 修复 [vuex 里面改了颜色 但是不生效 #I4WFMA](https://gitee.com/lyt-top/vue-next-admin/issues/I4WFMA)
-- 🐞 修复 全局主题 primary 清空颜色后报错，[#I4X0LG](https://gitee.com/lyt-top/vue-next-admin/issues/I4X0LG)，感谢[面向 BUG 编程](https://gitee.com/fhtfy)
-- 🐞 修复 [.eslintrc.js 文件 rules 标签名错误 #I53IPK](https://gitee.com/lyt-top/vue-next-admin/issues/I53IPK)，感谢[yuyong1566](https://gitee.com/yuyong1566)
-- 🐞 修复 `开启 Tagsview 图标` 时，`tagsView 右键菜单关闭` 报错问题
-- 🐞 修复 `router.push` 路径找不到时报错问题，`404、401 界面` 已移入到 `main` 主布局里（之前全屏）
-- 🐞 修复 [全局修改组件大小失效了](https://gitee.com/lyt-top/vue-next-admin/issues/I551RP)，感谢[lg_boy](https://gitee.com/lg_boy)
-- 🐞 修复 [修改一下配置时，需要每次都清理 `window.localStorage` 浏览器永久缓存，配置才会生效，问题解决#I567R1](https://gitee.com/lyt-top/vue-next-admin/issues/I567R1),感谢[@lanbao123](https://gitee.com/lanbao123)
-- 🐞 修复 [标记为需要缓存的 tab 页后，再次从左侧菜单打开，还是显示被缓存的页面内容#I4UY3G](https://gitee.com/lyt-top/vue-next-admin/issues/I4UY3G)，感谢@axcc1234、特别感谢群友@华仔
-- 🌈 重构 路由（`/src/router/index.ts`）解决 No match found for location with path "xxx"(前端控制，后端控制未解决) 问题
+- 🎉 同步 master 分支 v2.1.1 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
 
 ## 2.0.2
 
-`2022.03.04`
+- 🎉 同步 master 分支 v2.0.2 版本内容，具体查看 master CHANGELOG.md
 
-- 🌟 更新 依赖更新最新版本
-- 🎯 优化 Alert 提示添加边框
-- 🎯 优化 功能 / 数字滚动 演示界面
-- 🐞 修复 全局主题按钮颜色 :active 问题
-- 🐞 修复 Dropdown 下拉菜单样式问题
-- 🐞 修复 SvgIcon 图标组件动态切换时报警告问题，[SvgIcon 改变 name 时可能导致图像不显示](https://gitee.com/lyt-top/vue-next-admin/issues/I4VGE0)，感谢@axcc1234
-
-## 2.0.1
-
-`2022.02.25`
-
-- 🌟 更新 依赖更新最新版本
-- 🎯 优化 svgIcon 图标组件
-- 🎯 优化 vite.config.ts 打包，感谢群友@YourObjec
-- 🐞 修复 tagViews 开启图标不显示问题（风格 5），感谢群友@坏人
-- 🐞 修复 [Element Plus 1.2.0-beta.6 以后的版本 el-table 在移动端无法左右滑动](https://gitee.com/lyt-top/vue-next-admin/issues/I4UPTP)，感谢@YGDada
-
-## 2.0.0
-
-`2022.02.21`
-
-⚡⚡⚡ 此版本为破环性更新，优化内容如下：（谨慎更新！谨慎更新！！谨慎更新！！！）。演示界面建议直接覆盖文件。如需使用之前版本，请前往[gitee 发行版](https://gitee.com/lyt-top/vue-next-admin/releases) 进行对应版本下载。基础版会基于 `master` 分支进行修改
-
-- 🌟 更新 依赖更新最新版本
-- 🌟 更新 登录页、首页
-- 💔 移除 vue-web-screen-shot
-- 💔 移除 城市多级联动，完整 json 数据请去 [vue-next-admin-images/menu](https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu) 仓库查看
-- 💔 移除 功能/echartsTree 树图
-- 💔 移除 其它设置/Tagsview 风格 2、Tagsview 风格 3
-- 💔 移除 功能/验证器
-- 🚧 调整 src/api 编写方式
-- 🚧 调整 自定义封装公用组件演示，更好的维护
-- 🎉 新增 Volar 支持，vs code 配置参考 [Vue Language Features (Volar)](https://lyt-top.gitee.io/vue-next-admin-doc-preview/home/vscode/)
-- 🎉 新增 `SvgIcon` 支持本地 svg 图标使用
-- 🎉 新增 表单表格验证演示
-- 🎯 优化 全局主题（移除 success、info、warning、danger）
-- 🎯 优化 工作流（开源）
-- 🎯 优化 element plus svg 图标，`elementXXX` 改成 `ele-XXX`
-- 🌈 重构 深色模式
-- 🌹 合并 [处理 parent 的 h100 由于外层有 min-height 导致失效的问题](https://gitee.com/lyt-top/vue-next-admin/pulls/20)，感谢@MaxNull、@21030442-mao
-- 🐞 修复 element plus 升级 `^1.3.0-beta.5` 后 组件 size 大小问题（大改：涉及布局、演示界面）
-- 🐞 修复 vs code 使用 Vue Language Features (Volar) 插件 代码报红问题（可以把公用的 ts 类型定义封装起来公用）
-
-## 1.2.2
+## 0.2.2
 
 `2021.12.21`
 
-- 🌟 更新 依赖更新最新版本
-- 🎯 优化 iframes 滚动条问题
-- 🎯 优化 部署后每次都要强制刷新清浏览器缓存问题
-- 🎉 新增 工具类百分比验证演示
-- 🐞 修复 [tag-view 标签右键会超出浏览器 #I4KN78](https://gitee.com/lyt-top/vue-next-admin/issues/I4KN78)
+- 🎉 同步 master 分支 v1.2.2 版本内容，具体查看 master CHANGELOG.md
 
-## 1.2.1
+## 0.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
+## 0.2.0
 
-`2021.11.28`
+`2021.12.04`
 
-- 🌟 更新 依赖更新最新版本
-- 🎯 优化 深色模式
-- 🎯 优化 `/@/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)
+- 🎉 同步 master 分支 v1.2.0 版本内容，具体查看 master CHANGELOG.md
 
-## 1.1.2
+## 0.1.0
 
 `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` 左侧菜单数据不变问题
+- 🎉 新增 vue-next-admin-template 基础版本（不带国际化），切换 `vue-next-admin-template` 分支

README.md

@@ -1,26 +1,32 @@
 <div align="center">
-	<img src="https://img-blog.csdnimg.cn/9efd5420327a46b7bd6d93524a97229d.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_14,color_FFFFFF,t_70,g_se,x_16">
+	<img src="https://i.hd-r.cn/6ce52e5724fae609444b5b48bdc4accb.png">
 	<p align="center">
-	    <a href="https://v3.vuejs.org/" target="_blank">
-	        <img src="https://img.shields.io/badge/vue.js-vue3.x-green" alt="vue">
-	    </a>
-	    <a href="https://element-plus.gitee.io/#/zh-CN/component/changelog" target="_blank">
-	        <img src="https://img.shields.io/badge/element--plus-%3E1.0.0-blue" alt="element plus">
-	    </a>
+		<a href="https://v3.vuejs.org/" target="_blank">
+			<img src="https://img.shields.io/badge/vue.js-vue3.x-green" alt="vue">
+		</a>
+		<a href="https://element-plus.gitee.io/#/zh-CN/component/changelog" target="_blank">
+			<img src="https://img.shields.io/badge/element--plus-%3E1.0.0-blue" alt="element plus">
+		</a>
 		<a href="https://www.tslang.cn/" target="_blank">
-	        <img src="https://img.shields.io/badge/typescript-%3E4.0.0-blue" alt="typescript">
-	    </a>
+			<img src="https://img.shields.io/badge/typescript-%3E4.0.0-blue" alt="typescript">
+		</a>
 		<a href="https://vitejs.dev/" target="_blank">
-		    <img src="https://img.shields.io/badge/vite-%3E2.0.0-yellow" alt="vite">
+		  <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">
+		  <img src="https://img.shields.io/badge/license-MIT-success" alt="license">
 		</a>
 	</p>
 	<p>&nbsp;</p>
 </div>
 
-#### 🌈 介绍
+#### 💝 长期赞助商
+
+<a href="http://www.ccflow.org/" target="_blank">
+	<img src="./src/assets/ccflowRightNextAdmin.png" width="50%" height="70px">
+</a>
+
+#### 🌈 介绍 基础版 ts（不带国际化）
 
 基于 vue3.x + CompositionAPI setup 语法糖 + typescript + vite + element plus + vue-router-next + pinia 技术，适配手机、平板、pc 的后台开源免费模板，希望减少工作量，帮助大家实现快速开发。
 
@@ -28,6 +34,7 @@
 
 - vue3.x 版本预览（vue-next-admin）<a href="https://lyt-top.gitee.io/vue-next-admin-preview/#/login" target="_blank">https://lyt-top.gitee.io/vue-next-admin-preview/#/login</a>
 - vue2.x 版本预览（vue-prev-admin）<a href="https://lyt-top.gitee.io/vue-prev-admin-preview/#/login" target="_blank">https://lyt-top.gitee.io/vue-prev-admin-preview/#/login</a>
+- vue3.x + uni-app 商城 H5（vue-next-admin-shop）<a href="https://lyt-top.gitee.io/vue-next-admin-shop-preview" target="_blank">https://lyt-top.gitee.io/vue-next-admin-shop-preview</a>
 
 #### 💒 代码仓库
 
@@ -60,6 +67,9 @@ git clone https://gitee.com/lyt-top/vue-next-admin.git
 # 进入项目
 cd vue-next-admin
 
+# 切换分支
+git checkout vue-next-admin-template
+
 # 安装依赖
 cnpm install
 
@@ -76,28 +86,15 @@ cnpm run build
 
 #### 💯 学习交流加 QQ 群
 
-> 若加群了没同意（一般秒过），那就是群满了（500 人群），请换一个群试试。群会定期清理半年（6 个月）未发言的群友，资源有限，请谅解。建议勿加多群，可能会误伤！微信群由于只有 `7天有效` 就不放这里了。
+> 1 - 4 交流群已满，请加 vue-next-admin 交流群 5
 
-- 1 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">665452019</a>
-- 2 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=zVfy3gNy7pNWVK3kMduDzwU369PZg2fw&jump_from=webapi">766356862</a>
-- 3 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=02EWb5P2JkP-8iwzaDadgFdxA0HSHPpn&jump_from=webapi">795345435</a>
-- 4 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=0gTFO04WwkeZZ6R4lju6gucbeXHK-wNd&jump_from=webapi">736626228</a>
+群号：556254895
 
-  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">
-  	<img src="https://img-blog.csdnimg.cn/35e00f12a3fe4820892ec630ca72f15f.png" width="220" height="220" alt="vue-next-admin 讨论群1" title="vue-next-admin 讨论群1"/>
-  </a>
-  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=zVfy3gNy7pNWVK3kMduDzwU369PZg2fw&jump_from=webapi">
-  	<img src="https://img-blog.csdnimg.cn/5f1b548abd9f434eb41edde31d1c1fa9.png" width="220" height="220" alt="vue-next-admin 讨论群2" title="vue-next-admin 讨论群2"/>
-  </a>
-  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=02EWb5P2JkP-8iwzaDadgFdxA0HSHPpn&jump_from=webapi">
-  	<img src="https://img-blog.csdnimg.cn/70c8a012dd304246bddeac2184c4ab3a.png" width="220" height="220" alt="vue-next-admin 讨论群3" title="vue-next-admin 讨论群3"/>
-  </a>
-  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=0gTFO04WwkeZZ6R4lju6gucbeXHK-wNd&jump_from=webapi">
-  	<img src="https://img-blog.csdnimg.cn/e5c9704eed1342bc9d9e74b37203402d.png" width="220" height="220" alt="vue-next-admin 讨论群4" title="vue-next-admin 讨论群4"/>
-  </a>
+其它交流群请查看文档首页 [vueNextAdmin 解疑问](https://lyt-top.gitee.io/vue-next-admin-doc-preview/)
 
 #### 💒 集成后端
 
+- <a target="_blank" href="https://gitee.com/zuohuaijun/Admin.NET">@zuohuaijun Admin.NET</a>
 - <a target="_blank" href="https://github.com/PandaGoAdmin/PandaX">@熊猫 PandaGoAdmin</a>
 - <a target="_blank" href="https://toscode.gitee.com/GionConnection/gopro_free">@甜蜜蜜 GoPro 平台</a>
 - <a target="_blank" href="https://gitee.com/GionConnection/niupi-free">@甜蜜蜜 NiuPi 平台</a>
@@ -114,12 +111,10 @@ cnpm run build
 - <a href="https://github.com/vuejs/vue-next" target="_blank">vue-next</a>
 - <a href="https://github.com/ElemeFE/element" target="_blank">element-ui</a>
 - <a href="https://github.com/element-plus/element-plus" target="_blank">element-plus</a>
-- <a href="https://github.com/vuejs/vue-router-next" target="_blank">vue-router-next</a>
-- <a href="https://github.com/vuejs/pinia" target="_blank">pinia</a>
+- <a href="https://github.com/vuejs/vue-router-next" target="_blank">vue-router-nex</a>
+- <a href="https://github.com/vuejs/vuex" target="_blank">vuex</a>
 - <a href="https://github.com/apache/echarts" target="_blank">echarts</a>
 - <a href="https://github.com/axios/axios" target="_blank">axios</a>
-- <a href="https://github.com/zenorocha/clipboard.js" target="_blank">clipboard</a>
-- <a href="https://github.com/inorganik/countUp.js" target="_blank">countUp</a>
 - <a href="https://github.com/developit/mitt" target="_blank">mitt</a>
 - <a href="https://github.com/rstacruz/nprogress" target="_blank">nprogress</a>
 - <a href="https://github.com/sindresorhus/screenfull.js" target="_blank">screenfull</a>
@@ -127,18 +122,15 @@ cnpm run build
 - <a href="https://github.com/sass/sass" target="_blank">sass</a>
 - <a href="https://github.com/microsoft/TypeScript" target="_blank">typescript</a>
 - <a href="https://github.com/vitejs/vite" target="_blank">vite</a>
-- <a href="https://github.com/wangeditor-team/wangEditor" target="_blank">wangeditor</a>
-- <a href="https://github.com/fengyuanchen/cropperjs" target="_blank">cropperjs</a>
-- <a href="https://github.com/davidshimjs/qrcodejs" target="_blank">qrcodejs</a>
-- <a href="https://github.com/crabbly/Print.js" target="_blank">print-js</a>
-- <a href="https://github.com/jbaysolutions/vue-grid-layout" target="_blank">vue-grid-layout</a>
-- <a href="https://github.com/antoniandre/splitpanes" target="_blank">splitpanes</a>
-- <a href="https://github.com/jsplumb/jsplumb" target="_blank">jsplumb</a>
-- <a href="https://github.com/hxj9102/table2excel" target="_blank">js-table2excel</a>
+- <a href="https://pinia.vuejs.org/" target="_blank">pinia</a>
+- <a href="https://github.com/js-cookie/js-cookie" target="_blank">js-cookie</a>
+- <a href="https://github.com/mmf-fe/vite-plugin-cdn-import" target="_blank">vite-plugin-cdn-import</a>
+- <a href="https://github.com/vbenjs/vite-plugin-compression" target="_blank">vite-plugin-compression</a>
+- <a href="https://github.com/chenxch/vite-plugin-vue-setup-extend-plus" target="_blank">vite-plugin-vue-setup-extend-plus</a>
 
 #### 💕 特别感谢
 
-特别感谢老哥们的建议、指导与帮忙。谢谢！
+特别感谢老哥们的建议、指导与帮忙，谢谢！
 
 - <a href="https://gitee.com/click33/sa-plus" target="_blank">@省长</a>
 - <a href="https://gitee.com/jskz/Jskz-SpringCloud" target="_blank">@唐参</a>

index.html

@@ -27,6 +27,5 @@
 			})();
 		</script>
 		<script type="module" src="/src/main.ts"></script>
-		<script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=wsijQt8sLXrCW71YesmispvYHitfG9gv&s=1"></script>
 	</body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
-	"name": "vue-next-admin",
-	"version": "2.4.2",
+	"name": "vue-next-admin-template",
+	"version": "2.4.33",
 	"description": "vue3 vite next admin template",
 	"author": "lyt_20201208",
 	"license": "MIT",
@@ -10,50 +10,40 @@
 		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
 	},
 	"dependencies": {
-		"@element-plus/icons-vue": "^2.0.10",
-		"@wangeditor/editor": "^5.1.23",
-		"@wangeditor/editor-for-vue": "^5.1.12",
-		"axios": "^1.2.1",
-		"countup.js": "^2.3.2",
-		"cropperjs": "^1.5.13",
-		"echarts": "^5.4.0",
-		"echarts-gl": "^2.0.9",
-		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.2.26",
+		"@element-plus/icons-vue": "^2.1.0",
+		"axios": "^1.3.5",
+		"echarts": "^5.4.2",
+		"element-plus": "^2.3.3",
 		"js-cookie": "^3.0.1",
-		"js-table2excel": "^1.0.3",
-		"jsplumb": "^2.15.6",
 		"mitt": "^3.0.0",
 		"nprogress": "^0.2.0",
-		"pinia": "^2.0.28",
-		"print-js": "^1.6.0",
+		"pinia": "^2.0.34",
 		"qrcodejs2-fixes": "^0.0.2",
-		"qs": "^6.11.0",
 		"screenfull": "^6.0.2",
 		"sortablejs": "^1.15.0",
-		"splitpanes": "^3.1.5",
-		"vue": "^3.2.45",
+		"vue": "^3.2.47",
 		"vue-clipboard3": "^2.0.0",
-		"vue-grid-layout": "^3.0.0-beta1",
-		"vue-i18n": "^9.2.2",
+		"vue-demi": "^0.13.11",
+		"qs": "^6.11.1",
 		"vue-router": "^4.1.6"
 	},
 	"devDependencies": {
-		"@types/node": "^18.11.12",
+		"@types/node": "^18.15.11",
 		"@types/nprogress": "^0.2.0",
-		"@types/sortablejs": "^1.15.0",
-		"@typescript-eslint/eslint-plugin": "^5.46.0",
-		"@typescript-eslint/parser": "^5.46.0",
-		"@vitejs/plugin-vue": "^4.0.0",
-		"@vue/compiler-sfc": "^3.2.45",
-		"eslint": "^8.29.0",
-		"eslint-plugin-vue": "^9.8.0",
-		"prettier": "^2.8.1",
-		"sass": "^1.56.2",
-		"typescript": "^4.9.4",
-		"vite": "^4.0.0",
-		"vite-plugin-vue-setup-extend": "^0.4.0",
-		"vue-eslint-parser": "^9.1.0"
+		"@typescript-eslint/eslint-plugin": "^5.58.0",
+		"@typescript-eslint/parser": "^5.58.0",
+		"@vitejs/plugin-vue": "^4.1.0",
+		"@vue/compiler-sfc": "^3.2.47",
+		"eslint": "^8.38.0",
+		"eslint-plugin-vue": "^9.10.0",
+		"prettier": "^2.8.7",
+		"sass": "^1.61.0",
+		"typescript": "^5.0.4",
+		"vite": "^4.2.1",
+		"vite-plugin-cdn-import": "^0.3.5",
+		"vite-plugin-compression": "^0.5.1",
+		"vite-plugin-vue-setup-extend-plus": "^0.1.0",
+		"vue-eslint-parser": "^9.1.1"
 	},
 	"browserslist": [
 		"> 1%",
@@ -71,6 +61,7 @@
 		"vue",
 		"vue3",
 		"vuejs/vue-next",
+		"vuejs/vue-next-template",
 		"element-ui",
 		"element-plus",
 		"vue-next-admin",

src/App.vue

@@ -1,17 +1,18 @@
 <template>
-	<el-config-provider :size="getGlobalComponentSize" :locale="getGlobalI18n">
-		<router-view v-show="themeConfig.lockScreenTime > 1" />
+	<el-config-provider :size="getGlobalComponentSize" :locale="zhCn">
+		<router-view v-show="setLockScreen" />
 		<LockScreen v-if="themeConfig.isLockScreen" />
-		<Setings ref="setingsRef" v-show="themeConfig.lockScreenTime > 1" />
+		<Setings ref="setingsRef" v-show="setLockScreen" />
 		<CloseFull v-if="!themeConfig.isLockScreen" />
 		<Upgrade v-if="getVersion" />
+		<Sponsors />
 	</el-config-provider>
 </template>
 
 <script setup lang="ts" name="app">
 import { defineAsyncComponent, computed, ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
+import zhCn from 'element-plus/es/locale/lang/zh-cn';
 import { storeToRefs } from 'pinia';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import { useThemeConfig } from '/@/stores/themeConfig';
@@ -22,24 +23,30 @@ import setIntroduction from '/@/utils/setIconfont';
 
 // 引入组件
 const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue'));
-const Setings = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/setings.vue'));
-const CloseFull = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/closeFull.vue'));
+const Setings = defineAsyncComponent(() => import('/@/layout/navBars/topBar/setings.vue'));
+const CloseFull = defineAsyncComponent(() => import('/@/layout/navBars/topBar/closeFull.vue'));
 const Upgrade = defineAsyncComponent(() => import('/@/layout/upgrade/index.vue'));
+const Sponsors = defineAsyncComponent(() => import('/@/layout/sponsors/index.vue'));
 
 // 定义变量内容
-const { messages, locale } = useI18n();
 const setingsRef = ref();
 const route = useRoute();
 const stores = useTagsViewRoutes();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 
+// 设置锁屏时组件显示隐藏
+const setLockScreen = computed(() => {
+	// 防止锁屏后，刷新出现不相关界面
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I6AF8P
+	return themeConfig.value.isLockScreen ? themeConfig.value.lockScreenTime > 1 : themeConfig.value.lockScreenTime >= 0;
+});
 // 获取版本号
 const getVersion = computed(() => {
 	let isVersion = false;
 	if (route.path !== '/login') {
 		// @ts-ignore
-		if ((Local.get('version') && Local.get('version') !== __VERSION__) || !Local.get('version')) isVersion = true;
+		if ((Local.get('version') && Local.get('version') !== __NEXT_VERSION__) || !Local.get('version')) isVersion = true;
 	}
 	return isVersion;
 });
@@ -47,10 +54,6 @@ const getVersion = computed(() => {
 const getGlobalComponentSize = computed(() => {
 	return other.globalComponentSize();
 });
-// 获取全局 i18n
-const getGlobalI18n = computed(() => {
-	return messages.value[locale.value];
-});
 // 设置初始化，防止刷新时恢复默认
 onBeforeMount(() => {
 	// 设置批量第三方 icon 图标

src/components/auth/auth.vue

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

src/components/auth/authAll.vue

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

src/components/auth/auths.vue

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

src/components/cropper/index.vue

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

src/components/editor/index.vue

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

src/components/noticeBar/index.vue

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

src/components/table/index.vue

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

src/i18n/index.ts

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

src/i18n/lang/en.ts

@@ -1,191 +0,0 @@
-// 定义内容
-export default {
-	router: {
-		home: 'home',
-		system: 'system',
-		systemMenu: 'systemMenu',
-		systemRole: 'systemRole',
-		systemUser: 'systemUser',
-		systemDept: 'systemDept',
-		systemDic: 'systemDic',
-		limits: 'limits',
-		limitsFrontEnd: 'FrontEnd',
-		limitsFrontEndPage: 'FrontEndPage',
-		limitsFrontEndBtn: 'FrontEndBtn',
-		limitsBackEnd: 'BackEnd',
-		limitsBackEndEndPage: 'BackEndEndPage',
-		menu: 'menu',
-		menu1: 'menu1',
-		menu11: 'menu11',
-		menu12: 'menu12',
-		menu121: 'menu121',
-		menu122: 'menu122',
-		menu13: 'menu13',
-		menu2: 'menu2',
-		funIndex: 'function',
-		funTagsView: 'funTagsView',
-		funCountup: 'countup',
-		funWangEditor: 'wangEditor',
-		funCropper: 'cropper',
-		funQrcode: 'qrcode',
-		funEchartsMap: 'EchartsMap',
-		funPrintJs: 'PrintJs',
-		funClipboard: 'Copy cut',
-		funGridLayout: 'Drag layout',
-		funSplitpanes: 'Pane splitter',
-		funDragVerify: 'Validator',
-		pagesIndex: 'pages',
-		pagesFiltering: 'Filtering',
-		pagesFilteringDetails: 'FilteringDetails',
-		pagesFilteringDetails1: 'FilteringDetails1',
-		pagesIocnfont: 'iconfont icon',
-		pagesElement: 'element icon',
-		pagesAwesome: 'awesome icon',
-		pagesFormAdapt: 'FormAdapt',
-		pagesTableRules: 'pagesTableRules',
-		pagesFormI18n: 'FormI18n',
-		pagesFormRules: 'Multi form validation',
-		pagesDynamicForm: 'Dynamic complex form',
-		pagesWorkflow: 'Workflow',
-		pagesListAdapt: 'ListAdapt',
-		pagesWaterfall: 'Waterfall',
-		pagesSteps: 'Steps',
-		pagesPreview: 'Large preview',
-		pagesWaves: 'Wave effect',
-		pagesTree: 'tree alter table',
-		pagesDrag: 'Drag command',
-		pagesLazyImg: 'Image lazy loading',
-		makeIndex: 'makeIndex',
-		makeSelector: 'Icon selector',
-		makeNoticeBar: 'notification bar',
-		makeSvgDemo: 'Svgicon demo',
-		makeTableDemo: 'table demo',
-		paramsIndex: 'Routing parameters',
-		paramsCommon: 'General routing',
-		paramsDynamic: 'Dynamic routing',
-		paramsCommonDetails: 'General routing details',
-		paramsDynamicDetails: 'Dynamic routing details',
-		chartIndex: 'chartIndex',
-		visualizingIndex: 'visualizingIndex',
-		visualizingLinkDemo1: 'visualizingLinkDemo1',
-		visualizingLinkDemo2: 'visualizingLinkDemo2',
-		personal: 'personal',
-		tools: 'tools',
-		layoutLinkView: 'LinkView',
-		layoutIframeViewOne: 'IframeViewOne',
-		layoutIframeViewTwo: 'IframeViewTwo',
-	},
-	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',
-		dropdownLarge: 'large',
-		dropdownDefault: 'default',
-		dropdownSmall: 'small',
-		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',
-		newGo: 'Go to the notification center',
-		newDesc: 'No notice',
-		logOutTitle: 'Tips',
-		logOutMessage: 'This operation will log out. Do you want to continue?',
-		logOutConfirm: 'determine',
-		logOutCancel: 'cancel',
-		logOutExit: 'Exiting',
-	},
-	tagsView: {
-		refresh: 'refresh',
-		close: 'close',
-		closeOther: 'closeOther',
-		closeAll: 'closeAll',
-		fullscreen: 'fullscreen',
-		closeFullscreen: 'closeFullscreen',
-	},
-	notFound: {
-		foundTitle: 'Wrong address input, please re-enter the address~',
-		foundMsg: 'You can check the web address first, and then re-enter or give us feedback.',
-		foundBtn: 'Back to home page',
-	},
-	noAccess: {
-		accessTitle: 'You are not authorized to operate~',
-		accessMsg: 'Contact information: add QQ group discussion 665452019',
-		accessBtn: 'Reauthorization',
-	},
-	layout: {
-		configTitle: 'Layout configuration',
-		oneTitle: 'Global Themes',
-		twoTopTitle: 'top bar set up',
-		twoMenuTitle: 'Menu set up',
-		twoColumnsTitle: 'Columns set up',
-		twoTopBar: 'Top bar background',
-		twoTopBarColor: 'Top bar default font color',
-		twoIsTopBarColorGradual: 'Top bar gradient',
-		twoMenuBar: 'Menu background',
-		twoMenuBarColor: 'Menu default font color',
-		twoIsMenuBarColorGradual: 'Menu gradient',
-		twoColumnsMenuBar: 'Column menu background',
-		twoColumnsMenuBarColor: 'Default font color bar menu',
-		twoIsColumnsMenuBarColorGradual: 'Column gradient',
-		twoIsColumnsMenuHoverPreload: 'Column Menu Hover Preload',
-		threeTitle: 'Interface settings',
-		threeIsCollapse: 'Menu horizontal collapse',
-		threeIsUniqueOpened: 'Menu accordion',
-		threeIsFixedHeader: 'Fixed header',
-		threeIsClassicSplitMenu: 'Classic layout split menu',
-		threeIsLockScreen: 'Open the lock screen',
-		threeLockScreenTime: 'screen locking(s/s)',
-		fourTitle: 'Interface display',
-		fourIsShowLogo: 'Sidebar logo',
-		fourIsBreadcrumb: 'Open breadcrumb',
-		fourIsBreadcrumbIcon: 'Open breadcrumb icon',
-		fourIsTagsview: 'Open tagsview',
-		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',
-		sixTransverse: 'Three',
-		sixColumns: 'Four',
-		tipText: 'Click the button below to copy the layout configuration to `/src/stores/themeConfig.ts` It has been modified in.',
-		copyText: 'replication configuration',
-		resetText: 'restore default',
-		copyTextSuccess: 'Copy succeeded!',
-		copyTextError: 'Copy failed!',
-	},
-	upgrade: {
-		title: 'New version',
-		msg: 'The new version is available, please update it now! Dont worry, the update is fast!',
-		desc: 'Prompt: Update will restore the default configuration',
-		btnOne: 'Cruel refusal',
-		btnTwo: 'Update now',
-		btnTwoLoading: 'Updating',
-	},
-};

src/i18n/lang/zh-cn.ts

@@ -1,191 +0,0 @@
-// 定义内容
-export default {
-	router: {
-		home: '首页',
-		system: '系统设置',
-		systemMenu: '菜单管理',
-		systemRole: '角色管理',
-		systemUser: '用户管理',
-		systemDept: '部门管理',
-		systemDic: '字典管理',
-		limits: '权限管理',
-		limitsFrontEnd: '前端控制',
-		limitsFrontEndPage: '页面权限',
-		limitsFrontEndBtn: '按钮权限',
-		limitsBackEnd: '后端控制',
-		limitsBackEndEndPage: '页面权限',
-		menu: '菜单嵌套',
-		menu1: '菜单1',
-		menu11: '菜单11',
-		menu12: '菜单12',
-		menu121: '菜单121',
-		menu122: '菜单122',
-		menu13: '菜单13',
-		menu2: '菜单2',
-		funIndex: '功能',
-		funTagsView: 'tagsView 操作',
-		funCountup: '数字滚动',
-		funWangEditor: 'Editor 编辑器',
-		funCropper: '图片裁剪',
-		funQrcode: '二维码生成',
-		funEchartsMap: '地理坐标/地图',
-		funPrintJs: '页面打印',
-		funClipboard: '复制剪切',
-		funGridLayout: '拖拽布局',
-		funSplitpanes: '窗格拆分器',
-		funDragVerify: '验证器',
-		pagesIndex: '页面',
-		pagesFiltering: '过滤筛选组件',
-		pagesFilteringDetails: '过滤筛选组件详情',
-		pagesFilteringDetails1: '过滤筛选组件详情111',
-		pagesIocnfont: 'ali 字体图标',
-		pagesElement: 'ele 字体图标',
-		pagesAwesome: 'awe 字体图标',
-		pagesFormAdapt: '表单自适应',
-		pagesTableRules: '表单表格验证',
-		pagesFormI18n: '表单国际化',
-		pagesFormRules: '多表单验证',
-		pagesDynamicForm: '动态复杂表单',
-		pagesWorkflow: '工作流',
-		pagesListAdapt: '列表自适应',
-		pagesWaterfall: '瀑布屏',
-		pagesSteps: '步骤条',
-		pagesPreview: '大图预览',
-		pagesWaves: '波浪效果',
-		pagesTree: '树形改表格',
-		pagesDrag: '拖动指令',
-		pagesLazyImg: '图片懒加载',
-		makeIndex: '组件封装',
-		makeSelector: '图标选择器',
-		makeNoticeBar: '滚动通知栏',
-		makeSvgDemo: 'svgIcon 演示',
-		makeTableDemo: '表格封装演示',
-		paramsIndex: '路由参数',
-		paramsCommon: '普通路由',
-		paramsDynamic: '动态路由',
-		paramsCommonDetails: '普通路由详情',
-		paramsDynamicDetails: '动态路由详情',
-		chartIndex: '大数据图表',
-		visualizingIndex: '数据可视化',
-		visualizingLinkDemo1: '数据可视化演示1',
-		visualizingLinkDemo2: '数据可视化演示2',
-		personal: '个人中心',
-		tools: '工具类集合',
-		layoutLinkView: '外链',
-		layoutIframeViewOne: '内嵌 iframe1',
-		layoutIframeViewTwo: '内嵌 iframe2',
-	},
-	staticRoutes: {
-		signIn: '登录',
-		notFound: '找不到此页面',
-		noPower: '没有权限',
-	},
-	user: {
-		title0: '组件大小',
-		title1: '语言切换',
-		title2: '菜单搜索',
-		title3: '布局配置',
-		title4: '消息',
-		title5: '开全屏',
-		title6: '关全屏',
-		dropdownLarge: '大型',
-		dropdownDefault: '默认',
-		dropdownSmall: '小型',
-		dropdown1: '首页',
-		dropdown2: '个人中心',
-		dropdown3: '404',
-		dropdown4: '401',
-		dropdown5: '退出登录',
-		dropdown6: '代码仓库',
-		searchPlaceholder: '菜单搜索：支持中文、路由路径',
-		newTitle: '通知',
-		newBtn: '全部已读',
-		newGo: '前往通知中心',
-		newDesc: '暂无通知',
-		logOutTitle: '提示',
-		logOutMessage: '此操作将退出登录, 是否继续?',
-		logOutConfirm: '确定',
-		logOutCancel: '取消',
-		logOutExit: '退出中',
-	},
-	tagsView: {
-		refresh: '刷新',
-		close: '关闭',
-		closeOther: '关闭其它',
-		closeAll: '全部关闭',
-		fullscreen: '当前页全屏',
-		closeFullscreen: '关闭全屏',
-	},
-	notFound: {
-		foundTitle: '地址输入错误，请重新输入地址~',
-		foundMsg: '您可以先检查网址，然后重新输入或给我们反馈问题。',
-		foundBtn: '返回首页',
-	},
-	noAccess: {
-		accessTitle: '您未被授权，没有操作权限~',
-		accessMsg: '联系方式：加QQ群探讨 665452019',
-		accessBtn: '重新授权',
-	},
-	layout: {
-		configTitle: '布局配置',
-		oneTitle: '全局主题',
-		twoTopTitle: '顶栏设置',
-		twoMenuTitle: '菜单设置',
-		twoColumnsTitle: '分栏设置',
-		twoTopBar: '顶栏背景',
-		twoTopBarColor: '顶栏默认字体颜色',
-		twoIsTopBarColorGradual: '顶栏背景渐变',
-		twoMenuBar: '菜单背景',
-		twoMenuBarColor: '菜单默认字体颜色',
-		twoIsMenuBarColorGradual: '菜单背景渐变',
-		twoColumnsMenuBar: '分栏菜单背景',
-		twoColumnsMenuBarColor: '分栏菜单默认字体颜色',
-		twoIsColumnsMenuBarColorGradual: '分栏菜单背景渐变',
-		twoIsColumnsMenuHoverPreload: '分栏菜单鼠标悬停预加载',
-		threeTitle: '界面设置',
-		threeIsCollapse: '菜单水平折叠',
-		threeIsUniqueOpened: '菜单手风琴',
-		threeIsFixedHeader: '固定 Header',
-		threeIsClassicSplitMenu: '经典布局分割菜单',
-		threeIsLockScreen: '开启锁屏',
-		threeLockScreenTime: '自动锁屏(s/秒)',
-		fourTitle: '界面显示',
-		fourIsShowLogo: '侧边栏 Logo',
-		fourIsBreadcrumb: '开启 Breadcrumb',
-		fourIsBreadcrumbIcon: '开启 Breadcrumb 图标',
-		fourIsTagsview: '开启 Tagsview',
-		fourIsTagsviewIcon: '开启 Tagsview 图标',
-		fourIsCacheTagsView: '开启 TagsView 缓存',
-		fourIsSortableTagsView: '开启 TagsView 拖拽',
-		fourIsShareTagsView: '开启 TagsView 共用',
-		fourIsFooter: '开启 Footer',
-		fourIsGrayscale: '灰色模式',
-		fourIsInvert: '色弱模式',
-		fourIsDark: '深色模式',
-		fourIsWartermark: '开启水印',
-		fourWartermarkText: '水印文案',
-		fiveTitle: '其它设置',
-		fiveTagsStyle: 'Tagsview 风格',
-		fiveAnimation: '主页面切换动画',
-		fiveColumnsAsideStyle: '分栏高亮风格',
-		fiveColumnsAsideLayout: '分栏布局风格',
-		sixTitle: '布局切换',
-		sixDefaults: '默认',
-		sixClassic: '经典',
-		sixTransverse: '横向',
-		sixColumns: '分栏',
-		tipText: '点击下方按钮，复制布局配置去 `src/stores/themeConfig.ts` 中修改。',
-		copyText: '一键复制配置',
-		resetText: '一键恢复默认',
-		copyTextSuccess: '复制成功！',
-		copyTextError: '复制失败！',
-	},
-	upgrade: {
-		title: '新版本升级',
-		msg: '新版本来啦，马上更新尝鲜吧！不用担心，更新很快的哦！',
-		desc: '提示：更新会还原默认配置',
-		btnOne: '残忍拒绝',
-		btnTwo: '马上更新',
-		btnTwoLoading: '更新中',
-	},
-};

src/i18n/lang/zh-tw.ts

@@ -1,191 +0,0 @@
-// 定义内容
-export default {
-	router: {
-		home: '首頁',
-		system: '系統設置',
-		systemMenu: '選單管理',
-		systemRole: '角色管理',
-		systemUser: '用戶管理',
-		systemDept: '部門管理',
-		systemDic: '字典管理',
-		limits: '許可權管理',
-		limitsFrontEnd: '前端控制',
-		limitsFrontEndPage: '頁面許可權',
-		limitsFrontEndBtn: '按鈕許可權',
-		limitsBackEnd: '後端控制',
-		limitsBackEndEndPage: '頁面許可權',
-		menu: '選單嵌套',
-		menu1: '選單1',
-		menu11: '選單11',
-		menu12: '選單12',
-		menu121: '選單121',
-		menu122: '選單122',
-		menu13: '選單13',
-		menu2: '選單2',
-		funIndex: '功能',
-		funTagsView: 'tagsView 操作',
-		funCountup: '數位滾動',
-		funWangEditor: 'Editor 編輯器',
-		funCropper: '圖片裁剪',
-		funQrcode: '二維碼生成',
-		funEchartsMap: '地理座標/地圖',
-		funPrintJs: '頁面列印',
-		funClipboard: '複製剪切',
-		funGridLayout: '拖拽佈局',
-		funSplitpanes: '窗格折開器',
-		funDragVerify: '驗證器',
-		pagesIndex: '頁面',
-		pagesFiltering: '過濾篩選組件',
-		pagesFilteringDetails: '過濾篩選組件詳情',
-		pagesFilteringDetails1: '過濾篩選組件詳情111',
-		pagesIocnfont: 'ali 字體圖標',
-		pagesElement: 'ele 字體圖標',
-		pagesAwesome: 'awe 字體圖標',
-		pagesFormAdapt: '表單自我調整',
-		pagesTableRules: '表單表格驗證',
-		pagesFormI18n: '表單國際化',
-		pagesFormRules: '多表單驗證',
-		pagesDynamicForm: '動態複雜表單',
-		pagesWorkflow: '工作流',
-		pagesListAdapt: '清單自我調整',
-		pagesWaterfall: '瀑布屏',
-		pagesSteps: '步驟條',
-		pagesPreview: '大圖預覽',
-		pagesWaves: '波浪效果',
-		pagesTree: '樹形改表格',
-		pagesDrag: '拖動指令',
-		pagesLazyImg: '圖片懶加載',
-		makeIndex: '組件封裝',
-		makeSelector: '圖標選擇器',
-		makeNoticeBar: '滾動通知欄',
-		makeSvgDemo: 'svgIcon 演示',
-		makeTableDemo: '表格封裝演示',
-		paramsIndex: '路由參數',
-		paramsCommon: '普通路由',
-		paramsDynamic: '動態路由',
-		paramsCommonDetails: '普通路由詳情',
-		paramsDynamicDetails: '動態路由詳情',
-		chartIndex: '大資料圖表',
-		visualizingIndex: '數據視覺化',
-		visualizingLinkDemo1: '數據視覺化演示1',
-		visualizingLinkDemo2: '數據視覺化演示2',
-		personal: '個人中心',
-		tools: '工具類集合',
-		layoutLinkView: '外鏈',
-		layoutIframeViewOne: '内嵌 iframe1',
-		layoutIframeViewTwo: '内嵌 iframe2',
-	},
-	staticRoutes: {
-		signIn: '登入',
-		notFound: '找不到此頁面',
-		noPower: '沒有許可權',
-	},
-	user: {
-		title0: '組件大小',
-		title1: '語言切換',
-		title2: '選單蒐索',
-		title3: '佈局配寘',
-		title4: '消息',
-		title5: '開全屏',
-		title6: '關全屏',
-		dropdownLarge: '大型',
-		dropdownDefault: '默認',
-		dropdownSmall: '小型',
-		dropdown1: '首頁',
-		dropdown2: '個人中心',
-		dropdown3: '404',
-		dropdown4: '401',
-		dropdown5: '登出',
-		dropdown6: '程式碼倉庫',
-		searchPlaceholder: '選單蒐索：支援中文、路由路徑',
-		newTitle: '通知',
-		newBtn: '全部已讀',
-		newGo: '前往通知中心',
-		newDesc: '暫無通知',
-		logOutTitle: '提示',
-		logOutMessage: '此操作將登出，是否繼續？',
-		logOutConfirm: '確定',
-		logOutCancel: '取消',
-		logOutExit: '退出中',
-	},
-	tagsView: {
-		refresh: '重繪',
-		close: '關閉',
-		closeOther: '關閉其它',
-		closeAll: '全部關閉',
-		fullscreen: '當前頁全屏',
-		closeFullscreen: '關閉全屏',
-	},
-	notFound: {
-		foundTitle: '地址輸入錯誤，請重新輸入地址~',
-		foundMsg: '您可以先檢查網址，然後重新輸入或給我們迴響問題。',
-		foundBtn: '返回首頁',
-	},
-	noAccess: {
-		accessTitle: '您未被授權，沒有操作許可權~',
-		accessMsg: '聯繫方式：加QQ群探討665452019',
-		accessBtn: '重新授權',
-	},
-	layout: {
-		configTitle: '佈局配寘',
-		oneTitle: '全域主題',
-		twoTopTitle: '頂欄設定',
-		twoMenuTitle: '選單設定',
-		twoColumnsTitle: '分欄設定',
-		twoTopBar: '頂欄背景',
-		twoTopBarColor: '頂欄默認字體顏色',
-		twoIsTopBarColorGradual: '頂欄背景漸變',
-		twoMenuBar: '選單背景',
-		twoMenuBarColor: '選單默認字體顏色',
-		twoIsMenuBarColorGradual: '選單背景漸變',
-		twoColumnsMenuBar: '分欄選單背景',
-		twoColumnsMenuBarColor: '分欄選單默認字體顏色',
-		twoIsColumnsMenuBarColorGradual: '分欄選單背景漸變',
-		twoIsColumnsMenuHoverPreload: '分欄選單滑鼠懸停預加載',
-		threeTitle: '介面設定',
-		threeIsCollapse: '選單水准折疊',
-		threeIsUniqueOpened: '選單手風琴',
-		threeIsFixedHeader: '固定 Header',
-		threeIsClassicSplitMenu: '經典佈局分割選單',
-		threeIsLockScreen: '開啟鎖屏',
-		threeLockScreenTime: '自動鎖屏(s/秒)',
-		fourTitle: '介面顯示',
-		fourIsShowLogo: '側邊欄 Logo',
-		fourIsBreadcrumb: '開啟 Breadcrumb',
-		fourIsBreadcrumbIcon: '開啟 Breadcrumb 圖標',
-		fourIsTagsview: '開啟 Tagsview',
-		fourIsTagsviewIcon: '開啟 Tagsview 圖標',
-		fourIsCacheTagsView: '開啟 TagsView 緩存',
-		fourIsSortableTagsView: '開啟 TagsView 拖拽',
-		fourIsShareTagsView: '開啟 TagsView 共用',
-		fourIsFooter: '開啟 Footer',
-		fourIsGrayscale: '灰色模式',
-		fourIsInvert: '色弱模式',
-		fourIsDark: '深色模式',
-		fourIsWartermark: '開啟浮水印',
-		fourWartermarkText: '浮水印文案',
-		fiveTitle: '其它設定',
-		fiveTagsStyle: 'Tagsview 風格',
-		fiveAnimation: '主頁面切換動畫',
-		fiveColumnsAsideStyle: '分欄高亮風格',
-		fiveColumnsAsideLayout: '分欄佈局風格',
-		sixTitle: '佈局切換',
-		sixDefaults: '默認',
-		sixClassic: '經典',
-		sixTransverse: '橫向',
-		sixColumns: '分欄',
-		tipText: '點擊下方按鈕，複製佈局配寘去`src/stores/themeConfig.ts`中修改。',
-		copyText: '一鍵複製配寘',
-		resetText: '一鍵恢復默認',
-		copyTextSuccess: '複製成功！',
-		copyTextError: '複製失敗！',
-	},
-	upgrade: {
-		title: '新版本陞級',
-		msg: '新版本來啦，馬上更新嘗鮮吧！ 不用擔心，更新很快的哦！',
-		desc: '提示：更新會還原默認配寘',
-		btnOne: '殘忍拒絕',
-		btnTwo: '馬上更新',
-		btnTwoLoading: '更新中',
-	},
-};

src/i18n/pages/formI18n/en.ts

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

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

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

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

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

src/i18n/pages/login/en.ts

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

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

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

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

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

src/layout/component/aside.vue

@@ -12,7 +12,6 @@
 <script setup lang="ts" name="layoutAside">
 import { defineAsyncComponent, reactive, computed, watch, onBeforeMount, ref } from 'vue';
 import { storeToRefs } from 'pinia';
-import pinia from '/@/stores/index';
 import { useRoutesList } from '/@/stores/routesList';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
@@ -56,8 +55,8 @@ const setCollapseStyle = computed(() => {
 			return [asideBrColor, 'layout-aside-mobile', 'layout-aside-mobile-close'];
 		}
 	} else {
-		if (layout === 'columns') {
-			// 分栏布局，菜单收起时宽度给 1px
+		if (layout === 'columns' || layout === 'classic') {
+			// 分栏布局、经典布局，菜单收起时宽度给 1px，防止切换动画消失
 			if (isCollapse) return [asideBrColor, 'layout-aside-pc-1'];
 			else return [asideBrColor, 'layout-aside-pc-220'];
 		} else {
@@ -104,10 +103,11 @@ const initMenuFixed = (clientWidth: number) => {
 };
 // 鼠标移入、移出
 const onAsideEnterLeave = (bool: Boolean) => {
-	let { layout } = themeConfig.value;
+	const { layout, isColumnsMenuHoverPreload } = themeConfig.value;
 	if (layout !== 'columns') return false;
 	if (!bool) mittBus.emit('restoreDefault');
-	stores.setColumnsMenuHover(bool);
+	// 开启 `分栏菜单鼠标悬停预加载` 才设置，防止 columnsAside.vue 监听 pinia.state
+	if (isColumnsMenuHoverPreload) stores.setColumnsMenuHover(bool);
 };
 // 页面加载前
 onBeforeMount(() => {
@@ -118,32 +118,33 @@ onBeforeMount(() => {
 	mittBus.on('setSendColumnsChildren', (res: MittMenu) => {
 		state.menuList = res.children;
 	});
+	// 开启经典布局分割菜单时，设置菜单数据
 	mittBus.on('setSendClassicChildren', (res: MittMenu) => {
 		let { layout, isClassicSplitMenu } = themeConfig.value;
 		if (layout === 'classic' && isClassicSplitMenu) {
+			// 经典布局分割菜单只要一项子级时，收起左侧导航菜单
+			res.children.length <= 1 ? (themeConfig.value.isCollapse = true) : (themeConfig.value.isCollapse = false);
 			state.menuList = [];
 			state.menuList = res.children;
 		}
 	});
+	// 开启经典布局分割菜单时，重新处理菜单数据
 	mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
 		setFilterRoutes();
 	});
+	// 监听窗口大小改变时(适配移动端)
 	mittBus.on('layoutMobileResize', (res: LayoutMobileResize) => {
 		initMenuFixed(res.clientWidth);
 		closeLayoutAsideMobileMode();
 	});
 });
-// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-watch(themeConfig.value, (val) => {
-	if (val.isShowLogoChange !== val.isShowLogo) {
-		if (layoutAsideScrollbarRef.value) layoutAsideScrollbarRef.value.update();
-	}
-});
 // 监听 pinia 值的变化，动态赋值给菜单中
 watch(
-	pinia.state,
-	(val) => {
-		let { layout, isClassicSplitMenu } = val.themeConfig.themeConfig;
+	() => [themeConfig.value.isShowLogoChange, themeConfig.value.isShowLogo, themeConfig.value.layout, themeConfig.value.isClassicSplitMenu],
+	([isShowLogoChange, isShowLogo, layout, isClassicSplitMenu]) => {
+		if (isShowLogoChange !== isShowLogo) {
+			if (layoutAsideScrollbarRef.value) layoutAsideScrollbarRef.value.update();
+		}
 		if (layout === 'classic' && isClassicSplitMenu) return false;
 		setFilterRoutes();
 	},
@@ -151,4 +152,11 @@ watch(
 		deep: true,
 	}
 );
+// 监听用户权限切换，用于演示 `权限管理 -> 前端控制 -> 页面权限` 权限切换不生效
+watch(
+	() => routesList.value,
+	() => {
+		setFilterRoutes();
+	}
+);
 </script>

src/layout/component/columnsAside.vue

@@ -5,7 +5,7 @@
 				<li
 					v-for="(v, k) in state.columnsAsideList"
 					:key="k"
-					@click="onColumnsAsideMenuClick(v, k)"
+					@click="onColumnsAsideMenuClick(v)"
 					@mouseenter="onColumnsAsideMenuMouseenter(v, k)"
 					:ref="
 						(el) => {
@@ -13,15 +13,15 @@
 						}
 					"
 					:class="{ 'layout-columns-active': state.liIndex === k, 'layout-columns-hover': state.liHoverIndex === k }"
-					:title="$t(v.meta.title)"
+					:title="v.meta.title"
 				>
 					<div :class="themeConfig.columnsAsideLayout" v-if="!v.meta.isLink || (v.meta.isLink && v.meta.isIframe)">
 						<SvgIcon :name="v.meta.icon" />
 						<div class="columns-vertical-title font12">
 							{{
-								$t(v.meta.title) && $t(v.meta.title).length >= 4
-									? $t(v.meta.title).substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
-									: $t(v.meta.title)
+								v.meta.title && v.meta.title.length >= 4
+									? v.meta.title.substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
+									: v.meta.title
 							}}
 						</div>
 					</div>
@@ -30,9 +30,9 @@
 							<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, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
-										: $t(v.meta.title)
+									v.meta.title && v.meta.title.length >= 4
+										? v.meta.title.substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
+										: v.meta.title
 								}}
 							</div>
 						</a>
@@ -48,7 +48,6 @@
 import { reactive, ref, onMounted, nextTick, watch, onUnmounted } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
 import { storeToRefs } from 'pinia';
-import pinia from '/@/stores/index';
 import { useRoutesList } from '/@/stores/routesList';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import mittBus from '/@/utils/mitt';
@@ -74,15 +73,32 @@ const state = reactive<ColumnsAsideState>({
 
 // 设置菜单高亮位置移动
 const setColumnsAsideMove = (k: number) => {
+	if (k === undefined) return false;
 	state.liIndex = k;
 	columnsAsideActiveRef.value.style.top = `${columnsAsideOffsetTopRefs.value[k].offsetTop + state.difference}px`;
 };
 // 菜单高亮点击事件
-const onColumnsAsideMenuClick = (v: RouteItem, k: number) => {
-	setColumnsAsideMove(k);
+const onColumnsAsideMenuClick = (v: RouteItem) => {
 	let { path, redirect } = v;
-	if (redirect) router.push(redirect);
-	else router.push(path);
+	if (redirect) {
+		onColumnsAsideDown(v.k);
+		if (route.path.startsWith(redirect)) mittBus.emit('setSendColumnsChildren', setSendChildren(redirect));
+		else router.push(redirect);
+	} else {
+		if (!v.children) {
+			router.push(path);
+		} else {
+			// 显示子级菜单
+			const resData: MittMenu = setSendChildren(path);
+			if (Object.keys(resData).length <= 0) return false;
+			onColumnsAsideDown(resData.item?.k);
+			mittBus.emit('setSendColumnsChildren', resData);
+		}
+	}
+	// 一个路由设置自动收起菜单
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
+	if (!v.children) themeConfig.value.isCollapse = true;
+	else if (v.children.length > 1) themeConfig.value.isCollapse = false;
 };
 // 鼠标移入时，显示当前的子级菜单
 const onColumnsAsideMenuMouseenter = (v: RouteRecordRaw, k: number) => {
@@ -97,6 +113,7 @@ const onColumnsAsideMenuMouseenter = (v: RouteRecordRaw, k: number) => {
 };
 // 鼠标移走时，显示原来的子级菜单
 const onColumnsAsideMenuMouseleave = async () => {
+	if (!themeConfig.value.isColumnsMenuHoverPreload) return false;
 	await stores.setColumnsNavHover(false);
 	// 添加延时器，防止拿到的 store.state.routesList 值不是最新的
 	setTimeout(() => {
@@ -109,13 +126,23 @@ const onColumnsAsideDown = (k: number) => {
 		setColumnsAsideMove(k);
 	});
 };
+// 设置只有一个路由时设置自动收起菜单
+// https://gitee.com/lyt-top/vue-next-admin/issues/I6UW2I
+const setMenuAutoCollaps = (path: string) => {
+	const resData: MittMenu = setSendChildren(path);
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
+	resData.children.length <= 1 ? (themeConfig.value.isCollapse = true) : (themeConfig.value.isCollapse = false);
+	return resData;
+};
 // 设置/过滤路由（非静态路由/是否显示在菜单中）
 const setFilterRoutes = () => {
 	state.columnsAsideList = filterRoutesFun(routesList.value);
-	const resData: MittMenu = setSendChildren(route.path);
-	if (Object.keys(resData).length <= 0) return false;
+	const resData: MittMenu = setMenuAutoCollaps(route.path);
 	onColumnsAsideDown(resData.item?.k);
-	mittBus.emit('setSendColumnsChildren', resData);
+	// 延迟 500 毫秒更新，防止 aside.vue 组件 setSendColumnsChildren 还没有注册
+	setTimeout(() => {
+		mittBus.emit('setSendColumnsChildren', resData);
+	}, 500);
 };
 // 传送当前子级数据到菜单中
 const setSendChildren = (path: string) => {
@@ -168,15 +195,16 @@ onUnmounted(() => {
 });
 // 路由更新时
 onBeforeRouteUpdate((to) => {
+	const resData = setMenuAutoCollaps(to.path);
 	setColumnsMenuHighlight(to.path);
-	mittBus.emit('setSendColumnsChildren', setSendChildren(to.path));
+	mittBus.emit('setSendColumnsChildren', resData);
 });
 // 监听布局配置信息的变化，动态增加菜单高亮位置移动像素
 watch(
-	pinia.state,
-	(val) => {
-		val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
-		if (!val.routesList.isColumnsMenuHover && !val.routesList.isColumnsNavHover) {
+	[() => themeConfig.value.columnsAsideStyle, isColumnsMenuHover, isColumnsNavHover],
+	() => {
+		themeConfig.value.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
+		if (!isColumnsMenuHover.value && !isColumnsNavHover.value) {
 			state.liHoverIndex = null;
 			mittBus.emit('setSendColumnsChildren', setSendChildren(route.path));
 		} else {
@@ -198,7 +226,8 @@ watch(
 	background: var(--next-bg-columnsMenuBar);
 	ul {
 		position: relative;
-		.layout-columns-active {
+		.layout-columns-active,
+		.layout-columns-active a {
 			color: var(--next-bg-columnsMenuBarColor) !important;
 			transition: 0.3s ease-in-out;
 		}

src/layout/lockScreen/index.vue

@@ -213,7 +213,7 @@ onUnmounted(() => {
 }
 .layout-lock-screen-img {
 	@extend .layout-lock-screen-fixed;
-	background-image: url('https://img-blog.csdnimg.cn/afa9c317667f47d5bea34b85af45979e.png#pic_center');
+	background-image: url('https://i.hd-r.cn/e4a19d84364f185266666765ac21a5db.jpg');
 	background-size: 100% 100%;
 	z-index: 9999991;
 }

src/layout/main/classic.vue

@@ -43,7 +43,7 @@ const initScrollBarHeight = () => {
 		setTimeout(() => {
 			updateScrollbar();
 			// '!' not null 断言操作符，不执行运行时检查
-			layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
+			if (layoutMainRef.value) layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
 		}, 500);
 	});
 };
@@ -58,11 +58,13 @@ watch(
 		initScrollBarHeight();
 	}
 );
-// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
+// 监听 themeConfig  isTagsview 配置文件的变化，更新菜单 el-scrollbar 的高度
 watch(
-	themeConfig,
+	() => themeConfig.value.isTagsview,
 	() => {
-		updateScrollbar();
+		nextTick(() => {
+			updateScrollbar();
+		});
 	},
 	{
 		deep: true,

src/layout/main/columns.vue

@@ -35,7 +35,7 @@ const updateScrollbar = () => {
 	// 更新父级 scrollbar
 	layoutScrollbarRef.value.update();
 	// 更新子级 scrollbar
-	layoutMainRef.value!.layoutMainScrollbarRef.update();
+	layoutMainRef.value && layoutMainRef.value!.layoutMainScrollbarRef.update();
 };
 // 重置滚动条高度，由于组件是异步引入的
 const initScrollBarHeight = () => {
@@ -60,9 +60,11 @@ watch(
 );
 // 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
 watch(
-	themeConfig,
+	() => [themeConfig.value.isTagsview, themeConfig.value.isFixedHeader],
 	() => {
-		updateScrollbar();
+		nextTick(() => {
+			updateScrollbar();
+		});
 	},
 	{
 		deep: true,

src/layout/main/defaults.vue

@@ -60,9 +60,11 @@ watch(
 );
 // 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
 watch(
-	themeConfig,
+	() => [themeConfig.value.isTagsview, themeConfig.value.isFixedHeader],
 	() => {
-		updateScrollbar();
+		nextTick(() => {
+			updateScrollbar();
+		});
 	},
 	{
 		deep: true,

src/layout/main/transverse.vue

@@ -47,9 +47,11 @@ watch(
 );
 // 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
 watch(
-	themeConfig,
+	() => themeConfig.value.isTagsview,
 	() => {
-		updateScrollbar();
+		nextTick(() => {
+			updateScrollbar();
+		});
 	},
 	{
 		deep: true,

src/layout/navBars/index.vue

@@ -11,7 +11,7 @@ import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 
 // 引入组件
-const BreadcrumbIndex = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/index.vue'));
+const BreadcrumbIndex = defineAsyncComponent(() => import('/@/layout/navBars/topBar/index.vue'));
 const TagsView = defineAsyncComponent(() => import('/@/layout/navBars/tagsView/tagsView.vue'));
 
 // 定义变量内容

src/layout/navBars/tagsView/contextmenu.vue

@@ -20,7 +20,7 @@
 						@click="onCurrentContextmenuClick(v.contextMenuClickId)"
 					>
 						<SvgIcon :name="v.icon" />
-						<span>{{ $t(v.txt) }}</span>
+						<span>{{ v.txt }}</span>
 					</li>
 				</template>
 			</ul>
@@ -52,16 +52,11 @@ const emit = defineEmits(['currentContextmenuClick']);
 const state = reactive({
 	isShow: false,
 	dropdownList: [
-		{ contextMenuClickId: 0, txt: 'message.tagsView.refresh', affix: false, icon: 'ele-RefreshRight' },
-		{ contextMenuClickId: 1, txt: 'message.tagsView.close', affix: false, icon: 'ele-Close' },
-		{ contextMenuClickId: 2, txt: 'message.tagsView.closeOther', affix: false, icon: 'ele-CircleClose' },
-		{ contextMenuClickId: 3, txt: 'message.tagsView.closeAll', affix: false, icon: 'ele-FolderDelete' },
-		{
-			contextMenuClickId: 4,
-			txt: 'message.tagsView.fullscreen',
-			affix: false,
-			icon: 'iconfont icon-fullscreen',
-		},
+		{ contextMenuClickId: 0, txt: '刷新', affix: false, icon: 'ele-RefreshRight' },
+		{ contextMenuClickId: 1, txt: '关闭', affix: false, icon: 'ele-Close' },
+		{ contextMenuClickId: 2, txt: '关闭其它', affix: false, icon: 'ele-CircleClose' },
+		{ contextMenuClickId: 3, txt: '全部关闭', affix: false, icon: 'ele-FolderDelete' },
+		{ contextMenuClickId: 4, txt: '当前页全屏', affix: false, icon: 'iconfont icon-fullscreen' },
 	],
 	item: {},
 	arrowLeft: 10,

src/layout/navBars/tagsView/tagsView.vue

@@ -52,10 +52,10 @@ import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import Sortable from 'sortablejs';
 import { ElMessage } from 'element-plus';
 import { storeToRefs } from 'pinia';
-import pinia from '/@/stores/index';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { useKeepALiveNames } from '/@/stores/keepAliveNames';
+import { useRoutesList } from '/@/stores/routesList';
 import { Session } from '/@/utils/storage';
 import { isObjectValueEqual } from '/@/utils/arrayOperation';
 import other from '/@/utils/other';
@@ -72,8 +72,10 @@ const tagsUlRef = ref();
 const stores = useTagsViewRoutes();
 const storesThemeConfig = useThemeConfig();
 const storesTagsViewRoutes = useTagsViewRoutes();
+const storesRoutesList = useRoutesList();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
+const { routesList } = storeToRefs(storesRoutesList);
 const storesKeepALiveNames = useKeepALiveNames();
 const route = useRoute();
 const router = useRouter();
@@ -382,6 +384,11 @@ const onMousedownMenu = (v: RouteItem, e: MouseEvent) => {
 const onTagsClick = (v: RouteItem, k: number) => {
 	state.tagsRefsIndex = k;
 	router.push(v);
+	// 分栏布局时，收起/展开菜单
+	if (getThemeConfig.value.layout === 'columns') {
+		const item: RouteItem = routesList.value.find((r: RouteItem) => r.path.indexOf(`/${v.path.split('/')[1]}`) > -1);
+		!item.children ? (getThemeConfig.value.isCollapse = true) : (getThemeConfig.value.isCollapse = false);
+	}
 };
 // 处理 url，地址栏链接有参数时，tagsview 右键菜单刷新功能失效问题，感谢 @ZzZz-RIPPER、@dejavuuuuu
 // https://gitee.com/lyt-top/vue-next-admin/issues/I5K3YO
@@ -578,9 +585,9 @@ onBeforeRouteUpdate(async (to) => {
 });
 // 监听路由的变化，动态赋值给 tagsView
 watch(
-	pinia.state,
+	() => tagsViewRoutes.value,
 	(val) => {
-		if (val.tagsViewRoutes.tagsViewRoutes.length === state.tagsViewRoutesList.length) return false;
+		if (val.length === state.tagsViewRoutesList.length) return false;
 		getTagsViewRoutes();
 	},
 	{

src/layout/navBars/topBar/breadcrumb.vue

@@ -11,11 +11,11 @@
 				<el-breadcrumb-item v-for="(v, k) in state.breadcrumbList" :key="!v.meta.tagsViewName ? v.meta.title : v.meta.tagsViewName">
 					<span v-if="k === state.breadcrumbList.length - 1" class="layout-navbars-breadcrumb-span">
 						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="themeConfig.isBreadcrumbIcon" />
-						<div v-if="!v.meta.tagsViewName">{{ $t(v.meta.title) }}</div>
+						<div v-if="!v.meta.tagsViewName">{{ v.meta.title }}</div>
 						<div v-else>{{ v.meta.tagsViewName }}</div>
 					</span>
 					<a v-else @click.prevent="onBreadcrumbClick(v)">
-						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="themeConfig.isBreadcrumbIcon" />{{ $t(v.meta.title) }}
+						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="themeConfig.isBreadcrumbIcon" />{{ v.meta.title }}
 					</a>
 				</el-breadcrumb-item>
 			</transition-group>

src/layout/navBars/topBar/closeFull.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="layout-navbars-close-full" v-if="isTagsViewCurrenFull">
 		<div class="layout-navbars-close-full-icon">
-			<SvgIcon name="ele-Close" :title="$t('message.tagsView.closeFullscreen')" @click="onCloseFullscreen" />
+			<SvgIcon name="ele-Close" title="关闭全屏" @click="onCloseFullscreen" />
 		</div>
 	</div>
 </template>

src/layout/navBars/topBar/index.vue

@@ -16,8 +16,8 @@ import { useThemeConfig } from '/@/stores/themeConfig';
 import mittBus from '/@/utils/mitt';
 
 // 引入组件
-const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/breadcrumb.vue'));
-const User = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/user.vue'));
+const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/topBar/breadcrumb.vue'));
+const User = defineAsyncComponent(() => import('/@/layout/navBars/topBar/user.vue'));
 const Logo = defineAsyncComponent(() => import('/@/layout/logo/index.vue'));
 const Horizontal = defineAsyncComponent(() => import('/@/layout/navMenu/horizontal.vue'));
 

src/layout/navBars/topBar/search.vue

@@ -5,7 +5,7 @@
 				<el-autocomplete
 					v-model="state.menuQuery"
 					:fetch-suggestions="menuSearch"
-					:placeholder="$t('message.user.searchPlaceholder')"
+					placeholder="菜单搜索：支持中文、路由路径"
 					ref="layoutMenuAutocompleteRef"
 					@select="onHandleSelect"
 					:fit-input-width="true"
@@ -18,7 +18,7 @@
 					<template #default="{ item }">
 						<div>
 							<SvgIcon :name="item.meta.icon" class="mr5" />
-							{{ $t(item.meta.title) }}
+							{{ item.meta.title }}
 						</div>
 					</template>
 				</el-autocomplete>
@@ -30,7 +30,6 @@
 <script setup lang="ts" name="layoutBreadcrumbSearch">
 import { reactive, ref, nextTick } from 'vue';
 import { useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 
@@ -38,7 +37,6 @@ import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 const storesTagsViewRoutes = useTagsViewRoutes();
 const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
 const layoutMenuAutocompleteRef = ref();
-const { t } = useI18n();
 const router = useRouter();
 const state = reactive<SearchState>({
 	isShowSearch: false,
@@ -72,7 +70,7 @@ const createFilter = (queryString: string) => {
 		return (
 			restaurant.path.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
 			restaurant.meta!.title!.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
-			t(restaurant.meta!.title!).indexOf(queryString.toLowerCase()) > -1
+			restaurant.meta!.title!.indexOf(queryString.toLowerCase()) > -1
 		);
 	};
 };
@@ -107,6 +105,7 @@ defineExpose({
 			display: none;
 		}
 		.el-dialog__footer {
+			width: 100%;
 			position: absolute;
 			left: 50%;
 			transform: translateX(-50%);

src/layout/navBars/topBar/setings.vue

@@ -1,16 +1,9 @@
 <template>
 	<div class="layout-breadcrumb-seting">
-		<el-drawer
-			:title="$t('message.layout.configTitle')"
-			v-model="getThemeConfig.isDrawer"
-			direction="rtl"
-			destroy-on-close
-			size="260px"
-			@close="onDrawerClose"
-		>
+		<el-drawer title="布局配置" v-model="getThemeConfig.isDrawer" direction="rtl" destroy-on-close size="260px" @close="onDrawerClose">
 			<el-scrollbar class="layout-breadcrumb-seting-bar">
 				<!-- 全局主题 -->
-				<el-divider content-position="left">{{ $t('message.layout.oneTitle') }}</el-divider>
+				<el-divider content-position="left">全局主题</el-divider>
 				<div class="layout-breadcrumb-seting-bar-flex">
 					<div class="layout-breadcrumb-seting-bar-flex-label">primary</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
@@ -18,60 +11,69 @@
 					</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-label">深色模式</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isIsDark" size="small" @change="onAddDarkChange"></el-switch>
 					</div>
 				</div>
 
 				<!-- 顶栏设置 -->
-				<el-divider content-position="left">{{ $t('message.layout.twoTopTitle') }}</el-divider>
+				<el-divider content-position="left">顶栏设置</el-divider>
 				<div class="layout-breadcrumb-seting-bar-flex">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBar') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">顶栏背景</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-color-picker v-model="getThemeConfig.topBar" size="default" @change="onBgColorPickerChange('topBar')"> </el-color-picker>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBarColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">顶栏默认字体颜色</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-color-picker v-model="getThemeConfig.topBarColor" size="default" @change="onBgColorPickerChange('topBarColor')"> </el-color-picker>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt10">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsTopBarColorGradual') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">顶栏背景渐变</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isTopBarColorGradual" size="small" @change="onTopBarGradualChange"></el-switch>
 					</div>
 				</div>
 
 				<!-- 菜单设置 -->
-				<el-divider content-position="left">{{ $t('message.layout.twoMenuTitle') }}</el-divider>
+				<el-divider content-position="left">菜单设置</el-divider>
 				<div class="layout-breadcrumb-seting-bar-flex">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBar') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">菜单背景</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-color-picker v-model="getThemeConfig.menuBar" size="default" @change="onBgColorPickerChange('menuBar')"> </el-color-picker>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBarColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">菜单默认字体颜色</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-color-picker v-model="getThemeConfig.menuBarColor" size="default" @change="onBgColorPickerChange('menuBarColor')"> </el-color-picker>
 					</div>
 				</div>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">菜单高亮背景色</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker
+							v-model="getThemeConfig.menuBarActiveColor"
+							size="default"
+							show-alpha
+							@change="onBgColorPickerChange('menuBarActiveColor')"
+						/>
+					</div>
+				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt14">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsMenuBarColorGradual') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">菜单背景渐变</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isMenuBarColorGradual" size="small" @change="onMenuBarGradualChange"></el-switch>
 					</div>
 				</div>
 
 				<!-- 分栏设置 -->
-				<el-divider content-position="left" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">{{
-					$t('message.layout.twoColumnsTitle')
-				}}</el-divider>
+				<el-divider content-position="left" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">分栏设置</el-divider>
 				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBar') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">分栏菜单背景</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-color-picker
 							v-model="getThemeConfig.columnsMenuBar"
@@ -83,7 +85,7 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBarColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">分栏菜单默认字体颜色</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-color-picker
 							v-model="getThemeConfig.columnsMenuBarColor"
@@ -95,7 +97,7 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt14" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsColumnsMenuBarColorGradual') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">分栏菜单背景渐变</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch
 							v-model="getThemeConfig.isColumnsMenuBarColorGradual"
@@ -106,7 +108,7 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt14" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsColumnsMenuHoverPreload') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">分栏菜单鼠标悬停预加载</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch
 							v-model="getThemeConfig.isColumnsMenuHoverPreload"
@@ -118,9 +120,9 @@
 				</div>
 
 				<!-- 界面设置 -->
-				<el-divider content-position="left">{{ $t('message.layout.threeTitle') }}</el-divider>
+				<el-divider content-position="left">界面设置</el-divider>
 				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout === 'transverse' ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsCollapse') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">菜单水平折叠</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch
 							v-model="getThemeConfig.isCollapse"
@@ -131,7 +133,7 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout === 'transverse' ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsUniqueOpened') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">菜单手风琴</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch
 							v-model="getThemeConfig.isUniqueOpened"
@@ -142,13 +144,13 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsFixedHeader') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">固定 Header</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isFixedHeader" size="small" @change="onIsFixedHeaderChange"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout !== 'classic' ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsClassicSplitMenu') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">经典布局分割菜单</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch
 							v-model="getThemeConfig.isClassicSplitMenu"
@@ -160,13 +162,13 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsLockScreen') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">开启锁屏</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isLockScreen" size="small" @change="setLocalThemeConfig"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt11">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeLockScreenTime') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">自动锁屏(s/秒)</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-input-number
 							v-model="getThemeConfig.lockScreenTime"
@@ -182,9 +184,9 @@
 				</div>
 
 				<!-- 界面显示 -->
-				<el-divider content-position="left">{{ $t('message.layout.fourTitle') }}</el-divider>
+				<el-divider content-position="left">界面显示</el-divider>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsShowLogo') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">侧边栏 Logo</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isShowLogo" size="small" @change="onIsShowLogoChange"></el-switch>
 					</div>
@@ -193,7 +195,7 @@
 					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-label">开启 Breadcrumb</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch
 							v-model="getThemeConfig.isBreadcrumb"
@@ -204,31 +206,31 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsBreadcrumbIcon') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">开启 Breadcrumb 图标</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isBreadcrumbIcon" size="small" @change="setLocalThemeConfig"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsview') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">开启 Tagsview</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isTagsview" size="small" @change="setLocalThemeConfig"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsviewIcon') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">开启 Tagsview 图标</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isTagsviewIcon" size="small" @change="setLocalThemeConfig"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsCacheTagsView') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">开启 TagsView 缓存</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isCacheTagsView" size="small" @change="setLocalThemeConfig"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: state.isMobile ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsSortableTagsView') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">开启 TagsView 拖拽</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch
 							v-model="getThemeConfig.isSortableTagsView"
@@ -239,46 +241,46 @@
 					</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-label">开启 TagsView 共用</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isShareTagsView" size="small" @change="onShareTagsViewChange"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsFooter') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">开启 Footer</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isFooter" size="small" @change="setLocalThemeConfig"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsGrayscale') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">灰色模式</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isGrayscale" size="small" @change="onAddFilterChange('grayscale')"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsInvert') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">色弱模式</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isInvert" size="small" @change="onAddFilterChange('invert')"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsWartermark') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">开启水印</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-switch v-model="getThemeConfig.isWartermark" size="small" @change="onWartermarkChange"></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt14">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourWartermarkText') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">水印文案</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-input v-model="getThemeConfig.wartermarkText" size="default" style="width: 90px" @input="onWartermarkTextInput"></el-input>
+						<el-input v-model="getThemeConfig.wartermarkText" size="default" style="width: 90px" @input="onWartermarkTextInput($event)"></el-input>
 					</div>
 				</div>
 
 				<!-- 其它设置 -->
-				<el-divider content-position="left">{{ $t('message.layout.fiveTitle') }}</el-divider>
+				<el-divider content-position="left">其它设置</el-divider>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveTagsStyle') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">Tagsview 风格</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-select v-model="getThemeConfig.tagsStyle" placeholder="请选择" size="default" style="width: 90px" @change="setLocalThemeConfig">
 							<el-option label="风格1" value="tags-style-one"></el-option>
@@ -288,7 +290,7 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveAnimation') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">主页面切换动画</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-select v-model="getThemeConfig.animation" placeholder="请选择" size="default" style="width: 90px" @change="setLocalThemeConfig">
 							<el-option label="slide-right" value="slide-right"></el-option>
@@ -298,7 +300,7 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideStyle') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">分栏高亮风格</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-select
 							v-model="getThemeConfig.columnsAsideStyle"
@@ -314,7 +316,7 @@
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15 mb27" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
-					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideLayout') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-label">分栏布局风格</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-select
 							v-model="getThemeConfig.columnsAsideLayout"
@@ -331,7 +333,7 @@
 				</div>
 
 				<!-- 布局切换 -->
-				<el-divider content-position="left">{{ $t('message.layout.sixTitle') }}</el-divider>
+				<el-divider content-position="left">布局切换</el-divider>
 				<div class="layout-drawer-content-flex">
 					<!-- defaults 布局 -->
 					<div class="layout-drawer-content-item" @click="onSetLayout('defaults')">
@@ -344,7 +346,7 @@
 						</section>
 						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'defaults' }">
 							<div class="layout-tips-box">
-								<p class="layout-tips-txt">{{ $t('message.layout.sixDefaults') }}</p>
+								<p class="layout-tips-txt">默认</p>
 							</div>
 						</div>
 					</div>
@@ -361,7 +363,7 @@
 						</section>
 						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'classic' }">
 							<div class="layout-tips-box">
-								<p class="layout-tips-txt">{{ $t('message.layout.sixClassic') }}</p>
+								<p class="layout-tips-txt">经典</p>
 							</div>
 						</div>
 					</div>
@@ -377,7 +379,7 @@
 						</section>
 						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'transverse' }">
 							<div class="layout-tips-box">
-								<p class="layout-tips-txt">{{ $t('message.layout.sixTransverse') }}</p>
+								<p class="layout-tips-txt">横向</p>
 							</div>
 						</div>
 					</div>
@@ -393,24 +395,24 @@
 						</section>
 						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'columns' }">
 							<div class="layout-tips-box">
-								<p class="layout-tips-txt">{{ $t('message.layout.sixColumns') }}</p>
+								<p class="layout-tips-txt">分栏</p>
 							</div>
 						</div>
 					</div>
 				</div>
 				<div class="copy-config">
-					<el-alert :title="$t('message.layout.tipText')" type="warning" :closable="false"> </el-alert>
+					<el-alert title="点击下方按钮，复制布局配置去 `src/store/modules/themeConfig.ts` 中修改。" type="warning" :closable="false"> </el-alert>
 					<el-button size="default" class="copy-config-btn" type="primary" ref="copyConfigBtnRef" @click="onCopyConfigClick">
 						<el-icon class="mr5">
 							<ele-CopyDocument />
 						</el-icon>
-						{{ $t('message.layout.copyText') }}
+						一键复制配置
 					</el-button>
 					<el-button size="default" class="copy-config-btn-reset" type="info" @click="onResetConfigClick">
 						<el-icon class="mr5">
 							<ele-RefreshRight />
 						</el-icon>
-						{{ $t('message.layout.resetText') }}
+						一键恢复默认
 					</el-button>
 				</div>
 			</el-scrollbar>
@@ -421,19 +423,17 @@
 <script setup lang="ts" name="layoutBreadcrumbSeting">
 import { nextTick, onUnmounted, onMounted, computed, reactive } from 'vue';
 import { ElMessage } from 'element-plus';
-import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { useChangeColor } from '/@/utils/theme';
 import { verifyAndSpace } from '/@/utils/toolsValidate';
 import { Local } from '/@/utils/storage';
-import Watermark from '/@/utils/wartermark';
+import Watermark from '/@/utils/watermark';
 import commonFunction from '/@/utils/commonFunction';
 import other from '/@/utils/other';
 import mittBus from '/@/utils/mitt';
 
 // 定义变量内容
-const { locale } = useI18n();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const { copyText } = commonFunction();
@@ -483,14 +483,16 @@ const onColumnsMenuBarGradualChange = () => {
 };
 // 2、菜单 / 顶栏 --> 背景渐变函数
 const setGraduaFun = (el: string, bool: boolean, color: string) => {
-	setTimeout(() => {
-		let els = document.querySelector(el);
-		if (!els) return false;
-		document.documentElement.style.setProperty('--el-menu-bg-color', document.documentElement.style.getPropertyValue('--next-bg-menuBar'));
-		if (bool) els.setAttribute('style', `background:linear-gradient(to bottom left , ${color}, ${getLightColor(color, 0.6)}) !important;`);
-		else els.setAttribute('style', ``);
-		setLocalThemeConfig();
-	}, 200);
+	nextTick(() => {
+		setTimeout(() => {
+			let els = document.querySelector(el);
+			if (!els) return false;
+			document.documentElement.style.setProperty('--el-menu-bg-color', document.documentElement.style.getPropertyValue('--next-bg-menuBar'));
+			if (bool) els.setAttribute('style', `background:linear-gradient(to bottom , ${color}, ${getLightColor(color, 0.5)})`);
+			else els.setAttribute('style', ``);
+			setLocalThemeConfig();
+		}, 300);
+	});
 };
 // 2、分栏设置 ->
 const onColumnsMenuHoverPreloadChange = () => {
@@ -577,6 +579,7 @@ const onSetLayout = (layout: string) => {
 const initLayoutChangeFun = () => {
 	onBgColorPickerChange('menuBar');
 	onBgColorPickerChange('menuBarColor');
+	onBgColorPickerChange('menuBarActiveColor');
 	onBgColorPickerChange('topBar');
 	onBgColorPickerChange('topBarColor');
 	onBgColorPickerChange('columnsMenuBar');
@@ -620,7 +623,7 @@ const onResetConfigClick = () => {
 	Local.clear();
 	window.location.reload();
 	// @ts-ignore
-	Local.set('version', __VERSION__);
+	Local.set('version', __NEXT_VERSION__);
 };
 // 初始化菜单样式等
 const initSetStyle = () => {
@@ -654,8 +657,6 @@ onMounted(() => {
 			if (getThemeConfig.value.isIsDark) onAddDarkChange();
 			// 开启水印
 			onWartermarkChange();
-			// 语言国际化
-			if (Local.get('themeConfig')) locale.value = Local.get('themeConfig').globalI18n;
 			// 初始化菜单样式等
 			initSetStyle();
 		}, 100);

src/layout/navBars/topBar/user.vue

@@ -2,58 +2,47 @@
 	<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
 		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
 			<div class="layout-navbars-breadcrumb-user-icon">
-				<i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
+				<i class="iconfont icon-ziti" title="组件大小"></i>
 			</div>
 			<template #dropdown>
 				<el-dropdown-menu>
-					<el-dropdown-item command="large" :disabled="state.disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
-					<el-dropdown-item command="default" :disabled="state.disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
-					<el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
-				</el-dropdown-menu>
-			</template>
-		</el-dropdown>
-		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
-			<div class="layout-navbars-breadcrumb-user-icon">
-				<i
-					class="iconfont"
-					:class="state.disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'"
-					:title="$t('message.user.title1')"
-				></i>
-			</div>
-			<template #dropdown>
-				<el-dropdown-menu>
-					<el-dropdown-item command="zh-cn" :disabled="state.disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
-					<el-dropdown-item command="en" :disabled="state.disabledI18n === 'en'">English</el-dropdown-item>
-					<el-dropdown-item command="zh-tw" :disabled="state.disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>
+					<el-dropdown-item command="large" :disabled="state.disabledSize === 'large'">大型</el-dropdown-item>
+					<el-dropdown-item command="default" :disabled="state.disabledSize === 'default'">默认</el-dropdown-item>
+					<el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">小型</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
 		<div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
-			<el-icon :title="$t('message.user.title2')">
+			<el-icon title="菜单搜索">
 				<ele-Search />
 			</el-icon>
 		</div>
 		<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
-			<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
+			<i class="icon-skin iconfont" title="布局配置"></i>
 		</div>
-		<div class="layout-navbars-breadcrumb-user-icon">
-			<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
-				<template #reference>
-					<el-badge :is-dot="true">
-						<el-icon :title="$t('message.user.title4')">
-							<ele-Bell />
-						</el-icon>
-					</el-badge>
-				</template>
-				<template #default>
-					<UserNews />
-				</template>
-			</el-popover>
+		<div class="layout-navbars-breadcrumb-user-icon" ref="userNewsBadgeRef" v-click-outside="onUserNewsClick">
+			<el-badge :is-dot="true">
+				<el-icon title="消息">
+					<ele-Bell />
+				</el-icon>
+			</el-badge>
 		</div>
+		<el-popover
+			ref="userNewsRef"
+			:virtual-ref="userNewsBadgeRef"
+			placement="bottom"
+			trigger="click"
+			transition="el-zoom-in-top"
+			virtual-triggering
+			:width="300"
+			:persistent="false"
+		>
+			<UserNews />
+		</el-popover>
 		<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
 			<i
 				class="iconfont"
-				:title="state.isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
+				:title="state.isScreenfull ? '关全屏' : '开全屏'"
 				:class="!state.isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
 			></i>
 		</div>
@@ -66,13 +55,12 @@
 				</el-icon>
 			</span>
 			<template #dropdown>
-				<el-dropdown-menu>
-					<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
-					<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
-					<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
-					<el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
-					<el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>
-					<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
+				<el-dropdown-menu
+					><el-dropdown-item command="/home">首页</el-dropdown-item>
+					<el-dropdown-item command="wareHouse">代码仓库</el-dropdown-item>
+					<el-dropdown-item command="/404">404</el-dropdown-item>
+					<el-dropdown-item command="/401">401</el-dropdown-item>
+					<el-dropdown-item divided command="logOut">退出登录</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
@@ -81,24 +69,23 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbUser">
-import { defineAsyncComponent, ref, computed, reactive, onMounted } from 'vue';
+import { defineAsyncComponent, ref, unref, computed, reactive, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
-import { ElMessageBox, ElMessage } from 'element-plus';
+import { ElMessageBox, ElMessage, ClickOutside as vClickOutside } from 'element-plus';
 import screenfull from 'screenfull';
-import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 import { useUserInfo } from '/@/stores/userInfo';
 import { useThemeConfig } from '/@/stores/themeConfig';
-import other from '/@/utils/other';
 import mittBus from '/@/utils/mitt';
 import { Session, Local } from '/@/utils/storage';
 
 // 引入组件
-const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/userNews.vue'));
-const Search = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/search.vue'));
+const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/topBar/userNews.vue'));
+const Search = defineAsyncComponent(() => import('/@/layout/navBars/topBar/search.vue'));
 
 // 定义变量内容
-const { locale, t } = useI18n();
+const userNewsRef = ref();
+const userNewsBadgeRef = ref();
 const router = useRouter();
 const stores = useUserInfo();
 const storesThemeConfig = useThemeConfig();
@@ -107,7 +94,6 @@ const { themeConfig } = storeToRefs(storesThemeConfig);
 const searchRef = ref();
 const state = reactive({
 	isScreenfull: false,
-	disabledI18n: 'zh-cn',
 	disabledSize: 'large',
 });
 
@@ -132,6 +118,10 @@ const onScreenfullClick = () => {
 		else state.isScreenfull = false;
 	});
 };
+// 消息通知点击时
+const onUserNewsClick = () => {
+	unref(userNewsRef).popperRef?.delayHide?.();
+};
 // 布局配置 icon 点击时
 const onLayoutSetingClick = () => {
 	mittBus.emit('openSetingsDrawer');
@@ -142,16 +132,16 @@ const onHandleCommandClick = (path: string) => {
 		ElMessageBox({
 			closeOnClickModal: false,
 			closeOnPressEscape: false,
-			title: t('message.user.logOutTitle'),
-			message: t('message.user.logOutMessage'),
+			title: '提示',
+			message: '此操作将退出登录, 是否继续?',
 			showCancelButton: true,
-			confirmButtonText: t('message.user.logOutConfirm'),
-			cancelButtonText: t('message.user.logOutCancel'),
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
 			buttonSize: 'default',
 			beforeClose: (action, instance, done) => {
 				if (action === 'confirm') {
 					instance.confirmButtonLoading = true;
-					instance.confirmButtonText = t('message.user.logOutExit');
+					instance.confirmButtonText = '退出中';
 					setTimeout(() => {
 						done();
 						setTimeout(() => {
@@ -188,24 +178,14 @@ const onComponentSizeChange = (size: string) => {
 	initI18nOrSize('globalComponentSize', 'disabledSize');
 	window.location.reload();
 };
-// 语言切换
-const onLanguageChange = (lang: string) => {
-	Local.remove('themeConfig');
-	themeConfig.value.globalI18n = lang;
-	Local.set('themeConfig', themeConfig.value);
-	locale.value = lang;
-	other.useTitle();
-	initI18nOrSize('globalI18n', 'disabledI18n');
-};
 // 初始化组件大小/i18n
 const initI18nOrSize = (value: string, attr: string) => {
-	state[attr] = Local.get('themeConfig')[value];
+	(<any>state)[attr] = Local.get('themeConfig')[value];
 };
 // 页面加载时
 onMounted(() => {
 	if (Local.get('themeConfig')) {
 		initI18nOrSize('globalComponentSize', 'disabledSize');
-		initI18nOrSize('globalI18n', 'disabledI18n');
 	}
 });
 </script>

src/layout/navBars/topBar/userNews.vue

@@ -1,8 +1,8 @@
 <template>
 	<div class="layout-navbars-breadcrumb-user-news">
 		<div class="head-box">
-			<div class="head-box-title">{{ $t('message.user.newTitle') }}</div>
-			<div class="head-box-btn" v-if="state.newsList.length > 0" @click="onAllReadClick">{{ $t('message.user.newBtn') }}</div>
+			<div class="head-box-title">通知</div>
+			<div class="head-box-btn" v-if="state.newsList.length > 0" @click="onAllReadClick">全部已读</div>
 		</div>
 		<div class="content-box">
 			<template v-if="state.newsList.length > 0">
@@ -14,9 +14,9 @@
 					<div class="content-box-time">{{ v.time }}</div>
 				</div>
 			</template>
-			<el-empty :description="$t('message.user.newDesc')" v-else></el-empty>
+			<el-empty description="暂无通知" v-else></el-empty>
 		</div>
-		<div class="foot-box" @click="onGoToGiteeClick" v-if="state.newsList.length > 0">{{ $t('message.user.newGo') }}</div>
+		<div class="foot-box" @click="onGoToGiteeClick" v-if="state.newsList.length > 0">前往通知中心</div>
 	</div>
 </template>
 

src/layout/navMenu/horizontal.vue

@@ -1,37 +1,35 @@
 <template>
 	<div class="el-menu-horizontal-warp">
-		<el-scrollbar @wheel.native.prevent="onElMenuHorizontalScroll" ref="elMenuHorizontalScrollRef">
-			<el-menu router :default-active="state.defaultActive" :ellipsis="false" background-color="transparent" mode="horizontal">
-				<template v-for="val in menuLists">
-					<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
-						<template #title>
-							<SvgIcon :name="val.meta.icon" />
-							<span>{{ $t(val.meta.title) }}</span>
-						</template>
-						<SubItem :chil="val.children" />
-					</el-sub-menu>
-					<template v-else>
-						<el-menu-item :index="val.path" :key="val.path">
-							<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
-								<SvgIcon :name="val.meta.icon" />
-								{{ $t(val.meta.title) }}
-							</template>
-							<template #title v-else>
-								<a class="w100" @click.prevent="onALinkClick(val)">
-									<SvgIcon :name="val.meta.icon" />
-									{{ $t(val.meta.title) }}
-								</a>
-							</template>
-						</el-menu-item>
+		<el-menu router :default-active="state.defaultActive" background-color="transparent" mode="horizontal">
+			<template v-for="val in menuLists">
+				<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
+					<template #title>
+						<SvgIcon :name="val.meta.icon" />
+						<span>{{ val.meta.title }}</span>
 					</template>
+					<SubItem :chil="val.children" />
+				</el-sub-menu>
+				<template v-else>
+					<el-menu-item :index="val.path" :key="val.path">
+						<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
+							<SvgIcon :name="val.meta.icon" />
+							{{ val.meta.title }}
+						</template>
+						<template #title v-else>
+							<a class="w100" @click.prevent="onALinkClick(val)">
+								<SvgIcon :name="val.meta.icon" />
+								{{ val.meta.title }}
+							</a>
+						</template>
+					</el-menu-item>
 				</template>
-			</el-menu>
-		</el-scrollbar>
+			</template>
+		</el-menu>
 	</div>
 </template>
 
 <script setup lang="ts" name="navMenuHorizontal">
-import { defineAsyncComponent, reactive, computed, onMounted, nextTick, onBeforeMount, ref } from 'vue';
+import { defineAsyncComponent, reactive, computed, onBeforeMount } from 'vue';
 import { useRoute, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import { useRoutesList } from '/@/stores/routesList';
@@ -52,7 +50,6 @@ const props = defineProps({
 });
 
 // 定义变量内容
-const elMenuHorizontalScrollRef = ref();
 const stores = useRoutesList();
 const storesThemeConfig = useThemeConfig();
 const { routesList } = storeToRefs(stores);
@@ -66,19 +63,6 @@ const state = reactive({
 const menuLists = computed(() => {
 	return <RouteItems>props.menuList;
 });
-// 设置横向滚动条可以鼠标滚轮滚动
-const onElMenuHorizontalScroll = (e: WheelEventType) => {
-	const eventDelta = e.wheelDelta || -e.deltaY * 40;
-	elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft = elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft + eventDelta / 4;
-};
-// 初始化数据，页面刷新时，滚动条滚动到对应位置
-const initElMenuOffsetLeft = () => {
-	nextTick(() => {
-		let els = <HTMLElement>document.querySelector('.el-menu.el-menu--horizontal li.is-active');
-		if (!els) return false;
-		elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft = els.offsetLeft;
-	});
-};
 // 路由过滤递归函数
 const filterRoutesFun = <T extends RouteItem>(arr: T[]): T[] => {
 	return arr
@@ -122,10 +106,6 @@ const onALinkClick = (val: RouteItem) => {
 onBeforeMount(() => {
 	setCurrentRouterHighlight(route);
 });
-// 页面加载时
-onMounted(() => {
-	initElMenuOffsetLeft();
-});
 // 路由更新时
 onBeforeRouteUpdate((to) => {
 	// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G

src/layout/navMenu/subItem.vue

@@ -3,7 +3,7 @@
 		<el-sub-menu :index="val.path" :key="val.path" v-if="val.children && val.children.length > 0">
 			<template #title>
 				<SvgIcon :name="val.meta.icon" />
-				<span>{{ $t(val.meta.title) }}</span>
+				<span>{{ val.meta.title }}</span>
 			</template>
 			<sub-item :chil="val.children" />
 		</el-sub-menu>
@@ -11,12 +11,12 @@
 			<el-menu-item :index="val.path" :key="val.path">
 				<template v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
 					<SvgIcon :name="val.meta.icon" />
-					<span>{{ $t(val.meta.title) }}</span>
+					<span>{{ val.meta.title }}</span>
 				</template>
 				<template v-else>
 					<a class="w100" @click.prevent="onALinkClick(val)">
 						<SvgIcon :name="val.meta.icon" />
-						{{ $t(val.meta.title) }}
+						{{ val.meta.title }}
 					</a>
 				</template>
 			</el-menu-item>

src/layout/navMenu/vertical.vue

@@ -11,7 +11,7 @@
 			<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
 				<template #title>
 					<SvgIcon :name="val.meta.icon" />
-					<span>{{ $t(val.meta.title) }}</span>
+					<span>{{ val.meta.title }}</span>
 				</template>
 				<SubItem :chil="val.children" />
 			</el-sub-menu>
@@ -19,10 +19,10 @@
 				<el-menu-item :index="val.path" :key="val.path">
 					<SvgIcon :name="val.meta.icon" />
 					<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
-						<span>{{ $t(val.meta.title) }}</span>
+						<span>{{ val.meta.title }}</span>
 					</template>
 					<template #title v-else>
-						<a class="w100" @click.prevent="onALinkClick(val)">{{ $t(val.meta.title) }}</a>
+						<a class="w100" @click.prevent="onALinkClick(val)">{{ val.meta.title }}</a>
 					</template>
 				</el-menu-item>
 			</template>
@@ -91,9 +91,9 @@ onBeforeRouteUpdate((to) => {
 });
 // 设置菜单的收起/展开
 watch(
-	themeConfig.value,
-	() => {
-		document.body.clientWidth <= 1000 ? (state.isCollapse = false) : (state.isCollapse = themeConfig.value.isCollapse);
+	() => themeConfig.value.isCollapse,
+	(isCollapse) => {
+		document.body.clientWidth <= 1000 ? (state.isCollapse = false) : (state.isCollapse = isCollapse);
 	},
 	{
 		immediate: true,

src/layout/routerView/iframes.vue

@@ -2,7 +2,7 @@
 	<div class="layout-padding layout-padding-unset layout-iframe">
 		<div class="layout-padding-auto layout-padding-view">
 			<div class="w100" v-for="v in setIframeList" :key="v.path" v-loading="v.meta.loading" element-loading-background="white">
-				<transition-group :name="name" mode="out-in">
+				<transition-group :name="name">
 					<iframe
 						:src="v.meta.isLink"
 						:key="v.path"

src/layout/routerView/link.vue

@@ -3,7 +3,7 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<div class="layout-link-warp">
 				<i class="layout-link-icon iconfont icon-xingqiu"></i>
-				<div class="layout-link-msg">页面 "{{ $t(state.title) }}" 已在新窗口中打开</div>
+				<div class="layout-link-msg">页面 {{ state.title }} 已在新窗口中打开</div>
 				<el-button class="mt30" round size="default" @click="onGotoFullPage">
 					<i class="iconfont icon-lianjie"></i>
 					<span>立即前往体验</span>

src/layout/sponsors/index.vue

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

src/layout/upgrade/index.vue

@@ -10,21 +10,21 @@
 		>
 			<div class="upgrade-title">
 				<div class="upgrade-title-warp">
-					<span class="upgrade-title-warp-txt">{{ $t('message.upgrade.title') }}</span>
+					<span class="upgrade-title-warp-txt">新版本升级</span>
 					<span class="upgrade-title-warp-version">v{{ state.version }}</span>
 				</div>
 			</div>
 			<div class="upgrade-content">
-				{{ getThemeConfig.globalTitle }} {{ $t('message.upgrade.msg') }}
+				{{ getThemeConfig.globalTitle }} 新版本来啦，马上更新尝鲜吧！不用担心，更新很快的哦！
 				<div class="mt5">
 					<el-link type="primary" class="font12" href="https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md" target="_black">
 						CHANGELOG.md
 					</el-link>
 				</div>
-				<div class="upgrade-content-desc mt5">{{ $t('message.upgrade.desc') }}</div>
+				<div class="upgrade-content-desc mt5">提示：更新会还原默认配置</div>
 			</div>
 			<div class="upgrade-btn">
-				<el-button round size="default" type="info" text @click="onCancel">{{ $t('message.upgrade.btnOne') }}</el-button>
+				<el-button round size="default" type="info" text @click="onCancel">残忍拒绝</el-button>
 				<el-button type="primary" round size="default" @click="onUpgrade" :loading="state.isLoading">{{ state.btnTxt }}</el-button>
 			</div>
 		</el-dialog>
@@ -33,19 +33,17 @@
 
 <script setup lang="ts" name="layoutUpgrade">
 import { reactive, computed, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { Local } from '/@/utils/storage';
 
 // 定义变量内容
-const { t } = useI18n();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const state = reactive({
 	isUpgrade: false,
 	// @ts-ignore
-	version: __VERSION__,
+	version: __NEXT_VERSION__,
 	isLoading: false,
 	btnTxt: '',
 });
@@ -61,7 +59,7 @@ const onCancel = () => {
 // 马上更新
 const onUpgrade = () => {
 	state.isLoading = true;
-	state.btnTxt = t('message.upgrade.btnTwoLoading');
+	state.btnTxt = '更新中';
 	setTimeout(() => {
 		Local.clear();
 		window.location.reload();
@@ -78,7 +76,7 @@ const delayShow = () => {
 onMounted(() => {
 	delayShow();
 	setTimeout(() => {
-		state.btnTxt = t('message.upgrade.btnTwo');
+		state.btnTxt = '马上更新';
 	}, 200);
 });
 </script>

src/main.ts

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

src/router/backEnd.ts

@@ -53,7 +53,7 @@ export async function initBackEndControlRoutes() {
 	// 添加动态路由
 	await setAddRoute();
 	// 设置路由到 pinia routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
-	await setFilterMenuAndCacheTagsViewRoutes();
+	setFilterMenuAndCacheTagsViewRoutes();
 }
 
 /**

src/router/frontEnd.ts

@@ -32,7 +32,7 @@ export async function initFrontEndControlRoutes() {
 	// 添加动态路由
 	await setAddRoute();
 	// 设置递归过滤有权限的路由到 pinia routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
-	await setFilterMenuAndCacheTagsViewRoutes();
+	setFilterMenuAndCacheTagsViewRoutes();
 }
 
 /**

src/stores/themeConfig.ts

@@ -23,10 +23,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			isIsDark: false,
 
 			/**
-			 * 菜单 / 顶栏
-			 * 注意：v1.0.17 版本去除设置布局切换，重置主题样式（initSetLayoutChange），
-			 * 切换布局需手动设置样式，设置的样式自动同步各布局，
-			 * 代码位置：/@/layout/navBars/breadcrumb/setings.vue
+			 * 顶栏设置
 			 */
 			// 默认顶栏导航背景颜色
 			topBar: '#ffffff',
@@ -34,12 +31,22 @@ export const useThemeConfig = defineStore('themeConfig', {
 			topBarColor: '#606266',
 			// 是否开启顶栏背景颜色渐变
 			isTopBarColorGradual: false,
+
+			/**
+			 * 菜单设置
+			 */
 			// 默认菜单导航背景颜色
 			menuBar: '#545c64',
 			// 默认菜单导航字体颜色
 			menuBarColor: '#eaeaea',
+			// 默认菜单高亮背景色
+			menuBarActiveColor: 'rgba(0, 0, 0, 0.2)',
 			// 是否开启菜单背景颜色渐变
 			isMenuBarColorGradual: false,
+
+			/**
+			 * 分栏设置
+			 */
 			// 默认分栏菜单背景颜色
 			columnsMenuBar: '#545c64',
 			// 默认分栏菜单字体颜色
@@ -114,7 +121,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 
 			/**
 			 * 布局切换
-			 * 注意：为了演示，切换布局时，颜色会被还原成默认，代码位置：/@/layout/navBars/breadcrumb/setings.vue
+			 * 注意：为了演示，切换布局时，颜色会被还原成默认，代码位置：/@/layout/navBars/topBar/setings.vue
 			 * 中的 `initSetLayoutChange(设置布局切换，重置主题样式)` 方法
 			 */
 			// 布局切换：可选值"<defaults|classic|transverse|columns>"，默认 defaults

src/stores/userInfo.ts

@@ -22,7 +22,7 @@ export const useUserInfo = defineStore('userInfo', {
 			if (Session.get('userInfo')) {
 				this.userInfos = Session.get('userInfo');
 			} else {
-				const userInfos: any = await this.getApiUserInfo();
+				const userInfos = <UserInfos>await this.getApiUserInfo();
 				this.userInfos = userInfos;
 			}
 		},
@@ -63,6 +63,7 @@ export const useUserInfo = defineStore('userInfo', {
 						roles: defaultRoles,
 						authBtnList: defaultAuthBtnList,
 					};
+					Session.set('userInfo', userInfos);
 					resolve(userInfos);
 				}, 0);
 			});

src/theme/app.scss

@@ -141,6 +141,8 @@ body,
 	.layout-aside-pc-1 {
 		width: 1px !important;
 		transition: width 0.3s ease;
+		position: relative;
+		left: -1px;
 	}
 	// 手机端左侧导航样式
 	.layout-aside-mobile {

src/theme/dark.scss

@@ -22,6 +22,7 @@
 	--next-bg-topBarColor: var(--next-color-bar) !important;
 	--next-bg-menuBar: var(--next-color-disabled) !important;
 	--next-bg-menuBarColor: var(--next-color-bar) !important;
+	--next-bg-menuBarActiveColor: var(--next-color-hover-rgba) !important;
 	--next-bg-columnsMenuBar: var(--next-color-disabled) !important;
 	--next-bg-columnsMenuBarColor: var(--next-color-bar) !important;
 	--next-border-color-light: var(--next-border-black) !important;
@@ -105,9 +106,15 @@
 		background-color: var(--next-color-disabled) !important;
 	}
 
+	// topBar
+	.layout-navbars-breadcrumb-index {
+		background: none !important;
+	}
+
 	// menu
 	.layout-aside {
 		border-right: 1px solid var(--next-border-color-light) !important;
+		@extend .layout-navbars-breadcrumb-index;
 	}
 
 	// colorPicker

src/theme/element.scss

@@ -68,7 +68,7 @@
 ------------------------------- */
 // 鼠标 hover 时颜色
 .el-menu-hover-bg-color {
-	background-color: var(--next-color-menu-hover) !important;
+	background-color: var(--next-bg-menuBarActiveColor) !important;
 }
 // 默认样式修改
 .el-menu {
@@ -108,6 +108,9 @@
 .el-sub-menu:not(.is-opened):hover .el-sub-menu__title {
 	@extend .el-menu-hover-bg-color;
 }
+.el-menu-item:hover {
+	@extend .el-menu-hover-bg-color;
+}
 .el-sub-menu.is-active.is-opened .el-sub-menu__title {
 	background-color: unset !important;
 }
@@ -145,12 +148,12 @@
 		background: var(--next-bg-topBar);
 		.el-menu-item,
 		.el-sub-menu {
-			height: 50px !important;
-			line-height: 50px !important;
+			height: 48px !important;
+			line-height: 48px !important;
 			color: var(--next-bg-topBarColor);
 			.el-sub-menu__title {
-				height: 50px !important;
-				line-height: 50px !important;
+				height: 48px !important;
+				line-height: 48px !important;
 				color: var(--next-bg-topBarColor);
 			}
 			.el-popper.is-pure.is-light {
@@ -177,7 +180,7 @@
 	width: 100% !important;
 	.el-menu-item,
 	.el-sub-menu__title {
-		height: 50px !important;
+		height: 48px !important;
 		color: var(--next-bg-topBarColor);
 	}
 	.el-menu-item:not(.is-active):hover,
@@ -185,6 +188,18 @@
 		color: var(--next-bg-topBarColor);
 	}
 }
+// 菜单收起时，图标不居中问题
+.el-menu--collapse {
+	.el-menu-item .iconfont,
+	.el-sub-menu .iconfont,
+	.el-menu-item .fa,
+	.el-sub-menu .fa {
+		margin-right: 0 !important;
+	}
+	.el-sub-menu__title {
+		padding-right: 0 !important;
+	}
+}
 
 /* Tabs 标签页
 ------------------------------- */
@@ -279,6 +294,10 @@
 .layout-container-view .el-scrollbar__view {
 	height: 100%;
 }
+/*防止分栏布局二级菜单很多时，滚动条消失问题*/
+.layout-columns-warp .layout-aside .el-scrollbar__view {
+	height: unset !important;
+}
 
 /* Pagination 分页
 ------------------------------- */

src/theme/index.scss

@@ -1,3 +1,4 @@
+@import 'element-plus/dist/index.css';
 @import './app.scss';
 @import 'common/transition.scss';
 @import './other.scss';

src/theme/media/layout.scss

@@ -7,6 +7,10 @@
 	.el-message-box {
 		width: 80% !important;
 	}
+	// 锁屏页
+	.layout-lock-screen-date-top {
+		display: none;
+	}
 }
 
 /* 页面宽度小于768px

src/theme/tableTool.scss

@@ -8,18 +8,20 @@
 		height: 40px;
 		align-items: center;
 	}
-	.tool-item {
-		display: flex;
-		box-sizing: border-box;
-		color: var(--el-text-color-primary);
-		height: 35px;
-		align-items: center;
-		padding: var(--el-popover-padding);
-		&:hover {
-			background: var(--el-fill-color-lighter);
-		}
-		i {
-			opacity: 0.7;
+	.tool-sortable {
+		max-height: 303px;
+		.tool-sortable-item {
+			display: flex;
+			box-sizing: border-box;
+			color: var(--el-text-color-primary);
+			align-items: center;
+			padding: 0 12px;
+			&:hover {
+				background: var(--el-fill-color-lighter);
+			}
+			i {
+				opacity: 0.7;
+			}
 		}
 	}
 }

src/types/global.d.ts

@@ -6,6 +6,7 @@ declare module 'js-cookie';
 declare module '@wangeditor/editor-for-vue';
 declare module 'js-table2excel';
 declare module 'qs';
+declare module 'sortablejs';
 
 // 声明一个模块，防止引入文件时报错
 declare module '*.json';

src/types/pinia.d.ts

@@ -3,15 +3,16 @@
  */
 
 // 用户信息
-declare interface UserInfosState<T = any> {
-	userInfos: {
-		authBtnList: string[];
-		photo: string;
-		roles: string[];
-		time: number;
-		userName: string;
-		[key: string]: T;
-	};
+declare interface UserInfos<T = any> {
+	authBtnList: string[];
+	photo: string;
+	roles: string[];
+	time: number;
+	userName: string;
+	[key: string]: T;
+}
+declare interface UserInfosState {
+	userInfos: UserInfos;
 }
 
 // 路由缓存列表
@@ -48,6 +49,7 @@ declare interface ThemeConfigState {
 		isTopBarColorGradual: boolean;
 		menuBar: string;
 		menuBarColor: string;
+		menuBarActiveColor: string;
 		isMenuBarColorGradual: boolean;
 		columnsMenuBar: string;
 		columnsMenuBarColor: string;

src/types/views.d.ts

@@ -242,8 +242,6 @@ declare type XyState = {
 };
 
 declare type WorkflowState<T = any> = {
-	workflowRightRef: HTMLDivElement | null;
-	leftNavRefs: HTMLElement[];
 	leftNavList: T[];
 	dropdownNode: XyState;
 	dropdownLine: XyState;
@@ -327,5 +325,6 @@ declare type TableDemoState = {
 		};
 		search: TableSearchType[];
 		param: EmptyObjectType;
+		printName: string;
 	};
 };

src/utils/build.ts

@@ -0,0 +1,125 @@
+import importToCDN from 'vite-plugin-cdn-import';
+
+/**
+ * 打包相关
+ * 注意 prodUrl：使用的是 jsdelivr 还是 unpkg。它们的 path 可能不一致
+ * 文章链接：https://blog.csdn.net/qq_34450741/article/details/129766676，使用的是 jsdelivr
+ * @description importToCDN https://github.com/mmf-fe/vite-plugin-cdn-import
+ * @description cdn 在线引入的 cdn 地址配置。path：https://www.jsdelivr.com/ || https://unpkg.com/
+ * @description external 打包时，过滤包导入。参考：https://rollupjs.org/configuration-options/#external
+ */
+export const buildConfig = {
+	cdn() {
+		return importToCDN({
+			prodUrl: 'https://unpkg.com/{name}@{version}/{path}',
+			modules: [
+				// autoComplete('vue'),
+				// autoComplete('axios'),
+				{
+					name: 'vue',
+					var: 'Vue',
+					path: 'dist/vue.global.js',
+				},
+				{
+					name: 'vue-demi',
+					var: 'VueDemi',
+					path: 'lib/index.iife.js',
+				},
+				{
+					name: 'vue-router',
+					var: 'VueRouter',
+					path: 'dist/vue-router.global.js',
+				},
+				{
+					name: 'element-plus',
+					var: 'ElementPlus',
+					path: 'dist/index.full.js',
+				},
+				// {
+				// 	name: '@element-plus/icons-vue',
+				// 	var: 'ElementPlusIconsVue',
+				// 	path: 'dist/index.iife.min.js',
+				// },
+				// {
+				// 	name: 'echarts',
+				// 	var: 'echarts',
+				// 	path: 'dist/echarts.min.js',
+				// },
+				// {
+				// 	name: 'echarts-gl',
+				// 	var: 'echarts-gl',
+				// 	path: 'dist/echarts-gl.min.js',
+				// },
+				// {
+				// 	name: 'echarts-wordcloud',
+				// 	var: 'echarts-wordcloud',
+				// 	path: 'dist/echarts-wordcloud.min.js',
+				// },
+				// {
+				// 	name: 'vue-i18n',
+				// 	var: 'VueI18n',
+				// 	path: 'dist/vue-i18n.global.min.js',
+				// },
+				// {
+				// 	name: 'jsplumb',
+				// 	var: 'jsPlumb',
+				// 	path: 'dist/js/jsplumb.min.js',
+				// },
+				// {
+				// 	name: 'cropperjs',
+				// 	var: 'Cropper',
+				// 	path: 'dist/cropper.min.js',
+				// },
+				// {
+				// 	name: 'sortablejs',
+				// 	var: 'Sortable',
+				// 	path: 'Sortable.min.js',
+				// },
+				// {
+				// 	name: 'qrcodejs2-fixes',
+				// 	var: 'QRCode',
+				// 	path: 'qrcode.min.js',
+				// },
+				// {
+				// 	name: 'print-js',
+				// 	var: 'printJS',
+				// 	path: 'dist/print.min.js',
+				// },
+				// {
+				// 	name: '@wangeditor/editor',
+				// 	var: 'wangEditor',
+				// 	path: 'dist/index.min.js',
+				// },
+				// {
+				// 	name: '@wangeditor/editor-for-vue',
+				// 	var: 'WangEditorForVue',
+				// 	path: 'dist/index.min.js',
+				// },
+				// {
+				// 	name: 'vue-grid-layout',
+				// 	var: 'VueGridLayout',
+				// 	path: 'https://cdn.jsdelivr.net/npm/vue-grid-layout@3.0.0-beta1/dist/vue-grid-layout.umd.min.js',
+				// },
+			],
+		});
+	},
+	external: [
+		'vue',
+		// 'axios',
+		'vue-router',
+		'element-plus',
+		// '@element-plus/icons-vue',
+		// 'echarts',
+		// 'echarts-gl',
+		// 'echarts-wordcloud',
+		// 'vue-i18n',
+		// 'jsplumb',
+		// 'cropperjs',
+		// 'sortablejs',
+		// 'qrcodejs2-fixes',
+		// 'print-js',
+		// '@wangeditor/editor',
+		// '@wangeditor/editor-for-vue',
+		// 'vue-grid-layout',
+	],
+};

src/utils/commonFunction.ts

@@ -2,10 +2,8 @@
 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();
 
 	// 百分比格式化
@@ -42,14 +40,14 @@ export default function () {
 	const copyText = (text: string) => {
 		return new Promise((resolve, reject) => {
 			try {
-				//复制
+				// 复制
 				toClipboard(text);
-				//下面可以设置复制成功的提示框等操作
-				ElMessage.success(t('message.layout.copyTextSuccess'));
+				// 下面可以设置复制成功的提示框等操作
+				ElMessage.success('复制成功!');
 				resolve(text);
 			} catch (e) {
-				//复制失败
-				ElMessage.error(t('message.layout.copyTextError'));
+				// 复制失败
+				ElMessage.error('复制失败!');
 				reject(e);
 			}
 		});

src/utils/other.ts

@@ -5,7 +5,6 @@ import router from '/@/router/index';
 import pinia from '/@/stores/index';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
-import { i18n } from '/@/i18n/index';
 import { Local } from '/@/utils/storage';
 import { verifyUrl } from '/@/utils/toolsValidate';
 
@@ -46,7 +45,7 @@ export function useTitle() {
 }
 
 /**
- * 设置 自定义 tagsView 名称、 自定义 tagsView 名称国际化
+ * 设置 自定义 tagsView 名称
  * @param params 路由 query、params 中的 tagsViewName
  * @returns 返回当前 tagsViewName 名称
  */
@@ -54,17 +53,11 @@ export function setTagsViewNameI18n(item: any) {
 	let tagsViewName: string = '';
 	const { query, params, meta } = item;
 	if (query?.tagsViewName || params?.tagsViewName) {
-		if (/\/zh-cn|en|zh-tw\//.test(query?.tagsViewName) || /\/zh-cn|en|zh-tw\//.test(params?.tagsViewName)) {
-			// 国际化
-			const urlTagsParams = (query?.tagsViewName && JSON.parse(query?.tagsViewName)) || (params?.tagsViewName && JSON.parse(params?.tagsViewName));
-			tagsViewName = urlTagsParams[i18n.global.locale.value];
-		} else {
-			// 非国际化
-			tagsViewName = query?.tagsViewName || params?.tagsViewName;
-		}
+		// 非国际化
+		tagsViewName = query?.tagsViewName || params?.tagsViewName;
 	} else {
 		// 非自定义 tagsView 名称
-		tagsViewName = i18n.global.t(meta.title);
+		tagsViewName = meta.title;
 	}
 	return tagsViewName;
 }
@@ -182,7 +175,6 @@ export function handleOpenLink(val: RouteItem) {
  * @method deepClone 对象深克隆
  * @method isMobile 判断是否是移动端
  * @method handleEmpty 判断数组对象中所有属性是否为空，为空则删除当前行对象
- * @method handleOpenLink 打开外部链接
  */
 const other = {
 	elSvg: (app: App) => {

src/utils/request.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios, { AxiosInstance } from 'axios';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { Session } from '/@/utils/storage';
 import qs from 'qs';
@@ -17,7 +17,7 @@ const service: AxiosInstance = axios.create({
 
 // 添加请求拦截器
 service.interceptors.request.use(
-	(config: AxiosRequestConfig) => {
+	(config) => {
 		// 在发送请求之前做些什么 token
 		if (Session.get('token')) {
 			config.headers!['Authorization'] = `${Session.get('token')}`;
@@ -46,7 +46,7 @@ service.interceptors.response.use(
 			}
 			return Promise.reject(service.interceptors.response);
 		} else {
-			return response.data;
+			return res;
 		}
 	},
 	(error) => {

src/utils/storage.ts

@@ -8,18 +8,23 @@ import Cookies from 'js-cookie';
  * @method clear 移除全部永久缓存
  */
 export const Local = {
+	// 查看 v2.4.3版本更新日志
+	setKey(key: string) {
+		// @ts-ignore
+		return `${__NEXT_NAME__}:${key}`;
+	},
 	// 设置永久缓存
-	set(key: string, val: any) {
-		window.localStorage.setItem(key, JSON.stringify(val));
+	set<T>(key: string, val: T) {
+		window.localStorage.setItem(Local.setKey(key), JSON.stringify(val));
 	},
 	// 获取永久缓存
 	get(key: string) {
-		let json = <string>window.localStorage.getItem(key);
+		let json = <string>window.localStorage.getItem(Local.setKey(key));
 		return JSON.parse(json);
 	},
 	// 移除永久缓存
 	remove(key: string) {
-		window.localStorage.removeItem(key);
+		window.localStorage.removeItem(Local.setKey(key));
 	},
 	// 移除全部永久缓存
 	clear() {
@@ -36,20 +41,20 @@ export const Local = {
  */
 export const Session = {
 	// 设置临时缓存
-	set(key: string, val: any) {
+	set<T>(key: string, val: T) {
 		if (key === 'token') return Cookies.set(key, val);
-		window.sessionStorage.setItem(key, JSON.stringify(val));
+		window.sessionStorage.setItem(Local.setKey(key), JSON.stringify(val));
 	},
 	// 获取临时缓存
 	get(key: string) {
 		if (key === 'token') return Cookies.get(key);
-		let json = <string>window.sessionStorage.getItem(key);
+		let json = <string>window.sessionStorage.getItem(Local.setKey(key));
 		return JSON.parse(json);
 	},
 	// 移除临时缓存
 	remove(key: string) {
 		if (key === 'token') return Cookies.remove(key);
-		window.sessionStorage.removeItem(key);
+		window.sessionStorage.removeItem(Local.setKey(key));
 	},
 	// 移除全部临时缓存
 	clear() {

src/views/chart/chart.scss

@@ -1,434 +0,0 @@
-.chart-scrollbar {
-	.chart-warp {
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-		.chart-warp-bottom {
-			flex: 1;
-			overflow: hidden;
-			display: flex;
-			.big-data-down-left,
-			.big-data-down-right {
-				width: 30%;
-				display: flex;
-				flex-direction: column;
-				.flex-warp-item {
-					padding: 0 7.5px 15px 15px;
-					width: 100%;
-					height: 33.33%;
-					.flex-warp-item-box {
-						width: 100%;
-						height: 100%;
-						background: var(--el-color-white);
-						border: 1px solid var(--el-border-color-lighter);
-						border-radius: 4px;
-						display: flex;
-						flex-direction: column;
-						padding: 15px;
-						transition: all ease 0.3s;
-						&:hover {
-							box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-							transition: all ease 0.3s;
-						}
-						.flex-title {
-							margin-bottom: 15px;
-							display: flex;
-							justify-content: space-between;
-							.flex-title-small {
-								font-size: 12px;
-							}
-						}
-						.flex-content {
-							flex: 1;
-							font-size: 12px;
-						}
-						.flex-content-overflow {
-							overflow: hidden;
-						}
-					}
-				}
-			}
-			.big-data-down-left {
-				color: var(--el-text-color-primary);
-				.sky {
-					display: flex;
-					align-items: center;
-					.sky-left {
-						font-size: 30px;
-					}
-					.sky-center {
-						flex: 1;
-						overflow: hidden;
-						padding: 0 10px;
-						font {
-							margin-right: 15px;
-						}
-						.span {
-							background: #22bc76;
-							border-radius: 2px;
-							padding: 0 5px;
-							color: var(--el-color-white);
-						}
-					}
-					.sky-right {
-						span {
-							font-size: 30px;
-						}
-						font {
-							font-size: 20px;
-						}
-					}
-				}
-				.sky-dd {
-					.sky-dl {
-						display: flex;
-						align-items: center;
-						height: 28px;
-						overflow: hidden;
-						div {
-							flex: 1;
-							overflow: hidden;
-							i {
-								font-size: 14px;
-							}
-						}
-						.tip {
-							overflow: hidden;
-							white-space: nowrap;
-							text-overflow: ellipsis;
-						}
-					}
-					.sky-dl-first {
-						color: var(--el-color-primary);
-					}
-				}
-				.d-states {
-					display: flex;
-					.d-states-item {
-						flex: 1;
-						display: flex;
-						align-items: center;
-						overflow: hidden;
-						i {
-							font-size: 20px;
-							height: 33px;
-							width: 33px;
-							line-height: 33px;
-							text-align: center;
-							border-radius: 100%;
-							flex-shrink: 1;
-							color: var(--el-color-white);
-							display: flex;
-							align-items: center;
-							justify-content: center;
-						}
-						.i-bg1 {
-							background: #22bc76;
-						}
-						.i-bg2 {
-							background: #e2356d;
-						}
-						.i-bg3 {
-							background: #43bbef;
-						}
-						.d-states-flex {
-							overflow: hidden;
-							padding: 0 10px 0;
-							.d-states-item-label {
-								color: var(--el-color-primary);
-								overflow: hidden;
-								white-space: nowrap;
-								text-overflow: ellipsis;
-							}
-							.d-states-item-value {
-								font-size: 14px;
-								text-align: center;
-								margin-top: 3px;
-								color: var(--el-color-primary);
-							}
-						}
-					}
-				}
-				.d-btn {
-					margin-top: 5px;
-					.d-btn-item {
-						border: 1px solid var(--el-color-primary);
-						display: flex;
-						width: 100%;
-						border-radius: 35px;
-						align-items: center;
-						padding: 5px;
-						margin-top: 15px;
-						cursor: pointer;
-						transition: all ease 0.3s;
-						color: var(--el-color-primary);
-						.d-btn-item-left {
-							font-size: 20px;
-							border: 1px solid var(--el-color-primary);
-							width: 25px;
-							height: 25px;
-							line-height: 25px;
-							border-radius: 100%;
-							text-align: center;
-							font-size: 14px;
-						}
-						.d-btn-item-center {
-							padding: 0 10px;
-							flex: 1;
-						}
-						.d-btn-item-eight {
-							text-align: right;
-							padding-right: 10px;
-						}
-					}
-				}
-			}
-			.big-data-down-center {
-				width: 40%;
-				display: flex;
-				flex-direction: column;
-				.big-data-down-center-one {
-					height: 66.67%;
-					padding: 0 7.5px 15px;
-					.big-data-down-center-one-content {
-						height: 100%;
-						background: var(--el-color-white);
-						padding: 15px;
-						border: 1px solid var(--el-border-color-lighter);
-						border-radius: 4px;
-						transition: all ease 0.3s;
-						&:hover {
-							box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-							transition: all ease 0.3s;
-						}
-					}
-				}
-				.big-data-down-center-two {
-					padding: 0 7.5px 15px;
-					height: 33.33%;
-					.flex-warp-item-box {
-						width: 100%;
-						height: 100%;
-						background: var(--el-color-white);
-						display: flex;
-						flex-direction: column;
-						padding: 15px;
-						border: 1px solid var(--el-border-color-lighter);
-						border-radius: 4px;
-						transition: all ease 0.3s;
-						&:hover {
-							box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-							transition: all ease 0.3s;
-						}
-						.flex-title {
-							margin-bottom: 15px;
-							color: var(--el-text-color-primary);
-							display: flex;
-							justify-content: space-between;
-							.flex-title-small {
-								font-size: 12px;
-							}
-						}
-						.flex-content {
-							flex: 1;
-							font-size: 12px;
-							display: flex;
-							height: calc(100% - 30px);
-							.flex-content-left {
-								display: flex;
-								flex-wrap: wrap;
-								width: 120px;
-								height: 100%;
-								.monitor-item {
-									width: 50%;
-									display: flex;
-									align-items: center;
-									.monitor-wave {
-										cursor: pointer;
-										width: 40px;
-										height: 40px;
-										position: relative;
-										background-color: var(--el-color-primary);
-										border-radius: 50%;
-										overflow: hidden;
-										text-align: center;
-										&::before,
-										&::after {
-											content: '';
-											position: absolute;
-											left: 50%;
-											width: 40px;
-											height: 40px;
-											background: #f4f4f4;
-											animation: roateOne 10s linear infinite;
-											transform: translateX(-50%);
-											z-index: 1;
-										}
-										&::before {
-											bottom: 10px;
-											border-radius: 60%;
-										}
-										&::after {
-											bottom: 8px;
-											opacity: 0.7;
-											border-radius: 37%;
-										}
-										.monitor-z-index {
-											position: relative;
-											z-index: 2;
-											color: var(--el-color-primary);
-											display: flex;
-											align-items: center;
-											height: 100%;
-											justify-content: center;
-										}
-									}
-									@keyframes roateOne {
-										0% {
-											transform: translate(-50%, 0) rotateZ(0deg);
-										}
-										50% {
-											transform: translate(-50%, -2%) rotateZ(180deg);
-										}
-										100% {
-											transform: translate(-50%, 0%) rotateZ(360deg);
-										}
-									}
-									.monitor-active {
-										background-color: #22bc76;
-										.monitor-z-index {
-											color: #22bc76;
-										}
-									}
-								}
-							}
-							.flex-content-right {
-								flex: 1;
-							}
-						}
-					}
-				}
-			}
-			.big-data-down-right {
-				.flex-warp-item {
-					padding: 0 15px 15px 7.5px;
-					.flex-title {
-						color: var(--el-text-color-primary);
-					}
-					.flex-content {
-						display: flex;
-						flex-direction: column;
-						.task {
-							display: flex;
-							height: 45px;
-							.task-item {
-								flex: 1;
-								color: var(--el-color-white);
-								display: flex;
-								justify-content: center;
-								.task-item-box {
-									position: relative;
-									width: 45px;
-									height: 45px;
-									overflow: hidden;
-									border-radius: 100%;
-									z-index: 0;
-									display: flex;
-									align-items: center;
-									flex-direction: column;
-									justify-content: center;
-									box-shadow: 0 10px 12px 0 rgba(0, 0, 0, 0.3);
-									&::before {
-										content: '';
-										position: absolute;
-										z-index: -2;
-										left: -50%;
-										top: -50%;
-										width: 200%;
-										height: 200%;
-										background-repeat: no-repeat;
-										background-size: 50% 50%, 50% 50%;
-										background-position: 0 0, 100% 0, 100% 100%, 0 100%;
-										background-image: linear-gradient(#19d4ae, #19d4ae), linear-gradient(#5ab1ef, #5ab1ef), linear-gradient(#fa6e86, #fa6e86),
-											linear-gradient(#ffb980, #ffb980);
-										animation: rotate 2s linear infinite;
-									}
-									&::after {
-										content: '';
-										position: absolute;
-										z-index: -1;
-										left: 1px;
-										top: 1px;
-										width: calc(100% - 2px);
-										height: calc(100% - 2px);
-										border-radius: 100%;
-									}
-									.task-item-value {
-										text-align: center;
-										font-size: 14px;
-										font-weight: bold;
-									}
-									.task-item-label {
-										text-align: center;
-									}
-								}
-								.task1 {
-									&::after {
-										background: #5492be;
-									}
-								}
-								.task2 {
-									&::after {
-										background: #43a177;
-									}
-								}
-								.task3 {
-									&::after {
-										background: #a76077;
-									}
-								}
-							}
-							.task-first-item {
-								flex-direction: column;
-								text-align: center;
-								color: var(--el-color-primary);
-								.task-first {
-									font-size: 20px;
-								}
-							}
-						}
-						.progress {
-							color: var(--el-text-color-primary);
-							display: flex;
-							flex-direction: column;
-							flex: 1;
-							justify-content: space-between;
-							margin-top: 15px;
-							.progress-item {
-								height: 33.33%;
-								display: flex;
-								align-items: center;
-								.progress-box {
-									flex: 1;
-									width: 100%;
-									margin-left: 10px;
-									:deep(.el-progress__text) {
-										color: var(--el-text-color-primary);
-										font-size: 12px !important;
-										text-align: right;
-									}
-									:deep(.el-progress-bar__outer) {
-										background-color: rgba(0, 0, 0, 0.1) !important;
-									}
-									:deep(.el-progress-bar) {
-										margin-right: -22px !important;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}

src/views/chart/chart.ts

@@ -1,59 +0,0 @@
-/**
- * sky 天气
- * @returns 返回模拟数据
- */
-export const skyList = [
-	{
-		v1: '时间',
-		v2: '天气',
-		v3: '温度',
-		v5: '降水',
-		v7: '风力',
-		type: 'title',
-	},
-	{
-		v1: '今天',
-		v2: 'ele-Sunny',
-		v3: '20°/26°',
-		v5: '50%',
-		v7: '13m/s',
-	},
-	{
-		v1: '明天',
-		v2: 'ele-Lightning',
-		v3: '20°/26°',
-		v5: '50%',
-		v7: '13m/s',
-	},
-];
-
-/**
- * 当前设置状态
- * @returns 返回模拟数据
- */
-export const dBtnList = [
-	{
-		v2: '阳光玫瑰种植',
-		v3: '126天',
-		v4: '设备在线',
-	},
-];
-
-/**
- * 当前设备监测
- * @returns 返回模拟数据
- */
-export const chartData4List = [
-	{
-		label: '温度',
-	},
-	{
-		label: '光照',
-	},
-	{
-		label: '湿度',
-	},
-	{
-		label: '风力',
-	},
-];

src/views/chart/head.vue

@@ -1,101 +0,0 @@
-<template>
-	<div class="big-data-up mb15">
-		<div class="up-left">
-			<i class="el-icon-time mr5"></i>
-			<span>{{ state.time.txt }}</span>
-		</div>
-		<div class="up-center">
-			<span>智慧农业系统平台</span>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts" name="chartHead">
-import { reactive, onBeforeMount, onUnmounted } from 'vue';
-import { formatDate } from '/@/utils/formatTime';
-
-// 定义变量内容
-const state = reactive({
-	time: {
-		txt: '',
-		fun: 0,
-	},
-});
-
-// 初始化时间
-const initTime = () => {
-	state.time.txt = formatDate(new Date(), 'YYYY-mm-dd HH:MM:SS WWW QQQQ');
-	state.time.fun = window.setInterval(() => {
-		state.time.txt = formatDate(new Date(), 'YYYY-mm-dd HH:MM:SS WWW QQQQ');
-	}, 1000);
-};
-// 页面加载前
-onBeforeMount(() => {
-	initTime();
-});
-// 页面卸载时
-onUnmounted(() => {
-	window.clearInterval(state.time.fun);
-});
-</script>
-
-<style scoped lang="scss">
-.big-data-up {
-	height: 55px;
-	width: 100%;
-	display: flex;
-	align-items: center;
-	padding: 0 15px;
-	color: var(--el-color-primary);
-	overflow: hidden;
-	position: relative;
-	.up-left {
-		position: absolute;
-	}
-	.up-center {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		font-size: 18px;
-		letter-spacing: 5px;
-		background-image: -webkit-linear-gradient(
-			left,
-			var(--el-color-primary),
-			var(--el-color-primary-light-3) 25%,
-			var(--el-color-primary) 50%,
-			var(--el-color-primary-light-3) 75%,
-			var(--el-color-primary)
-		);
-		-webkit-text-fill-color: transparent;
-		-webkit-background-clip: text;
-		background-clip: text;
-		background-size: 200% 100%;
-		-webkit-animation: masked-animation-data-v-b02d8052 4s linear infinite;
-		animation: masked-animation-data-v-b02d8052 4s linear infinite;
-		-webkit-box-reflect: below -2px -webkit-gradient(linear, left top, left bottom, from(transparent), to(hsla(0, 0%, 100%, 0.1)));
-		position: relative;
-		@keyframes masked-animation {
-			0% {
-				background-position: 0 0;
-			}
-			100% {
-				background-position: -100% 0;
-			}
-		}
-		position: relative;
-		&::after {
-			content: '';
-			width: 250px;
-			position: absolute;
-			bottom: -15px;
-			left: 50%;
-			transform: translateX(-50%);
-			border: 1px transparent solid;
-			border-image: linear-gradient(to right, var(--el-color-primary-light-9), var(--el-color-primary)) 1 10;
-		}
-		span {
-			cursor: pointer;
-		}
-	}
-}
-</style>

src/views/chart/index.vue

@@ -1,477 +0,0 @@
-<template>
-	<div class="chart-scrollbar layout-padding">
-		<div class="chart-warp layout-padding-auto layout-padding-view">
-			<div class="chart-warp-top">
-				<ChartHead />
-			</div>
-			<div class="chart-warp-bottom">
-				<!-- 左边 -->
-				<div class="big-data-down-left">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<div class="flex-title">天气预报</div>
-							<div class="flex-content">
-								<div class="sky">
-									<SvgIcon name="ele-Sunny" class="sky-left" />
-									<div class="sky-center">
-										<div class="mb2">
-											<span>多云转晴</span>
-											<span>东南风</span>
-											<span class="span ml5">良</span>
-										</div>
-									</div>
-									<div class="sky-right">
-										<span>25</span>
-										<span>°C</span>
-									</div>
-								</div>
-								<div class="sky-dd">
-									<div class="sky-dl" v-for="(v, k) in state.skyList" :key="k" :class="{ 'sky-dl-first': k === 1 }">
-										<div>{{ v.v1 }}</div>
-										<div v-if="v.type === 'title'">{{ v.v2 }}</div>
-										<div v-else>
-											<SvgIcon :name="v.v2" />
-										</div>
-										<div>{{ v.v3 }}</div>
-										<div class="tip">{{ v.v5 }}</div>
-										<div>{{ v.v7 }}</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<div class="flex-title">当前设备状态</div>
-							<div class="flex-content flex-content-overflow">
-								<div class="d-states">
-									<div class="d-states-item">
-										<SvgIcon name="ele-Odometer" class="i-bg1" />
-										<div class="d-states-flex">
-											<div class="d-states-item-label">园区设备数</div>
-											<div class="d-states-item-value">99</div>
-										</div>
-									</div>
-									<div class="d-states-item">
-										<SvgIcon name="ele-FirstAidKit" class="i-bg2" />
-										<div class="d-states-flex">
-											<div class="d-states-item-label">预警设备数</div>
-											<div class="d-states-item-value">10</div>
-										</div>
-									</div>
-									<div class="d-states-item">
-										<SvgIcon name="ele-VideoPlay" class="i-bg3" />
-										<div class="d-states-flex">
-											<div class="d-states-item-label">运行设备数</div>
-											<div class="d-states-item-value">20</div>
-										</div>
-									</div>
-								</div>
-								<div class="d-btn">
-									<div class="d-btn-item" v-for="(v, k) in state.dBtnList" :key="k">
-										<i class="d-btn-item-left el-icon-money"></i>
-										<div class="d-btn-item-center">
-											<div>{{ v.v2 }}|{{ v.v3 }}</div>
-										</div>
-										<div class="d-btn-item-eight">{{ v.v4 }}</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<div class="flex-title">近30天预警总数</div>
-							<div class="flex-content">
-								<div style="height: 100%" ref="chartsWarningRef"></div>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				<!-- 中间 -->
-				<div class="big-data-down-center">
-					<div class="big-data-down-center-one">
-						<div class="big-data-down-center-one-content">
-							<div style="height: 100%" ref="chartsCenterOneRef"></div>
-						</div>
-					</div>
-					<div class="big-data-down-center-two">
-						<div class="flex-warp-item-box">
-							<div class="flex-title">
-								<span>当前设备监测</span>
-								<span class="flex-title-small">单位：次</span>
-							</div>
-							<div class="flex-content">
-								<div class="flex-content-left">
-									<div class="monitor-item" v-for="(v, k) in state.chartData4List" :key="k">
-										<div class="monitor-wave">
-											<div class="monitor-z-index">
-												<div class="monitor-item-label">{{ v.label }}</div>
-											</div>
-										</div>
-									</div>
-								</div>
-								<div class="flex-content-right">
-									<div style="height: 100%" ref="chartsMonitorRef"></div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				<!-- 右边 -->
-				<div class="big-data-down-right">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<div class="flex-title">
-								<span>近7天产品追溯扫码统计</span>
-								<span class="flex-title-small">单位：次</span>
-							</div>
-							<div class="flex-content">
-								<div style="height: 100%" ref="chartsSevenDaysRef"></div>
-							</div>
-						</div>
-					</div>
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<div class="flex-title">当前任务统计</div>
-							<div class="flex-content">
-								<div class="task">
-									<div class="task-item task-first-item">
-										<div class="task-item-value task-first">25</div>
-										<div class="task-item-label">待办任务</div>
-									</div>
-									<div class="task-item">
-										<div class="task-item-box task1">
-											<div class="task-item-value">12</div>
-											<div class="task-item-label">施肥</div>
-										</div>
-									</div>
-									<div class="task-item">
-										<div class="task-item-box task2">
-											<div class="task-item-value">3</div>
-											<div class="task-item-label">施药</div>
-										</div>
-									</div>
-									<div class="task-item">
-										<div class="task-item-box task3">
-											<div class="task-item-value">5</div>
-											<div class="task-item-label">农事</div>
-										</div>
-									</div>
-								</div>
-								<div class="progress">
-									<div class="progress-item">
-										<span>施肥率</span>
-										<div class="progress-box">
-											<el-progress :percentage="70" color="#43bdf0"></el-progress>
-										</div>
-									</div>
-									<div class="progress-item">
-										<span>施药率</span>
-										<div class="progress-box">
-											<el-progress :percentage="36" color="#43bdf0"></el-progress>
-										</div>
-									</div>
-									<div class="progress-item">
-										<span>农事率</span>
-										<div class="progress-box">
-											<el-progress :percentage="91" color="#43bdf0"></el-progress>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<div class="flex-title">
-								<span>近7天投入品记录</span>
-								<span class="flex-title-small">单位：件</span>
-							</div>
-							<div class="flex-content">
-								<div style="height: 100%" ref="chartsInvestmentRef"></div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts" name="chartIndex">
-import { defineAsyncComponent, reactive, onMounted, watch, nextTick, onActivated, ref } from 'vue';
-import * as echarts from 'echarts';
-import 'echarts-wordcloud';
-import { storeToRefs } from 'pinia';
-import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
-import { skyList, dBtnList, chartData4List } from '/@/views/chart/chart';
-
-// 引入组件
-const ChartHead = defineAsyncComponent(() => import('/@/views/chart/head.vue'));
-
-// 定义变量内容
-const chartsCenterOneRef = ref();
-const chartsSevenDaysRef = ref();
-const chartsWarningRef = ref();
-const chartsMonitorRef = ref();
-const chartsInvestmentRef = ref();
-const storesTagsViewRoutes = useTagsViewRoutes();
-const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
-const state = reactive({
-	skyList,
-	dBtnList,
-	chartData4List,
-	myCharts: [] as EmptyArrayType,
-});
-
-// 初始化中间图表1
-const initChartsCenterOne = () => {
-	const myChart = echarts.init(chartsCenterOneRef.value);
-	const option = {
-		grid: {
-			top: 15,
-			right: 15,
-			bottom: 20,
-			left: 30,
-		},
-		tooltip: {},
-		series: [
-			{
-				type: 'wordCloud',
-				sizeRange: [12, 40],
-				rotationRange: [0, 0],
-				rotationStep: 45,
-				gridSize: Math.random() * 20 + 5,
-				shape: 'circle',
-				width: '100%',
-				height: '100%',
-				textStyle: {
-					fontFamily: 'sans-serif',
-					fontWeight: 'bold',
-					color: function () {
-						return `rgb(${[Math.round(Math.random() * 160), Math.round(Math.random() * 160), Math.round(Math.random() * 160)].join(',')})`;
-					},
-				},
-				data: [
-					{ name: 'vue-next-admin', value: 520 },
-					{ name: 'lyt', value: 520 },
-					{ name: 'next-admin', value: 500 },
-					{ name: '更名', value: 420 },
-					{ name: '智慧农业', value: 520 },
-					{ name: '男神', value: 2.64 },
-					{ name: '好身材', value: 4.03 },
-					{ name: '校草', value: 24.95 },
-					{ name: '酷', value: 4.04 },
-					{ name: '时尚', value: 5.27 },
-					{ name: '阳光活力', value: 5.8 },
-					{ name: '初恋', value: 3.09 },
-					{ name: '英俊潇洒', value: 24.71 },
-					{ name: '霸气', value: 6.33 },
-					{ name: '腼腆', value: 2.55 },
-					{ name: '蠢萌', value: 3.88 },
-					{ name: '青春', value: 8.04 },
-					{ name: '网红', value: 5.87 },
-					{ name: '萌', value: 6.97 },
-					{ name: '认真', value: 2.53 },
-					{ name: '古典', value: 2.49 },
-					{ name: '温柔', value: 3.91 },
-					{ name: '有个性', value: 3.25 },
-					{ name: '可爱', value: 9.93 },
-					{ name: '幽默诙谐', value: 3.65 },
-				],
-			},
-		],
-	};
-	myChart.setOption(option);
-	state.myCharts.push(myChart);
-};
-// 初始化近7天产品追溯扫码统计
-const initChartsSevenDays = () => {
-	const myChart = echarts.init(chartsSevenDaysRef.value);
-	const option = {
-		grid: {
-			top: 15,
-			right: 15,
-			bottom: 20,
-			left: 30,
-		},
-		tooltip: {
-			trigger: 'axis',
-		},
-		xAxis: {
-			type: 'category',
-			boundaryGap: false,
-			data: ['1天', '2天', '3天', '4天', '5天', '6天', '7天'],
-		},
-		yAxis: {
-			type: 'value',
-		},
-		series: [
-			{
-				name: '邮件营销',
-				type: 'line',
-				stack: '总量',
-				data: [12, 32, 11, 34, 90, 23, 21],
-			},
-			{
-				name: '联盟广告',
-				type: 'line',
-				stack: '总量',
-				data: [22, 82, 91, 24, 90, 30, 30],
-			},
-			{
-				name: '视频广告',
-				type: 'line',
-				stack: '总量',
-				data: [50, 32, 18, 14, 90, 30, 50],
-			},
-		],
-	};
-	myChart.setOption(option);
-	state.myCharts.push(myChart);
-};
-// 初始化近30天预警总数
-const initChartsWarning = () => {
-	const myChart = echarts.init(chartsWarningRef.value);
-	const option = {
-		grid: {
-			top: 50,
-			right: 20,
-			bottom: 30,
-			left: 30,
-		},
-		tooltip: {
-			trigger: 'item',
-		},
-		series: [
-			{
-				name: '面积模式',
-				type: 'pie',
-				radius: [20, 50],
-				center: ['50%', '50%'],
-				roseType: 'area',
-				itemStyle: {
-					borderRadius: 8,
-				},
-				data: [
-					{ value: 40, name: '监测设备预警' },
-					{ value: 38, name: '天气预警' },
-					{ value: 32, name: '任务预警' },
-					{ value: 30, name: '病虫害预警' },
-				],
-			},
-		],
-	};
-	myChart.setOption(option);
-	state.myCharts.push(myChart);
-};
-// 初始化当前设备监测
-const initChartsMonitor = () => {
-	const myChart = echarts.init(chartsMonitorRef.value);
-	const option = {
-		grid: {
-			top: 15,
-			right: 15,
-			bottom: 20,
-			left: 30,
-		},
-		tooltip: {
-			trigger: 'axis',
-		},
-		xAxis: {
-			type: 'category',
-			boundaryGap: false,
-			data: ['02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00'],
-		},
-		yAxis: {
-			type: 'value',
-		},
-		series: [
-			{
-				itemStyle: {
-					color: '#289df5',
-					borderColor: '#289df5',
-					areaStyle: {
-						type: 'default',
-						opacity: 0.1,
-					},
-				},
-				data: [20, 32, 31, 34, 12, 13, 20],
-				type: 'line',
-				areaStyle: {},
-			},
-		],
-	};
-	myChart.setOption(option);
-	state.myCharts.push(myChart);
-};
-// 初始化近7天投入品记录
-const initChartsInvestment = () => {
-	const myChart = echarts.init(chartsInvestmentRef.value);
-	const option = {
-		grid: {
-			top: 15,
-			right: 15,
-			bottom: 20,
-			left: 30,
-		},
-		tooltip: {
-			trigger: 'axis',
-		},
-		xAxis: {
-			type: 'category',
-			data: ['1天', '2天', '3天', '4天', '5天', '6天', '7天'],
-		},
-		yAxis: {
-			type: 'value',
-		},
-		series: [
-			{
-				data: [10, 20, 15, 80, 70, 11, 30],
-				type: 'bar',
-			},
-		],
-	};
-	myChart.setOption(option);
-	state.myCharts.push(myChart);
-};
-// 批量设置 echarts resize
-const initEchartsResizeFun = () => {
-	nextTick(() => {
-		for (let i = 0; i < state.myCharts.length; i++) {
-			state.myCharts[i].resize();
-		}
-	});
-};
-// 批量设置 echarts resize
-const initEchartsResize = () => {
-	window.addEventListener('resize', initEchartsResizeFun);
-};
-// 页面加载时
-onMounted(() => {
-	initChartsCenterOne();
-	initChartsSevenDays();
-	initChartsWarning();
-	initChartsMonitor();
-	initChartsInvestment();
-	initEchartsResize();
-});
-// 由于页面缓存原因，keep-alive
-onActivated(() => {
-	initEchartsResizeFun();
-});
-// 监听 pinia 中的 tagsview 开启全屏变化，重新 resize 图表，防止不出现/大小不变等
-watch(
-	() => isTagsViewCurrenFull.value,
-	() => {
-		initEchartsResizeFun();
-	}
-);
-</script>
-
-<style scoped lang="scss">
-@import './chart.scss';
-</style>

src/views/error/401.vue

@@ -5,17 +5,15 @@
 				<div class="left">
 					<div class="left-item">
 						<div class="left-item-animation left-item-num">401</div>
-						<div class="left-item-animation left-item-title">{{ $t('message.noAccess.accessTitle') }}</div>
-						<div class="left-item-animation left-item-msg">{{ $t('message.noAccess.accessMsg') }}</div>
+						<div class="left-item-animation left-item-title">您未被授权，没有操作权限~</div>
+						<div class="left-item-animation left-item-msg">联系方式：加QQ群探讨 665452019</div>
 						<div class="left-item-animation left-item-btn">
-							<el-button type="primary" size="default" round @click="onSetAuth">{{ $t('message.noAccess.accessBtn') }}</el-button>
+							<el-button type="primary" size="default" round @click="onSetAuth">重新授权</el-button>
 						</div>
 					</div>
 				</div>
 				<div class="right">
-					<img
-						src="https://img-blog.csdnimg.cn/3333f265772a4fa89287993500ecbf96.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_16,color_FFFFFF,t_70,g_se,x_16"
-					/>
+					<img src="https://i.hd-r.cn/2cf0d2e192660eec23eb9d0655753e7d.png" />
 				</div>
 			</div>
 		</div>

src/views/error/404.vue

@@ -5,17 +5,15 @@
 				<div class="left">
 					<div class="left-item">
 						<div class="left-item-animation left-item-num">404</div>
-						<div class="left-item-animation left-item-title">{{ $t('message.notFound.foundTitle') }}</div>
-						<div class="left-item-animation left-item-msg">{{ $t('message.notFound.foundMsg') }}</div>
+						<div class="left-item-animation left-item-title">地址输入错误，请重新输入地址~</div>
+						<div class="left-item-animation left-item-msg">您可以先检查网址，然后重新输入或给我们反馈问题。</div>
 						<div class="left-item-animation left-item-btn">
-							<el-button type="primary" size="default" round @click="onGoHome">{{ $t('message.notFound.foundBtn') }}</el-button>
+							<el-button type="primary" size="default" round @click="onGoHome">返回首页</el-button>
 						</div>
 					</div>
 				</div>
 				<div class="right">
-					<img
-						src="https://img-blog.csdnimg.cn/9eb1d85a417f4ed1ba7107f149ce3da1.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_16,color_FFFFFF,t_70,g_se,x_16"
-					/>
+					<img src="https://i.hd-r.cn/1a0d90a6c1e8b0184c7299dda713effd.png" />
 				</div>
 			</div>
 		</div>

src/views/fun/clipboard/index.vue

@@ -1,30 +0,0 @@
-<template>
-	<div class="layout-pd">
-		<el-card shadow="hover" header="复制剪切演示">
-			<el-alert
-				title="感谢优秀的 `vue-clipboard3`，项目地址：https://github.com/JamieCurnow/vue-clipboard3`"
-				type="success"
-				:closable="false"
-				class="mb15"
-			></el-alert>
-			<el-input placeholder="请输入内容" v-model="state.copyVal">
-				<template #append>
-					<el-button @click="copyText(state.copyVal)">复制链接</el-button>
-				</template>
-			</el-input>
-			<el-input placeholder="先点击上方 `复制链接` 按钮，然后 `Ctrl + V` 进行粘贴！ " v-model="state.shearVal" class="mt15"> </el-input>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="funClipboard">
-import { reactive } from 'vue';
-import commonFunction from '/@/utils/commonFunction';
-
-// 定义变量内容
-const { copyText } = commonFunction();
-const state = reactive({
-	copyVal: 'https://gitee.com/lyt-top/vue-next-admin',
-	shearVal: '',
-});
-</script>

src/views/fun/countup/index.vue

@@ -1,152 +0,0 @@
-<template>
-	<div class="layout-pd">
-		<el-card shadow="hover" header="数字滚动演示">
-			<el-alert
-				title="感谢优秀的 `countup.js`，项目地址：https://github.com/inorganik/countUp.js"
-				type="success"
-				:closable="false"
-				class="mb15"
-			></el-alert>
-			<el-row :gutter="20">
-				<el-col :sm="6" class="mb15" v-for="(v, k) in state.topCardItemList" :key="k">
-					<div class="countup-card-item countup-card-item-box" :style="{ background: `var(${v.color})` }">
-						<div class="countup-card-item-flex" ref="topCardItemRefs">
-							<div class="countup-card-item-title pb3">{{ v.title }}</div>
-							<div class="countup-card-item-title-num pb6"></div>
-							<div class="countup-card-item-tip pb3">{{ v.tip }}</div>
-							<div class="countup-card-item-tip-num"></div>
-						</div>
-						<i :class="v.icon" :style="{ color: v.iconColor }"></i>
-					</div>
-				</el-col>
-			</el-row>
-			<div class="flex-warp">
-				<div class="flex-warp-item">
-					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default" @click="refreshCurrent">
-							<el-icon>
-								<ele-RefreshRight />
-							</el-icon>
-							重置/刷新数值
-						</el-button>
-					</div>
-				</div>
-			</div>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="funCountup">
-import { reactive, onMounted, nextTick, ref } from 'vue';
-import { CountUp } from 'countup.js';
-
-// 定义变量内容
-const topCardItemRefs = ref<RefType[]>([]);
-const state = reactive({
-	topCardItemList: [
-		{
-			title: '今日访问人数',
-			titleNum: '123',
-			tip: '在场人数',
-			tipNum: '911',
-			color: '--el-color-primary',
-			iconColor: '#ffcb47',
-			icon: 'iconfont icon-jinridaiban',
-		},
-		{
-			title: '实验室总数',
-			titleNum: '123',
-			tip: '使用中',
-			tipNum: '611',
-			color: '--el-color-success',
-			iconColor: '#70cf41',
-			icon: 'iconfont icon-AIshiyanshi',
-		},
-		{
-			title: '申请人数（月）',
-			titleNum: '123',
-			tip: '通过人数',
-			tipNum: '911',
-			color: '--el-color-warning',
-			iconColor: '#dfae64',
-			icon: 'iconfont icon-shenqingkaiban',
-		},
-		{
-			title: '销售情况',
-			titleNum: '123',
-			tip: '销售数',
-			tipNum: '911',
-			color: '--el-color-danger',
-			iconColor: '#e56565',
-			icon: 'iconfont icon-ditu',
-		},
-	],
-});
-
-// 初始化数字滚动
-const initNumCountUp = () => {
-	nextTick(() => {
-		topCardItemRefs.value.forEach((v: HTMLDivElement) => {
-			new CountUp(v.querySelector('.countup-card-item-title-num') as HTMLDivElement, Math.random() * 10000).start();
-			new CountUp(v.querySelector('.countup-card-item-tip-num') as HTMLDivElement, Math.random() * 1000).start();
-		});
-	});
-};
-// 重置/刷新数值
-const refreshCurrent = () => {
-	initNumCountUp();
-};
-// 页面加载时
-onMounted(() => {
-	initNumCountUp();
-});
-</script>
-
-<style scoped lang="scss">
-.countup-card-item {
-	width: 100%;
-	height: 103px;
-	background: var(--el-text-color-secondary);
-	border-radius: 4px;
-	transition: all ease 0.3s;
-	&:hover {
-		box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-		transition: all ease 0.3s;
-	}
-}
-.countup-card-item-box {
-	display: flex;
-	align-items: center;
-	position: relative;
-	overflow: hidden;
-	&:hover {
-		i {
-			right: 0px !important;
-			bottom: 0px !important;
-			transition: all ease 0.3s;
-		}
-	}
-	i {
-		position: absolute;
-		right: -10px;
-		bottom: -10px;
-		font-size: 70px;
-		transform: rotate(-30deg);
-		transition: all ease 0.3s;
-	}
-	.countup-card-item-flex {
-		padding: 0 20px;
-		color: var(--el-color-white);
-		.countup-card-item-title,
-		.countup-card-item-tip {
-			font-size: 13px;
-		}
-		.countup-card-item-title-num {
-			font-size: 18px;
-		}
-		.countup-card-item-tip-num {
-			font-size: 13px;
-		}
-	}
-}
-</style>

src/views/fun/cropper/index.vue

@@ -1,56 +0,0 @@
-<template>
-	<div class="croppers-container layout-pd">
-		<el-card shadow="hover" header="cropper 图片裁剪">
-			<el-alert
-				title="感谢优秀的 `cropperjs`，项目地址：https://github.com/fengyuanchen/cropperjs"
-				type="success"
-				:closable="false"
-				class="mb15"
-			></el-alert>
-			<div class="cropper-img-warp">
-				<div class="mb15 mt15">
-					<img class="cropper-img" :src="state.cropperImg" />
-				</div>
-				<el-button type="primary" size="default" @click="onCropperDialogOpen">
-					<el-icon>
-						<ele-Crop />
-					</el-icon>
-					更换头像
-				</el-button>
-			</div>
-		</el-card>
-		<CropperDialog ref="cropperDialogRef" />
-	</div>
-</template>
-
-<script setup lang="ts" name="funCropper">
-import { defineAsyncComponent, ref, reactive } from 'vue';
-
-// 引入组件
-const CropperDialog = defineAsyncComponent(() => import('/@/components/cropper/index.vue'));
-
-// 定义变量内容
-const cropperDialogRef = ref();
-const state = reactive({
-	cropperImg: 'https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500',
-});
-
-// 打开裁剪弹窗
-const onCropperDialogOpen = () => {
-	cropperDialogRef.value.openDialog(state.cropperImg);
-};
-</script>
-
-<style scoped lang="scss">
-.croppers-container {
-	.cropper-img-warp {
-		text-align: center;
-		.cropper-img {
-			margin: auto;
-			width: 150px;
-			height: 150px;
-			border-radius: 100%;
-		}
-	}
-}
-</style>

src/views/fun/echartsMap/index.vue

@@ -1,118 +0,0 @@
-<template>
-	<div class="layout-padding">
-		<div class="layout-padding-auto layout-padding-view">
-			<div ref="echartsMapRef" style="height: 100%"></div>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts" name="funEchartsMap">
-import { reactive, onMounted, ref } from 'vue';
-import * as echarts from 'echarts';
-import 'echarts/extension/bmap/bmap';
-import { echartsMapList, echartsMapData } from './mock';
-
-// 定义变量内容
-const echartsMapRef = ref<RefType>('');
-const state = reactive({
-	echartsMap: '' as unknown,
-	echartsMapList,
-	echartsMapData,
-});
-
-// echartsMap 将坐标信息和对应物理量的值合在一起
-const convertData = (data: EmptyObjectType[]) => {
-	let res = [];
-	for (let i = 0; i < data.length; i++) {
-		let geoCoord = state.echartsMapData[data[i].name];
-		if (geoCoord) {
-			res.push({
-				name: data[i].name,
-				value: geoCoord.concat(data[i].value),
-			});
-		}
-	}
-	return res;
-};
-// 初始化 echartsMap
-const initEchartsMap = () => {
-	const myChart = echarts.init(echartsMapRef.value);
-	const option = {
-		tooltip: {
-			trigger: 'item',
-		},
-		color: ['#9a60b4', '#ea7ccc'],
-		bmap: {
-			center: [104.114129, 37.550339],
-			zoom: 5,
-			roam: true,
-			mapStyle: {},
-		},
-		series: [
-			{
-				name: 'pm2.5',
-				type: 'scatter',
-				coordinateSystem: 'bmap',
-				data: convertData(state.echartsMapList),
-				symbolSize: function (val: any) {
-					return val[2] / 10;
-				},
-				encode: {
-					value: 2,
-				},
-				label: {
-					formatter: '{b}',
-					position: 'right',
-					show: false,
-				},
-				emphasis: {
-					label: {
-						show: true,
-					},
-				},
-			},
-			{
-				name: 'Top 5',
-				type: 'effectScatter',
-				coordinateSystem: 'bmap',
-				data: convertData(
-					state.echartsMapList
-						.sort(function (a: any, b: any) {
-							return b.value - a.value;
-						})
-						.slice(0, 6)
-				),
-				symbolSize: function (val: any) {
-					return val[2] / 10;
-				},
-				encode: {
-					value: 2,
-				},
-				showEffectOn: 'render',
-				rippleEffect: {
-					brushType: 'stroke',
-				},
-				hoverAnimation: true,
-				label: {
-					formatter: '{b}',
-					position: 'right',
-					show: true,
-				},
-				itemStyle: {
-					shadowBlur: 10,
-					shadowColor: '#333',
-				},
-				zlevel: 1,
-			},
-		],
-	};
-	myChart.setOption(option);
-	window.addEventListener('resize', () => {
-		myChart.resize();
-	});
-};
-// 页面加载时
-onMounted(() => {
-	initEchartsMap();
-});
-</script>

src/views/fun/echartsMap/mock.ts

@@ -1,387 +0,0 @@
-// 地图模拟数据
-export const echartsMapList = [
-	{ name: '海门', value: 9 },
-	{ name: '鄂尔多斯', value: 12 },
-	{ name: '招远', value: 12 },
-	{ name: '舟山', value: 12 },
-	{ name: '齐齐哈尔', value: 14 },
-	{ name: '盐城', value: 15 },
-	{ name: '赤峰', value: 16 },
-	{ name: '青岛', value: 18 },
-	{ name: '乳山', value: 18 },
-	{ name: '金昌', value: 19 },
-	{ name: '泉州', value: 21 },
-	{ name: '莱西', value: 21 },
-	{ name: '日照', value: 21 },
-	{ name: '胶南', value: 22 },
-	{ name: '南通', value: 23 },
-	{ name: '拉萨', value: 24 },
-	{ name: '云浮', value: 24 },
-	{ name: '梅州', value: 25 },
-	{ name: '文登', value: 25 },
-	{ name: '上海', value: 25 },
-	{ name: '攀枝花', value: 25 },
-	{ name: '威海', value: 25 },
-	{ name: '承德', value: 25 },
-	{ name: '厦门', value: 26 },
-	{ name: '汕尾', value: 26 },
-	{ name: '潮州', value: 26 },
-	{ name: '丹东', value: 27 },
-	{ name: '太仓', value: 27 },
-	{ name: '曲靖', value: 27 },
-	{ name: '烟台', value: 28 },
-	{ name: '福州', value: 29 },
-	{ name: '瓦房店', value: 30 },
-	{ name: '即墨', value: 30 },
-	{ name: '抚顺', value: 31 },
-	{ name: '玉溪', value: 31 },
-	{ name: '张家口', value: 31 },
-	{ name: '阳泉', value: 31 },
-	{ name: '莱州', value: 32 },
-	{ name: '湖州', value: 32 },
-	{ name: '汕头', value: 32 },
-	{ name: '昆山', value: 33 },
-	{ name: '宁波', value: 33 },
-	{ name: '湛江', value: 33 },
-	{ name: '揭阳', value: 34 },
-	{ name: '荣成', value: 34 },
-	{ name: '连云港', value: 35 },
-	{ name: '葫芦岛', value: 35 },
-	{ name: '常熟', value: 36 },
-	{ name: '东莞', value: 36 },
-	{ name: '河源', value: 36 },
-	{ name: '淮安', value: 36 },
-	{ name: '泰州', value: 36 },
-	{ name: '南宁', value: 37 },
-	{ name: '营口', value: 37 },
-	{ name: '惠州', value: 37 },
-	{ name: '江阴', value: 37 },
-	{ name: '蓬莱', value: 37 },
-	{ name: '韶关', value: 38 },
-	{ name: '嘉峪关', value: 38 },
-	{ name: '广州', value: 38 },
-	{ name: '延安', value: 38 },
-	{ name: '太原', value: 39 },
-	{ name: '清远', value: 39 },
-	{ name: '中山', value: 39 },
-	{ name: '昆明', value: 39 },
-	{ name: '寿光', value: 40 },
-	{ name: '盘锦', value: 40 },
-	{ name: '长治', value: 41 },
-	{ name: '深圳', value: 360 },
-	{ name: '珠海', value: 42 },
-	{ name: '宿迁', value: 43 },
-	{ name: '咸阳', value: 43 },
-	{ name: '铜川', value: 44 },
-	{ name: '平度', value: 44 },
-	{ name: '佛山', value: 44 },
-	{ name: '海口', value: 44 },
-	{ name: '江门', value: 45 },
-	{ name: '章丘', value: 45 },
-	{ name: '肇庆', value: 46 },
-	{ name: '大连', value: 47 },
-	{ name: '临汾', value: 47 },
-	{ name: '吴江', value: 47 },
-	{ name: '石嘴山', value: 49 },
-	{ name: '沈阳', value: 50 },
-	{ name: '苏州', value: 50 },
-	{ name: '茂名', value: 50 },
-	{ name: '嘉兴', value: 51 },
-	{ name: '长春', value: 51 },
-	{ name: '胶州', value: 52 },
-	{ name: '银川', value: 52 },
-	{ name: '张家港', value: 52 },
-	{ name: '三门峡', value: 53 },
-	{ name: '锦州', value: 54 },
-	{ name: '南昌', value: 54 },
-	{ name: '柳州', value: 54 },
-	{ name: '三亚', value: 54 },
-	{ name: '自贡', value: 56 },
-	{ name: '吉林', value: 56 },
-	{ name: '阳江', value: 57 },
-	{ name: '泸州', value: 57 },
-	{ name: '西宁', value: 57 },
-	{ name: '宜宾', value: 58 },
-	{ name: '呼和浩特', value: 58 },
-	{ name: '成都', value: 58 },
-	{ name: '大同', value: 58 },
-	{ name: '镇江', value: 59 },
-	{ name: '桂林', value: 59 },
-	{ name: '张家界', value: 59 },
-	{ name: '宜兴', value: 59 },
-	{ name: '北海', value: 60 },
-	{ name: '西安', value: 61 },
-	{ name: '金坛', value: 62 },
-	{ name: '东营', value: 62 },
-	{ name: '牡丹江', value: 63 },
-	{ name: '遵义', value: 63 },
-	{ name: '绍兴', value: 63 },
-	{ name: '扬州', value: 64 },
-	{ name: '常州', value: 64 },
-	{ name: '潍坊', value: 65 },
-	{ name: '重庆', value: 66 },
-	{ name: '台州', value: 67 },
-	{ name: '南京', value: 67 },
-	{ name: '滨州', value: 70 },
-	{ name: '贵阳', value: 71 },
-	{ name: '无锡', value: 71 },
-	{ name: '本溪', value: 71 },
-	{ name: '克拉玛依', value: 72 },
-	{ name: '渭南', value: 72 },
-	{ name: '马鞍山', value: 72 },
-	{ name: '宝鸡', value: 72 },
-	{ name: '焦作', value: 75 },
-	{ name: '句容', value: 75 },
-	{ name: '北京', value: 79 },
-	{ name: '徐州', value: 79 },
-	{ name: '衡水', value: 80 },
-	{ name: '包头', value: 80 },
-	{ name: '绵阳', value: 80 },
-	{ name: '乌鲁木齐', value: 84 },
-	{ name: '枣庄', value: 84 },
-	{ name: '杭州', value: 84 },
-	{ name: '淄博', value: 85 },
-	{ name: '鞍山', value: 86 },
-	{ name: '溧阳', value: 86 },
-	{ name: '库尔勒', value: 86 },
-	{ name: '安阳', value: 90 },
-	{ name: '开封', value: 90 },
-	{ name: '济南', value: 92 },
-	{ name: '德阳', value: 93 },
-	{ name: '温州', value: 95 },
-	{ name: '九江', value: 96 },
-	{ name: '邯郸', value: 98 },
-	{ name: '临安', value: 99 },
-	{ name: '兰州', value: 99 },
-	{ name: '沧州', value: 100 },
-	{ name: '临沂', value: 103 },
-	{ name: '南充', value: 104 },
-	{ name: '天津', value: 105 },
-	{ name: '富阳', value: 106 },
-	{ name: '泰安', value: 112 },
-	{ name: '诸暨', value: 112 },
-	{ name: '郑州', value: 113 },
-	{ name: '哈尔滨', value: 114 },
-	{ name: '聊城', value: 116 },
-	{ name: '芜湖', value: 117 },
-	{ name: '唐山', value: 119 },
-	{ name: '平顶山', value: 119 },
-	{ name: '邢台', value: 119 },
-	{ name: '德州', value: 120 },
-	{ name: '济宁', value: 120 },
-	{ name: '荆州', value: 127 },
-	{ name: '宜昌', value: 130 },
-	{ name: '义乌', value: 132 },
-	{ name: '丽水', value: 133 },
-	{ name: '洛阳', value: 134 },
-	{ name: '秦皇岛', value: 136 },
-	{ name: '株洲', value: 143 },
-	{ name: '石家庄', value: 147 },
-	{ name: '莱芜', value: 148 },
-	{ name: '常德', value: 152 },
-	{ name: '保定', value: 153 },
-	{ name: '湘潭', value: 154 },
-	{ name: '金华', value: 157 },
-	{ name: '岳阳', value: 169 },
-	{ name: '长沙', value: 175 },
-	{ name: '衢州', value: 177 },
-	{ name: '廊坊', value: 93 },
-	{ name: '菏泽', value: 194 },
-	{ name: '合肥', value: 229 },
-	{ name: '武汉', value: 273 },
-	{ name: '大庆', value: 279 },
-];
-
-// 地图经纬度数据
-export const echartsMapData = {
-	海门: [121.15, 31.89],
-	鄂尔多斯: [109.781327, 39.608266],
-	招远: [120.38, 37.35],
-	舟山: [122.207216, 29.985295],
-	齐齐哈尔: [123.97, 47.33],
-	盐城: [120.13, 33.38],
-	赤峰: [118.87, 42.28],
-	青岛: [120.33, 36.07],
-	乳山: [121.52, 36.89],
-	金昌: [102.188043, 38.520089],
-	泉州: [118.58, 24.93],
-	莱西: [120.53, 36.86],
-	日照: [119.46, 35.42],
-	胶南: [119.97, 35.88],
-	南通: [121.05, 32.08],
-	拉萨: [91.11, 29.97],
-	云浮: [112.02, 22.93],
-	梅州: [116.1, 24.55],
-	文登: [122.05, 37.2],
-	上海: [121.48, 31.22],
-	攀枝花: [101.718637, 26.582347],
-	威海: [122.1, 37.5],
-	承德: [117.93, 40.97],
-	厦门: [118.1, 24.46],
-	汕尾: [115.375279, 22.786211],
-	潮州: [116.63, 23.68],
-	丹东: [124.37, 40.13],
-	太仓: [121.1, 31.45],
-	曲靖: [103.79, 25.51],
-	烟台: [121.39, 37.52],
-	福州: [119.3, 26.08],
-	瓦房店: [121.979603, 39.627114],
-	即墨: [120.45, 36.38],
-	抚顺: [123.97, 41.97],
-	玉溪: [102.52, 24.35],
-	张家口: [114.87, 40.82],
-	阳泉: [113.57, 37.85],
-	莱州: [119.942327, 37.177017],
-	湖州: [120.1, 30.86],
-	汕头: [116.69, 23.39],
-	昆山: [120.95, 31.39],
-	宁波: [121.56, 29.86],
-	湛江: [110.359377, 21.270708],
-	揭阳: [116.35, 23.55],
-	荣成: [122.41, 37.16],
-	连云港: [119.16, 34.59],
-	葫芦岛: [120.836932, 40.711052],
-	常熟: [120.74, 31.64],
-	东莞: [113.75, 23.04],
-	河源: [114.68, 23.73],
-	淮安: [119.15, 33.5],
-	泰州: [119.9, 32.49],
-	南宁: [108.33, 22.84],
-	营口: [122.18, 40.65],
-	惠州: [114.4, 23.09],
-	江阴: [120.26, 31.91],
-	蓬莱: [120.75, 37.8],
-	韶关: [113.62, 24.84],
-	嘉峪关: [98.289152, 39.77313],
-	广州: [113.23, 23.16],
-	延安: [109.47, 36.6],
-	太原: [112.53, 37.87],
-	清远: [113.01, 23.7],
-	中山: [113.38, 22.52],
-	昆明: [102.73, 25.04],
-	寿光: [118.73, 36.86],
-	盘锦: [122.070714, 41.119997],
-	长治: [113.08, 36.18],
-	深圳: [114.07, 22.62],
-	珠海: [113.52, 22.3],
-	宿迁: [118.3, 33.96],
-	咸阳: [108.72, 34.36],
-	铜川: [109.11, 35.09],
-	平度: [119.97, 36.77],
-	佛山: [113.11, 23.05],
-	海口: [110.35, 20.02],
-	江门: [113.06, 22.61],
-	章丘: [117.53, 36.72],
-	肇庆: [112.44, 23.05],
-	大连: [121.62, 38.92],
-	临汾: [111.5, 36.08],
-	吴江: [120.63, 31.16],
-	石嘴山: [106.39, 39.04],
-	沈阳: [123.38, 41.8],
-	苏州: [120.62, 31.32],
-	茂名: [110.88, 21.68],
-	嘉兴: [120.76, 30.77],
-	长春: [125.35, 43.88],
-	胶州: [120.03336, 36.264622],
-	银川: [106.27, 38.47],
-	张家港: [120.555821, 31.875428],
-	三门峡: [111.19, 34.76],
-	锦州: [121.15, 41.13],
-	南昌: [115.89, 28.68],
-	柳州: [109.4, 24.33],
-	三亚: [109.511909, 18.252847],
-	自贡: [104.778442, 29.33903],
-	吉林: [126.57, 43.87],
-	阳江: [111.95, 21.85],
-	泸州: [105.39, 28.91],
-	西宁: [101.74, 36.56],
-	宜宾: [104.56, 29.77],
-	呼和浩特: [111.65, 40.82],
-	成都: [104.06, 30.67],
-	大同: [113.3, 40.12],
-	镇江: [119.44, 32.2],
-	桂林: [110.28, 25.29],
-	张家界: [110.479191, 29.117096],
-	宜兴: [119.82, 31.36],
-	北海: [109.12, 21.49],
-	西安: [108.95, 34.27],
-	金坛: [119.56, 31.74],
-	东营: [118.49, 37.46],
-	牡丹江: [129.58, 44.6],
-	遵义: [106.9, 27.7],
-	绍兴: [120.58, 30.01],
-	扬州: [119.42, 32.39],
-	常州: [119.95, 31.79],
-	潍坊: [119.1, 36.62],
-	重庆: [106.54, 29.59],
-	台州: [121.420757, 28.656386],
-	南京: [118.78, 32.04],
-	滨州: [118.03, 37.36],
-	贵阳: [106.71, 26.57],
-	无锡: [120.29, 31.59],
-	本溪: [123.73, 41.3],
-	克拉玛依: [84.77, 45.59],
-	渭南: [109.5, 34.52],
-	马鞍山: [118.48, 31.56],
-	宝鸡: [107.15, 34.38],
-	焦作: [113.21, 35.24],
-	句容: [119.16, 31.95],
-	北京: [116.46, 39.92],
-	徐州: [117.2, 34.26],
-	衡水: [115.72, 37.72],
-	包头: [110, 40.58],
-	绵阳: [104.73, 31.48],
-	乌鲁木齐: [87.68, 43.77],
-	枣庄: [117.57, 34.86],
-	杭州: [120.19, 30.26],
-	淄博: [118.05, 36.78],
-	鞍山: [122.85, 41.12],
-	溧阳: [119.48, 31.43],
-	库尔勒: [86.06, 41.68],
-	安阳: [114.35, 36.1],
-	开封: [114.35, 34.79],
-	济南: [117, 36.65],
-	德阳: [104.37, 31.13],
-	温州: [120.65, 28.01],
-	九江: [115.97, 29.71],
-	邯郸: [114.47, 36.6],
-	临安: [119.72, 30.23],
-	兰州: [103.73, 36.03],
-	沧州: [116.83, 38.33],
-	临沂: [118.35, 35.05],
-	南充: [106.110698, 30.837793],
-	天津: [117.2, 39.13],
-	富阳: [119.95, 30.07],
-	泰安: [117.13, 36.18],
-	诸暨: [120.23, 29.71],
-	郑州: [113.65, 34.76],
-	哈尔滨: [126.63, 45.75],
-	聊城: [115.97, 36.45],
-	芜湖: [118.38, 31.33],
-	唐山: [118.02, 39.63],
-	平顶山: [113.29, 33.75],
-	邢台: [114.48, 37.05],
-	德州: [116.29, 37.45],
-	济宁: [116.59, 35.38],
-	荆州: [112.239741, 30.335165],
-	宜昌: [111.3, 30.7],
-	义乌: [120.06, 29.32],
-	丽水: [119.92, 28.45],
-	洛阳: [112.44, 34.7],
-	秦皇岛: [119.57, 39.95],
-	株洲: [113.16, 27.83],
-	石家庄: [114.48, 38.03],
-	莱芜: [117.67, 36.19],
-	常德: [111.69, 29.05],
-	保定: [115.48, 38.85],
-	湘潭: [112.91, 27.87],
-	金华: [119.64, 29.12],
-	岳阳: [113.09, 29.37],
-	长沙: [113, 28.21],
-	衢州: [118.88, 28.97],
-	廊坊: [116.7, 39.53],
-	菏泽: [115.480656, 35.23375],
-	合肥: [117.27, 31.86],
-	武汉: [114.31, 30.52],
-	大庆: [125.03, 46.58],
-};

src/views/fun/gridLayout/index.vue

@@ -1,55 +0,0 @@
-<template>
-	<div class="grid-layout-container layout-pd">
-		<el-card shadow="hover" header="vue-grid-layout 拖拽布局演示">
-			<el-alert
-				title="感谢优秀的 `vue-grid-layout`，项目地址：https://github.com/jbaysolutions/vue-grid-layout"
-				type="success"
-				:closable="false"
-				class="mb15"
-			></el-alert>
-			<grid-layout
-				v-model:layout="state.layouts"
-				:col-num="12"
-				:row-height="30"
-				:is-draggable="true"
-				:is-resizable="true"
-				:is-mirrored="false"
-				:vertical-compact="true"
-				:margin="[10, 10]"
-				:use-css-transforms="true"
-			>
-				<grid-item v-for="item in state.layouts" :x="item.x" :y="item.y" :w="item.w" :h="item.h" :i="item.i" :key="item.i">
-					<div class="w100 h100 flex">
-						<span class="flex-margin font14">{{ item.i }}</span>
-					</div>
-				</grid-item>
-			</grid-layout>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="funGridLayout">
-import { reactive } from 'vue';
-
-// 定义变量内容
-const state = reactive({
-	layouts: [
-		{ x: 0, y: 0, w: 2, h: 2, i: '0' },
-		{ x: 2, y: 0, w: 2, h: 4, i: '1' },
-		{ x: 4, y: 0, w: 2, h: 5, i: '2' },
-		{ x: 6, y: 0, w: 2, h: 3, i: '3' },
-		{ x: 8, y: 0, w: 2, h: 3, i: '4' },
-		{ x: 10, y: 0, w: 2, h: 3, i: '5' },
-		{ x: 0, y: 5, w: 2, h: 5, i: '6' },
-	],
-});
-</script>
-
-<style scoped lang="scss">
-.grid-layout-container {
-	.vue-grid-item {
-		background: var(--el-color-primary);
-		color: var(--el-color-white);
-	}
-}
-</style>

src/views/fun/printJs/index.vue

@@ -1,35 +0,0 @@
-<template>
-	<div ref="printRef" class="layout-pd">
-		<el-card shadow="hover" header="打印演示">
-			<el-alert
-				title="感谢优秀的 `print-js`，项目地址：https://github.com/crabbly/Print.js。请在打印弹窗 `更多设置` 中开启 `背景图形。`"
-				type="success"
-				:closable="false"
-				class="mb15"
-			></el-alert>
-			<el-button @click="onPrintJs" size="default" type="primary">
-				<SvgIcon name="iconfont icon-dayin" />
-				点击打印演示
-			</el-button>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="funPrintJs">
-import { ref } from 'vue';
-import printJs from 'print-js';
-
-// 定义变量内容
-const printRef = ref();
-
-// 打印点击
-const onPrintJs = () => {
-	printJs({
-		printable: printRef.value,
-		type: 'html',
-		css: ['//at.alicdn.com/t/c/font_2298093_rnp72ifj3ba.css', '//unpkg.com/element-plus/dist/index.css'],
-		scanStyles: false,
-		style: `@media print{.mb15{margin-bottom:15px;}.el-button--small i.iconfont{font-size: 12px !important;margin-right: 5px;}}`,
-	});
-};
-</script>

src/views/fun/qrcode/index.vue

@@ -1,69 +0,0 @@
-<template>
-	<div class="qrcode-container layout-pd">
-		<el-card shadow="hover" header="qrcodejs2 二维码生成">
-			<el-alert
-				title="感谢优秀的 `qrcodejs2`，项目地址：https://github.com/davidshimjs/qrcodejs"
-				type="success"
-				:closable="false"
-				class="mb15"
-			></el-alert>
-			<div class="qrcode-img-warp">
-				<div class="mb30 mt30 qrcode-img">
-					<div class="qrcode" ref="qrcodeRef"></div>
-				</div>
-				<el-button type="primary" size="default" @click="onInitQrcode">
-					<el-icon>
-						<ele-Refresh />
-					</el-icon>
-					重新生成
-				</el-button>
-			</div>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="funQrcode">
-import { onMounted, ref } from 'vue';
-import QRCode from 'qrcodejs2-fixes';
-
-// 定义变量内容
-const qrcodeRef = ref();
-
-// 初始化生成二维码
-const initQrcode = () => {
-	new QRCode(qrcodeRef.value, {
-		text: `https://lyt-top.gitee.io/vue-next-admin-preview/#/login?t=${new Date().getTime()}`,
-		width: 125,
-		height: 125,
-		colorDark: '#000000',
-		colorLight: '#ffffff',
-	});
-};
-// 重新生成
-const onInitQrcode = () => {
-	qrcodeRef.value.innerHTML = '';
-	initQrcode();
-};
-// 页面加载时
-onMounted(() => {
-	initQrcode();
-});
-</script>
-
-<style scoped lang="scss">
-.qrcode-container {
-	.qrcode-img-warp {
-		text-align: center;
-		.qrcode-img {
-			display: flex;
-			width: 100%;
-			height: 125px;
-			.qrcode {
-				margin: auto;
-				width: 125px;
-				height: 125px;
-			}
-		}
-	}
-}
-</style>

src/views/fun/splitpanes/index.vue

@@ -1,44 +0,0 @@
-<template>
-	<div class="splitpanes-container layout-pd">
-		<el-card shadow="hover" header="splitpanes 窗格拆分器">
-			<el-alert
-				title="感谢优秀的 `splitpanes`，项目地址：https://github.com/antoniandre/splitpanes"
-				type="success"
-				:closable="false"
-				class="mb15"
-			></el-alert>
-			<splitpanes class="default-theme" @resize="paneSize = $event[0].size" style="height: 500px">
-				<pane :size="32"> 1 </pane>
-				<pane :size="36">
-					<splitpanes class="default-theme" :horizontal="true">
-						<pane :size="100"> 2 </pane>
-						<pane :size="100"> 3 </pane>
-					</splitpanes>
-				</pane>
-				<pane :size="32"> 4 </pane>
-			</splitpanes>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="funSplitpanes">
-import { ref } from 'vue';
-import { Splitpanes, Pane } from 'splitpanes';
-import 'splitpanes/dist/splitpanes.css';
-
-// 定义变量内容
-const paneSize = ref(50);
-</script>
-
-<style scoped lang="scss">
-.splitpanes__pane {
-	justify-content: center;
-	align-items: center;
-	display: flex;
-	position: relative;
-	font-size: 70px;
-	color: var(--el-color-primary-light-5);
-	border: 1px solid var(--el-border-color-lighter);
-	background-color: var(--el-color-primary) !important;
-}
-</style>

src/views/fun/tagsView/index.vue

@@ -1,107 +0,0 @@
-<template>
-	<div class="fun-tagsview layout-pd">
-		<NoticeBar
-			text="已删除非当前页 tagsView 演示，后续有时间可以再加回来！，tagsview 支持多标签（参数不同）、单标签共用（参数不同）"
-			background="#ecf5ff"
-			color="#409eff"
-		/>
-		<el-card shadow="hover" header="tagsView 当前页演示" class="mt15">
-			<div class="flex-warp">
-				<div class="flex-warp-item">
-					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default" @click="refreshCurrentTagsView">
-							<el-icon>
-								<ele-RefreshRight />
-							</el-icon>
-							刷新当前页
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item">
-					<div class="flex-warp-item-box">
-						<el-button type="info" size="default" @click="closeCurrentTagsView">
-							<el-icon>
-								<ele-Close />
-							</el-icon>
-							关闭当前页
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item">
-					<div class="flex-warp-item-box">
-						<el-button type="warning" size="default" @click="closeOtherTagsView">
-							<el-icon>
-								<ele-CircleClose />
-							</el-icon>
-							关闭其它
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item">
-					<div class="flex-warp-item-box">
-						<el-button type="danger" size="default" @click="closeAllTagsView">
-							<el-icon>
-								<ele-FolderDelete />
-							</el-icon>
-							全部关闭
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item">
-					<div class="flex-warp-item-box">
-						<el-button type="success" size="default" @click="openCurrenFullscreen">
-							<el-icon>
-								<ele-FullScreen />
-							</el-icon>
-							当前页全屏
-						</el-button>
-					</div>
-				</div>
-			</div>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="funTagsView">
-import { defineAsyncComponent } from 'vue';
-import { useRoute } from 'vue-router';
-import mittBus from '/@/utils/mitt';
-
-// 引入组件
-const NoticeBar = defineAsyncComponent(() => import('/@/components/noticeBar/index.vue'));
-
-// 定义变量内容
-const route = useRoute();
-
-// 0 刷新当前，1 关闭当前，2 关闭其它，3 关闭全部 4 当前页全屏
-// 1、刷新当前 tagsView
-const refreshCurrentTagsView = () => {
-	mittBus.emit('onCurrentContextmenuClick', Object.assign({}, { contextMenuClickId: 0, ...route }));
-};
-// 2、关闭当前 tagsView
-const closeCurrentTagsView = () => {
-	mittBus.emit('onCurrentContextmenuClick', Object.assign({}, { contextMenuClickId: 1, ...route }));
-};
-// 3、关闭其它 tagsView
-const closeOtherTagsView = () => {
-	mittBus.emit('onCurrentContextmenuClick', Object.assign({}, { contextMenuClickId: 2, ...route }));
-};
-// 4、关闭全部 tagsView
-const closeAllTagsView = () => {
-	mittBus.emit('onCurrentContextmenuClick', Object.assign({}, { contextMenuClickId: 3, ...route }));
-};
-// 5、开启当前页面全屏
-const openCurrenFullscreen = () => {
-	mittBus.emit('onCurrentContextmenuClick', Object.assign({}, { contextMenuClickId: 4, ...route }));
-};
-</script>
-
-<style scoped lang="scss">
-.fun-tagsview {
-	.fun-tagsview-from-item {
-		:deep(.el-form-item__content) {
-			margin-left: 0 !important;
-		}
-	}
-}
-</style>

src/views/fun/wangEditor/index.vue

@@ -1,30 +0,0 @@
-<template>
-	<div class="editor-container layout-pd">
-		<el-card shadow="hover" header="wangeditor富文本编辑器">
-			<el-alert
-				title="感谢优秀的 `wangeditor`，项目地址：https://github.com/wangeditor-team/wangEditor"
-				type="success"
-				:closable="false"
-				class="mb15"
-			></el-alert>
-			<Editor v-model:get-html="state.editor.htmlVal" v-model:get-text="state.editor.textVal" :disable="state.editor.disable" />
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="funWangEditor">
-import { defineAsyncComponent, reactive } from 'vue';
-
-// 引入组件
-const Editor = defineAsyncComponent(() => import('/@/components/editor/index.vue'));
-
-// 定义变量内容
-const state = reactive({
-	editor: {
-		htmlVal:
-			'<p><span style="color: rgb(51, 51, 51); background-color: rgb(255, 255, 255); font-size: 14px;">胡歌，1982年9月20日出生于上海市徐汇区，中国内地影视男演员、流行乐歌手，</span><a href="https://baike.baidu.com/item/%E6%B0%91%E7%9B%9F/1971441?fromModule=lemma_inlink" target="_blank" style="text-indent: 28px; text-align: start;">民盟</a><span style="color: rgb(51, 51, 51); background-color: rgb(255, 255, 255); font-size: 14px;">盟员</span><span style="color: rgb(51, 102, 204); background-color: rgb(255, 255, 255); font-size: 12px;"><sup> [1]</sup></span><a href="" target="" style="text-indent: 28px; text-align: start;"> </a><span style="color: rgb(51, 51, 51); background-color: rgb(255, 255, 255); font-size: 14px;"> ，毕业于</span><a href="https://baike.baidu.com/item/%E4%B8%8A%E6%B5%B7%E6%88%8F%E5%89%A7%E5%AD%A6%E9%99%A2/1736818?fromModule=lemma_inlink" target="_blank" style="text-indent: 28px; text-align: start;">上海戏剧学院</a><span style="color: rgb(51, 51, 51); background-color: rgb(255, 255, 255); font-size: 14px;">表演系。</span></p>',
-		textVal: '胡歌，1982年9月20日出生于上海市徐汇区，中国内地影视男演员、流行乐歌手，民盟盟员 [1]  ，毕业于上海戏剧学院表演系。',
-		disable: false,
-	},
-});
-</script>

src/views/limits/backEnd/page/index.vue

@@ -1,30 +0,0 @@
-<template>
-	<div class="layout-pd">
-		<el-alert
-			title="温馨提示：1、此页面无法模拟后端控制路由，因为 `gitee` 上所请求的 `json` 菜单数据线上会出现跨域的情况（json地址：
-      https://gitee.com/lyt-top/vue-next-admin-images/raw/master/menu/adminMenu.json）。2、本地接口请求文件位置：`/src/api/menu/index.ts`。
-      3、拉取代码后本地请求查看后端控制页面路由效果：`/src/store/modules/themeConfig.ts`中开启（isRequestRoutes 为 true，则开启后端控制路由）。
-      4、此页面效果只作为演示使用，若出现不可逆转的bug，请尝试 `F5` 刷新页面。5、默认启用的是 `前端控制路由`。"
-			type="warning"
-			:closable="false"
-		></el-alert>
-		<el-button type="primary" size="default" class="mt15" @click="onGoToFrontEndPage">
-			<el-icon>
-				<ele-Position />
-			</el-icon>
-			立即前往前端控制路由
-		</el-button>
-	</div>
-</template>
-
-<script setup lang="ts" name="limitsBackEndEndPage">
-import { useRouter } from 'vue-router';
-
-// 定义变量内容
-const router = useRouter();
-
-// 立即前往前端控制路由
-const onGoToFrontEndPage = () => {
-	router.push('/limits/frontEnd/page');
-};
-</script>

src/views/limits/frontEnd/btn/index.vue

@@ -1,379 +0,0 @@
-<template>
-	<div class="layout-pd">
-		<LimitsFrontEndPage style="padding: 0 !important" />
-		<!-- 演示1：组件方式 -->
-		<el-card shadow="hover" header="演示1：组件方式" class="mt15">
-			<el-row class="mb10" style="color: #808080">单个权限验证（:value="xxx"）：</el-row>
-			<div class="flex-warp">
-				<Auth :value="'btn.add'">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="primary" size="default">
-								<el-icon>
-									<ele-DocumentAdd />
-								</el-icon>
-								新增
-							</el-button>
-						</div>
-					</div>
-				</Auth>
-				<Auth :value="'btn.edit'">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="info" size="default">
-								<el-icon>
-									<ele-Edit />
-								</el-icon>
-								编辑
-							</el-button>
-						</div>
-					</div>
-				</Auth>
-				<Auth :value="'btn.del'">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="danger" size="default">
-								<el-icon>
-									<ele-Delete />
-								</el-icon>
-								删除
-							</el-button>
-						</div>
-					</div>
-				</Auth>
-				<Auth :value="'btn.link'">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="success" size="default">
-								<el-icon>
-									<ele-Link />
-								</el-icon>
-								跳转
-							</el-button>
-						</div>
-					</div>
-				</Auth>
-			</div>
-
-			<el-row class="mb10 mt10" style="color: #808080">多个权限验证，满足一个则显示（:value="[xxx,xxx]"）：</el-row>
-			<div class="flex-warp">
-				<Auths :value="['btn.addsss', 'btn.edit', 'btn.delsss', 'btn.linksss']">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="primary" size="default">
-								<el-icon>
-									<ele-DocumentAdd />
-								</el-icon>
-								新增
-							</el-button>
-						</div>
-					</div>
-				</Auths>
-				<Auths :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="info" size="default">
-								<el-icon>
-									<ele-Edit />
-								</el-icon>
-								编辑
-							</el-button>
-						</div>
-					</div>
-				</Auths>
-				<Auths :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="danger" size="default">
-								<el-icon>
-									<ele-Delete />
-								</el-icon>
-								删除
-							</el-button>
-						</div>
-					</div>
-				</Auths>
-				<Auths :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="success" size="default">
-								<el-icon>
-									<ele-Link />
-								</el-icon>
-								跳转
-							</el-button>
-						</div>
-					</div>
-				</Auths>
-			</div>
-
-			<el-row class="mb10 mt10" style="color: #808080">多个权限验证，全部满足则显示（:value="[xxx,xxx]"）：</el-row>
-			<div class="flex-warp">
-				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="primary" size="default">
-								<el-icon>
-									<ele-DocumentAdd />
-								</el-icon>
-								新增
-							</el-button>
-						</div>
-					</div>
-				</AuthAll>
-				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="info" size="default">
-								<el-icon>
-									<ele-Edit />
-								</el-icon>
-								编辑
-							</el-button>
-						</div>
-					</div>
-				</AuthAll>
-				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="danger" size="default">
-								<el-icon>
-									<ele-Delete />
-								</el-icon>
-								删除
-							</el-button>
-						</div>
-					</div>
-				</AuthAll>
-				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item">
-						<div class="flex-warp-item-box">
-							<el-button type="success" size="default">
-								<el-icon>
-									<ele-Link />
-								</el-icon>
-								跳转
-							</el-button>
-						</div>
-					</div>
-				</AuthAll>
-			</div>
-		</el-card>
-
-		<!-- 演示2：指令方式 -->
-		<el-card shadow="hover" header="演示2：指令方式（页面初始化时执行）" class="mt15">
-			<el-row class="mb10" style="color: #808080">单个权限验证（v-auth="xxx"）：</el-row>
-			<div class="flex-warp">
-				<div class="flex-warp-item" v-auth="'btn.add'">
-					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default">
-							<el-icon>
-								<ele-DocumentAdd />
-							</el-icon>
-							新增
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item" v-auth="'btn.edit'">
-					<div class="flex-warp-item-box">
-						<el-button type="info" size="default">
-							<el-icon>
-								<ele-Edit />
-							</el-icon>
-							编辑
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item" v-auth="'btn.del'">
-					<div class="flex-warp-item-box">
-						<el-button type="danger" size="default">
-							<el-icon>
-								<ele-Delete />
-							</el-icon>
-							删除
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item" v-auth="'btn.link'">
-					<div class="flex-warp-item-box">
-						<el-button type="success" size="default">
-							<el-icon>
-								<ele-Link />
-							</el-icon>
-							跳转
-						</el-button>
-					</div>
-				</div>
-			</div>
-
-			<el-row class="mb10 mt10" style="color: #808080">多个权限验证，满足一个则显示（v-auths="[xxx,xxx]"）：</el-row>
-			<div class="flex-warp">
-				<div class="flex-warp-item" v-auths="['btn.addsss', 'btn.edit', 'btn.delsss', 'btn.linksss']">
-					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default">
-							<el-icon>
-								<ele-DocumentAdd />
-							</el-icon>
-							新增
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item" v-auths="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item-box">
-						<el-button type="info" size="default">
-							<el-icon>
-								<ele-Edit />
-							</el-icon>
-							编辑
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item" v-auths="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item-box">
-						<el-button type="danger" size="default">
-							<el-icon>
-								<ele-Delete />
-							</el-icon>
-							删除
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item" v-auths="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item-box">
-						<el-button type="success" size="default">
-							<el-icon>
-								<ele-Link />
-							</el-icon>
-							跳转
-						</el-button>
-					</div>
-				</div>
-			</div>
-
-			<el-row class="mb10 mt10" style="color: #808080">多个权限验证，全部满足则显示（v-auth-all="[xxx,xxx]"）：</el-row>
-			<div class="flex-warp">
-				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default">
-							<el-icon>
-								<ele-DocumentAdd />
-							</el-icon>
-							新增
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item-box">
-						<el-button type="info" size="default">
-							<el-icon>
-								<ele-Edit />
-							</el-icon>
-							编辑
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item-box">
-						<el-button type="danger" size="default">
-							<el-icon>
-								<ele-Delete />
-							</el-icon>
-							删除
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
-					<div class="flex-warp-item-box">
-						<el-button type="success" size="default">
-							<el-icon>
-								<ele-Link />
-							</el-icon>
-							跳转
-						</el-button>
-					</div>
-				</div>
-			</div>
-		</el-card>
-
-		<!-- 演示3：函数方式 -->
-		<el-card shadow="hover" header="演示3：函数方式（点击按钮查看有无权限，用于判断）" class="mt15">
-			<el-row class="mb10" style="color: #808080">auth('xxx')、auths(['xxx','xxx'])、authAll(['xxx','xxx'])：</el-row>
-			<div class="flex-warp">
-				<div class="flex-warp-item">
-					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default" @click="onAuthClick">
-							<el-icon>
-								<ele-DocumentAdd />
-							</el-icon>
-							新增
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item">
-					<div class="flex-warp-item-box">
-						<el-button type="info" size="default" @click="onAuthsClick">
-							<el-icon>
-								<ele-Edit />
-							</el-icon>
-							编辑
-						</el-button>
-					</div>
-				</div>
-				<div class="flex-warp-item">
-					<div class="flex-warp-item-box">
-						<el-button type="danger" size="default" @click="onAuthAllClick">
-							<el-icon>
-								<ele-Delete />
-							</el-icon>
-							删除
-						</el-button>
-					</div>
-				</div>
-			</div>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="limitsFrontEndBtn">
-import { defineAsyncComponent } from 'vue';
-import { ElMessage } from 'element-plus';
-import { auth, auths, authAll } from '/@/utils/authFunction';
-
-// 引入组件
-const LimitsFrontEndPage = defineAsyncComponent(() => import('/@/views/limits/frontEnd/page/index.vue'));
-const Auth = defineAsyncComponent(() => import('/@/components/auth/auth.vue'));
-const Auths = defineAsyncComponent(() => import('/@/components/auth/auths.vue'));
-const AuthAll = defineAsyncComponent(() => import('/@/components/auth/authAll.vue'));
-
-// 单个权限验证
-const onAuthClick = () => {
-	if (!auth('btn.add')) ElMessage.error('抱歉，您没有权限！');
-	else ElMessage.success('恭喜，您有权限！');
-};
-// 多个权限验证，满足一个则为 true
-const onAuthsClick = () => {
-	if (!auths(['btn.add', 'btn.edit', 'btn.del', 'btn.link'])) ElMessage.error('抱歉，您没有权限！');
-	else ElMessage.success('恭喜，您有权限！');
-};
-// 多个权限验证，全部满足则为 true
-const onAuthAllClick = () => {
-	if (!authAll(['btn.add', 'btn.edit', 'btn.del', 'btn.link'])) ElMessage.error('抱歉，您没有权限！');
-	else ElMessage.success('恭喜，您有权限！');
-};
-</script>
-
-<style scoped lang="scss">
-.flex-warp {
-	display: flex;
-	flex-wrap: wrap;
-	align-content: flex-start;
-	margin: 0 -5px;
-	.flex-warp-item {
-		padding: 5px;
-		.flex-warp-item-box {
-			width: 100%;
-			height: 100%;
-		}
-	}
-}
-</style>

src/views/limits/frontEnd/page/index.vue

@@ -1,55 +0,0 @@
-<template>
-	<div class="layout-pd">
-		<el-alert
-			title="温馨提示：此权限页面代码及效果只作为演示使用，若出现不可逆转的bug，请尝试 `F5` 刷新页面。若实际项目中非要实现此用户权限切换功能，
-      请在切换方法 `onRadioChange` 最后面添加刷新代码 `window.location.reload()`。 请注意：按钮权限页面中的演示2（指令模式）、演示3（函数模式）
-      切换用户时无法动态演示，想要动态演示，请按 `F5` 或者添加 `window.location.reload()`。"
-			type="warning"
-			:closable="false"
-		></el-alert>
-		<el-alert
-			:title="`当前用户页面权限：[${userInfos.roles}]，当前用户按钮权限：[${userInfos.authBtnList}]`"
-			type="success"
-			:closable="false"
-			class="mt15"
-		></el-alert>
-		<el-card shadow="hover" header="切换用户演示，前端控制不同用户显示不同页面、按钮权限" class="mt15">
-			<el-radio-group v-model="userAuth" size="default" @change="onRadioChange">
-				<el-radio-button label="admin"></el-radio-button>
-				<el-radio-button label="common"></el-radio-button>
-			</el-radio-group>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="limitsFrontEndPage">
-import { onMounted, ref } from 'vue';
-import Cookies from 'js-cookie';
-import { storeToRefs } from 'pinia';
-import { useUserInfo } from '/@/stores/userInfo';
-import { frontEndsResetRoute, setAddRoute, setFilterMenuAndCacheTagsViewRoutes } from '/@/router/frontEnd';
-
-// 定义变量内容
-const storesUserInfo = useUserInfo();
-const { userInfos } = storeToRefs(storesUserInfo);
-const userAuth = ref('');
-
-// 初始化用户权限
-const initUserAuth = () => {
-	userAuth.value = userInfos.value.roles[0];
-};
-// 用户权限改变时
-const onRadioChange = async () => {
-	// 模拟数据
-	frontEndsResetRoute();
-	Cookies.set('userName', userAuth.value);
-	// 模拟切换不同权限用户
-	await storesUserInfo.setUserInfos();
-	await setAddRoute();
-	setFilterMenuAndCacheTagsViewRoutes();
-};
-// 页面加载时
-onMounted(() => {
-	initUserAuth();
-});
-</script>

src/views/login/component/account.vue

@@ -1,19 +1,14 @@
 <template>
 	<el-form size="large" class="login-content-form">
 		<el-form-item class="login-animation1">
-			<el-input text :placeholder="$t('message.account.accountPlaceholder1')" v-model="state.ruleForm.userName" clearable autocomplete="off">
+			<el-input text placeholder="用户名 admin 或不输均为 common" v-model="state.ruleForm.userName" clearable autocomplete="off">
 				<template #prefix>
 					<el-icon class="el-input__icon"><ele-User /></el-icon>
 				</template>
 			</el-input>
 		</el-form-item>
 		<el-form-item class="login-animation2">
-			<el-input
-				:type="state.isShowPassword ? 'text' : 'password'"
-				:placeholder="$t('message.account.accountPlaceholder2')"
-				v-model="state.ruleForm.password"
-				autocomplete="off"
-			>
+			<el-input :type="state.isShowPassword ? 'text' : 'password'" placeholder="密码：123456" v-model="state.ruleForm.password" autocomplete="off">
 				<template #prefix>
 					<el-icon class="el-input__icon"><ele-Unlock /></el-icon>
 				</template>
@@ -29,14 +24,7 @@
 		</el-form-item>
 		<el-form-item class="login-animation3">
 			<el-col :span="15">
-				<el-input
-					text
-					maxlength="4"
-					:placeholder="$t('message.account.accountPlaceholder3')"
-					v-model="state.ruleForm.code"
-					clearable
-					autocomplete="off"
-				>
+				<el-input text maxlength="4" placeholder="请输入验证码" v-model="state.ruleForm.code" clearable autocomplete="off">
 					<template #prefix>
 						<el-icon class="el-input__icon"><ele-Position /></el-icon>
 					</template>
@@ -49,7 +37,7 @@
 		</el-form-item>
 		<el-form-item class="login-animation4">
 			<el-button type="primary" class="login-content-submit" round v-waves @click="onSignIn" :loading="state.loading.signIn">
-				<span>{{ $t('message.account.accountBtnText') }}</span>
+				<span>登 录</span>
 			</el-button>
 		</el-form-item>
 	</el-form>
@@ -59,7 +47,6 @@
 import { reactive, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus';
-import { useI18n } from 'vue-i18n';
 import Cookies from 'js-cookie';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
@@ -70,7 +57,6 @@ import { formatAxis } from '/@/utils/formatTime';
 import { NextLoading } from '/@/utils/loading';
 
 // 定义变量内容
-const { t } = useI18n();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const route = useRoute();
@@ -129,7 +115,7 @@ const signInSuccess = (isNoPower: boolean | undefined) => {
 			router.push('/');
 		}
 		// 登录成功提示
-		const signInText = t('message.signInText');
+		const signInText = '欢迎回来！';
 		ElMessage.success(`${currentTimeInfo}，${signInText}`);
 		// 添加 loading，防止第一次进入界面时出现短暂空白
 		NextLoading.start();

src/views/login/component/mobile.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-form size="large" class="login-content-form">
 		<el-form-item class="login-animation1">
-			<el-input text :placeholder="$t('message.mobile.placeholder1')" v-model="state.ruleForm.userName" clearable autocomplete="off">
+			<el-input text placeholder="请输入手机号" v-model="state.ruleForm.userName" clearable autocomplete="off">
 				<template #prefix>
 					<i class="iconfont icon-dianhua el-input__icon"></i>
 				</template>
@@ -9,7 +9,7 @@
 		</el-form-item>
 		<el-form-item class="login-animation2">
 			<el-col :span="15">
-				<el-input text maxlength="4" :placeholder="$t('message.mobile.placeholder2')" v-model="state.ruleForm.code" clearable autocomplete="off">
+				<el-input text maxlength="4" placeholder="请输入验证码" v-model="state.ruleForm.code" clearable autocomplete="off">
 					<template #prefix>
 						<el-icon class="el-input__icon"><ele-Position /></el-icon>
 					</template>
@@ -17,15 +17,17 @@
 			</el-col>
 			<el-col :span="1"></el-col>
 			<el-col :span="8">
-				<el-button v-waves class="login-content-code">{{ $t('message.mobile.codeText') }}</el-button>
+				<el-button v-waves class="login-content-code">获取验证码</el-button>
 			</el-col>
 		</el-form-item>
 		<el-form-item class="login-animation3">
 			<el-button round type="primary" v-waves class="login-content-submit">
-				<span>{{ $t('message.mobile.btnText') }}</span>
+				<span>登 录</span>
 			</el-button>
 		</el-form-item>
-		<div class="font12 mt30 login-animation4 login-msg">{{ $t('message.mobile.msgText') }}</div>
+		<div class="font12 mt30 login-animation4 login-msg">
+			* 温馨提示：建议使用谷歌、Microsoft Edge，版本 79.0.1072.62 及以上浏览器，360浏览器请使用极速模式
+		</div>
 	</el-form>
 </template>
 

src/views/login/component/scan.vue

@@ -3,7 +3,7 @@
 		<div ref="qrcodeRef"></div>
 		<div class="font12 mt20 login-msg">
 			<i class="iconfont icon-saoyisao mr5"></i>
-			<span>{{ $t('message.scan.text') }}</span>
+			<span>打开手机扫一扫，快速登录/注册</span>
 		</div>
 	</div>
 </template>

src/views/login/index.vue

@@ -22,10 +22,10 @@
 					<div class="login-right-warp-main-form">
 						<div v-if="!state.isScan">
 							<el-tabs v-model="state.tabsActiveName">
-								<el-tab-pane :label="$t('message.label.one1')" name="account">
+								<el-tab-pane label="账号密码登录" name="account">
 									<Account />
 								</el-tab-pane>
-								<el-tab-pane :label="$t('message.label.two2')" name="mobile">
+								<el-tab-pane label="手机号登录" name="mobile">
 									<Mobile />
 								</el-tab-pane>
 							</el-tabs>

src/views/make/noticeBar/index.vue

@@ -1,158 +0,0 @@
-<template>
-	<div class="notice-bar-container layout-pd">
-		<el-card shadow="hover" header="滚动通知栏：默认">
-			<NoticeBar
-				text="🎉🎉🔥基于vue3.x 、Typescript、vite、Element plus等，适配手机、平板、pc
-				的后台开源免费模板库（vue2.x请切换vue-prev-admin分支），仓库地址：https://gitee.com/lyt-top/vue-next-admin"
-			/>
-		</el-card>
-
-		<el-card shadow="hover" header="滚动通知栏：设置样式" class="mt15">
-			<NoticeBar
-				text="🎉🎉🔥基于vue3.x 、Typescript、vite、Element plus等，适配手机、平板、pc
-				的后台开源免费模板库（vue2.x请切换vue-prev-admin分支），仓库地址：https://gitee.com/lyt-top/vue-next-admin"
-				leftIcon="iconfont icon-tongzhi2"
-				rightIcon="ele-ArrowRight"
-				background="#ecf5ff"
-				color="#409eff"
-			/>
-		</el-card>
-
-		<el-card shadow="hover" header="滚动通知栏：搭配 NoticeBar 和 Carousel 走马灯 组件可以实现垂直滚动的效果" class="mt15">
-			<NoticeBar :scrollable="true">
-				<el-carousel height="40px" direction="vertical" :autoplay="true" indicator-position="none" :interval="3000">
-					<el-carousel-item v-for="v in state.noticeList" :key="v">{{ v }} </el-carousel-item>
-				</el-carousel>
-			</NoticeBar>
-		</el-card>
-
-		<el-card shadow="hover" header="滚动通知栏：参数" class="mt15">
-			<el-table :data="state.tableData" style="width: 100%">
-				<el-table-column prop="a1" label="参数"> </el-table-column>
-				<el-table-column prop="a2" label="说明"> </el-table-column>
-				<el-table-column prop="a3" label="类型"> </el-table-column>
-				<el-table-column prop="a4" label="可选值"> </el-table-column>
-				<el-table-column prop="a5" label="默认值"> </el-table-column>
-			</el-table>
-		</el-card>
-
-		<el-card shadow="hover" header="图标选择器(宽度自动)：事件" class="mt15">
-			<el-table :data="state.tableData1" style="width: 100%">
-				<el-table-column prop="a1" label="事件名称"> </el-table-column>
-				<el-table-column prop="a2" label="说明"> </el-table-column>
-				<el-table-column prop="a3" label="类型"> </el-table-column>
-				<el-table-column prop="a4" label="回调参数"> </el-table-column>
-			</el-table>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="makeNoticeBar">
-import { defineAsyncComponent, reactive } from 'vue';
-
-// 引入组件
-const NoticeBar = defineAsyncComponent(() => import('/@/components/noticeBar/index.vue'));
-
-// 定义变量内容
-const state = reactive({
-	noticeList: [
-		'🎉🎉🔥基于vue3.x 、Typescript、vite、Element plus等',
-		'适配手机、平板、pc的后台开源免费模板库（vue2.x请切换vue-prev-admin分支）',
-		'仓库地址：https://gitee.com/lyt-top/vue-next-admin',
-		'演示地址：https://lyt-top.gitee.io/vue-next-admin-preview/#/login',
-	],
-	tableData: [
-		{
-			a1: 'mode',
-			a2: '通知栏模式，用于右侧 icon 图标点击',
-			a3: 'string',
-			a4: 'closeable / link',
-			a5: '',
-		},
-		{
-			a1: 'text',
-			a2: '通知文本内容，scrollable 为 false 时生效',
-			a3: 'string',
-			a4: '',
-			a5: '',
-		},
-		{
-			a1: 'color',
-			a2: '通知文本颜色',
-			a3: 'string',
-			a4: '',
-			a5: '#e6a23c',
-		},
-		{
-			a1: 'background',
-			a2: '通知背景色',
-			a3: 'string',
-			a4: '',
-			a5: '#fdf6ec',
-		},
-		{
-			a1: 'size',
-			a2: '字体大小，单位px',
-			a3: 'number / string',
-			a4: '',
-			a5: '14',
-		},
-		{
-			a1: 'height',
-			a2: '通知栏高度，单位px',
-			a3: 'number / string',
-			a4: '',
-			a5: '40',
-		},
-		{
-			a1: 'delay',
-			a2: '动画延迟时间 (s)',
-			a3: 'number / string',
-			a4: '',
-			a5: '1',
-		},
-		{
-			a1: 'speed',
-			a2: '滚动速率 (px/s)',
-			a3: 'number / string',
-			a4: '',
-			a5: '100',
-		},
-		{
-			a1: 'scrollable',
-			a2: '是否开启垂直滚动',
-			a3: 'boolean',
-			a4: 'true',
-			a5: 'false',
-		},
-		{
-			a1: 'leftIcon',
-			a2: '自定义左侧图标',
-			a3: 'string',
-			a4: '',
-			a5: '',
-		},
-		{
-			a1: 'rightIcon',
-			a2: '自定义右侧图标',
-			a3: 'string',
-			a4: '',
-			a5: '',
-		},
-	],
-	tableData1: [
-		{
-			a1: 'close',
-			a2: '通知栏模式（mode）closeable 时回调事件',
-			a3: 'function',
-			a4: '',
-		},
-		{
-			a1: 'link',
-			a2: '通知栏模式（mode）link 时回调事件',
-			a3: 'function',
-			a4: '',
-		},
-	],
-});
-</script>

src/views/make/selector/index.vue

@@ -1,118 +0,0 @@
-<template>
-	<div class="selector-container layout-pd">
-		<el-card shadow="hover" header="图标选择器(宽度自动)：">
-			<IconSelector @get="onGetIcon" @clear="onClearIcon" v-model="state.modelIcon" />
-		</el-card>
-
-		<el-card shadow="hover" header="图标选择器(宽度自动)：参数" class="mt15">
-			<el-table :data="state.tableData" style="width: 100%">
-				<el-table-column prop="a1" label="参数"> </el-table-column>
-				<el-table-column prop="a2" label="说明"> </el-table-column>
-				<el-table-column prop="a3" label="类型"> </el-table-column>
-				<el-table-column prop="a4" label="可选值"> </el-table-column>
-				<el-table-column prop="a5" label="默认值"> </el-table-column>
-			</el-table>
-		</el-card>
-
-		<el-card shadow="hover" header="图标选择器(宽度自动)：事件" class="mt15">
-			<el-table :data="state.tableData1" style="width: 100%">
-				<el-table-column prop="a1" label="事件名称"> </el-table-column>
-				<el-table-column prop="a2" label="说明"> </el-table-column>
-				<el-table-column prop="a3" label="类型"> </el-table-column>
-				<el-table-column prop="a4" label="回调参数"> </el-table-column>
-			</el-table>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="makeSelector">
-import { defineAsyncComponent, reactive } from 'vue';
-
-// 引入组件
-const IconSelector = defineAsyncComponent(() => import('/@/components/iconSelector/index.vue'));
-
-// 定义变量内容
-const state = reactive({
-	modelIcon: '',
-	tableData: [
-		{
-			a1: 'v-model',
-			a2: '双向绑定值',
-			a3: 'string',
-			a4: '',
-			a5: '',
-		},
-		{
-			a1: 'prepend',
-			a2: '输入框前置内容，只能字体图标',
-			a3: 'string',
-			a4: '',
-			a5: 'ele-Pointer',
-		},
-		{
-			a1: 'placeholder',
-			a2: '输入框占位文本',
-			a3: 'string',
-			a4: '',
-			a5: '请输入内容搜索图标或者选择图标',
-		},
-		{
-			a1: 'size',
-			a2: '尺寸',
-			a3: 'string',
-			a4: 'large / default / small',
-			a5: 'default',
-		},
-		{
-			a1: 'title',
-			a2: '弹窗标题',
-			a3: 'string',
-			a4: '',
-			a5: '请选择图标',
-		},
-		{
-			a1: 'disabled',
-			a2: '禁用',
-			a3: 'boolean',
-			a4: 'true',
-			a5: 'false',
-		},
-		{
-			a1: 'clearable',
-			a2: '是否可清空',
-			a3: 'boolean',
-			a4: 'false',
-			a5: 'true',
-		},
-		{
-			a1: 'emptyDescription',
-			a2: '自定义空状态描述文字',
-			a3: 'String',
-			a4: '',
-			a5: '无相关图标',
-		},
-	],
-	tableData1: [
-		{
-			a1: 'get',
-			a2: '获取当前点击的 icon 图标',
-			a3: 'function',
-			a4: '(icon: string)',
-		},
-		{
-			a1: 'clear',
-			a2: '清空当前点击的 icon 图标',
-			a3: 'function',
-			a4: '(icon: string)',
-		},
-	],
-});
-// 获取当前点击的 icon 图标
-const onGetIcon = (icon: string) => {
-	console.log(icon);
-};
-// 清空当前点击的 icon 图标
-const onClearIcon = (icon: string) => {
-	console.log(icon);
-};
-</script>

src/views/make/svgDemo/index.vue

@@ -1,51 +0,0 @@
-<template>
-	<div class="svg-demo-container layout-pd">
-		<el-card shadow="hover" header="svgIcon：演示（支持本地svg）">
-			<SvgIcon name="iconfont icon-shuju1" color="red" :size="30" />
-			<SvgIcon name="ele-Trophy" color="var(--el-color-primary)" :size="30" />
-			<SvgIcon name="fa fa-flag-checkered" color="#09f" :size="30" />
-			<SvgIcon :name="logoMini" color="#09f" :size="30" />
-		</el-card>
-		<el-card shadow="hover" header="svgIcon：参数" class="mt15">
-			<el-table :data="state.tableData" style="width: 100%">
-				<el-table-column prop="a1" label="参数"> </el-table-column>
-				<el-table-column prop="a2" label="说明"> </el-table-column>
-				<el-table-column prop="a3" label="类型"> </el-table-column>
-				<el-table-column prop="a4" label="可选值"> </el-table-column>
-				<el-table-column prop="a5" label="默认值"> </el-table-column>
-			</el-table>
-		</el-card>
-	</div>
-</template>
-
-<script setup lang="ts" name="makeSvgDemo">
-import { reactive } from 'vue';
-import logoMini from '/@/assets/logo-mini.svg';
-
-// 定义变量内容
-const state = reactive({
-	tableData: [
-		{
-			a1: 'name',
-			a2: 'svg 图标组件名字 / svg 路径 url',
-			a3: 'string',
-			a4: '',
-			a5: '',
-		},
-		{
-			a1: 'size',
-			a2: 'svg 大小',
-			a3: 'number',
-			a4: '',
-			a5: 14,
-		},
-		{
-			a1: 'color',
-			a2: 'svg 颜色',
-			a3: 'string',
-			a4: '',
-			a5: '',
-		},
-	],
-});
-</script>

src/views/make/tableDemo/index.vue

@@ -1,134 +0,0 @@
-<template>
-	<div class="table-demo-container layout-padding">
-		<div class="table-demo-padding layout-padding-view layout-padding-auto">
-			<TableSearch :search="state.tableData.search" @search="onSearch" />
-			<Table
-				ref="tableRef"
-				v-bind="state.tableData"
-				class="table-demo"
-				@delRow="onTableDelRow"
-				@pageChange="onTablePageChange"
-				@sortHeader="onSortHeader"
-			/>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts" name="makeTableDemo">
-import { defineAsyncComponent, reactive, ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
-
-// 引入组件
-const Table = defineAsyncComponent(() => import('/@/components/table/index.vue'));
-const TableSearch = defineAsyncComponent(() => import('/@/views/make/tableDemo/search.vue'));
-
-// 定义变量内容
-const tableRef = ref<RefType>();
-const state = reactive<TableDemoState>({
-	tableData: {
-		// 列表数据（必传）
-		data: [],
-		// 表头内容（必传，注意格式）
-		header: [
-			{ key: 'name', colWidth: '', title: '应检尽检核酸采样点名称', type: 'text', isCheck: true },
-			{ key: 'address', colWidth: '', title: '详细地址', type: 'text', isCheck: true },
-			{ key: 'phone', colWidth: '', title: '采样点联系电话', type: 'text', isCheck: true },
-			{ key: 'time', colWidth: '', title: '开放时间', type: 'text', isCheck: true },
-			{ key: 'isSupport', colWidth: '', title: '是否支持24小时核酸检测', type: 'text', isCheck: true },
-			{ key: 'image', colWidth: '', width: '70', height: '40', title: '图片描述', type: 'image', isCheck: true },
-		],
-		// 配置项（必传）
-		config: {
-			total: 0, // 列表总数
-			loading: true, // loading 加载
-			isBorder: false, // 是否显示表格边框
-			isSerialNo: true, // 是否显示表格序号
-			isSelection: true, // 是否显示表格多选
-			isOperate: true, // 是否显示表格操作栏
-		},
-		// 搜索表单，动态生成（传空数组时，将不显示搜索，注意格式）
-		search: [
-			{ label: '采样点名称', prop: 'name', placeholder: '请输入应检尽检核酸采样点名称', required: true, type: 'input' },
-			{ label: '详细地址', prop: 'address', placeholder: '请输入详细地址', required: false, type: 'input' },
-			{ label: '联系电话', prop: 'phone', placeholder: '请输入采样点联系电话', required: false, type: 'input' },
-			{ label: '开放时间', prop: 'time', placeholder: '请选择', required: false, type: 'date' },
-			{
-				label: '支持24小时',
-				prop: 'isSupport',
-				placeholder: '请选择',
-				required: false,
-				type: 'select',
-				options: [
-					{ label: '是', value: 1 },
-					{ label: '否', value: 0 },
-				],
-			},
-			{ label: '图片描述', prop: 'image', placeholder: '请输入图片描述', required: false, type: 'input' },
-			{ label: '核酸机构', prop: 'mechanism', placeholder: '请输入核酸机构', required: false, type: 'input' },
-		],
-		// 搜索参数（不用传，用于分页、搜索时传给后台的值，`getTableData` 中使用）
-		param: {
-			pageNum: 1,
-			pageSize: 10,
-		},
-	},
-});
-
-// 初始化列表数据
-const getTableData = () => {
-	state.tableData.config.loading = true;
-	state.tableData.data = [];
-	for (let i = 0; i < 20; i++) {
-		state.tableData.data.push({
-			id: `123456789${i + 1}`,
-			name: `莲塘别墅广场${i + 1}`,
-			address: `中沧公寓中庭榕树下${i + 1}`,
-			phone: `0592-6081259${i + 1}`,
-			time: `6:00 ~ 24:00`,
-			isSupport: `${i % 2 === 0 ? '是' : '否'}`,
-			image: `https://img2.baidu.com/it/u=417454395,2713356475&fm=253&fmt=auto?w=200&h=200`,
-		});
-	}
-	// 数据总数（模拟，真实从接口取）
-	state.tableData.config.total = state.tableData.data.length;
-	setTimeout(() => {
-		state.tableData.config.loading = false;
-	}, 500);
-};
-// 搜索点击时表单回调
-const onSearch = (data: EmptyObjectType) => {
-	state.tableData.param = Object.assign({}, state.tableData.param, { ...data });
-	tableRef.value.pageReset();
-};
-// 删除当前项回调
-const onTableDelRow = (row: EmptyObjectType) => {
-	ElMessage.success(`删除${row.name}成功！`);
-	getTableData();
-};
-// 分页改变时回调
-const onTablePageChange = (page: TableDemoPageType) => {
-	state.tableData.param.pageNum = page.pageNum;
-	state.tableData.param.pageSize = page.pageSize;
-	getTableData();
-};
-// 拖动显示列排序回调
-const onSortHeader = (data: TableHeaderType[]) => {
-	state.tableData.header = data;
-};
-// 页面加载时
-onMounted(() => {
-	getTableData();
-});
-</script>
-
-<style scoped lang="scss">
-.table-demo-container {
-	.table-demo-padding {
-		padding: 15px;
-		.table-demo {
-			flex: 1;
-			overflow: hidden;
-		}
-	}
-}
-</style>