Skip to content

Commit f42d4ac

Browse files
committed
Merge branch 'main' into feat-upload
2 parents 5639bd0 + c5be0c7 commit f42d4ac

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.fork/custom-commands.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
{
66
"action" : {
7-
"script" : "git branch -d localBranchName\ngit push gitee.com --delete refs/heads/${ref}",
7+
"script" : "git branch -d ${ref}\ngit push gitee.com --delete refs/heads/${ref}",
88
"showOutput" : false,
99
"type" : "sh",
1010
"waitForExit" : true

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.1" />
6363
<PackageReference Include="BootstrapBlazor.SmilesDrawer" Version="9.0.2" />
6464
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.2" />
65-
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.2" />
65+
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.3" />
6666
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.3" />
67-
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.3" />
67+
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.4" />
6868
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.4" />
6969
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
7070
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />

src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/OnlineSheet.razor.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ await ToastService.Show(new ToastOption()
7777
ForceDelay = true
7878
});
7979

80-
DispatchService.UnSubscribe(Dispatch);
81-
8280
await _sheetExcel.PushDataAsync(entry.Entry.Data);
8381
}
8482
}

0 commit comments

Comments
 (0)