Skip to content

Commit 9d398d9

Browse files
authored
Merge branch 'master' into ttonev-fix-10806
2 parents aadcaae + 4bd05ab commit 9d398d9

File tree

142 files changed

+17868
-320
lines changed

Some content is hidden

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

142 files changed

+17868
-320
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ All notable changes for each version of this project will be documented in this
55
## 13.1.0
66

77
### New Features
8+
- Added `IgxPivotGrid` component(Preview)
9+
- The igxPivotGrid is a data presentation control for displaying data in a pivot table. It enables users to perform complex analysis on the supplied data. Main purpose is to transform and display a flat array of data into a complex grouped structure with aggregated values based on the main 3 dimensions: rows, columns and values, which the user may specify depending on his/her business needs. The whole pivot grid configuration is set through `IPivotConfiguration` interface.
10+
11+
```html
12+
<igx-pivot-grid [data]="origData" [pivotConfiguration]="pivotConfigHierarchy">
13+
</igx-pivot-grid>
14+
```
15+
16+
- For more information, check out the [README](https://github.com/IgniteUI/igniteui-angular/blob/master/projects/igniteui-angular/src/lib/grids/pivot-grid/README.md), [specification](https://github.com/IgniteUI/igniteui-angular/wiki/igxPivotGrid-Specification) and [official documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/pivotgrid).
17+
818
- `igxTooltipTarget` directive now allows specifying a plain text tooltip without adding an additional DOM element decorated with the `igxTooltip` directive. This is achieved via the newly introduced `tooltip` string input.
919
```html
1020
<button igxTooltipTarget [tooltip]="'Infragistics Inc. HQ'">
@@ -99,6 +109,11 @@ All notable changes for each version of this project will be documented in this
99109
- Exposed new input `buttonText` which sets the text that is displayed inside the dropdown button in the toolbar.
100110
- `IgxCombo`
101111
- Added `groupSortingDirection` input, which allows you to set groups sorting order.
112+
- `igxChip`
113+
- Exposed drop directive related events for the chip when it's used as a drop target:
114+
- `dragLeave`
115+
- `dragDrop`
116+
- `dragOver`
102117
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
103118
- Added new directives for re-templating header sorting indicators - `IgxSortHeaderIconDirective`, `IgxSortAscendingHeaderIconDirective` and `IgxSortDescendingHeaderIconDirective`.
104119
- `IgxGrid`

package-lock.json

Lines changed: 35 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
"test:lib:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.grid.conf.js",
1515
"test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
1616
"test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
17+
"test:lib:pgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.pivot-grid.conf.js",
1718
"test:lib:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.non-grid.conf.js",
1819
"test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js",
1920
"test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js",
2021
"test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js",
22+
"test:lib:azure:pgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.pivot-grid.conf.js",
2123
"test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js",
2224
"test:lib:watch": "ng test igniteui-angular --karma-config=./projects/igniteui-angular/karma.watch.conf.js",
2325
"test:schematics": "ts-node --project projects/igniteui-angular/migrations/tsconfig.json ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/migrations/**/*.spec.ts ./projects/igniteui-angular/schematics/**/*.spec.ts",
@@ -87,14 +89,16 @@
8789
"@angular/language-service": "^13.1.1",
8890
"@angularclass/hmr": "^2.1.3",
8991
"@cypress/schematic": "^1.6.0",
92+
"@types/estree": "^0.0.50",
9093
"@types/jasmine": "^3.10.2",
9194
"@types/jasminewd2": "^2.0.10",
9295
"@types/node": "^12.20.36",
93-
"@types/sass-true": "^6.0.1",
96+
"@types/sass-true": "^6.0.2",
9497
"@types/webpack-env": "^1.16.3",
9598
"@typescript-eslint/eslint-plugin": "5.3.0",
9699
"@typescript-eslint/parser": "5.3.0",
97100
"browser-sync": "^2.27.7",
101+
"cypress": "latest",
98102
"del": "^6.0.0",
99103
"eslint": "^8.2.0",
100104
"eslint-plugin-import": "2.25.2",
@@ -131,7 +135,6 @@
131135
"typedoc": "^0.21.9",
132136
"typedoc-plugin-localization": "^2.2.4",
133137
"typescript": "^4.4.4",
134-
"webpack-sources": "1.3.0",
135-
"cypress": "latest"
138+
"webpack-sources": "1.3.0"
136139
}
137140
}

projects/igniteui-angular-i18n/src/i18n/BG/grid-resources.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,25 @@ const GridResourceStringsBG_: ExpandRequire<IGridResourceStrings> = {
132132
igx_grid_actions_pin_label: 'Закачи',
133133
igx_grid_actions_unpin_label: 'Откачи',
134134
igx_grid_actions_jumpUp_label: 'Придвижи се нагоре',
135-
igx_grid_actions_jumpDown_label: 'Придвижи се надолу'
135+
igx_grid_actions_jumpDown_label: 'Придвижи се надолу',
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time',
146+
igx_grid_pivot_empty_row_drop_area: 'Drop Row Fields here.',
147+
igx_grid_pivot_empty_column_drop_area: 'Drop Column Fields here.',
148+
igx_grid_pivot_empty_filter_drop_area: 'Drop Filter Fields here.',
149+
igx_grid_pivot_empty_value_drop_area: 'Drop Value Fields here.',
150+
igx_grid_pivot_row_drop_chip: 'Drop here to use as row',
151+
igx_grid_pivot_column_drop_chip: 'Drop here to use as column',
152+
igx_grid_pivot_filter_drop_chip: 'Drop here to use as filter',
153+
igx_grid_pivot_value_drop_chip: 'Drop here to use as value'
136154
};
137155

138156
/**

projects/igniteui-angular-i18n/src/i18n/CS/grid-resources.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,25 @@ const GridResourceStringsCS_: ExpandRequire<IGridResourceStrings> = {
132132
igx_grid_actions_pin_label: 'Kolík',
133133
igx_grid_actions_unpin_label: 'Odepnout',
134134
igx_grid_actions_jumpUp_label: 'Vyskočit',
135-
igx_grid_actions_jumpDown_label: 'Skočit dolů'
135+
igx_grid_actions_jumpDown_label: 'Skočit dolů',
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time',
146+
igx_grid_pivot_empty_row_drop_area: 'Drop Row Fields here.',
147+
igx_grid_pivot_empty_column_drop_area: 'Drop Column Fields here.',
148+
igx_grid_pivot_empty_filter_drop_area: 'Drop Filter Fields here.',
149+
igx_grid_pivot_empty_value_drop_area: 'Drop Value Fields here.',
150+
igx_grid_pivot_row_drop_chip: 'Drop here to use as row',
151+
igx_grid_pivot_column_drop_chip: 'Drop here to use as column',
152+
igx_grid_pivot_filter_drop_chip: 'Drop here to use as filter',
153+
igx_grid_pivot_value_drop_chip: 'Drop here to use as value'
136154
};
137155

138156
/**

projects/igniteui-angular-i18n/src/i18n/DA/grid-resources.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,25 @@ const GridResourceStringsDA_: ExpandRequire<IGridResourceStrings> = {
132132
igx_grid_actions_pin_label: 'Fastgør',
133133
igx_grid_actions_unpin_label: 'Frigør',
134134
igx_grid_actions_jumpUp_label: 'Spring op',
135-
igx_grid_actions_jumpDown_label: 'Spring ned'
135+
igx_grid_actions_jumpDown_label: 'Spring ned',
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time',
146+
igx_grid_pivot_empty_row_drop_area: 'Drop Row Fields here.',
147+
igx_grid_pivot_empty_column_drop_area: 'Drop Column Fields here.',
148+
igx_grid_pivot_empty_filter_drop_area: 'Drop Filter Fields here.',
149+
igx_grid_pivot_empty_value_drop_area: 'Drop Value Fields here.',
150+
igx_grid_pivot_row_drop_chip: 'Drop here to use as row',
151+
igx_grid_pivot_column_drop_chip: 'Drop here to use as column',
152+
igx_grid_pivot_filter_drop_chip: 'Drop here to use as filter',
153+
igx_grid_pivot_value_drop_chip: 'Drop here to use as value'
136154
};
137155

138156
/**

projects/igniteui-angular-i18n/src/i18n/DE/grid-resources.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,25 @@ const GridResourceStringsDE_: ExpandRequire<IGridResourceStrings> = {
132132
igx_grid_actions_pin_label: 'Fixiere',
133133
igx_grid_actions_unpin_label: 'Löse',
134134
igx_grid_actions_jumpUp_label: 'Springe hoch',
135-
igx_grid_actions_jumpDown_label: 'Springe runter'
135+
igx_grid_actions_jumpDown_label: 'Springe runter',
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time',
146+
igx_grid_pivot_empty_row_drop_area: 'Drop Row Fields here.',
147+
igx_grid_pivot_empty_column_drop_area: 'Drop Column Fields here.',
148+
igx_grid_pivot_empty_filter_drop_area: 'Drop Filter Fields here.',
149+
igx_grid_pivot_empty_value_drop_area: 'Drop Value Fields here.',
150+
igx_grid_pivot_row_drop_chip: 'Drop here to use as row',
151+
igx_grid_pivot_column_drop_chip: 'Drop here to use as column',
152+
igx_grid_pivot_filter_drop_chip: 'Drop here to use as filter',
153+
igx_grid_pivot_value_drop_chip: 'Drop here to use as value'
136154
};
137155

138156
/**

projects/igniteui-angular-i18n/src/i18n/ES/grid-resources.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,25 @@ const GridResourceStringsES_: ExpandRequire<IGridResourceStrings> = {
132132
igx_grid_actions_pin_label: 'Anclar',
133133
igx_grid_actions_unpin_label: 'Desanclar',
134134
igx_grid_actions_jumpUp_label: 'Saltar arriba',
135-
igx_grid_actions_jumpDown_label: 'Saltar abajo'
135+
igx_grid_actions_jumpDown_label: 'Saltar abajo',
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time',
146+
igx_grid_pivot_empty_row_drop_area: 'Drop Row Fields here.',
147+
igx_grid_pivot_empty_column_drop_area: 'Drop Column Fields here.',
148+
igx_grid_pivot_empty_filter_drop_area: 'Drop Filter Fields here.',
149+
igx_grid_pivot_empty_value_drop_area: 'Drop Value Fields here.',
150+
igx_grid_pivot_row_drop_chip: 'Drop here to use as row',
151+
igx_grid_pivot_column_drop_chip: 'Drop here to use as column',
152+
igx_grid_pivot_filter_drop_chip: 'Drop here to use as filter',
153+
igx_grid_pivot_value_drop_chip: 'Drop here to use as value'
136154
};
137155

138156
/**

0 commit comments

Comments
 (0)