Skip to content

Commit a7970d1

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Improve samples a bit.
1 parent 35a1bde commit a7970d1

File tree

5 files changed

+8113
-361
lines changed

5 files changed

+8113
-361
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,7 @@
11781178

11791179
%grid-row--mrl {
11801180
%igx-grid__hierarchical-expander--header,
1181+
%igx-grid__hierarchical-expander,
11811182
%igx-grid__header-indentation,
11821183
%igx-grid__row-indentation,
11831184
%grid__cbx-selection {
@@ -1310,6 +1311,7 @@
13101311
}
13111312

13121313
%grid__cbx-selection,
1314+
%igx-grid__hierarchical-expander,
13131315
%igx-grid__row-indentation,
13141316
%igx-grid__drag-indicator {
13151317
border-bottom: rem(1px) solid var-get($theme, 'row-border-color');

src/app/grid-cellMerging/grid-cellMerging.component.html

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h4 class="sample-title">Grid with cell merge</h4>
22

33
<div class="grid__wrapper">
4-
<igx-input-group type="search" class="offset">
4+
<igx-input-group type="search" class="searchInput">
55
<igx-prefix>
66
@if (searchText.length === 0) {
77
<igx-icon>search</igx-icon>
@@ -45,46 +45,47 @@ <h4 class="sample-title">Grid with cell merge</h4>
4545
</div>
4646
<igx-grid [data]="data" width="800px" height="550px" [moving]="true" #grid1
4747
[cellMergeMode]="'always'" [rowSelection]="'single'">
48-
<igx-column field="ProductID" header="Product ID" width="200px">
49-
<ng-template igxCell let-cell="cell" let-val>
50-
<div>
51-
<button igxButton>Test {{cell.row.index}}</button>
52-
<!-- @if (cell.row.index % 2 == 0) {
53-
<br/>
54-
<button igxButton>Test 2</button>
55-
} -->
56-
57-
</div>
58-
</ng-template>
48+
<igx-column field="OrderID" header="Order ID" [hidden]="true" >
49+
</igx-column>
50+
<igx-column field="ShipCountry" header="Ship Country" width="200px" [merge]="true" sortable="true">
51+
</igx-column>
52+
<igx-column field="OrderDate" header="Order Date" width="200px" [dataType]="'date'" sortable="true">
53+
</igx-column>
54+
<igx-column field="PostalCode" header="Postal Code" width="200px" >
55+
</igx-column>
56+
<igx-column field="Discontinued" header="Discontinued" width="200px" sortable="true">
57+
</igx-column>
58+
<igx-column field="ShipName" header="Ship Name" width="250px">
59+
</igx-column>
60+
<igx-column field="ShipCity" header="Ship City" width="250px">
5961
</igx-column>
60-
<igx-column field="ReorderLevel" width="200px" [merge]="true" editable="true">
62+
<igx-column field="ShipperName" header="Shipper Name" width="250px">
6163
</igx-column>
62-
<igx-column required field="ProductName" width="200px" [merge]="true" groupable="true">
64+
<igx-column field="Salesperson" header="Salesperson" width="250px">
6365
</igx-column>
64-
<igx-column field="UnitsInStock" header="UnitsInStock" width="200px" [merge]="true">
66+
<igx-column field="UnitPrice" header="Unit Price" width="150px" dataType="number">
6567
</igx-column>
66-
<igx-column field="OrderDate" width="200px">
68+
<igx-column field="Quantity" header="Quantity" width="150px" dataType="number">
6769
</igx-column>
6870
<igx-paginator [perPage]="20">
6971
</igx-paginator>
70-
<igx-action-strip>
72+
<!-- <igx-action-strip>
7173
<igx-grid-pinning-actions></igx-grid-pinning-actions>
72-
</igx-action-strip>
74+
</igx-action-strip> -->
7375
<igx-grid-toolbar>
7476
<igx-grid-toolbar-actions>
7577
<igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>
7678
<igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
77-
<igx-grid-toolbar-exporter></igx-grid-toolbar-exporter>
7879
</igx-grid-toolbar-actions>
7980
</igx-grid-toolbar>
8081
</igx-grid>
8182

8283
<h4 class="sample-title">Hierarchical grid with cell merge</h4>
8384

84-
<igx-hierarchical-grid #hierarchicalGrid width="800px" [height]="'550px'" [data]="hierarchicalData" [autoGenerate]="false"
85+
<igx-hierarchical-grid #hierarchicalGrid width="800px" [rowSelection]="'single'" [height]="'550px'" [data]="hierarchicalData" [autoGenerate]="false"
8586
[allowAdvancedFiltering]="true" [cellMergeMode]="'always'">
8687
<igx-grid-toolbar></igx-grid-toolbar>
87-
<igx-column field="EmployeeID" width="200px">
88+
<igx-column field="EmployeeID" width="200px" [hidden]="true">
8889
</igx-column>
8990
<igx-column field="FirstName" width="200px">
9091
</igx-column>
@@ -108,7 +109,7 @@ <h4 class="sample-title">Hierarchical grid with cell merge</h4>
108109

109110
<h4 class="sample-title">Tree grid with cell merge</h4>
110111

111-
<igx-tree-grid [autoGenerate]="false" [data]="treeData" [cellMergeMode]="'always'" [mergeStrategy]="treeGridMergeStrategy"
112+
<igx-tree-grid [autoGenerate]="false" [rowSelection]="'single'" [data]="treeData" [cellMergeMode]="'always'" [mergeStrategy]="treeGridMergeStrategy"
112113
childDataKey="ChildCompanies" primaryKey="ID" [expansionDepth]="1" width="800px" [height]="'550px'">
113114
<igx-column field="ContactName" width="200px">
114115
</igx-column>

src/app/grid-cellMerging/grid-cellMerging.component.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@
1717
.grid-size {
1818
--ig-size: var(--ig-size-small);
1919
}
20+
.searchInput{
21+
width: 800px;
22+
}

0 commit comments

Comments
 (0)