Skip to content
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ export class DxoCardViewColumnHeaderFilterComponent extends NestedOption impleme
}

@Input()
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
return this._getOption('groupInterval');
}
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
this._setOption('groupInterval', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ export class DxoCardViewHeaderFilterComponent extends NestedOption implements On
}

@Input()
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
return this._getOption('groupInterval');
}
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
this._setOption('groupInterval', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ export class DxoDataGridColumnHeaderFilterComponent extends NestedOption impleme
}

@Input()
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
return this._getOption('groupInterval');
}
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
this._setOption('groupInterval', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ export class DxoDataGridHeaderFilterComponent extends NestedOption implements On
}

@Input()
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
return this._getOption('groupInterval');
}
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
this._setOption('groupInterval', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ export class DxoGanttColumnHeaderFilterComponent extends NestedOption implements
}

@Input()
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
return this._getOption('groupInterval');
}
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
this._setOption('groupInterval', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ export class DxoGanttHeaderFilterComponent extends NestedOption implements OnDes
}

@Input()
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
return this._getOption('groupInterval');
}
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
this._setOption('groupInterval', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ export abstract class DxoColumnHeaderFilter extends NestedOption {
this._setOption('dataSource', value);
}

get groupInterval(): HeaderFilterGroupInterval | number | undefined {
get groupInterval(): HeaderFilterGroupInterval | number | undefined | Array<string | number> {
return this._getOption('groupInterval');
}
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
set groupInterval(value: HeaderFilterGroupInterval | number | undefined | Array<string | number>) {
this._setOption('groupInterval', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ export class DxoTreeListColumnHeaderFilterComponent extends NestedOption impleme
}

@Input()
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
return this._getOption('groupInterval');
}
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
this._setOption('groupInterval', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ export class DxoTreeListHeaderFilterComponent extends NestedOption implements On
}

@Input()
get groupInterval(): HeaderFilterGroupInterval | number | undefined {
get groupInterval(): Array<number | string> | HeaderFilterGroupInterval | number | undefined {
return this._getOption('groupInterval');
}
set groupInterval(value: HeaderFilterGroupInterval | number | undefined) {
set groupInterval(value: Array<number | string> | HeaderFilterGroupInterval | number | undefined) {
this._setOption('groupInterval', value);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-react/src/card-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ type IColumnHeaderFilterProps = React.PropsWithChildren<{
allowSearch?: boolean;
allowSelectAll?: boolean;
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
groupInterval?: HeaderFilterGroupInterval | number | undefined;
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
height?: number | string | undefined;
search?: ColumnHeaderFilterSearchConfig;
searchMode?: SearchMode;
Expand Down Expand Up @@ -1532,7 +1532,7 @@ type IHeaderFilterProps = React.PropsWithChildren<{
allowSearch?: boolean;
allowSelectAll?: boolean;
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
groupInterval?: HeaderFilterGroupInterval | number | undefined;
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
height?: number | string | undefined;
search?: ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig;
searchMode?: SearchMode;
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-react/src/data-grid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ type IColumnHeaderFilterProps = React.PropsWithChildren<{
allowSearch?: boolean;
allowSelectAll?: boolean;
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
groupInterval?: HeaderFilterGroupInterval | number | undefined;
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
height?: number | string | undefined;
search?: ColumnHeaderFilterSearchConfig;
searchMode?: SearchMode;
Expand Down Expand Up @@ -1799,7 +1799,7 @@ type IHeaderFilterProps = React.PropsWithChildren<{
allowSearch?: boolean;
allowSelectAll?: boolean;
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
groupInterval?: HeaderFilterGroupInterval | number | undefined;
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
height?: number | string | undefined;
search?: ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig;
searchMode?: SearchMode;
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-react/src/gantt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ type IColumnHeaderFilterProps = React.PropsWithChildren<{
allowSearch?: boolean;
allowSelectAll?: boolean;
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
groupInterval?: HeaderFilterGroupInterval | number | undefined;
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
height?: number | string | undefined;
search?: ColumnHeaderFilterSearchConfig;
searchMode?: SearchMode;
Expand Down Expand Up @@ -541,7 +541,7 @@ type IHeaderFilterProps = React.PropsWithChildren<{
allowSearch?: boolean;
allowSelectAll?: boolean;
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
groupInterval?: HeaderFilterGroupInterval | number | undefined;
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
height?: number | string | undefined;
search?: ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig;
searchMode?: SearchMode;
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-react/src/tree-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ type IColumnHeaderFilterProps = React.PropsWithChildren<{
allowSearch?: boolean;
allowSelectAll?: boolean;
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
groupInterval?: HeaderFilterGroupInterval | number | undefined;
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
height?: number | string | undefined;
search?: ColumnHeaderFilterSearchConfig;
searchMode?: SearchMode;
Expand Down Expand Up @@ -1502,7 +1502,7 @@ type IHeaderFilterProps = React.PropsWithChildren<{
allowSearch?: boolean;
allowSelectAll?: boolean;
dataSource?: Array<any> | DataSourceOptions | ((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void) | null | Store | undefined;
groupInterval?: HeaderFilterGroupInterval | number | undefined;
groupInterval?: Array<number | string> | HeaderFilterGroupInterval | number | undefined;
height?: number | string | undefined;
search?: ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig;
searchMode?: SearchMode;
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/card-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ const DxColumnHeaderFilterConfig = {
allowSearch: Boolean,
allowSelectAll: Boolean,
dataSource: [Array, Object, Function] as PropType<Array<any> | DataSourceOptions | (((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record<string, any>>,
groupInterval: [String, Number] as PropType<HeaderFilterGroupInterval | number>,
groupInterval: [Array, String, Number] as PropType<(Array<number | string>) | HeaderFilterGroupInterval | number>,
height: [Number, String],
search: Object as PropType<ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig | Record<string, any>>,
searchMode: String as PropType<SearchMode>,
Expand Down Expand Up @@ -1957,7 +1957,7 @@ const DxHeaderFilterConfig = {
allowSearch: Boolean,
allowSelectAll: Boolean,
dataSource: [Array, Object, Function] as PropType<Array<any> | DataSourceOptions | (((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record<string, any>>,
groupInterval: [String, Number] as PropType<HeaderFilterGroupInterval | number>,
groupInterval: [Array, String, Number] as PropType<(Array<number | string>) | HeaderFilterGroupInterval | number>,
height: [Number, String],
search: Object as PropType<ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig | Record<string, any>>,
searchMode: String as PropType<SearchMode>,
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/data-grid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ const DxColumnHeaderFilterConfig = {
allowSearch: Boolean,
allowSelectAll: Boolean,
dataSource: [Array, Object, Function] as PropType<Array<any> | DataSourceOptions | (((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record<string, any>>,
groupInterval: [String, Number] as PropType<HeaderFilterGroupInterval | number>,
groupInterval: [Array, String, Number] as PropType<(Array<number | string>) | HeaderFilterGroupInterval | number>,
height: [Number, String],
search: Object as PropType<ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig | Record<string, any>>,
searchMode: String as PropType<SearchMode>,
Expand Down Expand Up @@ -2317,7 +2317,7 @@ const DxHeaderFilterConfig = {
allowSearch: Boolean,
allowSelectAll: Boolean,
dataSource: [Array, Object, Function] as PropType<Array<any> | DataSourceOptions | (((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record<string, any>>,
groupInterval: [String, Number] as PropType<HeaderFilterGroupInterval | number>,
groupInterval: [Array, String, Number] as PropType<(Array<number | string>) | HeaderFilterGroupInterval | number>,
height: [Number, String],
search: Object as PropType<ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig | Record<string, any>>,
searchMode: String as PropType<SearchMode>,
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/gantt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ const DxColumnHeaderFilterConfig = {
allowSearch: Boolean,
allowSelectAll: Boolean,
dataSource: [Array, Object, Function] as PropType<Array<any> | DataSourceOptions | (((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record<string, any>>,
groupInterval: [String, Number] as PropType<HeaderFilterGroupInterval | number>,
groupInterval: [Array, String, Number] as PropType<(Array<number | string>) | HeaderFilterGroupInterval | number>,
height: [Number, String],
search: Object as PropType<ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig | Record<string, any>>,
searchMode: String as PropType<SearchMode>,
Expand Down Expand Up @@ -796,7 +796,7 @@ const DxHeaderFilterConfig = {
allowSearch: Boolean,
allowSelectAll: Boolean,
dataSource: [Array, Object, Function] as PropType<Array<any> | DataSourceOptions | (((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record<string, any>>,
groupInterval: [String, Number] as PropType<HeaderFilterGroupInterval | number>,
groupInterval: [Array, String, Number] as PropType<(Array<number | string>) | HeaderFilterGroupInterval | number>,
height: [Number, String],
search: Object as PropType<ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig | Record<string, any>>,
searchMode: String as PropType<SearchMode>,
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/tree-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1091,7 +1091,7 @@ const DxColumnHeaderFilterConfig = {
allowSearch: Boolean,
allowSelectAll: Boolean,
dataSource: [Array, Object, Function] as PropType<Array<any> | DataSourceOptions | (((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record<string, any>>,
groupInterval: [String, Number] as PropType<HeaderFilterGroupInterval | number>,
groupInterval: [Array, String, Number] as PropType<(Array<number | string>) | HeaderFilterGroupInterval | number>,
height: [Number, String],
search: Object as PropType<ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig | Record<string, any>>,
searchMode: String as PropType<SearchMode>,
Expand Down Expand Up @@ -2022,7 +2022,7 @@ const DxHeaderFilterConfig = {
allowSearch: Boolean,
allowSelectAll: Boolean,
dataSource: [Array, Object, Function] as PropType<Array<any> | DataSourceOptions | (((options: { component: Record<string, any>, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record<string, any>>,
groupInterval: [String, Number] as PropType<HeaderFilterGroupInterval | number>,
groupInterval: [Array, String, Number] as PropType<(Array<number | string>) | HeaderFilterGroupInterval | number>,
height: [Number, String],
search: Object as PropType<ColumnHeaderFilterSearchConfig | HeaderFilterSearchConfig | Record<string, any>>,
searchMode: String as PropType<SearchMode>,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PopupModel } from '@ts/ui/__tests__/__mock__/model/popup';
import { TreeViewModel } from '@ts/ui/__tests__/__mock__/model/tree_view';
import { TreeViewModel } from '@ts/ui/__tests__/__mock__/model/tree_view/tree_view';

const CLASSES = {
filterBuilder: 'dx-filterbuilder',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PopupModel } from '@ts/ui/__tests__/__mock__/model/popup';
import { TreeViewModel } from '@ts/ui/__tests__/__mock__/model/tree_view';
import { TreeViewModel } from '@ts/ui/__tests__/__mock__/model/tree_view/tree_view';

export class ColumnChooserModel extends PopupModel {
private readonly columnChooserListClass: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ColumnChooserModel } from './column_chooser';
import { ConfirmationDialogModel } from './confirmation_dialog';
import { EditFormModel } from './edit_form';
import { FilterPanelModel } from './filter_panel';
import { HeaderFilterModel } from './header_filter';
import { DataRowModel } from './row/data_row';
import { FilterRowModel } from './row/filter_row';
import { GroupRowModel } from './row/group_row';
Expand Down Expand Up @@ -73,6 +74,12 @@ export abstract class GridCoreModel<TInstance = GridBase | CardView> {
return $(Array.from(this.getHeaderCells()).find((el) => $(el).text().includes(text)));
}

public openHeaderFilter(columnIndex: number): HeaderFilterModel {
(this.getHeaderCellFilter(columnIndex).get(0) as HTMLElement).click();

return new HeaderFilterModel();
}

public getDataRows(): NodeListOf<HTMLElement> {
return this.root.querySelectorAll(`.${SELECTORS.dataRowClass}`);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { PopupModel } from '@ts/ui/__tests__/__mock__/model/popup';
import { TreeViewModel } from '@ts/ui/__tests__/__mock__/model/tree_view/tree_view';

const CLASSES = {
headerFilterMenu: 'dx-header-filter-menu',
listItemContent: 'dx-list-item-content',
treeView: 'dx-treeview',
};

const SELECTORS = {
Expand All @@ -15,6 +17,12 @@ export class HeaderFilterModel extends PopupModel {
return popup?.querySelector(SELECTORS.okButton) as HTMLElement;
}

public getTreeView(): TreeViewModel {
const popup = this.getPopupWrapper();
const treeViewElement = popup?.querySelector(`.${CLASSES.treeView}`) as HTMLElement;
return new TreeViewModel(treeViewElement);
}

public getListItems(): HTMLElement[] {
const popup = this.getPopupWrapper();
const listItems = popup?.querySelectorAll(`.${CLASSES.listItemContent}`);
Expand Down
Loading
Loading