Skip to content

Commit 3949f5a

Browse files
tongsonbarbstongsonbarbs
committed
additional
1 parent afd05ec commit 3949f5a

File tree

22 files changed

+121
-122
lines changed

22 files changed

+121
-122
lines changed

‎packages/devextreme-angular/src/ui/data-grid/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,10 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
494494
495495
*/
496496
@Input()
497-
get editing(): { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } {
497+
get editing(): { allowAdding?: boolean, allowDeleting?: boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } {
498498
return this._getOption('editing');
499499
}
500-
set editing(value: { allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) {
500+
set editing(value: { allowAdding?: boolean, allowDeleting?: boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) {
501501
this._setOption('editing', value);
502502
}
503503

@@ -1678,7 +1678,7 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
16781678
* This member supports the internal infrastructure and is not intended to be used directly from your code.
16791679
16801680
*/
1681-
@Output() editingChange: EventEmitter<{ allowAdding?: boolean, allowDeleting?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>;
1681+
@Output() editingChange: EventEmitter<{ allowAdding?: boolean, allowDeleting?: boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), allowUpdating?: boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, newRowPosition?: NewRowPosition, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: any | { addRow?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>;
16821682

16831683
/**
16841684

‎packages/devextreme-angular/src/ui/data-grid/nested/button-dxi.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ export class DxiDataGridButtonComponent extends CollectionNestedOption implement
4646
}
4747

4848
@Input()
49-
get disabled(): boolean | ((options: { column: dxDataGridColumn, component: dxDataGrid, row: dxDataGridRowObject }) => boolean) {
49+
get disabled(): boolean | ((options: any | { column: dxDataGridColumn, component: dxDataGrid, row: dxDataGridRowObject }) => boolean) {
5050
return this._getOption('disabled');
5151
}
52-
set disabled(value: boolean | ((options: { column: dxDataGridColumn, component: dxDataGrid, row: dxDataGridRowObject }) => boolean)) {
52+
set disabled(value: boolean | ((options: any | { column: dxDataGridColumn, component: dxDataGrid, row: dxDataGridRowObject }) => boolean)) {
5353
this._setOption('disabled', value);
5454
}
5555

@@ -102,10 +102,10 @@ export class DxiDataGridButtonComponent extends CollectionNestedOption implement
102102
}
103103

104104
@Input()
105-
get visible(): boolean | ((options: { column: dxDataGridColumn, component: dxDataGrid, row: dxDataGridRowObject }) => boolean) {
105+
get visible(): boolean | ((options: any | { column: dxDataGridColumn, component: dxDataGrid, row: dxDataGridRowObject }) => boolean) {
106106
return this._getOption('visible');
107107
}
108-
set visible(value: boolean | ((options: { column: dxDataGridColumn, component: dxDataGrid, row: dxDataGridRowObject }) => boolean)) {
108+
set visible(value: boolean | ((options: any | { column: dxDataGridColumn, component: dxDataGrid, row: dxDataGridRowObject }) => boolean)) {
109109
this._setOption('visible', value);
110110
}
111111

‎packages/devextreme-angular/src/ui/data-grid/nested/editing.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ export class DxoDataGridEditingComponent extends NestedOption implements OnDestr
4848
}
4949

5050
@Input()
51-
get allowDeleting(): boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean) {
51+
get allowDeleting(): boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean) {
5252
return this._getOption('allowDeleting');
5353
}
54-
set allowDeleting(value: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean)) {
54+
set allowDeleting(value: boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean)) {
5555
this._setOption('allowDeleting', value);
5656
}
5757

5858
@Input()
59-
get allowUpdating(): boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean) {
59+
get allowUpdating(): boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean) {
6060
return this._getOption('allowUpdating');
6161
}
62-
set allowUpdating(value: boolean | ((options: { component: dxDataGrid, row: dxDataGridRowObject }) => boolean)) {
62+
set allowUpdating(value: boolean | ((options: any | { component: dxDataGrid, row: dxDataGridRowObject }) => boolean)) {
6363
this._setOption('allowUpdating', value);
6464
}
6565

‎packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ export class DxiDataGridFieldComponent extends CollectionNestedOption {
4848
}
4949

5050
@Input()
51-
get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) {
51+
get customizeText(): ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string) {
5252
return this._getOption('customizeText');
5353
}
54-
set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) {
54+
set customizeText(value: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)) {
5555
this._setOption('customizeText', value);
5656
}
5757

‎packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ export class DxiFilterBuilderFieldComponent extends CollectionNestedOption {
4848
}
4949

5050
@Input()
51-
get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) {
51+
get customizeText(): ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string) {
5252
return this._getOption('customizeText');
5353
}
54-
set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) {
54+
set customizeText(value: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)) {
5555
this._setOption('customizeText', value);
5656
}
5757

‎packages/devextreme-angular/src/ui/tree-list/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,10 @@ export class DxTreeListComponent<TRowData = any, TKey = any> extends DxComponent
483483
484484
*/
485485
@Input()
486-
get editing(): { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } {
486+
get editing(): { allowAdding?: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean } {
487487
return this._getOption('editing');
488488
}
489-
set editing(value: { allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) {
489+
set editing(value: { allowAdding?: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }) {
490490
this._setOption('editing', value);
491491
}
492492

@@ -1659,7 +1659,7 @@ export class DxTreeListComponent<TRowData = any, TKey = any> extends DxComponent
16591659
* This member supports the internal infrastructure and is not intended to be used directly from your code.
16601660
16611661
*/
1662-
@Output() editingChange: EventEmitter<{ allowAdding?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>;
1662+
@Output() editingChange: EventEmitter<{ allowAdding?: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowDeleting?: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean), allowUpdating?: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean), changes?: Array<DataChange>, confirmDelete?: boolean, editColumnName?: string, editRowKey?: any, form?: dxFormOptions, mode?: GridsEditMode, popup?: dxPopupOptions<any>, refreshMode?: GridsEditRefreshMode, selectTextOnEditStart?: boolean, startEditAction?: StartEditAction, texts?: { addRow?: string, addRowToNode?: string, cancelAllChanges?: string, cancelRowChanges?: string, confirmDeleteMessage?: string, confirmDeleteTitle?: string, deleteRow?: string, editRow?: string, saveAllChanges?: string, saveRowChanges?: string, undeleteRow?: string, validationCancelChanges?: string }, useIcons?: boolean }>;
16631663

16641664
/**
16651665

‎packages/devextreme-angular/src/ui/tree-list/nested/button-dxi.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ export class DxiTreeListButtonComponent extends CollectionNestedOption implement
4747
}
4848

4949
@Input()
50-
get disabled(): boolean | ((options: { column: dxTreeListColumn, component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
50+
get disabled(): boolean | ((options: any | { column: dxTreeListColumn, component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
5151
return this._getOption('disabled');
5252
}
53-
set disabled(value: boolean | ((options: { column: dxTreeListColumn, component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
53+
set disabled(value: boolean | ((options: any | { column: dxTreeListColumn, component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
5454
this._setOption('disabled', value);
5555
}
5656

@@ -103,10 +103,10 @@ export class DxiTreeListButtonComponent extends CollectionNestedOption implement
103103
}
104104

105105
@Input()
106-
get visible(): boolean | ((options: { column: dxTreeListColumn, component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
106+
get visible(): boolean | ((options: any | { column: dxTreeListColumn, component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
107107
return this._getOption('visible');
108108
}
109-
set visible(value: boolean | ((options: { column: dxTreeListColumn, component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
109+
set visible(value: boolean | ((options: any | { column: dxTreeListColumn, component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
110110
this._setOption('visible', value);
111111
}
112112

‎packages/devextreme-angular/src/ui/tree-list/nested/editing.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,26 @@ import { DxiTreeListChangeComponent } from './change-dxi';
4040
})
4141
export class DxoTreeListEditingComponent extends NestedOption implements OnDestroy, OnInit {
4242
@Input()
43-
get allowAdding(): boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
43+
get allowAdding(): boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
4444
return this._getOption('allowAdding');
4545
}
46-
set allowAdding(value: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
46+
set allowAdding(value: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
4747
this._setOption('allowAdding', value);
4848
}
4949

5050
@Input()
51-
get allowDeleting(): boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
51+
get allowDeleting(): boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
5252
return this._getOption('allowDeleting');
5353
}
54-
set allowDeleting(value: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
54+
set allowDeleting(value: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
5555
this._setOption('allowDeleting', value);
5656
}
5757

5858
@Input()
59-
get allowUpdating(): boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
59+
get allowUpdating(): boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean) {
6060
return this._getOption('allowUpdating');
6161
}
62-
set allowUpdating(value: boolean | ((options: { component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
62+
set allowUpdating(value: boolean | ((options: any | { component: dxTreeList, row: dxTreeListRowObject }) => boolean)) {
6363
this._setOption('allowUpdating', value);
6464
}
6565

0 commit comments

Comments
 (0)