chore: better code

dream-num · Dec 25, 2024 · a800b69 · a800b69
1 parent 37d44fb
commit a800b69
Show file tree

Hide file tree

Showing 66 changed files with 212 additions and 193 deletions.
diff --git a/docs/tldr/skeleton.svg b/docs/tldr/skeleton.svg
diff --git a/packages/core/src/sheets/sheet-skeleton.ts b/packages/core/src/sheets/sheet-skeleton.ts
@@ -67,14 +67,6 @@ export class SheetSkeleton extends Skeleton {
     protected _cellData: ObjectMatrix<Nullable<ICellData>>;
     protected _imageCacheMap: ImageCacheMap;
 
-    /** Scale of Scene */
-    scaleX: number;
-    scaleY: number;
-    /** Viewport scrolled value */
-    scrollX: number;
-    /** Viewport scrolled value */
-    scrollY: number;
-
     constructor(
         readonly worksheet: Worksheet,
         protected _styles: Styles,
@@ -99,7 +91,6 @@ export class SheetSkeleton extends Skeleton {
 
     /**
      * @deprecated should never expose a property that is provided by another module!
-     * @returns
      */
     getWorksheetConfig(): IWorksheetData {
         return this._worksheetData;
@@ -121,6 +112,13 @@ export class SheetSkeleton extends Skeleton {
     private _columnWidthAccumulation: number[] = [];
     private _marginTop: number = 0;
     private _marginLeft: number = 0;
+    /** Scale of Scene */
+    protected _scaleX: number;
+    protected _scaleY: number;
+    /** Viewport scrolled value */
+    protected _scrollX: number;
+    /** Viewport scrolled value */
+    protected _scrollY: number;
 
     get rowHeightAccumulation(): number[] {
         return this._rowHeightAccumulation;
@@ -156,20 +154,36 @@ export class SheetSkeleton extends Skeleton {
 
     setScale(value: number, valueY?: number): void {
         this._updateLayout();
-        this.scaleX = value;
-        this.scaleY = valueY || value;
+        this._scaleX = value;
+        this._scaleY = valueY || value;
         this._updateLayout();
     }
 
     setScroll(scrollX?: number, scrollY?: number) {
         if (Tools.isDefine(scrollX)) {
-            this.scrollX = scrollX;
+            this._scrollX = scrollX;
         }
         if (Tools.isDefine(scrollY)) {
-            this.scrollY = scrollY;
+            this._scrollY = scrollY;
         }
     }
 
+    get scrollX(): number {
+        return this._scrollX;
+    }
+
+    get scrollY(): number {
+        return this._scrollY;
+    }
+
+    get scaleX(): number {
+        return this._scaleX;
+    }
+
+    get scaleY(): number {
+        return this._scaleY;
+    }
+
     get rowHeaderWidthAndMarginLeft(): number {
         return this.rowHeaderWidth + this._marginLeft;
     }
@@ -377,8 +391,6 @@ export class SheetSkeleton extends Skeleton {
             columnCount,
             rowHeader,
             columnHeader,
-            showGridlines,
-            gridlinesColor,
         } = this._worksheetData;
 
         const { rowTotalHeight, rowHeightAccumulation } =
@@ -534,8 +546,23 @@ export class SheetSkeleton extends Skeleton {
      * @param column
      * @returns {ISelectionCell} The cell info with merge data
      */
-    protected _getCellMergeInfo(row: number, column: number): ISelectionCell {
-        return this.worksheet.getCellInfoInMergeData(row, column);
+    // protected _getCellMergeInfo(row: number, column: number): ISelectionCell {
+    //     return this.worksheet.getCellInfoInMergeData(row, column);
+    // }
+
+    /**
+     * @deprecated use getNoMergeCellWithCoordByIndex instead.
+     * @param rowIndex
+     * @param columnIndex
+     * @param header
+     * @returns
+     */
+    getNoMergeCellPositionByIndex(
+        rowIndex: number,
+        columnIndex: number,
+        header: boolean = true
+    ) {
+        return this.getNoMergeCellWithCoordByIndex(rowIndex, columnIndex, header);
     }
 
     /**
@@ -895,7 +922,6 @@ export class SheetSkeleton extends Skeleton {
      * Original name: getDecomposedOffset
      * @param offsetX
      * @param offsetY
-     * @returns
      */
     getOffsetRelativeToRowCol(
         offsetX: number,

diff --git a/packages/core/src/sheets/workbook.ts b/packages/core/src/sheets/workbook.ts
@@ -254,7 +254,6 @@ export class Workbook extends UnitModel<IWorkbookData, UniverInstanceType.UNIVER
      * @param worksheet
      */
     setActiveSheet(worksheet: Worksheet): void {
-        console.log('active sheet');
         this._activeSheet$.next(worksheet);
     }
 

diff --git a/packages/engine-render/src/components/index.ts b/packages/engine-render/src/components/index.ts
@@ -17,5 +17,5 @@
 export * from './component';
 export * from './extension';
 export * from './sheets';
-export { RENDER_RAW_FORMULA_KEY } from './sheets/sheet-skeleton';
+export { RENDER_RAW_FORMULA_KEY } from './sheets/sheet.render-skeleton';
 export * from './slides';
diff --git a/packages/engine-render/src/components/sheets/column-header.ts b/packages/engine-render/src/components/sheets/column-header.ts
@@ -20,7 +20,7 @@ import type { Nullable } from '@univerjs/core';
 import type { IViewportInfo, Vector2 } from '../../basics/vector2';
 import type { UniverRenderingContext } from '../../context';
 import type { ColumnHeaderLayout, IColumnsHeaderCfgParam } from './extensions/column-header-layout';
-import type { SpreadsheetSkeleton } from './sheet-skeleton';
+import type { SpreadsheetSkeleton } from './sheet.render-skeleton';
 import { SheetColumnHeaderExtensionRegistry } from '../extension';
 import { SpreadsheetHeader } from './sheet-component';
 

diff --git a/packages/engine-render/src/components/sheets/extensions/background.ts b/packages/engine-render/src/components/sheets/extensions/background.ts
@@ -17,7 +17,7 @@
 import type { ICellWithCoord, IRange, IScale, ObjectMatrix } from '@univerjs/core';
 import type { UniverRenderingContext } from '../../../context';
 import type { IDrawInfo } from '../../extension';
-import type { SpreadsheetSkeleton } from '../sheet-skeleton';
+import type { SpreadsheetSkeleton } from '../sheet.render-skeleton';
 import type { Spreadsheet } from '../spreadsheet';
 import { Range } from '@univerjs/core';
 import { fixLineWidthByScale, getColor, inViewRanges } from '../../../basics/tools';

diff --git a/packages/engine-render/src/components/sheets/extensions/border.ts b/packages/engine-render/src/components/sheets/extensions/border.ts
@@ -19,7 +19,7 @@ import type { UniverRenderingContext } from '../../../context';
 
 import type { IDrawInfo } from '../../extension';
 import type { BorderCache, BorderCacheItem } from '../interfaces';
-import type { SpreadsheetSkeleton } from '../sheet-skeleton';
+import type { SpreadsheetSkeleton } from '../sheet.render-skeleton';
 import { BorderStyleTypes, Range } from '@univerjs/core';
 import { BORDER_TYPE as BORDER_LTRB, COLOR_BLACK_RGB, FIX_ONE_PIXEL_BLUR_OFFSET } from '../../../basics/const';
 import { drawDiagonalLineByBorderType, drawLineByBorderType, getLineWidth, setLineType } from '../../../basics/draw';

diff --git a/packages/engine-render/src/components/sheets/extensions/column-header-layout.ts b/packages/engine-render/src/components/sheets/extensions/column-header-layout.ts
@@ -18,7 +18,7 @@ import type { IScale } from '@univerjs/core';
 import type { UniverRenderingContext } from '../../../context';
 
 import type { IAColumnCfg, IAColumnCfgObj, IColumnStyleCfg } from '../interfaces';
-import type { SpreadsheetSkeleton } from '../sheet-skeleton';
+import type { SpreadsheetSkeleton } from '../sheet.render-skeleton';
 import { numberToABC } from '@univerjs/core';
 import { DEFAULT_FONTFACE_PLANE, FIX_ONE_PIXEL_BLUR_OFFSET, MIDDLE_CELL_POS_MAGIC_NUMBER } from '../../../basics/const';
 import { getColor } from '../../../basics/tools';

diff --git a/packages/engine-render/src/components/sheets/extensions/custom.ts b/packages/engine-render/src/components/sheets/extensions/custom.ts
@@ -16,7 +16,7 @@
 
 import type { IRange, IScale } from '@univerjs/core';
 import type { UniverRenderingContext } from '../../../context';
-import type { SpreadsheetSkeleton } from '../sheet-skeleton';
+import type { SpreadsheetSkeleton } from '../sheet.render-skeleton';
 import { Range, sortRules } from '@univerjs/core';
 import { SpreadsheetExtensionRegistry } from '../../extension';
 import { SheetExtension } from './sheet-extension';

diff --git a/packages/engine-render/src/components/sheets/extensions/font.ts b/packages/engine-render/src/components/sheets/extensions/font.ts
@@ -29,7 +29,7 @@ import { VERTICAL_ROTATE_ANGLE } from '../../../basics/text-rotation';
 import { clampRange, inViewRanges } from '../../../basics/tools';
 import { SpreadsheetExtensionRegistry } from '../../extension';
 import { EXPAND_SIZE_FOR_RENDER_OVERFLOW, FONT_EXTENSION_Z_INDEX } from '../constants';
-import { getDocsSkeletonPageSize, type SpreadsheetSkeleton } from '../sheet-skeleton';
+import { getDocsSkeletonPageSize, type SpreadsheetSkeleton } from '../sheet.render-skeleton';
 import { SheetExtension } from './sheet-extension';
 
 const UNIQUE_KEY = 'DefaultFontExtension';

diff --git a/packages/engine-render/src/components/sheets/extensions/marker.ts b/packages/engine-render/src/components/sheets/extensions/marker.ts
@@ -16,7 +16,7 @@
 
 import type { IRange, IScale } from '@univerjs/core';
 import type { UniverRenderingContext } from '../../../context';
-import type { SpreadsheetSkeleton } from '../sheet-skeleton';
+import type { SpreadsheetSkeleton } from '../sheet.render-skeleton';
 import { Range } from '@univerjs/core';
 import { SpreadsheetExtensionRegistry } from '../../extension';
 import { SheetExtension } from './sheet-extension';

diff --git a/packages/engine-render/src/components/sheets/extensions/row-header-layout.ts b/packages/engine-render/src/components/sheets/extensions/row-header-layout.ts
@@ -18,7 +18,7 @@ import type { IScale } from '@univerjs/core';
 
 import type { UniverRenderingContext } from '../../../context';
 import type { IARowCfg, IARowCfgObj, IColumnStyleCfg, IRowStyleCfg } from '../interfaces';
-import type { SpreadsheetSkeleton } from '../sheet-skeleton';
+import type { SpreadsheetSkeleton } from '../sheet.render-skeleton';
 import { DEFAULT_FONTFACE_PLANE, FIX_ONE_PIXEL_BLUR_OFFSET, MIDDLE_CELL_POS_MAGIC_NUMBER } from '../../../basics/const';
 import { getColor } from '../../../basics/tools';
 import { SheetRowHeaderExtensionRegistry } from '../../extension';

diff --git a/packages/engine-render/src/components/sheets/extensions/sheet-extension.ts b/packages/engine-render/src/components/sheets/extensions/sheet-extension.ts
@@ -15,7 +15,7 @@
  */
 
 import type { IRange } from '@univerjs/core';
-import type { SpreadsheetSkeleton } from '../sheet-skeleton';
+import type { SpreadsheetSkeleton } from '../sheet.render-skeleton';
 
 import { Rectangle } from '@univerjs/core';
 import { ComponentExtension } from '../../extension';

diff --git a/packages/engine-render/src/components/sheets/index.ts b/packages/engine-render/src/components/sheets/index.ts
@@ -20,5 +20,5 @@ export * from './extensions';
 export * from './interfaces';
 export * from './row-header';
 export * from './sheet-component';
-export * from './sheet-skeleton';
+export * from './sheet.render-skeleton';
 export * from './spreadsheet';
diff --git a/packages/engine-render/src/components/sheets/row-header.ts b/packages/engine-render/src/components/sheets/row-header.ts
@@ -18,7 +18,7 @@ import type { Nullable } from '@univerjs/core';
 import type { IViewportInfo, Vector2 } from '../../basics/vector2';
 import type { UniverRenderingContext } from '../../context';
 import type { IRowsHeaderCfgParam, RowHeaderLayout } from './extensions/row-header-layout';
-import type { SpreadsheetSkeleton } from './sheet-skeleton';
+import type { SpreadsheetSkeleton } from './sheet.render-skeleton';
 import { SheetRowHeaderExtensionRegistry } from '../extension';
 import { SpreadsheetHeader } from './sheet-component';
 

diff --git a/packages/engine-render/src/components/sheets/sheet-component.ts b/packages/engine-render/src/components/sheets/sheet-component.ts
@@ -19,7 +19,7 @@ import type { IRange, Nullable } from '@univerjs/core';
 import type { IViewportInfo, Vector2 } from '../../basics/vector2';
 import type { UniverRenderingContext } from '../../context';
 import type { SHEET_EXTENSION_TYPE } from './extensions/sheet-extension';
-import type { SpreadsheetSkeleton } from './sheet-skeleton';
+import type { SpreadsheetSkeleton } from './sheet.render-skeleton';
 import { RENDER_CLASS_TYPE } from '../../basics/const';
 import { RenderComponent } from '../component';
 

diff --git a/...r/src/components/sheets/sheet-skeleton.ts → ...omponents/sheets/sheet.render-skeleton.ts b/...r/src/components/sheets/sheet-skeleton.ts → ...omponents/sheets/sheet.render-skeleton.ts
@@ -191,18 +191,8 @@ export class SpreadsheetSkeleton extends SheetSkeleton {
         this._scene = scene;
 
         this._scene.onTransformChange$.subscribeEvent((param: ITransformChangeState) => {
-            if (param.value.scaleX !== undefined) {
-                this.scaleX = param.value.scaleX;
-            }
-            if (param.value.scaleY !== undefined) {
-                this.scaleY = param.value.scaleY;
-            }
+            this.setScale(param.value.scaleX || 1, param.value.scaleY);
         });
-
-        // const viewMain = this._scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
-        // if (viewMain) {
-        //     viewMain;
-        // }
     }
 
     override _updateLayout() {

diff --git a/packages/engine-render/src/components/sheets/spreadsheet.ts b/packages/engine-render/src/components/sheets/spreadsheet.ts
@@ -26,7 +26,7 @@ import type { Background } from './extensions/background';
 import type { Border } from './extensions/border';
 import type { Font } from './extensions/font';
 import type { IPaintForRefresh, IPaintForScrolling, SHEET_VIEWPORT_KEY } from './interfaces';
-import type { SpreadsheetSkeleton } from './sheet-skeleton';
+import type { SpreadsheetSkeleton } from './sheet.render-skeleton';
 import { BooleanNumber, sortRules, Tools } from '@univerjs/core';
 import { FIX_ONE_PIXEL_BLUR_OFFSET, RENDER_CLASS_TYPE } from '../../basics/const';
 import { getColor } from '../../basics/tools';

diff --git a/packages/engine-render/src/components/sheets/util.ts b/packages/engine-render/src/components/sheets/util.ts
@@ -17,7 +17,7 @@
 import type { CellValueType, IDocumentData, IPaddingData, IStyleBase, IStyleData, ITextRotation, ITextStyle, Nullable, TextDirection } from '@univerjs/core';
 import { DEFAULT_EMPTY_DOCUMENT_VALUE, DocumentDataModel, HorizontalAlign, VerticalAlign, WrapStrategy } from '@univerjs/core';
 import { convertTextRotation } from '../../basics/text-rotation';
-import { DEFAULT_PADDING_DATA } from './sheet-skeleton';
+import { DEFAULT_PADDING_DATA } from './sheet.render-skeleton';
 
 export interface ICellStyle {
     textRotation?: ITextRotation;

diff --git a/packages/engine-render/src/index.ts b/packages/engine-render/src/index.ts
@@ -34,7 +34,7 @@ export { DocumentViewModel } from './components/docs/view-model/document-view-mo
 export { DocumentEditArea } from './components/docs/view-model/document-view-model';
 export { parseDataStreamToTree } from './components/docs/view-model/document-view-model';
 export { getLastColumn } from './components/docs/layout/tools';
-export { DEFAULT_PADDING_DATA } from './components/sheets/sheet-skeleton';
+export { DEFAULT_PADDING_DATA } from './components/sheets/sheet.render-skeleton';
 export * from './context';
 export * from './custom';
 export * from './engine';

diff --git a/packages/engine-render/src/scene.ts b/packages/engine-render/src/scene.ts
@@ -17,7 +17,7 @@
 import type { IKeyValue, Nullable } from '@univerjs/core';
 import type { BaseObject } from './base-object';
 import type { IDragEvent, IKeyboardEvent, IMouseEvent, IPointerEvent, IWheelEvent } from './basics/i-events';
-import type { IObjectFullState, ISceneTransformState, ITransformChangeState } from './basics/interfaces';
+import type { ISceneTransformState, ITransformChangeState } from './basics/interfaces';
 import type { ITransformerConfig } from './basics/transformer-config';
 import type { Vector2 } from './basics/vector2';
 import type { Canvas } from './canvas';

diff --git a/packages/engine-render/tsconfig.json b/packages/engine-render/tsconfig.json
@@ -5,5 +5,5 @@
         "outDir": "lib/types"
     },
     "references": [{ "path": "./tsconfig.node.json" }],
-    "include": ["src", "types", "../core/src/skeleton.ts"]
+    "include": ["src", "types"]
 }
diff --git a/packages/sheets-data-validation-ui/src/controllers/dv-render.controller.ts b/packages/sheets-data-validation-ui/src/controllers/dv-render.controller.ts
@@ -191,7 +191,7 @@ export class SheetsDataValidationRenderController extends RxDisposable {
                             interceptorAutoHeight: () => {
                                 const skeleton = this._renderManagerService.getRenderById(unitId)
                                     ?.with(SheetSkeletonManagerService)
-                                    .getWorksheetSkeleton(subUnitId)
+                                    .getSkeletonParam(subUnitId)
                                     ?.skeleton;
                                 if (!skeleton) {
                                     return undefined;
@@ -200,7 +200,7 @@ export class SheetsDataValidationRenderController extends RxDisposable {
 
                                 const info: ICellRenderContext = {
                                     data: cell,
-                                    style: skeleton.getsStyles().getStyleByCell(cell),
+                                    style: skeleton.getStyles().getStyleByCell(cell),
                                     primaryWithCoord: skeleton.getCellWithCoordByIndex(mergeCell?.startRow ?? row, mergeCell?.startColumn ?? col),
                                     unitId,
                                     subUnitId,
@@ -214,7 +214,7 @@ export class SheetsDataValidationRenderController extends RxDisposable {
                             interceptorAutoWidth: () => {
                                 const skeleton = this._renderManagerService.getRenderById(unitId)
                                     ?.with(SheetSkeletonManagerService)
-                                    .getWorksheetSkeleton(subUnitId)
+                                    .getSkeletonParam(subUnitId)
                                     ?.skeleton;
                                 if (!skeleton) {
                                     return undefined;
@@ -223,7 +223,7 @@ export class SheetsDataValidationRenderController extends RxDisposable {
 
                                 const info: ICellRenderContext = {
                                     data: cell,
-                                    style: skeleton.getsStyles().getStyleByCell(cell),
+                                    style: skeleton.getStyles().getStyleByCell(cell),
                                     primaryWithCoord: skeleton.getCellWithCoordByIndex(mergeCell?.startRow ?? row, mergeCell?.startColumn ?? col),
                                     unitId,
                                     subUnitId,
@@ -335,7 +335,7 @@ export class SheetsDataValidationMobileRenderController extends RxDisposable {
                             interceptorAutoHeight: () => {
                                 const skeleton = this._renderManagerService.getRenderById(unitId)
                                     ?.with(SheetSkeletonManagerService)
-                                    .getWorksheetSkeleton(subUnitId)
+                                    .getSkeletonParam(subUnitId)
                                     ?.skeleton;
                                 if (!skeleton) {
                                     return undefined;
@@ -344,7 +344,7 @@ export class SheetsDataValidationMobileRenderController extends RxDisposable {
 
                                 const info: ICellRenderContext = {
                                     data: cell,
-                                    style: skeleton.getsStyles().getStyleByCell(cell),
+                                    style: skeleton.getStyles().getStyleByCell(cell),
                                     primaryWithCoord: skeleton.getCellWithCoordByIndex(mergeCell?.startRow ?? row, mergeCell?.startColumn ?? col),
                                     unitId,
                                     subUnitId,

diff --git a/packages/sheets-data-validation-ui/src/controllers/dv-rerender.controller.ts b/packages/sheets-data-validation-ui/src/controllers/dv-rerender.controller.ts
@@ -41,7 +41,7 @@ export class SheetsDataValidationReRenderController extends Disposable implement
                 sheetIds.add(value.subUnitId);
             });
             sheetIds.forEach((sheetId) => {
-                this._sheetSkeletonManagerService.getWorksheetSkeleton(sheetId)?.skeleton.makeDirty(true);
+                this._sheetSkeletonManagerService.getSkeletonParam(sheetId)?.skeleton.makeDirty(true);
             });
             this._context.mainComponent?.makeForceDirty();
         };

diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.ts
@@ -65,7 +65,7 @@ export class SheetDrawingPrintingController extends Disposable {
                             return next(range);
                         }
 
-                        const skeleton = renderer.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId);
+                        const skeleton = renderer.with(SheetSkeletonManagerService).getSkeletonParam(subUnitId);
                         if (!skeleton) {
                             return next(range);
                         }

diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.ts
@@ -57,7 +57,7 @@ export function getDrawingSizeByCell(
         return false;
     }
     const skeletonManagerService = currentRender.with(SheetSkeletonManagerService);
-    const skeleton = skeletonManagerService.getWorksheetSkeleton(location.subUnitId)?.skeleton;
+    const skeleton = skeletonManagerService.getSkeletonParam(location.subUnitId)?.skeleton;
     if (skeleton == null) {
         return false;
     }