From f99166cc0e7222a79277f353949d2efbe2ec9057 Mon Sep 17 00:00:00 2001 From: Marvin Date: Thu, 5 May 2022 15:07:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=A4=9A=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=E5=85=AC=E7=94=A8=201.1.?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=8C=83=E4=BE=8BSYS001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/SYSController.cs | 12 +- .../Resources.SharedResource.zh-TW.resx | 132 ++++++++++++++++++ .../Resources/SharedResource.cs | 14 ++ AMESCoreStudio.Web/Startup.cs | 10 +- AMESCoreStudio.Web/Views/SYS/SYS001.cshtml | 22 ++- 5 files changed, 176 insertions(+), 14 deletions(-) create mode 100644 AMESCoreStudio.Web/Resources/Resources.SharedResource.zh-TW.resx create mode 100644 AMESCoreStudio.Web/Resources/SharedResource.cs diff --git a/AMESCoreStudio.Web/Controllers/SYSController.cs b/AMESCoreStudio.Web/Controllers/SYSController.cs index 46177c14..57207e7c 100644 --- a/AMESCoreStudio.Web/Controllers/SYSController.cs +++ b/AMESCoreStudio.Web/Controllers/SYSController.cs @@ -9,6 +9,8 @@ using Microsoft.AspNetCore.Mvc.Rendering; using AMESCoreStudio.WebApi.Models.SYS; using AMESCoreStudio.CommonTools.Result; using AMESCoreStudio.WebApi.DTO.AMES; +using Microsoft.Extensions.Localization; +using AMESCoreStudio.Web.Resources; namespace AMESCoreStudio.Web.Controllers { @@ -17,15 +19,13 @@ namespace AMESCoreStudio.Web.Controllers private readonly ILogger _logger; public readonly ISYS _sysApi; public readonly IPCS _pcsApi; - public SYSController(ILogger logger, ISYS sysApi , IPCS pCS) + private readonly IStringLocalizer _sharedLocalizer; + public SYSController(ILogger logger, ISYS sysApi , IPCS pcsApi, IStringLocalizer sharedLocalizer) { _logger = logger; _sysApi = sysApi; - _pcsApi = pCS; - //if (Request.Cookies["_AMESCookie"] != null) - //{ - // HttpContext.Request.Cookies.TryGetValue("UserID", out userID); - //} + _pcsApi = pcsApi; + _sharedLocalizer = sharedLocalizer; } /// diff --git a/AMESCoreStudio.Web/Resources/Resources.SharedResource.zh-TW.resx b/AMESCoreStudio.Web/Resources/Resources.SharedResource.zh-TW.resx new file mode 100644 index 00000000..a20dd707 --- /dev/null +++ b/AMESCoreStudio.Web/Resources/Resources.SharedResource.zh-TW.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 系統描述 + + + 系統編號 + + + 系統名稱 + + + 系統代碼 + + \ No newline at end of file diff --git a/AMESCoreStudio.Web/Resources/SharedResource.cs b/AMESCoreStudio.Web/Resources/SharedResource.cs new file mode 100644 index 00000000..b27b8e50 --- /dev/null +++ b/AMESCoreStudio.Web/Resources/SharedResource.cs @@ -0,0 +1,14 @@ +using Microsoft.Extensions.Localization; + +namespace AMESCoreStudio.Web.Resources +{ + public class SharedResource + { + private readonly IStringLocalizer _localizer; + + public SharedResource(IStringLocalizer localizer) + { + _localizer = localizer; + } + } +} diff --git a/AMESCoreStudio.Web/Startup.cs b/AMESCoreStudio.Web/Startup.cs index 14d72aea..9f27c9bd 100644 --- a/AMESCoreStudio.Web/Startup.cs +++ b/AMESCoreStudio.Web/Startup.cs @@ -14,6 +14,7 @@ using WebApiClient; using System.Globalization; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.AspNetCore.Localization; +using AMESCoreStudio.Web.Resources; namespace AMESCoreStudio.Web { @@ -60,8 +61,13 @@ namespace AMESCoreStudio.Web // Add framework services. //services.AddMvc(); - services.AddMvc().AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix); - + //services.AddMvc().AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix); + services.AddMvc() + .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix) + .AddDataAnnotationsLocalization(options => + { + options.DataAnnotationLocalizerProvider = (type, factory) => factory.Create(typeof(SharedResource)); + }); //services.AddControllersWithViews(); services.AddControllersWithViews().AddRazorRuntimeCompilation(); diff --git a/AMESCoreStudio.Web/Views/SYS/SYS001.cshtml b/AMESCoreStudio.Web/Views/SYS/SYS001.cshtml index 58ba53d4..cb38fe5e 100644 --- a/AMESCoreStudio.Web/Views/SYS/SYS001.cshtml +++ b/AMESCoreStudio.Web/Views/SYS/SYS001.cshtml @@ -1,4 +1,10 @@ -@{ +@using System.Globalization +@using Microsoft.AspNetCore.Mvc.Localization +@using AMESCoreStudio.Web.Resources; + +@inject IHtmlLocalizer sharedLocalizer + +@{ ViewData["Title"] = "系統資料管理"; Layout = "~/Views/Shared/_AMESLayout.cshtml"; } @@ -14,6 +20,10 @@
+ + + + @section Scripts{ @@ -26,22 +36,22 @@ { field: 'systemID', width: 160, - title: '系統編號', + title: $("#ui_systemid").val(), sort: true }, { field: 'systemNo', width: 200, - title: '系統代碼' + title: $("#ui_systemno").val() }, { field: 'systemName', minWidth: 200, - title: '系統名稱' + title: $("#ui_systemname").val() }, { field: 'systemDesc', - title: '系統描述', + title: $("#ui_systemdesc").val(), width: 160 }, { @@ -98,7 +108,7 @@ class: 'layui-btn-normal', handler: function () { hg.open('新增系統', '/SYS/SYS001C', 720, 600); - + } }]; //基本数据表格