Skip to content

Commit 47755e0

Browse files
mosBrkrmosBrkr
authored
Merge branch 'vikramlearning:main' into main
2 parents 3b71540 + 99558d9 commit 47755e0

52 files changed

Lines changed: 548 additions & 144 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BlazorBootstrap.Demo.Hosted/Client/wwwroot/appsettings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "3.3.1",
2+
"version": "3.4.0",
33
"release": {
4-
"short_description": "New CheckboxInput, PasswordInput, RadioInput, TextInput, TextAreaInput components, along with other enhancements!!!"
4+
"short_description": "Bootstrap and Icon Upgrades, along with Grid, Tabs, Sidebar, and Sidebar2 Enhancements!!!"
55
},
66
"urls": {
77
"docs": "//docs.blazorbootstrap.com/docs/getting-started/blazor-webassembly",

‎BlazorBootstrap.Demo.Hosted/Server/Pages/_Host.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
<base href="~/" />
1414
<link href="images/logo/128X128.png" rel="icon" type="image/png" />
1515
<!-- CSS only -->
16-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
16+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-LN+7fdVzj6u52u30Kp6M/trliBMCMKTyK833zpbD+pXdCLuTusPj697FH4R/5mcr" crossorigin="anonymous">
1717
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism.min.css" integrity="sha512-tN7Ec6zAFaVSG3TpNAKtk4DOHNpSwKHxxrsiw4GHKESGPs5njn/0sMCUMl2svV4wo4BK/rCP7juYz+zx+l6oeQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
1818
<link href="_content/Blazor.Bootstrap/blazor.bootstrap.css" rel="stylesheet" asp-append-version="true" />
1919
<link href="_content/BlazorBootstrap.Demo.RCL/css/blazorbootstrap.demo.rcl.css" rel="stylesheet" asp-append-version="true" />
20-
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet" />
20+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.13.1/font/bootstrap-icons.min.css">
2121
<link href="BlazorBootstrap.Demo.Hosted.Client.styles.css" rel="stylesheet" asp-append-version="true" />
2222
<!-- Font Awesome -->
2323
<script src="https://kit.fontawesome.com/42379982c2.js" crossorigin="anonymous"></script>
@@ -47,7 +47,7 @@
4747
<component type="typeof(App)" render-mode="WebAssemblyPrerendered" />
4848

4949
<script src="_framework/blazor.webassembly.js" autostart="false" asp-append-version="true"></script>
50-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
50+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js" integrity="sha384-ndDqU0Gzau9qJ1lfW4pNLlhNTkCfHzAVBReH9diLvGRem5+R9g2FzA8ZGN954O5Q" crossorigin="anonymous"></script>
5151
<!-- Add chart.js reference if chart components are used in your application. -->
5252
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.umd.js" integrity="sha512-ZwR1/gSZM3ai6vCdI+LVF1zSq/5HznD3ZSTk7kajkaj4D292NLuduDCO1c/NT8Id+jE58KYLKT7hXnbtryGmMg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
5353
<!-- Add chartjs-plugin-datalabels.min.js reference if chart components with data label feature is used in your application. -->

‎BlazorBootstrap.Demo.RCL/Components/Pages/Grid/01-Overview/Grid_Demo_01_Client_Side_Filtering_Paging_And_Sorting.razor‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<Grid TItem="Employee1"
2-
Class="table table-hover table-bordered table-striped"
3-
DataProvider="EmployeesDataProvider"
42
AllowFiltering="true"
53
AllowPaging="true"
6-
PageSize="5"
74
AllowSorting="true"
85
AllowSelection="true"
9-
SelectionMode="GridSelectionMode.Multiple"
6+
Class="table table-hover table-bordered table-striped"
7+
DataProvider="EmployeesDataProvider"
8+
PageSize="5"
9+
Responsive="true"
10+
RowKeySelector="(emp) => emp.Id"
1011
SelectedItemsChanged="OnSelectedItemsChanged"
11-
Responsive="true">
12+
SelectionMode="GridSelectionMode.Multiple">
1213

1314
<GridColumns>
1415
<GridColumn TItem="Employee1" HeaderText="Id" PropertyName="Id" SortKeySelector="item => item.Id">

‎BlazorBootstrap.Demo.RCL/Components/Pages/Grid/99-other/Grid_Demo_07_Increase_TextBox_Width.razor‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<Grid TItem="Employee3"
2+
Class="table table-hover table-bordered table-striped"
3+
DataProvider="EmployeesDataProvider"
4+
AllowFiltering="false"
5+
Responsive="true">
6+
7+
<GridColumns>
8+
<GridColumn TItem="Employee3" HeaderText="Id" PropertyName="Id" FilterTextboxWidth="80">
9+
@context.Id
10+
</GridColumn>
11+
<GridColumn TItem="Employee3" HeaderText="First Name" PropertyName="FirstName" FilterTextboxWidth="80">
12+
@context.FirstName
13+
</GridColumn>
14+
<GridColumn TItem="Employee3" HeaderText="Last Name" PropertyName="LastName" FilterTextboxWidth="80">
15+
@context.LastName
16+
</GridColumn>
17+
<GridColumn TItem="Employee3" HeaderText="Salary" HeaderTextAlignment="Alignment.End" TextAlignment="Alignment.End" PropertyName="Salary">
18+
<CurrencyInput Style="width:120px;" TextAlignment="Alignment.End" Value="@context.Salary" ValueExpression="() => context.Salary" />
19+
</GridColumn>
20+
<GridColumn TItem="Employee3" HeaderText="Email" PropertyName="Email">
21+
@context.Email
22+
</GridColumn>
23+
<GridColumn TItem="Employee3" HeaderText="Company" TextNoWrap="true" PropertyName="Company">
24+
@context.Company
25+
</GridColumn>
26+
<GridColumn TItem="Employee3" HeaderText="Designation" TextNoWrap="true" PropertyName="Designation">
27+
@context.Designation
28+
</GridColumn>
29+
<GridColumn TItem="Employee3" HeaderText="DOJ" PropertyName="DOJ">
30+
@context.DOJ
31+
</GridColumn>
32+
<GridColumn TItem="Employee3" HeaderText="Active" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center" PropertyName="IsActive">
33+
@context.IsActive
34+
</GridColumn>
35+
</GridColumns>
36+
37+
</Grid>
38+
39+
@code {
40+
private IEnumerable<Employee3>? employees;
41+
42+
private async Task<GridDataProviderResult<Employee3>> EmployeesDataProvider(GridDataProviderRequest<Employee3> request)
43+
{
44+
if (employees is null) // pull employees only one time for client-side filtering, sorting, and paging
45+
employees = GetEmployees(); // call a service or an API to pull the employees
46+
47+
return await Task.FromResult(request.ApplyTo(employees));
48+
}
49+
50+
private IEnumerable<Employee3> GetEmployees()
51+
{
52+
return new List<Employee3>
53+
{
54+
new Employee3 { Id = 107, FirstName = "Alice", LastName = "Reddy", Email = "alice@blazorbootstrap.com", Company = "BlazorBootstrap Company", Designation = "AI Engineer", DOJ = new DateOnly(1998, 11, 17), Salary = 7700, IsActive = true },
55+
new Employee3 { Id = 103, FirstName = "Bob", LastName = "Roy", Email = "bob@blazorbootstrap.com", Company = "BlazorBootstrap Company", Designation = "Senior DevOps Engineer", DOJ = new DateOnly(1985, 1, 5), Salary = 19000, IsActive = true },
56+
new Employee3 { Id = 106, FirstName = "John", LastName = "P", Email = "john@blazorbootstrap.com", Company = "BlazorBootstrap Company", Designation = "Data Engineer", DOJ = new DateOnly(1995, 4, 17), Salary = 12000, IsActive = true },
57+
new Employee3 { Id = 104, FirstName = "Pop", LastName = "Two", Email = "pop@blazorbootstrap.com", Company = "BlazorBootstrap Company", Designation = "Associate Architect", DOJ = new DateOnly(1985, 6, 8), Salary = 19000, IsActive = false },
58+
new Employee3 { Id = 105, FirstName = "Ronald", LastName = "Dire", Email = "ronald@blazorbootstrap.com", Company = "BlazorBootstrap Company", Designation = "Senior Data Engineer", DOJ = new DateOnly(1991, 8, 23), Salary = 16500, IsActive = true },
59+
new Employee3 { Id = 102, FirstName = "Line", LastName = "K", Email = "line@blazorbootstrap.com", Company = "BlazorBootstrap Company", Designation = "Architect", DOJ = new DateOnly(1977, 1, 12), Salary = 24000, IsActive = true },
60+
new Employee3 { Id = 101, FirstName = "Daniel", LastName = "Potter", Email = "daniel@blazorbootstrap.com", Company = "BlazorBootstrap Company", Designation = "Architect", DOJ = new DateOnly(1977, 1, 12), Salary = 21000, IsActive = true },
61+
new Employee3 { Id = 108, FirstName = "Zayne", LastName = "Simmons", Email = "zayne@blazorbootstrap.com", Company = "BlazorBootstrap Company", Designation = "Data Analyst", DOJ = new DateOnly(1991, 1, 1), Salary = 17850, IsActive = true },
62+
new Employee3 { Id = 109, FirstName = "Isha", LastName = "Davison", Email = "isha@blazorbootstrap.com", Company = "BlazorBootstrap Company", Designation = "App Maker", DOJ = new DateOnly(1996, 7, 1), Salary = 8000, IsActive = true },
63+
};
64+
}
65+
}

‎BlazorBootstrap.Demo.RCL/Components/Pages/Grid/99-other/Grid_Other_Documentation.razor‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
<Demo Type="typeof(Grid_Demo_06_Hide_Columns_Dynamically)" Tabs="true" />
4343
</Section>
4444

45+
<Section Size="HeadingSize.H2" Name="Increase textbox width" PageUrl="@pageUrl" Link="increase-textbox-width">
46+
<Demo Type="typeof(Grid_Demo_07_Increase_TextBox_Width)" Tabs="true" />
47+
</Section>
48+
4549
@code {
4650
private const string pageUrl = RouteConstants.Demos_Grid_OtherExamples_Documentation;
4751
private const string pageTitle = "Blazor Grid - Other examples";

0 commit comments

Comments
 (0)