From 1b3ac27958ff101d299c818e7d9053bdd2e45095 Mon Sep 17 00:00:00 2001
From: KaneLeung <kk.xiaolan@gmail.com>
Date: Fri, 12 Jul 2024 08:43:23 +0800
Subject: [PATCH] =?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 25e4cc6b..d6ce6e98 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 }">
@@ -296,7 +292,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},
 					}