cloud-ide-element 1.1.266 → 1.1.267

package/fesm2022/cloud-ide-element.mjs

@@ -10999,7 +10999,11 @@ class CideEleDataGridComponent {
             // Client-side pagination
             const pageSize = this.mergedConfig().pagination?.pageSize || 10;
             this.pageSize.set(pageSize);
-            this.totalItems.set(data.length);
+            // When tree is enabled, data is root nodes only; use full node count for "X of Y"
+            const totalCount = this.mergedConfig().tree?.enabled
+                ? this.flattenAllDataForOrderTracking(data).length
+                : data.length;
+            this.totalItems.set(totalCount);
             // For client-side pagination, apply filters
             this.applyFilters();
         }
@@ -11149,23 +11153,33 @@ class CideEleDataGridComponent {
     // ===== Data Processing =====
     applyFilters() {
         let filtered = [...this.internalData()];
+        const query = this.searchQuery()?.toLowerCase();
+        const treeEnabled = this.mergedConfig().tree?.enabled;
+        const searchActive = !this.serverSidePagination && query && this.mergedConfig().search.enabled;
         // Apply search filter only for client-side pagination
-        // For server-side pagination, search is handled by the server
-        if (!this.serverSidePagination) {
-            const query = this.searchQuery()?.toLowerCase();
-            if (query && this.mergedConfig().search.enabled) {
+        if (searchActive) {
+            if (treeEnabled) {
+                // Search in full tree (all levels) so child entities are findable
+                const fullFlat = this.flattenAllDataForOrderTracking(this.internalData());
+                filtered = fullFlat.filter(item => this.mergedConfig().search.searchableColumns.some(columnKey => {
+                    const value = this.getNestedValue(item, columnKey);
+                    return String(value || '')?.toLowerCase()?.includes(query);
+                }));
+            }
+            else {
                 filtered = filtered.filter(item => this.mergedConfig().search.searchableColumns.some(columnKey => {
                     const value = this.getNestedValue(item, columnKey);
                     return String(value || '')?.toLowerCase()?.includes(query);
                 }));
             }
         }
-        // Flatten tree structure for display if tree is enabled
-        if (this.mergedConfig().tree?.enabled) {
+        // Flatten tree structure for display when tree is enabled (unless we already have flat search results)
+        if (treeEnabled && !searchActive) {
             filtered = this.flattenTreeForDisplay(filtered);
         }
-        // Apply column filters
-        this.applyFiltersToData(filtered);
+        // Apply column filters (when tree + search, pass matching count for totalItems)
+        const totalOverride = treeEnabled && searchActive ? filtered.length : undefined;
+        this.applyFiltersToData(filtered, totalOverride);
         // Apply sorting
         this.applySortsToData();
     }
@@ -11297,13 +11311,14 @@ class CideEleDataGridComponent {
         const itemMap = new Map();
         const processedItems = new Set();
         const rootItems = [];
+        const defaultExpanded = !!treeConfig.defaultExpandAll;
         // First pass: create tree items with default properties and level key
         data.forEach(item => {
             const treeItem = {
                 ...item,
                 [levelKey]: 0,
                 level: 0, // Always add 'level' property for consistent access
-                [expandedKey]: false,
+                [expandedKey]: defaultExpanded,
                 [hasChildrenKey]: false,
                 [childrenKey]: []
             };
@@ -12802,7 +12817,7 @@ class CideEleDataGridComponent {
         // Reapply sorting after filtering
         this.applySortsToData();
     }
-    applyFiltersToData(data) {
+    applyFiltersToData(data, totalCountOverride) {
         let filtered = data ? [...data] : [...this.internalData()];
         const filters = this.columnFilters();
         filters.forEach(filter => {
@@ -12832,8 +12847,14 @@ class CideEleDataGridComponent {
             });
         });
         this.filteredData.set(filtered);
-        this.totalItems.set(filtered.length);
-        this.totalPages.set(Math.ceil(filtered.length / this.pageSize()));
+        // When tree is enabled, use full tree count for totalItems unless override (e.g. search result count) is provided
+        const totalCount = totalCountOverride !== undefined
+            ? totalCountOverride
+            : this.mergedConfig().tree?.enabled
+                ? this.flattenAllDataForOrderTracking(this.internalData()).length
+                : filtered.length;
+        this.totalItems.set(totalCount);
+        this.totalPages.set(Math.ceil(totalCount / this.pageSize()));
     }
     // ===== Utility Methods =====
     emitEvent(type, data, column, action) {