[se] Fix bug 34976

ONLYOFFICE · Feb 12, 2025 · 4232db4 · 4232db4
1 parent 88814cd
commit 4232db4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cell/model/autofilters.js b/cell/model/autofilters.js
@@ -4471,7 +4471,7 @@
 				return range;
 			},
 
-			expandRange: function (activeRange, ignoreFilter, doNotCheckEmpty) {
+			expandRange: function (activeRange, ignoreFilter, doNotCheckEmpty, checkLastEmpty) {
 				var ws = this.worksheet;
 
 				//если вдруг встретили мерженную ячейку в диапазоне, расширяем
@@ -4710,6 +4710,14 @@
 					doExpand();
 				}
 
+
+				if (checkLastEmpty) {
+					let _cropRange = this.checkEmptyAreas(range, rangeAfterTableCrop);
+					if (_cropRange.r2 !== range.r2 || _cropRange.c2 !== range.c2) {
+						return activeRange;
+					}
+				}
+
 				//проверяем на наличие пустых колонок/строк
 				return doNotCheckEmpty ? range : this.checkEmptyAreas(range, rangeAfterTableCrop);
 			},

diff --git a/cell/view/WorksheetView.js b/cell/view/WorksheetView.js
@@ -9920,7 +9920,7 @@
 				}
 
 				if (!newRange) {
-					newRange = this.model.autoFilters.expandRange(ar, true);
+					newRange = this.model.autoFilters.expandRange(ar, true, true, true);
 				}
 
 				if (newRange) {