Skip to content

fix(DateTimePicker): body defaulting to current month #4357

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 6 commits into from
Sep 27, 2024
Merged

fix(DateTimePicker): body defaulting to current month #4357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
551d4a6
adjusting single view mode to display current date instead of previou…
eramosr16 Sep 25, 2024
8312a31
Merge branch 'main' into bugfix/fixing-single-view-mode-to-display-cu…
ArgoZhang Sep 26, 2024
c46d9ba
Merge branch 'main' into bugfix/fixing-single-view-mode-to-display-cu…
ArgoZhang Sep 27, 2024
cb5aab5
doc: 代码格式化
ArgoZhang Sep 27, 2024
6e31f75
refactor: 更新变量名称
ArgoZhang Sep 27, 2024
1fa394e
doc: 代码格式化
ArgoZhang Sep 27, 2024
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
14 changes: 7 additions & 7 deletions src/BootstrapBlazor/Components/DateTimeRange/DateTimeRange.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@
</div>
}
<CascadingValue Value="this" IsFixed="true">
<DatePickerBody Value="@StartValue" ValueChanged="UpdateValue" OnDateChanged="OnStartDateChanged"
DateFormat="@DateFormat" TimeFormat="@TimeFormat" ViewMode="ViewMode"
ShowLunar="ShowLunar" ShowSolarTerm="ShowSolarTerm" ShowFestivals="ShowFestivals" ShowHolidays="ShowHolidays"
ShowRightButtons="@_showRightButtons" MaxValue="MaxValue" MinValue="MinValue">
</DatePickerBody>
@if (RenderMode == DateTimeRangeRenderMode.Double)
{
<DatePickerBody Value="@EndValue" ValueChanged="UpdateValue" OnDateChanged="OnEndDateChanged"
<DatePickerBody Value="@StartValue" ValueChanged="UpdateValue" OnDateChanged="OnStartDateChanged"
DateFormat="@DateFormat" TimeFormat="@TimeFormat" ViewMode="ViewMode"
ShowLunar="ShowLunar" ShowSolarTerm="ShowSolarTerm" ShowFestivals="ShowFestivals" ShowHolidays="ShowHolidays"
ShowLeftButtons="false" MaxValue="MaxValue" MinValue="MinValue">
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"
ShowLeftButtons="@_showLeftButtons" MaxValue="MaxValue" MinValue="MinValue">
</DatePickerBody>
</CascadingValue>
</div>
<div class="picker-panel-footer">
Expand Down
4 changes: 2 additions & 2 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 @@ -270,7 +270,7 @@ public bool AllowNull
.AddClass("disabled", IsDisabled)
.Build();

private bool _showRightButtons = false;
private bool _showLeftButtons = false;

/// <summary>
/// <inheritdoc/>
Expand All @@ -297,7 +297,7 @@ protected override void OnInitialized()
}
}

_showRightButtons = RenderMode == DateTimeRangeRenderMode.Single;
_showLeftButtons = RenderMode == DateTimeRangeRenderMode.Single;
}

/// <summary>
Expand Down