From 12fbba285c4336914c9346adcea88cb976499ef7 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Mon, 2 Dec 2024 10:12:40 +0800 Subject: [PATCH 01/26] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/Services/ClearUploadFilesService.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Server/Services/ClearUploadFilesService.cs b/src/BootstrapBlazor.Server/Services/ClearUploadFilesService.cs index c134e2bf0cb..93e52a7f02a 100644 --- a/src/BootstrapBlazor.Server/Services/ClearUploadFilesService.cs +++ b/src/BootstrapBlazor.Server/Services/ClearUploadFilesService.cs @@ -37,8 +37,7 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) { TaskServicesManager.GetOrAdd("Clear Upload Files", (provider, token) => { - var webSiteUrl = $"images{Path.DirectorySeparatorChar}uploader{Path.DirectorySeparatorChar}"; - var filePath = Path.Combine(_env.WebRootPath, webSiteUrl); + var filePath = Path.Combine(_env.WebRootPath, "images", "uploader"); if (Directory.Exists(filePath)) { Directory.EnumerateFiles(filePath).Take(10).ToList().ForEach(file => DeleteFile(file, token)); From afa9d8fa8645f39aeff2a2339f8c9b241a686a9e Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Mon, 2 Dec 2024 11:15:03 +0800 Subject: [PATCH 02/26] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Shared/Components/Components/Header.razor | 2 +- src/BootstrapBlazor.Shared/Components/Components/Pre.razor | 2 +- .../Components/Components/ThemeChooser.razor | 2 +- .../Components/Components/UpdateIntro.razor | 2 +- .../Components/Components/VideoDemo.razor | 2 +- .../Components/Components/WebSiteModuleComponentBase.cs | 2 +- src/BootstrapBlazor.Shared/Components/Components/Wwads.razor | 2 +- src/BootstrapBlazor.Shared/Components/Layout/NavMenu.razor | 2 +- .../Components/Layout/TutorialsNavMenu.razor | 2 +- src/BootstrapBlazor.Shared/Components/Pages/Chats.razor | 2 +- .../Components/Samples/Charts/Line.razor.cs | 2 +- .../Components/Samples/Icons/AntDesignIconList.razor.cs | 2 +- .../Components/Samples/Icons/ElementIconList.razor.cs | 2 +- .../Components/Samples/Icons/FAIconList.razor.cs | 2 +- .../Components/Samples/Icons/IconParkList.razor.cs | 2 +- .../Components/Samples/Table/TablesSelection.razor.cs | 2 +- src/BootstrapBlazor.Shared/Components/Samples/Topologies.razor | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Components/Components/Header.razor b/src/BootstrapBlazor.Shared/Components/Components/Header.razor index 9c3514da9de..62db13d1842 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/Header.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/Header.razor @@ -1,5 +1,5 @@ @inherits WebSiteModuleComponentBase -@attribute [JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Components/Header.razor.js")] +@attribute [JSModuleAutoLoader("Components/Header.razor.js")]
diff --git a/src/BootstrapBlazor.Shared/Components/Components/Pre.razor b/src/BootstrapBlazor.Shared/Components/Components/Pre.razor index 1c78123b49b..ddb67ec0657 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/Pre.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/Pre.razor @@ -1,5 +1,5 @@ @inherits WebSiteModuleComponentBase -@attribute [JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Components/Pre.razor.js")] +@attribute [JSModuleAutoLoader("Components/Pre.razor.js")]

@LoadingText

diff --git a/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor b/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor index 01ebdca2fea..fcc9c818b83 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor @@ -1,5 +1,5 @@ @inherits WebSiteModuleComponentBase -@attribute [JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor.js")] +@attribute [JSModuleAutoLoader("Components/ThemeChooser.razor.js")]
diff --git a/src/BootstrapBlazor.Shared/Components/Components/UpdateIntro.razor b/src/BootstrapBlazor.Shared/Components/Components/UpdateIntro.razor index 8c2150e9191..3d0ad2d89bb 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/UpdateIntro.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/UpdateIntro.razor @@ -1,6 +1,6 @@ @inherits WebSiteModuleComponentBase @inject IStringLocalizer Localizer -@attribute [JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Components/UpdateIntro.razor.js")] +@attribute [JSModuleAutoLoader("Components/UpdateIntro.razor.js")]
Bootstrap Blazor @Localizer["H1"] @PackageVersionService.Version
diff --git a/src/BootstrapBlazor.Shared/Components/Components/VideoDemo.razor b/src/BootstrapBlazor.Shared/Components/Components/VideoDemo.razor index be8fe9687f5..40abcc833c3 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/VideoDemo.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/VideoDemo.razor @@ -1,4 +1,4 @@ @inherits WebSiteModuleComponentBase -@attribute [JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Components/VideoDemo.razor.js", AutoInvokeInit = false, AutoInvokeDispose = false)] +@attribute [JSModuleAutoLoader("Components/VideoDemo.razor.js", AutoInvokeInit = false, AutoInvokeDispose = false)] diff --git a/src/BootstrapBlazor.Shared/Components/Components/WebSiteModuleComponentBase.cs b/src/BootstrapBlazor.Shared/Components/Components/WebSiteModuleComponentBase.cs index 9c22a2bc5c7..7483c113b04 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/WebSiteModuleComponentBase.cs +++ b/src/BootstrapBlazor.Shared/Components/Components/WebSiteModuleComponentBase.cs @@ -17,6 +17,6 @@ protected override void OnLoadJSModule() { base.OnLoadJSModule(); - ModulePath = $"./Components/{ModulePath}"; + ModulePath = $"./_content/BootstrapBlazor.Shared/Components/{ModulePath}"; } } diff --git a/src/BootstrapBlazor.Shared/Components/Components/Wwads.razor b/src/BootstrapBlazor.Shared/Components/Components/Wwads.razor index 4bedfa252ef..6a6af9a4d31 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/Wwads.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/Wwads.razor @@ -1,4 +1,4 @@ @inherits WebSiteModuleComponentBase -@attribute [JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Components/Wwads.razor.js", AutoInvokeDispose = false)] +@attribute [JSModuleAutoLoader("Components/Wwads.razor.js", AutoInvokeDispose = false)]
diff --git a/src/BootstrapBlazor.Shared/Components/Layout/NavMenu.razor b/src/BootstrapBlazor.Shared/Components/Layout/NavMenu.razor index 21ae1399efd..4d2c14fa695 100644 --- a/src/BootstrapBlazor.Shared/Components/Layout/NavMenu.razor +++ b/src/BootstrapBlazor.Shared/Components/Layout/NavMenu.razor @@ -1,5 +1,5 @@ @inherits WebSiteModuleComponentBase -@attribute [JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Layout/NavMenu.razor.js")] +@attribute [JSModuleAutoLoader("Layout/NavMenu.razor.js")]
; diff --git a/src/BootstrapBlazor.Shared/Components/Components/ComponentCard.razor.cs b/src/BootstrapBlazor.Shared/Components/Components/ComponentCard.razor.cs index a6b9942727a..093e09b438d 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/ComponentCard.razor.cs +++ b/src/BootstrapBlazor.Shared/Components/Components/ComponentCard.razor.cs @@ -3,6 +3,8 @@ // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone +using Microsoft.Extensions.Options; + namespace BootstrapBlazor.Shared.Components.Components; /// @@ -10,7 +12,10 @@ namespace BootstrapBlazor.Shared.Components.Components; /// public sealed partial class ComponentCard { - private string ImageUrl => $"./_content/BootstrapBlazor.Shared/images/{Image}"; + [Inject, NotNull] + private IOptionsMonitor? WebSiteOptions { get; set; } + + private string ImageUrl => $"{WebSiteOptions.CurrentValue.AssetRootPath}images/{Image}"; private string? ClassString => CssBuilder.Default("col-12 col-sm-6 col-md-4 col-lg-3") .AddClass("d-none", IsHide) diff --git a/src/BootstrapBlazor.Shared/Components/Components/CustomWinBoxContent.razor.cs b/src/BootstrapBlazor.Shared/Components/Components/CustomWinBoxContent.razor.cs index a657d4d1119..d9530a18351 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/CustomWinBoxContent.razor.cs +++ b/src/BootstrapBlazor.Shared/Components/Components/CustomWinBoxContent.razor.cs @@ -3,6 +3,8 @@ // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone +using Microsoft.Extensions.Options; + namespace BootstrapBlazor.Shared.Components.Components; /// @@ -10,6 +12,9 @@ namespace BootstrapBlazor.Shared.Components.Components; /// public partial class CustomWinBoxContent { + [Inject, NotNull] + private IOptionsMonitor? WebSiteOptions { get; set; } + [Inject, NotNull] private WinBoxService? WinBoxService { get; set; } @@ -49,7 +54,7 @@ private async Task SetIconWinBox() { if (Option != null) { - Option.Icon = "./_content/BootstrapBlazor.Shared/images/Argo-C.png"; + Option.Icon = $"{WebSiteOptions.CurrentValue.AssetRootPath}images/Argo-C.png"; await WinBoxService.SetIcon(Option); } } diff --git a/src/BootstrapBlazor.Shared/Components/Components/Header.razor b/src/BootstrapBlazor.Shared/Components/Components/Header.razor index 62db13d1842..baa74c34958 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/Header.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/Header.razor @@ -34,12 +34,12 @@
  • - git + git
  • - gitee + gitee
  • diff --git a/src/BootstrapBlazor.Shared/Components/Components/InstallContent.razor b/src/BootstrapBlazor.Shared/Components/Components/InstallContent.razor index 94abb29d619..3267710dfcd 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/InstallContent.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/InstallContent.razor @@ -5,6 +5,7 @@

    @Title

    @Localizer["Heading"]

    +@inject IOptionsMonitor WebsiteOption

    @Localizer["P1"]

      @@ -23,17 +24,17 @@

      1. @Localizer["P11"]

      2. @Localizer["P12"]

      3. @Localizer["P13"] Blazor App @Localizer["P14"] @Localizer["P15"], @Localizer["P16"] Create

      -install +install @ChooseTemplate
      @Localizer["P17"]

      1. @Localizer["P18"] nuget.org @Localizer["P19"] BootstrapBlazor

      @Localizer["P20"] Manage Nuget Packages

      dotnet add package BootstrapBlazor --version @Version
      -install +install

      2. @Localizer["P21"]

      -install +install

      3. @Localizer["P22"]

      @Localizer["P23"]

      @@ -92,4 +93,4 @@

      1. @Localizer["P39"] Button @Localizer["P40"]

      <Button Color="Color.Primary" Icon="fa-solid fa-font-awesome" Text="@Localizer["P41"]" />

      2. @Localizer["P42"] Visual studio @Localizer["P43"] F5 @Localizer["P44"]

      -install +install diff --git a/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor b/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor index fcc9c818b83..2c7b5039710 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor @@ -1,8 +1,9 @@ @inherits WebSiteModuleComponentBase @attribute [JSModuleAutoLoader("Components/ThemeChooser.razor.js")] +@inject IOptionsMonitor WebsiteOption
      - +
      @HeaderText
      diff --git a/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor.cs b/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor.cs index b161c8dc9f5..ba9ae985b57 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor.cs +++ b/src/BootstrapBlazor.Shared/Components/Components/ThemeChooser.razor.cs @@ -25,10 +25,6 @@ public partial class ThemeChooser [NotNull] private IStringLocalizer? Localizer { get; set; } - [Inject] - [NotNull] - private IOptionsMonitor? SiteOptions { get; set; } - /// /// OnInitialized 方法 /// @@ -38,14 +34,14 @@ protected override void OnInitialized() Title ??= Localizer[nameof(Title)]; HeaderText ??= Localizer[nameof(HeaderText)]; - Themes = SiteOptions.CurrentValue.Themes.Select(i => new SelectedItem { Text = i.Name, Value = i.Key }); - SiteOptions.CurrentValue.CurrentTheme = "bootstrap"; + Themes = WebsiteOption.CurrentValue.Themes.Select(i => new SelectedItem { Text = i.Name, Value = i.Key }); + WebsiteOption.CurrentValue.CurrentTheme = "bootstrap"; } private async Task OnClickTheme(SelectedItem item) { - SiteOptions.CurrentValue.CurrentTheme = item.Value; - var theme = SiteOptions.CurrentValue.Themes.Find(i => i.Key == item.Value); + WebsiteOption.CurrentValue.CurrentTheme = item.Value; + var theme = WebsiteOption.CurrentValue.Themes.Find(i => i.Key == item.Value); if (theme != null) { await InvokeVoidAsync("updateTheme", [theme.Files]); @@ -53,6 +49,6 @@ private async Task OnClickTheme(SelectedItem item) } private string? GetThemeItemClass(SelectedItem item) => CssBuilder.Default("theme-item") - .AddClass("active", SiteOptions.CurrentValue.CurrentTheme == item.Value) + .AddClass("active", WebsiteOption.CurrentValue.CurrentTheme == item.Value) .Build(); } diff --git a/src/BootstrapBlazor.Shared/Components/Components/UpdateIntro.razor b/src/BootstrapBlazor.Shared/Components/Components/UpdateIntro.razor index 3d0ad2d89bb..f7618001c20 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/UpdateIntro.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/UpdateIntro.razor @@ -10,15 +10,15 @@

      @Localizer["P1"] @PackageVersionService.Version @Localizer["P2"] [@Localizer["P3"]] @Localizer["P4"] Star - github + github - gitee + gitee

      - QQGroup + QQGroup
      QQ 795206915
      diff --git a/src/BootstrapBlazor.Shared/Components/Components/WebSiteModuleComponentBase.cs b/src/BootstrapBlazor.Shared/Components/Components/WebSiteModuleComponentBase.cs index 7b695e138f2..efeac8a4506 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/WebSiteModuleComponentBase.cs +++ b/src/BootstrapBlazor.Shared/Components/Components/WebSiteModuleComponentBase.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone +using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; namespace BootstrapBlazor.Shared.Components.Components; diff --git a/src/BootstrapBlazor.Shared/Components/Components/Widget.razor b/src/BootstrapBlazor.Shared/Components/Components/Widget.razor index 1ee2f7e0c26..22323a0d904 100644 --- a/src/BootstrapBlazor.Shared/Components/Components/Widget.razor +++ b/src/BootstrapBlazor.Shared/Components/Components/Widget.razor @@ -1,4 +1,6 @@ - +@inject IOptionsMonitor WebsiteOption + + 您有 4 个未读消息 @@ -8,7 +10,7 @@ {
      - +
      diff --git a/src/BootstrapBlazor.Shared/Components/Layout/HomeLayout.razor b/src/BootstrapBlazor.Shared/Components/Layout/HomeLayout.razor index 25a6f82ad22..4b73f1b7e02 100644 --- a/src/BootstrapBlazor.Shared/Components/Layout/HomeLayout.razor +++ b/src/BootstrapBlazor.Shared/Components/Layout/HomeLayout.razor @@ -14,7 +14,7 @@
      本项目属于 .NET 基金会，并根据其 行为准则 运作
      - +
      @@ -79,7 +79,7 @@ 鲁ICP备19015061号-4
      - global + global 简 体 / English diff --git a/src/BootstrapBlazor.Shared/Components/Layout/MainLayout.razor b/src/BootstrapBlazor.Shared/Components/Layout/MainLayout.razor index 2c1bd01568d..507146aa844 100644 --- a/src/BootstrapBlazor.Shared/Components/Layout/MainLayout.razor +++ b/src/BootstrapBlazor.Shared/Components/Layout/MainLayout.razor @@ -26,5 +26,5 @@ - + diff --git a/src/BootstrapBlazor.Shared/Components/Layout/PageLayout.razor b/src/BootstrapBlazor.Shared/Components/Layout/PageLayout.razor index 1561b81fc00..a4c7fc6d4d4 100644 --- a/src/BootstrapBlazor.Shared/Components/Layout/PageLayout.razor +++ b/src/BootstrapBlazor.Shared/Components/Layout/PageLayout.razor @@ -2,7 +2,7 @@ @inject IOptionsMonitor WebsiteOption - + @@ -12,7 +12,7 @@
      Bootstrap of Blazor - + 个人中心 设置 @@ -23,7 +23,7 @@
      - +
      后台管理
      diff --git a/src/BootstrapBlazor.Shared/Components/Pages/Index.razor b/src/BootstrapBlazor.Shared/Components/Pages/Index.razor index d5dda4fd054..d2fd3e2d060 100644 --- a/src/BootstrapBlazor.Shared/Components/Pages/Index.razor +++ b/src/BootstrapBlazor.Shared/Components/Pages/Index.razor @@ -2,6 +2,7 @@ @page "/" @page "/index" @page "/home" +@inject IOptionsMonitor WebsiteOption
      @@ -34,6 +35,6 @@
      diff --git a/src/BootstrapBlazor.Shared/Components/Pages/Install.razor b/src/BootstrapBlazor.Shared/Components/Pages/Install.razor index bbdf5bbc3d2..c13cb3b87c3 100644 --- a/src/BootstrapBlazor.Shared/Components/Pages/Install.razor +++ b/src/BootstrapBlazor.Shared/Components/Pages/Install.razor @@ -12,13 +12,13 @@
      - fork + fork Fork
      - tortoisegit + tortoisegit
      diff --git a/src/BootstrapBlazor.Shared/Components/Pages/Install_Maui.razor b/src/BootstrapBlazor.Shared/Components/Pages/Install_Maui.razor index ed166a5c436..40af921122f 100644 --- a/src/BootstrapBlazor.Shared/Components/Pages/Install_Maui.razor +++ b/src/BootstrapBlazor.Shared/Components/Pages/Install_Maui.razor @@ -1,6 +1,7 @@ @page "/install-maui" @inject IStringLocalizer Localizer @inject PackageVersionService VersionManager +@inject IOptionsMonitor WebsiteOption

      @Title

      @@ -18,15 +19,15 @@

      1.Visual Studio

      2. @Localizer["P5"]

      3. @Localizer["P6"] @Localizer["P7"] @Localizer["P8"] @Localizer["P9"], @Localizer["P10"] @Localizer["P11"], @Localizer["P12"]

      - +
      @Localizer["P13"]

      @((MarkupString)Localizer["P14"].Value)

      @Localizer["P15"] Manage Nuget Packages

      dotnet add package BootstrapBlazor --version @Version
      - +

      @Localizer["P16"]

      - +

      @Localizer["P17"]

      @Localizer["P18"]

        @@ -92,7 +93,7 @@ return builder.Build();

        @Localizer["P34"] Button @Localizer["P35"]

        <Button Color="Color.Primary" Icon="fa-solid fa-font-awesome" Text="@Localizer["P36"]" />

        @Localizer["P37"] Visual studio @Localizer["P38"] F5 @Localizer["P39"]

        - +

        @Localizer["P40"]

        @Localizer["P41"] NativeContent.xaml @Localizer["P42"]

        @@ -205,7 +206,7 @@ return builder.Build(); } }

        @Localizer["P48"] Visual studio @Localizer["P49"] F5 @Localizer["P50"]

        - + @code { diff --git a/src/BootstrapBlazor.Shared/Components/Pages/Install_Server.razor b/src/BootstrapBlazor.Shared/Components/Pages/Install_Server.razor index 48c28192c8e..d467701409f 100644 --- a/src/BootstrapBlazor.Shared/Components/Pages/Install_Server.razor +++ b/src/BootstrapBlazor.Shared/Components/Pages/Install_Server.razor @@ -1,10 +1,11 @@ @page "/install-server" @inject IStringLocalizer Localizer +@inject IOptionsMonitor WebsiteOption

        4. @Localizer["D1"] Blazor Server App @Localizer["D2"] Create

        - +
          diff --git a/src/BootstrapBlazor.Shared/Components/Pages/Install_wasm.razor b/src/BootstrapBlazor.Shared/Components/Pages/Install_wasm.razor index c45799423c2..859d946c647 100644 --- a/src/BootstrapBlazor.Shared/Components/Pages/Install_wasm.razor +++ b/src/BootstrapBlazor.Shared/Components/Pages/Install_wasm.razor @@ -1,10 +1,11 @@ @page "/install-wasm" @inject IStringLocalizer Localizer +@inject IOptionsMonitor WebsiteOption

          4. @((MarkupString)Localizer["Install_wasmDescription"].Value)

          - +

          wwwroot/index.html

          diff --git a/src/BootstrapBlazor.Shared/Components/Pages/Template.razor b/src/BootstrapBlazor.Shared/Components/Pages/Template.razor index 44fe5c1a351..8eca51827f9 100644 --- a/src/BootstrapBlazor.Shared/Components/Pages/Template.razor +++ b/src/BootstrapBlazor.Shared/Components/Pages/Template.razor @@ -32,20 +32,20 @@

          @Localizer["P10"] Visual Studio @Localizer["P11"] @Localizer["P12"] @Localizer["P13"] [@Localizer["P14"]] @Localizer["P15"] [@Localizer["P16"]]

          - + - +

          2. @Localizer["P17"]

          - + - +

          3. @Localizer["P18"]

          - + - +
      - demo-image + demo-image
      Carousel Item
      @@ -153,7 +154,7 @@
      Sales champion
      www.blazor.zone
      - demo-image + demo-image
      Carousel Item
      @@ -163,7 +164,7 @@
      Sales champion
      www.blazor.zone
      - demo-image + demo-image
      Carousel Item
      @@ -177,7 +178,7 @@
      Sales champion
      www.blazor.zone
      - demo-image + demo-image
      Carousel Item
      @@ -187,7 +188,7 @@
      Sales champion
      www.blazor.zone
      - demo-image + demo-image
      Carousel Item
      @@ -197,7 +198,7 @@
      Sales champion
      www.blazor.zone
- demo-image + demo-image
Carousel Item
diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Carousels.razor.cs b/src/BootstrapBlazor.Shared/Components/Samples/Carousels.razor.cs index 919d8344a74..702ccd4bb6a 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/Carousels.razor.cs +++ b/src/BootstrapBlazor.Shared/Components/Samples/Carousels.razor.cs @@ -13,15 +13,21 @@ public sealed partial class Carousels [NotNull] private ConsoleLogger? OnClickLogger { get; set; } + private readonly List _images = []; + /// - /// Images + /// /// - private static List Images => - [ - "./_content/BootstrapBlazor.Shared/images/Pic0.jpg", - "./_content/BootstrapBlazor.Shared/images/Pic1.jpg", - "./_content/BootstrapBlazor.Shared/images/Pic2.jpg" - ]; + protected override void OnInitialized() + { + base.OnInitialized(); + + _images.AddRange([ + $"{WebsiteOption.CurrentValue.AssetRootPath}images/Pic0.jpg", + $"{WebsiteOption.CurrentValue.AssetRootPath}images/Pic1.jpg", + $"{WebsiteOption.CurrentValue.AssetRootPath}images/Pic2.jpg" + ]); + } /// /// OnClick diff --git a/src/BootstrapBlazor.Shared/Components/Samples/CherryMarkdowns.razor b/src/BootstrapBlazor.Shared/Components/Samples/CherryMarkdowns.razor index a5a2c8706b1..9c7a9eaaf80 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/CherryMarkdowns.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/CherryMarkdowns.razor @@ -1,4 +1,5 @@ @page "/cherry-markdown" +@inject IOptionsMonitor WebsiteOption

@Localizer["Header"]

@Localizer["Tip"]

diff --git a/src/BootstrapBlazor.Shared/Components/Samples/CherryMarkdowns.razor.cs b/src/BootstrapBlazor.Shared/Components/Samples/CherryMarkdowns.razor.cs index a7201af0504..0f726a4cae5 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/CherryMarkdowns.razor.cs +++ b/src/BootstrapBlazor.Shared/Components/Samples/CherryMarkdowns.razor.cs @@ -58,7 +58,7 @@ private async Task OnFileUpload(CherryMarkdownUploadFile arg) { var url = Path.Combine("images", "uploader", $"{Path.GetFileNameWithoutExtension(arg.FileName)}-{DateTimeOffset.Now:yyyyMMddHHmmss}{Path.GetExtension(arg.FileName)}"); - var fileName = Path.Combine(SiteOptions.CurrentValue.WebRootPath, url); + var fileName = Path.Combine(WebsiteOption.CurrentValue.WebRootPath, url); var ret = await arg.SaveToFile(fileName); return ret ? url : ""; } @@ -67,7 +67,7 @@ private async Task OnFileUpload(CherryMarkdownUploadFile arg) [NotNull] private IStringLocalizer? Localizer { get; set; } - private AttributeItem[] GetAttributes() => + private static AttributeItem[] GetAttributes() => [ new() { diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Downloads.razor b/src/BootstrapBlazor.Shared/Components/Samples/Downloads.razor index 238d27b2168..ba06e4f4424 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/Downloads.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/Downloads.razor @@ -3,6 +3,7 @@ @inject IOptionsMonitor SiteOptions @inject ToastService ToastService @inject DownloadService DownloadService +@inject IOptionsMonitor WebsiteOption

@Localizer["DownloadsTitle"]

@Localizer["DownloadsSubTitle"]

diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Downloads.razor.cs b/src/BootstrapBlazor.Shared/Components/Samples/Downloads.razor.cs index 4c50da937b7..933f0234f8f 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/Downloads.razor.cs +++ b/src/BootstrapBlazor.Shared/Components/Samples/Downloads.razor.cs @@ -18,7 +18,7 @@ private async Task DownloadPhysicalFileAsync() { try { - var filePath = Path.Combine(SiteOptions.CurrentValue.WebRootPath, "favicon.png"); + var filePath = Path.Combine(WebsiteOption.CurrentValue.WebRootPath, "favicon.png"); await using var stream = File.OpenRead(filePath); await DownloadService.DownloadFromStreamAsync("favicon.png", stream); } @@ -48,7 +48,7 @@ private async Task DownloadFolderAsync() { try { - await DownloadService.DownloadFolderAsync("test.zip", SiteOptions.CurrentValue.WebRootPath); + await DownloadService.DownloadFolderAsync("test.zip", WebsiteOption.CurrentValue.WebRootPath); } catch (FileNotFoundException msg) { diff --git a/src/BootstrapBlazor.Shared/Components/Samples/ImageCroppers.razor b/src/BootstrapBlazor.Shared/Components/Samples/ImageCroppers.razor index b39ec5e355e..16d2763af2d 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/ImageCroppers.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/ImageCroppers.razor @@ -1,12 +1,13 @@ @page "/image-cropper" @inject IStringLocalizer Localizer +@inject IOptionsMonitor WebsiteOption

@Localizer["Title"]

- +
public sealed partial class ListViews { + [Inject, NotNull] + private IOptionsMonitor? WebSiteOptions { get; set; } + [NotNull] private ConsoleLogger? Logger { get; set; } @@ -25,7 +30,7 @@ protected override void OnInitialized() Products = Enumerable.Range(1, 8).Select(i => new Product() { - ImageUrl = $"./_content/BootstrapBlazor.Shared/images/Pic{i}.jpg", + ImageUrl = $"{WebSiteOptions.CurrentValue.AssetRootPath}images/Pic{i}.jpg", Description = $"Pic{i}.jpg", Category = $"Group{(i % 4) + 1}" }); diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Logouts.razor b/src/BootstrapBlazor.Shared/Components/Samples/Logouts.razor index bb78dd569d8..edadb371989 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/Logouts.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/Logouts.razor @@ -1,5 +1,6 @@ @page "/logout" @inject IStringLocalizer Localizer +@inject IOptionsMonitor WebsiteOption

@Localizer["LogoutsTitle"]

@@ -9,7 +10,7 @@ Introduction="@Localizer["LogoutsNormalIntro"]" Name="Normal">
- +
@@ -18,7 +19,7 @@ Introduction="@Localizer["LogoutsShowUserNameIntro"]" Name="ShowUserName">
- +
@@ -26,7 +27,7 @@ - + @Localizer["LogoutsChildContentCustomDisplay"] @@ -36,10 +37,10 @@ - +
- avatar + avatar
@Localizer["LogoutsHeaderTemplateUser1"]
@Localizer["LogoutsHeaderTemplateUser2"]
@@ -53,7 +54,7 @@ - + @Localizer["LogoutsLinkTemplatePersonalCenter"] diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Menus.razor b/src/BootstrapBlazor.Shared/Components/Samples/Menus.razor index 95452c47957..dea2bd32fb3 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/Menus.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/Menus.razor @@ -70,7 +70,7 @@
- +
@Localizer["MenusClickShrinkMenuTitle"]
diff --git a/src/BootstrapBlazor.Shared/Components/Samples/MouseFollowers.razor b/src/BootstrapBlazor.Shared/Components/Samples/MouseFollowers.razor index 897a4f05f23..b9cf90eb353 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/MouseFollowers.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/MouseFollowers.razor @@ -1,6 +1,7 @@ @page "/mouse-follower" +@inject IOptionsMonitor WebsiteOption -
+ + -

@Localizer["MouseFollowersTitle"]

+

@Localizer["MouseFollowersTitle"]

-

@Localizer["MouseFollowersDescription"]

+

@Localizer["MouseFollowersDescription"]

- + - - -
- - + + +
+ + - - -
- - + + +
+ + - - -
- - + + +
+ + - - -
- - + + +
+ + - - -
- - + + +
+ + - -
+ diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Notifications.razor.cs b/src/BootstrapBlazor.Shared/Components/Samples/Notifications.razor.cs index 0800f2fee60..e664420b742 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/Notifications.razor.cs +++ b/src/BootstrapBlazor.Shared/Components/Samples/Notifications.razor.cs @@ -3,6 +3,8 @@ // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone +using Microsoft.Extensions.Options; + namespace BootstrapBlazor.Shared.Components.Samples; /// @@ -14,15 +16,16 @@ public partial class Notifications [NotNull] private NotificationService? BrowserNotification { get; set; } + [Inject, NotNull] + private IOptionsMonitor? WebSiteOptions { get; set; } + [NotNull] private ConsoleLogger? Logger { get; set; } private bool Permission { get; set; } - private NotificationItem Model { get; set; } = new() - { - Icon = "./_content/BootstrapBlazor.Shared/images/Argo-C.png" - }; + [NotNull] + private NotificationItem? Model { get; set; } /// /// @@ -30,9 +33,14 @@ public partial class Notifications protected override void OnInitialized() { base.OnInitialized(); - Model.Title ??= Localizer["NotificationsNormalTitleSampleText"]; - Model.Message ??= Localizer["NotificationsNormalMessageSampleText"]; - Model.OnClick = OnClickNotificationCallback; + + Model = new() + { + Icon = $"{WebSiteOptions.CurrentValue.AssetRootPath}images/Argo-C.png", + Title = Localizer["NotificationsNormalTitleSampleText"], + Message = Localizer["NotificationsNormalMessageSampleText"], + OnClick = OnClickNotificationCallback + }; } /// diff --git a/src/BootstrapBlazor.Shared/Components/Samples/SelectObjects.razor.cs b/src/BootstrapBlazor.Shared/Components/Samples/SelectObjects.razor.cs index abb7a74510f..74ed73a5302 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/SelectObjects.razor.cs +++ b/src/BootstrapBlazor.Shared/Components/Samples/SelectObjects.razor.cs @@ -3,6 +3,8 @@ // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone +using Microsoft.Extensions.Options; + namespace BootstrapBlazor.Shared.Components.Samples; /// @@ -10,6 +12,9 @@ namespace BootstrapBlazor.Shared.Components.Samples; /// public partial class SelectObjects { + [Inject, NotNull] + private IOptionsMonitor? WebSiteOptions { get; set; } + [NotNull] private IEnumerable? Products { get; set; } @@ -30,7 +35,7 @@ protected override void OnInitialized() Products = Enumerable.Range(1, 8).Select(i => new ListViews.Product() { - ImageUrl = $"./_content/BootstrapBlazor.Shared/images/Pic{i}.jpg", + ImageUrl = $"{WebSiteOptions.CurrentValue.AssetRootPath}images/Pic{i}.jpg", Description = $"Pic{i}.jpg", Category = $"Group{(i % 4) + 1}" }); diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/Admin.razor b/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/Admin.razor index b8a528dad4b..688068e1c8b 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/Admin.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/Admin.razor @@ -1,4 +1,5 @@ @page "/tutorials/admin" +@inject IOptionsMonitor WebsiteOption

后台权限管理演示系统

@@ -8,7 +9,7 @@
BootstrapBlazor 组件库实现
- +
@@ -18,7 +19,7 @@
MVC & Blazor 混合实现
- +
diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/LoginAndRegister/Template3.razor b/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/LoginAndRegister/Template3.razor index 9a8985f5655..99d69538fb5 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/LoginAndRegister/Template3.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/LoginAndRegister/Template3.razor @@ -1,9 +1,10 @@ @page "/tutorials/template3" @layout TutorialsLoginLayout +@inject IOptionsMonitor WebsiteOption public sealed partial class Uploads { + [Inject, NotNull] + private IOptionsMonitor? WebSiteOptions { get; set; } + [NotNull] private ConsoleLogger? Logger1 { get; set; } @@ -28,7 +32,7 @@ public sealed partial class Uploads private Person Foo2 { get; set; } = new Person(); - private List PreviewFileList { get; } = new(new[] { new UploadFile { PrevUrl = "./_content/BootstrapBlazor.Shared/images/Argo.png" } }); + private List PreviewFileList { get; } = []; private CancellationTokenSource? ReadAvatarToken { get; set; } @@ -51,6 +55,19 @@ public sealed partial class Uploads new UploadFile { FileName = "Test", PrevUrl = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAkCAYAAAD/yagrAAAE60lEQVR4AWJwL/AB9GIWvI0jURz/L1NomZmZP8p9kWNmhnIbKPdomZmZGcJgO7QsWMbce55Yl11t47FbVdKTYpjOr/+H4y4Z/MpYeJVV8KVvokFRylq9osKfVtGQ/NHyPl2CbNVGwau2oOlmgUDJtDJGzxtvvIA3vRH+7IgeA0VtYhQBtKPlToFgC6RY58aggfwLNKhr0Zry2NnPrpIM2YGW2+UBG1IEmdGVJEVXE+hQXt8joKhLjdGVZHd7TSD9DHmT3J1dheroSF4fhnvUVQwbZx9UOnHSzQjkTN0tIG+8hFdbxet4PQOG4WqJwN1hFVb+xUBmCblxvxRkIE+Q+Yf0T31NSrp4/RV4FhHgoSTchQRZBK4D1+Fe2q2g8CYXU6buQyNDaiZKZhn0IYXHVwbkRQydHyawOAGGisa/o3DvI/jF3QKKiuAy+LKs5CvaXMLdeXb35wbkKTjmReDZHysCBosWJqN7r0jZ/VfgXtIlUNQnVpK7D4nNJSC5BHGi1d108Ppr8MxlF0cJqBSyFJaUfUnvHLyO4cttgaI+NhGB7HE0MaSUks/gU5vwe1gv5tfhmUmAhxME8jbIUtiEDus+fhmDJlgCRY0ylZRZhybKWtNinmYlH9NvL5puO3m9UHOkgzb3xuF5HCkDyhYiSwrYVfQPTpYChTc+E35tG9VJBjGFFNmtVlNMDnjzbx0EBpKq1eTeh2awbArBRuHadBWu6WVB4U/NITfuobYoCZl7QL//wDtr+nTmsgzQh2Kwgtz7QAZWFeGw/RI8s94Kigp1PvzZg2i9x11FDtKn/oZCoZdZxhaAXmG4/ohJKHudLE1Gyu66DOfs10BRR5CU3TKQIrtzj9BAkF991dsMslTZEClLsI+jFmANZYFAdAJl9QG03jWH9GrcFh9QTP4Of6GfJGSpsv1J2aoEKRuWCANNJNqOFAaPAW36rVRMCjVf6ZCtqYF2p6Asxg5mWK6tQamY9RCs8z1wF+FxTR5UqYT/3GC7oCkMHcjxKguq6cnl+Egf2whip3C9Yu56jk+GXXOtv1XIa8L1f3AFkHe9az83AmNanwV/bhfa5JKJ3n1slCUL8dk7CNfvVFMfySRThoxbK7fh18tTZXI2QeySLk88IRGsbHkqQj6wUJ72G5CloCXKZrdbLPgVMgVfQMq5m97bfQWOOeVbaK02nSA2ofn2y662UJE47horLZTe38oDjdxQUhmawocxa0OJ5hXjnZE4w1y0uc/iULKGfk+xNuZxI/BnjhFs+THPq4phmTsbeYPXRjFsJJ+NSMlnInHkxrwzGDjR3uBcG1/B/b/TwZkhubb6tP2oVfTAD2G4kw9vYiA2h+zy4GwYxd7S4qGOgd6oqVn6re1DTXiO4e4wPF+yQlF4ZCBfheSPIjJn+ciS/w93qjA6aZYqeQ5D3dTqvuE6GZNTkov5vqsYvLh7j8u1sWWkLIdBQR+q+XdtaKGhJCWBDpkwgSw9gRpKyoNKw6rjCLCDP4yVflSgWFwt3C0HSUo2BTFYX28fVAaWPpDx7wtwjOSSUszawnUT0KTudlfrFQwZ3WNf867CNZQhk/C8kIFUhJLt/O3Jzn62IYNwrUvA8zws4W61CGlDSfugXMz5pJgiSFYyXMYiRXdH4GmyqaR9UHLxzxG41KAwpZxRPN4kRf85Z5I4MvYfFUFGfemJG40AAAAASUVORK5CYII=" }, ]; + /// + /// + /// + protected override void OnInitialized() + { + base.OnInitialized(); + + PreviewFileList.AddRange(new[] + { + new UploadFile { PrevUrl = $"{WebSiteOptions.CurrentValue.AssetRootPath}images/Argo.png" } + }); + } + private Task OnFileChange(UploadFile file) { // 未真正保存文件 @@ -95,12 +112,12 @@ private async Task OnClickToUploadNoUploadList(UploadFile file) private async Task SaveToFile(UploadFile file) { // Server Side 使用 - // Web Assembly 模式下必须使用 webapi 方式去保存文件到服务器或者数据库中 + // Web Assembly 模式下必须使用 WebApi 方式去保存文件到服务器或者数据库中 // 生成写入文件名称 var ret = false; - if (!string.IsNullOrEmpty(SiteOptions.CurrentValue.WebRootPath)) + if (!string.IsNullOrEmpty(WebSiteOptions.CurrentValue.WebRootPath)) { - var uploaderFolder = Path.Combine(SiteOptions.CurrentValue.WebRootPath, $"images{Path.DirectorySeparatorChar}uploader"); + var uploaderFolder = Path.Combine(WebSiteOptions.CurrentValue.WebRootPath, $"images{Path.DirectorySeparatorChar}uploader"); file.FileName = $"{Path.GetFileNameWithoutExtension(file.OriginFileName)}-{DateTimeOffset.Now:yyyyMMddHHmmss}{Path.GetExtension(file.OriginFileName)}"; var fileName = Path.Combine(uploaderFolder, file.FileName); @@ -110,7 +127,7 @@ private async Task SaveToFile(UploadFile file) if (ret) { // 保存成功 - file.PrevUrl = $"./_content/BootstrapBlazor.Shared/images/uploader/{file.FileName}"; + file.PrevUrl = $"{WebSiteOptions.CurrentValue.AssetRootPath}images/uploader/{file.FileName}"; } else { diff --git a/src/BootstrapBlazor.Shared/Components/Samples/WinBoxes.razor b/src/BootstrapBlazor.Shared/Components/Samples/WinBoxes.razor index 06d273eb5a5..3bbf3de6f99 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/WinBoxes.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/WinBoxes.razor @@ -1,6 +1,7 @@ @page "/win-box" @inject IStringLocalizer Localizer @inject IStringLocalizer LocalizerFoo +@inject IOptionsMonitor WebsiteOption

@Localizer["WinBoxTitle"]

@Localizer["WinBoxDescription"]

@@ -56,7 +57,7 @@ private WinBoxService? WinBoxService { get; set; }

通过 WinBoxOption 参数 Icon 设置

- 
new WinBoxOption() { Icon = "./_content/BootstrapBlazor.Shared/images/Argo-C.png" }
+ 
new WinBoxOption() { Icon = "@WebsiteOption.CurrentValue.GetAssetUrl("images/Argo-C.png")" }

通过服务方法 WinBoxService 实例方法

[Inject]
@@ -66,7 +67,7 @@ private WinBoxService? WinBoxService { get; set; }
 private async Task SetIcon()
 {
     // 提前保持弹窗 WinBoxOption 实例
-    option.Icon = "./_content/BootstrapBlazor.Shared/images/Argo-C.png";
+    option.Icon = "@WebsiteOption.CurrentValue.GetAssetUrl("images/Argo-C.png")";
     await WinBoxService.setIcon(option.Id);
 }
 diff --git a/src/BootstrapBlazor.Shared/Data/WebsiteOptions.cs b/src/BootstrapBlazor.Shared/Data/WebsiteOptions.cs index ea60acee543..3fe2b71d040 100644 --- a/src/BootstrapBlazor.Shared/Data/WebsiteOptions.cs +++ b/src/BootstrapBlazor.Shared/Data/WebsiteOptions.cs @@ -88,10 +88,10 @@ public class WebsiteOptions public string? ContentRootPath { get; set; } /// - /// 获得/设置 资源文件根目录 + /// 获得/设置 资源文件根目录 默认值为 "./_content/BootstrapBlazor.Shared/" /// [NotNull] - public string? AssetRootPath { get; set; } + public string? AssetRootPath { get; set; } = "./_content/BootstrapBlazor.Shared/"; /// /// 获得/设置 脚本根路径 @@ -165,4 +165,11 @@ private IConfiguration GetConfiguration(string jsonFileName) .AddJsonStream(res) .Build(); } + + /// + /// 拼接静态资源文件路径 + /// + /// + /// + public string? GetAssetUrl(string url) => $"{AssetRootPath}{url}"; } From bd81b454e4bdb0113416f3a0fe3f4b4dbb2b8fdc Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Mon, 2 Dec 2024 13:19:47 +0800 Subject: [PATCH 09/26] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=AD=A3=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E8=B5=84=E6=BA=90=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/Tutorials/DrawingApp.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor b/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor index 94874259839..0209a418626 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor @@ -1,8 +1,8 @@ @page "/tutorials/drawing" @inject MessageService MessageService @inject DownloadService DownloadService -@inherits BootstrapModuleComponentBase -@attribute [JSModuleAutoLoader("../../_content/BootstrapBlazor.Shared/Components/Samples/Tutorials/DrawingApp.razor.js")] +@inherits WebSiteModuleComponentBase +@attribute [JSModuleAutoLoader("Samples/Tutorials/DrawingApp.razor.js")]
From dfb21f98f50893a6255158566da4a6c8bbec7a92 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Mon, 2 Dec 2024 13:37:44 +0800 Subject: [PATCH 10/26] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Pages/Localization.razor | 2 +- .../Components/Samples/AutoFills.razor | 9 +++++---- .../Components/Samples/InputGroups.razor | 3 ++- .../Components/Samples/SelectTables.razor | 3 ++- .../Components/Samples/Selects.razor | 3 ++- .../Components/Samples/Table/TablesColumn.razor | 2 +- .../Components/Samples/Table/TablesExcel.razor | 3 ++- src/BootstrapBlazor.Shared/Data/Foo.cs | 8 -------- src/BootstrapBlazor.Shared/Data/WebsiteOptions.cs | 7 +++++++ src/BootstrapBlazor.Shared/Locales/en-US.json | 3 +-- src/BootstrapBlazor.Shared/Locales/zh-CN.json | 3 +-- 11 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Components/Pages/Localization.razor b/src/BootstrapBlazor.Shared/Components/Pages/Localization.razor index 8c5a857b0d6..f395c7f3f35 100644 --- a/src/BootstrapBlazor.Shared/Components/Pages/Localization.razor +++ b/src/BootstrapBlazor.Shared/Components/Pages/Localization.razor @@ -9,7 +9,7 @@
@Localizer["T1"] @Localizer["T2"]
-
@Localizer["T3"] wasm @Localizer["T4"] en，@Localizer["T5"]
+
@Localizer["T3"] wasm @Localizer["T4"] en
@((MarkupString)Localizer["LocalizationFileDesc"].Value)
 diff --git a/src/BootstrapBlazor.Shared/Components/Samples/AutoFills.razor b/src/BootstrapBlazor.Shared/Components/Samples/AutoFills.razor index 8fe89f96a1b..41487ad5d9b 100644 --- a/src/BootstrapBlazor.Shared/Components/Samples/AutoFills.razor +++ b/src/BootstrapBlazor.Shared/Components/Samples/AutoFills.razor @@ -1,5 +1,6 @@ @page "/auto-fill" @inject IStringLocalizer Localizer +@inject IOptionsMonitor WebsiteOption

@Localizer["Title"]

@Localizer["Description"]

@@ -13,7 +14,7 @@ - + @@ -33,7 +34,7 @@