@progress/kendo-vue-grid 3.7.4-dev.202212020747 → 3.7.4-dev.202301091431
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/cdn/js/kendo-vue-grid.js +1 -1
- package/dist/es/Grid.js +234 -80
- package/dist/es/GridToolbar.js +5 -1
- package/dist/es/cells/GridCell.d.ts +8 -1
- package/dist/es/cells/GridCell.js +11 -2
- package/dist/es/cells/GridDetailCell.js +1 -1
- package/dist/es/cells/GridDetailHierarchyCell.js +1 -1
- package/dist/es/cells/GridEditCell.d.ts +8 -1
- package/dist/es/cells/GridEditCell.js +13 -4
- package/dist/es/cells/GridFilterCell.js +34 -22
- package/dist/es/cells/GridGroupCell.d.ts +14 -2
- package/dist/es/cells/GridGroupCell.js +26 -3
- package/dist/es/cells/GridHierarchyCell.js +15 -2
- package/dist/es/cells/GridSelectionCell.d.ts +8 -1
- package/dist/es/cells/GridSelectionCell.js +10 -1
- package/dist/es/columnMenu/ColumnMenu.js +14 -6
- package/dist/es/columnMenu/GridColumnMenuCheckboxFilter.js +10 -3
- package/dist/es/columnMenu/GridColumnMenuItem.js +3 -3
- package/dist/es/columnMenu/GridColumnMenuSort.js +8 -8
- package/dist/es/drag/ColumnDraggable.js +15 -2
- package/dist/es/drag/DragClue.js +6 -2
- package/dist/es/drag/GroupingIndicator.js +38 -23
- package/dist/es/filterCommon.d.ts +4 -0
- package/dist/es/filterCommon.js +17 -1
- package/dist/es/footer/Footer.js +12 -2
- package/dist/es/footer/FooterRow.d.ts +1 -0
- package/dist/es/footer/FooterRow.js +12 -6
- package/dist/es/header/FilterRow.d.ts +1 -0
- package/dist/es/header/FilterRow.js +30 -30
- package/dist/es/header/GroupPanel.d.ts +1 -0
- package/dist/es/header/GroupPanel.js +18 -5
- package/dist/es/header/Header.js +4 -12
- package/dist/es/header/HeaderRow.d.ts +2 -0
- package/dist/es/header/HeaderRow.js +51 -18
- package/dist/es/interfaces/GridFilterCellProps.d.ts +12 -0
- package/dist/es/messages/main.d.ts +60 -0
- package/dist/es/messages/main.js +60 -0
- package/dist/es/package-metadata.js +1 -1
- package/dist/es/rows/GridRow.js +2 -2
- package/dist/es/utils/main.js +1 -1
- package/dist/esm/Grid.js +234 -80
- package/dist/esm/GridToolbar.js +5 -1
- package/dist/esm/cells/GridCell.d.ts +8 -1
- package/dist/esm/cells/GridCell.js +11 -2
- package/dist/esm/cells/GridDetailCell.js +1 -1
- package/dist/esm/cells/GridDetailHierarchyCell.js +1 -1
- package/dist/esm/cells/GridEditCell.d.ts +8 -1
- package/dist/esm/cells/GridEditCell.js +13 -4
- package/dist/esm/cells/GridFilterCell.js +34 -22
- package/dist/esm/cells/GridGroupCell.d.ts +14 -2
- package/dist/esm/cells/GridGroupCell.js +26 -3
- package/dist/esm/cells/GridHierarchyCell.js +15 -2
- package/dist/esm/cells/GridSelectionCell.d.ts +8 -1
- package/dist/esm/cells/GridSelectionCell.js +10 -1
- package/dist/esm/columnMenu/ColumnMenu.js +14 -6
- package/dist/esm/columnMenu/GridColumnMenuCheckboxFilter.js +10 -3
- package/dist/esm/columnMenu/GridColumnMenuItem.js +3 -3
- package/dist/esm/columnMenu/GridColumnMenuSort.js +8 -8
- package/dist/esm/drag/ColumnDraggable.js +15 -2
- package/dist/esm/drag/DragClue.js +6 -2
- package/dist/esm/drag/GroupingIndicator.js +38 -23
- package/dist/esm/filterCommon.d.ts +4 -0
- package/dist/esm/filterCommon.js +17 -1
- package/dist/esm/footer/Footer.js +12 -2
- package/dist/esm/footer/FooterRow.d.ts +1 -0
- package/dist/esm/footer/FooterRow.js +12 -6
- package/dist/esm/header/FilterRow.d.ts +1 -0
- package/dist/esm/header/FilterRow.js +30 -30
- package/dist/esm/header/GroupPanel.d.ts +1 -0
- package/dist/esm/header/GroupPanel.js +18 -5
- package/dist/esm/header/Header.js +4 -12
- package/dist/esm/header/HeaderRow.d.ts +2 -0
- package/dist/esm/header/HeaderRow.js +51 -18
- package/dist/esm/interfaces/GridFilterCellProps.d.ts +12 -0
- package/dist/esm/messages/main.d.ts +60 -0
- package/dist/esm/messages/main.js +60 -0
- package/dist/esm/package-metadata.js +1 -1
- package/dist/esm/rows/GridRow.js +2 -2
- package/dist/esm/utils/main.js +1 -1
- package/dist/npm/Grid.js +234 -80
- package/dist/npm/GridToolbar.js +5 -1
- package/dist/npm/cells/GridCell.d.ts +8 -1
- package/dist/npm/cells/GridCell.js +11 -2
- package/dist/npm/cells/GridDetailCell.js +1 -1
- package/dist/npm/cells/GridDetailHierarchyCell.js +1 -1
- package/dist/npm/cells/GridEditCell.d.ts +8 -1
- package/dist/npm/cells/GridEditCell.js +13 -4
- package/dist/npm/cells/GridFilterCell.js +33 -21
- package/dist/npm/cells/GridGroupCell.d.ts +14 -2
- package/dist/npm/cells/GridGroupCell.js +26 -3
- package/dist/npm/cells/GridHierarchyCell.js +15 -2
- package/dist/npm/cells/GridSelectionCell.d.ts +8 -1
- package/dist/npm/cells/GridSelectionCell.js +10 -1
- package/dist/npm/columnMenu/ColumnMenu.js +13 -5
- package/dist/npm/columnMenu/GridColumnMenuCheckboxFilter.js +9 -2
- package/dist/npm/columnMenu/GridColumnMenuItem.js +2 -2
- package/dist/npm/columnMenu/GridColumnMenuSort.js +8 -8
- package/dist/npm/drag/ColumnDraggable.js +15 -2
- package/dist/npm/drag/DragClue.js +6 -2
- package/dist/npm/drag/GroupingIndicator.js +37 -22
- package/dist/npm/filterCommon.d.ts +4 -0
- package/dist/npm/filterCommon.js +18 -1
- package/dist/npm/footer/Footer.js +12 -2
- package/dist/npm/footer/FooterRow.d.ts +1 -0
- package/dist/npm/footer/FooterRow.js +12 -6
- package/dist/npm/header/FilterRow.d.ts +1 -0
- package/dist/npm/header/FilterRow.js +28 -28
- package/dist/npm/header/GroupPanel.d.ts +1 -0
- package/dist/npm/header/GroupPanel.js +17 -4
- package/dist/npm/header/Header.js +4 -12
- package/dist/npm/header/HeaderRow.d.ts +2 -0
- package/dist/npm/header/HeaderRow.js +50 -17
- package/dist/npm/interfaces/GridFilterCellProps.d.ts +12 -0
- package/dist/npm/messages/main.d.ts +60 -0
- package/dist/npm/messages/main.js +61 -1
- package/dist/npm/package-metadata.js +1 -1
- package/dist/npm/rows/GridRow.js +2 -2
- package/dist/npm/utils/main.js +1 -1
- package/package.json +18 -16
|
@@ -42,6 +42,7 @@ var ColumnDraggableVue2 = {
|
|
|
42
42
|
},
|
|
43
43
|
// @ts-ignore
|
|
44
44
|
render: function render(createElement) {
|
|
45
|
+
var _this = this;
|
|
45
46
|
var h = gh || createElement;
|
|
46
47
|
var defaultSlot = getDefaultSlots(this);
|
|
47
48
|
return (
|
|
@@ -57,8 +58,20 @@ var ColumnDraggableVue2 = {
|
|
|
57
58
|
onRelease: this.onRelease,
|
|
58
59
|
ref: 'draggable'
|
|
59
60
|
}, this.v3 ? function () {
|
|
60
|
-
return [h("tr",
|
|
61
|
-
|
|
61
|
+
return [h("tr", {
|
|
62
|
+
"class": 'k-table-row',
|
|
63
|
+
role: 'row',
|
|
64
|
+
attrs: _this.v3 ? undefined : {
|
|
65
|
+
role: 'row'
|
|
66
|
+
}
|
|
67
|
+
}, [defaultSlot])];
|
|
68
|
+
} : [h("tr", {
|
|
69
|
+
"class": 'k-table-row',
|
|
70
|
+
role: 'row',
|
|
71
|
+
attrs: _this.v3 ? undefined : {
|
|
72
|
+
role: 'row'
|
|
73
|
+
}
|
|
74
|
+
}, [defaultSlot])])
|
|
62
75
|
);
|
|
63
76
|
}
|
|
64
77
|
};
|
package/dist/es/drag/DragClue.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// @ts-ignore
|
|
2
|
+
import { Icon } from '@progress/kendo-vue-common';
|
|
2
3
|
import * as Vue from 'vue';
|
|
3
4
|
var allVue = Vue;
|
|
4
5
|
var gh = allVue.h;
|
|
@@ -38,8 +39,11 @@ var DragClueVue2 = {
|
|
|
38
39
|
}
|
|
39
40
|
}, [h("span", {
|
|
40
41
|
"class": 'k-icon k-drag-status ' + this.status + ' k-icon-with-modifier'
|
|
41
|
-
}, [h(
|
|
42
|
-
|
|
42
|
+
}, [h(Icon, {
|
|
43
|
+
name: "modifier",
|
|
44
|
+
attrs: this.v3 ? undefined : {
|
|
45
|
+
name: "modifier"
|
|
46
|
+
}
|
|
43
47
|
})]), this.innerText]);
|
|
44
48
|
}
|
|
45
49
|
};
|
|
@@ -4,7 +4,8 @@ var allVue = Vue;
|
|
|
4
4
|
var gh = allVue.h;
|
|
5
5
|
var isV3 = allVue.version && allVue.version[0] === '3';
|
|
6
6
|
var ref = allVue.ref;
|
|
7
|
-
import { Draggable, getRef, setRef } from '@progress/kendo-vue-common';
|
|
7
|
+
import { Draggable, getRef, Icon, setRef } from '@progress/kendo-vue-common';
|
|
8
|
+
import { sortAscSmallIcon, sortDescSmallIcon, xCircleIcon } from '@progress/kendo-svg-icons';
|
|
8
9
|
/**
|
|
9
10
|
* @hidden
|
|
10
11
|
*/
|
|
@@ -73,12 +74,16 @@ var GroupingIndicatorVue2 = {
|
|
|
73
74
|
ref: 'draggable'
|
|
74
75
|
}, this.v3 ? function () {
|
|
75
76
|
return [h("div", {
|
|
76
|
-
"class": "k-
|
|
77
|
+
"class": "k-chip k-chip-md k-chip-solid k-chip-solid-base k-rounded-md",
|
|
77
78
|
ref: setRef(_this, 'indicatorContainer')
|
|
78
|
-
}, [h(
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
79
|
+
}, [h(Icon, {
|
|
80
|
+
name: 'sort-' + _this.$props.dir + '-small',
|
|
81
|
+
attrs: _this.v3 ? undefined : {
|
|
82
|
+
name: 'sort-' + _this.$props.dir + '-small',
|
|
83
|
+
icon: _this.$props.dir === 'asc' ? sortAscSmallIcon : sortDescSmallIcon
|
|
84
|
+
},
|
|
85
|
+
"class": 'k-chip-icon',
|
|
86
|
+
icon: _this.$props.dir === 'asc' ? sortAscSmallIcon : sortDescSmallIcon
|
|
82
87
|
}), h("span", {
|
|
83
88
|
"class": "k-chip-content",
|
|
84
89
|
tabindex: -1,
|
|
@@ -89,9 +94,7 @@ var GroupingIndicatorVue2 = {
|
|
|
89
94
|
on: _this.v3 ? undefined : {
|
|
90
95
|
"click": _this.sortChange
|
|
91
96
|
}
|
|
92
|
-
}, [h("span", {
|
|
93
|
-
"class": "k-chip-text"
|
|
94
|
-
}, [_this.$props.title])]), h("span", {
|
|
97
|
+
}, [_this.$props.title]), h("span", {
|
|
95
98
|
"class": "k-chip-actions"
|
|
96
99
|
}, [h("span", {
|
|
97
100
|
"class": "k-chip-action k-chip-remove-action",
|
|
@@ -103,16 +106,25 @@ var GroupingIndicatorVue2 = {
|
|
|
103
106
|
on: _this.v3 ? undefined : {
|
|
104
107
|
"click": _this.groupRemove
|
|
105
108
|
}
|
|
106
|
-
}, [h(
|
|
107
|
-
|
|
108
|
-
|
|
109
|
+
}, [h(Icon, {
|
|
110
|
+
name: "x-circle",
|
|
111
|
+
attrs: _this.v3 ? undefined : {
|
|
112
|
+
name: "x-circle",
|
|
113
|
+
icon: xCircleIcon
|
|
114
|
+
},
|
|
115
|
+
icon: xCircleIcon
|
|
116
|
+
})])])])];
|
|
109
117
|
} : [h("div", {
|
|
110
|
-
"class": "k-
|
|
118
|
+
"class": "k-chip k-chip-md k-chip-solid k-chip-solid-base k-rounded-md",
|
|
111
119
|
ref: setRef(_this, 'indicatorContainer')
|
|
112
|
-
}, [h(
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
120
|
+
}, [h(Icon, {
|
|
121
|
+
name: 'sort-' + _this.$props.dir + '-small',
|
|
122
|
+
attrs: _this.v3 ? undefined : {
|
|
123
|
+
name: 'sort-' + _this.$props.dir + '-small',
|
|
124
|
+
icon: _this.$props.dir === 'asc' ? sortAscSmallIcon : sortDescSmallIcon
|
|
125
|
+
},
|
|
126
|
+
"class": 'k-chip-icon',
|
|
127
|
+
icon: _this.$props.dir === 'asc' ? sortAscSmallIcon : sortDescSmallIcon
|
|
116
128
|
}), h("span", {
|
|
117
129
|
"class": "k-chip-content",
|
|
118
130
|
tabindex: -1,
|
|
@@ -123,9 +135,7 @@ var GroupingIndicatorVue2 = {
|
|
|
123
135
|
on: _this.v3 ? undefined : {
|
|
124
136
|
"click": _this.sortChange
|
|
125
137
|
}
|
|
126
|
-
}, [h("span", {
|
|
127
|
-
"class": "k-chip-text"
|
|
128
|
-
}, [_this.$props.title])]), h("span", {
|
|
138
|
+
}, [_this.$props.title]), h("span", {
|
|
129
139
|
"class": "k-chip-actions"
|
|
130
140
|
}, [h("span", {
|
|
131
141
|
"class": "k-chip-action k-chip-remove-action",
|
|
@@ -137,9 +147,14 @@ var GroupingIndicatorVue2 = {
|
|
|
137
147
|
on: _this.v3 ? undefined : {
|
|
138
148
|
"click": _this.groupRemove
|
|
139
149
|
}
|
|
140
|
-
}, [h(
|
|
141
|
-
|
|
142
|
-
|
|
150
|
+
}, [h(Icon, {
|
|
151
|
+
name: "x-circle",
|
|
152
|
+
attrs: _this.v3 ? undefined : {
|
|
153
|
+
name: "x-circle",
|
|
154
|
+
icon: xCircleIcon
|
|
155
|
+
},
|
|
156
|
+
icon: xCircleIcon
|
|
157
|
+
})])])])])
|
|
143
158
|
);
|
|
144
159
|
}
|
|
145
160
|
};
|
package/dist/es/filterCommon.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { messages } from './messages/main';
|
|
1
|
+
import { messages, numericFilterAriaLabel, dateFilterAriaLabel, textFilterAriaLabel, booleanFilterAriaLabel } from './messages/main';
|
|
2
2
|
/**
|
|
3
3
|
* @hidden
|
|
4
4
|
*/
|
|
@@ -154,3 +154,19 @@ export var cellOperatorChange = function (operator, e, value) {
|
|
|
154
154
|
}
|
|
155
155
|
return { value: value, operator: operator, event: e };
|
|
156
156
|
};
|
|
157
|
+
/**
|
|
158
|
+
* @hidden
|
|
159
|
+
*/
|
|
160
|
+
export var getAriaLabel = function (filterType, service) {
|
|
161
|
+
switch (filterType) {
|
|
162
|
+
case 'text':
|
|
163
|
+
return service.toLanguageString(textFilterAriaLabel, messages[textFilterAriaLabel]);
|
|
164
|
+
case 'numeric':
|
|
165
|
+
return service.toLanguageString(numericFilterAriaLabel, messages[numericFilterAriaLabel]);
|
|
166
|
+
case 'boolean':
|
|
167
|
+
return service.toLanguageString(booleanFilterAriaLabel, messages[booleanFilterAriaLabel]);
|
|
168
|
+
case 'date':
|
|
169
|
+
return service.toLanguageString(dateFilterAriaLabel, messages[dateFilterAriaLabel]);
|
|
170
|
+
default: return;
|
|
171
|
+
}
|
|
172
|
+
};
|
package/dist/es/footer/Footer.js
CHANGED
|
@@ -85,7 +85,11 @@ var FooterVue2 = {
|
|
|
85
85
|
var h = gh || createElement;
|
|
86
86
|
if (!this.$props.staticHeaders) {
|
|
87
87
|
return h("tfoot", {
|
|
88
|
-
"class": "k-grid-footer"
|
|
88
|
+
"class": "k-table-tfoot k-grid-footer",
|
|
89
|
+
role: "rowgroup",
|
|
90
|
+
attrs: this.v3 ? undefined : {
|
|
91
|
+
role: "rowgroup"
|
|
92
|
+
}
|
|
89
93
|
}, [this.$props.row]);
|
|
90
94
|
}
|
|
91
95
|
return h("div", {
|
|
@@ -99,7 +103,13 @@ var FooterVue2 = {
|
|
|
99
103
|
style: this.tableStyle
|
|
100
104
|
}, [h("colgroup", {
|
|
101
105
|
ref: setRef(this, 'colGroupHeader')
|
|
102
|
-
}, [this.$props.cols]), h("tfoot",
|
|
106
|
+
}, [this.$props.cols]), h("tfoot", {
|
|
107
|
+
"class": 'k-table-tfoot',
|
|
108
|
+
role: "rowgroup",
|
|
109
|
+
attrs: this.v3 ? undefined : {
|
|
110
|
+
role: "rowgroup"
|
|
111
|
+
}
|
|
112
|
+
}, [this.$props.row])])])]);
|
|
103
113
|
}
|
|
104
114
|
};
|
|
105
115
|
/**
|
|
@@ -12,7 +12,8 @@ var FooterRowVue2 = {
|
|
|
12
12
|
name: 'FooterRow',
|
|
13
13
|
props: {
|
|
14
14
|
isRtl: Boolean,
|
|
15
|
-
columns: Array
|
|
15
|
+
columns: Array,
|
|
16
|
+
rowIndex: Number
|
|
16
17
|
},
|
|
17
18
|
methods: {
|
|
18
19
|
columnStyles: function columnStyles(column) {
|
|
@@ -38,7 +39,7 @@ var FooterRowVue2 = {
|
|
|
38
39
|
var renderCell = function renderCell(column, index) {
|
|
39
40
|
var footerCellRendering = null;
|
|
40
41
|
var stickyClassName = column.locked && column.left !== undefined ? 'k-grid-footer-sticky' : '';
|
|
41
|
-
var tdClassName = column.footerClassName ? "".concat(column.footerClassName, " ").concat(stickyClassName) : stickyClassName;
|
|
42
|
+
var tdClassName = column.footerClassName ? "k-table-td ".concat(column.footerClassName, " ").concat(stickyClassName) : 'k-table-td' + stickyClassName;
|
|
42
43
|
footerCellRendering = getTemplate.call(this, {
|
|
43
44
|
h: h,
|
|
44
45
|
template: column.footerCell,
|
|
@@ -53,17 +54,22 @@ var FooterRowVue2 = {
|
|
|
53
54
|
key: index,
|
|
54
55
|
colspan: column.colSpan !== 1 ? column.colSpan : undefined,
|
|
55
56
|
attrs: this.v3 ? undefined : {
|
|
56
|
-
colspan: column.colSpan !== 1 ? column.colSpan : undefined
|
|
57
|
+
colspan: column.colSpan !== 1 ? column.colSpan : undefined,
|
|
58
|
+
role: 'gridcell'
|
|
57
59
|
},
|
|
58
60
|
style: this.columnStyles(column),
|
|
59
|
-
"class": tdClassName
|
|
61
|
+
"class": tdClassName,
|
|
62
|
+
role: 'gridcell'
|
|
60
63
|
}, [footerCellRendering]);
|
|
61
64
|
};
|
|
62
65
|
return h("tr", {
|
|
66
|
+
"class": 'k-table-row',
|
|
63
67
|
role: 'row',
|
|
64
68
|
attrs: this.v3 ? undefined : {
|
|
65
|
-
role: 'row'
|
|
66
|
-
|
|
69
|
+
role: 'row',
|
|
70
|
+
"aria-rowIndex": this.$props.rowIndex
|
|
71
|
+
},
|
|
72
|
+
"aria-rowIndex": this.$props.rowIndex
|
|
67
73
|
}, [footerColumns(this.$props.columns).map(renderCell, this)]);
|
|
68
74
|
}
|
|
69
75
|
};
|
|
@@ -4,11 +4,11 @@ var allVue = Vue;
|
|
|
4
4
|
var gh = allVue.h;
|
|
5
5
|
var isV3 = allVue.version && allVue.version[0] === '3';
|
|
6
6
|
var inject = allVue.inject;
|
|
7
|
-
import { operatorMap, booleanFilterValues, getFilterType } from '../filterCommon';
|
|
7
|
+
import { operatorMap, booleanFilterValues, getFilterType, getAriaLabel } from '../filterCommon';
|
|
8
8
|
import { GridFilterCell } from '../cells/GridFilterCell';
|
|
9
9
|
import { provideLocalizationService } from '@progress/kendo-vue-intl';
|
|
10
10
|
import { filterAriaLabel, messages } from '../messages/main';
|
|
11
|
-
import { tableKeyboardNavigationTools as navigationTools,
|
|
11
|
+
import { tableKeyboardNavigationTools as navigationTools, HeaderTdElement } from '@progress/kendo-vue-data-tools';
|
|
12
12
|
import { classNames } from '@progress/kendo-vue-common';
|
|
13
13
|
/**
|
|
14
14
|
* @hidden
|
|
@@ -23,7 +23,8 @@ var FilterRowVue2 = {
|
|
|
23
23
|
sort: [Object, Array],
|
|
24
24
|
cellRender: [String, Function, Object],
|
|
25
25
|
isRtl: Boolean,
|
|
26
|
-
ariaRowIndex: Number
|
|
26
|
+
ariaRowIndex: Number,
|
|
27
|
+
size: String
|
|
27
28
|
},
|
|
28
29
|
inject: {
|
|
29
30
|
kendoLocalizationService: {
|
|
@@ -31,15 +32,6 @@ var FilterRowVue2 = {
|
|
|
31
32
|
}
|
|
32
33
|
},
|
|
33
34
|
methods: {
|
|
34
|
-
headerCellClassName: function headerCellClassName(field, locked) {
|
|
35
|
-
var result = "".concat(locked ? 'k-grid-header-sticky' : '');
|
|
36
|
-
if (this.$props.sort && this.$props.sort.filter(function (descriptor) {
|
|
37
|
-
return descriptor.field === field;
|
|
38
|
-
}).length > 0) {
|
|
39
|
-
result += ' k-sorted';
|
|
40
|
-
}
|
|
41
|
-
return result;
|
|
42
|
-
},
|
|
43
35
|
setFilter: function setFilter(value, operator, field, e) {
|
|
44
36
|
var filters = [];
|
|
45
37
|
if (value !== '' && value !== null || operator !== '') {
|
|
@@ -94,7 +86,6 @@ var FilterRowVue2 = {
|
|
|
94
86
|
})[0];
|
|
95
87
|
return found ? found.operator : null;
|
|
96
88
|
};
|
|
97
|
-
var filterCellProps;
|
|
98
89
|
var serviceIndex = 0,
|
|
99
90
|
index = -1;
|
|
100
91
|
var filterCells = this.$props.columns.filter(function (c) {
|
|
@@ -105,6 +96,7 @@ var FilterRowVue2 = {
|
|
|
105
96
|
_this.setFilter(e.value, e.operator, column.field, e);
|
|
106
97
|
};
|
|
107
98
|
var filterType = getFilterType(column.filter);
|
|
99
|
+
var ariaLabelFilter = column.field + ' ' + getAriaLabel(filterType, intl);
|
|
108
100
|
// @ts-ignore
|
|
109
101
|
var filterRender = h(GridFilterCell, {
|
|
110
102
|
grid: this.$props.grid,
|
|
@@ -117,7 +109,9 @@ var FilterRowVue2 = {
|
|
|
117
109
|
operators: operatorMap(this.$props.filterOperators[filterType] || [], intl),
|
|
118
110
|
booleanValues: operatorMap(booleanFilterValues, intl),
|
|
119
111
|
filterType: filterType,
|
|
120
|
-
render: column.filterCell || this.$props.cellRender
|
|
112
|
+
render: column.filterCell || this.$props.cellRender,
|
|
113
|
+
ariaLabel: ariaLabelFilter,
|
|
114
|
+
size: this.$props.size
|
|
121
115
|
},
|
|
122
116
|
field: column.field,
|
|
123
117
|
title: column.filterTitle,
|
|
@@ -130,7 +124,9 @@ var FilterRowVue2 = {
|
|
|
130
124
|
on: this.v3 ? undefined : {
|
|
131
125
|
"change": onChangeFn
|
|
132
126
|
},
|
|
133
|
-
render: column.filterCell || this.$props.cellRender
|
|
127
|
+
render: column.filterCell || this.$props.cellRender,
|
|
128
|
+
ariaLabel: ariaLabelFilter,
|
|
129
|
+
size: this.$props.size
|
|
134
130
|
});
|
|
135
131
|
var key = column.declarationIndex >= 0 ? ++index : --serviceIndex;
|
|
136
132
|
var ariaAttrs = {
|
|
@@ -146,43 +142,47 @@ var FilterRowVue2 = {
|
|
|
146
142
|
} : {};
|
|
147
143
|
var filterCell =
|
|
148
144
|
// @ts-ignore function children
|
|
149
|
-
h(
|
|
145
|
+
h(HeaderTdElement, {
|
|
150
146
|
key: key,
|
|
151
|
-
|
|
147
|
+
role: 'gridcell',
|
|
152
148
|
attrs: this.v3 ? undefined : {
|
|
149
|
+
role: 'gridcell',
|
|
153
150
|
columnId: navigationTools.getFilterColumnId(column.id),
|
|
154
151
|
navigatable: column.navigatable,
|
|
155
|
-
|
|
156
|
-
|
|
152
|
+
ariaColumnIndex: ariaAttrs.ariaColumnIndex,
|
|
153
|
+
ariaLabel: ariaLabelFilter
|
|
157
154
|
},
|
|
155
|
+
columnId: navigationTools.getFilterColumnId(column.id),
|
|
158
156
|
navigatable: column.navigatable,
|
|
159
157
|
style: style,
|
|
160
|
-
"class": classNames('k-
|
|
161
|
-
|
|
162
|
-
|
|
158
|
+
"class": classNames('k-table-th', this.headerCellClassName(column.field, column.locked) || undefined),
|
|
159
|
+
ariaColumnIndex: ariaAttrs.ariaColumnIndex,
|
|
160
|
+
ariaLabel: ariaLabelFilter
|
|
163
161
|
}, this.v3 ? function () {
|
|
164
162
|
return [filterRender];
|
|
165
163
|
} : [filterRender]);
|
|
166
164
|
return column.filterable && filterCell ||
|
|
167
165
|
// @ts-ignore function children
|
|
168
|
-
h(
|
|
166
|
+
h(HeaderTdElement, {
|
|
169
167
|
key: key,
|
|
170
|
-
|
|
168
|
+
role: 'gridcell',
|
|
171
169
|
attrs: this.v3 ? undefined : {
|
|
170
|
+
role: 'gridcell',
|
|
172
171
|
columnId: navigationTools.getFilterColumnId(column.id),
|
|
173
172
|
navigatable: column.navigatable,
|
|
174
|
-
|
|
175
|
-
|
|
173
|
+
ariaColumnIndex: ariaAttrs.ariaColumnIndex,
|
|
174
|
+
ariaLabel: ariaLabelFilter
|
|
176
175
|
},
|
|
176
|
+
columnId: navigationTools.getFilterColumnId(column.id),
|
|
177
177
|
navigatable: column.navigatable,
|
|
178
178
|
style: style,
|
|
179
|
-
"class": classNames('k-
|
|
180
|
-
|
|
181
|
-
|
|
179
|
+
"class": classNames('k-table-th', this.headerCellClassName(column.field, column.locked) || undefined),
|
|
180
|
+
ariaColumnIndex: ariaAttrs.ariaColumnIndex,
|
|
181
|
+
ariaLabel: ariaLabelFilter
|
|
182
182
|
});
|
|
183
183
|
}, this);
|
|
184
184
|
return h("tr", {
|
|
185
|
-
"class": "k-filter-row",
|
|
185
|
+
"class": "k-table-row k-filter-row",
|
|
186
186
|
"aria-rowindex": this.ariaRowIndex,
|
|
187
187
|
attrs: this.v3 ? undefined : {
|
|
188
188
|
"aria-rowindex": this.ariaRowIndex,
|
|
@@ -11,6 +11,7 @@ declare type DefaultMethods<V> = {
|
|
|
11
11
|
export interface GroupPanelProps extends ColumnDraggableProps {
|
|
12
12
|
ref?: any;
|
|
13
13
|
group: GroupDescriptor[];
|
|
14
|
+
ariaControls: String;
|
|
14
15
|
onGroupChange?: (groups: GroupDescriptor[], event: any) => void;
|
|
15
16
|
resolveTitle: (field: string) => string;
|
|
16
17
|
onPressHandler?: (draggableEvent: any, element: HTMLElement) => void;
|
|
@@ -5,7 +5,7 @@ var gh = allVue.h;
|
|
|
5
5
|
var isV3 = allVue.version && allVue.version[0] === '3';
|
|
6
6
|
var inject = allVue.inject;
|
|
7
7
|
import { GroupingIndicator } from '../drag/GroupingIndicator';
|
|
8
|
-
import { messages, groupPanelEmpty as messageKey } from '../messages/main';
|
|
8
|
+
import { messages, groupPanelEmpty as messageKey, groupHeaderAriaLabel } from '../messages/main';
|
|
9
9
|
import { provideLocalizationService } from '@progress/kendo-vue-intl';
|
|
10
10
|
/**
|
|
11
11
|
* @hidden
|
|
@@ -13,7 +13,8 @@ import { provideLocalizationService } from '@progress/kendo-vue-intl';
|
|
|
13
13
|
var GroupPanelVue2 = {
|
|
14
14
|
props: {
|
|
15
15
|
group: Array,
|
|
16
|
-
resolveTitle: Function
|
|
16
|
+
resolveTitle: Function,
|
|
17
|
+
ariaControls: String
|
|
17
18
|
},
|
|
18
19
|
inject: {
|
|
19
20
|
kendoLocalizationService: {
|
|
@@ -57,6 +58,7 @@ var GroupPanelVue2 = {
|
|
|
57
58
|
render: function render(createElement) {
|
|
58
59
|
var h = gh || createElement;
|
|
59
60
|
var groupsProp = this.$props.group || [];
|
|
61
|
+
var ariaControls = this.$props.ariaControls;
|
|
60
62
|
var groups = groupsProp.map(function (groupDesc, index) {
|
|
61
63
|
var _this = this;
|
|
62
64
|
return (
|
|
@@ -92,10 +94,21 @@ var GroupPanelVue2 = {
|
|
|
92
94
|
})
|
|
93
95
|
);
|
|
94
96
|
}, this);
|
|
97
|
+
var groupHeaderAriaLabelValue = provideLocalizationService(this).toLanguageString(groupHeaderAriaLabel, messages[groupHeaderAriaLabel]);
|
|
95
98
|
return h("div", {
|
|
96
|
-
"class": "k-grouping-header
|
|
97
|
-
|
|
98
|
-
|
|
99
|
+
"class": "k-grouping-header",
|
|
100
|
+
role: 'toolbar',
|
|
101
|
+
attrs: this.v3 ? undefined : {
|
|
102
|
+
role: 'toolbar',
|
|
103
|
+
"aria-label": groupHeaderAriaLabelValue,
|
|
104
|
+
"aria-controls": ariaControls
|
|
105
|
+
},
|
|
106
|
+
"aria-label": groupHeaderAriaLabelValue,
|
|
107
|
+
"aria-controls": ariaControls
|
|
108
|
+
}, [!!groups.length && h("div", {
|
|
109
|
+
"class": "k-chip-list k-chip-list-md"
|
|
110
|
+
}, [groups]), h("div", {
|
|
111
|
+
"class": "k-grouping-drop-container"
|
|
99
112
|
}, [!groups.length && provideLocalizationService(this).toLanguageString(messageKey, messages[messageKey])])]);
|
|
100
113
|
}
|
|
101
114
|
};
|
package/dist/es/header/Header.js
CHANGED
|
@@ -92,24 +92,16 @@ var HeaderVue2 = {
|
|
|
92
92
|
}
|
|
93
93
|
return h("div", {
|
|
94
94
|
"class": this.wrapperClass,
|
|
95
|
-
style: this.divStyle
|
|
96
|
-
role: "presentation",
|
|
97
|
-
attrs: this.v3 ? undefined : {
|
|
98
|
-
role: "presentation"
|
|
99
|
-
}
|
|
95
|
+
style: this.divStyle
|
|
100
96
|
}, [h("div", {
|
|
101
97
|
ref: setRef(this, 'headerWrap'),
|
|
102
|
-
"class": "k-grid-header-wrap"
|
|
103
|
-
role: "presentation",
|
|
104
|
-
attrs: this.v3 ? undefined : {
|
|
105
|
-
role: "presentation"
|
|
106
|
-
}
|
|
98
|
+
"class": "k-grid-header-wrap"
|
|
107
99
|
}, [h("table", {
|
|
108
100
|
"class": this.tableClass,
|
|
109
101
|
ref: setRef(this, 'table'),
|
|
110
|
-
role: "
|
|
102
|
+
role: "none",
|
|
111
103
|
attrs: this.v3 ? undefined : {
|
|
112
|
-
role: "
|
|
104
|
+
role: "none"
|
|
113
105
|
}
|
|
114
106
|
}, [h("colgroup", {
|
|
115
107
|
ref: setRef(this, 'colGroupHeader')
|
|
@@ -35,6 +35,8 @@ export interface HeaderRowProps extends ColumnDraggableProps {
|
|
|
35
35
|
columnMenuAnimate?: boolean | PopupAnimation;
|
|
36
36
|
onFilterChange?: Function;
|
|
37
37
|
isRtl?: boolean;
|
|
38
|
+
isColCountDefined?: boolean;
|
|
39
|
+
columnsInitial?: ExtendedColumnProps[];
|
|
38
40
|
}
|
|
39
41
|
/**
|
|
40
42
|
* @hidden
|