Skip to content

Commit 7bd6b7f

Browse files
Vue demos. refactor type
1 parent b456d73 commit 7bd6b7f

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 2 additions & 3 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="gridColumns"
19+
:columns="fields"
2020
:height="300"
2121
/>
2222
</div>
@@ -25,12 +25,11 @@
2525
import { ref } from 'vue';
2626
import DxFilterBuilder from 'devextreme-vue/filter-builder';
2727
import DxButton from 'devextreme-vue/button';
28-
import DxDataGrid, { type DxDataGridTypes } from 'devextreme-vue/data-grid';
28+
import DxDataGrid 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[];
3433
const gridFilterValue = ref(filter);
3534
const dataSource = new DataSource({
3635
store: new ODataStore({

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

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

34
export const filter = [
45
['Product_Current_Inventory', '<>', 0],
@@ -10,13 +11,13 @@ export const filter = [
1011
],
1112
];
1213

13-
export const fields: DxFilterBuilderTypes.Field[] = [
14+
export const fields: (DxFilterBuilderTypes.Field & DxDataGridTypes.Column)[] = [
1415
{
1516
caption: 'ID',
1617
dataField: 'Product_ID',
1718
dataType: 'number',
1819
width: 50,
19-
} as DxFilterBuilderTypes.Field, {
20+
}, {
2021
dataField: 'Product_Name',
2122
dataType: 'string',
2223
}, {

0 commit comments

Comments
 (0)