From 6402b56db1bdad23b40a9a1ec27b348832f59365 Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Wed, 12 Oct 2022 17:30:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20DateTimePicker=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor.Shared/Samples/DateTimePickers.razor   | 4 ++--
 .../Components/DateTimePicker/DateTimePicker.razor         | 5 ++---
 .../Components/DateTimePicker/DateTimePicker.razor.cs      | 7 +++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/BootstrapBlazor.Shared/Samples/DateTimePickers.razor b/src/BootstrapBlazor.Shared/Samples/DateTimePickers.razor
index ab80e29b7..dbf94a519 100644
--- a/src/BootstrapBlazor.Shared/Samples/DateTimePickers.razor
+++ b/src/BootstrapBlazor.Shared/Samples/DateTimePickers.razor
@@ -6,7 +6,7 @@
 
 <DemoBlock Title="@Localizer["Block1Title"]" Introduction="@Localizer["Block1Intro"]" Name="Normal">
     <div style="width: 320px;">
-        <DatePickerBody IsShown="true" ValueChanged="@DateValueChanged" ShowFooter="false" />
+        <DatePickerBody ValueChanged="@DateValueChanged" ShowFooter="false" />
     </div>
     <BlockLogger @ref="DateLogger" class="mt-3" />
 </DemoBlock>
@@ -140,7 +140,7 @@
     <div class="row">
         <div class="col-12">
             <DateTimePicker TValue="DateTime" ViewMode="DatePickerViewMode.Date" Value="@(DateTime.Today.AddDays(3 - DateTime.Today.Day))"
-                            AutoClose="true" />
+                            AutoClose="false" />
         </div>
     </div>
 </DemoBlock>
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor
index 41b47f4ad..314546443 100644
--- a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor
+++ b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor
@@ -6,8 +6,8 @@
 {
     <BootstrapLabel required="@Required" for="@Id" ShowLabelTooltip="ShowLabelTooltip" Value="@DisplayText" />
 }
-<div @attributes="@AdditionalAttributes" tabindex="@TabIndexString" id="@Id" class="@ClassString">
-    <input readonly class="@InputClassName" value="@CurrentValueAsString" placeholder="@PlaceholderString" disabled="@Disabled" data-bs-toggle="@Constants.DropdownToggleString" data-bs-placement="@PlacementString" data-bs-dropdown=".picker-panel" data-bs-dismiss=".picker-panel-link-btn" />
+<div @attributes="@AdditionalAttributes" tabindex="@TabIndexString" id="@Id" class="@ClassString" data-bb-auto-close="@AutoCloseString" data-bb-dropdown=".picker-panel" data-bb-dismiss=".picker-panel-link-btn">
+    <input readonly class="@InputClassName" value="@CurrentValueAsString" placeholder="@PlaceholderString" disabled="@Disabled" data-bs-toggle="@Constants.DropdownToggleString" data-bs-placement="@PlacementString" />
     <i class="@DateTimePickerIconClassString"></i>
     <DatePickerBody @bind-Value="@ComponentValue" AllowNull="@AllowNull" ShowSidebar="@ShowSidebar"
                     DateFormat="@DateFormat"
@@ -15,4 +15,3 @@
                     AutoClose="AutoClose" ViewMode="@ViewMode">
     </DatePickerBody>
 </div>
-
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
index 8d1a12289..29a9b5503 100644
--- a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
+++ b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
@@ -9,6 +9,7 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// DateTimePicker 组件基类
 /// </summary>
+[JSModuleAutoLoader("dropdown", ModuleName = "Dropdown")]
 public sealed partial class DateTimePicker<TValue>
 {
     /// <summary>
@@ -43,6 +44,8 @@ public sealed partial class DateTimePicker<TValue>
 
     private string? TabIndexString => ValidateForm != null ? "0" : null;
 
+    private string? AutoCloseString => AutoClose ? "true" : null;
+
     /// <summary>
     /// 获得 Placeholder 显示字符串
     /// </summary>
@@ -247,9 +250,9 @@ public sealed partial class DateTimePicker<TValue>
         {
             await OnDateTimeChanged(Value);
         }
-        if (AutoClose)
+        if (AutoClose && Module != null)
         {
-            await JSRuntime.InvokeVoidByIdAsync(identifier: "bb.Dropdown.invoke", Id, "hide");
+            await Module.InvokeVoidAsync($"{ModuleName}.execute", Id, "hide");
         }
     }
 }
-- 
Gitee