imm-element-ui 2.9.8 → 2.9.9

package/fesm2022/imm-element-ui.mjs

@@ -5012,7 +5012,9 @@ const _gridUtils = {
     calcRowIds: (api, isServerSide) => {
         const result = [];
         api.forEachNode((node) => {
-            node.isSelected() && result.push(node.data);
+            if (node.data != null && node.isSelected() === true) {
+                result.push(node.data);
+            }
         });
         return result;
     },
@@ -5133,9 +5135,19 @@ const _gridUtils = {
                 maxWidth: 80,
             });
         }
-        if (gridOptions.columnDefs?.some((col) => col?.rowGroup === true)) {
+        const hasRowGroup = (columns) => columns.some((column) => column?.rowGroup === true || (Array.isArray(column?.children) && hasRowGroup(column.children)));
+        if (hasRowGroup(gridOptions.columnDefs || [])) {
+            const rowSelection = gridOptions.rowSelection;
             return {
                 ...gridOptions,
+                ...(typeof rowSelection === 'object' && rowSelection?.mode === 'multiRow'
+                    ? {
+                        rowSelection: {
+                            ...rowSelection,
+                            groupSelects: rowSelection.groupSelects ?? 'filteredDescendants',
+                        },
+                    }
+                    : {}),
                 autoGroupColumnDef: {
                     width: 300,
                     minWidth: 300,
@@ -7841,6 +7853,15 @@ class GridComponent {
     getGrid() {
         return this.grid;
     }
+    getLeafRowData() {
+        const rowData = [];
+        this.grid?.api.forEachLeafNode((node) => {
+            if (node.data != null) {
+                rowData.push(node.data);
+            }
+        });
+        return rowData;
+    }
     isMobileOrTabletBrowser() {
         if (typeof navigator === 'undefined') {
             return false;
@@ -8451,16 +8472,16 @@ class GridComponent {
         this.ajustGridHeight();
     }
     delRows() {
-        const selectedNodes = this.grid.api.getSelectedNodes();
-        const selectedData = selectedNodes.map((node) => node.data) || [];
-        let ids = selectedData.map((data) => data.id).filter((v) => v) || [];
+        const selectedData = gridUtils.calcRowIds(this.grid.api, this.toOptions().rowModelType === 'serverSide');
+        const ids = [...new Set(selectedData.map((data) => data.id).filter((id) => id))];
+        const unsavedRows = selectedData.filter((data) => !data.id);
+        if (unsavedRows.length > 0) {
+            this.handleDeletedRows(unsavedRows);
+            this.action.updateGridAction({ type: 'delete', data: unsavedRows });
+        }
         if (ids.length > 0) {
             this.deleteEmit.emit(ids);
         }
-        else if (selectedData.length > 0 && ids.length == 0) {
-            this.handleDeletedRows(selectedData);
-            this.action.updateGridAction({ type: 'delete', data: selectedData });
-        }
         this.ajustGridHeight();
     }
     setScrollHeight(height) {
@@ -12355,11 +12376,7 @@ class PageFormComponent extends AmComponent {
         if (e.length > 0) {
             let uniqueKeys = [];
             if (grid.uniqueField) {
-                const rowData = this.customGrid
-                    .get(this.indexValue)
-                    .getGrid()
-                    .api.getRenderedNodes()
-                    .map((node) => node.data);
+                const rowData = this.customGrid.get(this.indexValue).getLeafRowData();
                 // console.log('rowData-----',rowData)
                 uniqueKeys = rowData.map((item) => item[grid.uniqueField]);
             }
@@ -12389,30 +12406,15 @@ class PageFormComponent extends AmComponent {
         });
         if (grid.uniqueField) {
             const keys = datas.map((item) => item[grid.uniqueField]);
-            const rowData = this.customGrid
-                .get(this.indexValue)
-                .getGrid()
-                .api.getRenderedNodes()
-                .map((node) => node.data);
+            const rowData = this.customGrid.get(this.indexValue).getLeafRowData();
             let deletedRows = rowData.filter((item) => keys.includes(item[grid.uniqueField]));
             this.subDeleteIds = deletedRows.map((v) => v.id).filter((v) => v);
             const idNotRows = deletedRows.filter((v) => !v.id);
             // console.log('idNotRows----',idNotRows)
-            const deleteNodes = [];
-            this.customGrid
-                .get(this.indexValue)
-                .getGrid()
-                .api.forEachNode((node) => {
-                let main = node.data[grid.uniqueField];
-                let isExit = idNotRows.findIndex((v) => v[grid.uniqueField] == main);
-                if (isExit > -1) {
-                    deleteNodes.push(node.data);
-                }
-            });
             // if(deletedIds.length > 0){
             // 	this.delRows(deletedIds)
             // } else {
-            this.customGrid.get(this.indexValue).selectRowsDeleted(deleteNodes);
+            this.customGrid.get(this.indexValue).selectRowsDeleted(idNotRows);
             // }
         }
     }
@@ -12489,11 +12491,7 @@ class PageFormComponent extends AmComponent {
         }
         // console.log('!this.selectOptions.rowSelection-----',!this.selectOptions.rowSelection)
         if (grid.uniqueField) {
-            const rowData = this.customGrid
-                .get(this.indexValue)
-                .getGrid()
-                .api.getRenderedNodes()
-                .map((node) => node.data);
+            const rowData = this.customGrid.get(this.indexValue).getLeafRowData();
             this.selectionKeys = rowData?.map((item) => item[grid.uniqueField]) || [];
             // console.log('this.selectionKeys----',this.selectionKeys)
             if (typeof this.selectOptions.rowSelection == 'object') {