Merge branch 'master' of https://gitee.com/lyt-top/vue-next-admin

'admin-23.04.11:发布v2.4.33版本，更新内容查看CHANGELOG.md'
'admin-23.03.26:发布v2.4.33版本，更新内容查看CHANGELOG.md'
2026-06-07 18:26:06 +08:00 · 2023-04-11 22:05:15 +08:00 · 2023-04-11 22:04:59 +08:00 · 2023-04-11 22:01:28 +08:00 · 2023-04-07 13:50:10 +00:00 · 2023-03-26 17:50:35 +08:00
55 changed files with 1363 additions and 931 deletions
--- a/.env
+++ b/.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/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,45 @@

 🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支）

+## 2.4.33
+
+`2023.04.11`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 `/make/tableDemo` 中添加打印、图片预览功能
+- 🐞 修复 菜单收起时（isCollapse），图标不居中问题
+- 🐞 修复 演示 `权限管理 -> 前端控制 -> 页面权限` 切换不生效，感谢群友@傲世盛唐
+- 🐞 修复 `"typescript": "5.x"` 中 `tsconfig.json`，`compilerOptions.suppressImplicitAnyIndexErrors` 弃用问题 [TypeScript/issues/51909](https://github.com/microsoft/TypeScript/issues/51909)、[suppressImplicitAnyIndexErrors](https://www.typescriptlang.org/tsconfig#suppressImplicitAnyIndexErrors)
+- 🎨 合并 [!47cdn 打包支持 pnpm，消除无 external 的报错](https://gitee.com/lyt-top/vue-next-admin/commit/8de54a844bb54468d0bdccca158bf9bcb449f270)，感谢[@yujiacheng](https://gitee.com/YujiaCheng1996)
+- 🎯 优化 `layout/navBars/breadcrumb` 文件夹名称改成 `layout/navBars/topBar` 更易理解（`可全局替换`），感谢群友@傲世盛唐
+- 🎯 优化 `layout/navBars/topBar/user.vue` 组件，`UserNews` 点击消息图标触发范围，改用 [element plus Popover 气泡卡片 虚拟触发方式](https://element-plus.org/zh-CN/component/popover.html#%E8%99%9A%E6%8B%9F%E8%A7%A6%E5%8F%91)，防止点击消息通知背景色时不触发 `Popover` 弹出框
+
+## 2.4.32
+
+💔💔💔 图片不显示问题（README.md、演示中使用的图片，[vue-next-admin-images](https://gitee.com/lyt-top/vue-next-admin-images)），通过网站 [https://www.hd-r.cn/](https://www.hd-r.cn/) 转在线链接，如若侵权请联系作者 qq：1105290566
+
+`2023.03.26`
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 [关于开发环境 sourceMap 的问题](https://gitee.com/lyt-top/vue-next-admin/issues/I6DNDQ)，感谢[@XiaoSongJiang](https://gitee.com/XiaoSongJiang)
+- 🐞 修复 打包提示 `[@vue/compiler-sfc] ::v-deep usage as a combinator has been deprecated. Use :deep(<inner-selector>) instead.`，不能使用 `:deep {}`，而应使用 `:deep() {}`
+- 🎨 合并 [feat: 一级菜单重定向为空，分栏模式下，点击一次菜单时现在会切换子菜单列表，而不是打开空白页](https://gitee.com/lyt-top/vue-next-admin/commit/a91f84e3a1a86d8d303a5b46171622913d9d0737)，感谢[@写意](https://gitee.com/xjj_0906)
+- 🎯 优化 经典布局分割菜单只有一项子级时，收起左侧导航菜单
+- 🎯 优化 watch 监听范围
+- 🎯 优化 打包：分包（manualChunks）、gzip 压缩、cdn 加速 `默认关闭 .env 中开启`（可查看文章[vue-next-admin vue3 + vite 打包 gzip 压缩、cdn 加速](https://blog.csdn.net/qq_34450741/article/details/129766676)）
+
+## 2.4.31
+
+`2023.03.10`
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 顶栏背景渐变设置不生效
+- 🐞 修复 顶栏背景渐变、菜单背景渐变时，深色主题不生效
+- 🐞 修复 顶栏搜索框移动端显示问题
+- 🎯 优化 `main.ts`，相关 issues [#I6KNFH](https://gitee.com/lyt-top/vue-next-admin/issues/I6KNFH)、[#I6JRH6](https://gitee.com/lyt-top/vue-next-admin/issues/I6JRH6)
+- 🎯 优化 菜单横向模式显示（horizontal）
+- 🎯 优化 分栏布局，[希望分栏布局做一下优化，在没有二级菜单的时候，直接全屏展示一级菜单链接](https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H)，感谢[@jiuping](https://gitee.com/jiuping)，`tagsview` 点击时处理 `收起/展开` 菜单
+
 ## 2.4.3

 `2023.02.22`
@ -124,7 +163,7 @@
 - 🎯 优化 图标选择器 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`
+- 🎯 优化 地址栏有参数退出登录，再次登录不跳之前界面问题 `src/layout/navBars/topBar/user.vue`
 - 🎯 优化 `SvgIcon` 组件，防止 `开启 Tagsview 图标` 时，`tagsView 右键菜单关闭` 报错问题，工作流不可连线、全屏时关闭按钮消失问题
 - 🎯 优化 [如果 url 中有中文等特殊字符，第一次切换该 tab 时 keep-alive 失效#I55JS7](https://gitee.com/lyt-top/vue-next-admin/issues/I55JS7),感谢[yuyong1566](https://gitee.com/yuyong1566)
 - 🎯 优化 [wangEditor](https://www.wangeditor.com/) 更新到 v5，[vue3 版本线上示例中 wangeditor 富文本编辑器 demo 实例,无法换行#I5565B](https://gitee.com/lyt-top/vue-next-admin/issues/I5565B)，感谢@[jenchih](https://gitee.com/jenchih)
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
 <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">
@ -34,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>

 #### 💒 代码仓库

@ -82,28 +83,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>
@ -124,7 +112,6 @@ cnpm run build
 - <a href="https://github.com/vuejs/pinia" target="_blank">pinia</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>
@ -135,12 +122,19 @@ cnpm run build
 - <a href="https://github.com/vitejs/vite" target="_blank">vite</a>
 - <a href="https://github.com/wangeditor-team/wangEditor" target="_blank">wangeditor</a>
 - <a href="https://github.com/fengyuanchen/cropperjs" target="_blank">cropperjs</a>
- <a href="https://github.com/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://github.com/mmf-fe/vite-plugin-cdn-import" target="_blank">vite-plugin-cdn-import</a>
+- <a href="https://github.com/js-cookie/js-cookie" target="_blank">js-cookie</a>
+- <a href="https://github.com/davidshimjs/qrcodejs" target="_blank">qrcodejs2-fixes</a>
+- <a href="https://github.com/ljharb/qs" target="_blank">qs</a>
+- <a href="https://github.com/JamieCurnow/vue-clipboard3" target="_blank">vue-clipboard3</a>
+- <a href="https://github.com/intlify/vue-i18n-next" target="_blank">vue-i18n</a>
+- <a href="https://github.com/vbenjs/vite-plugin-compression" target="_blank">vite-plugin-compression</a>
+- <a href="https://github.com/chenxch/vite-plugin-vue-setup-extend-plus" target="_blank">vite-plugin-vue-setup-extend-plus</a>

 #### 💕 特别感谢

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,59 +1,62 @@
 {
 	"name": "vue-next-admin",
-	"version": "2.4.3",
+	"version": "2.4.33",
 	"description": "vue3 vite next admin template",
 	"author": "lyt_20201208",
 	"license": "MIT",
 	"scripts": {
-		"dev": "vite --force",
+		"dev": "vite",
 		"build": "vite build",
 		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
 	},
 	"dependencies": {
-		"@element-plus/icons-vue": "^2.0.10",
+		"@element-plus/icons-vue": "^2.1.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
-		"axios": "^1.3.3",
-		"countup.js": "^2.4.2",
+		"axios": "^1.3.5",
+		"countup.js": "^2.6.0",
 		"cropperjs": "^1.5.13",
-		"echarts": "^5.4.1",
+		"echarts": "^5.4.2",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.2.32",
+		"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.32",
+		"pinia": "^2.0.34",
 		"print-js": "^1.6.0",
 		"qrcodejs2-fixes": "^0.0.2",
-		"qs": "^6.11.0",
+		"qs": "^6.11.1",
 		"screenfull": "^6.0.2",
 		"sortablejs": "^1.15.0",
 		"splitpanes": "^3.1.5",
 		"vue": "^3.2.47",
 		"vue-clipboard3": "^2.0.0",
+		"vue-demi": "^0.13.11",
 		"vue-grid-layout": "^3.0.0-beta1",
 		"vue-i18n": "^9.2.2",
 		"vue-router": "^4.1.6"
 	},
 	"devDependencies": {
-		"@types/node": "^18.14.0",
+		"@types/node": "^18.15.11",
 		"@types/nprogress": "^0.2.0",
-		"@types/sortablejs": "^1.15.0",
-		"@typescript-eslint/eslint-plugin": "^5.53.0",
-		"@typescript-eslint/parser": "^5.53.0",
-		"@vitejs/plugin-vue": "^4.0.0",
+		"@types/sortablejs": "^1.15.1",
+		"@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.34.0",
-		"eslint-plugin-vue": "^9.9.0",
-		"prettier": "^2.8.4",
-		"sass": "^1.58.3",
-		"typescript": "^4.9.5",
-		"vite": "^4.1.4",
-		"vite-plugin-vue-setup-extend": "^0.4.0",
-		"vue-eslint-parser": "^9.1.0"
+		"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%",
--- a/src/App.vue
+++ b/src/App.vue
@ -23,8 +23,8 @@ 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'));

--- a/src/assets/ccflowRightNextAdmin.png
+++ b/src/assets/ccflowRightNextAdmin.png
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@ -22,7 +22,14 @@
 			>
 				<template v-slot="scope">
 					<template v-if="item.type === 'image'">
-						<img :src="scope.row[item.key]" :width="item.width" :height="item.height" />
+						<el-image
+							:style="{ width: `${item.width}px`, height: `${item.height}px` }"
+							:src="scope.row[item.key]"
+							:zoom-rate="1.2"
+							:preview-src-list="[scope.row[item.key]]"
+							preview-teleported
+							fit="cover"
+						/>
 					</template>
 					<template v-else>
 						{{ scope.row[item.key] }}
@ -56,6 +63,7 @@
 			>
 			</el-pagination>
 			<div class="table-footer-tool">
+				<SvgIcon name="iconfont icon-dayin" :size="19" title="打印" @click="onPrintTable" />
 				<SvgIcon name="iconfont icon-yunxiazai_o" :size="22" title="导出" @click="onImportTable" />
 				<SvgIcon name="iconfont icon-shuaxin" :size="22" title="刷新" @click="onRefreshTable" />
 				<el-popover
@ -103,6 +111,7 @@
 <script setup lang="ts" name="netxTable">
 import { reactive, computed, nextTick, ref } from 'vue';
 import { ElMessage } from 'element-plus';
+import printJs from 'print-js';
 import table2excel from 'js-table2excel';
 import Sortable from 'sortablejs';
 import { storeToRefs } from 'pinia';
@ -126,6 +135,11 @@ const props = defineProps({
 		type: Object,
 		default: () => {},
 	},
+	// 打印标题
+	printName: {
+		type: String,
+		default: () => '',
+	},
 });

 // 定义子组件向父组件传值/事件
@ -193,6 +207,37 @@ const pageReset = () => {
 	state.page.pageSize = 10;
 	emit('pageChange', state.page);
 };
+// 打印
+const onPrintTable = () => {
+	// https://printjs.crabbly.com/#documentation
+	// 自定义打印
+	let tableTh = '';
+	let tableTrTd = '';
+	let tableTd: any = {};
+	// 表头
+	props.header.forEach((v) => {
+		tableTh += `<th class="table-th">${v.title}</th>`;
+	});
+	// 表格内容
+	props.data.forEach((val, key) => {
+		if (!tableTd[key]) tableTd[key] = [];
+		props.header.forEach((v) => {
+			if (v.type === 'text') {
+				tableTd[key].push(`<td class="table-th table-center">${val[v.key]}</td>`);
+			} else if (v.type === 'image') {
+				tableTd[key].push(`<td class="table-th table-center"><img src="${val[v.key]}" style="width:${v.width}px;height:${v.height}px;"/></td>`);
+			}
+		});
+		tableTrTd += `<tr>${tableTd[key].join('')}</tr>`;
+	});
+	// 打印
+	printJs({
+		printable: `<div style=display:flex;flex-direction:column;text-align:center><h3>${props.printName}</h3></div><table border=1 cellspacing=0><tr>${tableTh}${tableTrTd}</table>`,
+		type: 'raw-html',
+		css: ['//at.alicdn.com/t/c/font_2298093_rnp72ifj3ba.css', '//unpkg.com/element-plus/dist/index.css'],
+		style: `@media print{.mb15{margin-bottom:15px;}.el-button--small i.iconfont{font-size: 12px !important;margin-right: 5px;}}; .table-th{word-break: break-all;white-space: pre-wrap;}.table-center{text-align: center;}`,
+	});
+};
 // 导出
 const onImportTable = () => {
 	if (state.selectlist.length <= 0) return ElMessage.warning('请先选择要导出的数据');
@ -211,7 +256,7 @@ const onSetTable = () => {
 			animation: 150,
 			onEnd: () => {
 				const headerList: EmptyObjectType[] = [];
-				sortable.toArray().forEach((val) => {
+				sortable.toArray().forEach((val: string) => {
 					props.header.forEach((v) => {
 						if (v.key === val) headerList.push({ ...v });
 					});
--- a/src/layout/component/aside.vue
+++ b/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 {
@ -107,7 +106,8 @@ const onAsideEnterLeave = (bool: Boolean) => {
 	let { layout } = themeConfig.value;
 	if (layout !== 'columns') return false;
 	if (!bool) mittBus.emit('restoreDefault');
-	stores.setColumnsMenuHover(bool);
+	// 开启 `分栏菜单鼠标悬停预加载` 才设置，防止 columnsAside.vue 监听 pinia.state
+	if (themeConfig.value.isColumnsMenuHoverPreload) stores.setColumnsMenuHover(bool);
 };
 // 页面加载前
 onBeforeMount(() => {
@ -118,37 +118,41 @@ 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;
+	}
+);
+// 监听用户权限切换，用于演示 `权限管理 -> 前端控制 -> 页面权限` 权限切换不生效
+watch(
+	() => routesList.value,
+	() => {
 		setFilterRoutes();
-	},
-	{
-		deep: true,
 	}
 );
 </script>
--- a/src/layout/component/columnsAside.vue
+++ b/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) => {
@ -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';
@ -79,11 +78,28 @@ const setColumnsAsideMove = (k: number) => {
 	columnsAsideActiveRef.value.style.top = `${columnsAsideOffsetTopRefs.value[k].offsetTop + state.difference}px`;
 };
 // 菜单高亮点击事件
-const onColumnsAsideMenuClick = (v: RouteItem, k: number) => {
-	setColumnsAsideMove(k);
+const onColumnsAsideMenuClick = async (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) => {
@ -98,6 +114,7 @@ const onColumnsAsideMenuMouseenter = (v: RouteRecordRaw, k: number) => {
 };
 // 鼠标移走时，显示原来的子级菜单
 const onColumnsAsideMenuMouseleave = async () => {
+	if (!themeConfig.value.isColumnsMenuHoverPreload) return false;
 	await stores.setColumnsNavHover(false);
 	// 添加延时器，防止拿到的 store.state.routesList 值不是最新的
 	setTimeout(() => {
@ -116,7 +133,13 @@ const setFilterRoutes = () => {
 	const resData: MittMenu = setSendChildren(route.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
+	resData.children.length <= 1 ? (themeConfig.value.isCollapse = true) : (themeConfig.value.isCollapse = false);
+	// 延迟 500 毫秒更新，防止 aside.vue 组件 setSendColumnsChildren 还没有注册
+	setTimeout(() => {
+		mittBus.emit('setSendColumnsChildren', resData);
+	}, 500);
 };
 // 传送当前子级数据到菜单中
 const setSendChildren = (path: string) => {
@ -174,10 +197,10 @@ onBeforeRouteUpdate((to) => {
 });
 // 监听布局配置信息的变化，动态增加菜单高亮位置移动像素
 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 {
--- a/src/layout/lockScreen/index.vue
+++ b/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;
 }
--- a/src/layout/main/classic.vue
+++ b/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,
--- a/src/layout/main/columns.vue
+++ b/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,
--- a/src/layout/main/defaults.vue
+++ b/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,
--- a/src/layout/main/transverse.vue
+++ b/src/layout/main/transverse.vue
@ -47,9 +47,11 @@ watch(
 );
 // 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
 watch(
-	themeConfig,
+	() => themeConfig.value.isTagsview,
 	() => {
-		updateScrollbar();
+		nextTick(() => {
+			updateScrollbar();
+		});
 	},
 	{
 		deep: true,
--- a/src/layout/navBars/index.vue
+++ b/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'));

 // 定义变量内容
--- a/src/layout/navBars/tagsView/tagsView.vue
+++ b/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();
 	},
 	{
--- a/src/layout/navBars/breadcrumb/breadcrumb.vue
+++ b/src/layout/navBars/breadcrumb/breadcrumb.vue
--- a/src/layout/navBars/breadcrumb/closeFull.vue
+++ b/src/layout/navBars/breadcrumb/closeFull.vue
--- a/src/layout/navBars/breadcrumb/index.vue
+++ b/src/layout/navBars/breadcrumb/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'));

--- a/src/layout/navBars/breadcrumb/search.vue
+++ b/src/layout/navBars/breadcrumb/search.vue
@ -107,6 +107,7 @@ defineExpose({
 			display: none;
 		}
 		.el-dialog__footer {
+			width: 100%;
 			position: absolute;
 			left: 50%;
 			transform: translateX(-50%);
--- a/src/layout/navBars/breadcrumb/setings.vue
+++ b/src/layout/navBars/breadcrumb/setings.vue
@ -494,14 +494,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 = () => {
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@ -36,20 +36,25 @@
 		<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
 			<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
 		</div>
-		<div class="layout-navbars-breadcrumb-user-icon">
-			<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
-				<template #reference>
-					<el-badge :is-dot="true">
-						<el-icon :title="$t('message.user.title4')">
-							<ele-Bell />
-						</el-icon>
-					</el-badge>
-				</template>
-				<template #default>
-					<UserNews />
-				</template>
-			</el-popover>
+		<div class="layout-navbars-breadcrumb-user-icon" ref="userNewsBadgeRef" v-click-outside="onUserNewsClick">
+			<el-badge :is-dot="true">
+				<el-icon :title="$t('message.user.title4')">
+					<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"
@ -81,9 +86,9 @@
 </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';
@ -94,10 +99,12 @@ 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 userNewsRef = ref();
+const userNewsBadgeRef = ref();
 const { locale, t } = useI18n();
 const router = useRouter();
 const stores = useUserInfo();
@ -132,6 +139,10 @@ const onScreenfullClick = () => {
 		else state.isScreenfull = false;
 	});
 };
+// 消息通知点击时
+const onUserNewsClick = () => {
+	unref(userNewsRef).popperRef?.delayHide?.();
+};
 // 布局配置 icon 点击时
 const onLayoutSetingClick = () => {
 	mittBus.emit('openSetingsDrawer');
@ -199,7 +210,7 @@ const onLanguageChange = (lang: string) => {
 };
 // 初始化组件大小/i18n
 const initI18nOrSize = (value: string, attr: string) => {
-	state[attr] = Local.get('themeConfig')[value];
+	(<any>state)[attr] = Local.get('themeConfig')[value];
 };
 // 页面加载时
 onMounted(() => {
--- a/src/layout/navBars/breadcrumb/userNews.vue
+++ b/src/layout/navBars/breadcrumb/userNews.vue
--- a/src/layout/navMenu/horizontal.vue
+++ b/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>
+		<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>{{ $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" />
-							<span>{{ $t(val.meta.title) }}</span>
+							{{ $t(val.meta.title) }}
 						</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)">
+						<template #title v-else>
+							<a class="w100" @click.prevent="onALinkClick(val)">
 								<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>
-					</template>
+							</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
--- a/src/layout/navMenu/vertical.vue
+++ b/src/layout/navMenu/vertical.vue
@ -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,
--- a/src/main.ts
+++ b/src/main.ts
@ -1,13 +1,12 @@
 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';

@ -16,4 +15,4 @@ 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).use(i18n).use(VueGridLayout).mount('#app');
--- a/src/router/backEnd.ts
+++ b/src/router/backEnd.ts
@ -53,7 +53,7 @@ export async function initBackEndControlRoutes() {
 	// 添加动态路由
 	await setAddRoute();
 	// 设置路由到 pinia routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
-	await setFilterMenuAndCacheTagsViewRoutes();
+	setFilterMenuAndCacheTagsViewRoutes();
 }

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

 /**
--- a/src/stores/themeConfig.ts
+++ b/src/stores/themeConfig.ts
@ -121,7 +121,7 @@ export const useThemeConfig = defineStore('themeConfig', {

 			/**
 			 * 布局切换
-			 * 注意：为了演示，切换布局时，颜色会被还原成默认，代码位置：/@/layout/navBars/breadcrumb/setings.vue
+			 * 注意：为了演示，切换布局时，颜色会被还原成默认，代码位置：/@/layout/navBars/topBar/setings.vue
 			 * 中的 `initSetLayoutChange(设置布局切换，重置主题样式)` 方法
 			 */
 			// 布局切换：可选值"<defaults|classic|transverse|columns>"，默认 defaults
--- a/src/stores/userInfo.ts
+++ b/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);
 			});
--- a/src/theme/app.scss
+++ b/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 {
--- a/src/theme/dark.scss
+++ b/src/theme/dark.scss
@ -106,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
--- a/src/theme/element.scss
+++ b/src/theme/element.scss
@ -148,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 {
@ -180,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,
@ -188,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 标签页
 ------------------------------- */
--- a/src/theme/index.scss
+++ b/src/theme/index.scss
@ -1,3 +1,4 @@
+@import 'element-plus/dist/index.css';
@import './app.scss';
@import 'common/transition.scss';
@import './other.scss';
--- a/src/theme/media/layout.scss
+++ b/src/theme/media/layout.scss
@ -7,6 +7,10 @@
 	.el-message-box {
 		width: 80% !important;
 	}
+	// 锁屏页
+	.layout-lock-screen-date-top {
+		display: none;
+	}
 }

 /* 页面宽度小于768px
--- a/src/types/global.d.ts
+++ b/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';
@ -26,6 +27,8 @@ declare module '*.vue' {
 /* eslint-disable */
 declare interface Window {
 	nextLoading: boolean;
+	BMAP_SATELLITE_MAP: any;
+	BMap: any;
 }

 // 声明路由当前项类型
--- a/src/types/pinia.d.ts
+++ b/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;
 }

 // 路由缓存列表
--- a/src/types/views.d.ts
+++ b/src/types/views.d.ts
@ -325,5 +325,6 @@ declare type TableDemoState = {
 		};
 		search: TableSearchType[];
 		param: EmptyObjectType;
+		printName: string;
 	};
 };
--- a/src/utils/build.ts
+++ b/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',
+	],
+};
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@ -46,7 +46,7 @@ service.interceptors.response.use(
 			}
 			return Promise.reject(service.interceptors.response);
 		} else {
-			return response.data;
+			return res;
 		}
 	},
 	(error) => {
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@ -13,9 +13,7 @@
 					</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>
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@ -13,9 +13,7 @@
 					</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>
--- a/src/views/limits/frontEnd/page/index.vue
+++ b/src/views/limits/frontEnd/page/index.vue
@ -27,6 +27,7 @@ import { onMounted, ref } from 'vue';
 import Cookies from 'js-cookie';
 import { storeToRefs } from 'pinia';
 import { useUserInfo } from '/@/stores/userInfo';
+import { Session } from '/@/utils/storage';
 import { frontEndsResetRoute, setAddRoute, setFilterMenuAndCacheTagsViewRoutes } from '/@/router/frontEnd';

 // 定义变量内容
@ -40,6 +41,9 @@ const initUserAuth = () => {
 };
 // 用户权限改变时
 const onRadioChange = async () => {
+	// 清空之前缓存的 userInfo，防止不请求接口。
+	// stores/userInfo.ts
+	Session.remove('userInfo');
 	// 模拟数据
 	frontEndsResetRoute();
 	Cookies.set('userName', userAuth.value);
--- a/src/views/make/tableDemo/index.vue
+++ b/src/views/make/tableDemo/index.vue
@ -71,6 +71,8 @@ const state = reactive<TableDemoState>({
 			pageNum: 1,
 			pageSize: 10,
 		},
+		// 打印标题
+		printName: 'vueNextAdmin 表格打印演示',
 	},
 });

--- a/src/views/pages/filtering/index.vue
+++ b/src/views/pages/filtering/index.vue
@ -226,6 +226,9 @@ const onHandleCurrentChange = (val: number) => {
 			flex-wrap: wrap;
 			align-content: flex-start;
 			margin: 0 -5px;
+			.el-row {
+				width: 101%;
+			}
 			.flex-warp-item {
 				padding: 5px;
 				width: 100%;
--- a/src/views/pages/tableRules/index.vue
+++ b/src/views/pages/tableRules/index.vue
@ -2,7 +2,7 @@
 	<div class="layout-pd">
 		<el-card shadow="hover" header="表单表格验证">
 			<el-form ref="tableRulesRef" :model="state.tableData" size="default">
-				<el-table :data="state.tableData.data" border class="module-table-uncollected">
+				<el-table ref="tableRef" :data="state.tableData.data" border class="module-table-uncollected" max-height="200">
 					<el-table-column
 						v-for="(item, index) in state.tableData.header"
 						:key="index"
@ -55,12 +55,13 @@
 </template>

 <script setup lang="ts" name="pagesTableRules">
-import { reactive, ref } from 'vue';
+import { reactive, ref, nextTick } from 'vue';
 import { ElMessage } from 'element-plus';
 import type { FormInstance } from 'element-plus';

 // 定义变量内容
 const tableRulesRef = ref<FormInstance>();
+const tableRef = ref();
 const state = reactive<TableRulesState>({
 	tableData: {
 		data: [],
@ -103,5 +104,9 @@ const onAddRow = () => {
 		a7: '',
 		a8: '',
 	});
+	tableRef.value.doLayout();
+	nextTick(() => {
+		tableRef.value.setScrollTop(1000000);
+	});
 };
 </script>
--- a/src/views/pages/workflow/component/drawer/node.vue
+++ b/src/views/pages/workflow/component/drawer/node.vue
@ -222,7 +222,7 @@ defineExpose({

 <style scoped lang="scss">
 .workflow-drawer-node {
-	:deep {
+	:deep() {
 		.el-tabs {
 			box-shadow: unset;
 			border: unset;
--- a/src/views/system/menu/dialog.vue
+++ b/src/views/system/menu/dialog.vue
@ -56,7 +56,7 @@
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 							<el-form-item label="组件路径">
-								<el-input v-model="state.ruleForm.component" placeholder="组件路径" clearable></el-input>
+								<el-input v-model="state.ruleForm.componentAlias" placeholder="组件路径" clearable></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@ -169,6 +169,7 @@ const state = reactive({
 		menuType: 'menu', // 菜单类型
 		name: '', // 路由名称
 		component: '', // 组件路径
+		componentAlias: '', // 组件路径别名
 		isLink: false, // 是否外链
 		menuSort: 0, // 菜单排序
 		path: '', // 路由路径
@ -209,12 +210,8 @@ const openDialog = (type: string, row?: any) => {
 	if (type === 'edit') {
 		// 模拟数据，实际请走接口
 		row.menuType = 'menu';
-		row.menuSort = Math.random();
-		row.component = `${row.component} `
-			.match(/\'(.+)\'/g)
-			?.join('')
-			.replace(/\'/g, '');
-		state.ruleForm = row;
+		row.menuSort = Math.floor(Math.random() * 100);
+		state.ruleForm = JSON.parse(JSON.stringify(row));
 		state.dialog.title = '修改菜单';
 		state.dialog.submitTxt = '修 改';
 	} else {
--- a/src/views/visualizing/demo1.vue
+++ b/src/views/visualizing/demo1.vue
@ -126,7 +126,7 @@ const initTime = () => {
 const convertData = (data: any) => {
 	let res = [];
 	for (let i = 0; i < data.length; i++) {
-		let geoCoord = state.echartsMapData[data[i].name];
+		let geoCoord = (<any>state.echartsMapData)[data[i].name];
 		if (geoCoord) {
 			res.push({
 				name: data[i].name,
@ -250,16 +250,16 @@ const initEchartsMap = () => {
 	// BMAP_SATELLITE_MAP：卫星地图 （没有坐标， 绿绿的一片的卫星地图）
 	// BMAP_HYBRID_MAP：混合地图 （既有坐标，也是绿绿的一片的卫星地图）
 	// eslint-disable-next-line no-undef
-	map.setMapType(BMAP_SATELLITE_MAP);
+	map.setMapType(window.BMAP_SATELLITE_MAP);
 	// eslint-disable-next-line no-undef
-	let bdary = new BMap.Boundary();
+	let bdary = new window.BMap.Boundary();
 	// 获取行政区域
 	bdary.get('深圳', function (rs: any) {
 		// 行政区域的点有多少个
 		let count = rs.boundaries.length;
 		for (let i = 0; i < count; i++) {
 			// eslint-disable-next-line no-undef
-			let ply = new BMap.Polygon(rs.boundaries[i], {
+			let ply = new window.BMap.Polygon(rs.boundaries[i], {
 				// 设置多边形边线线粗
 				strokeWeight: 4,
 				// 设置多边形边线透明度0-1
@ -280,7 +280,7 @@ const initEchartsMap = () => {
 		// 初始化地图，设置中心点坐标和地图级别
 		// new BMap.Point('深圳市', 11)
 		// eslint-disable-next-line no-undef
-		map.centerAndZoom(new BMap.Point(114.064524, 22.549225), 11);
+		map.centerAndZoom(new window.BMap.Point(114.064524, 22.549225), 11);
 	});
 };
 // 产业概况
--- a/src/views/visualizing/demo2.vue
+++ b/src/views/visualizing/demo2.vue
@ -235,8 +235,6 @@ import 'echarts-gl';
 import { formatDate } from '/@/utils/formatTime';
 import { NextLoading } from '/@/utils/loading';
 import { dropdownList, skyList, dBtnList, earth3DBtnList, chartData4List } from './mock/demo2';
-import worldImg from './images/world.jpg';
-import bathymetryImg from './images/bathymetry.jpg';

 // 定义变量内容
 const rightChartData1 = ref();
@ -694,8 +692,8 @@ const init3DEarth = (globeRadius: any) => {
 	const myChart = echarts.init(el);
 	const option = {
 		globe: {
-			baseTexture: worldImg,
-			heightTexture: bathymetryImg,
+			baseTexture: 'https://i.hd-r.cn/4d572a171eb475da0c2e731d15b63aea.jpg',
+			heightTexture: 'https://i.hd-r.cn/52356e8d906c84c5e23390f829dec7a3.jpg',
 			shading: 'realistic',
 			light: {
 				ambient: {
@ -790,7 +788,7 @@ onUnmounted(() => {
 	height: 100%;
 	width: 100%;
 	overflow: hidden;
-	background: url(https://img-blog.csdnimg.cn/6267533849444025811bf0840f9366e3.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_20,color_FFFFFF,t_70,g_se,x_16);
+	background: url(https://i.hd-r.cn/b1040178e4a2265fe87ffbb9bda839a4.jpg);
 	background-size: 100% 100%;
 	display: flex;
 	flex-direction: column;
--- a/src/views/visualizing/images/bathymetry.jpg
+++ b/src/views/visualizing/images/bathymetry.jpg
--- a/src/views/visualizing/images/world.jpg
+++ b/src/views/visualizing/images/world.jpg
--- a/tsconfig.json
+++ b/tsconfig.json
@ -67,8 +67,7 @@

 		/* Advanced Options */
 		"skipLibCheck": true /* Skip type checking of declaration files. */,
-		"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
-		"suppressImplicitAnyIndexErrors": true
+		"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
 	},
 	"include": ["src/**/*.ts", "src/**/*.vue", "src/**/*.tsx", "src/**/*.d.ts"], // **Represents any directory, and * represents any file. Indicates that all files in the src directory will be compiled
 	"exclude": ["node_modules", "dist"] // Indicates the file directory that does not need to be compiled
--- a/vite.config.ts
+++ b/vite.config.ts
@ -1,7 +1,9 @@
 import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 import { defineConfig, loadEnv, ConfigEnv } from 'vite';
-import vueSetupExtend from 'vite-plugin-vue-setup-extend';
+import vueSetupExtend from 'vite-plugin-vue-setup-extend-plus';
+import viteCompression from 'vite-plugin-compression';
+import { buildConfig } from './src/utils/build';

 const pathResolve = (dir: string) => {
 	return resolve(__dirname, '.', dir);
@ -15,13 +17,11 @@ const alias: Record<string, string> = {
 const viteConfig = defineConfig((mode: ConfigEnv) => {
 	const env = loadEnv(mode.mode, process.cwd());
 	return {
-		plugins: [vue(), vueSetupExtend()],
+		plugins: [vue(), vueSetupExtend(), viteCompression(), JSON.parse(env.VITE_OPEN_CDN) ? buildConfig.cdn() : null],
 		root: process.cwd(),
 		resolve: { alias },
 		base: mode.command === 'serve' ? './' : env.VITE_PUBLIC_PATH,
-		optimizeDeps: {
-			include: ['element-plus/lib/locale/lang/zh-cn', 'element-plus/lib/locale/lang/en', 'element-plus/lib/locale/lang/zh-tw'],
-		},
+		optimizeDeps: { exclude: ['vue-demi'] },
 		server: {
 			host: '0.0.0.0',
 			port: env.VITE_PORT as unknown as number,
@ -41,15 +41,16 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 			chunkSizeWarningLimit: 1500,
 			rollupOptions: {
 				output: {
-					entryFileNames: `assets/[name].[hash].js`,
-					chunkFileNames: `assets/[name].[hash].js`,
-					assetFileNames: `assets/[name].[hash].[ext]`,
-					compact: true,
-					manualChunks: {
-						vue: ['vue', 'vue-router', 'pinia'],
-						echarts: ['echarts'],
+					chunkFileNames: 'assets/js/[name]-[hash].js',
+					entryFileNames: 'assets/js/[name]-[hash].js',
+					assetFileNames: 'assets/[ext]/[name]-[hash].[ext]',
+					manualChunks(id) {
+						if (id.includes('node_modules')) {
+							return id.toString().match(/\/node_modules\/(?!.pnpm)(?<moduleName>[^\/]*)\//)?.groups!.moduleName ?? 'vender';
+						}
 					},
 				},
+				...(JSON.parse(env.VITE_OPEN_CDN) ? { external: buildConfig.external } : {}),
 			},
 		},
 		css: { preprocessorOptions: { css: { charset: false } } },
Author	SHA1	Message	Date
lyt	fae8ec55ea	Merge branch 'master' of https://gitee.com/lyt-top/vue-next-admin	2023-04-11 22:05:15 +08:00
lyt	8189fec5b4	'admin-23.04.11:发布v2.4.33版本，更新内容查看CHANGELOG.md'	2023-04-11 22:04:59 +08:00
lyt	ecdb9ac58c	'admin-23.03.26:发布v2.4.33版本，更新内容查看CHANGELOG.md'	2023-04-11 22:01:28 +08:00
yujiacheng	8de54a844b	!47 cdn打包支持pnpm，消除无external的报错 * <fix>cdn打包支持pnpm，消除无external的报错	2023-04-07 13:50:10 +00:00
lyt	7544b23d7c	'admin-23.03.26:发布v2.4.32版本，更新内容查看CHANGELOG.md	2023-03-26 17:50:35 +08:00
lyt	225bce794b	'admin-23.03.26:发布v2.4.32版本，更新内容查看CHANGELOG.md	2023-03-26 17:43:05 +08:00
lyt-Top	f92574c0f2	!46 分栏模式下，分栏菜单存在子菜单，且没有指定重定向时，只切换子菜单，不打开页面 Merge pull request !46 from 写意/master	2023-03-23 15:23:28 +00:00
许俊杰	a91f84e3a1	feat: 一级菜单重定向为空，分栏模式下，点击一次菜单时现在会切换子菜单列表，而不是打开空白页	2023-03-19 17:53:29 +08:00
lyt	ccca4cd355	'admin-23.03.10:发布v2.4.31版本，更新内容查看CHANGELOG.md'	2023-03-10 22:03:13 +08:00
lyt	a894768c56	'admin-23.02.27:优化分栏布局'	2023-02-27 23:22:53 +08:00
lyt-Top	496594578a	'admin-23.02.26:群满，请加交流群5，556254895' Signed-off-by: lyt-Top <1105290566@qq.com>	2023-02-26 02:54:01 +00:00