From 06b67ca0f068749b2241c3ef5098731cf3b08b03 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 20 Nov 2023 11:12:14 +0800 Subject: [PATCH] =?UTF-8?q?*=20fix:=20=E4=BF=AE=E5=A4=8DTable=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=9C=A8=E6=98=8E=E7=BB=86=E8=A1=8C=E5=8C=85=E5=90=ABTable?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=97=B6=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/LayoutPages.razor | 8 ++--- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- .../Components/Layout/Layout.razor.scss | 34 +++++++++---------- .../Components/Table/Table.razor.js | 2 +- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/LayoutPages.razor b/src/BootstrapBlazor.Server/Components/Samples/LayoutPages.razor index 340eb15fb..b2556ab9b 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/LayoutPages.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/LayoutPages.razor @@ -10,8 +10,7 @@

@Localizer["P1"] Layout @Localizer["P2"] dotnet new bbapp @Localizer["P3"] Visual Studio 2019 @Localizer["P4"] @Localizer["P5"] @Localizer["P6"] [@Localizer["P7"]]

- @Localizer["P8"]： -
+ @Localizer["P8"]： Layout @Localizer["P9"] @Localizer["P10"] @Localizer["P11"] @Localizer["P12"] @Localizer["P13"] AdditionalAssemblies @Localizer["P14"] [@Localizer["P15"]]
@@ -51,7 +50,7 @@

@Localizer["P27"]

@Localizer["P28"] - +
@@ -61,8 +60,7 @@

@Localizer["P29"]

@Localizer["P30"] @Localizer["P32"] @Localizer["P33"]
-
-
@Localizer["P34"]
+
@Localizer["P34"]
} diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index e894f6629..1a5f21b2f 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 8.0.1 + 8.0.2 diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss index a1d6ee1ec..de6f20237 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss @@ -1,21 +1,21 @@ .layout { - -bb-layout-header-height: #{$bb-layout-header-height}; - -bb-layout-header-backgound: #{$bb-layout-header-backgound}; - -bb-layout-headerbar-backgound: #{$bb-layout-headerbar-backgound}; - -bb-layout-headerbar-border-color: #{$bb-layout-headerbar-border-color}; - -bb-layout-footer-backgound: #{$bb-layout-footer-backgound}; - -bb-layout-footer-height: #{$bb-layout-footer-height}; - -bb-layout-user-height: #{$bb-layout-user-height}; - -bb-layout-sidebar-width: #{$bb-layout-sidebar-width}; - -bb-layout-sidebar-collapse-width: #{$bb-layout-sidebar-collapse-width}; - -bb-layout-sidebar-banner-background: #{$bb-layout-sidebar-banner-background}; - -bb-layout-sidebar-scrollbar-background: #{$bb-layout-sidebar-scrollbar-background}; - -bb-layout-sidebar-backgound: #{$bb-layout-sidebar-backgound}; - -bb-layout-sidebar-color: #{$bb-layout-sidebar-color}; - -bb-layout-title-color: #{$bb-layout-title-color}; - -bb-layout-title-margin-left: #{$bb-layout-title-margin-left}; - -bb-layout-banner-font-size: #{$bb-layout-banner-font-size}; - -bb-layout-banner-logo-width: #{$bb-layout-banner-logo-width}; + --bb-layout-header-height: #{$bb-layout-header-height}; + --bb-layout-header-backgound: #{$bb-layout-header-backgound}; + --bb-layout-headerbar-backgound: #{$bb-layout-headerbar-backgound}; + --bb-layout-headerbar-border-color: #{$bb-layout-headerbar-border-color}; + --bb-layout-footer-backgound: #{$bb-layout-footer-backgound}; + --bb-layout-footer-height: #{$bb-layout-footer-height}; + --bb-layout-user-height: #{$bb-layout-user-height}; + --bb-layout-sidebar-width: #{$bb-layout-sidebar-width}; + --bb-layout-sidebar-collapse-width: #{$bb-layout-sidebar-collapse-width}; + --bb-layout-sidebar-banner-background: #{$bb-layout-sidebar-banner-background}; + --bb-layout-sidebar-scrollbar-background: #{$bb-layout-sidebar-scrollbar-background}; + --bb-layout-sidebar-backgound: #{$bb-layout-sidebar-backgound}; + --bb-layout-sidebar-color: #{$bb-layout-sidebar-color}; + --bb-layout-title-color: #{$bb-layout-title-color}; + --bb-layout-title-margin-left: #{$bb-layout-title-margin-left}; + --bb-layout-banner-font-size: #{$bb-layout-banner-font-size}; + --bb-layout-banner-logo-width: #{$bb-layout-banner-logo-width}; display: flex; height: 100%; width: 100%; diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.js b/src/BootstrapBlazor/Components/Table/Table.razor.js index bcc88532d..5e10b60df 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.js +++ b/src/BootstrapBlazor/Components/Table/Table.razor.js @@ -559,7 +559,7 @@ export function sort(id) { export function load(id, method) { const table = Data.get(id) - const loader = table.el.querySelector('.table-loader') + const loader = document.querySelector('#' + table.el.id + '>.table-loader') if (method === 'show') { loader.classList.add('show') } else { -- Gitee