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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 2 additions & 3 deletions demos/aurelia/src/examples/slickgrid/example01.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h3>
<div class="grid-container1">
<aurelia-slickgrid
grid-id="grid1-1"
columns.bind="columnDefinitions1"
columns.bind="columns1"
options.bind="gridOptions1"
dataset.bind="dataset1"
on-aurelia-grid-created.trigger="aureliaGridReady($event.detail)"
Expand All @@ -44,5 +44,4 @@ <h3>
<hr />

<h3>Grid 2 <small>(with local Pagination)</small></h3>
<aurelia-slickgrid grid-id="grid1-2" columns.bind="columnDefinitions2" options.bind="gridOptions2" dataset.bind="dataset2">
</aurelia-slickgrid>
<aurelia-slickgrid grid-id="grid1-2" columns.bind="columns2" options.bind="gridOptions2" dataset.bind="dataset2"> </aurelia-slickgrid>
10 changes: 5 additions & 5 deletions demos/aurelia/src/examples/slickgrid/example01.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export class Example01 {
aureliaGrid1!: AureliaGridInstance;
gridOptions1!: GridOption;
gridOptions2!: GridOption;
columnDefinitions1: Column[] = [];
columnDefinitions2: Column[] = [];
columns1: Column[] = [];
columns2: Column[] = [];
dataset1: any[] = [];
dataset2: any[] = [];
hideSubTitle = false;
Expand Down Expand Up @@ -41,7 +41,7 @@ export class Example01 {

/* Define grid Options and Columns */
defineGrids() {
this.columnDefinitions1 = [
this.columns1 = [
{ id: 'title', name: 'Title', field: 'title', sortable: true, minWidth: 100 },
{ id: 'duration', name: 'Duration (days)', field: 'duration', sortable: true, minWidth: 100 },
{ id: '%', name: '% Complete', field: 'percentComplete', sortable: true, minWidth: 100 },
Expand All @@ -60,7 +60,7 @@ export class Example01 {

// copy the same Grid Options and Column Definitions to 2nd grid
// but also add Pagination in this grid
this.columnDefinitions2 = this.columnDefinitions1;
this.columns2 = this.columns1;
this.gridOptions2 = {
...this.gridOptions1,
...{
Expand Down Expand Up @@ -99,7 +99,7 @@ export class Example01 {

resetGrid1() {
// const cols = this.aureliaGrid1.slickGrid?.getColumns() || [];
const cols = this.columnDefinitions1.slice();
const cols = this.columns1.slice();
cols.forEach((c) => (c.hidden = false));
this.aureliaGrid1.slickGrid?.setColumns(cols);
this.aureliaGrid1.slickGrid?.autosizeColumns();
Expand Down
8 changes: 1 addition & 7 deletions demos/aurelia/src/examples/slickgrid/example02.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,5 @@ <h2>
</button>
<button class="btn btn-outline-secondary btn-sm btn-icon" click.trigger="disposeGrid()">Dispose Grid</button>

<aurelia-slickgrid
grid-id="grid2"
columns.bind="columnDefinitions"
options.bind="gridOptions"
dataset.bind="dataset"
instances.bind="aureliaGrid"
>
<aurelia-slickgrid grid-id="grid2" columns.bind="columns" options.bind="gridOptions" dataset.bind="dataset" instances.bind="aureliaGrid">
</aurelia-slickgrid>
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example02.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const customEnableButtonFormatter: Formatter<DataItem> = (_row: number, _cell: n
export class Example02 {
aureliaGrid!: AureliaGridInstance;
gridOptions!: GridOption;
columnDefinitions: Column<DataItem>[] = [];
columns: Column<DataItem>[] = [];
dataset: any[] = [];
hideSubTitle = false;
resizerPaused = false;
Expand All @@ -50,7 +50,7 @@ export class Example02 {
/* Define grid Options and Columns */
defineGrid() {
// the columns field property is type-safe, try to add a different string not representing one of DataItems properties
this.columnDefinitions = [
this.columns = [
{ id: 'title', name: 'Title', field: 'title', sortable: true, width: 70 },
{
id: 'phone',
Expand Down
2 changes: 1 addition & 1 deletion demos/aurelia/src/examples/slickgrid/example03.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ <h2>
<div id="grid-container" class="col-sm-12">
<aurelia-slickgrid
grid-id="grid3"
columns.bind="columnDefinitions"
columns.bind="columns"
options.bind="gridOptions"
dataset.bind="dataset"
instances.bind="aureliaGrid"
Expand Down
14 changes: 7 additions & 7 deletions demos/aurelia/src/examples/slickgrid/example03.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class Example03 {
private _commandQueue: EditCommand[] = [];
aureliaGrid!: AureliaGridInstance;
gridOptions!: GridOption;
columnDefinitions: Column[] = [];
columns: Column[] = [];
dataset: any[] = [];
updatedObject: any;
hideSubTitle = false;
Expand All @@ -79,7 +79,7 @@ export class Example03 {

/* Define grid Options and Columns */
defineGrid() {
this.columnDefinitions = [
this.columns = [
{
id: 'edit',
field: 'id',
Expand Down Expand Up @@ -464,7 +464,7 @@ export class Example03 {
// wrap into a timer to simulate a backend async call
setTimeout(() => {
// at any time, we can poke the "collection" property and modify it
const requisiteColumnDef = this.columnDefinitions.find((column: Column) => column.id === 'prerequisites');
const requisiteColumnDef = this.columns.find((column: Column) => column.id === 'prerequisites');
if (requisiteColumnDef) {
const collectionEditor = requisiteColumnDef.editor!.collection;
const collectionFilter = requisiteColumnDef.filter!.collection;
Expand All @@ -489,7 +489,7 @@ export class Example03 {

/** Delete last inserted row */
deleteItem() {
const requisiteColumnDef = this.columnDefinitions.find((column: Column) => column.id === 'prerequisites');
const requisiteColumnDef = this.columns.find((column: Column) => column.id === 'prerequisites');
if (requisiteColumnDef) {
const collectionEditor = requisiteColumnDef.editor!.collection;
const collectionFilter = requisiteColumnDef.filter!.collection;
Expand Down Expand Up @@ -596,20 +596,20 @@ export class Example03 {

// you can dynamically add your column to your column definitions
// and then use the spread operator [...cols] OR slice to force Aurelia to review the changes
this.columnDefinitions.push(newCol);
this.columns.push(newCol);

// NOTE if you use an Extensions (Checkbox Selector, Row Detail, ...) that modifies the column definitions in any way
// you MUST use "getAllColumnDefinitions()" from the GridService, using this will be ALL columns including the 1st column that is created internally
// for example if you use the Checkbox Selector (row selection), you MUST use the code below
/*
const allColumns = this.aureliaGrid.gridService.getAllColumnDefinitions();
allColumns.push(newCol);
this.columnDefinitions = [...allColumns]; // (or use slice) reassign to column definitions for Aurelia to do dirty checking
this.columns = [...allColumns]; // (or use slice) reassign to column definitions for Aurelia to do dirty checking
*/
}

dynamicallyRemoveLastColumn() {
this.columnDefinitions.pop();
this.columns.pop();

/*
// remove your column the full set of columns
Expand Down
2 changes: 1 addition & 1 deletion demos/aurelia/src/examples/slickgrid/example04.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h2>

<aurelia-slickgrid
grid-id="grid4"
columns.bind="columnDefinitions"
columns.bind="columns"
options.bind="gridOptions"
dataset.bind="dataset"
on-aurelia-grid-created.trigger="aureliaGridReady($event.detail)"
Expand Down
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example04.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const NB_ITEMS = 10500;

export class Example04 {
aureliaGrid!: AureliaGridInstance;
columnDefinitions: Column[] = [];
columns: Column[] = [];
gridOptions!: GridOption;
dataset: any[] = [];
hideSubTitle = false;
Expand All @@ -47,7 +47,7 @@ export class Example04 {

/* Define grid Options and Columns */
defineGrid() {
this.columnDefinitions = [
this.columns = [
{
id: 'title',
name: 'Title',
Expand Down
2 changes: 1 addition & 1 deletion demos/aurelia/src/examples/slickgrid/example05.html
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ <h2>

<aurelia-slickgrid
grid-id="grid5"
columns.bind="columnDefinitions"
columns.bind="columns"
options.bind="gridOptions"
dataset.bind="dataset"
pagination-options.bind="paginationOptions"
Expand Down
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example05.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const PERCENT_HTML_ESCAPED = '%25';

export class Example05 {
aureliaGrid!: AureliaGridInstance;
columnDefinitions: Column[] = [];
columns: Column[] = [];
gridOptions!: GridOption;
dataset: any[] = [];
hideSubTitle = false;
Expand All @@ -45,7 +45,7 @@ export class Example05 {
}

defineGrid() {
this.columnDefinitions = [
this.columns = [
{
id: 'name',
name: 'Name',
Expand Down
2 changes: 1 addition & 1 deletion demos/aurelia/src/examples/slickgrid/example06.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ <h2>

<aurelia-slickgrid
grid-id="grid6"
columns.bind="columnDefinitions"
columns.bind="columns"
options.bind="gridOptions"
dataset.bind="dataset"
on-aurelia-grid-created.trigger="aureliaGridReady($event.detail)"
Expand Down
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example06.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const FAKE_SERVER_DELAY = 250;
export class Example06 {
isWithCursor = false;
aureliaGrid!: AureliaGridInstance;
columnDefinitions: Column[] = [];
columns: Column[] = [];
gridOptions!: GridOption;
dataset: any[] = [];
metrics!: Metrics;
Expand Down Expand Up @@ -58,7 +58,7 @@ export class Example06 {
}

defineGrid() {
this.columnDefinitions = [
this.columns = [
{
id: 'name',
field: 'name',
Expand Down
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example07.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h2>
<h5>Grid 1</h5>
<aurelia-slickgrid
grid-id="grid7-1"
columns.bind="columnDefinitions1"
columns.bind="columns1"
options.bind="gridOptions1"
dataset.bind="dataset1"
on-aurelia-grid-created.trigger="aureliaGrid1Ready($event.detail)"
Expand All @@ -47,7 +47,7 @@ <h5>Grid 1</h5>
<h5>Grid 2 - <span class="subtitle">with both Header Buttons & Menus</span></h5>
<aurelia-slickgrid
grid-id="grid7-2"
columns.bind="columnDefinitions2"
columns.bind="columns2"
options.bind="gridOptions2"
dataset.bind="dataset2"
on-aurelia-grid-created.trigger="aureliaGrid2Ready($event.detail)"
Expand Down
10 changes: 5 additions & 5 deletions demos/aurelia/src/examples/slickgrid/example07.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ let columns1WithHighlightingById: any = {};
let columns2WithHighlightingById: any = {};

export class Example07 {
columnDefinitions1: Column[] = [];
columnDefinitions2: Column[] = [];
columns1: Column[] = [];
columns2: Column[] = [];
gridOptions1!: GridOption;
gridOptions2!: GridOption;
dataset1: any[] = [];
Expand Down Expand Up @@ -37,8 +37,8 @@ export class Example07 {
}

defineGrid() {
this.columnDefinitions1 = [];
this.columnDefinitions2 = [];
this.columns1 = [];
this.columns2 = [];

this.gridOptions1 = {
enableAutoResize: true,
Expand Down Expand Up @@ -210,7 +210,7 @@ export class Example07 {
}

// assign column definitions only once
this[`columnDefinitions${gridNo}`] = cols;
this[`columns${gridNo}`] = cols;

return mockDataset;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/aurelia/src/examples/slickgrid/example08.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2>

<aurelia-slickgrid
grid-id="grid8"
columns.bind="columnDefinitions"
columns.bind="columns"
options.bind="gridOptions"
dataset.bind="dataset"
on-aurelia-grid-created.trigger="aureliaGridReady($event.detail)"
Expand Down
6 changes: 3 additions & 3 deletions demos/aurelia/src/examples/slickgrid/example08.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import './example08.scss'; // provide custom CSS/SASS styling

export class Example08 {
aureliaGrid!: AureliaGridInstance;
columnDefinitions: Column[] = [];
columns: Column[] = [];
gridOptions!: GridOption;
dataset: any[] = [];
hideSubTitle = false;
Expand All @@ -32,7 +32,7 @@ export class Example08 {
}

defineGrid() {
this.columnDefinitions = [
this.columns = [
{ id: 'title', name: 'Title', field: 'title', nameKey: 'TITLE' },
{ id: 'duration', name: 'Duration', field: 'duration', nameKey: 'DURATION', sortable: true },
{ id: 'percentComplete', name: '% Complete', field: 'percentComplete', nameKey: 'PERCENT_COMPLETE', sortable: true },
Expand All @@ -41,7 +41,7 @@ export class Example08 {
{ id: 'completed', name: 'Completed', field: 'completed', nameKey: 'COMPLETED', formatter: Formatters.checkmarkMaterial },
];

this.columnDefinitions.forEach((columnDef) => {
this.columns.forEach((columnDef) => {
columnDef.header = {
menu: {
commandItems: [
Expand Down
2 changes: 1 addition & 1 deletion demos/aurelia/src/examples/slickgrid/example09.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h2>

<aurelia-slickgrid
grid-id="grid9"
columns.bind="columnDefinitions"
columns.bind="columns"
dataset.bind="dataset"
options.bind="gridOptions"
on-aurelia-grid-created.trigger="aureliaGridReady($event.detail)"
Expand Down
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example09.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import './example09.scss'; // provide custom CSS/SASS styling

export class Example09 {
aureliaGrid!: AureliaGridInstance;
columnDefinitions: Column[] = [];
columns: Column[] = [];
gridOptions!: GridOption;
dataset: any[] = [];
dataView!: SlickDataView;
Expand Down Expand Up @@ -44,7 +44,7 @@ export class Example09 {
}

defineGrid() {
this.columnDefinitions = [
this.columns = [
{ id: 'title', name: 'Title', field: 'title', nameKey: 'TITLE', filterable: true },
{
id: 'duration',
Expand Down
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example10.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2>
<div class="overflow-hidden">
<aurelia-slickgrid
grid-id="grid1"
columns.bind="columnDefinitions1"
columns.bind="columns1"
options.bind="gridOptions1"
dataset.bind="dataset1"
on-aurelia-grid-created.trigger="aureliaGrid1Ready($event.detail)"
Expand Down Expand Up @@ -93,7 +93,7 @@ <h2>
<div class="overflow-hidden">
<aurelia-slickgrid
grid-id="grid2"
columns.bind="columnDefinitions2"
columns.bind="columns2"
options.bind="gridOptions2"
dataset.bind="dataset2"
on-aurelia-grid-created.trigger="aureliaGrid2Ready($event.detail)"
Expand Down
8 changes: 4 additions & 4 deletions demos/aurelia/src/examples/slickgrid/example10.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export class Example10 {

aureliaGrid1!: AureliaGridInstance;
aureliaGrid2!: AureliaGridInstance;
columnDefinitions1: Column[] = [];
columnDefinitions2: Column[] = [];
columns1: Column[] = [];
columns2: Column[] = [];
gridOptions1!: GridOption;
gridOptions2!: GridOption;
dataset1: any[] = [];
Expand Down Expand Up @@ -39,7 +39,7 @@ export class Example10 {

/* Define grid Options and Columns */
defineGrids() {
this.columnDefinitions1 = [
this.columns1 = [
{ id: 'title', name: 'Title', field: 'title', sortable: true, filterable: true },
{ id: 'duration', name: 'Duration (days)', field: 'duration', sortable: true, type: 'number', filterable: true },
{
Expand Down Expand Up @@ -92,7 +92,7 @@ export class Example10 {
},
];

this.columnDefinitions2 = [
this.columns2 = [
{ id: 'title', name: 'Title', field: 'title', sortable: true, filterable: true },
{ id: 'duration', name: 'Duration (days)', field: 'duration', sortable: true, type: 'number', filterable: true },
{
Expand Down
Loading
Loading