es-grid-template 1.8.76 → 1.8.78

package/es/grid-component/type.d.ts

@@ -29,8 +29,54 @@ export interface DensityOptions {
     onOperatorChange?: OnChangeFn<OpetorState>;
 }
 export type Key = React.Key;
-export type PaginationConfig = TablePaginationConfig & {
+export type GridTableLocale = TableLocale & {
+    ok_btn?: string;
+    cancel_btn?: string;
+    add_rows?: string;
+    add_rows_before?: string;
+    add_rows_after?: string;
+    add_1?: string;
+    add_10?: string;
+    add_50?: string;
+    add_100?: string;
+    add_children?: string;
+    delete_content?: string;
+    delete_rows?: string;
+    custom?: string;
+    filterTitle?: string;
+    filterConfirm?: React.ReactNode;
+    filterReset?: React.ReactNode;
+    filterEmptyText?: React.ReactNode;
+    filterCheckall?: React.ReactNode;
+    filterSearchPlaceholder?: string;
+    emptyText?: React.ReactNode | (() => React.ReactNode);
+    selectAll?: React.ReactNode;
+    selectNone?: React.ReactNode;
+    selectInvert?: React.ReactNode;
+    selectionAll?: React.ReactNode;
+    sortTitle?: string;
+    expand?: string;
+    collapse?: string;
+    triggerDesc?: string;
+    triggerAsc?: string;
+    cancelSort?: string;
+    fullScreen?: string;
+    minimized?: string;
+    setting?: string;
+    groupData?: string;
+    textPlaceholder?: string;
+    selectPlaceholder?: string;
+};
+export type PagingLocale = PaginationLocale & {
+    items?: string;
+};
+export type Locale = {
+    table?: GridTableLocale;
+    pager?: PagingLocale;
+};
+export type PaginationConfig = Omit<TablePaginationConfig, 'locale'> & {
     currentPage?: number;
+    locale?: PagingLocale;
 };
 export type AnyObject = Record<PropertyKey, any>;
 export type IFormat = {
@@ -163,51 +209,6 @@ export type ColumnTable<RecordType = AnyObject> = {
     sumGroup?: boolean;
     onCell?: (rowData: RecordType, index: number) => React.TdHTMLAttributes<HTMLTableCellElement>;
 };
-export type GridTableLocale = TableLocale & {
-    ok_btn?: string;
-    cancel_btn?: string;
-    add_rows?: string;
-    add_rows_before?: string;
-    add_rows_after?: string;
-    add_1?: string;
-    add_10?: string;
-    add_50?: string;
-    add_100?: string;
-    add_children?: string;
-    delete_content?: string;
-    delete_rows?: string;
-    custom?: string;
-    filterTitle?: string;
-    filterConfirm?: React.ReactNode;
-    filterReset?: React.ReactNode;
-    filterEmptyText?: React.ReactNode;
-    filterCheckall?: React.ReactNode;
-    filterSearchPlaceholder?: string;
-    emptyText?: React.ReactNode | (() => React.ReactNode);
-    selectAll?: React.ReactNode;
-    selectNone?: React.ReactNode;
-    selectInvert?: React.ReactNode;
-    selectionAll?: React.ReactNode;
-    sortTitle?: string;
-    expand?: string;
-    collapse?: string;
-    triggerDesc?: string;
-    triggerAsc?: string;
-    cancelSort?: string;
-    fullScreen?: string;
-    minimized?: string;
-    setting?: string;
-    groupData?: string;
-    textPlaceholder?: string;
-    selectPlaceholder?: string;
-};
-export type PagingLocale = PaginationLocale & {
-    items?: string;
-};
-export type Locale = {
-    table?: GridTableLocale;
-    pager?: PagingLocale;
-};
 export type ColumnsTable<RecordType = AnyObject> = ColumnTable<RecordType>[];
 export type TableProps<RecordType = AnyObject> = {
     id?: string;

package/es/group-component/TableContainer.js

@@ -368,7 +368,7 @@ const TableContainer = props => {
       thousandSeparator: '.'
     })} / ${numericFormatter((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${paginationLocal?.items || 'items'}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
   }, pagination, {
     onChange: (page, pageSize1) => {
       if (pagination.onChange) {

package/es/group-component/TableContainerEdit.js

@@ -2084,7 +2084,7 @@ const TableContainerEdit = props => {
       thousandSeparator: '.'
     })} / ${numericFormatter((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${paginationLocal?.items || 'items'}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
   }, pagination, {
     onChange: (page, pageSize1) => {
       if (pagination.onChange) {

package/es/group-component/hook/utils.d.ts

@@ -165,7 +165,7 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
     type?: IColumnType;
     haveSum?: boolean;
     isSummary?: boolean;
-    summaryTemplate?: (data: number, key: string) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode;
+    summaryTemplate?: (data: number, key: string) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     format?: IFormat | ((rowData: any) => IFormat);
     allowFiltering?: boolean;
     sorter?: boolean;
@@ -180,18 +180,18 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
     headerText?: string;
     hidden?: boolean;
     visible?: boolean;
-    headerTooltip?: string | boolean | (() => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
+    headerTooltip?: string | boolean | (() => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
     columnGroupText?: string;
     align?: import("./../../grid-component/type").ITextAlign;
     textAlign?: import("./../../grid-component/type").ITextAlign;
     headerTextAlign?: import("./../../grid-component/type").ITextAlign;
-    template?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode | ((args: import("./../../grid-component/type").ColumnTemplate<RecordType>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
+    template?: import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | ((args: import("./../../grid-component/type").ColumnTemplate<RecordType>) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
     showTooltip?: boolean;
     tooltipDescription?: string | ((args: {
         value: any;
         rowData: RecordType;
-    }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
-    headerTemplate?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode | ((column: ColumnTable<RecordType>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
+    }) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
+    headerTemplate?: import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | ((column: ColumnTable<RecordType>) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
     commandItems?: import("./../../grid-component/type").CommandItem[];
     children?: ColumnTable<RecordType>[];
     editType?: EditType | ((rowData?: RecordType) => EditType);
@@ -211,9 +211,9 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
     ellipsis?: boolean;
     allowResizing?: boolean;
     allowSelection?: boolean | ((rowData: RecordType) => boolean);
-    onCellStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
-    onCellHeaderStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
-    onCellFooterStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
+    onCellStyles?: Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width">);
+    onCellHeaderStyles?: Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width">);
+    onCellFooterStyles?: Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width">);
     sumGroup?: boolean;
     onCell?: (rowData: RecordType, index: number) => import("react").TdHTMLAttributes<HTMLTableCellElement>;
 }[];

package/es/table-component/TableContainer.js

@@ -325,7 +325,7 @@ const TableContainer = props => {
       thousandSeparator: '.'
     })} / ${numericFormatter((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${paginationLocal?.items || 'items'}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
   }, pagination, {
     onChange: (page, pageSize1) => {
       if (pagination.onChange) {

package/es/table-component/TableContainerEdit.js

@@ -1984,7 +1984,7 @@ const TableContainerEdit = props => {
       thousandSeparator: '.'
     })} / ${numericFormatter((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${locale?.pager?.items || paginationLocal?.items || ''}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
 
     // locale={locale}
   }, pagination, {

package/es/table-component/header/renderFilter.js

@@ -95,7 +95,9 @@ export const renderFilter = args => {
         format: dateRangeFormat,
         value: dateRangeValue,
         onChange: value => {
+          console.log('value', value);
           const newDateRangeValue = value ? [value[0] ? moment(value[0]).format() : '', value[1] ? moment(value[1]).format() : ''] : [];
+          console.log('newDateRangeValue', newDateRangeValue);
           setSelectedKeys(newDateRangeValue);
         },
         menuClassName: "rc-menu-popup",

package/es/table-virtuoso/table/TableContainer.js

@@ -275,7 +275,7 @@ const TableContainer = props => {
       thousandSeparator: '.'
     })} / ${numericFormatter((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${paginationLocal?.items || 'items'}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
   }, pagination, {
     onChange: (page, pageSize1) => {
       if (pagination.onChange) {

package/lib/grid-component/type.d.ts

@@ -29,8 +29,54 @@ export interface DensityOptions {
     onOperatorChange?: OnChangeFn<OpetorState>;
 }
 export type Key = React.Key;
-export type PaginationConfig = TablePaginationConfig & {
+export type GridTableLocale = TableLocale & {
+    ok_btn?: string;
+    cancel_btn?: string;
+    add_rows?: string;
+    add_rows_before?: string;
+    add_rows_after?: string;
+    add_1?: string;
+    add_10?: string;
+    add_50?: string;
+    add_100?: string;
+    add_children?: string;
+    delete_content?: string;
+    delete_rows?: string;
+    custom?: string;
+    filterTitle?: string;
+    filterConfirm?: React.ReactNode;
+    filterReset?: React.ReactNode;
+    filterEmptyText?: React.ReactNode;
+    filterCheckall?: React.ReactNode;
+    filterSearchPlaceholder?: string;
+    emptyText?: React.ReactNode | (() => React.ReactNode);
+    selectAll?: React.ReactNode;
+    selectNone?: React.ReactNode;
+    selectInvert?: React.ReactNode;
+    selectionAll?: React.ReactNode;
+    sortTitle?: string;
+    expand?: string;
+    collapse?: string;
+    triggerDesc?: string;
+    triggerAsc?: string;
+    cancelSort?: string;
+    fullScreen?: string;
+    minimized?: string;
+    setting?: string;
+    groupData?: string;
+    textPlaceholder?: string;
+    selectPlaceholder?: string;
+};
+export type PagingLocale = PaginationLocale & {
+    items?: string;
+};
+export type Locale = {
+    table?: GridTableLocale;
+    pager?: PagingLocale;
+};
+export type PaginationConfig = Omit<TablePaginationConfig, 'locale'> & {
     currentPage?: number;
+    locale?: PagingLocale;
 };
 export type AnyObject = Record<PropertyKey, any>;
 export type IFormat = {
@@ -163,51 +209,6 @@ export type ColumnTable<RecordType = AnyObject> = {
     sumGroup?: boolean;
     onCell?: (rowData: RecordType, index: number) => React.TdHTMLAttributes<HTMLTableCellElement>;
 };
-export type GridTableLocale = TableLocale & {
-    ok_btn?: string;
-    cancel_btn?: string;
-    add_rows?: string;
-    add_rows_before?: string;
-    add_rows_after?: string;
-    add_1?: string;
-    add_10?: string;
-    add_50?: string;
-    add_100?: string;
-    add_children?: string;
-    delete_content?: string;
-    delete_rows?: string;
-    custom?: string;
-    filterTitle?: string;
-    filterConfirm?: React.ReactNode;
-    filterReset?: React.ReactNode;
-    filterEmptyText?: React.ReactNode;
-    filterCheckall?: React.ReactNode;
-    filterSearchPlaceholder?: string;
-    emptyText?: React.ReactNode | (() => React.ReactNode);
-    selectAll?: React.ReactNode;
-    selectNone?: React.ReactNode;
-    selectInvert?: React.ReactNode;
-    selectionAll?: React.ReactNode;
-    sortTitle?: string;
-    expand?: string;
-    collapse?: string;
-    triggerDesc?: string;
-    triggerAsc?: string;
-    cancelSort?: string;
-    fullScreen?: string;
-    minimized?: string;
-    setting?: string;
-    groupData?: string;
-    textPlaceholder?: string;
-    selectPlaceholder?: string;
-};
-export type PagingLocale = PaginationLocale & {
-    items?: string;
-};
-export type Locale = {
-    table?: GridTableLocale;
-    pager?: PagingLocale;
-};
 export type ColumnsTable<RecordType = AnyObject> = ColumnTable<RecordType>[];
 export type TableProps<RecordType = AnyObject> = {
     id?: string;

package/lib/group-component/TableContainer.js

@@ -376,7 +376,7 @@ const TableContainer = props => {
       thousandSeparator: '.'
     })} / ${(0, _reactNumericComponent.numericFormatter)((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${paginationLocal?.items || 'items'}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
   }, pagination, {
     onChange: (page, pageSize1) => {
       if (pagination.onChange) {

package/lib/group-component/TableContainerEdit.js

@@ -2092,7 +2092,7 @@ const TableContainerEdit = props => {
       thousandSeparator: '.'
     })} / ${(0, _reactNumericComponent.numericFormatter)((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${paginationLocal?.items || 'items'}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
   }, pagination, {
     onChange: (page, pageSize1) => {
       if (pagination.onChange) {

package/lib/table-component/TableContainer.js

@@ -332,7 +332,7 @@ const TableContainer = props => {
       thousandSeparator: '.'
     })} / ${(0, _reactNumericComponent.numericFormatter)((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${paginationLocal?.items || 'items'}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
   }, pagination, {
     onChange: (page, pageSize1) => {
       if (pagination.onChange) {

package/lib/table-component/TableContainerEdit.js

@@ -1991,7 +1991,7 @@ const TableContainerEdit = props => {
       thousandSeparator: '.'
     })} / ${(0, _reactNumericComponent.numericFormatter)((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${locale?.pager?.items || paginationLocal?.items || ''}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
 
     // locale={locale}
   }, pagination, {

package/lib/table-component/header/renderFilter.js

@@ -104,7 +104,9 @@ const renderFilter = args => {
         format: dateRangeFormat,
         value: dateRangeValue,
         onChange: value => {
+          console.log('value', value);
           const newDateRangeValue = value ? [value[0] ? (0, _moment.default)(value[0]).format() : '', value[1] ? (0, _moment.default)(value[1]).format() : ''] : [];
+          console.log('newDateRangeValue', newDateRangeValue);
           setSelectedKeys(newDateRangeValue);
         },
         menuClassName: "rc-menu-popup",

package/lib/table-virtuoso/table/TableContainer.js

@@ -283,7 +283,7 @@ const TableContainer = props => {
       thousandSeparator: '.'
     })} / ${(0, _reactNumericComponent.numericFormatter)((totalItems ?? 0).toString(), {
       thousandSeparator: '.'
-    })} ${paginationLocal?.items || 'items'}`
+    })} ${pagination?.locale?.items || paginationLocal?.items || ''}`
   }, pagination, {
     onChange: (page, pageSize1) => {
       if (pagination.onChange) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.8.76",
+  "version": "1.8.78",
   "description": "es-grid-template",
   "keywords": [
     "react",