Skip to content

Commit 8e70627

Browse files
pomahtrimpreyskurantov
pomahtri
and
mpreyskurantov
authored
CardView - dts - minor fixes (DevExpress#30070)
Co-authored-by: Mikhail Preyskurantov <[email protected]>
1 parent f6579b4 commit 8e70627

File tree

11 files changed

+393
-102
lines changed

11 files changed

+393
-102
lines changed

‎packages/devextreme-angular/src/ui/card-view/index.ts‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
export { ExplicitTypes } from 'devextreme/ui/card_view';
2525

2626
import DataSource from 'devextreme/data/data_source';
27-
import { CardCover, CardHeader, ColumnProperties, dxCardViewEditing, HeaderPanel, CardClickEvent, CardDblClickEvent, CardHoverChangedEvent, CardInsertedEvent, CardInsertingEvent, CardPreparedEvent, CardRemovedEvent, CardRemovingEvent, CardSavedEvent, CardSavingEvent, CardUpdatedEvent, CardUpdatingEvent, ContextMenuPreparingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, FieldCaptionClickEvent, FieldCaptionDblClickEvent, FieldCaptionPreparedEvent, FieldValueClickEvent, FieldValueDblClickEvent, FieldValuePreparedEvent, FocusedCardChanged, InitNewCardEvent, SelectionChangedEvent, SelectionChangingEvent, Paging, RemoteOperations, SelectionConfiguration, Toolbar } from 'devextreme/ui/card_view';
27+
import { CardCover, CardHeader, ColumnProperties, dxCardViewEditing, HeaderPanel, CardClickEvent, CardDblClickEvent, CardHoverChangedEvent, CardInsertedEvent, CardInsertingEvent, CardPreparedEvent, CardRemovedEvent, CardRemovingEvent, CardSavedEvent, CardSavingEvent, CardUpdatedEvent, CardUpdatingEvent, ContextMenuPreparingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, FieldCaptionClickEvent, FieldCaptionDblClickEvent, FieldCaptionPreparedEvent, FieldValueClickEvent, FieldValueDblClickEvent, FieldValuePreparedEvent, FocusedCardChanged, InitNewCardEvent, SelectionChangedEvent, Paging, RemoteOperations, SelectionConfiguration, Toolbar } from 'devextreme/ui/card_view';
2828
import { Mode } from 'devextreme/common';
2929
import { ColumnChooser, FilterPanel, HeaderFilter, Pager, SearchPanel, Sorting } from 'devextreme/common/grids';
3030
import { DataSourceOptions } from 'devextreme/data/data_source';
@@ -73,6 +73,7 @@ import { DxiCardViewCompareRuleModule } from 'devextreme-angular/ui/card-view/ne
7373
import { DxiCardViewCustomOperationModule } from 'devextreme-angular/ui/card-view/nested';
7474
import { DxiCardViewCustomRuleModule } from 'devextreme-angular/ui/card-view/nested';
7575
import { DxoCardViewEditingModule } from 'devextreme-angular/ui/card-view/nested';
76+
import { DxoCardViewEditingTextsModule } from 'devextreme-angular/ui/card-view/nested';
7677
import { DxiCardViewEmailRuleModule } from 'devextreme-angular/ui/card-view/nested';
7778
import { DxiCardViewEmptyItemModule } from 'devextreme-angular/ui/card-view/nested';
7879
import { DxiCardViewFieldModule } from 'devextreme-angular/ui/card-view/nested';
@@ -362,6 +363,16 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
362363

363364

364365

366+
@Input()
367+
get filterSyncEnabled(): boolean | Mode {
368+
return this._getOption('filterSyncEnabled');
369+
}
370+
set filterSyncEnabled(value: boolean | Mode) {
371+
this._setOption('filterSyncEnabled', value);
372+
}
373+
374+
375+
365376
@Input()
366377
get filterValue(): Array<any> | Function | string {
367378
return this._getOption('filterValue');
@@ -850,14 +861,6 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
850861
*/
851862
@Output() onSelectionChanged: EventEmitter<SelectionChangedEvent>;
852863

853-
/**
854-
855-
* [descr:undefined]
856-
857-
858-
*/
859-
@Output() onSelectionChanging: EventEmitter<SelectionChangingEvent>;
860-
861864
/**
862865
863866
* This member supports the internal infrastructure and is not intended to be used directly from your code.
@@ -1012,6 +1015,13 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
10121015
*/
10131016
@Output() filterPanelChange: EventEmitter<FilterPanel>;
10141017

1018+
/**
1019+
1020+
* This member supports the internal infrastructure and is not intended to be used directly from your code.
1021+
1022+
*/
1023+
@Output() filterSyncEnabledChange: EventEmitter<boolean | Mode>;
1024+
10151025
/**
10161026
10171027
* This member supports the internal infrastructure and is not intended to be used directly from your code.
@@ -1242,7 +1252,6 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
12421252
{ subscribe: 'initNewCard', emit: 'onInitNewCard' },
12431253
{ subscribe: 'optionChanged', emit: 'onOptionChanged' },
12441254
{ subscribe: 'selectionChanged', emit: 'onSelectionChanged' },
1245-
{ subscribe: 'selectionChanging', emit: 'onSelectionChanging' },
12461255
{ emit: 'accessKeyChange' },
12471256
{ emit: 'activeStateEnabledChange' },
12481257
{ emit: 'allowColumnReorderingChange' },
@@ -1265,6 +1274,7 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
12651274
{ emit: 'filterBuilderChange' },
12661275
{ emit: 'filterBuilderPopupChange' },
12671276
{ emit: 'filterPanelChange' },
1277+
{ emit: 'filterSyncEnabledChange' },
12681278
{ emit: 'filterValueChange' },
12691279
{ emit: 'focusStateEnabledChange' },
12701280
{ emit: 'headerFilterChange' },
@@ -1371,6 +1381,7 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
13711381
DxiCardViewCustomOperationModule,
13721382
DxiCardViewCustomRuleModule,
13731383
DxoCardViewEditingModule,
1384+
DxoCardViewEditingTextsModule,
13741385
DxiCardViewEmailRuleModule,
13751386
DxiCardViewEmptyItemModule,
13761387
DxiCardViewFieldModule,
@@ -1448,6 +1459,7 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
14481459
DxiCardViewCustomOperationModule,
14491460
DxiCardViewCustomRuleModule,
14501461
DxoCardViewEditingModule,
1462+
DxoCardViewEditingTextsModule,
14511463
DxiCardViewEmailRuleModule,
14521464
DxiCardViewEmptyItemModule,
14531465
DxiCardViewFieldModule,

‎packages/devextreme-angular/src/ui/card-view/nested/column-dxi.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ export class DxiCardViewColumnComponent extends CollectionNestedOption {
154154
}
155155

156156
@Input()
157-
get customizeText(): ((cellInfo: { groupInterval: string | number, target: string, value: any, valueText: string }) => string) {
157+
get customizeText(): ((fieldInfo: { groupInterval: string | number, target: string, value: any, valueText: string }) => string) {
158158
return this._getOption('customizeText');
159159
}
160-
set customizeText(value: ((cellInfo: { groupInterval: string | number, target: string, value: any, valueText: string }) => string)) {
160+
set customizeText(value: ((fieldInfo: { groupInterval: string | number, target: string, value: any, valueText: string }) => string)) {
161161
this._setOption('customizeText', value);
162162
}
163163

‎packages/devextreme-angular/src/ui/card-view/nested/editing-texts.ts‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/* tslint:disable:max-line-length */
2+
3+
4+
import {
5+
Component,
6+
OnInit,
7+
OnDestroy,
8+
NgModule,
9+
Host,
10+
SkipSelf,
11+
Input
12+
} from '@angular/core';
13+
14+
15+
16+
17+
18+
import {
19+
DxIntegrationModule,
20+
NestedOptionHost,
21+
} from 'devextreme-angular/core';
22+
import { NestedOption } from 'devextreme-angular/core';
23+
24+
25+
@Component({
26+
selector: 'dxo-card-view-editing-texts',
27+
standalone: true,
28+
template: '',
29+
styles: [''],
30+
imports: [ DxIntegrationModule ],
31+
providers: [NestedOptionHost]
32+
})
33+
export class DxoCardViewEditingTextsComponent extends NestedOption implements OnDestroy, OnInit {
34+
@Input()
35+
get addCard(): string {
36+
return this._getOption('addCard');
37+
}
38+
set addCard(value: string) {
39+
this._setOption('addCard', value);
40+
}
41+
42+
@Input()
43+
get confirmDeleteMessage(): string {
44+
return this._getOption('confirmDeleteMessage');
45+
}
46+
set confirmDeleteMessage(value: string) {
47+
this._setOption('confirmDeleteMessage', value);
48+
}
49+
50+
@Input()
51+
get confirmDeleteTitle(): string {
52+
return this._getOption('confirmDeleteTitle');
53+
}
54+
set confirmDeleteTitle(value: string) {
55+
this._setOption('confirmDeleteTitle', value);
56+
}
57+
58+
@Input()
59+
get deleteCard(): string {
60+
return this._getOption('deleteCard');
61+
}
62+
set deleteCard(value: string) {
63+
this._setOption('deleteCard', value);
64+
}
65+
66+
@Input()
67+
get editCard(): string {
68+
return this._getOption('editCard');
69+
}
70+
set editCard(value: string) {
71+
this._setOption('editCard', value);
72+
}
73+
74+
@Input()
75+
get saveCard(): string {
76+
return this._getOption('saveCard');
77+
}
78+
set saveCard(value: string) {
79+
this._setOption('saveCard', value);
80+
}
81+
82+
83+
protected get _optionPath() {
84+
return 'texts';
85+
}
86+
87+
88+
constructor(@SkipSelf() @Host() parentOptionHost: NestedOptionHost,
89+
@Host() optionHost: NestedOptionHost) {
90+
super();
91+
parentOptionHost.setNestedOption(this);
92+
optionHost.setHost(this, this._fullOptionPath.bind(this));
93+
}
94+
95+
96+
ngOnInit() {
97+
this._addRecreatedComponent();
98+
}
99+
100+
ngOnDestroy() {
101+
this._addRemovedOption(this._getOptionPath());
102+
}
103+
104+
105+
}
106+
107+
@NgModule({
108+
imports: [
109+
DxoCardViewEditingTextsComponent
110+
],
111+
exports: [
112+
DxoCardViewEditingTextsComponent
113+
],
114+
})
115+
export class DxoCardViewEditingTextsModule { }

‎packages/devextreme-angular/src/ui/card-view/nested/editing.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919

2020
import { DataChange } from 'devextreme/common/grids';
2121
import { dxFormOptions } from 'devextreme/ui/form';
22+
import { EditingTexts } from 'devextreme/ui/card_view';
2223

2324
import {
2425
DxIntegrationModule,
@@ -101,6 +102,14 @@ export class DxoCardViewEditingComponent extends NestedOption implements OnDestr
101102
this._setOption('popup', value);
102103
}
103104

105+
@Input()
106+
get texts(): EditingTexts {
107+
return this._getOption('texts');
108+
}
109+
set texts(value: EditingTexts) {
110+
this._setOption('texts', value);
111+
}
112+
104113

105114
protected get _optionPath() {
106115
return 'editing';

‎packages/devextreme-angular/src/ui/card-view/nested/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export * from './column-header-filter';
2323
export * from './compare-rule-dxi';
2424
export * from './custom-operation-dxi';
2525
export * from './custom-rule-dxi';
26+
export * from './editing-texts';
2627
export * from './editing';
2728
export * from './email-rule-dxi';
2829
export * from './empty-item-dxi';

‎packages/devextreme-angular/src/ui/card-view/nested/texts.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,54 @@ import { NestedOption } from 'devextreme-angular/core';
3131
providers: [NestedOptionHost]
3232
})
3333
export class DxoCardViewTextsComponent extends NestedOption implements OnDestroy, OnInit {
34+
@Input()
35+
get addCard(): string {
36+
return this._getOption('addCard');
37+
}
38+
set addCard(value: string) {
39+
this._setOption('addCard', value);
40+
}
41+
42+
@Input()
43+
get confirmDeleteMessage(): string {
44+
return this._getOption('confirmDeleteMessage');
45+
}
46+
set confirmDeleteMessage(value: string) {
47+
this._setOption('confirmDeleteMessage', value);
48+
}
49+
50+
@Input()
51+
get confirmDeleteTitle(): string {
52+
return this._getOption('confirmDeleteTitle');
53+
}
54+
set confirmDeleteTitle(value: string) {
55+
this._setOption('confirmDeleteTitle', value);
56+
}
57+
58+
@Input()
59+
get deleteCard(): string {
60+
return this._getOption('deleteCard');
61+
}
62+
set deleteCard(value: string) {
63+
this._setOption('deleteCard', value);
64+
}
65+
66+
@Input()
67+
get editCard(): string {
68+
return this._getOption('editCard');
69+
}
70+
set editCard(value: string) {
71+
this._setOption('editCard', value);
72+
}
73+
74+
@Input()
75+
get saveCard(): string {
76+
return this._getOption('saveCard');
77+
}
78+
set saveCard(value: string) {
79+
this._setOption('saveCard', value);
80+
}
81+
3482
@Input()
3583
get clearFilter(): string {
3684
return this._getOption('clearFilter');

0 commit comments

Comments
 (0)