Merge branch 'T1270796_25_1' of https://github.com/tongsonbarbs/DevEx…

…treme into T1270796_25_1 # Conflicts: # packages/devextreme/js/ui/filter_builder.d.ts # packages/devextreme/ts/dx.all.d.ts
DevExpress · Jan 28, 2025 · 60b48c5 · 60b48c5
2 parents d367cb6 + 7bbae40
commit 60b48c5
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 32 deletions.
diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts
@@ -48,10 +48,10 @@ export class DxiDataGridFieldComponent extends CollectionNestedOption {
     }
 
     @Input()
-    get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) {
+    get customizeText(): ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string) {
         return this._getOption('customizeText');
     }
-    set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) {
+    set customizeText(value: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)) {
         this._setOption('customizeText', value);
     }
 

diff --git a/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts
@@ -48,10 +48,10 @@ export class DxiFilterBuilderFieldComponent extends CollectionNestedOption {
     }
 
     @Input()
-    get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) {
+    get customizeText(): ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string) {
         return this._getOption('customizeText');
     }
-    set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) {
+    set customizeText(value: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)) {
         this._setOption('customizeText', value);
     }
 

diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts
@@ -48,10 +48,10 @@ export class DxiTreeListFieldComponent extends CollectionNestedOption {
     }
 
     @Input()
-    get customizeText(): ((fieldInfo: { value: string | number | Date, valueText: string }) => string) {
+    get customizeText(): ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string) {
         return this._getOption('customizeText');
     }
-    set customizeText(value: ((fieldInfo: { value: string | number | Date, valueText: string }) => string)) {
+    set customizeText(value: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)) {
         this._setOption('customizeText', value);
     }
 

diff --git a/packages/devextreme-react/src/common/data/custom-store.ts b/packages/devextreme-react/src/common/data/custom-store.ts
diff --git a/packages/devextreme-react/src/data-grid.ts b/packages/devextreme-react/src/data-grid.ts
@@ -1142,7 +1142,7 @@ const ExportTexts = Object.assign<typeof _componentExportTexts, NestedComponentM
 type IFieldProps = React.PropsWithChildren<{
   calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>);
   caption?: string | undefined;
-  customizeText?: ((fieldInfo: { value: string | number | Date, valueText: string }) => string);
+  customizeText?: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string);
   dataField?: string | undefined;
   dataType?: DataType;
   editorOptions?: any;

diff --git a/packages/devextreme-react/src/filter-builder.ts b/packages/devextreme-react/src/filter-builder.ts
@@ -118,7 +118,7 @@ const CustomOperation = Object.assign<typeof _componentCustomOperation, NestedCo
 type IFieldProps = React.PropsWithChildren<{
   calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>);
   caption?: string | undefined;
-  customizeText?: ((fieldInfo: { value: string | number | Date, valueText: string }) => string);
+  customizeText?: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string);
   dataField?: string | undefined;
   dataType?: DataType;
   editorOptions?: any;

diff --git a/packages/devextreme-react/src/tree-list.ts b/packages/devextreme-react/src/tree-list.ts
@@ -951,7 +951,7 @@ const EmailRule = Object.assign<typeof _componentEmailRule, NestedComponentMeta>
 type IFieldProps = React.PropsWithChildren<{
   calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>);
   caption?: string | undefined;
-  customizeText?: ((fieldInfo: { value: string | number | Date, valueText: string }) => string);
+  customizeText?: ((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string);
   dataField?: string | undefined;
   dataType?: DataType;
   editorOptions?: any;

diff --git a/packages/devextreme-vue/src/common/data/custom-store.ts b/packages/devextreme-vue/src/common/data/custom-store.ts
diff --git a/packages/devextreme-vue/src/data-grid.ts b/packages/devextreme-vue/src/data-grid.ts
@@ -1577,7 +1577,7 @@ const DxFieldConfig = {
   props: {
     calculateFilterExpression: Function as PropType<((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>)>,
     caption: String,
-    customizeText: Function as PropType<((fieldInfo: { value: string | number | Date, valueText: string }) => string)>,
+    customizeText: Function as PropType<((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)>,
     dataField: String,
     dataType: String as PropType<DataType>,
     editorOptions: {},

diff --git a/packages/devextreme-vue/src/filter-builder.ts b/packages/devextreme-vue/src/filter-builder.ts
@@ -200,7 +200,7 @@ const DxFieldConfig = {
   props: {
     calculateFilterExpression: Function as PropType<((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>)>,
     caption: String,
-    customizeText: Function as PropType<((fieldInfo: { value: string | number | Date, valueText: string }) => string)>,
+    customizeText: Function as PropType<((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)>,
     dataField: String,
     dataType: String as PropType<DataType>,
     editorOptions: {},

diff --git a/packages/devextreme-vue/src/tree-list.ts b/packages/devextreme-vue/src/tree-list.ts
@@ -1395,7 +1395,7 @@ const DxFieldConfig = {
   props: {
     calculateFilterExpression: Function as PropType<((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>)>,
     caption: String,
-    customizeText: Function as PropType<((fieldInfo: { value: string | number | Date, valueText: string }) => string)>,
+    customizeText: Function as PropType<((fieldInfo: { field: any, value: string | number | Date, valueText: string }) => string)>,
     dataField: String,
     dataType: String as PropType<DataType>,
     editorOptions: {},

diff --git a/packages/devextreme/js/ui/filter_builder.d.ts b/packages/devextreme/js/ui/filter_builder.d.ts
@@ -363,6 +363,7 @@ export type CustomOperation = dxFilterBuilderCustomOperation;
 export type FieldInfo = {
   value?: string | number | Date;
   valueText?: string;
+  field?: Field;
 };
 /**
  * @namespace DevExpress.ui
@@ -386,7 +387,7 @@ export interface dxFilterBuilderCustomOperation {
      * @docid
      * @public
      */
-    customizeText?: ((fieldInfo: FieldInfo) => string);
+    customizeText?: (fieldInfo: FieldInfo) => string;
     /**
      * @docid
      * @default undefined
@@ -452,7 +453,7 @@ export interface dxFilterBuilderField {
      * @docid
      * @public
      */
-    customizeText?: ((fieldInfo: FieldInfo) => string);
+    customizeText?: (fieldInfo: FieldInfo) => string;
     /**
      * @docid
      * @default undefined

diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts
@@ -16814,6 +16814,7 @@ declare module DevExpress.ui {
     export type FieldInfo = {
       value?: string | number | Date;
       valueText?: string;
+      field?: Field;
     };
     /**
      * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution.
@@ -29692,8 +29693,8 @@ declare module DevExpress.ui {
     };
     export type TreeListCommandColumnType = 'adaptive' | 'buttons' | 'drag';
     export type TreeListEditingOptions<TRowData, TKey> = {
-      readonly component?: dxTreeList<TRowData, TKey>;
-      readonly row?: Row<TRowData, TKey>;
+      component?: dxTreeList<TRowData, TKey>;
+      row?: Row<TRowData, TKey>;
     };
     export type TreeListFilterMode =
       | 'fullBranch'