diff --git a/Atomx.Admin/Atomx.Admin.Client/Models/LanguageModel.cs b/Atomx.Admin/Atomx.Admin.Client/Models/LanguageModel.cs index 5cee95c..d974537 100644 --- a/Atomx.Admin/Atomx.Admin.Client/Models/LanguageModel.cs +++ b/Atomx.Admin/Atomx.Admin.Client/Models/LanguageModel.cs @@ -1,15 +1,10 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace Atomx.Admin.Client.Models +namespace Atomx.Admin.Client.Models { public class LanguageModel { /// /// 数据ID /// - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - [Key] public int Id { get; set; } /// @@ -41,15 +36,5 @@ namespace Atomx.Admin.Client.Models /// 是否可用,系统面 /// public bool Enabled { get; set; } - - /// - /// 多语言资源的版本,可以是时间戳或哈希 - /// - public string ResourceVersion { get; set; } = string.Empty; - - /// - /// 是否编辑 - /// - public bool IsEdit { get; set; } } } diff --git a/Atomx.Admin/Atomx.Admin.Client/Models/LocaleResourceSearch.cs b/Atomx.Admin/Atomx.Admin.Client/Models/LocaleResourceSearch.cs new file mode 100644 index 0000000..85bd8f8 --- /dev/null +++ b/Atomx.Admin/Atomx.Admin.Client/Models/LocaleResourceSearch.cs @@ -0,0 +1,11 @@ +namespace Atomx.Admin.Client.Models +{ + public class LocaleResourceSearch + { + public int LanguageId { get; set; } + + public string? ResourceName { get; set; } + + public string? ResourceValue { get; set; } + } +} diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LanguageList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LanguageList.razor index e6a246f..436a207 100644 --- a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LanguageList.razor +++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LanguageList.razor @@ -33,10 +33,13 @@ } - - - + + + + + 语言资源 + diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceList.razor index 36b3087..22a6d63 100644 --- a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceList.razor +++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceList.razor @@ -2,10 +2,41 @@ @inject ILogger Logger 本地化语言资源 +多语言本地资源管理 + @code { [Parameter] - public long Id { get; set; } + public int Id { get; set; } bool loading = false; + + [SupplyParameterFromForm] + LocaleResourceSearch search { get; set; } = default!; + + [SupplyParameterFromForm] + LocaleResourceModel model { get; set; } = default!; + + protected override void OnInitialized() + { + search ??= new LocaleResourceSearch(); + model ??= new LocaleResourceModel(); + base.OnInitialized(); + } + + protected override async Task OnParametersSetAsync() + { + await LoadList(); + } + + private async Task LoadList() + { + loading = true; + + var url = $"/api/locale/resource/search/{Id}"; + + + loading = false; + StateHasChanged(); + } } diff --git a/Atomx.Admin/Atomx.Admin/Controllers/LanguageController.cs b/Atomx.Admin/Atomx.Admin/Controllers/LanguageController.cs index bc11683..b3debcb 100644 --- a/Atomx.Admin/Atomx.Admin/Controllers/LanguageController.cs +++ b/Atomx.Admin/Atomx.Admin/Controllers/LanguageController.cs @@ -147,7 +147,7 @@ namespace Atomx.Admin.Controllers result = result.IsFail("语言文化已存在,请更换!"); return new JsonResult(result); } - if (model.IsEdit) + if (model.Id > 0) { data = _dbContext.Languages.SingleOrDefault(p => p.Id == model.Id); if (data == null)