@smartbit4all/ng-client 3.1.63 → 3.1.65

package/fesm2020/smartbit4all-ng-client.mjs

@@ -11217,23 +11217,43 @@ class SmartGridComponent {
     renderCards() {
         // TODO
     }
+    isMultipleSelection() {
+        const selectionMode = this.service.gridModel.view?.descriptor?.selectionMode;
+        return selectionMode === GridSelectionMode.Multiple;
+    }
     renderTree() {
         if (!this.treeDataSource) {
             this.treeFlattener = new MatTreeFlattener(this.transformer, this.getLevel, this.isExpandable, this.getChildren);
             this.treeControl = new FlatTreeControl(this.getLevel, this.isExpandable);
             this.treeDataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
-            const selectionMode = this.service.gridModel.view?.descriptor?.selectionMode;
-            const isMultiple = selectionMode === GridSelectionMode.Multiple;
-            this.treeChecklistSelection = new SelectionModel(isMultiple);
+            this.treeChecklistSelection = new SelectionModel(this.isMultipleSelection());
+        }
+        let nodes = this.treeControl?.dataNodes;
+        let expandedNodes;
+        if (nodes) {
+            expandedNodes = nodes
+                .filter((node) => this.treeControl?.isExpandable(node))
+                .filter((node) => this.treeControl?.isExpanded(node))
+                .map((node) => node.id);
+        }
+        else {
+            expandedNodes = [];
         }
+        this.smartGrid.gridModel.page.rows.forEach((row) => (row.level = undefined));
         this.treeDataSource.data = this.smartGrid.gridModel.page.rows.filter((row) => !row.parent);
-        // TODO handle and set expansion..
         this.treeChecklistSelection?.clear();
         this.treeControl?.dataNodes.forEach((node) => {
             if (node.selected) {
                 this.treeChecklistSelection?.select(node);
             }
         });
+        this.treeControl?.collapseAll();
+        expandedNodes.forEach((rowId) => {
+            let row = this.treeControl?.dataNodes.find((row) => rowId === row.id);
+            if (row) {
+                this.treeControl?.expand(row);
+            }
+        });
     }
     getTreeItem(row) {
         let columns = this.smartGrid?.gridModel.view?.orderedColumnNames;
@@ -11250,20 +11270,25 @@ class SmartGridComponent {
         }
         let selectionBefore = this.treeChecklistSelection.selected.map((row) => row.id);
         this.treeChecklistSelection.toggle(node);
-        const descendants = this.treeControl.getDescendants(node);
-        this.treeChecklistSelection.isSelected(node)
-            ? this.treeChecklistSelection.select(...descendants)
-            : this.treeChecklistSelection.deselect(...descendants);
-        this.checkAllParentsSelection(node);
+        if (this.isMultipleSelection()) {
+            const descendants = this.treeControl.getDescendants(node);
+            this.treeChecklistSelection.isSelected(node)
+                ? this.treeChecklistSelection.select(...descendants)
+                : this.treeChecklistSelection.deselect(...descendants);
+            this.checkAllParentsSelection(node);
+        }
         let selectionAfter = this.treeChecklistSelection.selected.map((row) => row.id);
         let selectedIds = selectionAfter.filter((s) => !selectionBefore.includes(s));
         let unselectedIds = selectionBefore.filter((s) => !selectionAfter.includes(s));
-        this.service.gridModel.page.rows
-            ?.filter((row) => selectedIds.includes(row.id))
-            .forEach((row) => (row.selected = false)); // onSelect will toggle!
-        this.service.gridModel.page.rows
-            ?.filter((row) => unselectedIds.includes(row.id))
-            .forEach((row) => (row.selected = true)); // onSelect will toggle!
+        if (this.dev) {
+            // when service call is active (!dev), onSelect will toggle row.selected
+            this.service.gridModel.page.rows
+                ?.filter((row) => selectedIds.includes(row.id))
+                .forEach((row) => (row.selected = true));
+            this.service.gridModel.page.rows
+                ?.filter((row) => unselectedIds.includes(row.id))
+                .forEach((row) => (row.selected = false));
+        }
         let union = selectedIds.concat(unselectedIds);
         this.onSelectList(union);
     }
@@ -11497,9 +11522,7 @@ class SmartGridComponent {
         }
     }
     async onSelect(rowId) {
-        this.isBlocked = true;
-        this.selectRowInternal(rowId);
-        this.refresh();
+        this.onSelectList([rowId]);
     }
     async selectRowInternal(rowId) {
         const row = this.service.gridModel.page.rows?.find((gridRow) => gridRow.id === rowId);
@@ -11508,8 +11531,13 @@ class SmartGridComponent {
     }
     async onSelectList(rowIds) {
         this.isBlocked = true;
-        rowIds.forEach((rowId) => this.selectRowInternal(rowId));
-        this.refresh();
+        if (this.dev) {
+            this.render();
+        }
+        else {
+            rowIds.forEach((rowId) => this.selectRowInternal(rowId));
+            this.refresh();
+        }
     }
     async onSelectAll(selected) {
         this.isBlocked = true;