Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix: filtered & hidden rows should not be calculated in statusbar (#3026)

YuHong803ced46790f
diff --git a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
index ca04554ff7..a9f0ed9777 100644
--- a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
+++ b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
@@ -89,7 +89,7 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
// Use the setCenter method to position the viewport to the center of the node.
setCenter(x + width / 2, y + height / 2, {
duration: 300,
- zoom: getZoom(),
+ zoom: 1,
});
}
};
@@ -110,12 +110,12 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
useEffect(() => {
const newNodeSubscribe = unitGridService.newNode$.subscribe((node) => handleFitView(node));
- const timer = setTimeout(() => {
- fitView();
- }, 1000);
+ // const timer = setTimeout(() => {
+ // fitView();
+ // }, 1000);
return () => {
- clearTimeout(timer);
+ // clearTimeout(timer);
newNodeSubscribe.unsubscribe();
};
}, [fitView]);
diff --git a/packages/sheets-ui/src/controllers/status-bar.controller.ts b/packages/sheets-ui/src/controllers/status-bar.controller.ts
index 7cf55ed5fe..6df900b362 100644
--- a/packages/sheets-ui/src/controllers/status-bar.controller.ts
+++ b/packages/sheets-ui/src/controllers/status-bar.controller.ts
@@ -125,7 +125,8 @@ export class StatusBarController extends Disposable {
return this._clearResult();
}
const unitId = workbook.getUnitId();
- const sheetId = workbook.getActiveSheet()?.getSheetId();
+ const sheet = workbook.getActiveSheet();
+ const sheetId = sheet?.getSheetId();
if (!sheetId) {
return this._clearResult();
}
@@ -148,7 +149,27 @@ export class StatusBarController extends Disposable {
});
if (selections?.length) {
- const refs = selections.map((s) => new RangeReferenceObject(s, sheetId, unitId));
+ const realSelections: IRange[] = [];
+ selections.forEach((selection) => {
+ const { startRow: start, endRow: end } = selection;
+ let prev = null;
+ for (let r = start; r <= end; r++) {
+ if (sheet.getRowVisible(r)) {
+ if (prev === null) {
+ prev = r;
+ }
+ } else {
+ if (prev !== null) {
+ realSelections.push({ ...selection, startRow: prev, endRow: r - 1 });
+ prev = null;
+ }
+ }
+ }
+ if (prev !== null) {
+ realSelections.push({ ...selection, startRow: prev, endRow: end });
+ }
+ });
+ const refs = realSelections.map((s) => new RangeReferenceObject(s, sheetId, unitId));
refs.forEach((ref) => {
ref.setUnitData({
[unitId]: sheetData,