@shival99/z-ui 2.0.72 → 2.0.74

package/fesm2022/shival99-z-ui-components-z-table.mjs

@@ -8976,7 +8976,7 @@ class ZTableComponent {
             this._skipNextConfigSave = true;
         }
         const config = this.zConfig();
-        const nextOrder = this.table.getAllLeafColumns().map(column => column.id);
+        const nextOrder = this._getDefaultColumnOrder();
         const nextVisibility = config.initialState?.columnVisibility ?? {};
         const nextPinning = this._defaultColumnPinning();
         const initialGroupingColumnIds = this._getInitialGroupingColumnIds(true);
@@ -8989,17 +8989,31 @@ class ZTableComponent {
         if (initialGroupingColumnIds.length > 0) {
             this._moveGroupingColumnsToLeadingDataPosition(initialGroupingColumnIds);
         }
+        const resetOrder = this.columnOrder();
         this.collapsedGroupIds.set(new Set());
         this.showHeaderFooterShadow.set(config.showHeaderShadow ?? config.showFooterShadow ?? true);
         this.showHorizontalBorder.set(config.showHorizontalBorder ?? true);
         this.showVerticalBorder.set(config.showVerticalBorder ?? true);
-        this.pendingVisibleColumns.set(this.table
-            .getAllLeafColumns()
-            .filter(column => nextVisibility[column.id] !== false)
-            .map(column => column.id));
-        this.pendingColumnOrder.set(nextOrder);
+        this.pendingVisibleColumns.set(resetOrder.filter(columnId => nextVisibility[columnId] !== false));
+        this.pendingColumnOrder.set(resetOrder);
         this._scheduleFitColumnWidths();
     }
+    _getDefaultColumnOrder() {
+        const columnIds = [];
+        const collectLeafColumnIds = (columns) => {
+            for (const column of columns) {
+                if ('columns' in column && column.columns?.length) {
+                    collectLeafColumnIds(column.columns);
+                    continue;
+                }
+                if (column.id) {
+                    columnIds.push(column.id);
+                }
+            }
+        };
+        collectLeafColumnIds(this._columns());
+        return columnIds;
+    }
     _getInitialGroupingColumnIds(includeLegacyColumnsFallback = false) {
         if (!this.canUseGrouping()) {
             return [];
@@ -9199,7 +9213,6 @@ class ZTableComponent {
                 right: this.columnPinning().right,
             },
             columnVisibility: this.columnVisibility(),
-            groupingColumnId: this.groupingColumnIds()[0] ?? null,
             groupingColumnIds: this.groupingColumnIds(),
             columnInfo,
             showHeaderFooterShadow: this.showHeaderFooterShadow(),
@@ -9266,14 +9279,6 @@ class ZTableComponent {
             if (config.groupingColumnIds) {
                 this.groupingColumnIds.set(config.groupingColumnIds.filter(columnId => this.canGroupColumn(columnId)));
             }
-            if (!config.groupingColumnIds && config.groupingColumnId === null) {
-                this.groupingColumnIds.set([]);
-            }
-            if (!config.groupingColumnIds &&
-                typeof config.groupingColumnId === 'string' &&
-                this.canGroupColumn(config.groupingColumnId)) {
-                this.groupingColumnIds.set([config.groupingColumnId]);
-            }
             if (typeof config.showHeaderFooterShadow === 'boolean') {
                 this.showHeaderFooterShadow.set(config.showHeaderFooterShadow);
             }
@@ -9418,8 +9423,23 @@ class ZTableComponent {
         if (formatter) {
             return formatter({ value, columnId, rows });
         }
+        const date = this._getGroupDate(value);
+        if (date) {
+            return formatDate(date, 'dd/MM/yyyy | HH:mm:ss', 'en-US');
+        }
         return this._getGroupLabel(value);
     }
+    _getGroupDate(value) {
+        if (value instanceof Date) {
+            return Number.isNaN(value.getTime()) ? null : value;
+        }
+        if (typeof value !== 'string' ||
+            !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d{1,3})?)?(?:Z|[+-]\d{2}:\d{2})?$/.test(value)) {
+            return null;
+        }
+        const date = new Date(value);
+        return Number.isNaN(date.getTime()) ? null : date;
+    }
     _getGroupLabel(value) {
         if (value === null || value === undefined || value === '') {
             return this._zTranslate.translate('i18n_z_ui_table_group_empty')();