Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(vue-grid): fix spread messages property #1205

Merged
merged 1 commit into from
Jun 21, 2018
Merged
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
11 changes: 7 additions & 4 deletions packages/dx-vue-grid-bootstrap4/src/plugins/grouping-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@ const defaultMessages = {
export const DxGroupingPanel = {
name: 'DxGroupingPanel',
functional: true,
props: {
messages: {
type: Object,
},
},
render(h, context) {
const { messages } = context.props;

return (
<DxGroupingPanelBase
layoutComponent={GroupPanelLayout}
containerComponent={GroupPanelContainer}
itemComponent={GroupPanelItem}
emptyMessageComponent={GroupPanelEmptyMessage}
messages={{ ...defaultMessages, ...messages }}
{...{ attrs: context.props, on: context.listeners }}
messages={{ ...defaultMessages, ...context.props.messages }}
{...{ attrs: context.data.attrs, on: context.listeners }}
/>
);
},
Expand Down
10 changes: 7 additions & 3 deletions packages/dx-vue-grid-bootstrap4/src/plugins/paging-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ const defaultMessages = {
export const DxPagingPanel = {
name: 'DxPagingPanel',
functional: true,
props: {
messages: {
type: Object,
},
},
render(h, context) {
const { messages } = context.props;
return (
<DxPagingPanelBase
containerComponent={Pager}
messages={{ ...defaultMessages, ...messages }}
{...{ attrs: context.props, on: context.listeners }}
messages={{ ...defaultMessages, ...context.props.messages }}
{...{ attrs: context.data.attrs, on: context.listeners }}
/>
);
},
Expand Down
9 changes: 7 additions & 2 deletions packages/dx-vue-grid-bootstrap4/src/plugins/search-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ const defaultMessages = {
export const DxSearchPanel = {
name: 'DxSearchPanel',
functional: true,
props: {
messages: {
type: Object,
},
},
render(h, context) {
return (
<DxSearchPanelBase
inputComponent={SearchPanelInput}
messages={{ ...defaultMessages, ...context.messages }}
{...{ attrs: context.props, on: context.listeners }}
messages={{ ...defaultMessages, ...context.props.messages }}
{...{ attrs: context.data.attrs, on: context.listeners }}
/>
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ const defaultMessages = {
export const DxTableColumnVisibility = {
name: 'DxTableColumnVisibility',
functional: true,
props: {
messages: {
type: Object,
},
},
render(h, context) {
return (
<DxTableColumnVisibilityBase
emptyMessageComponent={EmptyMessage}
messages={{ ...defaultMessages, ...context.messages }}
{...{ attrs: context.props, on: context.listeners }}
messages={{ ...defaultMessages, ...context.props.messages }}
{...{ attrs: context.data.attrs, on: context.listeners }}
/>
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@ const defaultMessages = {
export const DxTableEditColumn = {
name: 'DxTableEditColumn',
functional: true,
props: {
messages: {
type: Object,
},
},
render(h, context) {
return (
<DxTableEditColumnBase
cellComponent={EditCommandCell}
headerCellComponent={EditCommandHeadingCell}
commandComponent={CommandButton}
messages={{ ...defaultMessages, ...context.messages }}
{...{ attrs: context.props, on: context.listeners }}
messages={{ ...defaultMessages, ...context.props.messages }}
{...{ attrs: context.data.attrs, on: context.listeners }}
/>
);
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { DxTableFilterRow as DxTableFilterRowBase } from '@devexpress/dx-vue-grid';

import { TableFilterCell } from '../templates/table-filter-cell';
import { TableRow } from '../templates/table-row';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { DxTableHeaderRow as DxTableHeaderRowBase } from '@devexpress/dx-vue-grid';

import { TableRow } from '../templates/table-row';
import { TableHeaderCell } from '../templates/table-header-cell';

Expand Down
7 changes: 6 additions & 1 deletion packages/dx-vue-grid-bootstrap4/src/plugins/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ const defaultMessages = {
export const DxTable = {
name: 'DxTable',
functional: true,
props: {
messages: {
type: Object,
},
},
render(h, context) {
return (
<DxTableBase
Expand All @@ -35,7 +40,7 @@ export const DxTable = {
stubCellComponent={TableStubCell}
stubHeaderCellComponent={TableHeaderStubCell}
messages={{ ...defaultMessages, ...context.props.messages }}
{...{ attrs: context.props, on: context.listeners }}
{...{ attrs: context.data.attrs, on: context.listeners }}
/>
);
},
Expand Down
1 change: 1 addition & 0 deletions packages/dx-vue-grid-bootstrap4/src/plugins/toolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { DxToolbar as Root } from '../templates/toolbar/toolbar';
import { FlexibleSpace } from '../templates/toolbar/flexible-space';

export const DxToolbar = {
name: 'DxToolbar',
render() {
return (
<DxToolbarBase
Expand Down