From 5a66a88d8f6aff90640a0d580b7f64b0ac0bc8b1 Mon Sep 17 00:00:00 2001
From: KaneLeung <kk.xiaolan@gmail.com>
Date: Thu, 11 Jul 2024 14:33:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=8F=82=E7=AE=80=E5=8C=96Vxe=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E5=88=97=E6=98=BE=E7=A4=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
index de62f3c7..55321003 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
@@ -154,11 +154,7 @@
 				@:<template #row_@(@column.LowerPropertyName)="{ row }">
                     @:<el-tag :type="dv('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{dv('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name}}</el-tag>
 				@:</template>
-                        } else if(@column.EffectType == "DatePicker") {
-				@:<template #row_@(@column.LowerPropertyName)="{ row }">
-					@:<span>{{ formatDate(new Date(row.@(@column.LowerPropertyName)), 'YYYY-mm-dd HH:MM:SS') }}</span>
-				@:</template>
-						}
+                        }
                     }
                 }
 				<template #row_record="{ row }">
@@ -303,7 +299,7 @@ const options = useVxeTable<@(@Model.ClassName)>({
                 } else if(@column.EffectType == "EnumSelector") {
         @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
                 } else if(@column.EffectType == "DatePicker") {
-        @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
+        @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', formatter: ({ cellValue }) => formatDate(new Date(cellValue), 'YYYY-mm-dd HH:MM:SS'), @whethersortable },
 				} else {
         @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', @whethersortable},
                 }

From db845f85b755a149729600d7d30346848c246989 Mon Sep 17 00:00:00 2001
From: KaneLeung <kk.xiaolan@gmail.com>
Date: Thu, 11 Jul 2024 14:52:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=98=B5=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E8=8F=9C=E5=8D=95=E7=82=B9=E5=87=BB=E6=97=A0=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/layout/component/columnsAside.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/src/layout/component/columnsAside.vue b/Web/src/layout/component/columnsAside.vue
index 7eaf2603..38c87bf5 100644
--- a/Web/src/layout/component/columnsAside.vue
+++ b/Web/src/layout/component/columnsAside.vue
@@ -79,7 +79,7 @@ const onColumnsAsideMenuClick = async (v: RouteItem) => {
 		if (route.path.startsWith(redirect)) mittBus.emit('setSendColumnsChildren', setSendChildren(redirect));
 		else router.push(redirect);
 	} else {
-		if (!v.children) {
+		if (!v.children || v.children?.length === 0) {
 			router.push(path);
 		} else {
 			// 显示子级菜单

From 9f9f666a62019c0bbbd7884da241a0668bbd1764 Mon Sep 17 00:00:00 2001
From: KaneLeung <kk.xiaolan@gmail.com>
Date: Thu, 11 Jul 2024 15:10:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=99=84=E4=BC=98=E5=8C=96=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=80=E7=BA=A7=E8=8F=9C=E5=8D=95=E5=90=8E=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=83=8C=E6=99=AF=E8=89=B2=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/layout/component/columnsAside.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Web/src/layout/component/columnsAside.vue b/Web/src/layout/component/columnsAside.vue
index 38c87bf5..68b4876c 100644
--- a/Web/src/layout/component/columnsAside.vue
+++ b/Web/src/layout/component/columnsAside.vue
@@ -81,6 +81,7 @@ const onColumnsAsideMenuClick = async (v: RouteItem) => {
 	} else {
 		if (!v.children || v.children?.length === 0) {
 			router.push(path);
+			onColumnsAsideDown(v.k);
 		} else {
 			// 显示子级菜单
 			const resData: MittMenu = setSendChildren(path);
@@ -92,7 +93,7 @@ const onColumnsAsideMenuClick = async (v: RouteItem) => {
 
 	// 一个路由设置自动收起菜单
 	// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
-	if (!v.children) themeConfig.value.isCollapse = true;
+	if (!v.children || v.children?.length === 0) themeConfig.value.isCollapse = true;
 	else if (v.children.length > 1) themeConfig.value.isCollapse = false;
 };
 // 鼠标移入时，显示当前的子级菜单