Skip to content

Commit 819ca93

Browse files
ArgoZhangArgoZhang
committed
Merge branch 'master' into feat-TouchSocket
2 parents d691979 + 8b14e08 commit 819ca93

16 files changed

Lines changed: 445 additions & 158 deletions

File tree

‎BootstrapBlazor.Extensions.sln‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.11.35303.130
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components", "{FF1089BE-C704-4374-B629-C57C08E1798F}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.BaiduMap", "src\components\BootstrapBlazor.BaiduMap\BootstrapBlazor.BaiduMap.csproj", "{22C6D47A-F770-4813-B363-F2C90455E870}"
9-
EndProject
108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.BarcodeGenerator", "src\components\BootstrapBlazor.BarcodeGenerator\BootstrapBlazor.BarcodeGenerator.csproj", "{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD}"
119
EndProject
1210
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.FileSystem", "src\components\BootstrapBlazor.FileSystem\BootstrapBlazor.FileSystem.csproj", "{203B9DE4-201C-4223-AD0E-4823777AB9A7}"
@@ -150,8 +148,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{FF8B3A19
150148
EndProject
151149
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Middleware", "src\middleware\BootstrapBlazor.Middleware\BootstrapBlazor.Middleware.csproj", "{2D783293-CEBD-4365-B8A1-0F9E76D73295}"
152150
EndProject
153-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.WebSerialPort", "src\components\BootstrapBlazor.WebSerialPort\BootstrapBlazor.WebSerialPort.csproj", "{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}"
154-
EndProject
155151
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Html2Pdf.Select", "src\components\BootstrapBlazor.Html2Pdf.Select\BootstrapBlazor.Html2Pdf.Select.csproj", "{11FD9DF2-3F3F-4AF1-8C85-446190F7D887}"
156152
EndProject
157153
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.SvgEditor", "src\components\BootstrapBlazor.SVGEditor\BootstrapBlazor.SvgEditor.csproj", "{29E47F4A-CE03-42B5-BDAA-FB4B40D4C897}"
@@ -192,8 +188,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.PdfViewer",
192188
EndProject
193189
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Vditor", "src\components\BootstrapBlazor.Vditor\BootstrapBlazor.Vditor.csproj", "{D417E1B9-D146-4983-81D0-79F3193B322B}"
194190
EndProject
195-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.TouchSocket", "src\extensions\BootstrapBlazor.TouchSocket\BootstrapBlazor.TouchSocket.csproj", "{FD23CEA1-78EB-85D7-8EDF-047657355B52}"
196-
EndProject
197191
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.OfficeViewer", "src\components\BootstrapBlazor.OfficeViewer\BootstrapBlazor.OfficeViewer.csproj", "{2436940C-5920-D801-8A81-721F4C20A355}"
198192
EndProject
199193
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestTouchSocket", "test\UnitTestTouchSocket\UnitTestTouchSocket.csproj", "{23D21A45-64A3-704C-27C0-73399048ED03}"
@@ -206,10 +200,6 @@ Global
206200
Release|Any CPU = Release|Any CPU
207201
EndGlobalSection
208202
GlobalSection(ProjectConfigurationPlatforms) = postSolution
209-
{22C6D47A-F770-4813-B363-F2C90455E870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
210-
{22C6D47A-F770-4813-B363-F2C90455E870}.Debug|Any CPU.Build.0 = Debug|Any CPU
211-
{22C6D47A-F770-4813-B363-F2C90455E870}.Release|Any CPU.ActiveCfg = Release|Any CPU
212-
{22C6D47A-F770-4813-B363-F2C90455E870}.Release|Any CPU.Build.0 = Release|Any CPU
213203
{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
214204
{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
215205
{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -446,10 +436,6 @@ Global
446436
{2D783293-CEBD-4365-B8A1-0F9E76D73295}.Debug|Any CPU.Build.0 = Debug|Any CPU
447437
{2D783293-CEBD-4365-B8A1-0F9E76D73295}.Release|Any CPU.ActiveCfg = Release|Any CPU
448438
{2D783293-CEBD-4365-B8A1-0F9E76D73295}.Release|Any CPU.Build.0 = Release|Any CPU
449-
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
450-
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
451-
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
452-
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}.Release|Any CPU.Build.0 = Release|Any CPU
453439
{11FD9DF2-3F3F-4AF1-8C85-446190F7D887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
454440
{11FD9DF2-3F3F-4AF1-8C85-446190F7D887}.Debug|Any CPU.Build.0 = Debug|Any CPU
455441
{11FD9DF2-3F3F-4AF1-8C85-446190F7D887}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -530,10 +516,6 @@ Global
530516
{D417E1B9-D146-4983-81D0-79F3193B322B}.Debug|Any CPU.Build.0 = Debug|Any CPU
531517
{D417E1B9-D146-4983-81D0-79F3193B322B}.Release|Any CPU.ActiveCfg = Release|Any CPU
532518
{D417E1B9-D146-4983-81D0-79F3193B322B}.Release|Any CPU.Build.0 = Release|Any CPU
533-
{FD23CEA1-78EB-85D7-8EDF-047657355B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
534-
{FD23CEA1-78EB-85D7-8EDF-047657355B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
535-
{FD23CEA1-78EB-85D7-8EDF-047657355B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
536-
{FD23CEA1-78EB-85D7-8EDF-047657355B52}.Release|Any CPU.Build.0 = Release|Any CPU
537519
{2436940C-5920-D801-8A81-721F4C20A355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
538520
{2436940C-5920-D801-8A81-721F4C20A355}.Debug|Any CPU.Build.0 = Debug|Any CPU
539521
{2436940C-5920-D801-8A81-721F4C20A355}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -552,7 +534,6 @@ Global
552534
EndGlobalSection
553535
GlobalSection(NestedProjects) = preSolution
554536
{FF1089BE-C704-4374-B629-C57C08E1798F} = {A48E5EAB-6EFB-4A78-810E-A3E79CF749F5}
555-
{22C6D47A-F770-4813-B363-F2C90455E870} = {FF1089BE-C704-4374-B629-C57C08E1798F}
556537
{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD} = {FF1089BE-C704-4374-B629-C57C08E1798F}
557538
{203B9DE4-201C-4223-AD0E-4823777AB9A7} = {FF1089BE-C704-4374-B629-C57C08E1798F}
558539
{3EBD90E6-5237-4BB0-9C14-CC1FC5956A1B} = {FF1089BE-C704-4374-B629-C57C08E1798F}
@@ -615,7 +596,6 @@ Global
615596
{22594AD2-3E36-4984-949C-8B578B402EDE} = {B6A98ADE-D26A-4D0B-8978-AB7AC915F5AE}
616597
{FF8B3A19-60DC-4802-9FA0-9FE670C7D565} = {A48E5EAB-6EFB-4A78-810E-A3E79CF749F5}
617598
{2D783293-CEBD-4365-B8A1-0F9E76D73295} = {BB06AD5B-3F2B-4B59-A135-36AF999A614F}
618-
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E} = {FF1089BE-C704-4374-B629-C57C08E1798F}
619599
{11FD9DF2-3F3F-4AF1-8C85-446190F7D887} = {FF1089BE-C704-4374-B629-C57C08E1798F}
620600
{29E47F4A-CE03-42B5-BDAA-FB4B40D4C897} = {FF1089BE-C704-4374-B629-C57C08E1798F}
621601
{DA2198E1-2CA9-EE53-926B-7950AB4B5EBF} = {FF1089BE-C704-4374-B629-C57C08E1798F}
@@ -636,7 +616,6 @@ Global
636616
{08458CA3-BF81-48E8-870D-9389DC037808} = {FF1089BE-C704-4374-B629-C57C08E1798F}
637617
{4757B038-70E4-40B0-9B73-700EE5632B07} = {FF1089BE-C704-4374-B629-C57C08E1798F}
638618
{D417E1B9-D146-4983-81D0-79F3193B322B} = {FF1089BE-C704-4374-B629-C57C08E1798F}
639-
{FD23CEA1-78EB-85D7-8EDF-047657355B52} = {7B29E81D-92DE-46C8-8EDC-1B48C8F12BC2}
640619
{2436940C-5920-D801-8A81-721F4C20A355} = {FF1089BE-C704-4374-B629-C57C08E1798F}
641620
{23D21A45-64A3-704C-27C0-73399048ED03} = {B6A98ADE-D26A-4D0B-8978-AB7AC915F5AE}
642621
{C8C8F286-4D4C-C5F9-6ADD-C1BCE188E040} = {7B29E81D-92DE-46C8-8EDC-1B48C8F12BC2}

‎src/components/BootstrapBlazor.CherryMarkdown/BootstrapBlazor.CherryMarkdown.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.0.1</Version>
4+
<Version>9.0.3</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎src/components/BootstrapBlazor.CherryMarkdown/Components/CherryMarkdown/CherryMarkdown.razor.cs‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// Website: https://www.blazor.zone or https://argozhang.github.io/
44

55
using Microsoft.AspNetCore.Components;
6+
using System.Globalization;
67

78
namespace BootstrapBlazor.Components;
89

@@ -66,6 +67,25 @@ public partial class CherryMarkdown
6667
[Parameter]
6768
public bool IsViewer { get; set; }
6869

70+
/// <summary>
71+
/// 获取/设置 组件语言
72+
/// </summary>
73+
[Parameter]
74+
public string? Language { get; set; }
75+
76+
/// <summary>
77+
/// <inheritdoc/>
78+
/// </summary>
79+
protected override void OnParametersSet()
80+
{
81+
base.OnParametersSet();
82+
83+
if (string.IsNullOrEmpty(Language))
84+
{
85+
Language = CultureInfo.CurrentUICulture.Name;
86+
}
87+
}
88+
6989
/// <summary>
7090
/// <inheritdoc/>
7191
/// </summary>
@@ -93,7 +113,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
93113
/// </summary>
94114
/// <returns></returns>
95115
protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop,
96-
new { Value, IsSupportMath, IsViewer, Editor = EditorSettings ?? new(), Toolbars = ToolbarSettings ?? new() },
116+
new { Value, IsSupportMath, IsViewer, Locale = Language, Editor = EditorSettings ?? new(), Toolbars = ToolbarSettings ?? new() },
97117
nameof(Upload));
98118

99119
/// <summary>

‎src/components/BootstrapBlazor.CherryMarkdown/Components/CherryMarkdown/CherryMarkdown.razor.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ export async function init(id, invoke, options, callback) {
5858
},
5959
fileUpload: fileUpload
6060
};
61+
62+
if (op.locale) {
63+
op.locale = op.locale.replace('-', '_');
64+
}
65+
6166
const editor = new Cherry(op);
6267
const md = { invoke, editor };
6368
Data.set(id, md);

‎src/components/BootstrapBlazor.DockView/BootstrapBlazor.DockView.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.14</Version>
4+
<Version>9.1.17</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎src/components/BootstrapBlazor.DockView/wwwroot/css/dockview-bb.css‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@
2727
--dv-tabs-and-actions-container-font-size: 12px;
2828
}
2929

30+
.bb-dockview .dockview-theme-light {
31+
--dv-floating-box-shadow: 0px 0px 0px 1px var(--bs-border-color), 0px 6px 12px -3px #25292e0a, 0px 6px 18px 0px #25292e1f;
32+
}
33+
34+
.bb-dockview .dv-resize-container {
35+
border: none;
36+
border-radius: var(--bs-border-radius);
37+
overflow: hidden;
38+
}
39+
3040
.bb-dockview .bb-dockview-panel {
3141
height: 100%;
3242
width: 100%;
@@ -279,4 +289,4 @@
279289

280290
.bb-dockview .bb-overflowHidden {
281291
overflow: hidden;
282-
}
292+
}

‎src/components/BootstrapBlazor.DockView/wwwroot/css/dockview.css‎

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@
292292
--dv-active-sash-color: transparent;
293293
--dv-active-sash-transition-duration: 0.1s;
294294
--dv-active-sash-transition-delay: 0.5s;
295+
box-sizing: border-box;
295296
padding: 10px;
296297
background-color: #ebeced;
297298
--dv-group-view-background-color: #ebeced;
@@ -411,6 +412,7 @@
411412
--dv-tab-margin: 0.5rem 0.25rem;
412413
--dv-tabs-and-actions-container-height: 44px;
413414
--dv-border-radius: 20px;
415+
box-sizing: border-box;
414416
--dv-color-abyss-dark: rgb(11, 6, 17);
415417
--dv-color-abyss: #16121f;
416418
--dv-color-abyss-light: #201d2b;
@@ -515,6 +517,7 @@
515517
--dv-tab-margin: 0.5rem 0.25rem;
516518
--dv-tabs-and-actions-container-height: 44px;
517519
--dv-border-radius: 20px;
520+
box-sizing: border-box;
518521
--dv-drag-over-border: 2px solid rgb(91, 30, 207);
519522
--dv-drag-over-background-color: "";
520523
--dv-group-view-background-color: #f6f5f9;
@@ -1023,6 +1026,63 @@
10231026
pointer-events: none;
10241027
background-color: var(--dv-separator-border);
10251028
}
1029+
.dv-dragged {
1030+
transform: translate3d(0px, 0px, 0px); /* forces tab to be drawn on a separate layer (see https://github.com/microsoft/vscode/issues/18733) */
1031+
}
1032+
1033+
.dv-tab {
1034+
flex-shrink: 0;
1035+
}
1036+
.dv-tab:focus-within, .dv-tab:focus {
1037+
position: relative;
1038+
}
1039+
.dv-tab:focus-within::after, .dv-tab:focus::after {
1040+
position: absolute;
1041+
content: "";
1042+
height: 100%;
1043+
width: 100%;
1044+
top: 0px;
1045+
left: 0px;
1046+
pointer-events: none;
1047+
outline: 1px solid var(--dv-tab-divider-color) !important;
1048+
outline-offset: -1px;
1049+
z-index: 5;
1050+
}
1051+
.dv-tab.dv-tab-dragging .dv-default-tab-action {
1052+
background-color: var(--dv-activegroup-visiblepanel-tab-color);
1053+
}
1054+
.dv-tab.dv-active-tab .dv-default-tab .dv-default-tab-action {
1055+
visibility: visible;
1056+
}
1057+
.dv-tab.dv-inactive-tab .dv-default-tab .dv-default-tab-action {
1058+
visibility: hidden;
1059+
}
1060+
.dv-tab.dv-inactive-tab .dv-default-tab:hover .dv-default-tab-action {
1061+
visibility: visible;
1062+
}
1063+
.dv-tab .dv-default-tab {
1064+
position: relative;
1065+
height: 100%;
1066+
display: flex;
1067+
align-items: center;
1068+
white-space: nowrap;
1069+
text-overflow: ellipsis;
1070+
}
1071+
.dv-tab .dv-default-tab .dv-default-tab-content {
1072+
flex-grow: 1;
1073+
margin-right: 4px;
1074+
}
1075+
.dv-tab .dv-default-tab .dv-default-tab-action {
1076+
padding: 4px;
1077+
display: flex;
1078+
align-items: center;
1079+
justify-content: center;
1080+
box-sizing: border-box;
1081+
}
1082+
.dv-tab .dv-default-tab .dv-default-tab-action:hover {
1083+
border-radius: 2px;
1084+
background-color: var(--dv-icon-hover-background-color);
1085+
}
10261086
.dv-tabs-overflow-dropdown-default {
10271087
height: 100%;
10281088
color: var(--dv-activegroup-hiddenpanel-tab-color);
@@ -1129,63 +1189,6 @@
11291189
.dv-tabs-and-actions-container .dv-right-actions-container {
11301190
display: flex;
11311191
}
1132-
.dv-dragged {
1133-
transform: translate3d(0px, 0px, 0px); /* forces tab to be drawn on a separate layer (see https://github.com/microsoft/vscode/issues/18733) */
1134-
}
1135-
1136-
.dv-tab {
1137-
flex-shrink: 0;
1138-
}
1139-
.dv-tab:focus-within, .dv-tab:focus {
1140-
position: relative;
1141-
}
1142-
.dv-tab:focus-within::after, .dv-tab:focus::after {
1143-
position: absolute;
1144-
content: "";
1145-
height: 100%;
1146-
width: 100%;
1147-
top: 0px;
1148-
left: 0px;
1149-
pointer-events: none;
1150-
outline: 1px solid var(--dv-tab-divider-color) !important;
1151-
outline-offset: -1px;
1152-
z-index: 5;
1153-
}
1154-
.dv-tab.dv-tab-dragging .dv-default-tab-action {
1155-
background-color: var(--dv-activegroup-visiblepanel-tab-color);
1156-
}
1157-
.dv-tab.dv-active-tab .dv-default-tab .dv-default-tab-action {
1158-
visibility: visible;
1159-
}
1160-
.dv-tab.dv-inactive-tab .dv-default-tab .dv-default-tab-action {
1161-
visibility: hidden;
1162-
}
1163-
.dv-tab.dv-inactive-tab .dv-default-tab:hover .dv-default-tab-action {
1164-
visibility: visible;
1165-
}
1166-
.dv-tab .dv-default-tab {
1167-
position: relative;
1168-
height: 100%;
1169-
display: flex;
1170-
align-items: center;
1171-
white-space: nowrap;
1172-
text-overflow: ellipsis;
1173-
}
1174-
.dv-tab .dv-default-tab .dv-default-tab-content {
1175-
flex-grow: 1;
1176-
margin-right: 4px;
1177-
}
1178-
.dv-tab .dv-default-tab .dv-default-tab-action {
1179-
padding: 4px;
1180-
display: flex;
1181-
align-items: center;
1182-
justify-content: center;
1183-
box-sizing: border-box;
1184-
}
1185-
.dv-tab .dv-default-tab .dv-default-tab-action:hover {
1186-
border-radius: 2px;
1187-
background-color: var(--dv-icon-hover-background-color);
1188-
}
11891192
.dv-watermark {
11901193
display: flex;
11911194
height: 100%;

0 commit comments

Comments
 (0)