Skip to content

feat(ColorPicker): add Swatches parameter #4562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 28, 2024
Merged

feat(ColorPicker): add Swatches parameter #4562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
67b279a
fix: 修复 swatches 丢失问题
ArgoZhang Oct 27, 2024
b8c9c64
chore: 更新依赖包到最新
ArgoZhang Oct 27, 2024
bc981bc
chore: 更新工具链
ArgoZhang Oct 27, 2024
5144966
doc: 更新文档
ArgoZhang Oct 28, 2024
3d43057
doc: 更新键值
ArgoZhang Oct 28, 2024
d9b7ca0
doc: 更新参数文档
ArgoZhang Oct 28, 2024
6eb3a84
bump version 8.11.1-beta01
ArgoZhang Oct 28, 2024
9706f39
doc: 更正弹窗文本错误
ArgoZhang Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="8.1.1" />
<PackageReference Include="BootstrapBlazor.BaiduOcr" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.BarCode" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="8.4.0" />
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="8.0.3" />
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.Chart" Version="8.4.0" />
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.Dock" Version="8.3.0" />
<PackageReference Include="BootstrapBlazor.DockView" Version="8.3.0" />
<PackageReference Include="BootstrapBlazor.DockView" Version="8.4.0" />
<PackageReference Include="BootstrapBlazor.DriverJs" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.FileViewer" Version="8.3.0" />
Expand All @@ -44,7 +44,7 @@
<PackageReference Include="BootstrapBlazor.Holiday" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="8.3.0" />
<PackageReference Include="BootstrapBlazor.IconPark" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="8.3.0" />
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.Markdown" Version="8.2.1" />
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="8.1.0" />
Expand All @@ -55,7 +55,7 @@
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="8.0.4" />
<PackageReference Include="BootstrapBlazor.PdfReader" Version="8.0.4" />
<PackageReference Include="BootstrapBlazor.Player" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.Player" Version="8.3.0" />
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.Sortable" Version="8.2.0" />
<PackageReference Include="BootstrapBlazor.Splitting" Version="8.2.0" />
Expand All @@ -68,7 +68,7 @@
<PackageReference Include="BootstrapBlazor.WebAPI" Version="8.0.5" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="8.2.0" />
<PackageReference Include="Longbow.Logging" Version="8.1.0" />
<PackageReference Include="Longbow.Tasks" Version="8.1.0" />
<PackageReference Include="Longbow.Tasks" Version="8.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
36 changes: 30 additions & 6 deletions src/BootstrapBlazor.Server/Components/Samples/ColorPickers.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,41 @@ private AttributeItem[] GetAttributes() =>
[
new()
{
Name = "OnValueChanged",
Description = Localizer["Event1"],
Type = "Func<string, Task>",
Name = nameof(ColorPicker.Template),
Description = Localizer["AttributeTemplate"],
Type = "RenderFragment<string>",
ValueList = " — ",
DefaultValue = " — "
},
new()
{
Name = nameof(ColorPicker.Template),
Description = Localizer["EventTemplate"],
Type = "Func<string>",
Name = nameof(ColorPicker.Formatter),
Description = Localizer["AttributeFormatter"],
Type = "Func<string, Task<string>>",
ValueList = " — ",
DefaultValue = " — "
},
new()
{
Name = nameof(ColorPicker.IsSupportOpacity),
Description = Localizer["AttributeIsSupportOpacity"],
Type = "bool",
ValueList = "true|false",
DefaultValue = "false"
},
new()
{
Name = nameof(ColorPicker.Swatches),
Description = Localizer["AttributeSwatches"],
Type = "bool",
ValueList = " — ",
DefaultValue = " — "
},
new()
{
Name = nameof(ColorPicker.OnValueChanged),
Description = Localizer["EventOnValueChanged"],
Type = "Func<string, Task>",
ValueList = " — ",
DefaultValue = " — "
}
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Server/Components/Samples/Dialogs.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private async Task OnResultDialogClick()

private async Task OnConfirmModalClick()
{
var result = await DialogService.ShowModal(Localizer["ConfirmDialogModalContent"], Localizer["ConfirmDialogModalTitle"]);
var result = await DialogService.ShowModal(Localizer["ConfirmDialogModalTitle"], Localizer["ConfirmDialogModalContent"]);

ModalDialogLogger.Log($"The return value of the popup window is: {result} no component provider");
}
Expand Down
6 changes: 5 additions & 1 deletion src/BootstrapBlazor.Server/Locales/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,7 +2490,11 @@
"ValidateFormIntro": "Built in <code>ValidateForm</code> to use",
"IsSupportOpacityTitle": "Support Opacity",
"IsSupportOpacityIntro": "Enable transparency support by setting <code>IsSupportOpacity=\"true\"</code>",
"Event1": "Color change callback delegate method"
"EventOnValueChanged": "Color change callback delegate method",
"AttributeTemplate": "The template for display",
"AttributeFormatter": "Display color value formatting callback method",
"AttributeIsSupportOpacity": "Whether to support transparency",
"AttributeSwatches": "Preset candidate colors"
},
"BootstrapBlazor.Server.Components.Samples.DateTimePickers": {
"Title": "DatePicker",
Expand Down
6 changes: 5 additions & 1 deletion src/BootstrapBlazor.Server/Locales/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,7 +2490,11 @@
"ValidateFormIntro": "内置于 <code>ValidateForm</code> 中使用",
"IsSupportOpacityTitle": "支持透明度",
"IsSupportOpacityIntro": "通过设置 <code>IsSupportOpacity=\"true\"</code> 开启透明度支持",
"Event1": "颜色改变回调委托方法"
"EventOnValueChanged": "颜色改变回调委托方法",
"AttributeTemplate": "显示模板",
"AttributeFormatter": "显示颜色值格式化回调方法",
"AttributeIsSupportOpacity": "是否支持透明度",
"AttributeSwatches": "预设候选颜色"
},
"BootstrapBlazor.Server.Components.Samples.DateTimePickers": {
"Title": "DatePicker 日期选择器",
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>8.11.0</Version>
<Version>8.11.1-beta01</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/BootstrapBlazor/Components/ColorPicker/ColorPicker.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ const getOptions = (el, options) => {
options.default = options.value;
delete options.value;
}
if (options.swatches === null) {
delete options.swatches;
}
const config = {
el,
theme: 'nano',
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.SassCompiler" Version="1.79.5" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="AspNetCore.SassCompiler" Version="1.80.4" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == 'net8.0'" />
</ItemGroup>

<ItemGroup>
Expand Down