From 787b21192ea7d6d18db23dc02a87786c53b6b4b7 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 16 Aug 2021 22:28:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20DateTimePicker?= =?UTF-8?q?=20=E7=BB=84=E4=BB=B6=E5=BC=80=E5=90=AF=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E6=97=B6=E4=BB=8D=E7=84=B6=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A1=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Popover/Popover.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/BootstrapBlazor/Components/Popover/Popover.js b/src/BootstrapBlazor/Components/Popover/Popover.js index 9047ea6cc..98bf52dce 100644 --- a/src/BootstrapBlazor/Components/Popover/Popover.js +++ b/src/BootstrapBlazor/Components/Popover/Popover.js @@ -43,6 +43,10 @@ toggle: 'datetime-picker', placement: placement }) + .on('show.bs.popover', function () { + var disabled = $(this).parent().hasClass('disabled'); + return !disabled; + }) .on('inserted.bs.popover', function () { var pId = this.getAttribute('aria-describedby'); if (pId) { -- Gitee From 45f72189b5d44220eb9497b884dd4e69aa21ede1 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 16 Aug 2021 22:28:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/Samples/DateTimePickers.razor | 5 ++++- .../Pages/Samples/DateTimePickers.razor.cs | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor b/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor index 62872f526..e92879fa4 100644 --- a/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor +++ b/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor @@ -99,9 +99,12 @@
-
+
+
+ +
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor.cs index adf8e42aa..e2f10152a 100644 --- a/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor.cs +++ b/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor.cs @@ -36,6 +36,8 @@ namespace BootstrapBlazor.Shared.Pages private DateTime? BindNullValue { get; set; } + private bool IsDisabled { get; set; } + /// /// /// -- Gitee From 0c98506eb6e74e91e30f6ca7cc11010ee672cda0 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 16 Aug 2021 22:35:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor | 2 +- .../Pages/Samples/DateTimePickers.razor.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor b/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor index e92879fa4..d50fa093b 100644 --- a/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor +++ b/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor @@ -100,7 +100,7 @@
- +
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor.cs index e2f10152a..9d4b115cd 100644 --- a/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor.cs +++ b/src/BootstrapBlazor.Shared/Pages/Samples/DateTimePickers.razor.cs @@ -36,7 +36,7 @@ namespace BootstrapBlazor.Shared.Pages private DateTime? BindNullValue { get; set; } - private bool IsDisabled { get; set; } + private bool IsDisabled { get; set; } = true; /// /// -- Gitee