Skip to content

Commit 5cabbd0

Browse files
ArgoZhangArgoZhang
committed
Merge branch 'doc-blog'
2 parents b24e2d8 + 9b51e50 commit 5cabbd0

31 files changed

+713
-143
lines changed

‎localization/de.json‎

Lines changed: 93 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"WeekText": "Woche",
3131
"NextWeek": "Nächste Woche",
3232
"WeekHeaderText": "",
33-
"WeekLists": "Son,Mon,Die,Mit,Don,Fre,Sam",
33+
"WeekLists": "So,Mo,Di,Mi,Do,Fr,Sa",
3434
"WeekNumberText": "{0} Woche(n)",
3535
"Months": "Januar,Februar,März,April,Mai,Juni,Juli,August,September,Oktober,November,Dezember",
3636
"Title": "{0} {1}"
@@ -65,7 +65,7 @@
6565
"YearPeriodText": "{0} - {1}",
6666
"Months": "Januar,Februar,März,April,Mai,Juni,Juli,August,September,Oktober,November,Dezember",
6767
"MonthLists": "Jan,Feb,Mar,Apr,Mai,Jun,Jul,Aug,Sep,Okt,Nov,Dez",
68-
"WeekLists": "Son,Mon,Die,Mit,Don,Fre,Sam",
68+
"WeekLists": "So,Mo,Di,Mi,Do,Fr,Sa",
6969
"GenericTypeErroMessage": "DateTimePicker unterstützt nur DateTime oder Nullable<DateTime>",
7070
"Today": "Heute",
7171
"Yesterday": "Gestern",
@@ -78,6 +78,7 @@
7878
"ClearButtonText": "Leeren",
7979
"TodayButtonText": "Heute",
8080
"ConfirmButtonText": "Ok",
81+
"DateTimeFormat": "dd\\.MM\\.yyyy HH\\:mm\\:ss",
8182
"DateFormat": "dd\\.MM\\.yyyy",
8283
"Last7Days": "Letzte 7 Tage",
8384
"Last30Days": "Letzte 30 Tage",
@@ -109,7 +110,7 @@
109110
"ErrorMessage": "Bitte geben Sie denselben Wert nochmals ein"
110111
},
111112
"BootstrapBlazor.Components.ErrorLogger": {
112-
"ToastTitle": "Anwendungfehler"
113+
"ToastTitle": "Anwendungsfehler"
113114
},
114115
"BootstrapBlazor.Components.GoTop": {
115116
"TooltipText": "Nach oben"
@@ -119,7 +120,7 @@
119120
},
120121
"BootstrapBlazor.Components.Logout": {
121122
"PrefixDisplayNameText": "Willkommen",
122-
"PrefixUserNameText": "Account:"
123+
"PrefixUserNameText": "Benutzername:"
123124
},
124125
"BootstrapBlazor.Components.LogoutLink": {
125126
"Text": "Ausloggen"
@@ -130,15 +131,17 @@
130131
"BootstrapBlazor.Components.ModalDialog": {
131132
"CloseButtonText": "Schließen",
132133
"SaveButtonText": "Speichern",
133-
"PrintButtonText": "Drucken"
134+
"PrintButtonText": "Drucken",
135+
"ExportPdfButtonText": "PDF exportieren"
134136
},
135137
"BootstrapBlazor.Components.MultiSelect": {
136138
"PlaceHolder": "Klicken, um auszuwählen ...",
137139
"SelectAllText": "Alle",
138140
"ReverseSelectText": "Umkehren",
139141
"ClearText": "Leeren",
140142
"MinErrorMessage": "Wählen Sie wenigstens {0} Elemente",
141-
"MaxErrorMessage": "Es können maximal {0} Elemente selektiert werden"
143+
"MaxErrorMessage": "Es können maximal {0} Elemente selektiert werden",
144+
"NoSearchDataText": "Kein Ergebnis"
142145
},
143146
"BootstrapBlazor.Components.Pagination": {
144147
"GotoNavigatorLabelText": "Zu"
@@ -151,11 +154,16 @@
151154
"BootstrapBlazor.Components.PrintButton": {
152155
"Text": "Drucken"
153156
},
157+
"BootstrapBlazor.Components.Repeater": {
158+
"EmptyText": "Keine Daten"
159+
},
154160
"BootstrapBlazor.Components.Search": {
155-
"SearchButtonText": "Suchen"
161+
"SearchButtonText": "Suchen",
162+
"NoDataTip": "Keine Einträge gefunden"
156163
},
157164
"BootstrapBlazor.Components.Select": {
158-
"PlaceHolder": "Zum Auswählen klicken ..."
165+
"PlaceHolder": "Zum Auswählen klicken ...",
166+
"NoSearchDataText": "Kein Ergebnis"
159167
},
160168
"BootstrapBlazor.Components.SelectTree": {
161169
"PlaceHolder": "Zum Auswählen klicken ..."
@@ -179,7 +187,17 @@
179187
"CloseCurrentTabText": "Abbrechen",
180188
"CloseOtherTabsText": "Andere schließen",
181189
"CloseAllTabsText": "Alle schließen",
182-
"NotFoundTabText": "Nicht gefunden"
190+
"NotFoundTabText": "Nicht gefunden",
191+
"RefreshToolbarTooltipText": "Aktualisieren",
192+
"FullscreenToolbarTooltipText": "Vollbild",
193+
"PrevTabNavLinkTooltipText": "Vorheriger Tab",
194+
"NextTabNavLinkTooltipText": "Nächster Tab",
195+
"CloseTabNavLinkTooltipText": "Schließen",
196+
"ContextRefresh": "Aktualisieren",
197+
"ContextClose": "Schließen",
198+
"ContextCloseOther": "Andere Tabs schließen",
199+
"ContextCloseAll": "Alle Tabs schließen",
200+
"ContextFullScreen": "Vollbild"
183201
},
184202
"BootstrapBlazor.Components.Table": {
185203
"AddButtonText": "Hinzufügen",
@@ -201,11 +219,13 @@
201219
"SearchButtonText": "Suchen",
202220
"ResetSearchButtonText": "Zurücksetzen",
203221
"AdvanceButtonText": "Erweiterte Suche",
222+
"AdvancedSortModalTitle": "Sortieren",
223+
"AdvancedSortButtonText": "Erweitertes Sortieren",
204224
"CheckboxDisplayText": "Alle",
205225
"EditModalTitle": "Bearbeiten",
206226
"AddModalTitle": "Neu",
207227
"LineNoText": "Zeilen",
208-
"ColumnButtonTemplateHeaderText": "",
228+
"ColumnButtonTemplateHeaderText": "Aktionen",
209229
"SearchTooltip": "<div class='search-input-tooltip'>Bitte eingeben ...</br><kbd>Enter</kbd> Suche <kbd>ESC</kbd> Leeren</div>",
210230
"SearchModalTitle": "Suche",
211231
"AddButtonToastTitle": "Daten hinzufügen",
@@ -236,17 +256,27 @@
236256
"ExportCsvDropdownItemText": "MS-Csv",
237257
"ExportExcelDropdownItemText": "MS-Excel",
238258
"ExportPdfDropdownItemText": "Pdf",
239-
"PageInfoText": "{0} - {1} Total {2}",
240-
"PageItemsText": "{0}/page"
259+
"PageInfoText": "{0} - {1} Insgesamt {2}",
260+
"PageItemsText": "{0}/Seite",
261+
"CopyColumnTooltipText": "Ganze Spalte in die Zwischenablage kopieren",
262+
"CopyColumnCopiedTooltipText": "Kopiert!",
263+
"ColumnWidthTooltipPrefix": "Breite: ",
264+
"ColumnToolboxTitle": "Werkzeuge",
265+
"AlignLeftText": "Links",
266+
"AlignLeftTooltipText": "Klicken, um den Text in dieser Spalte links auszurichten",
267+
"AlignCenterText": "Zentriert",
268+
"AlignCenterTooltipText": "Klicken, um den Text in dieser Spalte zentriert auszurichten",
269+
"AlignRightText": "Rechts",
270+
"AlignRightTooltipText": "Klicken, um den Text in dieser Spalte rechts auszurichten"
241271
},
242272
"BootstrapBlazor.Components.EditDialog": {
243273
"CloseButtonText": "Schließen",
244274
"SaveButtonText": "Speichern"
245275
},
246-
"BootstrapBlazor.Components.TableFilter": {
276+
"BootstrapBlazor.Components.TableColumnFilter": {
247277
"Title": "Filter",
248278
"ClearButtonText": "Leeren",
249-
"FilterButtonText": "Übernehmen",
279+
"FilterButtonText": "Filtern",
250280
"BoolFilter.AllText": "Alle",
251281
"BoolFilter.TrueText": "Wahr",
252282
"BoolFilter.FalseText": "Unwahr",
@@ -258,7 +288,10 @@
258288
"NotEqual": "Ungleich",
259289
"Contains": "Beinhaltet",
260290
"NotContains": "Beinhaltet nicht",
261-
"EnumFilter.AllText": "Alle"
291+
"EnumFilter.AllText": "Alle",
292+
"NotSupportedMessage": "Nicht unterstützter Filtertyp. Bitte passen Sie den Filter mit FilterTemplate an",
293+
"MultiFilterSearchPlaceHolderText": "Bitte eingeben ...",
294+
"MultiFilterSelectAllText": "Alle auswählen"
262295
},
263296
"BootstrapBlazor.Components.FilterLogicItem": {
264297
"And": "Und",
@@ -284,7 +317,9 @@
284317
},
285318
"BootstrapBlazor.Components.Transfer": {
286319
"LeftPanelText": "Alle",
287-
"RightPanelText": "Markierte"
320+
"RightPanelText": "Markierte",
321+
"MinErrorMessage": "Bitte wählen Sie mindestens {0} Elemente aus",
322+
"MaxErrorMessage": "Es können bis zu {0} Elemente ausgewählt werden"
288323
},
289324
"BootstrapBlazor.Components.TransferPanel": {
290325
"SearchPlaceHolderString": "Bitte eingeben ...",
@@ -293,18 +328,24 @@
293328
"BootstrapBlazor.Components.Tree": {
294329
"NotSetOnTreeExpandErrorMessage": "OnExpandNodeAsync-Parameter nicht gesetzt"
295330
},
331+
"BootstrapBlazor.Components.TreeView": {
332+
"NotSetOnTreeExpandErrorMessage": "OnExpandNodeAsync-Parameter nicht gesetzt",
333+
"ToolbarEditTitle": "Knoten bearbeiten",
334+
"ToolbarEditLabelText": "Umbenennen"
335+
},
296336
"BootstrapBlazor.Components.UploadBase": {
297337
"DeleteButtonText": "Löschen",
298338
"BrowserButtonText": "Browser",
299339
"FileExtensions": "Datei muss folgende Endung haben: {0}",
300-
"FileSizeValidation": "Dateigrößer muss kleiner sein als {0}"
340+
"FileSizeValidation": "Dateigröße muss kleiner sein als {0}",
341+
"DropUploadText": "Dateien hierher ziehen oder <em>klicken, um hochzuladen</em>"
301342
},
302343
"BootstrapBlazor.Components.Handwritten": {
303344
"SaveButtonText": "Speichern",
304345
"ClearButtonText": "Leeren"
305346
},
306347
"BootstrapBlazor.Components.SignaturePad": {
307-
"SignAboveLabel": "In das Feld eintragen",
348+
"SignAboveLabel": "Im Feld unterschreiben",
308349
"ClearBtnTitle": "Löschen",
309350
"SignatureAlertText": "Bitte geben Sie zuerst eine Unterschrift an",
310351
"ChangeColorBtnTitle": "Farbe ändern",
@@ -316,7 +357,7 @@
316357
"SaveSVGBtnTitle": "SVG"
317358
},
318359
"BootstrapBlazor.Components.NullableBoolItemsAttribute": {
319-
"NullValueDisplayText": "Bitte wählen",
360+
"NullValueDisplayText": "Bitte auswählen ...",
320361
"TrueValueDisplayText": "Wahr",
321362
"FalseValueDisplayText": "Falsch"
322363
},
@@ -330,5 +371,38 @@
330371
"ButtonText": "Kopieren",
331372
"DialogHeaderText": "Ausgewähltes Symbol",
332373
"CopiedTooltipText": "Kopieren erfolgreich"
374+
},
375+
"BootstrapBlazor.Components.Splitting": {
376+
"Text": "Laden ..."
377+
},
378+
"BootstrapBlazor.Components.QueryBuilder": {
379+
"And": "und",
380+
"Or": "oder",
381+
"GreaterThanOrEqual": "Größer oder gleich",
382+
"LessThanOrEqual": "Kleiner oder gleich",
383+
"GreaterThan": "Größer",
384+
"LessThan": "Kleiner",
385+
"Equal": "Gleich",
386+
"NotEqual": "Ungleich",
387+
"Contains": "Beinhaltet",
388+
"NotContains": "Beinhaltet nicht",
389+
"GroupText": "Gruppe",
390+
"ItemText": "Element"
391+
},
392+
"BootstrapBlazor.Components.TableAdvancedSortDialog": {
393+
"AscText": "Aufsteigend",
394+
"DescText": "Absteigend"
395+
},
396+
"BootstrapBlazor.Components.ClockPicker": {
397+
"AMText": "Vormittag",
398+
"PMText": "Nachmittag"
399+
},
400+
"BootstrapBlazor.Components.ThemeProvider": {
401+
"AutoModeText": "Auto",
402+
"DarkModeText": "Dunkel",
403+
"LightModeText": "Hell"
404+
},
405+
"BootstrapBlazor.Components.ValidateBase": {
406+
"DefaultRequiredErrorMessage": "{0} ist erforderlich."
333407
}
334408
}

‎src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
7272
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
7373
<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.5" />
74+
<PackageReference Include="BootstrapBlazor.Vditor" Version="9.0.0" />
7475
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.3" />
7576
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
7677
<PackageReference Include="Longbow.Logging" Version="9.0.0" />

‎src/BootstrapBlazor.Server/Components/App.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
1111
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1212
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
13-
<meta name="keywords" content="bootstrapblazor,bootstrap,blazor,wasm,webassembly,UI,netcore,web,assembly">
13+
<meta name="keywords" content="bootstrapblazor,blazorbootstrap,bootstrap blazor,blazor bootstrap,bootstrap,blazor,wasm,webassembly,UI,netcore,web,assembly">
1414
<meta name="description" content="基于 Bootstrap 风格的 Blazor UI 组件库，用于研发企业级中后台产品。">
1515
<meta name="author" content="argo ([email protected])">
1616
<meta name="theme-color" content="#712cf9">

‎src/BootstrapBlazor.Server/Components/Components/Pre.razor.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
display: none;
2020
}
2121

22+
.pre-code > pre {
23+
color: #e83e8c;
24+
margin-bottom: 0;
25+
max-height: 260px;
26+
}
27+
2228
::deep .btn-group {
2329
position: absolute;
2430
top: 0;

‎src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor.css‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
::deep pre {
2-
color: #e83e8c;
3-
margin-bottom: 0;
4-
max-height: 260px;
5-
}
6-
7-
main {
1+
main {
82
min-height: calc(100vh - var(--bs-header-height));
93
position: relative;
104
z-index: 10;

‎src/BootstrapBlazor.Server/Components/Samples/CherryMarkdowns.razor‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
<h3>@Localizer["Header"]</h3>
55
<h4>@Localizer["Tip"]</h4>
6+
7+
<PackageTips Name="BootstrapBlazor.CherryMarkdown" />
8+
69
<p>@((MarkupString)Localizer["MarkdownsNote"].Value)</p>
710

811
<Pre class="no-highlight">builder.Services.Configure&lt;HubOptions&gt;(option => option.MaximumReceiveMessageSize = null);</Pre>

‎src/BootstrapBlazor.Server/Components/Samples/FlipClocks.razor‎

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@
55

66
<h4>@((MarkupString)Localizer["FlipClocksDescription"].Value)</h4>
77

8-
<DemoBlock Title="@Localizer["BaseUsageText"]" Introduction="@Localizer["BaseUsageIntro"]" Name="Normal">
9-
<FlipClock></FlipClock>
10-
</DemoBlock>
11-
12-
<DemoBlock Title="@Localizer["ShowMinuteText"]" Introduction="@Localizer["ShowMinuteIntro"]" Name="ShowMinute">
13-
<FlipClock ShowHour="false" ShowMinute="false"></FlipClock>
14-
</DemoBlock>
15-
16-
<DemoBlock Title="@Localizer["ShowSecondText"]" Introduction="@Localizer["ShowSecondIntro"]" Name="ShowSecond">
17-
<FlipClock ShowSecond="false"></FlipClock>
18-
</DemoBlock>
19-
208
<DemoBlock Title="@Localizer["CountText"]" Introduction="@Localizer["CountIntro"]" Name="Count">
219
<FlipClock ViewMode="FlipClockViewMode.Count"></FlipClock>
2210
</DemoBlock>
@@ -71,10 +59,50 @@
7159
<Slider @bind-Value="CardGroupMarginValue" Max="28" Min="18"></Slider>
7260
</BootstrapInputGroup>
7361
</div>
62+
<div class="col-12 col-sm-6 col-lg-4">
63+
<BootstrapInputGroup>
64+
<BootstrapInputGroupLabel DisplayText="@Localizer["ShowYear"]" Width="150"></BootstrapInputGroupLabel>
65+
<Switch @bind-Value="_showYear"></Switch>
66+
</BootstrapInputGroup>
67+
</div>
68+
<div class="col-12 col-sm-6 col-lg-4">
69+
<BootstrapInputGroup>
70+
<BootstrapInputGroupLabel DisplayText="@Localizer["ShowMonth"]" Width="150"></BootstrapInputGroupLabel>
71+
<Switch @bind-Value="_showMonth"></Switch>
72+
</BootstrapInputGroup>
73+
</div>
74+
<div class="col-12 col-sm-6 col-lg-4">
75+
<BootstrapInputGroup>
76+
<BootstrapInputGroupLabel DisplayText="@Localizer["ShowDay"]" Width="150"></BootstrapInputGroupLabel>
77+
<Switch @bind-Value="_showDay"></Switch>
78+
</BootstrapInputGroup>
79+
</div>
80+
<div class="col-12 col-sm-6 col-lg-4">
81+
<BootstrapInputGroup>
82+
<BootstrapInputGroupLabel DisplayText="@Localizer["ShowHour"]" Width="150"></BootstrapInputGroupLabel>
83+
<Switch @bind-Value="_showHour"></Switch>
84+
</BootstrapInputGroup>
85+
</div>
86+
<div class="col-12 col-sm-6 col-lg-4">
87+
<BootstrapInputGroup>
88+
<BootstrapInputGroupLabel DisplayText="@Localizer["ShowMinute"]" Width="150"></BootstrapInputGroupLabel>
89+
<Switch @bind-Value="_showMinute"></Switch>
90+
</BootstrapInputGroup>
91+
</div>
92+
<div class="col-12 col-sm-6 col-lg-4">
93+
<BootstrapInputGroup>
94+
<BootstrapInputGroupLabel DisplayText="@Localizer["ShowSecond"]" Width="150"></BootstrapInputGroupLabel>
95+
<Switch @bind-Value="_showSecond"></Switch>
96+
</BootstrapInputGroup>
97+
</div>
7498
</div>
7599
</GroupBox>
76100
</section>
77-
<FlipClock BackgroundColor="radial-gradient(ellipse at center, #ac85f1 0%, #833bf8 100%)" Height="@HeightValueString" FontSize="@FontSizeValueString" CardHeight="@CardHeightValueString" CardWidth="@CardWidthValueString" CardMargin="@CardMarginValueString" CardGroupMargin="@CardGroupMarginValueString"></FlipClock>
101+
<FlipClock BackgroundColor="radial-gradient(ellipse at center, #ac85f1 0%, #833bf8 100%)" Height="@HeightValueString"
102+
FontSize="@FontSizeValueString" CardHeight="@CardHeightValueString" CardWidth="@CardWidthValueString"
103+
CardMargin="@CardMarginValueString" CardGroupMargin="@CardGroupMarginValueString"
104+
ShowYear="_showYear" ShowMonth="_showMonth" ShowDay="_showDay"
105+
ShowHour="_showHour" ShowMinute="_showMinute" ShowSecond="_showSecond"></FlipClock>
78106
</DemoBlock>
79107

80108
<AttributeTable Items="@GetAttributes()" />

0 commit comments

Comments
 (0)