'admin-22.06.11:同步master分支v2.1.1版本，具体查看master根目录CHANGELOG.md'

2026-07-07 06:15:18 +08:00 · 2022-06-11 22:42:05 +08:00
parent 2a25a1d5c8
commit 5a5f7c324d
79 changed files with 6563 additions and 1803 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,7 +1,11 @@
-# <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-js（不带国际化） 更新日志</a>

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

+## 2.1.1
+
+- 🎉 同步 [vue-next-admin-template-js](https://gitee.com/lyt-top/vue-next-admin/tree/vue-next-admin-template/) 分支 v2.1.1 版本内容，具体查看 [master CHANGELOG.md](https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md)
+
 ## 2.0.2

 - 🎉 同步 vue-next-admin-template 基础版本（不带国际化） 分支 v2.0.2 版本内容，具体查看 master CHANGELOG.md
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
 <div align="center">
-	<img src="https://gitee.com/lyt-top/vue-next-admin-images/raw/master/logo/logo-text.svg">
+	<img src="https://img-blog.csdnimg.cn/9efd5420327a46b7bd6d93524a97229d.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_14,color_FFFFFF,t_70,g_se,x_16">
 	<p align="center">
 	    <a href="https://v3.vuejs.org/" target="_blank">
 	        <img src="https://img.shields.io/badge/vue.js-vue3.x-green" alt="vue">
@ -20,7 +20,7 @@
 	<p>&nbsp;</p>
 </div>

-#### 🌈 介绍 基础版 js（不带国际化，基于 vue-next-admin-template V2.0.2 版）
+#### 🌈 介绍 基础版 js（不带国际化，基于 vue-next-admin-template V2.1.1 版）

 基于 vue3.x + CompositionAPI + vite + element plus + vue-router-next，适配手机、平板、pc 的后台开源免费模板，希望减少工作量，帮助大家实现快速开发。

@ -41,9 +41,9 @@

 #### 🏭 环境支持

-| Edge                                                                     | last 2 versions                                                                   | last 2 versions                                                                | last 2 versions                                                                |
-| ------------------------------------------------------------------------ | --------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------ |
-| ![Edge](https://cdn.jsdelivr.net/npm/@browser-logos/edge/edge_32x32.png) | ![Firefox](https://cdn.jsdelivr.net/npm/@browser-logos/firefox/firefox_32x32.png) | ![Chrome](https://cdn.jsdelivr.net/npm/@browser-logos/chrome/chrome_32x32.png) | ![Safari](https://cdn.jsdelivr.net/npm/@browser-logos/safari/safari_32x32.png) |
+| Edge      | Firefox      | Chrome      | Safari      |
+| --------- | ------------ | ----------- | ----------- |
+| Edge ≥ 79 | Firefox ≥ 78 | Chrome ≥ 64 | Safari ≥ 12 |

 > 由于 Vue3 不再支持 IE11，故而 ElementPlus 也不支持 IE11 及之前版本。

@ -73,7 +73,7 @@ cnpm run build

 #### 💯 学习交流加 QQ 群

- 若加群了没同意（一般秒过），那就是群满了（500 人群），请换一个群试试，3 群未满
+- 若加群了没同意（一般秒过），那就是群满了（500 人群），请换一个群试试。群会定期清理半年（6 个月）未发言的群友，资源有限，请谅解。建议勿加多群，可能会误伤！
 - 查看开发文档、<a href="https://lyt-top.gitee.io/vue-next-admin-preview/#/login" target="_blank">vue-next-admin</a> 开发文档正在编写中...
 - 群号码：
  1 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">665452019</a>
@ -81,19 +81,25 @@ cnpm run build
  3 群：<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=02EWb5P2JkP-8iwzaDadgFdxA0HSHPpn&jump_from=webapi">795345435</a>

  <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi">
-  	<img src="https://gitee.com/lyt-top/vue-next-admin-images/raw/master/user/qq1.png" width="220" height="220" alt="vue-next-admin 讨论群1" title="vue-next-admin 讨论群1"/>
+  <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://gitee.com/lyt-top/vue-next-admin-images/raw/master/user/qq2.png" width="220" height="220" alt="vue-next-admin 讨论群" title="vue-next-admin 讨论群2"/>
+  <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://gitee.com/lyt-top/vue-next-admin-images/raw/master/user/qq3.png" width="220" height="220" alt="vue-next-admin 讨论群3" title="vue-next-admin 讨论群3"/>
+  <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://github.com/PandaGoAdmin/PandaX">@熊猫 PandaGoAdmin</a>
- <a target="_blank" href="https://www.gnet.top/public">@甜蜜蜜 GoPro 平台</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>
+- <a target="_blank" href="https://gitee.com/tiger1103/gfast/tree/os-v3/">@游子 GFast-V3</a>
+- <a target="_blank" href="https://gitee.com/diygw/diygw-ui-php/">@diygw.com gw-ui-php</a>
+- <a target="_blank" href="https://gitee.com/zsvg/vboot-net">@zsvg vboot-net</a>
+- <a target="_blank" href="https://gitee.com/zsvg/vboot-java">@zsvg vboot-java</a>
+- <a target="_blank" href="https://gitee.com/wonderful-code/buildadmin">@青红造了个白 buildadmin</a>

 #### ❤️ 鸣谢列表

@ -112,14 +118,16 @@ 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://pinia.vuejs.org/" target="_blank">pinia</a>

 #### 💕 特别感谢

 特别感谢老哥们的建议、指导与帮忙，谢谢！

 - <a href="https://gitee.com/click33/sa-plus" target="_blank">@省长</a>
- <a href="https://gitee.com/jskz/Jskz-SpringCloud" target="_blank">@唐参
+- <a href="https://gitee.com/jskz/Jskz-SpringCloud" target="_blank">@唐参</a>
 - <a href="https://gitee.com/chuange" target="_blank">@川歌</a>
+- @华仔

 #### 💌 支持作者

--- a/jsconfig.json
+++ b/jsconfig.json
@ -14,6 +14,7 @@
 		"paths": {
 			"/@/*": ["src/*"]
 		},
-		"moduleResolution": "node"
+		"moduleResolution": "node",
+		"strict": true
 	}
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "vue-next-admin-template-js",
-	"version": "2.0.2",
+	"version": "2.1.1",
 	"description": "vue3 vite next admin template js setup",
 	"author": "lyt_20201208",
 	"license": "MIT",
@ -10,33 +10,34 @@
 		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
 	},
 	"dependencies": {
-		"@element-plus/icons-vue": "^1.0.1",
-		"axios": "^0.26.0",
-		"echarts": "^5.3.0",
-		"element-plus": "^2.0.4",
+		"@element-plus/icons-vue": "^2.0.4",
+		"axios": "^0.27.2",
+		"echarts": "^5.3.2",
+		"element-plus": "^2.2.5",
+		"js-cookie": "^3.0.1",
 		"mitt": "^3.0.0",
 		"nprogress": "^0.2.0",
+		"pinia": "^2.0.14",
 		"qrcodejs2-fixes": "^0.0.2",
 		"screenfull": "^6.0.1",
-		"sortablejs": "^1.14.0",
-		"vue": "^3.2.31",
-		"vue-clipboard3": "^1.0.1",
-		"vue-router": "^4.0.13",
-		"vuex": "^4.0.2"
+		"sortablejs": "^1.15.0",
+		"vue": "^3.2.37",
+		"vue-clipboard3": "^2.0.0",
+		"vue-router": "^4.0.16"
 	},
 	"devDependencies": {
-		"@vitejs/plugin-vue": "^2.2.4",
-		"@vue/compiler-sfc": "^3.2.31",
-		"dotenv": "^16.0.0",
-		"eslint": "^8.10.0",
-		"eslint-plugin-vue": "^8.5.0",
-		"prettier": "^2.5.1",
-		"sass": "^1.49.9",
-		"sass-loader": "^12.6.0",
-		"unplugin-auto-import": "^0.6.1",
-		"vite": "^2.8.6",
+		"@vitejs/plugin-vue": "^2.3.3",
+		"@vue/compiler-sfc": "^3.2.37",
+		"dotenv": "^16.0.1",
+		"eslint": "^8.17.0",
+		"eslint-plugin-vue": "^9.1.1",
+		"prettier": "^2.6.2",
+		"sass": "^1.52.3",
+		"sass-loader": "^13.0.0",
+		"unplugin-auto-import": "^0.8.7",
+		"vite": "^2.9.12",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
-		"vue-eslint-parser": "^8.3.0"
+		"vue-eslint-parser": "^9.0.2"
 	},
 	"browserslist": [
 		"> 1%",
--- a/src/App.vue
+++ b/src/App.vue
@ -1,14 +1,17 @@
 <template>
 	<el-config-provider :size="getGlobalComponentSize" :locale="zhCn">
-		<router-view v-show="getThemeConfig.lockScreenTime !== 0" />
-		<LockScreen v-if="getThemeConfig.isLockScreen" />
-		<Setings ref="setingsRef" v-show="getThemeConfig.lockScreenTime !== 0" />
-		<CloseFull />
+		<router-view v-show="themeConfig.lockScreenTime > 1" />
+		<LockScreen v-if="themeConfig.isLockScreen" />
+		<Setings ref="setingsRef" v-show="themeConfig.lockScreenTime > 1" />
+		<CloseFull v-if="!themeConfig.isLockScreen" />
 	</el-config-provider>
 </template>

 <script setup name="app">
 import zhCn from 'element-plus/es/locale/lang/zh-cn';
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import other from '/@/utils/other';
 import { Local, Session } from '/@/utils/storage';
 import setIntroduction from '/@/utils/setIconfont';
@ -19,14 +22,12 @@ import CloseFull from '/@/layout/navBars/breadcrumb/closeFull.vue';
 const { proxy } = getCurrentInstance();
 const setingsRef = ref();
 const route = useRoute();
-const store = useStore();
-// 获取布局配置信息
-const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
-});
+const stores = useTagsViewRoutes();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 // 获取全局组件大小
 const getGlobalComponentSize = computed(() => {
-	return other.globalComponentSize;
+	return other.globalComponentSize();
 });
 // 布局配置弹窗打开
 const openSetingsDrawer = () => {
@ -48,20 +49,27 @@ onMounted(() => {
 		});
 		// 获取缓存中的布局配置
 		if (Local.get('themeConfig')) {
-			store.dispatch('themeConfig/setThemeConfig', Local.get('themeConfig'));
+			storesThemeConfig.setThemeConfig(Local.get('themeConfig'));
 			document.documentElement.style.cssText = Local.get('themeConfigStyle');
 		}
 		// 获取缓存中的全屏配置
 		if (Session.get('isTagsViewCurrenFull')) {
-			store.dispatch('tagsViewRoutes/setCurrenFullscreen', Session.get('isTagsViewCurrenFull'));
+			stores.setCurrenFullscreen(Session.get('isTagsViewCurrenFull'));
 		}
 	});
 });
+// 页面销毁时，关闭监听布局配置/i18n监听
+onUnmounted(() => {
+	proxy.mittBus.off('openSetingsDrawer', () => {});
+});
 // 监听路由的变化，设置网站标题
 watch(
 	() => route.path,
 	() => {
 		other.useTitle();
+	},
+	{
+		deep: true,
 	}
 );
 </script>
--- a/src/components/iconSelector/index.vue
+++ b/src/components/iconSelector/index.vue
@ -1,10 +1,17 @@
 <template>
-	<div class="icon-selector">
-		<el-popover placement="bottom" :width="state.fontIconWidth" v-model:visible="state.fontIconVisible" popper-class="icon-selector-popper">
+	<div class="icon-selector w100 h100">
+		<el-popover
+			placement="bottom"
+			:width="fontIconWidth"
+			trigger="click"
+			transition="el-zoom-in-top"
+			popper-class="icon-selector-popper"
+			@show="onPopoverShow"
+		>
 			<template #reference>
 				<el-input
-					v-model="state.fontIconSearch"
-					:placeholder="state.fontIconPlaceholder"
+					v-model="fontIconSearch"
+					:placeholder="fontIconPlaceholder"
 					:clearable="clearable"
 					:disabled="disabled"
 					:size="size"
@ -15,35 +22,29 @@
 				>
 					<template #prepend>
 						<SvgIcon
-							:name="state.fontIconPrefix === '' ? prepend : state.fontIconPrefix"
+							:name="fontIconPrefix === '' ? prepend : fontIconPrefix"
 							class="font14"
-							v-if="state.fontIconPrefix === '' ? prepend?.indexOf('ele-') > -1 : state.fontIconPrefix?.indexOf('ele-') > -1"
+							v-if="fontIconPrefix === '' ? prepend?.indexOf('ele-') > -1 : fontIconPrefix?.indexOf('ele-') > -1"
 						/>
-						<i v-else :class="state.fontIconPrefix === '' ? prepend : state.fontIconPrefix" class="font14"></i>
+						<i v-else :class="fontIconPrefix === '' ? prepend : fontIconPrefix" class="font14"></i>
 					</template>
 				</el-input>
 			</template>
-			<transition name="el-zoom-in-top">
-				<div class="icon-selector-warp" v-show="state.fontIconVisible">
+			<template #default>
+				<div class="icon-selector-warp">
 					<div class="icon-selector-warp-title flex">
 						<div class="flex-auto">{{ title }}</div>
 						<div class="icon-selector-warp-title-tab" v-if="type === 'all'">
-							<span :class="{ 'span-active': state.fontIconType === 'ali' }" @click="onIconChange('ali')" class="ml10" title="iconfont 图标"
-								>ali</span
-							>
-							<span :class="{ 'span-active': state.fontIconType === 'ele' }" @click="onIconChange('ele')" class="ml10" title="elementPlus 图标"
-								>ele</span
-							>
-							<span :class="{ 'span-active': state.fontIconType === 'awe' }" @click="onIconChange('awe')" class="ml10" title="fontawesome 图标"
-								>awe</span
-							>
+							<span :class="{ 'span-active': fontIconType === 'ali' }" @click="onIconChange('ali')" class="ml10" title="iconfont 图标">ali</span>
+							<span :class="{ 'span-active': fontIconType === 'ele' }" @click="onIconChange('ele')" class="ml10" title="elementPlus 图标">ele</span>
+							<span :class="{ 'span-active': fontIconType === 'awe' }" @click="onIconChange('awe')" class="ml10" title="fontawesome 图标">awe</span>
 						</div>
 					</div>
 					<div class="icon-selector-warp-row">
 						<el-scrollbar ref="selectorScrollbarRef">
 							<el-row :gutter="10" v-if="fontIconSheetsFilterList.length > 0">
 								<el-col :xs="6" :sm="4" :md="4" :lg="4" :xl="4" @click="onColClick(v)" v-for="(v, k) in fontIconSheetsFilterList" :key="k">
-									<div class="icon-selector-warp-item" :class="{ 'icon-selector-active': state.fontIconPrefix === v }">
+									<div class="icon-selector-warp-item" :class="{ 'icon-selector-active': fontIconPrefix === v }">
 										<div class="flex-margin">
 											<div class="icon-selector-warp-item-value">
 												<SvgIcon :name="v" />
@ -56,191 +57,195 @@
 						</el-scrollbar>
 					</div>
 				</div>
-			</transition>
+			</template>
 		</el-popover>
 	</div>
 </template>

-<script setup name="iconSelector">
+<script lang="ts">
+import { ref, toRefs, reactive, onMounted, nextTick, computed, watch, defineComponent } from 'vue';
 import initIconfont from '/@/utils/getStyleSheets';

-// 传值 setup="props"
-const props = defineProps({
-	// 输入框前置内容
-	prepend: {
-		type: String,
-		default: () => 'ele-Pointer',
+export default defineComponent({
+	name: 'iconSelector',
+	emits: ['update:modelValue', 'get', 'clear'],
+	props: {
+		// 输入框前置内容
+		prepend: {
+			type: String,
+			default: () => 'ele-Pointer',
+		},
+		// 输入框占位文本
+		placeholder: {
+			type: String,
+			default: () => '请输入内容搜索图标或者选择图标',
+		},
+		// 输入框占位文本
+		size: {
+			type: String,
+			default: () => 'default',
+		},
+		// 弹窗标题
+		title: {
+			type: String,
+			default: () => '请选择图标',
+		},
+		// icon 图标类型
+		type: {
+			type: String,
+			default: () => 'ele',
+		},
+		// 禁用
+		disabled: {
+			type: Boolean,
+			default: () => false,
+		},
+		// 是否可清空
+		clearable: {
+			type: Boolean,
+			default: () => true,
+		},
+		// 自定义空状态描述文字
+		emptyDescription: {
+			type: String,
+			default: () => '无相关图标',
+		},
+		// 双向绑定值，默认为 modelValue，
+		// 参考：https://v3.cn.vuejs.org/guide/migration/v-model.html#%E8%BF%81%E7%A7%BB%E7%AD%96%E7%95%A5
+		// 参考：https://v3.cn.vuejs.org/guide/component-custom-events.html#%E5%A4%9A%E4%B8%AA-v-model-%E7%BB%91%E5%AE%9A
+		modelValue: String,
 	},
-	// 输入框占位文本
-	placeholder: {
-		type: String,
-		default: () => '请输入内容搜索图标或者选择图标',
-	},
-	// 输入框占位文本
-	size: {
-		type: String,
-		default: () => 'default',
-	},
-	// 弹窗标题
-	title: {
-		type: String,
-		default: () => '请选择图标',
-	},
-	// icon 图标类型
-	type: {
-		type: String,
-		default: () => 'ele',
-	},
-	// 禁用
-	disabled: {
-		type: Boolean,
-		default: () => false,
-	},
-	// 是否可清空
-	clearable: {
-		type: Boolean,
-		default: () => true,
-	},
-	// 自定义空状态描述文字
-	emptyDescription: {
-		type: String,
-		default: () => '无相关图标',
-	},
-	// 双向绑定值，字段名为固定，改了之后将不生效
-	// 参考：https://v3.cn.vuejs.org/guide/migration/v-model.html#%E8%BF%81%E7%A7%BB%E7%AD%96%E7%95%A5
-	modelValue: String,
-});
-
-// 事件
-const emit = defineEmits(['update:modelValue', 'get', 'clear']);
-
-const inputWidthRef = ref();
-const selectorScrollbarRef = ref();
-const state = reactive({
-	fontIconPrefix: '',
-	fontIconVisible: false,
-	fontIconWidth: 0,
-	fontIconSearch: '',
-	fontIconSheetsList: [],
-	fontIconPlaceholder: '',
-	fontIconType: 'ali',
-});
-
-// 处理 input 获取焦点时，modelValue 有值时，改变 input 的 placeholder 值
-const onIconFocus = () => {
-	state.fontIconVisible = true;
-	if (!props.modelValue) return false;
-	state.fontIconSearch = '';
-	state.fontIconPlaceholder = props.modelValue;
-};
-
-// 处理 input 失去焦点时，为空将清空 input 值，为点击选中图标时，将取原先值
-const onIconBlur = () => {
-	setTimeout(() => {
-		const icon = state.fontIconSheetsList.filter((icon) => icon === state.fontIconSearch);
-		if (icon.length <= 0) state.fontIconSearch = '';
-	}, 300);
-};
-
-// 处理 icon 双向绑定数值回显
-const initModeValueEcho = () => {
-	if (props.modelValue === '') return false;
-	state.fontIconPlaceholder = props.modelValue;
-	state.fontIconPrefix = props.modelValue;
-};
-
-// 图标搜索及图标数据显示
-const fontIconSheetsFilterList = computed(() => {
-	if (!state.fontIconSearch) return state.fontIconSheetsList;
-	let search = state.fontIconSearch.trim().toLowerCase();
-	return state.fontIconSheetsList.filter((item) => {
-		if (item.toLowerCase().indexOf(search) !== -1) return item;
-	});
-});
-
-// 获取 input 的宽度
-const getInputWidth = () => {
-	nextTick(() => {
-		state.fontIconWidth = inputWidthRef.value.$el.offsetWidth;
-	});
-};
-
-// 监听页面宽度改变
-const initResize = () => {
-	window.addEventListener('resize', () => {
-		getInputWidth();
-	});
-};
-
-// 初始化数据
-const initFontIconData = async (type) => {
-	state.fontIconSheetsList = [];
-	if (type === 'ali') {
-		await initIconfont.ali().then((res) => {
-			// 阿里字体图标使用 `iconfont xxx`
-			state.fontIconSheetsList = res.map((i) => `iconfont ${i}`);
+	setup(props, { emit }) {
+		const inputWidthRef = ref();
+		const selectorScrollbarRef = ref();
+		const state = reactive({
+			fontIconPrefix: '',
+			fontIconWidth: 0,
+			fontIconSearch: '',
+			fontIconTabsIndex: 0,
+			fontIconSheetsList: [],
+			fontIconPlaceholder: '',
+			fontIconType: 'ali',
+			fontIconShow: true,
 		});
-	} else if (type === 'ele') {
-		await initIconfont.ele().then((res) => {
-			state.fontIconSheetsList = res;
+		// 处理 input 获取焦点时，modelValue 有值时，改变 input 的 placeholder 值
+		const onIconFocus = () => {
+			if (!props.modelValue) return false;
+			state.fontIconSearch = '';
+			state.fontIconPlaceholder = props.modelValue;
+		};
+		// 处理 input 失去焦点时，为空将清空 input 值，为点击选中图标时，将取原先值
+		const onIconBlur = () => {
+			setTimeout(() => {
+				const icon = state.fontIconSheetsList.filter((icon) => icon === state.fontIconSearch);
+				if (icon.length <= 0) state.fontIconSearch = '';
+			}, 300);
+		};
+		// 处理 icon 双向绑定数值回显
+		const initModeValueEcho = () => {
+			if (props.modelValue === '') return (state.fontIconPlaceholder = props.placeholder);
+			state.fontIconPlaceholder = props.modelValue;
+			state.fontIconPrefix = props.modelValue;
+		};
+		// 处理 icon type 类型为 all 时，类型 ali、ele、awe 回显问题
+		const initFontIconTypeEcho = () => {
+			if (props.modelValue?.indexOf('iconfont') > -1) onIconChange('ali');
+			else if (props.modelValue?.indexOf('ele-') > -1) onIconChange('ele');
+			else if (props.modelValue?.indexOf('fa') > -1) onIconChange('awe');
+			else onIconChange('ali');
+		};
+		// 图标搜索及图标数据显示
+		const fontIconSheetsFilterList = computed(() => {
+			if (!state.fontIconSearch) return state.fontIconSheetsList;
+			let search = state.fontIconSearch.trim().toLowerCase();
+			return state.fontIconSheetsList.filter((item) => {
+				if (item.toLowerCase().indexOf(search) !== -1) return item;
+			});
 		});
-	} else if (type === 'awe') {
-		await initIconfont.awe().then((res) => {
-			// fontawesome字体图标使用 `fa xxx`
-			state.fontIconSheetsList = res.map((i) => `fa ${i}`);
+		// 获取 input 的宽度
+		const getInputWidth = () => {
+			nextTick(() => {
+				state.fontIconWidth = inputWidthRef.value.$el.offsetWidth;
+			});
+		};
+		// 监听页面宽度改变
+		const initResize = () => {
+			window.addEventListener('resize', () => {
+				getInputWidth();
+			});
+		};
+		// 初始化数据
+		const initFontIconData = async (type) => {
+			state.fontIconSheetsList = [];
+			if (type === 'ali') {
+				await initIconfont.ali().then((res) => {
+					// 阿里字体图标使用 `iconfont xxx`
+					state.fontIconSheetsList = res.map((i) => `iconfont ${i}`);
+				});
+			} else if (type === 'ele') {
+				await initIconfont.ele().then((res) => {
+					state.fontIconSheetsList = res;
+				});
+			} else if (type === 'awe') {
+				await initIconfont.awe().then((res) => {
+					// fontawesome字体图标使用 `fa xxx`
+					state.fontIconSheetsList = res.map((i) => `fa ${i}`);
+				});
+			}
+			// 初始化 input 的 placeholder
+			// 参考（单项数据流）：https://cn.vuejs.org/v2/guide/components-props.html?#%E5%8D%95%E5%90%91%E6%95%B0%E6%8D%AE%E6%B5%81
+			state.fontIconPlaceholder = props.placeholder;
+			// 初始化双向绑定回显
+			initModeValueEcho();
+		};
+		// 图标点击切换
+		const onIconChange = (type) => {
+			state.fontIconType = type;
+			initFontIconData(type);
+		};
+		// 获取当前点击的 icon 图标
+		const onColClick = (v) => {
+			state.fontIconPlaceholder = v;
+			state.fontIconPrefix = v;
+			emit('get', state.fontIconPrefix);
+			emit('update:modelValue', state.fontIconPrefix);
+		};
+		// 清空当前点击的 icon 图标
+		const onClearFontIcon = () => {
+			state.fontIconPrefix = '';
+			emit('clear', state.fontIconPrefix);
+			emit('update:modelValue', state.fontIconPrefix);
+		};
+		// 监听 Popover 打开，用于双向绑定值回显
+		const onPopoverShow = () => {
+			initModeValueEcho();
+			initFontIconTypeEcho();
+		};
+		// 页面加载时
+		onMounted(() => {
+			initModeValueEcho();
+			initResize();
+			getInputWidth();
 		});
-	}
-	// 初始化 input 的 placeholder
-	// 参考（单项数据流）：https://cn.vuejs.org/v2/guide/components-props.html?#%E5%8D%95%E5%90%91%E6%95%B0%E6%8D%AE%E6%B5%81
-	state.fontIconPlaceholder = props.placeholder;
-	// 初始化双向绑定回显
-	initModeValueEcho();
-	// 切换时，滚动条置顶。感兴趣可以使用 keep-alive <component :is="xxx"/> 进行缓存
-	selectorScrollbarRef.value.wrap$.scrollTop = 0;
-};
-
-// 图标点击切换
-const onIconChange = (type) => {
-	state.fontIconType = type;
-	initFontIconData(type);
-};
-
-// 获取当前点击的 icon 图标
-const onColClick = (v) => {
-	state.fontIconPlaceholder = v;
-	state.fontIconVisible = false;
-	state.fontIconPrefix = v;
-	emit('get', state.fontIconPrefix);
-	emit('update:modelValue', state.fontIconPrefix);
-};
-
-// 清空当前点击的 icon 图标
-const onClearFontIcon = () => {
-	state.fontIconPrefix = '';
-	emit('clear', state.fontIconPrefix);
-	emit('update:modelValue', state.fontIconPrefix);
-};
-
-// 页面加载时
-onMounted(() => {
-	// 判断默认进来是什么类型图标，进行 tab 回显
-	if (props.type === 'all') {
-		if (props.modelValue?.indexOf('iconfont') > -1) onIconChange('ali');
-		else if (props.modelValue?.indexOf('element') > -1) onIconChange('ele');
-		else if (props.modelValue?.indexOf('fa') > -1) onIconChange('awe');
-		else onIconChange('ali');
-	} else {
-		onIconChange(props.type);
-	}
-	initResize();
-	getInputWidth();
+		// 监听双向绑定 modelValue 的变化
+		watch(
+			() => props.modelValue,
+			() => {
+				initModeValueEcho();
+			}
+		);
+		return {
+			inputWidthRef,
+			selectorScrollbarRef,
+			fontIconSheetsFilterList,
+			onColClick,
+			onIconChange,
+			onClearFontIcon,
+			onIconFocus,
+			onIconBlur,
+			onPopoverShow,
+			...toRefs(state),
+		};
+	},
 });
-
-// 监听双向绑定 modelValue 的变化
-watch(
-	() => props.modelValue,
-	() => {
-		initModeValueEcho();
-	}
-);
 </script>
--- a/src/components/svgIcon/index.vue
+++ b/src/components/svgIcon/index.vue
@ -1,8 +1,17 @@
-<script lang="ts">
-// 渲染函数：https://v3.cn.vuejs.org/guide/render-function.html
-import { h, resolveComponent } from 'vue';
+<template>
+	<i v-if="isShowIconSvg" class="el-icon" :style="setIconSvgStyle">
+		<component :is="getIconName" />
+	</i>
+	<div v-else-if="isShowIconImg" :style="setIconImgOutStyle">
+		<img :src="getIconName" :style="setIconSvgInsStyle" />
+	</div>
+	<i v-else :class="getIconName" :style="setIconSvgStyle" />
+</template>

-export default {
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+
+export default defineComponent({
 	name: 'svgIcon',
 	props: {
 		// svg 图标组件名字
@ -20,16 +29,45 @@ export default {
 		},
 	},
 	setup(props) {
-		// 定义变量
+		// 在线链接、本地引入地址前缀
 		const linesString = ['https', 'http', '/src', '/assets', import.meta.env.VITE_PUBLIC_PATH];
-		const onLineStyle = `font-size: ${props.size}px;color: ${props.color}`;
-		const localsStyle = `width: ${props.size}px;height: ${props.size}px`;
-		const eleSetStyle = { class: 'el-icon', style: onLineStyle };

-		// 逻辑判断
-		if (props.name?.startsWith('ele-')) return () => h('i', eleSetStyle, [props.name === 'ele-' ? '' : h(resolveComponent(props.name))]);
-		else if (linesString.find((str) => props.name?.startsWith(str))) return () => h('img', { src: props.name, style: localsStyle });
-		else return () => h('i', { class: props.name, style: onLineStyle });
+		// 获取 icon 图标名称
+		const getIconName = computed(() => {
+			return props?.name;
+		});
+		// 用于判断 element plus 自带 svg 图标的显示、隐藏
+		const isShowIconSvg = computed(() => {
+			return props?.name?.startsWith('ele-');
+		});
+		// 用于判断在线链接、本地引入等图标显示、隐藏
+		const isShowIconImg = computed(() => {
+			return linesString.find((str) => props.name?.startsWith(str));
+		});
+		// 设置图标样式
+		const setIconSvgStyle = computed(() => {
+			return `font-size: ${props.size}px;color: ${props.color};`;
+		});
+		// 设置图片样式
+		const setIconImgOutStyle = computed(() => {
+			return `width: ${props.size}px;height: ${props.size}px;display: inline-block;overflow: hidden;`;
+		});
+		// 设置图片样式
+		// https://gitee.com/lyt-top/vue-next-admin/issues/I59ND0
+		const setIconSvgInsStyle = computed(() => {
+			const filterStyle = [];
+			const compatibles = ['-webkit', '-ms', '-o', '-moz'];
+			compatibles.forEach((j) => filterStyle.push(`${j}-filter: drop-shadow(${props.color} 30px 0);`));
+			return `width: ${props.size}px;height: ${props.size}px;position: relative;left: -${props.size}px;${filterStyle.join('')}`;
+		});
+		return {
+			getIconName,
+			isShowIconSvg,
+			isShowIconImg,
+			setIconSvgStyle,
+			setIconImgOutStyle,
+			setIconSvgInsStyle,
+		};
 	},
-};
+});
 </script>
--- a/src/layout/component/aside.vue
+++ b/src/layout/component/aside.vue
@ -10,22 +10,28 @@
 </template>

 <script setup name="layoutAside">
+import { storeToRefs } from 'pinia';
+import pinia from '/@/stores/index';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import Logo from '/@/layout/logo/index.vue';
 import Vertical from '/@/layout/navMenu/vertical.vue';

 const { proxy } = getCurrentInstance();
-const store = useStore();
+const stores = useRoutesList();
+const storesThemeConfig = useThemeConfig();
+const storesTagsViewRoutes = useTagsViewRoutes();
+const { routesList } = storeToRefs(stores);
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
 const state = reactive({
 	menuList: [],
 	clientWidth: '',
 });
-// 获取卡片全屏信息
-const isTagsViewCurrenFull = computed(() => {
-	return store.state.tagsViewRoutes.isTagsViewCurrenFull;
-});
 // 设置菜单展开/收起时的宽度
 const setCollapseStyle = computed(() => {
-	const { layout, isCollapse, menuBar } = store.state.themeConfig.themeConfig;
+	const { layout, isCollapse, menuBar } = themeConfig.value;
 	const asideBrTheme = ['#FFFFFF', '#FFF', '#fff', '#ffffff'];
 	const asideBrColor = asideBrTheme.includes(menuBar) ? 'layout-el-aside-br-color' : '';
 	// 判断是否是手机端
@ -46,18 +52,12 @@ const setCollapseStyle = computed(() => {
 	} else {
 		if (layout === 'columns') {
 			// 分栏布局，菜单收起时宽度给 1px
-			if (isCollapse) {
-				return [asideBrColor, 'layout-aside-pc-1'];
-			} else {
-				return [asideBrColor, 'layout-aside-pc-220'];
-			}
+			if (isCollapse) return [asideBrColor, 'layout-aside-pc-1'];
+			else return [asideBrColor, 'layout-aside-pc-220'];
 		} else {
 			// 其它布局给 64px
-			if (isCollapse) {
-				return [asideBrColor, 'layout-aside-pc-64'];
-			} else {
-				return [asideBrColor, 'layout-aside-pc-220'];
-			}
+			if (isCollapse) return [asideBrColor, 'layout-aside-pc-64'];
+			else return [asideBrColor, 'layout-aside-pc-220'];
 		}
 	}
 });
@ -66,18 +66,18 @@ const closeLayoutAsideMobileMode = () => {
 	const el = document.querySelector('.layout-aside-mobile-mode');
 	el && el.parentNode?.removeChild(el);
 	const clientWidth = document.body.clientWidth;
-	if (clientWidth < 1000) store.state.themeConfig.themeConfig.isCollapse = false;
+	if (clientWidth < 1000) themeConfig.value.isCollapse = false;
 	document.body.setAttribute('class', '');
 };
 // 设置显示/隐藏 logo
 const setShowLogo = computed(() => {
-	let { layout, isShowLogo } = store.state.themeConfig.themeConfig;
+	let { layout, isShowLogo } = themeConfig.value;
 	return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
 });
 // 设置/过滤路由（非静态路由/是否显示在菜单中）
 const setFilterRoutes = () => {
-	if (store.state.themeConfig.themeConfig.layout === 'columns') return false;
-	state.menuList = filterRoutesFun(store.state.routesList.routesList);
+	if (themeConfig.value.layout === 'columns') return false;
+	state.menuList = filterRoutesFun(routesList.value);
 };
 // 路由过滤递归函数
 const filterRoutesFun = (arr) => {
@ -95,24 +95,30 @@ const initMenuFixed = (clientWidth) => {
 };
 // 鼠标移入、移出
 const onAsideEnterLeave = (bool) => {
-	let { layout } = store.state.themeConfig.themeConfig;
+	let { layout } = themeConfig.value;
 	if (layout !== 'columns') return false;
 	if (!bool) proxy.mittBus.emit('restoreDefault');
-	store.dispatch('routesList/setColumnsMenuHover', bool);
+	stores.setColumnsMenuHover(bool);
 };
 // 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-watch(store.state.themeConfig.themeConfig, (val) => {
+watch(themeConfig.value, (val) => {
 	if (val.isShowLogoChange !== val.isShowLogo) {
 		if (!proxy.$refs.layoutAsideScrollbarRef) return false;
 		proxy.$refs.layoutAsideScrollbarRef.update();
 	}
 });
 // 监听vuex值的变化，动态赋值给菜单中
-watch(store.state, (val) => {
-	let { layout, isClassicSplitMenu } = val.themeConfig.themeConfig;
-	if (layout === 'classic' && isClassicSplitMenu) return false;
-	setFilterRoutes();
-});
+watch(
+	pinia.state,
+	(val) => {
+		let { layout, isClassicSplitMenu } = val.themeConfig.themeConfig;
+		if (layout === 'classic' && isClassicSplitMenu) return false;
+		setFilterRoutes();
+	},
+	{
+		deep: true,
+	}
+);
 // 页面加载前
 onBeforeMount(() => {
 	initMenuFixed(document.body.clientWidth);
@ -123,7 +129,7 @@ onBeforeMount(() => {
 		state.menuList = res.children;
 	});
 	proxy.mittBus.on('setSendClassicChildren', (res) => {
-		let { layout, isClassicSplitMenu } = store.state.themeConfig.themeConfig;
+		let { layout, isClassicSplitMenu } = themeConfig.value;
 		if (layout === 'classic' && isClassicSplitMenu) {
 			state.menuList = [];
 			state.menuList = res.children;
--- a/src/layout/component/columnsAside.vue
+++ b/src/layout/component/columnsAside.vue
@ -15,28 +15,30 @@
 					:class="{ 'layout-columns-active': state.liIndex === k, 'layout-columns-hover': state.liHoverIndex === k }"
 					:title="v.meta.title"
 				>
-					<div :class="setColumnsAsidelayout" v-if="!v.meta.isLink || (v.meta.isLink && v.meta.isIframe)">
+					<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">
 							{{
-								v.meta.title && v.meta.title.length >= 4 ? v.meta.title.substr(0, setColumnsAsidelayout === 'columns-vertical' ? 4 : 3) : 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>
-					<div :class="setColumnsAsidelayout" v-else>
+					<div :class="themeConfig.columnsAsideLayout" v-else>
 						<a :href="v.meta.isLink" target="_blank">
 							<SvgIcon :name="v.meta.icon" />
 							<div class="columns-vertical-title font12">
 								{{
 									v.meta.title && v.meta.title.length >= 4
-										? v.meta.title.substr(0, setColumnsAsidelayout === 'columns-vertical' ? 4 : 3)
+										? v.meta.title.substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
 										: v.meta.title
 								}}
 							</div>
 						</a>
 					</div>
 				</li>
-				<div ref="columnsAsideActiveRef" :class="setColumnsAsideStyle"></div>
+				<div ref="columnsAsideActiveRef" :class="themeConfig.columnsAsideStyle"></div>
 			</ul>
 		</el-scrollbar>
 	</div>
@ -44,10 +46,18 @@

 <script setup name="layoutColumnsAside">
 import { onBeforeRouteUpdate } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import pinia from '/@/stores/index';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+
 const columnsAsideOffsetTopRefs = ref([]);
 const columnsAsideActiveRef = ref();
 const { proxy } = getCurrentInstance();
-const store = useStore();
+const stores = useRoutesList();
+const storesThemeConfig = useThemeConfig();
+const { routesList, isColumnsMenuHover, isColumnsNavHover } = storeToRefs(stores);
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const route = useRoute();
 const router = useRouter();
 const state = reactive({
@ -59,14 +69,6 @@ const state = reactive({
 	difference: 0,
 	routeSplit: [],
 });
-// 设置分栏高亮风格
-const setColumnsAsideStyle = computed(() => {
-	return store.state.themeConfig.themeConfig.columnsAsideStyle;
-});
-// 设置分栏布局风格
-const setColumnsAsidelayout = computed(() => {
-	return store.state.themeConfig.themeConfig.columnsAsideLayout;
-});
 // 设置菜单高亮位置移动
 const setColumnsAsideMove = (k) => {
 	state.liIndex = k;
@ -86,15 +88,14 @@ const onColumnsAsideMenuMouseenter = (v, k) => {
 	state.liOldIndex = k;
 	state.liHoverIndex = k;
 	proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(path));
-	store.dispatch('routesList/setColumnsMenuHover', false);
-	store.dispatch('routesList/setColumnsNavHover', true);
+	stores.setColumnsMenuHover(false);
+	stores.setColumnsNavHover(true);
 };
 // 鼠标移走时，显示原来的子级菜单
 const onColumnsAsideMenuMouseleave = async () => {
-	await store.dispatch('routesList/setColumnsNavHover', false);
+	await stores.setColumnsNavHover(false);
 	// 添加延时器，防止拿到的 store.state.routesList 值不是最新的
 	setTimeout(() => {
-		const { isColumnsMenuHover, isColumnsNavHover } = store.state.routesList;
 		if (!isColumnsMenuHover && !isColumnsNavHover) proxy.mittBus.emit('restoreDefault');
 	}, 100);
 };
@ -106,7 +107,7 @@ const onColumnsAsideDown = (k) => {
 };
 // 设置/过滤路由（非静态路由/是否显示在菜单中）
 const setFilterRoutes = () => {
-	state.columnsAsideList = filterRoutesFun(store.state.routesList.routesList);
+	state.columnsAsideList = filterRoutesFun(routesList.value);
 	const resData = setSendChildren(route.path);
 	if (Object.keys(resData).length <= 0) return false;
 	onColumnsAsideDown(resData.item[0].k);
@ -149,17 +150,23 @@ const setColumnsMenuHighlight = (path) => {
 	}, 0);
 };
 // 监听布局配置信息的变化，动态增加菜单高亮位置移动像素
-watch(store.state, (val) => {
-	val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
-	if (!val.routesList.isColumnsMenuHover && !val.routesList.isColumnsNavHover) {
-		state.liHoverIndex = null;
-		proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(route.path));
-	} else {
-		state.liHoverIndex = state.liOldIndex;
-		if (!state.liOldPath) return false;
-		proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(state.liOldPath));
+watch(
+	pinia.state,
+	(val) => {
+		val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
+		if (!val.routesList.isColumnsMenuHover && !val.routesList.isColumnsNavHover) {
+			state.liHoverIndex = null;
+			proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(route.path));
+		} else {
+			state.liHoverIndex = state.liOldIndex;
+			if (!state.liOldPath) return false;
+			proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(state.liOldPath));
+		}
+	},
+	{
+		deep: true,
 	}
-});
+);
 // 页面加载时
 onMounted(() => {
 	setFilterRoutes();
@ -224,7 +231,7 @@ onBeforeRouteUpdate((to) => {
 			}
 		}
 		.layout-columns-active {
-			color: var(--el-color-white);
+			color: var(--next-bg-columnsMenuBarColor) !important;
 			transition: 0.3s ease-in-out;
 		}
 		.layout-columns-hover {
--- a/src/layout/component/header.vue
+++ b/src/layout/component/header.vue
@ -5,17 +5,19 @@
 </template>

 <script setup name="layoutHeader">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import NavBarsIndex from '/@/layout/navBars/index.vue';

-const store = useStore();
+const storesTagsViewRoutes = useTagsViewRoutes();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
 // 设置 header 的高度
 const setHeaderHeight = computed(() => {
-	let { isTagsview, layout } = store.state.themeConfig.themeConfig;
+	let { isTagsview, layout } = themeConfig.value;
 	if (isTagsview && layout !== 'classic') return '84px';
 	else return '50px';
 });
-// 获取卡片全屏信息
-const isTagsViewCurrenFull = computed(() => {
-	return store.state.tagsViewRoutes.isTagsViewCurrenFull;
-});
 </script>
--- a/src/layout/component/main.vue
+++ b/src/layout/component/main.vue
@ -1,53 +1,60 @@
 <template>
 	<el-main class="layout-main">
 		<el-scrollbar
-			class="layout-scrollbar"
 			ref="layoutScrollbarRef"
-			:style="{ padding: state.currentRouteMeta.isLink && state.currentRouteMeta.isIframe ? 0 : '', transition: 'padding 0.3s ease-in-out' }"
+			:class="{
+				'layout-scrollbar':
+					(!isClassicOrTransverse && !state.currentRouteMeta.isLink && !state.currentRouteMeta.isIframe) ||
+					(!isClassicOrTransverse && currentRouteMeta.isLink && !state.currentRouteMeta.isIframe),
+			}"
 		>
-			<LayoutParentView :style="{ minHeight: `calc(100vh - ${state.headerHeight})` }" />
-			<Footer v-if="getThemeConfig.isFooter" />
+			<LayoutParentView
+				:style="{
+					padding: !isClassicOrTransverse || (state.currentRouteMeta.isLink && state.currentRouteMeta.isIframe) ? '0' : '15px',
+					transition: 'padding 0.3s ease-in-out',
+				}"
+			/>
+			<Footer v-if="themeConfig.isFooter" />
 		</el-scrollbar>
 	</el-main>
 </template>

 <script setup name="layoutMain">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { NextLoading } from '/@/utils/loading';
 import LayoutParentView from '/@/layout/routerView/parent.vue';
 import Footer from '/@/layout/footer/index.vue';

 const { proxy } = getCurrentInstance();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const route = useRoute();
-const store = useStore();
 const state = reactive({
 	headerHeight: '',
 	currentRouteMeta: {},
 });
-// 获取布局配置信息
-const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
+// 判断布局
+const isClassicOrTransverse = computed(() => {
+	const { layout } = themeConfig.value;
+	return layout === 'classic' || layout === 'transverse';
 });
 // 设置 main 的高度
 const initHeaderHeight = () => {
-	let { isTagsview } = store.state.themeConfig.themeConfig;
-	if (isTagsview) return (state.headerHeight = `84px`);
-	else return (state.headerHeight = `50px`);
+	const bool = state.currentRouteMeta.isLink && state.currentRouteMeta.isIframe;
+	let { isTagsview } = themeConfig.value;
+	if (isTagsview) return (state.headerHeight = bool ? `86px` : `115px`);
+	else return (state.headerHeight = `80px`);
 };
 // 初始化获取当前路由 meta，用于设置 iframes padding
 const initGetMeta = () => {
 	state.currentRouteMeta = route.meta;
 };
-// 页面加载前
-onBeforeMount(() => {
+// 页面加载时
+onMounted(async () => {
+	await initGetMeta();
 	initHeaderHeight();
-	initGetMeta();
-});
-// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-watch(store.state.themeConfig.themeConfig, (val) => {
-	state.headerHeight = val.isTagsview ? '84px' : '50px';
-	if (val.isFixedHeaderChange !== val.isFixedHeader) {
-		if (!proxy.$refs.layoutScrollbarRef) return false;
-		proxy.$refs.layoutScrollbarRef.update();
-	}
+	NextLoading.done();
 });
 // 监听路由变化
 watch(
@ -55,18 +62,21 @@ watch(
 	() => {
 		state.currentRouteMeta = route.meta;
 		const bool = state.currentRouteMeta.isLink && state.currentRouteMeta.isIframe;
-		state.headerHeight = bool ? `85px` : `114px`;
+		state.headerHeight = bool ? `86px` : `115px`;
 		proxy.$refs.layoutScrollbarRef.update();
 	}
 );
 // 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-watch(store.state.themeConfig.themeConfig, (val) => {
-	state.currentRouteMeta = route.meta;
-	const bool = state.currentRouteMeta.isLink && state.currentRouteMeta.isIframe;
-	state.headerHeight = val.isTagsview ? (bool ? `85px` : `114px`) : '51px';
-	if (val.isFixedHeaderChange !== val.isFixedHeader) {
-		if (!proxy.$refs.layoutScrollbarRef) return false;
-		proxy.$refs.layoutScrollbarRef.update();
+watch(
+	themeConfig,
+	(val) => {
+		state.currentRouteMeta = route.meta;
+		const bool = state.currentRouteMeta.isLink && state.currentRouteMeta.isIframe;
+		state.headerHeight = val.isTagsview ? (bool ? `86px` : `115px`) : '51px';
+		proxy.$refs?.layoutScrollbarRef?.update();
+	},
+	{
+		deep: true,
 	}
-});
+);
 </script>
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@ -1,36 +1,37 @@
 <template>
-	<Defaults v-if="getThemeConfig.layout === 'defaults'" />
-	<Classic v-else-if="getThemeConfig.layout === 'classic'" />
-	<Transverse v-else-if="getThemeConfig.layout === 'transverse'" />
-	<Columns v-else-if="getThemeConfig.layout === 'columns'" />
+	<Defaults v-if="themeConfig.layout === 'defaults'" />
+	<Classic v-else-if="themeConfig.layout === 'classic'" />
+	<Transverse v-else-if="themeConfig.layout === 'transverse'" />
+	<Columns v-else-if="themeConfig.layout === 'columns'" />
 </template>

 <script setup name="layout">
+import { defineAsyncComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import { Local } from '/@/utils/storage';
-import Defaults from '/@/layout/main/defaults.vue';
-import Classic from '/@/layout/main/classic.vue';
-import Transverse from '/@/layout/main/transverse.vue';
-import Columns from '/@/layout/main/columns.vue';
+
+const Defaults = defineAsyncComponent(() => import('/@/layout/main/defaults.vue'));
+const Classic = defineAsyncComponent(() => import('/@/layout/main/classic.vue'));
+const Transverse = defineAsyncComponent(() => import('/@/layout/main/transverse.vue'));
+const Columns = defineAsyncComponent(() => import('/@/layout/main/columns.vue'));

 const { proxy } = getCurrentInstance();
-const store = useStore();
-// 获取布局配置信息
-const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
-});
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 // 窗口大小改变时(适配移动端)
 const onLayoutResize = () => {
-	if (!Local.get('oldLayout')) Local.set('oldLayout', getThemeConfig.value.layout);
+	if (!Local.get('oldLayout')) Local.set('oldLayout', themeConfig.value.layout);
 	const clientWidth = document.body.clientWidth;
 	if (clientWidth < 1000) {
-		getThemeConfig.value.isCollapse = false;
+		themeConfig.value.isCollapse = false;
 		proxy.mittBus.emit('layoutMobileResize', {
 			layout: 'defaults',
 			clientWidth,
 		});
 	} else {
 		proxy.mittBus.emit('layoutMobileResize', {
-			layout: Local.get('oldLayout') ? Local.get('oldLayout') : getThemeConfig.value.layout,
+			layout: Local.get('oldLayout') ? Local.get('oldLayout') : themeConfig.value.layout,
 			clientWidth,
 		});
 	}
--- a/src/layout/lockScreen/index.vue
+++ b/src/layout/lockScreen/index.vue
@ -40,7 +40,7 @@
 							>
 								<template #append>
 									<el-button @click="onLockScreenSubmit">
-										<el-icon>
+										<el-icon class="el-input__icon">
 											<ele-Right />
 										</el-icon>
 									</el-button>
@ -49,9 +49,9 @@
 						</div>
 					</div>
 					<div class="layout-lock-screen-login-icon">
-						<SvgIcon name="ele-Microphone" />
-						<SvgIcon name="ele-AlarmClock" />
-						<SvgIcon name="ele-SwitchButton" />
+						<SvgIcon name="ele-Microphone" :size="20" />
+						<SvgIcon name="ele-AlarmClock" :size="20" />
+						<SvgIcon name="ele-SwitchButton" :size="20" />
 					</div>
 				</div>
 			</transition>
@ -60,12 +60,15 @@
 </template>

 <script setup name="layoutLockScreen">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import { formatDate } from '/@/utils/formatTime';
 import { Local } from '/@/utils/storage';

 const { proxy } = getCurrentInstance();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const layoutLockScreenInputRef = ref();
-const store = useStore();
 const state = reactive({
 	transparency: 1,
 	downClientY: 0,
@ -142,14 +145,14 @@ const initSetTime = () => {
 };
 // 锁屏时间定时器
 const initLockScreen = () => {
-	if (store.state.themeConfig.themeConfig.isLockScreen) {
+	if (themeConfig.value.isLockScreen) {
 		state.isShowLockScreenIntervalTime = window.setInterval(() => {
-			if (store.state.themeConfig.themeConfig.lockScreenTime <= 1) {
+			if (themeConfig.value.lockScreenTime <= 1) {
 				state.isShowLockScreen = true;
 				setLocalThemeConfig();
 				return false;
 			}
-			store.state.themeConfig.themeConfig.lockScreenTime--;
+			themeConfig.value.lockScreenTime--;
 		}, 1000);
 	} else {
 		clearInterval(state.isShowLockScreenIntervalTime);
@ -157,13 +160,13 @@ const initLockScreen = () => {
 };
 // 存储布局配置
 const setLocalThemeConfig = () => {
-	store.state.themeConfig.themeConfig.isDrawer = false;
-	Local.set('themeConfig', store.state.themeConfig.themeConfig);
+	themeConfig.value.isDrawer = false;
+	Local.set('themeConfig', themeConfig.value);
 };
 // 密码输入点击事件
 const onLockScreenSubmit = () => {
-	store.state.themeConfig.themeConfig.isLockScreen = false;
-	store.state.themeConfig.themeConfig.lockScreenTime = 30;
+	themeConfig.value.isLockScreen = false;
+	themeConfig.value.lockScreenTime = 30;
 	setLocalThemeConfig();
 };
 // 页面加载时
@ -197,7 +200,7 @@ onUnmounted(() => {
 }
 .layout-lock-screen-img {
 	@extend .layout-lock-screen-fixed;
-	background-image: url('https://gitee.com/lyt-top/vue-next-admin-images/raw/master/images/03.jpg');
+	background-image: url('https://img-blog.csdnimg.cn/afa9c317667f47d5bea34b85af45979e.png#pic_center');
 	background-size: 100% 100%;
 	z-index: 9999991;
 }
@ -219,11 +222,11 @@ onUnmounted(() => {
 			bottom: 50px;
 			&-time {
 				font-size: 100px;
-				color: var(--color-whites);
+				color: var(--el-color-white);
 			}
 			&-info {
 				font-size: 40px;
-				color: var(--color-whites);
+				color: var(--el-color-white);
 			}
 			&-minutes {
 				font-size: 16px;
@ -236,7 +239,7 @@ onUnmounted(() => {
 			border-radius: 100%;
 			border: 1px solid var(--el-border-color-light, #ebeef5);
 			background: rgba(255, 255, 255, 0.1);
-			color: var(--color-whites);
+			color: var(--el-color-white);
 			opacity: 0.8;
 			position: absolute;
 			right: 30px;
@ -252,7 +255,7 @@ onUnmounted(() => {
 				position: absolute;
 				top: 150%;
 				font-size: 12px;
-				color: var(--color-whites);
+				color: var(--el-color-white);
 				left: 50%;
 				line-height: 1.2;
 				transform: translate(-50%, -50%);
@ -263,7 +266,7 @@ onUnmounted(() => {
 				border: 1px solid rgba(255, 255, 255, 0.5);
 				background: rgba(255, 255, 255, 0.2);
 				box-shadow: 0 0 12px 0 rgba(255, 255, 255, 0.5);
-				color: var(--color-whites);
+				color: var(--el-color-white);
 				opacity: 1;
 				transition: all 0.3s ease;
 				i {
@ -288,7 +291,7 @@ onUnmounted(() => {
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-		color: var(--color-whites);
+		color: var(--el-color-white);
 		&-box {
 			text-align: center;
 			margin: auto;
--- a/src/layout/logo/index.vue
+++ b/src/layout/logo/index.vue
@ -1,7 +1,7 @@
 <template>
 	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
 		<img :src="logoMini" class="layout-logo-medium-img" />
-		<span>{{ getThemeConfig.globalTitle }}</span>
+		<span>{{ themeConfig.globalTitle }}</span>
 	</div>
 	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
 		<img :src="logoMini" class="layout-logo-size-img" />
@ -10,21 +10,20 @@

 <script setup name="layoutLogo">
 import logoMini from '/@/assets/logo-mini.svg';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';

-const store = useStore();
-// 获取布局配置信息
-const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
-});
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 // 设置 logo 的显示。classic 经典布局默认显示 logo
 const setShowLogo = computed(() => {
-	let { isCollapse, layout } = store.state.themeConfig.themeConfig;
+	let { isCollapse, layout } = themeConfig.value;
 	return !isCollapse || layout === 'classic' || document.body.clientWidth < 1000;
 });
 // logo 点击实现菜单展开/收起
 const onThemeConfigChange = () => {
-	if (store.state.themeConfig.themeConfig.layout === 'transverse') return false;
-	store.state.themeConfig.themeConfig.isCollapse = !store.state.themeConfig.themeConfig.isCollapse;
+	if (themeConfig.value.layout === 'transverse') return false;
+	themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
 };
 </script>

@ -40,6 +39,10 @@ const onThemeConfigChange = () => {
 	font-size: 16px;
 	cursor: pointer;
 	animation: logoAnimation 0.3s ease-in-out;
+	span {
+		white-space: nowrap;
+		display: inline-block;
+	}
 	&:hover {
 		span {
 			color: var(--color-primary-light-2);
--- a/src/layout/main/classic.vue
+++ b/src/layout/main/classic.vue
@ -4,7 +4,7 @@
 		<el-container class="layout-mian-height-50">
 			<Aside />
 			<div class="flex-center layout-backtop">
-				<TagsView v-if="getThemeConfig.isTagsview" />
+				<TagsView v-if="themeConfig.isTagsview" />
 				<Main />
 			</div>
 		</el-container>
@ -13,14 +13,13 @@
 </template>

 <script setup name="layoutClassic">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import Aside from '/@/layout/component/aside.vue';
 import Header from '/@/layout/component/header.vue';
 import Main from '/@/layout/component/main.vue';
 import TagsView from '/@/layout/navBars/tagsView/tagsView.vue';

-const store = useStore();
-// 获取布局配置信息
-const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
-});
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 </script>
--- a/src/layout/main/columns.vue
+++ b/src/layout/main/columns.vue
@ -16,13 +16,17 @@
 </template>

 <script setup name="layoutColumns">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import Aside from '/@/layout/component/aside.vue';
 import Header from '/@/layout/component/header.vue';
 import Main from '/@/layout/component/main.vue';
 import ColumnsAside from '/@/layout/component/columnsAside.vue';

-const store = useStore();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+// 是否固定顶栏
 const isFixedHeader = computed(() => {
-	return store.state.themeConfig.themeConfig.isFixedHeader;
+	return themeConfig.value.isFixedHeader;
 });
 </script>
--- a/src/layout/main/defaults.vue
+++ b/src/layout/main/defaults.vue
@ -13,15 +13,19 @@
 </template>

 <script setup name="layoutDefaults">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import Aside from '/@/layout/component/aside.vue';
 import Header from '/@/layout/component/header.vue';
 import Main from '/@/layout/component/main.vue';

 const { proxy } = getCurrentInstance();
-const store = useStore();
 const route = useRoute();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+// 是否固定顶栏
 const isFixedHeader = computed(() => {
-	return store.state.themeConfig.themeConfig.isFixedHeader;
+	return themeConfig.value.isFixedHeader;
 });
 // 监听路由的变化
 watch(
--- a/src/layout/navBars/breadcrumb/breadcrumb.vue
+++ b/src/layout/navBars/breadcrumb/breadcrumb.vue
@ -1,18 +1,21 @@
 <template>
-	<div class="layout-navbars-breadcrumb" :style="{ display: isShowBreadcrumb }">
+	<div v-if="isShowBreadcrumb" class="layout-navbars-breadcrumb">
 		<SvgIcon
 			class="layout-navbars-breadcrumb-icon"
-			:name="getThemeConfig.isCollapse ? 'elementExpand' : 'elementFold'"
+			:name="themeConfig.isCollapse ? 'ele-Expand' : 'ele-Fold'"
+			:size="16"
 			@click="onThemeConfigChange"
 		/>
 		<el-breadcrumb class="layout-navbars-breadcrumb-hide">
 			<transition-group name="breadcrumb" mode="out-in">
-				<el-breadcrumb-item v-for="(v, k) in state.breadcrumbList" :key="v.meta.title">
+				<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="getThemeConfig.isBreadcrumbIcon" />{{ v.meta.title }}
+						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="themeConfig.isBreadcrumbIcon" />
+						<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="getThemeConfig.isBreadcrumbIcon" />{{ 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>
@ -22,7 +25,17 @@

 <script setup name="layoutBreadcrumb">
 import { onBeforeRouteUpdate } from 'vue-router';
-const store = useStore();
+import { Local } from '/@/utils/storage';
+import other from '/@/utils/other';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useRoutesList } from '/@/stores/routesList';
+Local;
+
+const stores = useRoutesList();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { routesList } = storeToRefs(stores);
 const route = useRoute();
 const router = useRouter();
 const state = reactive({
@ -31,16 +44,12 @@ const state = reactive({
 	routeSplitFirst: '',
 	routeSplitIndex: 1,
 });
-// 获取布局配置信息
-const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
-});
 // 动态设置经典、横向布局不显示
 const isShowBreadcrumb = computed(() => {
 	initRouteSplit(route.path);
-	const { layout, isBreadcrumb } = store.state.themeConfig.themeConfig;
-	if (layout === 'classic' || layout === 'transverse') return 'none';
-	else return isBreadcrumb ? '' : 'none';
+	const { layout, isBreadcrumb } = themeConfig.value;
+	if (layout === 'classic' || layout === 'transverse') return false;
+	else return isBreadcrumb ? true : false;
 });
 // 面包屑点击时
 const onBreadcrumbClick = (v) => {
@ -50,18 +59,18 @@ const onBreadcrumbClick = (v) => {
 };
 // 展开/收起左侧菜单点击
 const onThemeConfigChange = () => {
-	store.state.themeConfig.themeConfig.isCollapse = !store.state.themeConfig.themeConfig.isCollapse;
+	themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
 	setLocalThemeConfig();
 };
 // 存储布局配置
 const setLocalThemeConfig = () => {
 	Local.remove('themeConfig');
-	Local.set('themeConfig', getThemeConfig.value);
+	Local.set('themeConfig', themeConfig.value);
 };
 // 处理面包屑数据
 const getBreadcrumbList = (arr) => {
-	arr.map((item) => {
-		state.routeSplit.map((v, k, arrs) => {
+	arr.forEach((item) => {
+		state.routeSplit.forEach((v, k, arrs) => {
 			if (state.routeSplitFirst === item.path) {
 				state.routeSplitFirst += `/${arrs[state.routeSplitIndex]}`;
 				state.breadcrumbList.push(item);
@ -73,13 +82,15 @@ const getBreadcrumbList = (arr) => {
 };
 // 当前路由字符串切割成数组，并删除第一项空内容
 const initRouteSplit = (path) => {
-	if (!store.state.themeConfig.themeConfig.isBreadcrumb) return false;
-	state.breadcrumbList = [store.state.routesList.routesList[0]];
+	if (!themeConfig.value.isBreadcrumb) return false;
+	state.breadcrumbList = [routesList.value[0]];
 	state.routeSplit = path.split('/');
 	state.routeSplit.shift();
 	state.routeSplitFirst = `/${state.routeSplit[0]}`;
 	state.routeSplitIndex = 1;
-	getBreadcrumbList(store.state.routesList.routesList);
+	getBreadcrumbList(routesList.value);
+	if (route.name === 'home' || (route.name === 'notFound' && state.breadcrumbList.length > 1)) state.breadcrumbList.shift();
+	if (state.breadcrumbList.length > 0) state.breadcrumbList[state.breadcrumbList.length - 1].meta.tagsViewName = other.setTagsViewNameI18n(route);
 };
 // 页面加载时
 onMounted(() => {
@ -97,14 +108,20 @@ onBeforeRouteUpdate((to) => {
 	height: inherit;
 	display: flex;
 	align-items: center;
-	padding-left: 15px;
 	.layout-navbars-breadcrumb-icon {
 		cursor: pointer;
 		font-size: 18px;
 		margin-right: 15px;
 		color: var(--next-bg-topBarColor);
+		height: 100%;
+		width: 40px;
+		opacity: 0.8;
+		&:hover {
+			opacity: 1;
+		}
 	}
 	.layout-navbars-breadcrumb-span {
+		display: flex;
 		opacity: 0.7;
 		color: var(--next-bg-topBarColor);
 	}
--- a/src/layout/navBars/breadcrumb/closeFull.vue
+++ b/src/layout/navBars/breadcrumb/closeFull.vue
@ -1,20 +1,21 @@
 <template>
 	<div class="layout-navbars-close-full" v-if="isTagsViewCurrenFull">
-		<div class="layout-navbars-close-full-box" title="关闭全屏" @click="onCloseFullscreen">
-			<SvgIcon name="ele-Close" />
+		<div class="layout-navbars-close-full-icon">
+			<SvgIcon name="ele-Close" title="关闭全屏" @click="onCloseFullscreen" />
 		</div>
 	</div>
 </template>

 <script setup name="layoutCloseFull">
-const store = useStore();
-// 获取卡片全屏信息
-const isTagsViewCurrenFull = computed(() => {
-	return store.state.tagsViewRoutes.isTagsViewCurrenFull;
-});
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
+const stores = useTagsViewRoutes();
+const { isTagsViewCurrenFull } = storeToRefs(stores);
+
 // 关闭当前全屏
 const onCloseFullscreen = () => {
-	store.dispatch('tagsViewRoutes/setCurrenFullscreen', false);
+	stores.setCurrenFullscreen(false);
 };
 </script>

@ -24,7 +25,7 @@ const onCloseFullscreen = () => {
 	z-index: 9999999999;
 	right: -30px;
 	top: -30px;
-	.layout-navbars-close-full-box {
+	.layout-navbars-close-full-icon {
 		width: 60px;
 		height: 60px;
 		border-radius: 100%;
@ -32,17 +33,17 @@ const onCloseFullscreen = () => {
 		cursor: pointer;
 		background: rgba(0, 0, 0, 0.1);
 		transition: all 0.3s ease;
-		i {
+		position: relative;
+		::v-deep(i) {
 			position: absolute;
-			left: 11px;
+			left: 10px;
 			top: 35px;
 			color: #333333;
 			transition: all 0.3s ease;
 		}
 		&:hover {
-			background: rgba(0, 0, 0, 0.2);
 			transition: all 0.3s ease;
-			i {
+			::v-deep(i) {
 				color: var(--el-color-primary);
 				transition: all 0.3s ease;
 			}
--- a/src/layout/navBars/breadcrumb/index.vue
+++ b/src/layout/navBars/breadcrumb/index.vue
@ -8,36 +8,42 @@
 </template>

 <script setup name="layoutBreadcrumbIndex">
+import { storeToRefs } from 'pinia';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import Breadcrumb from '/@/layout/navBars/breadcrumb/breadcrumb.vue';
 import User from '/@/layout/navBars/breadcrumb/user.vue';
 import Logo from '/@/layout/logo/index.vue';
 import Horizontal from '/@/layout/navMenu/horizontal.vue';

 const { proxy } = getCurrentInstance();
-const store = useStore();
+const stores = useRoutesList();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { routesList } = storeToRefs(stores);
 const route = useRoute();
 const state = reactive({
 	menuList: [],
 });
 // 设置 logo 显示/隐藏
 const setIsShowLogo = computed(() => {
-	let { isShowLogo, layout } = store.state.themeConfig.themeConfig;
+	let { isShowLogo, layout } = themeConfig.value;
 	return (isShowLogo && layout === 'classic') || (isShowLogo && layout === 'transverse');
 });
 // 设置是否显示横向导航菜单
 const isLayoutTransverse = computed(() => {
-	let { layout, isClassicSplitMenu } = store.state.themeConfig.themeConfig;
+	let { layout, isClassicSplitMenu } = themeConfig.value;
 	return layout === 'transverse' || (isClassicSplitMenu && layout === 'classic');
 });
 // 设置/过滤路由（非静态路由/是否显示在菜单中）
 const setFilterRoutes = () => {
-	let { layout, isClassicSplitMenu } = store.state.themeConfig.themeConfig;
+	let { layout, isClassicSplitMenu } = themeConfig.value;
 	if (layout === 'classic' && isClassicSplitMenu) {
-		state.menuList = delClassicChildren(filterRoutesFun(store.state.routesList.routesList));
+		state.menuList = delClassicChildren(filterRoutesFun(routesList.value));
 		const resData = setSendClassicChildren(route.path);
 		proxy.mittBus.emit('setSendClassicChildren', resData);
 	} else {
-		state.menuList = filterRoutesFun(store.state.routesList.routesList);
+		state.menuList = filterRoutesFun(routesList.value);
 	}
 };
 // 设置了分割菜单时，删除底下 children
@ -61,7 +67,7 @@ const filterRoutesFun = (arr) => {
 const setSendClassicChildren = (path) => {
 	const currentPathSplit = path.split('/');
 	let currentData = {};
-	filterRoutesFun(store.state.routesList.routesList).map((v, k) => {
+	filterRoutesFun(routesList.value).map((v, k) => {
 		if (v.path === `/${currentPathSplit[1]}`) {
 			v['k'] = k;
 			currentData['item'] = [{ ...v }];
@ -80,7 +86,7 @@ onMounted(() => {
 });
 // 页面卸载时
 onUnmounted(() => {
-	proxy.mittBus.off('getBreadcrumbIndexSetFilterRoutes');
+	proxy.mittBus.off('getBreadcrumbIndexSetFilterRoutes', () => {});
 });
 </script>

@ -89,7 +95,6 @@ onUnmounted(() => {
 	height: 50px;
 	display: flex;
 	align-items: center;
-	padding-right: 15px;
 	background: var(--next-bg-topBar);
 	border-bottom: 1px solid var(--next-border-color-light);
 }
--- a/src/layout/navBars/breadcrumb/search.vue
+++ b/src/layout/navBars/breadcrumb/search.vue
@ -15,7 +15,10 @@
 					</el-icon>
 				</template>
 				<template #default="{ item }">
-					<div><i :class="item.meta.icon" class="mr10"></i>{{ item.meta.title }}</div>
+					<div>
+						<SvgIcon :name="item.meta.icon" class="mr5" />
+						{{ item.meta.title }}
+					</div>
 				</template>
 			</el-autocomplete>
 		</el-dialog>
@ -23,8 +26,12 @@
 </template>

 <script setup name="layoutBreadcrumbSearch">
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
+const storesTagsViewRoutes = useTagsViewRoutes();
+const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
 const layoutMenuAutocompleteRef = ref();
-const store = useStore();
 const router = useRouter();
 const state = reactive({
 	isShowSearch: false,
@ -37,7 +44,9 @@ const openSearch = () => {
 	state.isShowSearch = true;
 	initTageView();
 	nextTick(() => {
-		layoutMenuAutocompleteRef.value.focus();
+		setTimeout(() => {
+			layoutMenuAutocompleteRef.value.focus();
+		});
 	});
 };
 // 搜索弹窗关闭
@ -54,14 +63,15 @@ const createFilter = (queryString) => {
 	return (restaurant) => {
 		return (
 			restaurant.path.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
-			restaurant.meta.title.toLowerCase().indexOf(queryString.toLowerCase()) > -1
+			restaurant.meta.title.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
+			restaurant.meta.title.indexOf(queryString.toLowerCase()) > -1
 		);
 	};
 };
 // 初始化菜单数据
 const initTageView = () => {
 	if (state.tagsViewList.length > 0) return false;
-	store.state.tagsViewRoutes.tagsViewRoutes.map((v) => {
+	tagsViewRoutes.value.map((v) => {
 		if (!v.meta.isHide) state.tagsViewList.push({ ...v });
 	});
 };
--- a/src/layout/navBars/breadcrumb/setings.vue
+++ b/src/layout/navBars/breadcrumb/setings.vue
@ -99,16 +99,26 @@

 				<!-- 界面设置 -->
 				<el-divider content-position="left">界面设置</el-divider>
-				<div class="layout-breadcrumb-seting-bar-flex">
+				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout === 'transverse' ? 0.5 : 1 }">
 					<div class="layout-breadcrumb-seting-bar-flex-label">菜单水平折叠</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isCollapse" size="small" @change="onThemeConfigChange"></el-switch>
+						<el-switch
+							v-model="getThemeConfig.isCollapse"
+							:disabled="getThemeConfig.layout === 'transverse'"
+							size="small"
+							@change="onThemeConfigChange"
+						></el-switch>
 					</div>
 				</div>
-				<div class="layout-breadcrumb-seting-bar-flex mt15">
+				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout === 'transverse' ? 0.5 : 1 }">
 					<div class="layout-breadcrumb-seting-bar-flex-label">菜单手风琴</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-switch v-model="getThemeConfig.isUniqueOpened" size="small" @change="setLocalThemeConfig"></el-switch>
+						<el-switch
+							v-model="getThemeConfig.isUniqueOpened"
+							:disabled="getThemeConfig.layout === 'transverse'"
+							size="small"
+							@change="setLocalThemeConfig"
+						></el-switch>
 					</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
@ -389,6 +399,9 @@
 </template>

 <script setup name="layoutBreadcrumbSeting">
+import { ElMessage } from 'element-plus';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import { getLightColor, getDarkColor } from '/@/utils/theme';
 import { verifyAndSpace } from '/@/utils/toolsValidate';
 import { Local } from '/@/utils/storage';
@ -397,17 +410,19 @@ import commonFunction from '/@/utils/commonFunction';
 import other from '/@/utils/other';

 const { proxy } = getCurrentInstance();
-const store = useStore();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const { copyText } = commonFunction();
 const state = reactive({
 	isMobile: false,
 });
 // 获取布局配置信息
 const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
+	return themeConfig.value;
 });
 // 1、全局主题
 const onColorPickerChange = () => {
+	if (!getThemeConfig.value.primary) return ElMessage.warning('全局主题 primary 颜色值不能为空');
 	// 颜色加深
 	document.documentElement.style.setProperty('--el-color-primary-dark-2', `${getDarkColor(getThemeConfig.value.primary, 0.1)}`);
 	document.documentElement.style.setProperty('--el-color-primary', getThemeConfig.value.primary);
@ -420,6 +435,9 @@ const onColorPickerChange = () => {
 // 2、菜单 / 顶栏
 const onBgColorPickerChange = (bg) => {
 	document.documentElement.style.setProperty(`--next-bg-${bg}`, getThemeConfig.value[bg]);
+	if (bg === 'menuBar') {
+		document.documentElement.style.setProperty(`--next-bg-menuBar-light-1`, getLightColor(getThemeConfig.value.menuBar, 0.05));
+	}
 	onTopBarGradualChange();
 	onMenuBarGradualChange();
 	onColumnsMenuBarGradualChange();
@ -519,7 +537,7 @@ const onWartermarkTextInput = (val) => {
 // 5、布局切换
 const onSetLayout = (layout) => {
 	Local.set('oldLayout', layout);
-	if (getThemeConfig.value.layout === layout) return false;
+	if (layout === 'transverse') getThemeConfig.value.isCollapse = false;
 	getThemeConfig.value.layout = layout;
 	getThemeConfig.value.isDrawer = false;
 	initLayoutChangeFun();
@ -609,7 +627,7 @@ onMounted(() => {
 	});
 });
 onUnmounted(() => {
-	proxy.mittBus.off('layoutMobileResize');
+	proxy.mittBus.off('layoutMobileResize', () => {});
 });

 // 暴露变量
@ -680,7 +698,7 @@ defineExpose({
 				top: 50%;
 				transform: translate(-50%, -50%);
 				border: 1px solid;
-				border-color: var(--el-color-primary-light-4);
+				border-color: var(--el-color-primary-light-5);
 				border-radius: 100%;
 				padding: 4px;
 				.layout-tips-box {
@ -689,7 +707,7 @@ defineExpose({
 					height: 30px;
 					z-index: 9;
 					border: 1px solid;
-					border-color: var(--el-color-primary-light-4);
+					border-color: var(--el-color-primary-light-5);
 					border-radius: 100%;
 					.layout-tips-txt {
 						transition: inherit;
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@ -1,5 +1,5 @@
 <template>
-	<div class="layout-navbars-breadcrumb-user" :style="{ flex: layoutUserFlexNum }">
+	<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="组件大小"></i>
@ -21,7 +21,7 @@
 			<i class="icon-skin iconfont" title="布局配置"></i>
 		</div>
 		<div class="layout-navbars-breadcrumb-user-icon">
-			<el-popover placement="bottom" trigger="click">
+			<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="消息">
@ -29,20 +29,22 @@
 						</el-icon>
 					</el-badge>
 				</template>
-				<UserNews />
+				<template #default>
+					<UserNews />
+				</template>
 			</el-popover>
 		</div>
 		<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
 			<i
 				class="iconfont"
-				:title="state.isScreenfull ? '开全屏' : '关全屏'"
+				:title="state.isScreenfull ? '关全屏' : '开全屏'"
 				:class="!state.isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
 			></i>
 		</div>
 		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
 			<span class="layout-navbars-breadcrumb-user-link">
-				<img :src="getUserInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
-				{{ getUserInfos.userName === '' ? 'common' : getUserInfos.userName }}
+				<img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+				{{ userInfos.userName === '' ? 'common' : userInfos.userName }}
 				<el-icon class="el-icon--right">
 					<ele-ArrowDown />
 				</el-icon>
@ -64,32 +66,29 @@
 <script setup name="layoutBreadcrumbUser">
 import { ElMessageBox, ElMessage } from 'element-plus';
 import screenfull from 'screenfull';
-import { resetRoute } from '/@/router/index';
 import { Session, Local } from '/@/utils/storage';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '/@/stores/userInfo';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import UserNews from '/@/layout/navBars/breadcrumb/userNews.vue';
 import Search from '/@/layout/navBars/breadcrumb/search.vue';

 const { proxy } = getCurrentInstance();
 const router = useRouter();
-const store = useStore();
+const stores = useUserInfo();
+const storesThemeConfig = useThemeConfig();
+const { userInfos } = storeToRefs(stores);
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const searchRef = ref();
 const state = reactive({
 	isScreenfull: false,
 	isShowUserNewsPopover: false,
 	disabledSize: '',
 });
-// 获取用户信息 vuex
-const getUserInfos = computed(() => {
-	return store.state.userInfos.userInfos;
-});
-// 获取布局配置信息
-const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
-});
 // 设置分割样式
 const layoutUserFlexNum = computed(() => {
 	let num = '';
-	const { layout, isClassicSplitMenu } = getThemeConfig.value;
+	const { layout, isClassicSplitMenu } = themeConfig.value;
 	const layoutArr = ['defaults', 'columns'];
 	if (layoutArr.includes(layout) || (layout === 'classic' && !isClassicSplitMenu)) num = '1';
 	else num = '';
@ -140,11 +139,8 @@ const onHandleCommandClick = (path) => {
 		})
 			.then(async () => {
 				Session.clear(); // 清除缓存/token等
-				resetRoute(); // 删除/重置路由
-				ElMessage.success('安全退出成功！');
-				setTimeout(() => {
-					window.location.href = '';
-				}, 300);
+				// 使用 reload 时，不需要调用 resetRoute() 重置路由
+				window.location.reload();
 			})
 			.catch(() => {});
 	} else if (path === 'wareHouse') {
@ -160,9 +156,8 @@ const onSearchClick = () => {
 // 组件大小改变
 const onComponentSizeChange = (size) => {
 	Local.remove('themeConfig');
-	getThemeConfig.value.globalComponentSize = size;
-	Local.set('themeConfig', getThemeConfig.value);
-	proxy.$ELEMENT.size = size;
+	themeConfig.value.globalComponentSize = size;
+	Local.set('themeConfig', themeConfig.value);
 	initComponentSize();
 	window.location.reload();
 };
--- a/src/layout/navBars/index.vue
+++ b/src/layout/navBars/index.vue
@ -6,13 +6,16 @@
 </template>

 <script setup name="layoutNavBars">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import BreadcrumbIndex from '/@/layout/navBars/breadcrumb/index.vue';
 import TagsView from '/@/layout/navBars/tagsView/tagsView.vue';

-const store = useStore();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 // 是否显示 tagsView
 const setShowTagsView = computed(() => {
-	let { layout, isTagsview } = store.state.themeConfig.themeConfig;
+	let { layout, isTagsview } = themeConfig.value;
 	return layout !== 'classic' && isTagsview;
 });
 </script>
--- a/src/layout/navBars/tagsView/tagsView.vue
+++ b/src/layout/navBars/tagsView/tagsView.vue
@ -1,6 +1,6 @@
 <template>
 	<div class="layout-navbars-tagsview" :class="{ 'layout-navbars-tagsview-shadow': getThemeConfig.layout === 'classic' }">
-		<el-scrollbar ref="scrollbarRef" @wheel.native.prevent="onHandleScroll">
+		<el-scrollbar ref="scrollbarRef" @wheel.prevent="onHandleScroll">
 			<ul class="layout-navbars-tagsview-ul" :class="setTagsStyle" ref="tagsUlRef">
 				<li
 					v-for="(v, k) in state.tagsViewList"
@ -18,7 +18,7 @@
 				>
 					<i class="iconfont icon-webicon318 layout-navbars-tagsview-ul-li-iconfont" v-if="isActive(v)"></i>
 					<SvgIcon :name="v.meta.icon" v-if="!isActive(v) && getThemeConfig.isTagsviewIcon" class="pr5" />
-					<span>{{ v.meta.title }}</span>
+					<span>{{ setTagsViewNameI18n(v) }}</span>
 					<template v-if="isActive(v)">
 						<SvgIcon
 							name="ele-RefreshRight"
@ -49,6 +49,11 @@
 import { 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 { Session } from '/@/utils/storage';
 import { isObjectValueEqual } from '/@/utils/arrayOperation';
 import other from '/@/utils/other';
@ -59,9 +64,14 @@ const tagsRefs = ref([]);
 const scrollbarRef = ref();
 const contextmenuRef = ref();
 const tagsUlRef = ref();
-const store = useStore();
 const route = useRoute();
 const router = useRouter();
+const stores = useTagsViewRoutes();
+const storesThemeConfig = useThemeConfig();
+const storesTagsViewRoutes = useTagsViewRoutes();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
+const storesKeepALiveNames = useKeepALiveNames();
 const state = reactive({
 	routeActive: '',
 	routePath: route.path,
@ -73,18 +83,31 @@ const state = reactive({
 });
 // 动态设置 tagsView 风格样式
 const setTagsStyle = computed(() => {
-	return store.state.themeConfig.themeConfig.tagsStyle;
+	return themeConfig.value.tagsStyle;
 });
 // 获取布局配置信息
 const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
+	return themeConfig.value;
+});
+// 设置 自定义 tagsView 名称、 自定义 tagsView 名称国际化
+const setTagsViewNameI18n = computed(() => {
+	return (v) => {
+		return other.setTagsViewNameI18n(v);
+	};
 });
 // 设置 tagsView 高亮
 const isActive = (v) => {
 	if (getThemeConfig.value.isShareTagsView) {
 		return v.path === state.routePath;
 	} else {
-		return v.url ? v.url === state.routeActive : v.path === state.routeActive;
+		if ((v.query && Object.keys(v.query).length) || (v.params && Object.keys(v.params).length)) {
+			// 普通传参
+			return v.url ? v.url === state.routeActive : v.path === state.routeActive;
+		} else {
+			// 通过 name 传参，params 取值，刷新页面参数消失
+			// https://gitee.com/lyt-top/vue-next-admin/issues/I51RS9
+			return v.path === state.routePath;
+		}
 	}
 };
 // 存储 tagsViewList 到浏览器临时缓存中，页面刷新时，保留记录
@ -96,7 +119,7 @@ const getTagsViewRoutes = async () => {
 	state.routeActive = await setTagsViewHighlight(route);
 	state.routePath = (await route.meta.isDynamic) ? route.meta.isDynamicPath : route.path;
 	state.tagsViewList = [];
-	state.tagsViewRoutesList = store.state.tagsViewRoutes.tagsViewRoutes;
+	state.tagsViewRoutesList = tagsViewRoutes.value;
 	initTagsView();
 };
 // vuex 中获取路由信息：如果是设置了固定的（isAffix），进行初始化显示
@ -108,6 +131,7 @@ const initTagsView = async () => {
 			if (v.meta.isAffix && !v.meta.isHide) {
 				v.url = setTagsViewHighlight(v);
 				state.tagsViewList.push({ ...v });
+				storesKeepALiveNames.addCachedView(v);
 			}
 		});
 		await addTagsView(route.path, route);
@ -129,11 +153,11 @@ const solveAddTagsView = async (path, to) => {
 	if (current.length <= 0) {
 		// 防止：Avoid app logic that relies on enumerating keys on a component instance. The keys will be empty in production mode to avoid performance overhead.
 		let findItem = state.tagsViewRoutesList.find((v) => v.path === isDynamicPath);
-		if (findItem.meta.isAffix) return false;
-		if (findItem.meta.isLink && !findItem.meta.isIframe) return false;
+		if (!findItem || findItem.meta.isAffix || (findItem.meta.isLink && !findItem.meta.isIframe)) return false;
 		to.meta.isDynamic ? (findItem.params = to.params) : (findItem.query = to.query);
 		findItem.url = setTagsViewHighlight(findItem);
 		state.tagsViewList.push({ ...findItem });
+		await storesKeepALiveNames.addCachedView(findItem);
 		addBrowserSetSession(state.tagsViewList);
 	}
 };
@ -173,23 +197,30 @@ const addTagsView = (path, to) => {
 			if (state.tagsViewList.some((v) => v.path === path)) return false;
 			item = state.tagsViewRoutesList.find((v) => v.path === path);
 		}
-		if (item.meta.isLink && !item.meta.isIframe) return false;
+		if (!item || (item.meta.isLink && !item.meta.isIframe)) return false;
 		if (to && to.meta.isDynamic) item.params = to?.params ? to?.params : route.params;
 		else item.query = to?.query ? to?.query : route.query;
 		item.url = setTagsViewHighlight(item);
+		await storesKeepALiveNames.addCachedView(item);
 		await state.tagsViewList.push({ ...item });
 		await addBrowserSetSession(state.tagsViewList);
 	});
 };
 // 2、刷新当前 tagsView：
-const refreshCurrentTagsView = (fullPath) => {
-	proxy.mittBus.emit('onTagsViewRefreshRouterView', fullPath);
+const refreshCurrentTagsView = async (fullPath) => {
+	const item = state.tagsViewList.find((v) => (getThemeConfig.value.isShareTagsView ? v.path === fullPath : v.url === fullPath));
+	if (item != null) {
+		await storesKeepALiveNames.delCachedView(item);
+		proxy.mittBus.emit('onTagsViewRefreshRouterView', fullPath);
+		if (item.meta.isKeepAlive) storesKeepALiveNames.addCachedView(item);
+	}
 };
 // 3、关闭当前 tagsView：如果是设置了固定的（isAffix），不可以关闭
 const closeCurrentTagsView = (path) => {
 	state.tagsViewList.map((v, k, arr) => {
 		if (!v.meta.isAffix) {
 			if (getThemeConfig.value.isShareTagsView ? v.path === path : v.url === path) {
+				storesKeepALiveNames.delCachedView(v);
 				state.tagsViewList.splice(k, 1);
 				setTimeout(() => {
 					if (state.tagsViewList.length === k && getThemeConfig.value.isShareTagsView ? state.routePath === path : state.routeActive === path) {
@ -223,29 +254,40 @@ const closeCurrentTagsView = (path) => {
 };
 // 4、关闭其它 tagsView：如果是设置了固定的（isAffix），不进行关闭
 const closeOtherTagsView = (path) => {
-	state.tagsViewList = [];
-	state.tagsViewRoutesList.map((v) => {
-		if (v.meta.isAffix && !v.meta.isHide) state.tagsViewList.push({ ...v });
-	});
-	addTagsView(path, route);
+	if (Session.get('tagsViewList')) {
+		state.tagsViewList = [];
+		Session.get('tagsViewList').map((v) => {
+			if (v.meta.isAffix && !v.meta.isHide) {
+				v.url = setTagsViewHighlight(v);
+				storesKeepALiveNames.delOthersCachedViews(v);
+				state.tagsViewList.push({ ...v });
+			}
+		});
+		addTagsView(path, route);
+		addBrowserSetSession(state.tagsViewList);
+	}
 };
 // 5、关闭全部 tagsView：如果是设置了固定的（isAffix），不进行关闭
 const closeAllTagsView = () => {
-	state.tagsViewList = [];
-	state.tagsViewRoutesList.map((v) => {
-		if (v.meta.isAffix && !v.meta.isHide) {
-			state.tagsViewList.push({ ...v });
-			router.push({ path: state.tagsViewList[state.tagsViewList.length - 1].path });
-		}
-	});
-	addBrowserSetSession(state.tagsViewList);
+	if (Session.get('tagsViewList')) {
+		storesKeepALiveNames.delAllCachedViews();
+		state.tagsViewList = [];
+		Session.get('tagsViewList').map((v) => {
+			if (v.meta.isAffix && !v.meta.isHide) {
+				v.url = setTagsViewHighlight(v);
+				state.tagsViewList.push({ ...v });
+				router.push({ path: state.tagsViewList[state.tagsViewList.length - 1].path });
+			}
+		});
+		addBrowserSetSession(state.tagsViewList);
+	}
 };
 // 6、开启当前页面全屏
 const openCurrenFullscreen = async (path) => {
 	const item = state.tagsViewList.find((v) => (getThemeConfig.value.isShareTagsView ? v.path === path : v.url === path));
 	if (item.meta.isDynamic) await router.push({ name: item.name, params: item.params });
 	else await router.push({ name: item.name, query: item.query });
-	store.dispatch('tagsViewRoutes/setCurrenFullscreen', true);
+	stores.setCurrenFullscreen(true);
 };
 // 当前项右键菜单点击，拿当前点击的路由路径对比 浏览器缓存中的 tagsView 路由数组，取当前点击项的详细路由信息
 // 防止 tagsView 非当前页演示时，操作异常
@ -452,11 +494,11 @@ onBeforeMount(() => {
 // 页面卸载时
 onUnmounted(() => {
 	// 取消非本页面调用监听
-	proxy.mittBus.off('onCurrentContextmenuClick');
+	proxy.mittBus.off('onCurrentContextmenuClick', () => {});
 	// 取消监听布局配置界面开启/关闭拖拽
-	proxy.mittBus.off('openOrCloseSortable');
+	proxy.mittBus.off('openOrCloseSortable', () => {});
 	// 取消监听布局配置开启 TagsView 共用
-	proxy.mittBus.off('openShareTagsView');
+	proxy.mittBus.off('openShareTagsView', () => {});
 	// 取消窗口 resize 监听
 	window.removeEventListener('resize', onSortableResize);
 });
@ -466,11 +508,11 @@ onBeforeUpdate(() => {
 });
 // 页面加载时
 onMounted(() => {
-	// 初始化 vuex 中的 tagsViewRoutes 列表
+	// 初始化 pinia 中的 tagsViewRoutes 列表
 	getTagsViewRoutes();
 	initSortable();
 });
-// 路由更新时
+// 路由更新时（组件内生命钩子）
 onBeforeRouteUpdate(async (to) => {
 	state.routeActive = setTagsViewHighlight(to);
 	state.routePath = to.meta.isDynamic ? to.meta.isDynamicPath : to.path;
@ -478,10 +520,16 @@ onBeforeRouteUpdate(async (to) => {
 	getTagsRefsIndex(getThemeConfig.value.isShareTagsView ? state.routePath : state.routeActive);
 });
 // 监听路由的变化，动态赋值给 tagsView
-watch(store.state, (val) => {
-	if (val.tagsViewRoutes.tagsViewRoutes.length === state.tagsViewRoutesList.length) return false;
-	getTagsViewRoutes();
-});
+watch(
+	pinia.state,
+	(val) => {
+		if (val.tagsViewRoutes.tagsViewRoutes.length === state.tagsViewRoutesList.length) return false;
+		getTagsViewRoutes();
+	},
+	{
+		deep: true,
+	}
+);
 </script>

 <style scoped lang="scss">
@ -509,7 +557,7 @@ watch(store.state, (val) => {
 			line-height: 26px;
 			display: flex;
 			align-items: center;
-			border: 1px solid #e6e6e6;
+			border: 1px solid var(--el-border-color-lighter);
 			padding: 0 15px;
 			margin-right: 5px;
 			border-radius: 2px;
@ -520,7 +568,7 @@ watch(store.state, (val) => {
 			&:hover {
 				background-color: var(--el-color-primary-light-9);
 				color: var(--el-color-primary);
-				border-color: var(--el-color-primary-light-6);
+				border-color: var(--el-color-primary-light-5);
 			}
 			&-iconfont {
 				position: relative;
--- a/src/layout/navMenu/horizontal.vue
+++ b/src/layout/navMenu/horizontal.vue
@ -1,7 +1,7 @@
 <template>
 	<div class="el-menu-horizontal-warp">
 		<el-scrollbar @wheel.native.prevent="onElMenuHorizontalScroll" ref="elMenuHorizontalScrollRef">
-			<el-menu router :default-active="state.defaultActive" background-color="transparent" mode="horizontal">
+			<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>
@ -17,7 +17,7 @@
 								{{ val.meta.title }}
 							</template>
 							<template #title v-else>
-								<a :href="val.meta.isLink" target="_blank" rel="opener">
+								<a :href="val.meta.isLink" target="_blank" rel="opener" class="w100">
 									<SvgIcon :name="val.meta.icon" />
 									{{ val.meta.title }}
 								</a>
@ -31,6 +31,9 @@
 </template>

 <script setup name="navMenuHorizontal">
+import { storeToRefs } from 'pinia';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import { onBeforeRouteUpdate } from 'vue-router';
 import SubItem from '/@/layout/navMenu/subItem.vue';

@ -41,8 +44,11 @@ const props = defineProps({
 	},
 });
 const { proxy } = getCurrentInstance();
+const stores = useRoutesList();
+const storesThemeConfig = useThemeConfig();
+const { routesList } = storeToRefs(stores);
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const route = useRoute();
-const store = useStore();
 const state = reactive({
 	defaultActive: null,
 });
@ -77,7 +83,7 @@ const filterRoutesFun = (arr) => {
 const setSendClassicChildren = (path) => {
 	const currentPathSplit = path.split('/');
 	let currentData = {};
-	filterRoutesFun(store.state.routesList.routesList).map((v, k) => {
+	filterRoutesFun(routesList.value).map((v, k) => {
 		if (v.path === `/${currentPathSplit[1]}`) {
 			v['k'] = k;
 			currentData['item'] = [{ ...v }];
@ -90,7 +96,7 @@ const setSendClassicChildren = (path) => {
 // 设置页面当前路由高亮
 const setCurrentRouterHighlight = (currentRoute) => {
 	const { path, meta } = currentRoute;
-	if (store.state.themeConfig.themeConfig.layout === 'classic') {
+	if (themeConfig.value.layout === 'classic') {
 		state.defaultActive = `/${path.split('/')[1]}`;
 	} else {
 		const pathSplit = meta.isDynamic ? meta.isDynamicPath.split('/') : path.split('/');
@ -111,7 +117,7 @@ onBeforeRouteUpdate((to) => {
 	// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
 	setCurrentRouterHighlight(to);
 	// 修复经典布局开启切割菜单时，点击tagsView后左侧导航菜单数据不变的问题
-	let { layout, isClassicSplitMenu } = store.state.themeConfig.themeConfig;
+	let { layout, isClassicSplitMenu } = themeConfig.value;
 	if (layout === 'classic' && isClassicSplitMenu) {
 		proxy.mittBus.emit('setSendClassicChildren', setSendClassicChildren(to.path));
 	}
--- a/src/layout/navMenu/subItem.vue
+++ b/src/layout/navMenu/subItem.vue
@ -14,7 +14,7 @@
 					<span>{{ val.meta.title }}</span>
 				</template>
 				<template v-else>
-					<a :href="val.meta.isLink" target="_blank" rel="opener">
+					<a :href="val.meta.isLink" target="_blank" rel="opener" class="w100">
 						<SvgIcon :name="val.meta.icon" />
 						{{ val.meta.title }}
 					</a>
--- a/src/layout/navMenu/vertical.vue
+++ b/src/layout/navMenu/vertical.vue
@ -31,6 +31,8 @@
 </template>

 <script setup name="navMenuVertical">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import { onBeforeRouteUpdate } from 'vue-router';
 import SubItem from '/@/layout/navMenu/subItem.vue';

@ -40,7 +42,8 @@ const props = defineProps({
 		default: () => [],
 	},
 });
-const store = useStore();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const route = useRoute();
 const state = reactive({
 	// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
@ -53,7 +56,7 @@ const menuLists = computed(() => {
 });
 // 获取布局配置信息
 const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
+	return themeConfig.value;
 });
 // 菜单高亮（详情时，父级高亮）
 const setParentHighlight = (currentRoute) => {
@ -64,9 +67,9 @@ const setParentHighlight = (currentRoute) => {
 };
 // 设置菜单的收起/展开
 watch(
-	store.state.themeConfig.themeConfig,
+	themeConfig.value,
 	() => {
-		document.body.clientWidth <= 1000 ? (state.isCollapse = false) : (state.isCollapse = getThemeConfig.value.isCollapse);
+		document.body.clientWidth <= 1000 ? (state.isCollapse = false) : (state.isCollapse = themeConfig.value.isCollapse);
 	},
 	{
 		immediate: true,
@ -81,6 +84,6 @@ onBeforeRouteUpdate((to) => {
 	// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
 	state.defaultActive = setParentHighlight(to);
 	const clientWidth = document.body.clientWidth;
-	if (clientWidth < 1000) getThemeConfig.value.isCollapse = false;
+	if (clientWidth < 1000) themeConfig.value.isCollapse = false;
 });
 </script>
--- a/src/layout/routerView/iframes.vue
+++ b/src/layout/routerView/iframes.vue
@ -1,12 +1,19 @@
 <template>
 	<div class="layout-view-bg-white flex mt1" :style="{ height: `calc(100vh - ${setIframeHeight}`, border: 'none' }" v-loading="state.iframeLoading">
-		<iframe :src="state.iframeUrl" frameborder="0" height="100%" width="100%" id="iframe" v-show="!state.iframeLoading"></iframe>
+		<iframe :src="iframeUrl" frameborder="0" height="100%" width="100%" ref="iframeDom" v-show="!iframeLoading"></iframe>
 	</div>
 </template>

 <script setup name="layoutIfameView">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
 const route = useRoute();
-const store = useStore();
+const storesThemeConfig = useThemeConfig();
+const storesTagsViewRoutes = useTagsViewRoutes();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
 const state = reactive({
 	iframeLoading: true,
 	iframeUrl: '',
@ -16,7 +23,7 @@ const initIframeLoad = () => {
 	state.iframeUrl = route.meta.isLink;
 	nextTick(() => {
 		state.iframeLoading = true;
-		const iframe = document.getElementById('iframe');
+		const iframe = state.iframeDom;
 		if (!iframe) return false;
 		iframe.onload = () => {
 			state.iframeLoading = false;
@ -25,12 +32,11 @@ const initIframeLoad = () => {
 };
 // 设置 iframe 的高度
 const setIframeHeight = computed(() => {
-	let { isTagsview } = store.state.themeConfig.themeConfig;
-	let { isTagsViewCurrenFull } = store.state.tagsViewRoutes;
-	if (isTagsViewCurrenFull) {
+	let { isTagsview } = themeConfig.value;
+	if (isTagsViewCurrenFull.value) {
 		return `1px`;
 	} else {
-		if (isTagsview) return `85px`;
+		if (isTagsview) return `86px`;
 		else return `51px`;
 	}
 });
--- a/src/layout/routerView/link.vue
+++ b/src/layout/routerView/link.vue
@ -7,8 +7,12 @@
 </template>

 <script setup name="layoutLinkView">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+
 const route = useRoute();
-const store = useStore();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const state = reactive({
 	currentRouteMeta: {
 		isLink: '',
@ -17,8 +21,8 @@ const state = reactive({
 });
 // 设置 link 的高度
 const setLinkHeight = computed(() => {
-	let { isTagsview } = store.state.themeConfig.themeConfig;
-	if (isTagsview) return `114px`;
+	let { isTagsview } = themeConfig.value;
+	if (isTagsview) return `115px`;
 	else return `80px`;
 });
 // 监听路由的变化，设置内容
--- a/src/layout/routerView/parent.vue
+++ b/src/layout/routerView/parent.vue
@ -2,8 +2,8 @@
 	<div class="h100">
 		<router-view v-slot="{ Component }">
 			<transition :name="setTransitionName" mode="out-in">
-				<keep-alive :include="state.keepAliveNameList">
-					<component :is="Component" :key="state.refreshRouterViewKey" class="w100" :style="{ minHeight }" />
+				<keep-alive :include="getKeepAliveNames">
+					<component :is="Component" :key="state.refreshRouterViewKey" class="w100" />
 				</keep-alive>
 			</transition>
 		</router-view>
@ -11,43 +11,49 @@
 </template>

 <script setup name="layoutParentView">
-const props = defineProps({
-	minHeight: {
-		type: String,
-		default: '',
-	},
-});
+import { storeToRefs } from 'pinia';
+import { useKeepALiveNames } from '/@/stores/keepAliveNames';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { Session } from '/@/utils/storage';

 const { proxy } = getCurrentInstance();
 const route = useRoute();
-const store = useStore();
+const storesKeepAliveNames = useKeepALiveNames();
+const storesThemeConfig = useThemeConfig();
+const { keepAliveNames, cachedViews } = storeToRefs(storesKeepAliveNames);
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const state = reactive({
 	refreshRouterViewKey: null,
 	keepAliveNameList: [],
 });
 // 设置主界面切换动画
 const setTransitionName = computed(() => {
-	return store.state.themeConfig.themeConfig.animation;
-});
-// 设置最小高度
-const minHeight = computed(() => {
-	return props.minHeight;
+	return themeConfig.value.animation;
 });
 // 获取组件缓存列表(name值)
 const getKeepAliveNames = computed(() => {
-	return store.state.keepAliveNames.keepAliveNames;
+	return themeConfig.value.isTagsview ? cachedViews.value : state.keepAliveNameList;
 });
 // 页面加载前，处理缓存，页面刷新时路由缓存处理
 onBeforeMount(() => {
-	state.keepAliveNameList = getKeepAliveNames.value;
+	state.keepAliveNameList = keepAliveNames.value;
 	proxy.mittBus.on('onTagsViewRefreshRouterView', (fullPath) => {
-		state.keepAliveNameList = getKeepAliveNames.value.filter((name) => route.name !== name);
+		state.keepAliveNameList = keepAliveNames.value.filter((name) => route.name !== name);
 		state.refreshRouterViewKey = null;
 		nextTick(() => {
 			state.refreshRouterViewKey = fullPath;
-			state.keepAliveNameList = getKeepAliveNames.value;
+			state.keepAliveNameList = keepAliveNames.value;
 		});
 	});
+}); // 页面加载时
+onMounted(() => {
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I58U75
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I59RXK
+	nextTick(() => {
+		setTimeout(() => {
+			if (themeConfig.value.isCacheTagsView) cachedViews.value = Session.get('tagsViewList')?.map((item) => item.name);
+		}, 0);
+	});
 });
 // 页面卸载时
 onUnmounted(() => {
@ -57,7 +63,7 @@ onUnmounted(() => {
 watch(
 	() => route.fullPath,
 	() => {
-		state.refreshRouterViewKey = route.fullPath;
+		state.refreshRouterViewKey = decodeURI(route.fullPath);
 	}
 );
 </script>
--- a/src/main.js
+++ b/src/main.js
@ -1,7 +1,7 @@
 import { createApp } from 'vue';
+import pinia from './stores/index';
 import App from './App.vue';
 import router from './router';
-import { store } from './store';
 import { directive } from '/@/utils/directive';
 import other from '/@/utils/other';

@ -15,6 +15,6 @@ const app = createApp(App);
 directive(app);
 other.elSvg(app);

-app.use(router).use(store).use(ElementPlus).mount('#app');
+app.use(pinia).use(router).use(ElementPlus).mount('#app');

 app.config.globalProperties.mittBus = mitt();
--- a/src/router/backEnd.js
+++ b/src/router/backEnd.js
@ -1,14 +1,22 @@
-import { store } from '/@/store/index';
+import { storeToRefs } from 'pinia';
+import pinia from '../stores/index';
+import { useUserInfo } from '/@/stores/userInfo';
+import { useRequestOldRoutes } from '/@/stores/requestOldRoutes';
 import { Session } from '/@/utils/storage';
 import { NextLoading } from '/@/utils/loading';
-import { setAddRoute, setFilterMenuAndCacheTagsViewRoutes } from '/@/router/index';
-import { dynamicRoutes } from '/@/router/route';
+import { dynamicRoutes, notFoundAndNoPower } from '/@/router/route';
+import { formatTwoStageRoutes, formatFlatteningRoutes, router } from '/@/router/index';
+import { useRoutesList } from '/@/stores/routesList';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import { useMenuApi } from '/@/api/menu/index';

 const menuApi = useMenuApi();

 const layouModules = import.meta.glob('../layout/routerView/*.{vue,tsx}');
 const viewsModules = import.meta.glob('../views/**/*.{vue,tsx}');
+
+// 后端控制路由
+
 /**
 * 获取目录下的 .vue、.tsx 全部文件
 * @method import.meta.glob
@ -18,29 +26,73 @@ const dynamicViewsModules = Object.assign({}, { ...layouModules }, { ...viewsMod

 /**
 * 后端控制路由：初始化方法，防止刷新时路由丢失
- * @method  NextLoading 界面 loading 动画开始执行
- * @method store.dispatch('userInfos/setUserInfos') 触发初始化用户信息
- * @method store.dispatch('requestOldRoutes/setBackEndControlRoutes') 存储接口原始路由（未处理component），根据需求选择使用
+ * @method NextLoading 界面 loading 动画开始执行
+ * @method useUserInfo().setUserInfos() 触发初始化用户信息 pinia
+ * @method useRequestOldRoutes().setRequestOldRoutes() 存储接口原始路由（未处理component），根据需求选择使用
 * @method setAddRoute 添加动态路由
- * @method setFilterMenuAndCacheTagsViewRoutes 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+ * @method setFilterMenuAndCacheTagsViewRoutes 设置路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
 */
+
 export async function initBackEndControlRoutes() {
 	// 界面 loading 动画开始执行
 	if (window.nextLoading === undefined) NextLoading.start();
 	// 无 token 停止执行下一步
 	if (!Session.get('token')) return false;
-	// 触发初始化用户信息
-	store.dispatch('userInfos/setUserInfos');
+	// 触发初始化用户信息 pinia
+	useUserInfo().setUserInfos();
 	// 获取路由菜单数据
 	const res = await getBackEndControlRoutes();
 	// 存储接口原始路由（未处理component），根据需求选择使用
-	store.dispatch('requestOldRoutes/setBackEndControlRoutes', JSON.parse(JSON.stringify(res.data)));
+	useRequestOldRoutes().setRequestOldRoutes(JSON.parse(JSON.stringify(res.data)));
 	// 处理路由（component），替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
 	dynamicRoutes[0].children = await backEndComponent(res.data);
 	// 添加动态路由
 	await setAddRoute();
-	// 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
-	setFilterMenuAndCacheTagsViewRoutes();
+	// 设置路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+	await setFilterMenuAndCacheTagsViewRoutes();
+}
+
+/**
+ * 设置路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
+ * @description 用于左侧菜单、横向菜单的显示
+ * @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
+ */
+export function setFilterMenuAndCacheTagsViewRoutes() {
+	const storesRoutesList = useRoutesList(pinia);
+	storesRoutesList.setRoutesList(dynamicRoutes[0].children);
+	setCacheTagsViewRoutes();
+}
+
+/**
+ * 缓存多级嵌套数组处理后的一维数组
+ * @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
+ */
+export function setCacheTagsViewRoutes() {
+	const storesTagsView = useTagsViewRoutes(pinia);
+	storesTagsView.setTagsViewRoutes(formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes))[0].children);
+}
+
+/**
+ * 处理路由格式及添加捕获所有路由或 404 Not found 路由
+ * @description 替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
+ * @returns 返回替换后的路由数组
+ */
+export function setFilterRouteEnd() {
+	let filterRouteEnd = formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes));
+	filterRouteEnd[0].children = [...filterRouteEnd[0].children, ...notFoundAndNoPower];
+	return filterRouteEnd;
+}
+
+/**
+ * 添加动态路由
+ * @method router.addRoute
+ * @description 此处循环为 dynamicRoutes（/@/router/route）第一个顶级 children 的路由一维数组，非多级嵌套
+ * @link 参考：https://next.router.vuejs.org/zh/api/#addroute
+ */
+export async function setAddRoute() {
+	await setFilterRouteEnd().forEach((route) => {
+		router.addRoute(route);
+	});
 }

 /**
@ -50,7 +102,9 @@ export async function initBackEndControlRoutes() {
 */
 export function getBackEndControlRoutes() {
 	// 模拟 admin 与 test
-	const auth = store.state.userInfos.userInfos.roles[0];
+	const stores = useUserInfo(pinia);
+	const { userInfos } = storeToRefs(stores);
+	const auth = userInfos.value.roles[0];
 	// 管理员 admin
 	if (auth === 'admin') return menuApi.getMenuAdmin();
 	// 其它用户 test
--- a/src/router/frontEnd.js
+++ b/src/router/frontEnd.js
@ -1,12 +1,19 @@
-import { store } from '/@/store/index';
+import { storeToRefs } from 'pinia';
+import { formatTwoStageRoutes, formatFlatteningRoutes, router } from '/@/router/index';
+import { dynamicRoutes, notFoundAndNoPower } from '/@/router/route';
+import pinia from '../stores/index';
 import { Session } from '/@/utils/storage';
+import { useUserInfo } from '/@/stores/userInfo';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import { useRoutesList } from '/@/stores/routesList';
 import { NextLoading } from '/@/utils/loading';
-import { setAddRoute, setFilterMenuAndCacheTagsViewRoutes } from '/@/router/index';
+
+// 前端控制路由

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

+/**
+ * 1、前端控制路由时：isRequestRoutes 为 false，需要写 roles，需要走 setFilterRoute 方法。
+ * 2、后端控制路由时：isRequestRoutes 为 true，不需要写 roles，不需要走 setFilterRoute 方法），
+ * 相关方法已拆解到对应的 `backEnd.ts` 与 `frontEnd.ts`（他们互不影响，不需要同时改 2 个文件）。
+ * 特别说明：
+ * 1、前端控制：路由菜单由前端去写（无菜单管理界面，有角色管理界面），角色管理中有 roles 属性，需返回到 userInfo 中。
+ * 2、后端控制：路由菜单由后端返回（有菜单管理界面、有角色管理界面）
+ */
+
+// 读取 `/src/stores/themeConfig.ts` 是否开启后端控制路由配置
+const storesThemeConfig = useThemeConfig(pinia);
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { isRequestRoutes } = themeConfig.value;
+if (isRequestRoutes) staticRoutes.splice(0, 1);
+
 /**
 * 创建一个可以被 Vue 应用程序使用的路由实例
 * @method createRouter(options: RouterOptions): Router
 * @link 参考：https://next.router.vuejs.org/zh/api/#createrouter
 */
-const router = createRouter({
+export const router = createRouter({
 	history: createWebHashHistory(),
 	routes: staticRoutes,
 });

-/**
- * 定义404界面
- * @link 参考：https://next.router.vuejs.org/zh/guide/essentials/history-mode.html#netlify
- */
-const pathMatch = {
-	path: '/:path(.*)*',
-	redirect: '/404',
-};
-
 /**
 * 路由多级嵌套数组处理成一维数组
 * @param arr 传入路由菜单数据数组
@ -68,124 +77,15 @@ export function formatTwoStageRoutes(arr) {
 			// 路径：/@/layout/routerView/parent.vue
 			if (newArr[0].meta.isKeepAlive && v.meta.isKeepAlive) {
 				cacheList.push(v.name);
-				store.dispatch('keepAliveNames/setCacheKeepAlive', cacheList);
+				const stores = useKeepALiveNames(pinia);
+				stores.setCacheKeepAlive(cacheList);
 			}
 		}
 	});
 	return newArr;
 }

-/**
- * 缓存多级嵌套数组处理后的一维数组
- * @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
- */
-export function setCacheTagsViewRoutes() {
-	// 获取有权限的路由，否则 tagsView、菜单搜索中无权限的路由也将显示
-	let rolesRoutes = setFilterHasRolesMenu(dynamicRoutes, store.state.userInfos.userInfos.roles);
-	// 添加到 vuex setTagsViewRoutes 中
-	store.dispatch('tagsViewRoutes/setTagsViewRoutes', formatTwoStageRoutes(formatFlatteningRoutes(rolesRoutes))[0].children);
-}
-
-/**
- * 判断路由 `meta.roles` 中是否包含当前登录用户权限字段
- * @param roles 用户权限标识，在 userInfos（用户信息）的 roles（登录页登录时缓存到浏览器）数组
- * @param route 当前循环时的路由项
- * @returns 返回对比后有权限的路由项
- */
-export function hasRoles(roles, route) {
-	if (route.meta && route.meta.roles) return roles.some((role) => route.meta.roles.includes(role));
-	else return true;
-}
-
-/**
- * 获取当前用户权限标识去比对路由表，设置递归过滤有权限的路由
- * @param routes 当前路由 children
- * @param roles 用户权限标识，在 userInfos（用户信息）的 roles（登录页登录时缓存到浏览器）数组
- * @returns 返回有权限的路由数组 `meta.roles` 中控制
- */
-export function setFilterHasRolesMenu(routes, roles) {
-	const menu = [];
-	routes.forEach((route) => {
-		const item = { ...route };
-		if (hasRoles(roles, item)) {
-			if (item.children) item.children = setFilterHasRolesMenu(item.children, roles);
-			menu.push(item);
-		}
-	});
-	return menu;
-}
-
-/**
- * 设置递归过滤有权限的路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
- * @description 用于左侧菜单、横向菜单的显示
- * @description 用于 tagsView、菜单搜索中：未过滤隐藏的(isHide)
- */
-export function setFilterMenuAndCacheTagsViewRoutes() {
-	store.dispatch('routesList/setRoutesList', setFilterHasRolesMenu(dynamicRoutes[0].children, store.state.userInfos.userInfos.roles));
-	setCacheTagsViewRoutes();
-}
-
-/**
- * 获取当前用户权限标识去比对路由表（未处理成多级嵌套路由）
- * @description 这里主要用于动态路由的添加，router.addRoute
- * @link 参考：https://next.router.vuejs.org/zh/api/#addroute
- * @param chil dynamicRoutes（/@/router/route）第一个顶级 children 的下路由集合
- * @returns 返回有当前用户权限标识的路由数组
- */
-export function setFilterRoute(chil) {
-	let filterRoute = [];
-	chil.forEach((route) => {
-		if (route.meta.roles) {
-			route.meta.roles.forEach((metaRoles) => {
-				store.state.userInfos.userInfos.roles.forEach((roles) => {
-					if (metaRoles === roles) filterRoute.push({ ...route });
-				});
-			});
-		}
-	});
-	return filterRoute;
-}
-
-/**
- * 获取有当前用户权限标识的路由数组，进行对原路由的替换
- * @description 替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
- * @returns 返回替换后的路由数组
- */
-export function setFilterRouteEnd() {
-	let filterRouteEnd = formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes));
-	filterRouteEnd[0].children = [...setFilterRoute(filterRouteEnd[0].children), { ...pathMatch }];
-	return filterRouteEnd;
-}
-
-/**
- * 添加动态路由
- * @method router.addRoute
- * @description 此处循环为 dynamicRoutes（/@/router/route）第一个顶级 children 的路由一维数组，非多级嵌套
- * @link 参考：https://next.router.vuejs.org/zh/api/#addroute
- */
-export function setAddRoute() {
-	setFilterRouteEnd().forEach((route) => {
-		const routeName = route.name;
-		if (!router.hasRoute(routeName)) router.addRoute(route);
-	});
-}
-
-/**
- * 删除/重置路由
- * @method router.removeRoute
- * @description 此处循环为 dynamicRoutes（/@/router/route）第一个顶级 children 的路由一维数组，非多级嵌套
- * @link 参考：https://next.router.vuejs.org/zh/api/#push
- */
-export function resetRoute() {
-	setFilterRouteEnd().forEach((route) => {
-		const routeName = route.name;
-		router.hasRoute(routeName) && router.removeRoute(routeName);
-	});
-}
-
-// isRequestRoutes 为 true，则开启后端控制路由，路径：`/src/store/modules/themeConfig.ts`
-const { isRequestRoutes } = store.state.themeConfig.themeConfig;
-// 前端控制路由：初始化方法，防止刷新时路由丢失
+// isRequestRoutes 为 true，则开启后端控制路由，路径：`/src/stores/themeConfig.ts`
 if (!isRequestRoutes) initFrontEndControlRoutes();

 // 路由加载前
@ -200,13 +100,14 @@ router.beforeEach(async (to, from, next) => {
 		if (!token) {
 			next(`/login?redirect=${to.path}&params=${JSON.stringify(to.query ? to.query : to.params)}`);
 			Session.clear();
-			resetRoute();
 			NProgress.done();
 		} else if (token && to.path === '/login') {
 			next('/home');
 			NProgress.done();
 		} else {
-			if (store.state.routesList.routesList.length === 0) {
+			const storesRoutesList = useRoutesList(pinia);
+			const { routesList } = storeToRefs(storesRoutesList);
+			if (routesList.value.length === 0) {
 				if (isRequestRoutes) {
 					// 后端控制路由：路由数据初始化，防止刷新时丢失
 					await initBackEndControlRoutes();
@ -224,7 +125,6 @@ router.beforeEach(async (to, from, next) => {
 // 路由加载后
 router.afterEach(() => {
 	NProgress.done();
-	NextLoading.done();
 });

 // 导出路由
--- a/src/router/route.js
+++ b/src/router/route.js
@ -2,12 +2,12 @@
 * 路由meta对象参数说明
 * meta: {
 *      title:          菜单栏及 tagsView 栏、菜单搜索名称（国际化）
- *      isLink：        是否超链接菜单，开启外链条件，`1、isLink:true 2、链接地址不为空`
+ *      isLink：        是否超链接菜单，开启外链条件，`1、isLink: 链接地址不为空`
 *      isHide：        是否隐藏此路由
 *      isKeepAlive：   是否缓存组件状态
 *      isAffix：       是否固定在 tagsView 栏上
- *      isIframe：      是否内嵌窗口，，开启条件，`1、isIframe:true 2、链接地址不为空`
- *      roles：          当前路由权限标识，取角色管理。控制路由显示、隐藏。超级管理员：admin 普通角色：common
+ *      isIframe：      是否内嵌窗口，开启条件，`1、isIframe:true 2、isLink：链接地址不为空`
+ *      roles：         当前路由权限标识，取角色管理。控制路由显示、隐藏。超级管理员：admin 普通角色：common
 *      icon：          菜单、tagsView 图标，阿里：加 `iconfont xxx`，fontawesome：加 `fa xxx`
 * }
 */
@ -141,25 +141,17 @@ export const dynamicRoutes = [
 ];

 /**
- * 定义静态路由
- * @description 前端控制直接改 dynamicRoutes 中的路由，后端控制不需要修改，请求接口路由数据时，会覆盖 dynamicRoutes 第一个顶级 children 的内容（全屏，不包含 layout 中的路由出口）
- * @returns 返回路由菜单数据
+ * 定义404、401界面
+ * @link 参考：https://next.router.vuejs.org/zh/guide/essentials/history-mode.html#netlify
 */
-export const staticRoutes = [
+export const notFoundAndNoPower = [
 	{
-		path: '/login',
-		name: 'login',
-		component: () => import('/@/views/login/index.vue'),
-		meta: {
-			title: '登录',
-		},
-	},
-	{
-		path: '/404',
+		path: '/:path(.*)*',
 		name: 'notFound',
 		component: () => import('/@/views/error/404.vue'),
 		meta: {
 			title: '页面找不到',
+			isHide: true,
 		},
 	},
 	{
@ -168,6 +160,36 @@ export const staticRoutes = [
 		component: () => import('/@/views/error/401.vue'),
 		meta: {
 			title: '页面无权限',
+			isHide: true,
+		},
+	},
+];
+
+/**
+ * 定义静态路由（默认路由）
+ * 此路由不要动，前端添加路由的话，请在 `dynamicRoutes 数组` 中添加
+ * @description 前端控制直接改 dynamicRoutes 中的路由，后端控制不需要修改，请求接口路由数据时，会覆盖 dynamicRoutes 第一个顶级 children 的内容（全屏，不包含 layout 中的路由出口）
+ * @returns 返回路由菜单数据
+ */
+export const staticRoutes = [
+	{
+		path: '/',
+		name: '/',
+		component: () => import('/@/layout/index.vue'),
+		meta: {
+			title: '布局界面',
+		},
+		children: [
+			// 请不要往这里 `children` 中添加内容，此内容为了防止 No match found for location with path "xxx" 问题
+			...notFoundAndNoPower,
+		],
+	},
+	{
+		path: '/login',
+		name: 'login',
+		component: () => import('/@/views/login/index.vue'),
+		meta: {
+			title: '登录',
 		},
 	},
 ];
--- a/src/store/index.js
+++ b/src/store/index.js
@ -1,19 +0,0 @@
-import { createStore } from 'vuex';
-
-// Vite supports importing multiple modules from the file system using the special import.meta.glob function
-// see https://cn.vitejs.dev/guide/features.html#glob-import
-const modulesFiles = import.meta.globEager('./modules/*.js');
-const pathList = [];
-
-for (const path in modulesFiles) {
-	pathList.push(path);
-}
-
-const modules = pathList.reduce((modules, modulePath) => {
-	const moduleName = modulePath.replace(/^\.\/modules\/(.*)\.\w+$/, '$1');
-	const value = modulesFiles[modulePath];
-	modules[moduleName] = value.default;
-	return modules;
-}, {});
-
-export const store = createStore({ modules });
--- a/src/store/modules/keepAliveNames.js
+++ b/src/store/modules/keepAliveNames.js
@ -1,20 +0,0 @@
-const keepAliveNamesModule = {
-	namespaced: true,
-	state: {
-		keepAliveNames: [],
-	},
-	mutations: {
-		// 设置路由缓存（name字段）
-		getCacheKeepAlive(state, data) {
-			state.keepAliveNames = data;
-		},
-	},
-	actions: {
-		// 设置路由缓存（name字段）
-		async setCacheKeepAlive({ commit }, data) {
-			commit('getCacheKeepAlive', data);
-		},
-	},
-};
-
-export default keepAliveNamesModule;
--- a/src/store/modules/requestOldRoutes.js
+++ b/src/store/modules/requestOldRoutes.js
@ -1,20 +0,0 @@
-const requestOldRoutesModule = {
-	namespaced: true,
-	state: {
-		requestOldRoutes: [],
-	},
-	mutations: {
-		// 后端控制路由
-		getBackEndControlRoutes(state, data) {
-			state.requestOldRoutes = data;
-		},
-	},
-	actions: {
-		// 后端控制路由
-		setBackEndControlRoutes({ commit }, routes) {
-			commit('getBackEndControlRoutes', routes);
-		},
-	},
-};
-
-export default requestOldRoutesModule;
--- a/src/store/modules/routesList.js
+++ b/src/store/modules/routesList.js
@ -1,38 +0,0 @@
-const routesListModule = {
-	namespaced: true,
-	state: {
-		routesList: [],
-		isColumnsMenuHover: false,
-		isColumnsNavHover: false,
-	},
-	mutations: {
-		// 设置路由，菜单中使用到
-		getRoutesList(state, data) {
-			state.routesList = data;
-		},
-		// 设置分栏布局，鼠标是否移入移出（菜单）
-		getColumnsMenuHover(state, bool) {
-			state.isColumnsMenuHover = bool;
-		},
-		// 设置分栏布局，鼠标是否移入移出（导航）
-		getColumnsNavHover(state, bool) {
-			state.isColumnsNavHover = bool;
-		},
-	},
-	actions: {
-		// 设置路由，菜单中使用到
-		async setRoutesList({ commit }, data) {
-			commit('getRoutesList', data);
-		},
-		// 设置分栏布局，鼠标是否移入移出（菜单）
-		async setColumnsMenuHover({ commit }, bool) {
-			commit('getColumnsMenuHover', bool);
-		},
-		// 设置分栏布局，鼠标是否移入移出（菜单）
-		async setColumnsNavHover({ commit }, bool) {
-			commit('getColumnsNavHover', bool);
-		},
-	},
-};
-
-export default routesListModule;
--- a/src/store/modules/tagsViewRoutes.js
+++ b/src/store/modules/tagsViewRoutes.js
@ -1,32 +0,0 @@
-import { Session } from '/@/utils/storage';
-
-const tagsViewRoutesModule = {
-	namespaced: true,
-	state: {
-		tagsViewRoutes: [],
-		isTagsViewCurrenFull: false,
-	},
-	mutations: {
-		// 设置 TagsView 路由
-		getTagsViewRoutes(state, data) {
-			state.tagsViewRoutes = data;
-		},
-		// 设置卡片全屏
-		getCurrenFullscreen(state, bool) {
-			Session.set('isTagsViewCurrenFull', bool);
-			state.isTagsViewCurrenFull = bool;
-		},
-	},
-	actions: {
-		// 设置 TagsView 路由
-		async setTagsViewRoutes({ commit }, data) {
-			commit('getTagsViewRoutes', data);
-		},
-		// 设置卡片全屏
-		setCurrenFullscreen({ commit }, bool) {
-			commit('getCurrenFullscreen', bool);
-		},
-	},
-};
-
-export default tagsViewRoutesModule;
--- a/src/store/modules/userInfos.js
+++ b/src/store/modules/userInfos.js
@ -1,26 +0,0 @@
-import { Session } from '/@/utils/storage';
-
-const userInfosModule = {
-	namespaced: true,
-	state: {
-		userInfos: {},
-	},
-	mutations: {
-		// 设置用户信息
-		getUserInfos(state, data) {
-			state.userInfos = data;
-		},
-	},
-	actions: {
-		// 设置用户信息
-		async setUserInfos({ commit }, data) {
-			if (data) {
-				commit('getUserInfos', data);
-			} else {
-				if (Session.get('userInfo')) commit('getUserInfos', Session.get('userInfo'));
-			}
-		},
-	},
-};
-
-export default userInfosModule;
--- a/src/stores/index.js
+++ b/src/stores/index.js
@ -0,0 +1,8 @@
+// https://pinia.vuejs.org/
+import { createPinia } from 'pinia';
+
+// 创建
+const pinia = createPinia();
+
+// 导出
+export default pinia;
--- a/src/stores/keepAliveNames.js
+++ b/src/stores/keepAliveNames.js
@ -0,0 +1,36 @@
+import { defineStore } from 'pinia';
+
+/**
+ * 路由缓存列表
+ * @methods setCacheKeepAlive 设置要缓存的路由 names（开启 Tagsview）
+ * @methods addCachedView 添加要缓存的路由 names（关闭 Tagsview）
+ * @methods delCachedView 删除要缓存的路由 names（关闭 Tagsview）
+ * @methods delOthersCachedViews 右键菜单`关闭其它`，删除要缓存的路由 names（关闭 Tagsview）
+ * @methods delAllCachedViews 右键菜单`全部关闭`，删除要缓存的路由 names（关闭 Tagsview）
+ */
+export const useKeepALiveNames = defineStore('keepALiveNames', {
+	state: () => ({
+		keepAliveNames: [],
+		cachedViews: [],
+	}),
+	actions: {
+		async setCacheKeepAlive(data) {
+			this.keepAliveNames = data;
+		},
+		async addCachedView(view) {
+			if (this.cachedViews.includes(view.name)) return;
+			if (view.meta.isKeepAlive) this.cachedViews.push(view.name);
+		},
+		async delCachedView(view) {
+			const index = this.cachedViews.indexOf(view.name);
+			index > -1 && this.cachedViews.splice(index, 1);
+		},
+		async delOthersCachedViews(view) {
+			if (view.meta.isKeepAlive) this.cachedViews = [view.name];
+			else this.cachedViews = [];
+		},
+		async delAllCachedViews() {
+			this.cachedViews = [];
+		},
+	},
+});
--- a/src/stores/requestOldRoutes.js
+++ b/src/stores/requestOldRoutes.js
@ -0,0 +1,16 @@
+import { defineStore } from 'pinia';
+
+/**
+ * 后端返回原始路由(未处理时)
+ * @methods setCacheKeepAlive 设置接口原始路由数据
+ */
+export const useRequestOldRoutes = defineStore('requestOldRoutes', {
+	state: () => ({
+		requestOldRoutes: [],
+	}),
+	actions: {
+		async setRequestOldRoutes(routes) {
+			this.requestOldRoutes = routes;
+		},
+	},
+});
--- a/src/stores/routesList.js
+++ b/src/stores/routesList.js
@ -0,0 +1,26 @@
+import { defineStore } from 'pinia';
+
+/**
+ * 路由列表
+ * @methods setRoutesList 设置路由数据
+ * @methods setColumnsMenuHover 设置分栏布局菜单鼠标移入 boolean
+ * @methods setColumnsNavHover 设置分栏布局最左侧导航鼠标移入 boolean
+ */
+export const useRoutesList = defineStore('routesList', {
+	state: () => ({
+		routesList: [],
+		isColumnsMenuHover: false,
+		isColumnsNavHover: false,
+	}),
+	actions: {
+		async setRoutesList(data) {
+			this.routesList = data;
+		},
+		async setColumnsMenuHover(bool) {
+			this.isColumnsMenuHover = bool;
+		},
+		async setColumnsNavHover(bool) {
+			this.isColumnsNavHover = bool;
+		},
+	},
+});
--- a/src/stores/tagsViewRoutes.js
+++ b/src/stores/tagsViewRoutes.js
@ -0,0 +1,23 @@
+import { defineStore } from 'pinia';
+import { Session } from '/@/utils/storage';
+
+/**
+ * TagsView 路由列表
+ * @methods setTagsViewRoutes 设置 TagsView 路由列表
+ * @methods setCurrenFullscreen 设置开启/关闭全屏时的 boolean 状态
+ */
+export const useTagsViewRoutes = defineStore('tagsViewRoutes', {
+	state: () => ({
+		tagsViewRoutes: [],
+		isTagsViewCurrenFull: false,
+	}),
+	actions: {
+		async setTagsViewRoutes(data) {
+			this.tagsViewRoutes = data;
+		},
+		setCurrenFullscreen(bool) {
+			Session.set('isTagsViewCurrenFull', bool);
+			this.isTagsViewCurrenFull = bool;
+		},
+	},
+});
--- a/src/store/modules/themeConfig.js
+++ b/src/store/modules/themeConfig.js
@ -1,11 +1,15 @@
+import { defineStore } from 'pinia';
+
 /**
- * 2020.05.28 by lyt 优化
- * 修改一下配置时，需要每次都清理 `window.localStorage` 浏览器永久缓存，配置才会生效
- * 哪个大佬有解决办法，欢迎pr，感谢💕！
+ * 布局配置
+ * 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I567R1，感谢@lanbao123
+ * 2020.05.28 by lyt 优化。开发时配置不生效问题
+ * 修改配置时：
+ * 1、需要每次都清理 `window.localStorage` 浏览器永久缓存
+ * 2、或者点击布局配置最底部 `一键恢复默认` 按钮即可看到效果
 */
-const themeConfigModule = {
-	namespaced: true,
-	state: {
+export const useThemeConfig = defineStore('themeConfig', {
+	state: () => ({
 		themeConfig: {
 			// 是否开启布局配置抽屉
 			isDrawer: false,
@ -15,6 +19,8 @@ const themeConfigModule = {
 			 */
 			// 默认 primary 主题颜色
 			primary: '#409eff',
+			// 是否开启深色模式
+			isIsDark: false,

 			/**
 			 * 菜单 / 顶栏
@ -86,8 +92,6 @@ const themeConfigModule = {
 			isGrayscale: false,
 			// 是否开启色弱模式
 			isInvert: false,
-			// 是否开启深色模式
-			isIsDark: false,
 			// 是否开启水印
 			isWartermark: false,
 			// 水印文案
@ -127,22 +131,15 @@ const themeConfigModule = {
 			globalTitle: 'vue-next-admin',
 			// 网站副标题（登录页顶部文字）
 			globalViceTitle: 'vueNextAdmin',
+			// 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn
+			globalI18n: 'zh-cn',
 			// 默认全局组件大小，可选值"<large|'default'|small>"，默认 'large'
 			globalComponentSize: 'large',
 		},
-	},
-	mutations: {
-		// 设置布局配置
-		getThemeConfig(state, data) {
-			state.themeConfig = data;
-		},
-	},
+	}),
 	actions: {
-		// 设置布局配置
-		setThemeConfig({ commit }, data) {
-			commit('getThemeConfig', data);
+		setThemeConfig(data) {
+			this.themeConfig = data;
 		},
 	},
-};
-
-export default themeConfigModule;
+});
--- a/src/stores/userInfo.js
+++ b/src/stores/userInfo.js
@ -0,0 +1,63 @@
+import { defineStore } from 'pinia';
+import Cookies from 'js-cookie';
+import { Session } from '/@/utils/storage';
+
+/**
+ * 用户信息
+ * @methods setUserInfos 设置用户信息
+ */
+export const useUserInfo = defineStore('userInfo', {
+	state: () => ({
+		userInfos: {
+			userName: '',
+			photo: '',
+			time: 0,
+			roles: [],
+			authBtnList: [],
+		},
+	}),
+	actions: {
+		async setUserInfos() {
+			// 模拟数据，请求接口时，记得删除多余代码及对应依赖的引入
+			const userName = Cookies.get('userName');
+			// 模拟数据
+			let defaultRoles = [];
+			let defaultAuthBtnList = [];
+			// admin 页面权限标识，对应路由 meta.roles，用于控制路由的显示/隐藏
+			let adminRoles = ['admin'];
+			// admin 按钮权限标识
+			let adminAuthBtnList = ['btn.add', 'btn.del', 'btn.edit', 'btn.link'];
+			// test 页面权限标识，对应路由 meta.roles，用于控制路由的显示/隐藏
+			let testRoles = ['common'];
+			// test 按钮权限标识
+			let testAuthBtnList = ['btn.add', 'btn.link'];
+			// 不同用户模拟不同的用户权限
+			if (userName === 'admin') {
+				defaultRoles = adminRoles;
+				defaultAuthBtnList = adminAuthBtnList;
+			} else {
+				defaultRoles = testRoles;
+				defaultAuthBtnList = testAuthBtnList;
+			}
+			// 用户信息模拟数据
+			const userInfos = {
+				userName: userName,
+				photo:
+					userName === 'admin'
+						? 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg'
+						: 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=317673774,2961727727&fm=26&gp=0.jpg',
+				time: new Date().getTime(),
+				roles: defaultRoles,
+				authBtnList: defaultAuthBtnList,
+			};
+			// 存储用户信息到浏览器缓存
+			Session.set('userInfo', userInfos);
+
+			if (Session.get('userInfo')) {
+				this.userInfos = Session.get('userInfo');
+			} else {
+				this.userInfos = userInfos;
+			}
+		},
+	},
+});
--- a/src/theme/app.scss
+++ b/src/theme/app.scss
@ -8,12 +8,16 @@
 }

 :root {
+	--next-color-white: #ffffff;
 	--next-bg-main-color: #f8f8f8;
 	--next-bg-color: #f5f5ff;
 	--next-border-color-light: #f1f2f3;
 	--next-color-primary-lighter: #ecf5ff;
+	--next-color-success-lighter: #f0f9eb;
+	--next-color-warning-lighter: #fdf6ec;
+	--next-color-danger-lighter: #fef0f0;
 	--next-color-dark-hover: #0000001a;
-	--next-color-menu-hover: rgba(0, 0, 0, 0.1);
+	--next-color-menu-hover: rgba(0, 0, 0, 0.2);
 	--next-color-user-hover: rgba(0, 0, 0, 0.04);
 	--next-color-seting-main: #e9eef3;
 	--next-color-seting-aside: #d3dce6;
--- a/src/theme/dark.scss
+++ b/src/theme/dark.scss
@ -26,6 +26,9 @@
 	--next-bg-columnsMenuBarColor: var(--next-color-bar) !important;
 	--next-border-color-light: var(--next-border-black) !important;
 	--next-color-primary-lighter: var(--next-color-primary) !important;
+	--next-color-success-lighter: var(--next-color-primary) !important;
+	--next-color-warning-lighter: var(--next-color-primary) !important;
+	--next-color-danger-lighter: var(--next-color-primary) !important;
 	--next-bg-color: var(--next-color-primary) !important;
 	--next-color-dark-hover: var(--next-color-hover) !important;
 	--next-color-menu-hover: var(--next-color-hover-rgba) !important;
@ -37,20 +40,24 @@
 	// element plus
 	--el-color-white: var(--next-color-disabled) !important;
 	--el-text-color-primary: var(--next-color-bar) !important;
-	--el-border-color-base: var(--next-border-black) !important;
+	--el-border-color: var(--next-border-black) !important;
 	--el-border-color-light: var(--next-border-black) !important;
-	--el-text-color-regular: var(--next-text-color-regular) !important;
-	--el-bg-color: var(--next-color-hover-rgba) !important;
-	--el-color-success-lighter: var(--next-color-primary) !important;
-	--el-color-warning-lighter: var(--next-color-primary) !important;
-	--el-color-danger-lighter: var(--next-color-primary) !important;
-	--el-color-primary-lighter: var(--next-color-primary) !important;
-	--el-color-primary-light-9: var(--next-color-hover) !important;
-	--el-text-color-disabled-base: var(--el-color-primary) !important;
 	--el-border-color-lighter: var(--next-border-black) !important;
+	--el-border-color-extra-light: var(--el-color-primary-light-8) !important;
+	--el-text-color-regular: var(--next-text-color-regular) !important;
+	--el-bg-color: var(--next-color-disabled) !important;
+	--el-color-primary-light-9: var(--next-color-hover) !important;
+	--el-text-color-disabled: var(--next-text-color-placeholder) !important;
+	--el-text-color-disabled-base: var(--el-color-primary) !important;
 	--el-text-color-placeholder: var(--next-text-color-placeholder) !important;
 	--el-disabled-bg-color: var(--next-color-disabled) !important;
 	--el-fill-base: var(--next-color-white) !important;
+	--el-fill-colo: var(--next-color-hover-rgba) !important;
+	--el-fill-color: var(--next-color-hover-rgba) !important;
+	--el-fill-color-blank: var(--next-color-disabled) !important;
+	--el-fill-color-light: var(--next-color-hover-rgba) !important;
+	--el-bg-color-overlay: var(--el-color-primary-light-9) !important;
+	--el-mask-color: rgb(42 42 42 / 80%);

 	// button
 	.el-button {
@ -216,4 +223,14 @@
 	.layout-columns-aside {
 		border-right: 1px solid var(--next-border-columns);
 	}
+
+	// tagsView
+	.tags-style-one {
+		.is-active {
+			color: var(--el-text-color-primary) !important;
+		}
+		.layout-navbars-tagsview-ul-li:hover {
+			border-color: var(--el-border-color-lighter) !important;
+		}
+	}
 }
--- a/src/theme/element.scss
+++ b/src/theme/element.scss
@ -16,9 +16,15 @@
 	font-size: 12px !important;
 	margin-right: 5px;
 }
+.el-button.is-circle i.el-icon {
+	margin-right: unset !important;
+}

 /* Input 输入框、InputNumber 计数器
 ------------------------------- */
+.el-input {
+	height: 100%;
+}
 // 菜单搜索
 .el-autocomplete-suggestion__wrap {
 	max-height: 280px !important;
@ -60,20 +66,17 @@
 	border-right: none !important;
 	width: 220px;
 }
-// 修复点击左侧菜单折叠再展开时，宽度不跟随问题
-.el-menu--collapse {
-	width: 64px !important;
+.el-menu-item {
+	height: 56px !important;
+	line-height: 56px !important;
 }
 .el-menu-item,
 .el-sub-menu__title {
 	color: var(--next-bg-menuBarColor);
 }
-.el-menu.el-menu--horizontal {
-	border-bottom: none !important;
-}
-.el-menu-item {
-	height: 56px !important;
-	line-height: 56px !important;
+// 修复点击左侧菜单折叠再展开时，宽度不跟随问题
+.el-menu--collapse {
+	width: 64px !important;
 }
 // 外部链接时
 .el-menu-item a,
@ -90,49 +93,87 @@
 .el-sub-menu .fa {
 	@include generalIcon;
 }
-// 高亮时
+// 水平菜单、横向菜单高亮 背景色，鼠标 hover 时，有子级菜单的背景色
 .el-menu-item.is-active,
-.el-sub-menu.is-active .el-sub-menu__title {
-	@extend .el-menu-hover-bg-color;
-	i,
-	span {
-		color: var(--el-menu-active-color) !important;
-	}
-}
-.el-sub-menu.is-active.is-opened {
-	.el-sub-menu__title {
-		background-color: unset !important;
-	}
-	i,
-	span {
-		color: unset !important;
-	}
-}
-// 鼠标 hover 时
-.el-menu-item:hover,
-.el-sub-menu__title:hover {
+.el-sub-menu.is-active .el-sub-menu__title,
+.el-sub-menu:not(.is-opened):hover .el-sub-menu__title {
 	@extend .el-menu-hover-bg-color;
 }
-// 菜单收起时且时 a 链接
+.el-sub-menu.is-active.is-opened .el-sub-menu__title {
+	background-color: unset !important;
+}
+// 子级菜单背景颜色
+// .el-menu--inline {
+// 	background: var(--next-bg-menuBar-light-1);
+// }
+// 水平菜单、横向菜单折叠 a 标签
 .el-popper.is-dark a {
 	color: var(--el-color-white) !important;
 	text-decoration: none;
 }
-// 菜单收起时鼠标经过背景颜色/字体颜色
-.el-popper.is-light {
+// 水平菜单、横向菜单折叠背景色
+.el-popper.is-pure.is-light {
+	// 水平菜单
 	.el-menu--vertical {
-		.el-menu {
-			background: var(--next-bg-menuBar);
+		background: var(--next-bg-menuBar);
+		.el-sub-menu.is-active .el-sub-menu__title {
+			color: var(--el-menu-active-color);
+		}
+		.el-popper.is-pure.is-light {
+			.el-menu--vertical {
+				.el-sub-menu .el-sub-menu__title {
+					background-color: unset !important;
+					color: var(--next-bg-menuBarColor);
+				}
+				.el-sub-menu.is-active .el-sub-menu__title {
+					color: var(--el-menu-active-color);
+				}
+			}
 		}
 	}
+	// 横向菜单
 	.el-menu--horizontal {
 		background: var(--next-bg-topBar);
-		.el-menu,
 		.el-menu-item,
-		.el-sub-menu__title {
+		.el-sub-menu {
+			height: 50px !important;
+			line-height: 50px !important;
 			color: var(--next-bg-topBarColor);
-			background: var(--next-bg-topBar);
+			.el-sub-menu__title {
+				height: 50px !important;
+				line-height: 50px !important;
+				color: var(--next-bg-topBarColor);
+			}
+			.el-popper.is-pure.is-light {
+				.el-menu--horizontal {
+					.el-sub-menu .el-sub-menu__title {
+						background-color: unset !important;
+						color: var(--next-bg-topBarColor);
+					}
+					.el-sub-menu.is-active .el-sub-menu__title {
+						color: var(--el-menu-active-color);
+					}
+				}
+			}
 		}
+		.el-menu-item.is-active,
+		.el-sub-menu.is-active .el-sub-menu__title {
+			color: var(--el-menu-active-color);
+		}
+	}
+}
+// 横向菜单（经典、横向）布局
+.el-menu.el-menu--horizontal {
+	border-bottom: none !important;
+	width: 100% !important;
+	.el-menu-item,
+	.el-sub-menu__title {
+		height: 50px !important;
+		color: var(--next-bg-topBarColor);
+	}
+	.el-menu-item:not(.is-active):hover,
+	.el-sub-menu:not(.is-active):hover .el-sub-menu__title {
+		color: var(--next-bg-topBarColor);
 	}
 }

@ -149,6 +190,10 @@
 }
 .el-dropdown-menu .el-dropdown-menu__item {
 	white-space: nowrap;
+	&:not(.is-disabled):hover {
+		background-color: var(--el-dropdown-menuItem-hover-fill);
+		color: var(--el-dropdown-menuItem-hover-color);
+	}
 }

 /* Steps 步骤条
@ -193,6 +238,14 @@
 	padding: 15px 20px;
 }

+/* Table 表格 element plus 2.2.0 版本
+------------------------------- */
+.el-table {
+	.el-button.is-text {
+		padding: 0;
+	}
+}
+
 /* scrollbar
 ------------------------------- */
 .el-scrollbar__bar {
@ -221,7 +274,7 @@
 		display: flex;
 		align-items: center;
 		margin-bottom: 0 !important;
-		border-bottom: 1px solid var(--el-border-color-base);
+		border-bottom: 1px solid var(--el-border-color);
 		color: var(--el-text-color-primary);
 	}
 	.el-drawer__body {
--- a/src/theme/iconSelector.scss
+++ b/src/theme/iconSelector.scss
@ -26,7 +26,7 @@
 		.icon-selector-warp-row {
 			height: 230px;
 			overflow: hidden;
-			border-top: var(--el-border-base);
+			border-top: 1px solid var(--el-border-color);
 			.el-row {
 				padding: 15px;
 			}
@ -35,7 +35,7 @@
 			}
 			.icon-selector-warp-item {
 				display: flex;
-				border: var(--el-border-base);
+				border: 1px solid var(--el-border-color);
 				padding: 5px;
 				border-radius: 5px;
 				margin-bottom: 10px;
@ -48,7 +48,7 @@
 				&:hover {
 					cursor: pointer;
 					background-color: var(--el-color-primary-light-9);
-					border: 1px solid var(--el-color-primary-light-6);
+					border: 1px solid var(--el-color-primary-light-5);
 					.icon-selector-warp-item-value {
 						i {
 							color: var(--el-color-primary);
@ -58,7 +58,7 @@
 			}
 			.icon-selector-active {
 				background-color: var(--el-color-primary-light-9);
-				border: 1px solid var(--el-color-primary-light-6);
+				border: 1px solid var(--el-color-primary-light-5);
 				.icon-selector-warp-item-value {
 					i {
 						color: var(--el-color-primary);
--- a/src/theme/media/error.scss
+++ b/src/theme/media/error.scss
@ -33,3 +33,13 @@
 		}
 	}
 }
+
+/* 页面宽度小于1200px
+------------------------------- */
+@media screen and (max-width: $lg) {
+	.error {
+		.error-flex {
+			padding: 0 30px;
+		}
+	}
+}
--- a/src/theme/mixins/index.scss
+++ b/src/theme/mixins/index.scss
@ -7,6 +7,7 @@
 	margin-right: 5px;
 	width: 24px;
 	text-align: center;
+	justify-content: center;
 }

 /* 文本不换行
--- a/src/theme/other.scss
+++ b/src/theme/other.scss
@ -1,16 +1,36 @@
 /* wangeditor富文本编辑器
 ------------------------------- */
-.w-e-toolbar {
-	border: 1px solid #ebeef5 !important;
-	border-bottom: 1px solid #ebeef5 !important;
-	border-top-left-radius: 3px;
-	border-top-right-radius: 3px;
-	z-index: 2 !important;
+.editor-container {
+	z-index: 9999;
+	.w-e-toolbar {
+		border: 1px solid var(--el-border-color-light, #ebeef5) !important;
+		border-bottom: 1px solid var(--el-border-color-light, #ebeef5) !important;
+		border-top-left-radius: 3px;
+		border-top-right-radius: 3px;
+		z-index: 2 !important;
+	}
+	.w-e-text-container {
+		border: 1px solid var(--el-border-color-light, #ebeef5) !important;
+		border-top: none !important;
+		border-bottom-left-radius: 3px;
+		border-bottom-right-radius: 3px;
+		z-index: 1 !important;
+	}
 }
-.w-e-text-container {
-	border: 1px solid #ebeef5 !important;
-	border-top: none !important;
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-	z-index: 1 !important;
+
+[data-theme='dark'] {
+	// textarea - css vars
+	--w-e-textarea-bg-color: var(--el-color-white) !important;
+	--w-e-textarea-color: var(--el-text-color-primary) !important;
+
+	// toolbar - css vars
+	--w-e-toolbar-color: var(--el-text-color-primary) !important;
+	--w-e-toolbar-bg-color: var(--el-color-white) !important;
+	--w-e-toolbar-active-color: var(--el-text-color-primary) !important;
+	--w-e-toolbar-active-bg-color: var(--next-color-menu-hover) !important;
+	--w-e-toolbar-border-color: var(--el-border-color-light, #ebeef5) !important;
+
+	// modal - css vars
+	--w-e-modal-button-bg-color: var(--el-color-primary) !important;
+	--w-e-modal-button-border-color: var(--el-color-primary) !important;
 }
--- a/src/utils/arrayOperation.js
+++ b/src/utils/arrayOperation.js
@ -1,15 +1,17 @@
 /**
- * 判断两数组是否相同
+ * 判断两数组字符串是否相同（用于按钮权限验证），数组字符串中存在相同时会自动去重（按钮权限标识不会重复）
 * @param news 新数据
 * @param old 源数据
 * @returns 两数组相同返回 `true`，反之则反
 */
-export function judementSameArr(news, old) {
+export function judementSameArr(newArr, oldArr) {
+	const news = removeDuplicate(newArr);
+	const olds = removeDuplicate(oldArr);
 	let count = 0;
-	const leng = old.length;
-	for (let i in old) {
+	const leng = olds.length;
+	for (let i in olds) {
 		for (let j in news) {
-			if (old[i] === news[j]) count++;
+			if (olds[i] === news[j]) count++;
 		}
 	}
 	return count === leng ? true : false;
@ -39,3 +41,26 @@ export function isObjectValueEqual(a, b) {
 	}
 	return true;
 }
+
+/**
+ * 数组、数组对象去重
+ * @param arr 数组内容
+ * @param attr 需要去重的键值（数组对象）
+ * @returns
+ */
+export function removeDuplicate(arr, attr) {
+	if (!arr && !arr.length) {
+		return arr;
+	} else {
+		if (attr) {
+			const obj = {};
+			const newArr = arr.reduce((cur, item) => {
+				obj[item[attr]] ? '' : (obj[item[attr]] = true && item[attr] && cur.push(item));
+				return cur;
+			}, []);
+			return newArr;
+		} else {
+			return Array.from(new Set([...arr]));
+		}
+	}
+}
--- a/src/utils/authDirective.js
+++ b/src/utils/authDirective.js
@ -1,4 +1,4 @@
-import { store } from '/@/store/index';
+import { useUserInfo } from '/@/stores/userInfo';
 import { judementSameArr } from '/@/utils/arrayOperation';

 /**
@ -11,14 +11,16 @@ export function authDirective(app) {
 	// 单个权限验证（v-auth="xxx"）
 	app.directive('auth', {
 		mounted(el, binding) {
-			if (!store.state.userInfos.userInfos.authBtnList.some((v) => v === binding.value)) el.parentNode.removeChild(el);
+			const stores = useUserInfo();
+			if (!stores.userInfos.authBtnList.some((v) => v === binding.value)) el.parentNode.removeChild(el);
 		},
 	});
 	// 多个权限验证，满足一个则显示（v-auths="[xxx,xxx]"）
 	app.directive('auths', {
 		mounted(el, binding) {
 			let flag = false;
-			store.state.userInfos.userInfos.authBtnList.map((val) => {
+			const stores = useUserInfo();
+			stores.userInfos.authBtnList.map((val) => {
 				binding.value.map((v) => {
 					if (val === v) flag = true;
 				});
@ -29,7 +31,8 @@ export function authDirective(app) {
 	// 多个权限验证，全部满足则显示（v-auth-all="[xxx,xxx]"）
 	app.directive('auth-all', {
 		mounted(el, binding) {
-			const flag = judementSameArr(binding.value, store.state.userInfos.userInfos.authBtnList);
+			const stores = useUserInfo();
+			const flag = judementSameArr(binding.value, stores.userInfos.authBtnList);
 			if (!flag) el.parentNode.removeChild(el);
 		},
 	});
--- a/src/utils/authFunction.js
+++ b/src/utils/authFunction.js
@ -1,4 +1,4 @@
-import { store } from '/@/store/index';
+import { useUserInfo } from '/@/stores/userInfo';
 import { judementSameArr } from '/@/utils/arrayOperation';

 /**
@ -7,7 +7,8 @@ import { judementSameArr } from '/@/utils/arrayOperation';
 * @returns 有权限，返回 `true`，反之则反
 */
 export function auth(value) {
-	return store.state.userInfos.userInfos.authBtnList.some((v) => v === value);
+	const stores = useUserInfo();
+	return stores.userInfos.authBtnList.some((v) => v === value);
 }

 /**
@ -17,7 +18,8 @@ export function auth(value) {
 */
 export function auths(value) {
 	let flag = false;
-	store.state.userInfos.userInfos.authBtnList.map((val) => {
+	const stores = useUserInfo();
+	stores.userInfos.authBtnList.map((val) => {
 		value.map((v) => {
 			if (val === v) flag = true;
 		});
@ -31,5 +33,6 @@ export function auths(value) {
 * @returns 有权限，返回 `true`，反之则反
 */
 export function authAll(value) {
-	return judementSameArr(value, store.state.userInfos.userInfos.authBtnList);
+	const stores = useUserInfo();
+	return judementSameArr(value, stores.userInfos.authBtnList);
 }
--- a/src/utils/other.js
+++ b/src/utils/other.js
@ -1,7 +1,9 @@
 import { nextTick } from 'vue';
 import * as svg from '@element-plus/icons-vue';
 import router from '/@/router/index';
-import { store } from '/@/store/index';
+import pinia from '../stores/index';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import { Local } from '/@/utils/storage';
 import SvgIcon from '/@/components/svgIcon/index.vue';

@ -23,14 +25,39 @@ export function elSvg(app) {
 * @method const title = useTitle(); ==> title()
 */
 export function useTitle() {
+	const stores = useThemeConfig(pinia);
+	const { themeConfig } = storeToRefs(stores);
 	nextTick(() => {
 		let webTitle = '';
-		let globalTitle = store.state.themeConfig.themeConfig.globalTitle;
-		webTitle = router.currentRoute.value.meta.title;
+		let globalTitle = themeConfig.value.globalTitle;
+		const { path, meta } = router.currentRoute.value;
+		if (path === '/login') {
+			webTitle = meta.title;
+		} else {
+			webTitle = setTagsViewNameI18n(router.currentRoute.value);
+		}
 		document.title = `${webTitle} - ${globalTitle}` || globalTitle;
 	});
 }

+/**
+ * 设置 自定义 tagsView 名称
+ * @param params 路由 query、params 中的 tagsViewName
+ * @returns 返回当前 tagsViewName 名称
+ */
+export function setTagsViewNameI18n(item) {
+	let tagsViewName = '';
+	const { query, params, meta } = item;
+	if (query?.tagsViewName || params?.tagsViewName) {
+		// 非国际化
+		tagsViewName = query?.tagsViewName || params?.tagsViewName;
+	} else {
+		// 非自定义 tagsView 名称
+		tagsViewName = meta.title;
+	}
+	return tagsViewName;
+}
+
 /**
 * 图片懒加载
 * @param el dom 目标元素
@ -59,7 +86,11 @@ export const lazyImg = (el, arr) => {
 * 全局组件大小
 * @returns 返回 `window.localStorage` 中读取的缓存值 `globalComponentSize`
 */
-export const globalComponentSize = Local.get('themeConfig')?.globalComponentSize || store.state.themeConfig.themeConfig?.globalComponentSize;
+export const globalComponentSize = () => {
+	const stores = useThemeConfig(pinia);
+	const { themeConfig } = storeToRefs(stores);
+	return Local.get('themeConfig')?.globalComponentSize || themeConfig.value?.globalComponentSize;
+};

 /**
 * 对象深克隆
@ -74,7 +105,7 @@ export function deepClone(obj) {
 		newObj = {};
 	}
 	for (let attr in obj) {
-		if (typeof obj[attr] === 'object') {
+		if (obj[attr] && typeof obj[attr] === 'object') {
 			newObj[attr] = deepClone(obj[attr]);
 		} else {
 			newObj[attr] = obj[attr];
@ -123,8 +154,9 @@ export function handleEmpty(list) {
 * 统一批量导出
 * @method elSvg 导出全局注册 element plus svg 图标
 * @method useTitle 设置浏览器标题国际化
+ * @method setTagsViewNameI18n 设置 自定义 tagsView 名称、 自定义 tagsView 名称国际化
 * @method lazyImg 图片懒加载
- * @method globalComponentSize element plus 全局组件大小
+ * @method globalComponentSize() element plus 全局组件大小
 * @method deepClone 对象深克隆
 * @method isMobile 判断是否是移动端
 * @method handleEmpty 判断数组对象中所有属性是否为空，为空则删除当前行对象
@ -136,12 +168,17 @@ const other = {
 	useTitle: () => {
 		useTitle();
 	},
+	setTagsViewNameI18n(route) {
+		return setTagsViewNameI18n(route);
+	},
 	lazyImg: (el, arr) => {
 		lazyImg(el, arr);
 	},
-	globalComponentSize,
+	globalComponentSize: () => {
+		return globalComponentSize();
+	},
 	deepClone: (obj) => {
-		deepClone(obj);
+		return deepClone(obj);
 	},
 	isMobile: () => {
 		return isMobile();
--- a/src/utils/storage.js
+++ b/src/utils/storage.js
@ -1,3 +1,5 @@
+import Cookies from 'js-cookie';
+
 /**
 * window.localStorage 浏览器永久缓存
 * @method set 设置永久缓存
@ -35,19 +37,23 @@ export const Local = {
 export const Session = {
 	// 设置临时缓存
 	set(key, val) {
+		if (key === 'token') return Cookies.set(key, val);
 		window.sessionStorage.setItem(key, JSON.stringify(val));
 	},
 	// 获取临时缓存
 	get(key) {
+		if (key === 'token') return Cookies.get(key);
 		let json = window.sessionStorage.getItem(key);
 		return JSON.parse(json);
 	},
 	// 移除临时缓存
 	remove(key) {
+		if (key === 'token') return Cookies.remove(key);
 		window.sessionStorage.removeItem(key);
 	},
 	// 移除全部临时缓存
 	clear() {
+		Cookies.remove('token');
 		window.sessionStorage.clear();
 	},
 };
--- a/src/utils/toolsValidate.js
+++ b/src/utils/toolsValidate.js
@ -190,7 +190,7 @@ export function verifyNumberCnUppercase(val, unit = '仟佰拾亿仟佰拾万仟
 */
 export function verifyPhone(val) {
 	// false: 手机号码不正确
-	if (!/^((12[0-9])|(13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\d{8}$/.test(val)) return false;
+	if (!/^((12[0-9])|(13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0|1,5-9]))\d{8}$/.test(val)) return false;
 	// true: 手机号码正确
 	else return true;
 }
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@ -1,5 +1,5 @@
 <template>
-	<div class="error">
+	<div class="error layout-view-bg-white" :style="{ height: `calc(100vh - ${initTagViewHeight}` }">
 		<div class="error-flex">
 			<div class="left">
 				<div class="left-item">
@ -12,16 +12,36 @@
 				</div>
 			</div>
 			<div class="right">
-				<img src="https://gitee.com/lyt-top/vue-next-admin-images/raw/master/error/401.png" />
+				<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"
+				/>
 			</div>
 		</div>
 	</div>
 </template>

 <script setup name="401">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import { Session } from '/@/utils/storage';

 const router = useRouter();
+const storesThemeConfig = useThemeConfig();
+const storesTagsViewRoutes = useTagsViewRoutes();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+// 设置主内容的高度
+const initTagViewHeight = computed(() => {
+	let { isTagsview } = themeConfig.value;
+	if (isTagsViewCurrenFull.value) {
+		return `30px`;
+	} else {
+		if (isTagsview) return `114px`;
+		else return `80px`;
+	}
+});
+// 重新授权
 const onSetAuth = () => {
 	Session.clear();
 	router.push('/login');
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@ -1,5 +1,5 @@
 <template>
-	<div class="error">
+	<div class="error layout-view-bg-white" :style="{ height: `calc(100vh - ${initTagViewHeight}` }">
 		<div class="error-flex">
 			<div class="left">
 				<div class="left-item">
@ -12,14 +12,35 @@
 				</div>
 			</div>
 			<div class="right">
-				<img src="https://gitee.com/lyt-top/vue-next-admin-images/raw/master/error/404.png" />
+				<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"
+				/>
 			</div>
 		</div>
 	</div>
 </template>

 <script setup name="404">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
 const router = useRouter();
+const storesThemeConfig = useThemeConfig();
+const storesTagsViewRoutes = useTagsViewRoutes();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+// 设置主内容的高度
+const initTagViewHeight = computed(() => {
+	let { isTagsview } = themeConfig.value;
+	if (isTagsViewCurrenFull.value) {
+		return `30px`;
+	} else {
+		if (isTagsview) return `114px`;
+		else return `80px`;
+	}
+});
+// 返回首页
 const onGoHome = () => {
 	router.push('/');
 };
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
--- a/src/views/login/component/account.vue
+++ b/src/views/login/component/account.vue
@ -1,7 +1,7 @@
 <template>
 	<el-form size="large" class="login-content-form">
 		<el-form-item class="login-animation1">
-			<el-input type="text" placeholder="用户名 admin 或不输均为 common" 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>
@ -24,7 +24,7 @@
 		</el-form-item>
 		<el-form-item class="login-animation3">
 			<el-col :span="15">
-				<el-input type="text" maxlength="4" placeholder="请输入验证码" 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>
@ -45,14 +45,19 @@

 <script setup name="loginAccount">
 import { ElMessage } from 'element-plus';
+import Cookies from 'js-cookie';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
 import { initFrontEndControlRoutes } from '/@/router/frontEnd';
 import { initBackEndControlRoutes } from '/@/router/backEnd';
 import { Session } from '/@/utils/storage';
 import { formatAxis } from '/@/utils/formatTime';
+import { NextLoading } from '/@/utils/loading';

-const store = useStore();
 const route = useRoute();
 const router = useRouter();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const state = reactive({
 	isShowPassword: false,
 	ruleForm: {
@ -70,50 +75,16 @@ const currentTime = computed(() => {
 });
 // 登录
 const onSignIn = async () => {
-	// 模拟数据
-	state.loading.signIn = true;
-	let defaultRoles = [];
-	let defaultAuthBtnList = [];
-	// admin 页面权限标识，对应路由 meta.roles，用于控制路由的显示/隐藏
-	let adminRoles = ['admin'];
-	// admin 按钮权限标识
-	let adminAuthBtnList = ['btn.add', 'btn.del', 'btn.edit', 'btn.link'];
-	// test 页面权限标识，对应路由 meta.roles，用于控制路由的显示/隐藏
-	let testRoles = ['common'];
-	// test 按钮权限标识
-	let testAuthBtnList = ['btn.add', 'btn.link'];
-	// 不同用户模拟不同的用户权限
-	if (state.ruleForm.userName === 'admin') {
-		defaultRoles = adminRoles;
-		defaultAuthBtnList = adminAuthBtnList;
-	} else {
-		defaultRoles = testRoles;
-		defaultAuthBtnList = testAuthBtnList;
-	}
-	// 用户信息模拟数据
-	const userInfos = {
-		userName: state.ruleForm.userName,
-		photo:
-			state.ruleForm.userName === 'admin'
-				? 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg'
-				: 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=317673774,2961727727&fm=26&gp=0.jpg',
-		time: new Date().getTime(),
-		roles: defaultRoles,
-		authBtnList: defaultAuthBtnList,
-	};
 	// 存储 token 到浏览器缓存
 	Session.set('token', Math.random().toString(36).substr(0));
-	// 存储用户信息到浏览器缓存
-	Session.set('userInfo', userInfos);
-	// 1、请注意执行顺序(存储用户信息到vuex)
-	store.dispatch('userInfos/setUserInfos', userInfos);
-	if (!store.state.themeConfig.themeConfig.isRequestRoutes) {
+	// 模拟数据，对接接口时，记得删除多余代码及对应依赖的引入。用于 `/src/stores/userInfo.js` 中不同用户登录判断（模拟数据）
+	Cookies.set('userName', state.ruleForm.userName);
+	if (!themeConfig.value.isRequestRoutes) {
 		// 前端控制路由，2、请注意执行顺序
 		await initFrontEndControlRoutes();
 		signInSuccess();
 	} else {
 		// 模拟后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
-		// 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
 		await initBackEndControlRoutes();
 		// 执行完 initBackEndControlRoutes，再执行 signInSuccess
 		signInSuccess();
@ -139,6 +110,7 @@ const signInSuccess = () => {
 	state.loading.signIn = true;
 	const signInText = '欢迎回来！';
 	ElMessage.success(`${currentTimeInfo}，${signInText}`);
+	NextLoading.start();
 };
 </script>

--- a/src/views/login/component/mobile.vue
+++ b/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 type="text" placeholder="请输入手机号" 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 type="text" maxlength="4" placeholder="请输入验证码" 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>
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -31,21 +31,28 @@
 </template>

 <script setup name="login">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { NextLoading } from '/@/utils/loading';
 import Account from '/@/views/login/component/account.vue';
 import Mobile from '/@/views/login/component/mobile.vue';
 import Scan from '/@/views/login/component/scan.vue';
-
 import logoMini from '/@/assets/logo-mini.svg';
 import loginIconTwo from '/@/assets/login-icon-two.svg';

-const store = useStore();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
 const state = reactive({
 	tabsActiveName: 'account',
 	isScan: false,
 });
 // 获取布局配置信息
 const getThemeConfig = computed(() => {
-	return store.state.themeConfig.themeConfig;
+	return themeConfig.value;
+});
+// 页面加载时
+onMounted(() => {
+	NextLoading.done();
 });
 </script>

--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@ -39,9 +39,9 @@
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" show-overflow-tooltip width="140">
 					<template #default="scope">
-						<el-button size="small" type="text" @click="onOpenAddDept(scope.row)">新增</el-button>
-						<el-button size="small" type="text" @click="onOpenEditDept(scope.row)">修改</el-button>
-						<el-button size="small" type="text" @click="onTabelRowDel(scope.row)">删除</el-button>
+						<el-button size="small" text type="primary" @click="onOpenAddDept">新增</el-button>
+						<el-button size="small" text type="primary" @click="onOpenEditDept(scope.row)">修改</el-button>
+						<el-button size="small" text type="primary" @click="onTabelRowDel(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
--- a/src/views/system/dic/index.vue
+++ b/src/views/system/dic/index.vue
@ -30,8 +30,8 @@
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="100">
 					<template #default="scope">
-						<el-button size="small" type="text" @click="onOpenEditDic(scope.row)">修改</el-button>
-						<el-button size="small" type="text" @click="onRowDel(scope.row)">删除</el-button>
+						<el-button size="small" text type="primary" @click="onOpenEditDic(scope.row)">修改</el-button>
+						<el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
--- a/src/views/system/menu/component/addMenu.vue
+++ b/src/views/system/menu/component/addMenu.vue
@ -146,10 +146,13 @@
 </template>

 <script setup name="systemAddMenu">
+import { storeToRefs } from 'pinia';
+import { useRoutesList } from '/@/stores/routesList';
 import IconSelector from '/@/components/iconSelector/index.vue';
 // import { setBackEndControlRefreshRoutes } from "/@/router/backEnd";

-const store = useStore();
+const stores = useRoutesList();
+const { routesList } = storeToRefs(stores);
 const state = reactive({
 	isShowDialog: false,
 	// 参数请参考 `/src/router/route.ts` 中的 `dynamicRoutes` 路由菜单格式
@ -168,9 +171,8 @@ const state = reactive({
 			isHide: false, // 是否隐藏
 			isKeepAlive: true, // 是否缓存
 			isAffix: false, // 是否固定
-			isLink: '', // 外链/内嵌时链接地址（http:xxx.com），开启外链条件，`1、isLink:true 2、链接地址不为空`
-			isIframe: false, // 是否内嵌，开启条件，`1、isIframe:true 2、链接地址不为空`
-			roles: '', // 权限标识，取角色管理
+			isLink: '', // 外链/内嵌时链接地址（http:xxx.com），开启外链条件，`1、isLink: 链接地址不为空`
+			isIframe: false, // 是否内嵌，开启条件，`1、isIframe:true 2、isLink：链接地址不为空`
 		},
 		btnPower: '', // 菜单类型为按钮时，权限标识
 	},
@ -214,7 +216,7 @@ const onSubmit = () => {
 };
 // 页面加载时
 onMounted(() => {
-	state.menuData = getMenuData(store.state.routesList.routesList);
+	state.menuData = getMenuData(routesList.value);
 });

 // 暴露变量
--- a/src/views/system/menu/component/editMenu.vue
+++ b/src/views/system/menu/component/editMenu.vue
@ -146,10 +146,13 @@
 </template>

 <script setup name="systemEditMenu">
+import { storeToRefs } from 'pinia';
+import { useRoutesList } from '/@/stores/routesList';
 import IconSelector from '/@/components/iconSelector/index.vue';
 // import { setBackEndControlRefreshRoutes } from "/@/router/backEnd";

-const store = useStore();
+const stores = useRoutesList();
+const { routesList } = storeToRefs(stores);
 const state = reactive({
 	isShowDialog: false,
 	// 参数请参考 `/src/router/route.ts` 中的 `dynamicRoutes` 路由菜单格式
@ -168,8 +171,8 @@ const state = reactive({
 			isHide: false, // 是否隐藏
 			isKeepAlive: true, // 是否缓存
 			isAffix: false, // 是否固定
-			isLink: '', // 外链/内嵌时链接地址（http:xxx.com），开启外链条件，`1、isLink:true 2、链接地址不为空`
-			isIframe: false, // 是否内嵌，开启条件，`1、isIframe:true 2、链接地址不为空`
+			isLink: '', // 外链/内嵌时链接地址（http:xxx.com），开启外链条件，`1、isLink: 链接地址不为空`
+			isIframe: false, // 是否内嵌，开启条件，`1、isIframe:true 2、isLink：链接地址不为空`
 			roles: '', // 权限标识，取角色管理
 		},
 		btnPower: '', // 菜单类型为按钮时，权限标识
@ -189,8 +192,13 @@ const getMenuData = (routes) => {
 };
 // 打开弹窗
 const openDialog = (row) => {
+	// 模拟数据，实际请走接口
 	row.menuType = 'menu';
 	row.menuSort = Math.random();
+	row.component = `${row.component} `
+		.match(/\'(.+)\'/g)
+		?.join('')
+		.replace(/\'/g, '');
 	state.ruleForm = row;
 	state.isShowDialog = true;
 };
@ -217,7 +225,7 @@ const onSubmit = () => {
 };
 // 页面加载时
 onMounted(() => {
-	state.menuData = getMenuData(store.state.routesList.routesList);
+	state.menuData = getMenuData(routesList.value);
 });

 // 暴露变量
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@ -46,9 +46,9 @@
 				</el-table-column>
 				<el-table-column label="操作" show-overflow-tooltip width="140">
 					<template #default="scope">
-						<el-button size="small" type="text" @click="onOpenAddMenu(scope.row)">新增</el-button>
-						<el-button size="small" type="text" @click="onOpenEditMenu(scope.row)">修改</el-button>
-						<el-button size="small" type="text" @click="onTabelRowDel(scope.row)">删除</el-button>
+						<el-button size="small" text type="primary" @click="onOpenAddMenu(scope.row)">新增</el-button>
+						<el-button size="small" text type="primary" @click="onOpenEditMenu(scope.row)">修改</el-button>
+						<el-button size="small" text type="primary" @click="onTabelRowDel(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@ -59,16 +59,19 @@
 </template>

 <script setup name="systemMenu">
+import { storeToRefs } from 'pinia';
+import { useRoutesList } from '/@/stores/routesList';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import AddMenu from '/@/views/system/menu/component/addMenu.vue';
 import EditMenu from '/@/views/system/menu/component/editMenu.vue';

-const store = useStore();
 const addMenuRef = ref();
 const editMenuRef = ref();
-// 获取 vuex 中的路由
+const stores = useRoutesList();
+const { routesList } = storeToRefs(stores);
+// 获取 pinia 中的路由
 const menuTableData = computed(() => {
-	return store.state.routesList.routesList;
+	return routesList.value;
 });
 // 打开新增菜单弹窗
 const onOpenAddMenu = () => {
--- a/src/views/system/role/component/addRole.vue
+++ b/src/views/system/role/component/addRole.vue
@ -200,7 +200,8 @@ defineExpose({
 <style scoped lang="scss">
 .system-add-role-container {
 	.menu-data-tree {
-		border: var(--el-input-border, var(--el-border-base));
+		width: 100%;
+		border: 1px solid var(--el-border-color);
 		border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
 		padding: 5px;
 	}
--- a/src/views/system/role/component/editRole.vue
+++ b/src/views/system/role/component/editRole.vue
@ -208,7 +208,8 @@ defineExpose({
 <style scoped lang="scss">
 .system-edit-role-container {
 	.menu-data-tree {
-		border: var(--el-input-border, var(--el-border-base));
+		width: 100%;
+		border: 1px solid var(--el-border-color);
 		border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
 		padding: 5px;
 	}
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@ -31,8 +31,10 @@
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="100">
 					<template #default="scope">
-						<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" type="text" @click="onOpenEditRole(scope.row)">修改</el-button>
-						<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" type="text" @click="onRowDel(scope.row)">删除</el-button>
+						<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary" @click="onOpenEditRole(scope.row)"
+							>修改</el-button
+						>
+						<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@ -34,8 +34,8 @@
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="100">
 					<template #default="scope">
-						<el-button :disabled="scope.row.userName === 'admin'" size="small" type="text" @click="onOpenEditUser(scope.row)">修改</el-button>
-						<el-button :disabled="scope.row.userName === 'admin'" size="small" type="text" @click="onRowDel(scope.row)">删除</el-button>
+						<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenEditUser(scope.row)">修改</el-button>
+						<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
--- a/vite.config.js
+++ b/vite.config.js
@ -19,7 +19,7 @@ const viteConfig = defineConfig((mode) => {
 			vue(),
 			vueSetupExtend(),
 			AutoImport({
-				imports: ['vue', 'vue-router', 'vuex'],
+				imports: ['vue', 'vue-router'],
 			}),
 		],
 		root: process.cwd(),
@ -49,7 +49,7 @@ const viteConfig = defineConfig((mode) => {
 					assetFileNames: `assets/[name].${new Date().getTime()}.[ext]`,
 					compact: true,
 					manualChunks: {
-						vue: ['vue', 'vue-router', 'vuex'],
+						vue: ['vue', 'vue-router', 'pinia'],
 						echarts: ['echarts'],
 					},
 				},