Skip to content

feat(SelectRegion): update switch board logic #600

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
ArgoZhang merged 5 commits into from
Oct 15, 2025
Merged

feat(SelectRegion): update switch board logic #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ad943f
refactor: 移除 JSObjectReference 初始化
ArgoZhang Oct 14, 2025
b1e9a88
refactor: 更新细节
ArgoZhang Oct 15, 2025
fae0a2b
fix: 修复脚本错误
ArgoZhang Oct 15, 2025
78eee90
chore: 增加全局命名空间
ArgoZhang Oct 15, 2025
9351a3e
refactor: 更新样式
ArgoZhang Oct 15, 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
1 change: 1 addition & 0 deletions src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
</ItemGroup>

<ItemGroup>
<Using Include="Microsoft.AspNetCore.Components" />
<Using Include="Microsoft.JSInterop" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/components/BootstrapBlazor.Region/Components/SelectRegion.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@namespace BootstrapBlazor.Components
@inherits PopoverSelectBase<string>
@attribute [JSModuleAutoLoader("./_content/BootstrapBlazor.Region/Components/SelectRegion.razor.js", JSObjectReference = true)]
@attribute [JSModuleAutoLoader("./_content/BootstrapBlazor.Region/Components/SelectRegion.razor.js")]

@if (IsShowLabel)
{
Expand Down
22 changes: 10 additions & 12 deletions src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
// Website: https://www.blazor.zone or https://argozhang.github.io/

using Microsoft.AspNetCore.Components;

namespace BootstrapBlazor.Components;

/// <summary>
Expand Down Expand Up @@ -177,11 +175,11 @@ private void ResetValue()

private async Task OnClearValue()
{
_provinceValue = "";
_cityValue = "";
_provinceValue = null;
_cityValue = null;
_countyValue = new();
_detailValue = "";
CurrentValue = "";
_detailValue = null;
CurrentValue = null;

_currentViewMode = RegionViewMode.Province;

Expand Down Expand Up @@ -226,6 +224,9 @@ private HashSet<string> GetDetails()
private void OnClickProvince(string value)
{
_provinceValue = value;
_cityValue = null;
_countyValue = new();
_detailValue = null;
_currentViewMode = RegionViewMode.City;

CurrentValue = _provinceValue;
Expand All @@ -234,6 +235,8 @@ private void OnClickProvince(string value)
private void OnClickCity(string value)
{
_cityValue = value;
_countyValue = new();
_detailValue = null;
_currentViewMode = RegionViewMode.County;

CurrentValue = $"{_provinceValue}-{_cityValue}";
Expand All @@ -242,6 +245,7 @@ private void OnClickCity(string value)
private void OnClickCounty(CountyItem item)
{
_countyValue = item;
_detailValue = null;
_currentViewMode = RegionViewMode.Detail;

CurrentValue = $"{_provinceValue}-{_cityValue}-{_countyValue.Name}";
Expand All @@ -259,22 +263,16 @@ private async Task OnClickDetail(string value)
private void OnSwitchProvinceView()
{
_currentViewMode = RegionViewMode.Province;
_cityValue = "";
_countyValue = new();
_detailValue = "";
}

private void OnSwitchCityView()
{
_currentViewMode = RegionViewMode.City;
_countyValue = new();
_detailValue = "";
}

private void OnSwitchCountyView()
{
_currentViewMode = RegionViewMode.County;
_detailValue = "";
}

private void OnSwitchDetailView()
Expand Down
6 changes: 3 additions & 3 deletions src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
color: #777;
}

.bb-region-body ul li.active {
background-color: #e3e3e3;
.bb-region-body ul li:hover {
background-color: #e9ecef;
color: #000;
}

.bb-region-body ul li:hover {
.bb-region-body ul li.active {
background-color: #e3e3e3;
color: #000;
}
2 changes: 1 addition & 1 deletion src/components/BootstrapBlazor.Region/Components/SelectRegion.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ export function dispose(id) {

const { popover } = region;
if (popover) {
Popover.dispose(select.popover);
Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (bug_risk): Corrected Popover.dispose argument to use the correct variable.

Please verify that disposal now works as expected and no new issues have been introduced.

Popover.dispose(popover);
}
}