Merge branch 'dev' into feat/async-promise-function

dream-num · Jan 2, 2025 · 819d078 · 819d078
2 parents 9bd85f0 + 407f68b
commit 819d078
Show file tree

Hide file tree

Showing 19 changed files with 338 additions and 80 deletions.
diff --git a/packages/core/src/facade/f-enum.ts b/packages/core/src/facade/f-enum.ts
@@ -35,12 +35,31 @@ export class FEnum extends FBase {
         return instance;
     }
 
-    readonly UniverInstanceType = UniverInstanceType;
-    readonly LifecycleStages = LifecycleStages;
-
-    readonly DataValidationType = DataValidationType;
-    readonly DataValidationErrorStyle = DataValidationErrorStyle;
-    readonly DataValidationRenderMode = DataValidationRenderMode;
-    readonly DataValidationOperator = DataValidationOperator;
-    readonly DataValidationStatus = DataValidationStatus;
+    get UniverInstanceType() {
+        return UniverInstanceType;
+    }
+
+    get LifecycleStages() {
+        return LifecycleStages;
+    }
+
+    get DataValidationType() {
+        return DataValidationType;
+    }
+
+    get DataValidationErrorStyle() {
+        return DataValidationErrorStyle;
+    }
+
+    get DataValidationRenderMode() {
+        return DataValidationRenderMode;
+    }
+
+    get DataValidationOperator() {
+        return DataValidationOperator;
+    }
+
+    get DataValidationStatus() {
+        return DataValidationStatus;
+    }
 }
diff --git a/packages/core/src/facade/f-event.ts b/packages/core/src/facade/f-event.ts
@@ -54,8 +54,13 @@ export class FEventName extends FBase {
         return instance;
     }
 
-    UnitCreated = 'UnitCreated' as const;
-    LifeCycleChanged = 'LifeCycleChanged' as const;
+    get UnitCreated() {
+        return 'UnitCreated' as const;
+    }
+
+    get LifeCycleChanged() {
+        return 'LifeCycleChanged' as const;
+    }
 }
 
 export interface IEventParamConfig {

diff --git a/packages/core/src/facade/f-univer.ts b/packages/core/src/facade/f-univer.ts
@@ -24,7 +24,7 @@ import { ICommandService } from '../services/command/command.service';
 import { IUniverInstanceService } from '../services/instance/instance.service';
 import { LifecycleService } from '../services/lifecycle/lifecycle.service';
 import { RedoCommand, UndoCommand } from '../services/undoredo/undoredo.service';
-import { toDisposable } from '../shared';
+import { ColorBuilder, toDisposable } from '../shared';
 import { Univer } from '../univer';
 import { FBaseInitialable } from './f-base';
 import { FBlob } from './f-blob';
@@ -190,6 +190,10 @@ export class FUniver extends FBaseInitialable {
         return this._injector.createInstance(FBlob);
     }
 
+    newColor(): ColorBuilder {
+        return new ColorBuilder();
+    }
+
     get Enum() {
         return FEnum.get();
     }

diff --git a/packages/core/src/sheets/typedef.ts b/packages/core/src/sheets/typedef.ts
@@ -354,9 +354,22 @@ export function isCellV(cell: Nullable<ICellData | CellValue>) {
 }
 
 export interface IFreeze {
+    /**
+     * count of fixed cols
+     */
     xSplit: number;
+    /**
+     * count of fixed rows
+     */
     ySplit: number;
+    /**
+     * scrollable start row
+     */
     startRow: number;
+
+    /**
+     * scrollable start column
+     */
     startColumn: number;
 }
 

diff --git a/packages/core/src/sheets/worksheet.ts b/packages/core/src/sheets/worksheet.ts
@@ -581,10 +581,13 @@ export class Worksheet {
             } else if (dataMode === CellModeEnum.Intercepted) {
                 cellData = this.getCell(row, col);
             } else if (dataMode === CellModeEnum.Both) {
-                cellData = this.getCellRaw(row, col);
-                const displayV = this.getCell(row, col)?.v;
-                if (isNotNullOrUndefined(displayV) && cellData) {
-                    cellData.displayV = String(displayV);
+                const cellDataRaw = this.getCellRaw(row, col);
+                if (cellDataRaw) {
+                    cellData = { ...cellDataRaw };
+                    const displayV = this.getCell(row, col)?.v;
+                    if (isNotNullOrUndefined(displayV) && cellData) {
+                        cellData.displayV = String(displayV);
+                    }
                 }
             }
 

diff --git a/packages/engine-render/src/components/sheets/sheet-skeleton.ts b/packages/engine-render/src/components/sheets/sheet-skeleton.ts
@@ -2299,4 +2299,24 @@ export class SpreadsheetSkeleton extends Skeleton {
         const i = Math.max(0, col - 1);
         return arr[i];
     }
+
+    getHiddenRowsInRange(range: IRowRange) {
+        const hiddenRows = [];
+        for (let i = range.startRow; i <= range.endRow; i++) {
+            if (!this.worksheet.getRowVisible(i)) {
+                hiddenRows.push(i);
+            }
+        }
+        return hiddenRows;
+    }
+
+    getHiddenColumnsInRange(range: IColumnRange) {
+        const hiddenCols = [];
+        for (let i = range.startColumn; i <= range.endColumn; i++) {
+            if (!this.worksheet.getColVisible(i)) {
+                hiddenCols.push(i);
+            }
+        }
+        return hiddenCols;
+    }
 }
diff --git a/packages/sheets-conditional-formatting/src/facade/f-workbook.ts b/packages/sheets-conditional-formatting/src/facade/f-workbook.ts
@@ -18,6 +18,9 @@ import { ColorBuilder } from '@univerjs/core';
 import { FWorkbook } from '@univerjs/sheets/facade';
 
 export interface IFWorkbookConditionalFormattingMixin {
+    /**
+     * @deprecated use `univerAPI.newColor()` as instead.
+     */
     newColor(): ColorBuilder;
 }
 

diff --git a/packages/sheets-ui/src/commands/commands/set-scroll.command.ts b/packages/sheets-ui/src/commands/commands/set-scroll.command.ts
@@ -32,7 +32,18 @@ export interface ISetScrollRelativeCommandParams {
 export interface IScrollCommandParams {
     offsetX?: number;
     offsetY?: number;
+    /**
+     * The index of row in spreadsheet.
+     * e.g. if row start 10 at current viewport after freeze, and scroll value is zero, startRow is 0.
+     * e.g. if scrolled about 2 rows, now top is 12, then sheetViewStartRow is 2.
+     */
     sheetViewStartRow?: number;
+
+    /**
+     * Not the index of col in spreadsheet, but index of first column in current viewport.
+     * e.g. if col start C at current viewport after freeze, and scroll value is zero, startColumn is 0.
+     * e.g. if scrolled about 2 columns, now left is E, then sheetViewStartColumn is 2.
+     */
     sheetViewStartColumn?: number;
 }
 
@@ -65,9 +76,15 @@ export const SetScrollRelativeCommand: ICommand<ISetScrollRelativeCommandParams>
             offsetY: currentOffsetY = 0,
         } = currentScroll || {};
         // the receiver is scroll.operation.ts
+        // const { xSplit, ySplit } = target.worksheet.getConfig().freeze;
+
         return commandService.executeCommand(SetScrollOperation.id, {
             unitId,
             sheetId: subUnitId,
+
+            // why + ySplit? receiver - ySplit in scroll.operation.ts
+            // sheetViewStartRow: sheetViewStartRow + ySplit,
+            // sheetViewStartColumn: sheetViewStartColumn + xSplit,
             sheetViewStartRow,
             sheetViewStartColumn,
             offsetX: currentOffsetX + offsetX, // currentOffsetX + offsetX may be negative or over max
@@ -110,13 +127,17 @@ export const ScrollCommand: ICommand<IScrollCommandParams> = {
             offsetX: currentOffsetX,
             offsetY: currentOffsetY,
         } = currentScroll || {};
-
+        const { xSplit, ySplit } = target.worksheet.getConfig().freeze;
         const commandService = accessor.get(ICommandService);
+
         return commandService.syncExecuteCommand(SetScrollOperation.id, {
             unitId: workbook.getUnitId(),
             sheetId: worksheet.getSheetId(),
-            sheetViewStartRow: sheetViewStartRow ?? (currentRow ?? 0),
-            sheetViewStartColumn: sheetViewStartColumn ?? (currentColumn ?? 0),
+            // why + ySplit? receiver - ySplit in scroll.operation.ts
+            // sheetViewStartRow: sheetViewStartRow + ySplit,
+            // sheetViewStartColumn: sheetViewStartColumn + xSplit,
+            sheetViewStartRow: sheetViewStartRow ?? (currentRow ?? 0 + ySplit),
+            sheetViewStartColumn: sheetViewStartColumn ?? (currentColumn ?? 0 + xSplit),
             offsetX: offsetX ?? currentOffsetX,
             offsetY: offsetY ?? currentOffsetY,
         });

diff --git a/packages/sheets-ui/src/commands/operations/scroll.operation.ts b/packages/sheets-ui/src/commands/operations/scroll.operation.ts
@@ -34,6 +34,10 @@ export const SetScrollOperation: IOperation<IScrollStateWithSearchParam> = {
         const { unitId, sheetId, offsetX, offsetY, sheetViewStartColumn, sheetViewStartRow } = params;
         const renderManagerService = accessor.get(IRenderManagerService);
         const scrollManagerService = renderManagerService.getRenderById(unitId)!.with(SheetScrollManagerService);
+        // const currentService = accessor.get(IUniverInstanceService);
+        // const workbook = currentService.getUniverSheetInstance(unitId);
+        // const worksheet = workbook!.getSheetBySheetId(sheetId);
+        // const { xSplit, ySplit } = worksheet!.getConfig().freeze;
 
         scrollManagerService.setScrollInfoAndEmitEvent({
             unitId,