Skip to content

Commit c7da860

Browse files
Revert "Vue demos. refactor type"
This reverts commit c0e8a05.
1 parent c0e8a05 commit c7da860

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

apps/demos/Demos/FilterBuilder/WithDataGrid/Vue/App.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
:data-source="dataSource"
1717
:filter-value="gridFilterValue"
1818
:show-borders="true"
19-
:columns="fields"
19+
:columns="gridColumns"
2020
:height="300"
2121
/>
2222
</div>
@@ -25,11 +25,12 @@
2525
import { ref } from 'vue';
2626
import DxFilterBuilder from 'devextreme-vue/filter-builder';
2727
import DxButton from 'devextreme-vue/button';
28-
import DxDataGrid from 'devextreme-vue/data-grid';
28+
import DxDataGrid, { type DxDataGridTypes } from 'devextreme-vue/data-grid';
2929
import { DataSource, ODataStore } from 'devextreme-vue/common/data';
3030
import { filter, fields } from './data.ts';
3131
3232
const filterValue = ref(filter);
33+
const gridColumns = fields as DxDataGridTypes.Column[];
3334
const gridFilterValue = ref(filter);
3435
const dataSource = new DataSource({
3536
store: new ODataStore({

apps/demos/Demos/FilterBuilder/WithDataGrid/Vue/data.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { type DxFilterBuilderTypes } from 'devextreme-vue/filter-builder';
2-
import { type DxDataGridTypes } from 'devextreme-vue/data-grid';
32

43
export const filter = [
54
['Product_Current_Inventory', '<>', 0],
@@ -11,7 +10,7 @@ export const filter = [
1110
],
1211
];
1312

14-
export const fields: (DxFilterBuilderTypes.Field & DxDataGridTypes.Column)[] = [
13+
export const fields: DxFilterBuilderTypes.Field[] = [
1514
{
1615
caption: 'ID',
1716
dataField: 'Product_ID',

0 commit comments

Comments
 (0)