From e2f76a524b4b8e5812f19944615ca1331b420467 Mon Sep 17 00:00:00 2001 From: yzp Date: Tue, 27 May 2025 10:50:50 +0800 Subject: [PATCH] =?UTF-8?q?BUG:=E6=97=A5=E6=9C=9F=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=91=BD=E5=90=8D=E7=A9=BA=E9=9F=B3=E5=BC=95?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm | 1 + .../Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm | 1 + .../Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm index 697ec0d1..ded75017 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm @@ -25,6 +25,7 @@ @if(@Model.NameSpace != "Admin.NET.Core"){ @:using Admin.NET.Core; } +using Admin.NET.Core.Service; namespace @(@Model.NameSpace); public partial class @(@Model.ClassName)Mid diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm index 8e159e53..863d58ac 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm @@ -7,6 +7,7 @@ using Admin.NET.Core.Service; using Microsoft.AspNetCore.Http; using System.Linq.Expressions; +using Furion.EventBus; using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; @{ string joinTableName = "u"; diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm index 8d7c8805..cf0d7fe6 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm @@ -331,7 +331,7 @@ const checkTableColumnVisible = (tableColumnName: any) => { } else if(@column.EffectType == "EnumSelector") { @:{ visible: checkTableColumnVisible('@(@Model.LowerClassName):@(@column.LowerPropertyName)'), field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable }, } else if(@column.EffectType == "DatePicker") { - @:{ visible: checkTableColumnVisible('@(@Model.LowerClassName):@(@column.LowerPropertyName)'), field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', formatter: ({ cellValue }) => formatDate(new Date(cellValue), 'YYYY-mm-dd HH:MM:SS'), @whethersortable }, + @:{ visible: checkTableColumnVisible('@(@Model.LowerClassName):@(@column.LowerPropertyName)'), field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', formatter: ({ cellValue }) => cellValue==null?'':formatDate(new Date(cellValue), 'YYYY-mm-dd HH:MM:SS'), @whethersortable }, } else { @:{ visible: checkTableColumnVisible('@(@Model.LowerClassName):@(@column.LowerPropertyName)'), field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', @whethersortable}, }