Skip to content

Commit be8bec1

Browse files
author
marker dao ®
committed
feat(ddeditor.d.ts): Hide fieldTemplates && Add doc tags
1 parent f66334b commit be8bec1

File tree

15 files changed

+105
-54
lines changed

15 files changed

+105
-54
lines changed

‎packages/devextreme-angular/src/ui/color-box/index.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,19 @@ export class DxColorBoxComponent extends DxComponent implements OnDestroy, Contr
291291
}
292292

293293

294+
/**
295+
* [descr:dxDropDownEditorOptions.fieldTemplates]
296+
297+
*/
298+
@Input()
299+
get fieldTemplates(): any {
300+
return this._getOption('fieldTemplates');
301+
}
302+
set fieldTemplates(value: any) {
303+
this._setOption('fieldTemplates', value);
304+
}
305+
306+
294307
/**
295308
* [descr:dxTextEditorOptions.focusStateEnabled]
296309
@@ -893,6 +906,13 @@ export class DxColorBoxComponent extends DxComponent implements OnDestroy, Contr
893906
*/
894907
@Output() fieldTemplateChange: EventEmitter<any>;
895908

909+
/**
910+
911+
* This member supports the internal infrastructure and is not intended to be used directly from your code.
912+
913+
*/
914+
@Output() fieldTemplatesChange: EventEmitter<any>;
915+
896916
/**
897917
898918
* This member supports the internal infrastructure and is not intended to be used directly from your code.
@@ -1169,6 +1189,7 @@ export class DxColorBoxComponent extends DxComponent implements OnDestroy, Contr
11691189
{ emit: 'editAlphaChannelChange' },
11701190
{ emit: 'elementAttrChange' },
11711191
{ emit: 'fieldTemplateChange' },
1192+
{ emit: 'fieldTemplatesChange' },
11721193
{ emit: 'focusStateEnabledChange' },
11731194
{ emit: 'heightChange' },
11741195
{ emit: 'hintChange' },

‎packages/devextreme-angular/src/ui/drop-down-box/index.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,19 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co
296296
}
297297

298298

299+
/**
300+
* [descr:dxDropDownEditorOptions.fieldTemplates]
301+
302+
*/
303+
@Input()
304+
get fieldTemplates(): any {
305+
return this._getOption('fieldTemplates');
306+
}
307+
set fieldTemplates(value: any) {
308+
this._setOption('fieldTemplates', value);
309+
}
310+
311+
299312
/**
300313
* [descr:dxTextEditorOptions.focusStateEnabled]
301314
@@ -937,6 +950,13 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co
937950
*/
938951
@Output() fieldTemplateChange: EventEmitter<any>;
939952

953+
/**
954+
955+
* This member supports the internal infrastructure and is not intended to be used directly from your code.
956+
957+
*/
958+
@Output() fieldTemplatesChange: EventEmitter<any>;
959+
940960
/**
941961
942962
* This member supports the internal infrastructure and is not intended to be used directly from your code.
@@ -1242,6 +1262,7 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co
12421262
{ emit: 'dropDownOptionsChange' },
12431263
{ emit: 'elementAttrChange' },
12441264
{ emit: 'fieldTemplateChange' },
1265+
{ emit: 'fieldTemplatesChange' },
12451266
{ emit: 'focusStateEnabledChange' },
12461267
{ emit: 'heightChange' },
12471268
{ emit: 'hintChange' },

‎packages/devextreme-react/src/color-box.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ type IColorBoxOptionsNarrowedEvents = {
4848
type IColorBoxOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties, IColorBoxOptionsNarrowedEvents> & IHtmlOptions & {
4949
dropDownButtonRender?: (...params: any) => React.ReactNode;
5050
dropDownButtonComponent?: React.ComponentType<any>;
51-
fieldRender?: (...params: any) => React.ReactNode;
52-
fieldComponent?: React.ComponentType<any>;
5351
defaultOpened?: boolean;
5452
defaultValue?: string;
5553
onOpenedChange?: (value: boolean) => void;
@@ -92,11 +90,6 @@ const ColorBox = memo(
9290
render: "dropDownButtonRender",
9391
component: "dropDownButtonComponent"
9492
},
95-
{
96-
tmplOption: "fieldTemplate",
97-
render: "fieldRender",
98-
component: "fieldComponent"
99-
},
10093
]), []);
10194

10295
return (

‎packages/devextreme-react/src/drop-down-box.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ type IDropDownBoxOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties,
5050
contentComponent?: React.ComponentType<any>;
5151
dropDownButtonRender?: (...params: any) => React.ReactNode;
5252
dropDownButtonComponent?: React.ComponentType<any>;
53-
fieldRender?: (...params: any) => React.ReactNode;
54-
fieldComponent?: React.ComponentType<any>;
5553
defaultOpened?: boolean;
5654
onOpenedChange?: (value: boolean) => void;
5755
}>
@@ -96,11 +94,6 @@ const DropDownBox = memo(
9694
render: "dropDownButtonRender",
9795
component: "dropDownButtonComponent"
9896
},
99-
{
100-
tmplOption: "fieldTemplate",
101-
render: "fieldRender",
102-
component: "fieldComponent"
103-
},
10497
]), []);
10598

10699
return (

‎packages/devextreme-react/src/select-box.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ type ISelectBoxOptionsNarrowedEvents = {
5151
type ISelectBoxOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties, ISelectBoxOptionsNarrowedEvents> & IHtmlOptions & {
5252
dropDownButtonRender?: (...params: any) => React.ReactNode;
5353
dropDownButtonComponent?: React.ComponentType<any>;
54-
fieldRender?: (...params: any) => React.ReactNode;
55-
fieldComponent?: React.ComponentType<any>;
5654
groupRender?: (...params: any) => React.ReactNode;
5755
groupComponent?: React.ComponentType<any>;
5856
itemRender?: (...params: any) => React.ReactNode;
@@ -100,11 +98,6 @@ const SelectBox = memo(
10098
render: "dropDownButtonRender",
10199
component: "dropDownButtonComponent"
102100
},
103-
{
104-
tmplOption: "fieldTemplate",
105-
render: "fieldRender",
106-
component: "fieldComponent"
107-
},
108101
{
109102
tmplOption: "groupTemplate",
110103
render: "groupRender",

‎packages/devextreme-react/src/tag-box.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ type ITagBoxOptionsNarrowedEvents = {
5050
type ITagBoxOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties, ITagBoxOptionsNarrowedEvents> & IHtmlOptions & {
5151
dropDownButtonRender?: (...params: any) => React.ReactNode;
5252
dropDownButtonComponent?: React.ComponentType<any>;
53-
fieldRender?: (...params: any) => React.ReactNode;
54-
fieldComponent?: React.ComponentType<any>;
5553
groupRender?: (...params: any) => React.ReactNode;
5654
groupComponent?: React.ComponentType<any>;
5755
itemRender?: (...params: any) => React.ReactNode;
@@ -101,11 +99,6 @@ const TagBox = memo(
10199
render: "dropDownButtonRender",
102100
component: "dropDownButtonComponent"
103101
},
104-
{
105-
tmplOption: "fieldTemplate",
106-
render: "fieldRender",
107-
component: "fieldComponent"
108-
},
109102
{
110103
tmplOption: "groupTemplate",
111104
render: "groupRender",

‎packages/devextreme-vue/src/color-box.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import dxPopup from "devextreme/ui/popup";
88
import {
99
ApplyValueMode,
1010
TextEditorButton,
11+
template,
1112
LabelMode,
1213
EditorStyle,
1314
ValidationMessageMode,
@@ -26,6 +27,7 @@ import {
2627
} from "devextreme/common";
2728
import {
2829
DropDownPredefinedButton,
30+
FieldTemplate,
2931
} from "devextreme/ui/drop_down_editor/ui.drop_down_editor";
3032
import {
3133
dxPopupOptions,
@@ -96,6 +98,7 @@ type AccessibleOptions = Pick<Properties,
9698
"editAlphaChannel" |
9799
"elementAttr" |
98100
"fieldTemplate" |
101+
"fieldTemplates" |
99102
"focusStateEnabled" |
100103
"height" |
101104
"hint" |
@@ -162,7 +165,8 @@ const componentConfig = {
162165
dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
163166
editAlphaChannel: Boolean,
164167
elementAttr: Object as PropType<Record<string, any>>,
165-
fieldTemplate: {},
168+
fieldTemplate: [Object, Function] as PropType<FieldTemplate | (((data: any, element: any) => string | any)) | template>,
169+
fieldTemplates: Object as PropType<Record<string, any>>,
166170
focusStateEnabled: Boolean,
167171
height: [Number, String],
168172
hint: String,
@@ -226,6 +230,7 @@ const componentConfig = {
226230
"update:editAlphaChannel": null,
227231
"update:elementAttr": null,
228232
"update:fieldTemplate": null,
233+
"update:fieldTemplates": null,
229234
"update:focusStateEnabled": null,
230235
"update:height": null,
231236
"update:hint": null,

‎packages/devextreme-vue/src/drop-down-box.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ import DOMComponent from "devextreme/core/dom_component";
88
import dxPopup from "devextreme/ui/popup";
99
import {
1010
DropDownPredefinedButton,
11+
FieldTemplate,
1112
} from "devextreme/ui/drop_down_editor/ui.drop_down_editor";
1213
import {
1314
TextEditorButton,
15+
template,
1416
LabelMode,
1517
EditorStyle,
1618
ValidationMessageMode,
@@ -102,6 +104,7 @@ type AccessibleOptions = Pick<Properties,
102104
"dropDownOptions" |
103105
"elementAttr" |
104106
"fieldTemplate" |
107+
"fieldTemplates" |
105108
"focusStateEnabled" |
106109
"height" |
107110
"hint" |
@@ -171,7 +174,8 @@ const componentConfig = {
171174
dropDownButtonTemplate: {},
172175
dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
173176
elementAttr: Object as PropType<Record<string, any>>,
174-
fieldTemplate: {},
177+
fieldTemplate: [Object, Function] as PropType<FieldTemplate | (((data: any, element: any) => string | any)) | template>,
178+
fieldTemplates: Object as PropType<Record<string, any>>,
175179
focusStateEnabled: Boolean,
176180
height: [Number, String],
177181
hint: String,
@@ -238,6 +242,7 @@ const componentConfig = {
238242
"update:dropDownOptions": null,
239243
"update:elementAttr": null,
240244
"update:fieldTemplate": null,
245+
"update:fieldTemplates": null,
241246
"update:focusStateEnabled": null,
242247
"update:height": null,
243248
"update:hint": null,

‎packages/devextreme-vue/src/select-box.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ import DOMComponent from "devextreme/core/dom_component";
88
import dxPopup from "devextreme/ui/popup";
99
import {
1010
DropDownPredefinedButton,
11+
FieldTemplate,
1112
} from "devextreme/ui/drop_down_editor/ui.drop_down_editor";
1213
import {
1314
TextEditorButton,
15+
template,
1416
LabelMode,
1517
SimplifiedSearchMode,
1618
EditorStyle,
@@ -198,7 +200,7 @@ const componentConfig = {
198200
dropDownButtonTemplate: {},
199201
dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
200202
elementAttr: Object as PropType<Record<string, any>>,
201-
fieldTemplate: {},
203+
fieldTemplate: [Object, Function] as PropType<FieldTemplate | (((data: any, element: any) => string | any)) | template>,
202204
focusStateEnabled: Boolean,
203205
grouped: Boolean,
204206
groupTemplate: {},

‎packages/devextreme-vue/src/tag-box.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import dxPopup from "devextreme/ui/popup";
99
import {
1010
ApplyValueMode,
1111
TextEditorButton,
12+
template,
1213
LabelMode,
1314
SimplifiedSearchMode,
1415
SelectAllMode,
@@ -29,6 +30,7 @@ import {
2930
} from "devextreme/common";
3031
import {
3132
DropDownPredefinedButton,
33+
FieldTemplate,
3234
} from "devextreme/ui/drop_down_editor/ui.drop_down_editor";
3335
import {
3436
CollectionWidgetItem,
@@ -205,7 +207,7 @@ const componentConfig = {
205207
dropDownButtonTemplate: {},
206208
dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
207209
elementAttr: Object as PropType<Record<string, any>>,
208-
fieldTemplate: {},
210+
fieldTemplate: [Object, Function] as PropType<FieldTemplate | (((data: any, element: any) => string | any)) | template>,
209211
focusStateEnabled: Boolean,
210212
grouped: Boolean,
211213
groupTemplate: {},

0 commit comments

Comments
 (0)