From 31ea0f7df59bbc3e7d64b131b031f81b74aaedc2 Mon Sep 17 00:00:00 2001 From: Argo Date: Tue, 31 May 2022 06:57:55 +0000 Subject: [PATCH] =?UTF-8?q?!2841=20doc(#I5A6AQ):=20update=20repo=20link=20?= =?UTF-8?q?*=20chore:=20=E6=9B=B4=E6=96=B0=20bug=20=E8=BF=BD=E8=B8=AA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20*=20doc:=20=E6=9B=B4=E6=96=B0=E9=87=8D?= =?UTF-8?q?=E8=BF=9E=E7=BB=84=E4=BB=B6=E6=A8=A1=E6=9D=BF=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=20*=20doc:=20=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=BB=93=E5=BA=93=E5=9C=B0=E5=9D=80=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=20*=20chore:=20=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9=20*=20doc:=20?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=93=BE=E6=8E=A5=E6=94=B9=E4=B8=BA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=20*=20doc:=20=E7=BB=84=E4=BB=B6=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20Url=20=E6=9B=B4=E6=94=B9=E4=B8=BA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=20*=20refactor:=20=E6=9B=B4=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=9C=B0=E5=9D=80=20*=20refactor:=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=A5=E5=BF=97=E5=BC=B9=E7=AA=97=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=BB=84=E4=BB=B6=20*=20doc:=20=E6=9B=B4=E6=94=B9=20?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .issuetracker | 6 ++--- README.zh-CN.md | 26 +++++++++---------- .../Pages/_Layout.cshtml | 23 +++------------- .../Components/BlazorReconnector.razor | 8 ++++-- .../Components/UpdateIntro.razor | 18 +++++++++++++ .../Components/UpdateIntro.razor.cs | 22 ++++++++++++++++ .../Data/WebsiteOptions.cs | 10 +++---- src/BootstrapBlazor.Shared/Locales/en.json | 4 +-- src/BootstrapBlazor.Shared/Locales/zh.json | 4 +-- .../Pages/Install.razor | 5 ++-- .../Pages/Template.razor | 3 ++- .../Pages/Template.razor.cs | 2 ++ .../Samples/Reconnectors.razor | 13 +++++----- .../Samples/Reconnectors.razor.cs | 2 ++ .../Samples/Table/TablesColumn.razor | 3 ++- .../Samples/Table/TablesEdit.razor | 2 +- .../Samples/Table/TablesEdit.razor.cs | 7 +++++ .../Samples/Table/TablesFilter.razor | 2 +- .../Samples/Table/TablesFilter.razor.cs | 7 +++++ .../Shared/BaseLayout.razor | 4 +-- .../Shared/BaseLayout.razor.cs | 2 ++ .../Shared/ComponentLayout.razor | 3 ++- .../Shared/ComponentLayout.razor.cs | 2 ++ .../Shared/HomeLayout.razor | 6 ++--- .../Components/Modal/Modal.razor.cs | 2 +- .../Components/Table/InternalTableColumn.cs | 2 +- .../Components/Table/Table.razor.Checkbox.cs | 2 +- .../Components/Table/Table.razor.Toolbar.cs | 2 +- src/BootstrapBlazor/Directory.Build.props | 2 +- .../Extensions/LambdaExtensions.cs | 2 +- 30 files changed, 125 insertions(+), 71 deletions(-) create mode 100644 src/BootstrapBlazor.Shared/Components/UpdateIntro.razor create mode 100644 src/BootstrapBlazor.Shared/Components/UpdateIntro.razor.cs diff --git a/.issuetracker b/.issuetracker index 0240f2c93..cb9300c3f 100644 --- a/.issuetracker +++ b/.issuetracker @@ -4,7 +4,7 @@ [issuetracker "Gitee-Issue"] regex = "#(.+?)\\)" - url = "https://gitee.com/LongbowEnterprise/BootstrapBlazor/issues/$1" + url = "https://gitee.com/Longbow/BootstrapBlazor/issues/$1" [issuetracker "Gitee-Url"] regex = "([a-zA-z]+://[^\\s]*)" @@ -12,8 +12,8 @@ [issuetracker "Gitee-Commit"] regex = "[C|c]ommit:([^\\s]*)" - url = "https://gitee.com/LongbowEnterprise/BootstrapBlazor/commit/$1" + url = "https://gitee.com/Longbow/BootstrapBlazor/commit/$1" [issuetracker "Gitee-PR"] regex = "!([\\d]+)" - url = "https://gitee.com/LongbowEnterprise/BootstrapBlazor/pulls/$1" + url = "https://gitee.com/Longbow/BootstrapBlazor/pulls/$1" diff --git a/README.zh-CN.md b/README.zh-CN.md index ee49297b8..86381622d 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -47,12 +47,12 @@ WTM 快速开发框架，设计的核心理念就是 "尽一切可能提高开 1. 安装 .net core sdk 最新版 [官方网址](http://www.microsoft.com/net/download) 2. 安装 Visual Studio 2022 最新版 [官方网址](https://visualstudio.microsoft.com/vs/getting-started/) -3. 获取本项目代码 [BootstrapBlazor](https://gitee.com/LongbowEnterprise/BootstrapBlazor) +3. 获取本项目代码 [BootstrapBlazor](https://gitee.com/Longbow/BootstrapBlazor) ### 克隆代码 ```shell -git clone https://gitee.com/LongbowEnterprise/BootstrapBlazor.git +git clone https://gitee.com/Longbow/BootstrapBlazor.git cd BootstrapBlazor/src/BootstrapBlazor.Server dotnet run ``` @@ -80,7 +80,7 @@ dotnet run ### 项目模板 - [微软市场](https://marketplace.visualstudio.com/items?itemName=Longbow.BootstrapBlazorUITemplate) -- [码云镜像](https://gitee.com/LongbowEnterprise/BootstrapBlazorVsix/raw/master/dist/BootstrapBlazor.UITemplate.vsix) +- [码云镜像](https://gitee.com/Longbow/BootstrapBlazorVsix/raw/master/dist/BootstrapBlazor.UITemplate.vsix) ### 更多文档 @@ -170,16 +170,16 @@ Blazor 应用基于组件。 Blazor 中的组件是指 UI 元素，例如页面 ## 项目截图 -![登录可查看](https://gitee.com/LongbowEnterprise/Pictures/raw/master/BootstrapBlazor/Toggle.png "Toggle.png") -![登录可查看](https://gitee.com/LongbowEnterprise/Pictures/raw/master/BootstrapBlazor/Toast.png "Toast.png") -![登录可查看](https://gitee.com/LongbowEnterprise/Pictures/raw/master/BootstrapBlazor/Upload.png "Upload.png") -![登录可查看](https://gitee.com/LongbowEnterprise/Pictures/raw/master/BootstrapBlazor/Upload2.png "Upload2.png") -![登录可查看](https://gitee.com/LongbowEnterprise/Pictures/raw/master/BootstrapBlazor/Bar.png "Bar.png") -![登录可查看](https://gitee.com/LongbowEnterprise/Pictures/raw/master/BootstrapBlazor/Pie.png "Pei.png") -![登录可查看](https://gitee.com/LongbowEnterprise/Pictures/raw/master/BootstrapBlazor/Doughnut.png "Doughnut.png") +![登录可查看](https://gitee.com/Longbow/Pictures/raw/master/BootstrapBlazor/Toggle.png "Toggle.png") +![登录可查看](https://gitee.com/Longbow/Pictures/raw/master/BootstrapBlazor/Toast.png "Toast.png") +![登录可查看](https://gitee.com/Longbow/Pictures/raw/master/BootstrapBlazor/Upload.png "Upload.png") +![登录可查看](https://gitee.com/Longbow/Pictures/raw/master/BootstrapBlazor/Upload2.png "Upload2.png") +![登录可查看](https://gitee.com/Longbow/Pictures/raw/master/BootstrapBlazor/Bar.png "Bar.png") +![登录可查看](https://gitee.com/Longbow/Pictures/raw/master/BootstrapBlazor/Pie.png "Pei.png") +![登录可查看](https://gitee.com/Longbow/Pictures/raw/master/BootstrapBlazor/Doughnut.png "Doughnut.png") ## 开源协议 -[![Gitee license](https://img.shields.io/github/license/argozhang/bootstrapblazor.svg?logo=git&logoColor=red)](https://gitee.com/LongbowEnterprise/BootstrapBlazor/blob/master/LICENSE) +[![Gitee license](https://img.shields.io/github/license/argozhang/bootstrapblazor.svg?logo=git&logoColor=red)](https://gitee.com/Longbow/BootstrapBlazor/blob/master/LICENSE) ## 特别鸣谢 @@ -187,7 +187,7 @@ Blazor 应用基于组件。 Blazor 中的组件是指 UI 元素，例如页面 特别鸣谢胡总对本项目的鼎力赞助 **10000** 元 - + ## 参与贡献 @@ -200,4 +200,4 @@ Blazor 应用基于组件。 Blazor 中的组件是指 UI 元素，例如页面 如果这个项目对您有所帮助，请扫下方二维码打赏一杯咖啡。 - + diff --git a/src/BootstrapBlazor.Server/Pages/_Layout.cshtml b/src/BootstrapBlazor.Server/Pages/_Layout.cshtml index b908edcd1..fe2ddde03 100644 --- a/src/BootstrapBlazor.Server/Pages/_Layout.cshtml +++ b/src/BootstrapBlazor.Server/Pages/_Layout.cshtml @@ -1,4 +1,5 @@ -@using Microsoft.AspNetCore.Components.Web +@using BootstrapBlazor.Shared.Components +@using Microsoft.AspNetCore.Components.Web @namespace BootstrapBlazor.Server @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @@ -54,25 +55,7 @@ - -
-
Bootstrap Blazor 组件库 更新到 6.6.0
-
-
-

首先感谢您对本套组件的关注，本目前本套组件已经拥有超过 120 个组件，本组件是基于 Bootstrap 风格的 Blazor 企业级组件库，提供如布局、导航、表单、数据、通知、图标、语音等几大类通用组件，每一个组件都经过静心设计，具有模块化、响应式和优秀的性能。从更多实际场景出发，满足多种场景的需求，极大的减少开发者时间成本，大大缩短开发周期，大幅提高开发效率，并提供了一套 通用权限管理系统 示例工程。Bootstrap Blazor 产品是由一支专业的全职技术团队进行维护，高效的响应速度，多元化的解决方案，长期提供支持，并提供企业级支持。目前已在多家知名国企内部使用，项目最高在线 1200 人稳定运行。右侧为国内人数最多的中文 Blazor QQ 社区二维码，欢迎扫描加群。

-

组件更新到 6.6.0 更新日志 [传送门] 如果组件给您带来了方便，请您帮忙给项目点亮 Star - github - gitee

-
-
- QQGroup -
QQ 795206915
-
-
-
- -
-
+ diff --git a/src/BootstrapBlazor.Shared/Components/BlazorReconnector.razor b/src/BootstrapBlazor.Shared/Components/BlazorReconnector.razor index caa7dacd4..d0457f532 100644 --- a/src/BootstrapBlazor.Shared/Components/BlazorReconnector.razor +++ b/src/BootstrapBlazor.Shared/Components/BlazorReconnector.razor @@ -1,4 +1,6 @@ - +@inject IOptionsMonitor WebsiteOption + +
@@ -57,6 +59,8 @@ @code { + private string TemplateUrl => $"{WebsiteOption.CurrentValue.BootstrapBlazorLink}/wikis/%E9%A1%B9%E7%9B%AE%E6%A8%A1%E6%9D%BF%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B"; + RenderFragment RenderBootstrapBlazor => @
Bootstrap Blazor UI 组件库
@@ -65,7 +69,7 @@
一套基于 Bootstrap 样式的企业级 Blazor UI 组件库，支持 Server 与 WebAssembly
适配移动端支持各种主流浏览器以及移动端，适配 ABP，同时支持 NET5/NET6
-
已提供项目模板方便快速上手 项目模板
+
已提供项目模板方便快速上手 项目模板
QQGroup
diff --git a/src/BootstrapBlazor.Shared/Components/UpdateIntro.razor b/src/BootstrapBlazor.Shared/Components/UpdateIntro.razor new file mode 100644 index 000000000..3cc0e12b3 --- /dev/null +++ b/src/BootstrapBlazor.Shared/Components/UpdateIntro.razor @@ -0,0 +1,18 @@ +
+
Bootstrap Blazor 组件库 更新到 6.6.0
+
+
+

首先感谢您对本套组件的关注，本目前本套组件已经拥有超过 120 个组件，本组件是基于 Bootstrap 风格的 Blazor 企业级组件库，提供如布局、导航、表单、数据、通知、图标、语音等几大类通用组件，每一个组件都经过静心设计，具有模块化、响应式和优秀的性能。从更多实际场景出发，满足多种场景的需求，极大的减少开发者时间成本，大大缩短开发周期，大幅提高开发效率，并提供了一套 通用权限管理系统 示例工程。Bootstrap Blazor 产品是由一支专业的全职技术团队进行维护，高效的响应速度，多元化的解决方案，长期提供支持，并提供企业级支持。目前已在多家知名国企内部使用，项目最高在线 1200 人稳定运行。右侧为国内人数最多的中文 Blazor QQ 社区二维码，欢迎扫描加群。

+

组件更新到 6.6.0 更新日志 [传送门] 如果组件给您带来了方便，请您帮忙给项目点亮 Star + github + gitee

+
+
+ QQGroup +
QQ 795206915
+
+
+
+ +
+
diff --git a/src/BootstrapBlazor.Shared/Components/UpdateIntro.razor.cs b/src/BootstrapBlazor.Shared/Components/UpdateIntro.razor.cs new file mode 100644 index 000000000..ac4f90ca8 --- /dev/null +++ b/src/BootstrapBlazor.Shared/Components/UpdateIntro.razor.cs @@ -0,0 +1,22 @@ +// Copyright (c) Argo Zhang (argo@163.com). 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 Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Options; + +namespace BootstrapBlazor.Shared.Components; + +/// +/// 更新日志介绍组件 +/// +public partial class UpdateIntro +{ + [Inject] + [NotNull] + private IOptionsMonitor? WebsiteOption { get; set; } + + [NotNull] + private string? UpdateLogUrl => $"{WebsiteOption.CurrentValue.BootstrapBlazorLink}/wikis/%E6%9B%B4%E6%96%B0%E6%97%A5%E5%BF%97?sort_id=4062034"; +} diff --git a/src/BootstrapBlazor.Shared/Data/WebsiteOptions.cs b/src/BootstrapBlazor.Shared/Data/WebsiteOptions.cs index 7913924e4..b9215028c 100644 --- a/src/BootstrapBlazor.Shared/Data/WebsiteOptions.cs +++ b/src/BootstrapBlazor.Shared/Data/WebsiteOptions.cs @@ -34,27 +34,27 @@ public class WebsiteOptions /// /// /// - public string BootstrapAdminLink { get; set; } = "https://gitee.com/LongbowEnterprise/BootstrapAdmin"; + public string BootstrapAdminLink { get; set; } = "https://gitee.com/Longbow/BootstrapAdmin"; /// /// /// - public string BootstrapBlazorLink { get; set; } = "https://gitee.com/LongbowEnterprise/BootstrapBlazor"; + public string BootstrapBlazorLink { get; set; } = "https://gitee.com/Longbow/BootstrapBlazor"; /// /// /// - public string VideoLibUrl { get; set; } = "https://gitee.com/LongbowEnterprise/BootstrapBlazor/wikis/%E8%A7%86%E9%A2%91%E8%B5%84%E6%BA%90?sort_id=3300624"; + public string VideoLibUrl { get; set; } = "https://gitee.com/Longbow/BootstrapBlazor/wikis/%E8%A7%86%E9%A2%91%E8%B5%84%E6%BA%90?sort_id=3300624"; /// /// /// - public string RepositoryUrl { get; set; } = "https://gitee.com/LongbowEnterprise/BootstrapBlazor/raw/main/src/BootstrapBlazor.Shared/Samples/"; + public string RepositoryUrl { get; set; } = "https://gitee.com/Longbow/BootstrapBlazor/raw/main/src/BootstrapBlazor.Shared/Samples/"; /// /// /// - public string WikiUrl { get; set; } = "https://gitee.com/LongbowEnterprise/BootstrapBlazor/wikis/%E6%9B%B4%E6%96%B0%E6%97%A5%E5%BF%97?sort_id=4062034"; + public string WikiUrl { get; set; } = "https://gitee.com/Longbow/BootstrapBlazor/wikis/%E6%9B%B4%E6%96%B0%E6%97%A5%E5%BF%97?sort_id=4062034"; /// /// 获得 QQ 1 群链接地址 diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json index 1552a426d..97fb1a94b 100644 --- a/src/BootstrapBlazor.Shared/Locales/en.json +++ b/src/BootstrapBlazor.Shared/Locales/en.json @@ -104,7 +104,7 @@ "EnvBuildTitle": "Project Environment Construction", "EnvLi1": "Install .net core sdk Official Website", "EnvLi2": "Install Visual Studio 2019 and above Official website", - "EnvLi3": "Pull the project code BootstrapBlazor Warehouse URL" + "EnvLi3": "Pull the project code BootstrapBlazor Warehouse URL" }, "BootstrapBlazor.Shared.Pages.Template": { "Title": "Project Template", @@ -3090,7 +3090,7 @@ "AutoGenerateColumnsP1": "In this example, by setting the value of AutoGenerateColumns to true, the automatic column generation function is enabled. All attributes of the bound model entity class are all generated by default. code>AutoGenerateColumnAttribute tag class for function settings, such as: ", "AutoGenerateColumnsLi1": "Ignore means ignore this property, i.e. not generate", "AutoGenerateColumnsLi2": "Readonly means read only", - "AutoGenerateColumnsLi3": "For more attributes, see Source code", + "AutoGenerateColumnsLi3": "For more attributes, see Source code", "AutoGenerateColumnsP2": " In this example the date column is formatted through the [AutoGenerateColumn(Order = 1, FormatString = \"yyyy-MM-dd\")] tag; Set the template column in the code to customize the Complete column and use the Switch component to render; through the [AutoGenerateColumn(Order = 10)] tag in the Order set the display order", "OnColumnCreatingTitle": "Set current column properties", "OnColumnCreatingIntro": "By specifying OnColumnCreating callback, make secondary data changes to the column collection", diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json index b4b40c4c2..a2bccbc89 100644 --- a/src/BootstrapBlazor.Shared/Locales/zh.json +++ b/src/BootstrapBlazor.Shared/Locales/zh.json @@ -104,7 +104,7 @@ "EnvBuildTitle": "项目环境搭建", "EnvLi1": "安装 .net core sdk 官方网址", "EnvLi2": "安装 Visual Studio 2019 以上 官方网址", - "EnvLi3": "拉取项目代码 BootstrapBlazor 仓库网址" + "EnvLi3": "拉取项目代码 BootstrapBlazor 仓库网址" }, "BootstrapBlazor.Shared.Pages.Template": { "Title": "项目模板", @@ -3103,7 +3103,7 @@ "AutoGenerateColumnsP1": "本例中通过设置 AutoGenerateColumns 值为 true 开启自动生成列功能，默认绑定模型实体类所有属性全部生成，实体类可以通过 AutoGenerateColumnAttribute 标签类进行功能设置，如：", "AutoGenerateColumnsLi1": "Ignore 表示忽略此属性，即不生成", "AutoGenerateColumnsLi2": "Readonly 表示只读", - "AutoGenerateColumnsLi3": "更多属性详见 源码", + "AutoGenerateColumnsLi3": "更多属性详见 源码", "AutoGenerateColumnsP2": " 本例中通过 [AutoGenerateColumn(Order = 1, FormatString = \"yyyy-MM-dd\")] 标签格式化 日期 列；通过代码中设置模板列对 Complete 列进行自定义使用 Switch 组件进行渲染；通过 [AutoGenerateColumn(Order = 10)] 标签中的 Order 对显示顺序进行设定", "OnColumnCreatingTitle": "设置当前列属性", "OnColumnCreatingIntro": "通过指定 OnColumnCreating回调，对列集合进行数据二次更改", diff --git a/src/BootstrapBlazor.Shared/Pages/Install.razor b/src/BootstrapBlazor.Shared/Pages/Install.razor index 4f4504053..bd14b0a84 100644 --- a/src/BootstrapBlazor.Shared/Pages/Install.razor +++ b/src/BootstrapBlazor.Shared/Pages/Install.razor @@ -1,6 +1,7 @@ @page "/install" @inject VersionService VersionManager @inject IStringLocalizer Localizer +@inject IOptionsMonitor WebsiteOption

@Localizer["InstallTitle"]

@@ -40,10 +41,10 @@
  1. @((MarkupString)Localizer["EnvLi1"].Value)
  2. @((MarkupString)Localizer["EnvLi2"].Value)
    3. -
  3. @((MarkupString)Localizer["EnvLi3"].Value)
    4. +
  4. @((MarkupString)string.Format(Localizer["EnvLi3"].Value, WebsiteOption.CurrentValue.BootstrapBlazorLink))
-
git clone https://gitee.com/LongbowEnterprise/BootstrapBlazor
+
git clone @WebsiteOption.CurrentValue.BootstrapBlazorLink
@code { /// diff --git a/src/BootstrapBlazor.Shared/Pages/Template.razor b/src/BootstrapBlazor.Shared/Pages/Template.razor index a89a52342..6b379235f 100644 --- a/src/BootstrapBlazor.Shared/Pages/Template.razor +++ b/src/BootstrapBlazor.Shared/Pages/Template.razor @@ -1,6 +1,7 @@ @page "/template" @inject VersionService VersionManager @inject IStringLocalizer