updates

pomeara · Oct 6, 2022 · 76706d7 · 76706d7
1 parent ce1d2c9
commit 76706d7
Show file tree

Hide file tree

Showing 43 changed files with 14,073 additions and 0 deletions.
diff --git a/src/BootstrapBlazor.Shared/Components/UpdateIntro.razor.orig b/src/BootstrapBlazor.Shared/Components/UpdateIntro.razor.orig
@@ -0,0 +1,25 @@
+@inject IStringLocalizer<UpdateIntro> Localizer
+
+<div class="blazor-intro">
+    <h5><b>Bootstrap Blazor</b> @Localizer["H1"] <span class="version">6.6.0</span></h5>
+    <div class="d-flex">
+        <div class="blazor-intro-body">
+<<<<<<< HEAD
+            <p>@Localizer["B1"] <b>Bootstrap</b> <b>Blazor</b> @Localizer["B2"] <a href="@WebsiteOption.CurrentValue.AdminUrl" target="_blank"><b>@Localizer["B3"]</b></a> @Localizer["B4"]。<b>Bootstrap Blazor</b> @Localizer["B5"]。</p>
+=======
+            <p>@Localizer["B1"] <b>Bootstrap</b> <b>Blazor</b> @Localizer["B2"] <a href="@WebsiteOption.CurrentValue.AdminUrl" target="_blank"><b>@Localizer["B3"]</b></a> @Localizer["B4"]。<b>Bootstrap Blazor</b> @((MarkupString)Localizer["B5"].Value)</p>
+>>>>>>> 9f6ec82d87add21c3748c83afbecc2d5cee5af27
+            <p>
+                @Localizer["P1"] <span class="version">6.6.0</span> @Localizer["P2"] <a target="_blank" href="@UpdateLogUrl"><b>[@Localizer["P3"]]</b></a> @Localizer["P4"] <b>Star</b>
+                <a class="px-2" href="https://github.com/ArgoZhang/BootstrapBlazor" target="_blank"><img src="_content/BootstrapBlazor.Shared/images/git.svg" alt="github" /></a>
+                <a href="@WebsiteOption.CurrentValue.BootstrapBlazorLink" target="_blank"><img src="_content/BootstrapBlazor.Shared/images/gitee.svg" alt="gitee" /></a></p>
+        </div>
+        <div class="blazor-intro-barcode">
+            <img src="_content/BootstrapBlazor.Shared/images/[email protected]" alt="QQGroup" />
+            <div>QQ 795206915</div>
+        </div>
+    </div>
+    <div class="blazor-intro-button">
+        <svg viewBox="0 0 24 24"><path d="M19.707 5.707l-1.414-1.414L12 10.586 5.707 4.293 4.293 5.707 10.586 12l-6.293 6.293 1.414 1.414L12 13.414l6.293 6.293 1.414-1.414L13.414 12l6.293-6.293z"></path></svg>
+    </div>
+</div>
diff --git a/src/BootstrapBlazor.Shared/Locales/en.json.orig b/src/BootstrapBlazor.Shared/Locales/en.json.orig
diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json.orig b/src/BootstrapBlazor.Shared/Locales/zh.json.orig
diff --git a/src/BootstrapBlazor.Shared/Samples/AnchorLinks.razor.cs.orig b/src/BootstrapBlazor.Shared/Samples/AnchorLinks.razor.cs.orig
@@ -0,0 +1,72 @@
+// Copyright (c) Argo Zhang ([email protected]). All rights reserved.
+// 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 BootstrapBlazor.Components;
+using BootstrapBlazor.Shared.Common;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
+
+namespace BootstrapBlazor.Shared.Samples;
+
+/// <summary>
+/// 
+/// </summary>
+public partial class AnchorLinks
+{
+    [Inject]
+    [NotNull]
+    private IStringLocalizer<AnchorLinks>? Localizer { get; set; }
+
+    private IEnumerable<AttributeItem> GetAttributes() => new[]
+    {
+        // TODO: 移动到数据库中
+        new AttributeItem() {
+<<<<<<< HEAD
+            Name = "Id",
+            Description = "Component Id",
+=======
+            Name = nameof(AnchorLink.Id),
+            Description = Localizer[$"Attr{nameof(AnchorLink.Id)}"],
+>>>>>>> 9f6ec82d87add21c3748c83afbecc2d5cee5af27
+            Type = "string",
+            ValueList = " — ",
+            DefaultValue = " — "
+        },
+        new AttributeItem() {
+            Name = nameof(AnchorLink.Icon),
+<<<<<<< HEAD
+            Description = "Component Icon",
+=======
+            Description = Localizer[$"Attr{nameof(AnchorLink.Icon)}"],
+>>>>>>> 9f6ec82d87add21c3748c83afbecc2d5cee5af27
+            Type = "string",
+            ValueList = " — ",
+            DefaultValue = "fa-solid fa-link"
+        },
+        new AttributeItem() {
+<<<<<<< HEAD
+            Name = "Text",
+            Description = "Component display text",
+=======
+            Name = nameof(AnchorLink.Text),
+            Description = Localizer[$"Attr{nameof(AnchorLink.Text)}"],
+>>>>>>> 9f6ec82d87add21c3748c83afbecc2d5cee5af27
+            Type = "string",
+            ValueList = " — ",
+            DefaultValue = " — "
+        },
+        new AttributeItem() {
+<<<<<<< HEAD
+            Name = "TooltipText",
+            Description = "Tooltip Text",
+=======
+            Name = nameof(AnchorLink.TooltipText),
+            Description = Localizer[$"Attr{nameof(AnchorLink.TooltipText)}"],
+>>>>>>> 9f6ec82d87add21c3748c83afbecc2d5cee5af27
+            Type = "string",
+            ValueList = " — ",
+            DefaultValue = " — "
+        }
+    };
+}
diff --git a/src/BootstrapBlazor.Shared/Samples/CherryMarkdowns.razor.orig b/src/BootstrapBlazor.Shared/Samples/CherryMarkdowns.razor.orig
@@ -0,0 +1,47 @@
+@page "/cherry-markdowns"
+
+<<<<<<< HEAD
+@inject IStringLocalizer<CherryMarkdowns>? Localizer
+
+<h3>@Localizer["Header"]</h3>
+
+<h4>@Localizer["P1"]</h4>
+
+=======
+<h3>@Localizer["Header"]</h3>
+<h4>@Localizer["P1"]</h4>
+
+>>>>>>> 9f6ec82d87add21c3748c83afbecc2d5cee5af27
+<DemoBlock Title="@Localizer["P2"]" Introduction="@Localizer["P3"]">
+    <CherryMarkdown @bind-Value="MarkdownString" @bind-Html="HtmlString" style="height: 400px"></CherryMarkdown>
+    <div class="mt-3">
+        <textarea class="form-control" rows="6" disabled="disabled">
+            @MarkdownString
+            </textarea>
+    </div>
+    <div class="mt-3">
+        <textarea class="form-control" rows="6" disabled="disabled">
+            @HtmlString
+            </textarea>
+    </div>
+</DemoBlock>
+
+<DemoBlock Title="@Localizer["P4"]" Introduction="@Localizer["P5"]">
+    <CherryMarkdown OnFileUpload="OnFileUpload"></CherryMarkdown>
+</DemoBlock>
+
+<DemoBlock Title="@Localizer["P6"]" Introduction="@Localizer["P7"]">
+    <CherryMarkdown ToolbarSettings="@ToolbarSettings" EditorSettings="@EditorSettings"></CherryMarkdown>
+</DemoBlock>
+
+<DemoBlock Title="@Localizer["P8"]" Introduction="@Localizer["P9"]">
+    <CherryMarkdown @bind-Value="MarkdownString" @bind-Html="HtmlString" style="height: 400px" IsViewer="true"></CherryMarkdown>
+</DemoBlock>
+
+<DemoBlock Title="@Localizer["P10"]" Introduction="@Localizer["P11"]">
+    <CherryMarkdown @ref="@MarkdownElement"></CherryMarkdown>
+    <Button OnClick="@(async () => { await MarkdownElement.DoMethodAsync("toolbar.toolbarHandlers.insert", "checklist");})">@Localizer["P12"]</Button>
+    <Button OnClick="@(async () => { await MarkdownElement.DoMethodAsync("insert", "![一张图片](https://i.niupic.com/images/2022/04/01/9Y6T.jpg)", false, false, true);})">@Localizer["P13"]</Button>
+</DemoBlock>
+
+<AttributeTable Items="GetAttributes()"></AttributeTable>