@shival99/z-ui 2.0.69 → 2.0.70

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

@@ -5590,9 +5590,12 @@ class ZTableComponent {
     }, ...(ngDevMode ? [{ debugName: "hasServerFiltering" }] : []));
     groupingConfig = computed(() => {
         const { enableGrouping: grouping } = this.zConfig();
-        if (!grouping) {
+        if (grouping === false) {
             return { enabled: false, mode: 'local', allowHeaderMenu: true, defaultExpanded: true, showCount: true };
         }
+        if (grouping === undefined) {
+            return { enabled: true, mode: 'local', allowHeaderMenu: true, defaultExpanded: true, showCount: true };
+        }
         if (typeof grouping === 'boolean') {
             return { enabled: grouping, mode: 'local', allowHeaderMenu: true, defaultExpanded: true, showCount: true };
         }
@@ -5654,7 +5657,8 @@ class ZTableComponent {
             if (this._isSpecialColumnId(column.id)) {
                 continue;
             }
-            result[column.id] = allowedIds ? allowedIds.has(column.id) : true;
+            const columnConfig = this._findColumnConfig(column.id);
+            result[column.id] = columnConfig?.enableGrouping !== false && (allowedIds ? allowedIds.has(column.id) : true);
         }
         return result;
     }, ...(ngDevMode ? [{ debugName: "groupableColumnMap" }] : []));
@@ -5665,8 +5669,7 @@ class ZTableComponent {
         for (const headerGroup of this.orderedHeaderGroups()) {
             for (const header of headerGroup.headers) {
                 const isLeafHeader = header.subHeaders.length === 0;
-                result[header.id] =
-                    isLeafHeader && (groupableColumns[header.column.id] || activeColumnId === header.column.id);
+                result[header.id] = isLeafHeader && (groupableColumns[header.column.id] || activeColumnId === header.column.id);
             }
         }
         return result;
@@ -5694,7 +5697,6 @@ class ZTableComponent {
             }
             groups.set(groupId, {
                 value,
-                label: this._getGroupLabel(value),
                 rows: [row],
             });
         }
@@ -5705,7 +5707,7 @@ class ZTableComponent {
                 type: 'group',
                 id,
                 value: group.value,
-                label: group.label,
+                label: this._getColumnGroupLabel(columnId, group.value, group.rows),
                 columnLabel,
                 count: group.rows.length,
                 expanded,
@@ -5748,7 +5750,7 @@ class ZTableComponent {
                 type: 'group',
                 id: groupId,
                 value: group.value,
-                label: group.label ?? this._getGroupLabel(group.value),
+                label: group.label ?? this._getColumnGroupLabel(columnId, group.value, rows),
                 columnLabel,
                 count: group.count ?? rows.length,
                 expanded,
@@ -8825,6 +8827,9 @@ class ZTableComponent {
         if (this._isSpecialColumnId(columnId)) {
             return false;
         }
+        if (this._findColumnConfig(columnId)?.enableGrouping === false) {
+            return false;
+        }
         if (config.columns?.length) {
             return config.columns.includes(columnId);
         }
@@ -9309,6 +9314,13 @@ class ZTableComponent {
     _getGroupId(columnId, value) {
         return `${columnId}:${this._getGroupLabel(value)}`;
     }
+    _getColumnGroupLabel(columnId, value, rows) {
+        const formatter = this._findColumnConfig(columnId)?.groupLabel;
+        if (formatter) {
+            return formatter({ value, columnId, rows });
+        }
+        return this._getGroupLabel(value);
+    }
     _getGroupLabel(value) {
         if (value === null || value === undefined || value === '') {
             return this._zTranslate.translate('i18n_z_ui_table_group_empty')();