Skip to content

fix(DateTimeRange): should close popup after click confirm button #5668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 20, 2025
Merged

fix(DateTimeRange): should close popup after click confirm button #5668

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70331dd
refactor: 增加关窗逻辑
ArgoZhang Mar 20, 2025
d923f7b
refactor: 精简代码
ArgoZhang Mar 20, 2025
6ac692b
chore: bump version 9.5.0-beta08
ArgoZhang Mar 20, 2025
386a6bf
refactor: 修复清空按钮不关窗问题
ArgoZhang Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.5.0-beta07</Version>
<Version>9.5.0-beta08</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
<BootstrapLabel required="@Required" for="@Id" ShowLabelTooltip="ShowLabelTooltip" Value="@DisplayText" />
}
<div @attributes="@AdditionalAttributes" tabindex="@TabIndexString" id="@Id" class="@ClassString" data-bb-dropdown=".picker-panel" data-bb-dismiss=".picker-panel-link-btn">
<div @attributes="@AdditionalAttributes" tabindex="@TabIndexString" id="@Id" class="@ClassString" data-bb-dropdown=".picker-panel">
<input readonly="@ReadonlyString" class="@InputClassName" @bind="@CurrentValueAsString" placeholder="@PlaceholderString" disabled="@Disabled" data-bs-toggle="@Constants.DropdownToggleString" data-bs-placement="@PlacementString" data-bs-custom-class="@CustomClassString" @onblur="OnBlur" />
@if (ShowIcon)
{
Expand Down
8 changes: 5 additions & 3 deletions src/BootstrapBlazor/Components/DateTimeRange/DateTimeRange.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
<BootstrapLabel required="@Required" ShowLabelTooltip="ShowLabelTooltip" Value="@DisplayText" />
}
<div @attributes="@AdditionalAttributes" id="@Id" tabindex="0" class="@ClassString" data-bb-dropdown=".datetime-range-body" data-bb-dismiss=".picker-panel-link-btn">
<div @attributes="@AdditionalAttributes" id="@Id" tabindex="0" class="@ClassString" data-bb-dropdown=".datetime-range-body">
<div class="dropdown-toggle datetime-range-control" data-bs-toggle="@Constants.DropdownToggleString" data-bs-placement="@PlacementString" data-bs-custom-class="@CustomClassString">
<div class="position-relative">
<i class="@DateTimePickerIconClassString"></i>
Expand Down Expand Up @@ -37,13 +37,15 @@
{
<DatePickerBody Value="@StartValue" ValueChanged="UpdateValue" OnDateChanged="OnStartDateChanged"
DateFormat="@DateFormat" TimeFormat="@TimeFormat" ViewMode="ViewMode"
ShowLunar="ShowLunar" ShowSolarTerm="ShowSolarTerm" ShowFestivals="ShowFestivals" ShowHolidays="ShowHolidays"
ShowLunar="ShowLunar" ShowSolarTerm="ShowSolarTerm"
ShowFestivals="ShowFestivals" ShowHolidays="ShowHolidays"
ShowRightButtons="false" MaxValue="MaxValue" MinValue="MinValue">
</DatePickerBody>
}
<DatePickerBody Value="@EndValue" ValueChanged="UpdateValue" OnDateChanged="OnEndDateChanged"
DateFormat="@DateFormat" TimeFormat="@TimeFormat" ViewMode="ViewMode"
ShowLunar="ShowLunar" ShowSolarTerm="ShowSolarTerm" ShowFestivals="ShowFestivals" ShowHolidays="ShowHolidays"
ShowLunar="ShowLunar" ShowSolarTerm="ShowSolarTerm"
ShowFestivals="ShowFestivals" ShowHolidays="ShowHolidays"
ShowLeftButtons="@_showLeftButtons" MaxValue="MaxValue" MinValue="MinValue">
</DatePickerBody>
</CascadingValue>
Expand Down
1 change: 1 addition & 0 deletions src/BootstrapBlazor/Components/DateTimeRange/DateTimeRange.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ private async Task ClickConfirmButton()
{
EditContext.NotifyFieldChanged(FieldIdentifier.Value);
}
await InvokeVoidAsync("hide", Id);
}

/// <summary>
Expand Down