revert(fieldTemplate type)

Author: marker dao ®

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

@@ -48,6 +48,8 @@ type IColorBoxOptionsNarrowedEvents = {
 type IColorBoxOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties, IColorBoxOptionsNarrowedEvents> & IHtmlOptions & {
   dropDownButtonRender?: (...params: any) => React.ReactNode;
   dropDownButtonComponent?: React.ComponentType<any>;
+  fieldRender?: (...params: any) => React.ReactNode;
+  fieldComponent?: React.ComponentType<any>;
   defaultOpened?: boolean;
   defaultValue?: string;
   onOpenedChange?: (value: boolean) => void;
@@ -90,6 +92,11 @@ const ColorBox = memo(
           render: "dropDownButtonRender",
           component: "dropDownButtonComponent"
         },
+        {
+          tmplOption: "fieldTemplate",
+          render: "fieldRender",
+          component: "fieldComponent"
+        },
       ]), []);
 
       return (

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

@@ -50,6 +50,8 @@ type IDropDownBoxOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties,
   contentComponent?: React.ComponentType<any>;
   dropDownButtonRender?: (...params: any) => React.ReactNode;
   dropDownButtonComponent?: React.ComponentType<any>;
+  fieldRender?: (...params: any) => React.ReactNode;
+  fieldComponent?: React.ComponentType<any>;
   defaultOpened?: boolean;
   onOpenedChange?: (value: boolean) => void;
 }>
@@ -94,6 +96,11 @@ const DropDownBox = memo(
           render: "dropDownButtonRender",
           component: "dropDownButtonComponent"
         },
+        {
+          tmplOption: "fieldTemplate",
+          render: "fieldRender",
+          component: "fieldComponent"
+        },
       ]), []);
 
       return (

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

@@ -51,6 +51,8 @@ type ISelectBoxOptionsNarrowedEvents = {
 type ISelectBoxOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties, ISelectBoxOptionsNarrowedEvents> & IHtmlOptions & {
   dropDownButtonRender?: (...params: any) => React.ReactNode;
   dropDownButtonComponent?: React.ComponentType<any>;
+  fieldRender?: (...params: any) => React.ReactNode;
+  fieldComponent?: React.ComponentType<any>;
   groupRender?: (...params: any) => React.ReactNode;
   groupComponent?: React.ComponentType<any>;
   itemRender?: (...params: any) => React.ReactNode;
@@ -98,6 +100,11 @@ const SelectBox = memo(
           render: "dropDownButtonRender",
           component: "dropDownButtonComponent"
         },
+        {
+          tmplOption: "fieldTemplate",
+          render: "fieldRender",
+          component: "fieldComponent"
+        },
         {
           tmplOption: "groupTemplate",
           render: "groupRender",

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

@@ -50,6 +50,8 @@ type ITagBoxOptionsNarrowedEvents = {
 type ITagBoxOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties, ITagBoxOptionsNarrowedEvents> & IHtmlOptions & {
   dropDownButtonRender?: (...params: any) => React.ReactNode;
   dropDownButtonComponent?: React.ComponentType<any>;
+  fieldRender?: (...params: any) => React.ReactNode;
+  fieldComponent?: React.ComponentType<any>;
   groupRender?: (...params: any) => React.ReactNode;
   groupComponent?: React.ComponentType<any>;
   itemRender?: (...params: any) => React.ReactNode;
@@ -99,6 +101,11 @@ const TagBox = memo(
           render: "dropDownButtonRender",
           component: "dropDownButtonComponent"
         },
+        {
+          tmplOption: "fieldTemplate",
+          render: "fieldRender",
+          component: "fieldComponent"
+        },
         {
           tmplOption: "groupTemplate",
           render: "groupRender",

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

@@ -8,7 +8,6 @@ import  dxPopup from "devextreme/ui/popup";
 import {
  ApplyValueMode,
  TextEditorButton,
- template,
  LabelMode,
  EditorStyle,
  ValidationMessageMode,
@@ -27,7 +26,6 @@ import {
 } from "devextreme/common";
 import {
  DropDownPredefinedButton,
- FieldTemplate,
  FieldTemplates,
 } from "devextreme/ui/drop_down_editor/ui.drop_down_editor";
 import {
@@ -166,7 +164,7 @@ const componentConfig = {
     dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
     editAlphaChannel: Boolean,
     elementAttr: Object as PropType<Record<string, any>>,
-    fieldTemplate: [Object, Function] as PropType<FieldTemplate | (((data: any, element: any) => string | any)) | template>,
+    fieldTemplate: {},
     fieldTemplates: Object as PropType<FieldTemplates | Record<string, any>>,
     focusStateEnabled: Boolean,
     height: [Number, String],

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

@@ -8,12 +8,10 @@ import  DOMComponent from "devextreme/core/dom_component";
 import  dxPopup from "devextreme/ui/popup";
 import {
  DropDownPredefinedButton,
- FieldTemplate,
  FieldTemplates,
 } from "devextreme/ui/drop_down_editor/ui.drop_down_editor";
 import {
  TextEditorButton,
- template,
  LabelMode,
  EditorStyle,
  ValidationMessageMode,
@@ -175,7 +173,7 @@ const componentConfig = {
     dropDownButtonTemplate: {},
     dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
     elementAttr: Object as PropType<Record<string, any>>,
-    fieldTemplate: [Object, Function] as PropType<FieldTemplate | (((data: any, element: any) => string | any)) | template>,
+    fieldTemplate: {},
     fieldTemplates: Object as PropType<FieldTemplates | Record<string, any>>,
     focusStateEnabled: Boolean,
     height: [Number, String],

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

@@ -8,12 +8,10 @@ import  DOMComponent from "devextreme/core/dom_component";
 import  dxPopup from "devextreme/ui/popup";
 import {
  DropDownPredefinedButton,
- FieldTemplate,
  FieldTemplates,
 } from "devextreme/ui/drop_down_editor/ui.drop_down_editor";
 import {
  TextEditorButton,
- template,
  LabelMode,
  SimplifiedSearchMode,
  EditorStyle,
@@ -202,7 +200,7 @@ const componentConfig = {
     dropDownButtonTemplate: {},
     dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
     elementAttr: Object as PropType<Record<string, any>>,
-    fieldTemplate: [Object, Function] as PropType<FieldTemplate | (((data: any, element: any) => string | any)) | template>,
+    fieldTemplate: {},
     fieldTemplates: Object as PropType<FieldTemplates | Record<string, any>>,
     focusStateEnabled: Boolean,
     grouped: Boolean,

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

@@ -9,7 +9,6 @@ import  dxPopup from "devextreme/ui/popup";
 import {
  ApplyValueMode,
  TextEditorButton,
- template,
  LabelMode,
  SimplifiedSearchMode,
  SelectAllMode,
@@ -30,7 +29,6 @@ import {
 } from "devextreme/common";
 import {
  DropDownPredefinedButton,
- FieldTemplate,
  FieldTemplates,
 } from "devextreme/ui/drop_down_editor/ui.drop_down_editor";
 import {
@@ -209,7 +207,7 @@ const componentConfig = {
     dropDownButtonTemplate: {},
     dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
     elementAttr: Object as PropType<Record<string, any>>,
-    fieldTemplate: [Object, Function] as PropType<FieldTemplate | (((data: any, element: any) => string | any)) | template>,
+    fieldTemplate: {},
     fieldTemplates: Object as PropType<FieldTemplates | Record<string, any>>,
     focusStateEnabled: Boolean,
     grouped: Boolean,

packages/devextreme/js/ui/color_box.d.ts

@@ -1,14 +1,21 @@
+import {
+    UserDefinedElement,
+    DxElement,
+} from '../core/element';
+
 import {
     EventInfo,
     NativeEventInfo,
     InitializedEventInfo,
     ChangedOptionInfo,
 } from '../common/core/events';
 
-import { ApplyValueMode } from '../common';
+import {
+    template,
+    ApplyValueMode,
+} from '../common';
 
 import dxDropDownEditor, {
-    FieldTemplate,
     dxDropDownEditorOptions,
     DropDownButtonTemplateDataModel,
 } from './drop_down_editor/ui.drop_down_editor';
@@ -191,7 +198,7 @@ export interface dxColorBoxOptions extends dxDropDownEditorOptions<dxColorBox> {
      * @type_function_return string|Element|jQuery
      * @public
      */
-    fieldTemplate?: FieldTemplate<string>;
+    fieldTemplate?: template | ((value: string, fieldElement: DxElement) => string | UserDefinedElement);
     /**
      * @docid
      * @default 1

packages/devextreme/js/ui/drop_down_box.d.ts

@@ -19,7 +19,6 @@ import {
 import dxDropDownEditor, {
     dxDropDownEditorOptions,
     DropDownButtonTemplateDataModel,
-    FieldTemplate,
 } from './drop_down_editor/ui.drop_down_editor';
 
 import {
@@ -213,7 +212,7 @@ export interface dxDropDownBoxOptions extends DataExpressionMixinOptions<dxDropD
      * @type_function_return string|Element|jQuery
      * @public
      */
-    fieldTemplate?: FieldTemplate;
+    fieldTemplate?: template | ((value: any, fieldElement: DxElement) => string | UserDefinedElement);
     /**
      * @docid
      * @public