@addsign/moje-agenda-shared-lib 2.0.35 → 2.0.36

package/dist/components/datatable/types.d.ts

@@ -1,10 +1,15 @@
 import { IOptionItem } from '../../types';
 
+export interface IDataTableRendexXlsOptions {
+    type?: "string" | "number" | "date";
+    format?: string;
+}
 export interface DataTableColumn<T> {
     key: keyof T | "actions";
     header: string;
     render?: (item: T) => React.ReactNode;
     renderXls?: (item: T) => string | number;
+    renderXlsOptions?: IDataTableRendexXlsOptions;
     actions?: DataTableAction<T>[];
     filterType?: string;
     classes?: string;

package/lib/components/datatable/DataTableServer.tsx

@@ -508,6 +508,7 @@ function DataTableServer<T extends DataTableInternalItems>({
 
               // Handle number formatting
               if (
+                column.renderXlsOptions?.type === "number" ||
                 typeof value === "number" ||
                 (typeof value === "string" && !isNaN(Number(value)))
               ) {
@@ -540,7 +541,16 @@ function DataTableServer<T extends DataTableInternalItems>({
             for (let R = range.s.r; R <= range.e.r; ++R) {
               const cell = worksheet[col + (R + 1)];
               if (cell && typeof cell.v === "number") {
-                cell.z = "#,##0"; // Number format without forcing decimals
+                // Get the column index by converting the column letter to number
+                const colIndex = XLSX.utils.decode_col(col);
+                // Find the corresponding column definition
+                const column = columns[colIndex];
+                // Apply the format if specified in renderXlsOptions
+                if (column?.renderXlsOptions?.format) {
+                  cell.z = column.renderXlsOptions.format;
+                } else {
+                  cell.z = "#,##0"; // Default number format
+                }
               }
             }
           }

package/lib/components/datatable/types.ts

@@ -1,10 +1,15 @@
 import { IOptionItem } from "../../types";
 
+export interface IDataTableRendexXlsOptions {
+    type?: "string" | "number" | "date";
+    format?: string;
+}
 export interface DataTableColumn<T> {
     key: keyof T | "actions";
     header: string;
     render?: (item: T) => React.ReactNode;
     renderXls?: (item: T) => string | number;
+    renderXlsOptions?: IDataTableRendexXlsOptions;
     actions?: DataTableAction<T>[];
     filterType?: string;
     classes?: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@addsign/moje-agenda-shared-lib",
   "private": false,
-  "version": "2.0.35",
+  "version": "2.0.36",
   "type": "module",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",