From 299928b186bb6264012a2b4a95a6085f66d83907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Fri, 5 Dec 2025 07:28:42 +0000
Subject: [PATCH 1/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/views/system/user/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 425c49d..0fe63d4 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -66,7 +66,7 @@
 				</div>
 				<my-list-panel ref="refTable" :load-fn="loadData" :total="state.total">
 					<template #default="scope">
-						<my-table :data="state.list" :columns="state.columns" :init-columns="state.columns" @selection-change="(val) => (tableSelection = val)">
+						<my-table :data="state.list" :columns="state.columns" @selection-change="(val) => (tableSelection = val)">
 							<template #index="{ $index }">
 								{{ $index + 1 + (scope.page - 1) * scope.size }}
 							</template>
-- 
Gitee


From 44484200561e24310b7c8e142e669887d6dbeaa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Mon, 8 Dec 2025 11:00:16 +0000
Subject: [PATCH 2/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/components/my-form/my-form.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/my-form/my-form.vue b/src/components/my-form/my-form.vue
index 3fb3dc1..3227607 100644
--- a/src/components/my-form/my-form.vue
+++ b/src/components/my-form/my-form.vue
@@ -21,13 +21,7 @@
 </template>
 
 <script setup name="MyForm" lang="ts">
-import { FormInstance } from 'element-plus';
-
-const refMyForm = shallowRef<FormInstance>();
-
-const isArray = (val: any) => {
-	return Object.prototype.toString.call(val) === '[object Array]';
-};
+const refMyForm = useTemplate('refMyForm');
 
 /***
  * props
-- 
Gitee


From ab29e2a680fe347a8f8ff5f51b2e43e349353599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Tue, 9 Dec 2025 03:33:03 +0000
Subject: [PATCH 3/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/extension/login/login.vue | 53 ++++++++++-------------------------
 1 file changed, 15 insertions(+), 38 deletions(-)

diff --git a/src/extension/login/login.vue b/src/extension/login/login.vue
index 4d20529..4083d96 100644
--- a/src/extension/login/login.vue
+++ b/src/extension/login/login.vue
@@ -9,24 +9,24 @@
 						<el-input ref="username" v-model="loginForm.username" size="large" placeholder="请输入" />
 					</el-form-item>
 					<el-form-item prop="password" label="密码">
-						<el-input ref="password" v-model="loginForm.password" size="large" show-password placeholder="请输入" @keyup.enter="handleLogin" />
+						<el-input ref="password" v-model="loginForm.password" size="large" show-password placeholder="请输入" @keyup.enter="handleLogin"
+						/>
 					</el-form-item>
-					<el-form-item v-if="coo" prop="code" label="请输入">
+					<el-form-item v-if="coo" prop="code" label="请输入" :rules="[
+			{
+			required: true,
+			trigger: 'change',
+			message: '验证码不能为空'
+		}
+	]">
 						<el-input ref="code" v-model="loginForm.code" placeholder="验证码" style="width: 70%" @keyup.enter="handleLogin" />
 						<div class="login-code">
 							<img :src="codeUrl" class="login-code-img" @click.prevent="getCode" />
 						</div>
 					</el-form-item>
-					<div class="flex m-between">
-						<el-checkbox v-model="loginForm.rememberMe">
-							<span :style="{ color: loginForm.rememberMe ? '' : '#d3d7f7' }">记住密码</span>
-						</el-checkbox>
-					</div>
-					<el-form-item>
-						<button class="loginBtn" :loading="loading" @click.prevent="handleLogin">
-							{{ loading ? '登 录 中...' : '登 录' }}
-						</button>
-					</el-form-item>
+					<button class="loginBtn" :loading="loading" @click.prevent="handleLogin">
+						{{ loading ? '登 录 中...' : '登 录' }}
+					</button>
 				</div>
 			</el-form>
 		</div>
@@ -57,7 +57,7 @@ const codeUrl = ref(''),
 /**
  * 计算属性-计算form表单校验数组
  */
-const Rules1 = {
+const loginRules = {
 	username: [
 		{
 			required: true,
@@ -71,32 +71,9 @@ const Rules1 = {
 			trigger: 'change',
 			message: '密码不能为空'
 		}
-	],
-	code: [
-		{
-			required: true,
-			trigger: 'change',
-			message: '验证码不能为空'
-		}
 	]
 };
-const Rules2 = {
-	username: [
-		{
-			required: true,
-			trigger: 'change',
-			message: '账号不能为空'
-		}
-	],
-	password: [
-		{
-			required: true,
-			trigger: 'change',
-			message: '密码不能为空'
-		}
-	]
-};
-const loginRules = computed(() => (coo.value ? Rules1 : Rules2));
+
 /**
  * 初始化判断光标位置
  */
@@ -231,4 +208,4 @@ function handleLogin() {
 		}
 	}
 }
-</style>
+</style>
\ No newline at end of file
-- 
Gitee


From ff8b8b64fa1fc4ccf93d5020e127b3d23a4b7df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Tue, 9 Dec 2025 11:16:49 +0000
Subject: [PATCH 4/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/extension/login/login.vue | 1 +
 src/store/user.js             | 1 -
 src/utils/axios.ts            | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/extension/login/login.vue b/src/extension/login/login.vue
index 4083d96..1770e5a 100644
--- a/src/extension/login/login.vue
+++ b/src/extension/login/login.vue
@@ -117,6 +117,7 @@ function handleLogin() {
 				remove('password');
 				remove('rememberMe');
 			}
+			$store.user.LogOutSET()
 			$store.user
 				.Login({ ...loginForm, password: encrypt(loginForm.password) })
 				.then(() => {
diff --git a/src/store/user.js b/src/store/user.js
index 3c8f59b..f156b09 100644
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -158,7 +158,6 @@ export default defineStore('user', {
 			return new Promise((resolve, reject) => {
 				authLogout()
 					.then(() => {
-						this.LogOutSET();
 						resolve();
 					})
 					.catch((error) => {
diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index 957cf9b..023e69e 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -191,7 +191,6 @@ function responseSuccess(res: AxiosResponse<ApiResponse>) {
 
 	if ([401, 418].includes(Number(code))) {
 		if (code === 418) {
-			(user() as any).LogOutSET();
 			$router.replace('/login');
 		}
 		if (code === 401) {
-- 
Gitee


From c6718a34fc219aa32f66a5d29b7afd7fd5bbc795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Tue, 9 Dec 2025 11:22:30 +0000
Subject: [PATCH 5/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/extension/login/login.vue | 1 -
 src/store/user.js             | 1 -
 src/utils/axios.ts            | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/extension/login/login.vue b/src/extension/login/login.vue
index 1770e5a..4083d96 100644
--- a/src/extension/login/login.vue
+++ b/src/extension/login/login.vue
@@ -117,7 +117,6 @@ function handleLogin() {
 				remove('password');
 				remove('rememberMe');
 			}
-			$store.user.LogOutSET()
 			$store.user
 				.Login({ ...loginForm, password: encrypt(loginForm.password) })
 				.then(() => {
diff --git a/src/store/user.js b/src/store/user.js
index f156b09..e714799 100644
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -178,7 +178,6 @@ export default defineStore('user', {
 			this.menuTabsList = [];
 			this.activeMenu = '';
 			this.activeMenuTab = '';
-			$store.guarder.Menus = [];
 		}
 	},
 	// 开启数据缓存
diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index 023e69e..957cf9b 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -191,6 +191,7 @@ function responseSuccess(res: AxiosResponse<ApiResponse>) {
 
 	if ([401, 418].includes(Number(code))) {
 		if (code === 418) {
+			(user() as any).LogOutSET();
 			$router.replace('/login');
 		}
 		if (code === 401) {
-- 
Gitee


From 554b1d6a5bad91bb52bd6bdff749c25aece4e298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Tue, 9 Dec 2025 11:33:32 +0000
Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/router/guarder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/guarder.ts b/src/router/guarder.ts
index ea60409..f78f098 100644
--- a/src/router/guarder.ts
+++ b/src/router/guarder.ts
@@ -65,7 +65,7 @@ export default function (router: Router) {
 				if (!$store.user.rolesGets.length) await $store.user.GetInfo();
 
 				// 生成对应权限的路由
-				if (!$store.guarder.Menus.length) {
+				if (!$store.guarder.addRouter.length) {
 					await $store.guarder.GenerateRoutes();
 
 					// hack方法 确保addRoutes已完成
-- 
Gitee


From 6ed5cf38c304d3579005965d68f4f96851fdde73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Mon, 15 Dec 2025 02:18:13 +0000
Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/extension/login/login.vue |  3 +-
 src/hooks/mixin.ts            |  2 +-
 src/router/guarder.ts         | 61 +++++++++++------------------------
 src/store/guarder.js          |  5 +++
 4 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/src/extension/login/login.vue b/src/extension/login/login.vue
index 4083d96..9286060 100644
--- a/src/extension/login/login.vue
+++ b/src/extension/login/login.vue
@@ -119,7 +119,8 @@ function handleLogin() {
 			}
 			$store.user
 				.Login({ ...loginForm, password: encrypt(loginForm.password) })
-				.then(() => {
+				.then(async() => {
+					await $store.user.GetInfo();
 					nextTick(() => {
 						$router.push({
 							path: redirect || '/',
diff --git a/src/hooks/mixin.ts b/src/hooks/mixin.ts
index bb39851..d2328d3 100644
--- a/src/hooks/mixin.ts
+++ b/src/hooks/mixin.ts
@@ -111,7 +111,7 @@ export function dialogMixin({
 		resetForm(unref(refDialogForm));
 		dialog.name = 'insert';
 		dialog.open = true;
-		dialog.form.id = undefined;
+		dialog.form[id] = undefined;
 		callback?.(dialog.form);
 	}
 	// 删除信息
diff --git a/src/router/guarder.ts b/src/router/guarder.ts
index f78f098..ad84daf 100644
--- a/src/router/guarder.ts
+++ b/src/router/guarder.ts
@@ -33,56 +33,31 @@ export default function (router: Router) {
 	 * 全局前置守卫
 	 */
 	router.beforeEach(async (to, from, next) => {
-		// 外链地址
-		if (isExternal(to.path)) {
-			window.open(to.path, '_block');
-		} else {
-			document.title = ((TITLE as string) || (to.meta.title as string)).toString();
+		document.title = ((TITLE as string) || (to.meta.title as string)).toString();
 
-			// 开启进度条
-			NProgress.start();
+		NProgress.start();
 
-			// 清除正在进行中的所有请求
-			cancelFn();
+		cancelFn();
 
-			//判断当前代码版本是否与服务器中代码版本一致，如不一致则刷新页面获取最新
-			versionTood();
+		versionTood();
 
-			// 联合登陆功能添加token
-			if (to.query.uid) {
-				if (to.query.pputoken) $store.user.token = to.query.pputoken;
-				$store.user.uid = to.query.uid;
-				to.query = {};
-			}
-			// 512页面
-			if (to.path === '/512') {
+		if ($store.user.token) {
+			if (!$store.guarder.addRouter.length) {
+				await $store.guarder.GenerateRoutes();
+
+				// hack方法 确保addRoutes已完成
+				next({ ...to, replace: false });
+			} else {
 				next();
-				return;
 			}
-			/** 已经登录了存在token */
-			if ($store.user.token || $store.user.uid) {
-				// 判断当前用户是否已拉取完user_info信息
-				if (!$store.user.rolesGets.length) await $store.user.GetInfo();
-
-				// 生成对应权限的路由
-				if (!$store.guarder.addRouter.length) {
-					await $store.guarder.GenerateRoutes();
-
-					// hack方法 确保addRoutes已完成
-					next({ ...to, replace: false });
-				} else {
-					next();
-				}
+		} else {
+			if (whiteRouter(to.path)) {
+				next();
 			} else {
-				if (whiteRouter(to.path)) {
-					// 在免登录白名单，直接进入
-					next();
-				} else {
-					next({
-						name: '/login',
-						query: { redirect: to.fullPath }
-					});
-				}
+				next({
+					name: '/login',
+					query: { redirect: to.fullPath }
+				});
 			}
 		}
 	});
diff --git a/src/store/guarder.js b/src/store/guarder.js
index 6114336..d8b4cb9 100644
--- a/src/store/guarder.js
+++ b/src/store/guarder.js
@@ -155,6 +155,11 @@ function filterAsyncRouter(data) {
 
 		// 左边菜单数据
 		if (visible !== 1) MenusData[id] = cloneDeep(RoutesData[id]);
+
+		// 外链地址不需要添加进路由表
+		if(isExternal(path)){
+			delete RoutesData[id]
+		}
 	});
 
 	// 树形结构数据
-- 
Gitee


From 282f6c13f581a446ea9904f7c8169212e9a4dc6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Wed, 17 Dec 2025 03:03:54 +0000
Subject: [PATCH 8/8] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=94=B6=E7=BC=A9?=
 =?UTF-8?q?=EF=BC=8C=E5=B1=95=E5=BC=80=E6=97=B6=E5=8D=A1=E9=A1=BF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=8C=E5=8F=96=E6=B6=88=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=8A=A8=E7=94=BB=20collapse-transition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/extension/layout/index.vue | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/extension/layout/index.vue b/src/extension/layout/index.vue
index 9d71b3b..72513e4 100644
--- a/src/extension/layout/index.vue
+++ b/src/extension/layout/index.vue
@@ -5,10 +5,16 @@
 			<el-header :class="[{ 'header-sidebar': !['sidebar'].includes(theme.layout) }, 'header']">
 				<el-aside class="title pointer header-sidebar" :class="{ 'title-sidebar': ['sidebar'].includes(theme.layout) }" :width="`${aside_width}px`"
 				 @click="$router.push('/')">
-					<div class="flex-center">
-						<img v-show="theme.logo" src="@/assets/img/logo.png" alt="logo" />
-						<span v-show="!collapse" class="m-l-10">{{ TITLE }}</span>
-					</div>
+					<transition name="logoFade">
+						<div v-if="collapse" key="collapse" class="flex-center">
+							<img v-if="theme.logo" src="@/assets/img/logo.png" alt="logo" />
+							<span v-else class="m-l-10">{{ TITLE }}</span>
+						</div>
+						<div v-else key="expand" class="flex-center">
+							<img v-if="theme.logo" src="@/assets/img/logo.png" alt="logo" />
+							<span class="m-l-10">{{ TITLE }}</span>
+						</div>
+				 	</transition>
 				</el-aside>
 				<div class="flex-auto w-0 flex p-0 top-r overflow-hidden">
 					<div v-if="['sidebar'].includes(theme.layout)" class="flex flex-center">
@@ -89,12 +95,13 @@
 				</div>
 			</el-header>
 			<el-container>
-				<el-aside
+				<aside
 					v-if="['sidebar'].includes(theme.layout) || (['both'].includes(theme.layout) && bothRightMenus.length)"
 					class="menu"
 					:width="`${aside_width}px`"
 				>
 					<my-menu
+						:collapse-transition="false"
 						:data="theme.layout === 'sidebar' ? $store.guarder.Menus : bothRightMenus"
 						:collapse="collapse"
 						:default-active="$store.user.activeMenu"
@@ -106,7 +113,7 @@
 					<div v-if="theme.collapsible && ['both'].includes(theme.layout)" class="sidebar__trigger" @click="collapse = !collapse">
 						<my-icon :icon="collapse ? 'Expand' : 'Fold'" size="26"></my-icon>
 					</div>
-				</el-aside>
+				</aside>
 				<el-container id="ContentArea" class="flex-col">
 					<Tabs v-if="theme.showTabs" />
 					<el-main class="main">
@@ -289,8 +296,13 @@ function handlePreview() {
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-aside) {
-	transition: all 0.2s;
+.logoFade-enter-active {
+	transition: opacity 1s;
+}
+
+.logoFade-enter-from,
+.logoFade-leave-to {
+	opacity: 0;
 }
 
 #layout {
@@ -388,11 +400,6 @@ function handlePreview() {
 		background-color: var(--el-menu-bg-color);
 	}
 
-	:deep(.el-aside) {
-		z-index: 1;
-		overflow-x: hidden;
-	}
-
 	.menu {
 		position: relative;
 		display: flex;
@@ -437,6 +444,7 @@ function handlePreview() {
 		padding: 0;
 		overflow: hidden;
 		background-color: var(--el-bg-color-page);
+		transform: translateZ(0);
 	}
 
 	@keyframes zy {
-- 
Gitee