Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion scripts/linux/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sudo cp BootstrapBlazor/scripts/linux/cert/* /etc/nginx/cert/

echo "*********************** install chrome ***********************"
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
sudo apt install ./google-chrome-stable_current_amd64.deb
sudo yes|sudo apt install ./google-chrome-stable_current_amd64.deb

echo "*********************** install support font ***********************"
sudo apt install fonts-wqy-microhei
Expand Down
42 changes: 21 additions & 21 deletions src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<h4>@Localizer["MultiSelectsDescription"]</h4>

@* <DemoBlock Title="@Localizer["MultiSelectColorTitle"]" Introduction="@Localizer["MultiSelectColorIntro"]" Name="Color">
<DemoBlock Title="@Localizer["MultiSelectColorTitle"]" Introduction="@Localizer["MultiSelectColorIntro"]" Name="Color">
<div class="row g-3">
<div class="col-12 col-sm-6">
<MultiSelect TValue="string" Items="@Items1" />
Expand Down Expand Up @@ -81,7 +81,7 @@
<section ignore>@((MarkupString)Localizer["MultiSelectBindingNumberDescription"].Value)</section>
<div class="row g-3">
<div class="col-12 col-sm-6">
<MultiSelect Items="@LongItems" @bind-Value="@SelectedIntArrayValues" />
<MultiSelect Items="@LongItems" @bind-Value="@SelectedIntArrayValues"></MultiSelect>
</div>
<div class="col-12 col-sm-6">
<Button Icon="fa-solid fa-plus" Text="@Localizer["MultiSelectAdd"]" OnClick="@AddArrayItems" class="me-1"></Button>
Expand All @@ -96,7 +96,7 @@
<section ignore>@((MarkupString)Localizer["MultiSelectBindingEnumCollectionDescription"].Value)</section>
<MultiSelect @bind-Value="@SelectedEnumValues"></MultiSelect>
<section ignore>@(string.Join(",", SelectedEnumValues))</section>
</DemoBlock> *@
</DemoBlock>

<DemoBlock Title="@Localizer["MultiSelectFlagsEnumTitle"]" Introduction="@Localizer["MultiSelectFlagsEnumIntro"]"
Name="Flags">
Expand All @@ -113,36 +113,36 @@ private enum MultiSelectEnumFoo
<MultiSelect @bind-Value="@EnumFoo"></MultiSelect>
</DemoBlock>

@* <DemoBlock Title="@Localizer["MultiSelectSearchTitle"]" Introduction="@Localizer["MultiSelectSearchIntro"]" Name="Search">
<DemoBlock Title="@Localizer["MultiSelectSearchTitle"]" Introduction="@Localizer["MultiSelectSearchIntro"]" Name="Search">
<section ignore>@((MarkupString)Localizer["MultiSelectSearchDescription"].Value)</section>
<MultiSelect Items="@Items" @bind-Value="@SelectedSearchItemsValue" ShowSearch="true" OnSearchTextChanged="@OnSearch" />
<MultiSelect Items="@Items" @bind-Value="@SelectedSearchItemsValue" ShowSearch="true" OnSearchTextChanged="@OnSearch"></MultiSelect>
<section ignore>@SelectedSearchItemsValue</section>
<ConsoleLogger @ref="Logger" />
<ConsoleLogger @ref="Logger"></ConsoleLogger>
</DemoBlock>

<DemoBlock Title="@Localizer["MultiSelectGroupTitle"]" Introduction="@Localizer["MultiSelectGroupIntro"]" Name="Group">
<div class="row g-3">
<div class="col-12 col-sm-6">
<MultiSelect TValue="string" Items="GroupItems" />
<MultiSelect TValue="string" Items="GroupItems"></MultiSelect>
</div>
</div>
</DemoBlock>

<DemoBlock Title="@Localizer["MultiSelectDisableTitle"]" Introduction="@Localizer["MultiSelectDisableIntro"]" Name="Disable">
<section ignore>@Localizer["MultiSelectDisableDescription"]</section>
<MultiSelect Items="@Items" Value="@SelectedDisableItemsValue" IsDisabled="true" />
<MultiSelect Items="@Items" Value="@SelectedDisableItemsValue" IsDisabled="true"></MultiSelect>
</DemoBlock>

<DemoBlock Title="@Localizer["MultiSelectOptionChangeTitle"]" Introduction="@Localizer["MultiSelectOptionChangeIntro"]" Name="OptionChange">
<MultiSelect Items="@Items" OnSelectedItemsChanged="@OnSelectedItemsChanged8" Value="@SelectedOptionItemsValue" />
<MultiSelect Items="@Items" OnSelectedItemsChanged="@OnSelectedItemsChanged8" Value="@SelectedOptionItemsValue"></MultiSelect>
</DemoBlock>

<DemoBlock Title="@Localizer["MultiSelectClientValidationTitle"]" Introduction="@Localizer["MultiSelectClientValidationIntro"]" Name="ClientValidation">
<section ignore>@((MarkupString)Localizer["MultiSelectClientValidationDescription"].Value)</section>
<ValidateForm Model="@Model">
<div class="row g-3">
<div class="col-12 col-sm-8">
<MultiSelect Items="Items" @bind-Value="@Model.Address" />
<MultiSelect Items="Items" @bind-Value="@Model.Address"></MultiSelect>
</div>
<div class="col-12 col-sm-4 align-self-end">
<Button ButtonType="ButtonType.Submit">@Localizer["MultiSelectClientValidationSubmit"]</Button>
Expand All @@ -154,12 +154,12 @@ private enum MultiSelectEnumFoo
<DemoBlock Title="@Localizer["MultiSelectDisplayLabelTitle"]" Introduction="@Localizer["MultiSelectDisplayLabelIntro"]" Name="DisplayLabel">
<section ignore>
<p>@((MarkupString)Localizer["MultiSelectDisplayLabelDescription"].Value)</p>
<Divider Text="@Localizer["MultiSelectDisplayLabelShowLabel"]" Alignment="Alignment.Left" style="margin: 2rem 0;" />
<Divider Text="@Localizer["MultiSelectDisplayLabelShowLabel"]" Alignment="Alignment.Left" style="margin: 2rem 0;"></Divider>
</section>
<ValidateForm Model="@Foo">
<div class="row g-3">
<div class="col-12">
<MultiSelect Color="Color.Primary" Items="@Items1" @bind-Value="@Foo.Name" />
<MultiSelect Color="Color.Primary" Items="@Items1" @bind-Value="@Foo.Name"></MultiSelect>
</div>
</div>
</ValidateForm>
Expand All @@ -177,19 +177,19 @@ private enum MultiSelectEnumFoo

<DemoBlock Title="@Localizer["MultiSelectButtonTitle"]" Introduction="@Localizer["MultiSelectButtonIntro"]" Name="Button">
<div style="max-width: 400px">
<MultiSelect Items="@LongItems" @bind-Value="@SelectedLongItemsValue1" ShowToolbar="true" ShowSearch="true" />
<MultiSelect Items="@LongItems" @bind-Value="@SelectedLongItemsValue1" ShowToolbar="true" ShowSearch="true"></MultiSelect>
<p>@SelectedLongItemsValue1</p>
</div>
</DemoBlock>

<DemoBlock Title="@Localizer["MultiSelectMaxMinTitle"]" Introduction="@Localizer["MultiSelectMaxMinIntro"]" Name="MaxMin">
<div style="max-width: 300px">
<p>@Localizer["MultiSelectMaxMinMax"]</p>
<MultiSelect Items="@LongItems" @bind-Value="@SelectedMaxItemsValue" Max="2" />
<MultiSelect Items="@LongItems" @bind-Value="@SelectedMaxItemsValue" Max="2"></MultiSelect>
</div>
<div style="max-width: 300px" class="mt-3">
<p>@Localizer["MultiSelectMaxMinMin"]</p>
<MultiSelect Items="@LongItems" @bind-Value="@SelectedMinItemsValue" Min="2" />
<MultiSelect Items="@LongItems" @bind-Value="@SelectedMinItemsValue" Min="2"></MultiSelect>
</div>
</DemoBlock>

Expand All @@ -210,7 +210,7 @@ private enum MultiSelectEnumFoo
<Select TValue="string" Items="@_cascadingItems2" OnSelectedItemChanged="@OnCascadeBindSelectClick"></Select>
</div>
<div class="col-12 col-sm-6">
<MultiSelect TValue="string" Items="@CascadingItems1" />
<MultiSelect TValue="string" Items="@CascadingItems1"></MultiSelect>
</div>
</div>
</DemoBlock>
Expand Down Expand Up @@ -251,7 +251,7 @@ private enum MultiSelectEnumFoo
<DemoBlock Title="@Localizer["MultiSelectPopoverTitle"]" Introduction="@Localizer["MultiSelectPopoverIntro"]" Name="Popover">
<div class="row">
<div class="col-12 col-sm-6 overflow-hidden">
<MultiSelect TValue="string" Items="@Items" IsPopover="true" ShowSearch="true" ShowToolbar />
<MultiSelect TValue="string" Items="@Items" IsPopover="true" ShowSearch="true" ShowToolbar="true"></MultiSelect>
</div>
</div>
</DemoBlock>
Expand All @@ -262,14 +262,14 @@ private enum MultiSelectEnumFoo
</section>
<div class="row g-3">
<div class="col-12 col-sm-6">
<MultiSelect @bind-Value="@_editString" Items="@EditableItems" IsEditable="true" Max="2" EditSubmitKey="EditSubmitKey.Enter" OnEditCallback="OnEditCallback" />
<MultiSelect @bind-Value="@_editString" Items="@EditableItems" IsEditable="true" Max="2" EditSubmitKey="EditSubmitKey.Enter" OnEditCallback="OnEditCallback"></MultiSelect>
</div>
<div class="col-12 col-sm-6">
<Display Value="@_editString"></Display>
</div>
</div>
</DemoBlock> *@
</DemoBlock>

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

<EventTable Items="@GetEvents()" />
<EventTable Items="@GetEvents()"></EventTable>
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.3.1-beta05</Version>
<Version>9.3.1-beta06</Version>
</PropertyGroup>

<ItemGroup>
Expand Down