Skip to content

Commit 7f9ea1d

Browse files
authored
Merge branch 'main' into main
2 parents ff71403 + a704298 commit 7f9ea1d

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

.github/ISSUE_TEMPLATE/10_bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ body:
7474
- NET8.0
7575
- NET7.0
7676
- NET6.0
77-
default: 1
77+
default: 0
7878
validations:
7979
required: true
8080
- type: textarea

src/BootstrapBlazor/BootstrapBlazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.1.5-beta01</Version>
4+
<Version>9.1.5</Version>
55
</PropertyGroup>
66

77
<ItemGroup>

src/BootstrapBlazor/Components/Layout/Layout.razor.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@
9595
.layout-menu {
9696
height: 100%;
9797
}
98+
99+
.layout-main {
100+
width: 1%;
101+
min-width: 0;
102+
}
98103
}
99104

100105
.layout-menu {
@@ -125,8 +130,6 @@
125130
padding: 1rem;
126131
position: relative;
127132
flex: 1;
128-
width: 1%;
129-
min-width: 0;
130133

131134
.tabs.tabs-border-card {
132135
box-shadow: none;

src/BootstrapBlazor/Components/Select/SelectTree.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<span class="@AppendClassName"><i class="@DropdownIcon"></i></span>
2121
</div>
2222
<div class="dropdown-menu">
23-
<TreeView TItem="TValue" Items="@Items" ShowIcon="ShowIcon" OnTreeItemClick="OnItemClick" ModelEqualityComparer="@ModelEqualityComparer" CustomKeyAttribute="@CustomKeyAttribute" OnExpandNodeAsync="@OnExpandNodeAsync" />
23+
<TreeView TItem="TValue" Items="@Items" IsReset="IsReset" ShowIcon="ShowIcon" OnTreeItemClick="OnItemClick" ModelEqualityComparer="@ModelEqualityComparer" CustomKeyAttribute="@CustomKeyAttribute" OnExpandNodeAsync="@OnExpandNodeAsync" />
2424
</div>
2525
@if (!IsPopover)
2626
{

src/BootstrapBlazor/Components/Select/SelectTree.razor.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@ public partial class SelectTree<TValue> : IModelEqualityComparer<TValue>
120120
[Parameter]
121121
public bool IsEditable { get; set; }
122122

123+
/// <summary>
124+
/// 获得/设置 页面刷新是否重置已加载数据 默认 false
125+
/// </summary>
126+
[Parameter]
127+
public bool IsReset { get; set; }
128+
123129
[Inject]
124130
[NotNull]
125131
private IStringLocalizer<SelectTree<TValue>>? Localizer { get; set; }

0 commit comments

Comments
 (0)