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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix: sheet text (#3189)
lumix5fd53500de3c
diff --git a/packages/drawing-ui/src/controllers/image-cropper.controller.ts b/packages/drawing-ui/src/controllers/image-cropper.controller.tsindex 4f9739cd0f..bbf79075cf 100644--- a/packages/drawing-ui/src/controllers/image-cropper.controller.ts+++ b/packages/drawing-ui/src/controllers/image-cropper.controller.ts@@ -269,7 +269,7 @@ export class ImageCropperController extends Disposable {}private _searchCropObject(scene: Scene) {- const objects = scene.getAllObjects();+ const objects = scene.getAllObjectsByOrder();for (const object of objects) {if (object instanceof ImageCropperObject) {diff --git a/packages/engine-render/src/components/sheets/column-header.ts b/packages/engine-render/src/components/sheets/column-header.tsindex 918adc9eec..6998f900e9 100644--- a/packages/engine-render/src/components/sheets/column-header.ts+++ b/packages/engine-render/src/components/sheets/column-header.ts@@ -14,6 +14,8 @@* limitations under the License.*/+/* eslint-disable unused-imports/no-unused-vars */+import type { Nullable } from '@univerjs/core';import type { IViewportInfo, Vector2 } from '../../basics/vector2';import type { UniverRenderingContext } from '../../context';@@ -23,7 +25,7 @@ import { SpreadsheetHeader } from './sheet-component';import type { SpreadsheetSkeleton } from './sheet-skeleton';export class SpreadsheetColumnHeader extends SpreadsheetHeader {- override getDocuments() {+ override getDocuments(): void {throw new Error('Method not implemented.');}@@ -39,40 +41,27 @@ export class SpreadsheetColumnHeader extends SpreadsheetHeader {constructor(oKey: string, spreadsheetSkeleton?: SpreadsheetSkeleton) {super(oKey, spreadsheetSkeleton);-this._initialDefaultExtension();-this.makeDirty(true);}- get columnHeaderLayoutExtension() {+ get columnHeaderLayoutExtension(): ColumnHeaderLayout {return this._columnHeaderLayoutExtension;}- override draw(ctx: UniverRenderingContext, bounds?: IViewportInfo) {+ override draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void {const spreadsheetSkeleton = this.getSkeleton();- if (!spreadsheetSkeleton) {- return;- }+ if (!spreadsheetSkeleton) return;const parentScale = this.getParentScale();-spreadsheetSkeleton.calculateSegment(bounds);-const segment = spreadsheetSkeleton.rowColumnSegment;- if (!segment) {- return;- }+ if (!segment) return;- if (segment.startColumn === -1 && segment.endColumn === -1) {- return;- }+ if (segment.startColumn === -1 && segment.endColumn === -1) return;const { rowHeaderWidth } = spreadsheetSkeleton;-- // const { left: fixTranslateLeft, top: fixTranslateTop } = getTranslateInSpreadContextWithPixelRatio();-ctx.translateWithPrecision(rowHeaderWidth, 0);const extensions = this.getExtensionsByOrder();@@ -94,7 +83,7 @@ export class SpreadsheetColumnHeader extends SpreadsheetHeader {return false;}- private _initialDefaultExtension() {+ private _initialDefaultExtension(): void {SheetColumnHeaderExtensionRegistry.getData().forEach((extension) => {this.register(extension);});@@ -103,7 +92,11 @@ export class SpreadsheetColumnHeader extends SpreadsheetHeader {) as ColumnHeaderLayout;}- setCustomHeader(cfg: IColumnsHeaderCfgParam) {+ /**+ * Custimize column header, such as custom header text and background.+ * @param cfg+ */+ setCustomHeader(cfg: IColumnsHeaderCfgParam): void {this.makeDirty(true);this._columnHeaderLayoutExtension.configHeaderColumn(cfg);}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.tsindex 6c61820c41..4151972f86 100644--- a/packages/engine-render/src/components/sheets/extensions/column-header-layout.ts+++ b/packages/engine-render/src/components/sheets/extensions/column-header-layout.ts@@ -39,6 +39,10 @@ const DEFAULT_COLUMN_STYLE = {textAlign: 'center',textBaseline: 'middle',} as const;++/**+ * Column Header Bar, include a lot of columns header+ */export class ColumnHeaderLayout extends SheetExtension {override uKey = UNIQUE_KEY;override Z_INDEX = 10;@@ -60,12 +64,12 @@ export class ColumnHeaderLayout extends SheetExtension {}}- configHeaderColumn(cfg: IColumnsHeaderCfgParam) {+ configHeaderColumn(cfg: IColumnsHeaderCfgParam): void {this.columnsCfg = cfg.columnsCfg || [];this.headerStyle = { ...this.headerStyle, ...cfg.headerStyle };}- getCfgOfCurrentColumn(colIndex: number) {+ getCfgOfCurrentColumn(colIndex: number): [IAColumnCfgObj, boolean] {let mergeWithSpecCfg;let curColSpecCfg;const columnsCfg = this.columnsCfg || [];@@ -83,7 +87,7 @@ export class ColumnHeaderLayout extends SheetExtension {return [mergeWithSpecCfg, specStyle] as [IAColumnCfgObj, boolean];}- setStyleToCtx(ctx: UniverRenderingContext, columnStyle: Partial<IColumnStyleCfg>) {+ setStyleToCtx(ctx: UniverRenderingContext, columnStyle: Partial<IColumnStyleCfg>): void {if (columnStyle.textAlign) ctx.textAlign = columnStyle.textAlign;if (columnStyle.textBaseline) ctx.textBaseline = columnStyle.textBaseline;if (columnStyle.fontColor) ctx.fillStyle = columnStyle.fontColor;@@ -92,7 +96,7 @@ export class ColumnHeaderLayout extends SheetExtension {}// eslint-disable-next-line max-lines-per-function- override draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton) {+ override draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton): void {const { rowColumnSegment, columnHeaderHeight = 0 } = spreadsheetSkeleton;const { startColumn, endColumn } = rowColumnSegment;@@ -123,6 +127,8 @@ export class ColumnHeaderLayout extends SheetExtension {ctx.setLineWidthByPrecision(1);ctx.translateWithPrecisionRatio(FIX_ONE_PIXEL_BLUR_OFFSET, FIX_ONE_PIXEL_BLUR_OFFSET);let preColumnPosition = 0;++ // draw each column headerfor (let c = startColumn - 1; c <= endColumn; c++) {if (c < 0 || c > columnWidthAccumulation.length - 1) {continue;diff --git a/packages/engine-render/src/group.ts b/packages/engine-render/src/group.tsindex de74dd95ff..6c1a4d2f57 100644--- a/packages/engine-render/src/group.ts+++ b/packages/engine-render/src/group.ts@@ -156,19 +156,13 @@ export class Group extends BaseObject {}object.parent = this;-object.isInGroup = true;-object.groupKey = this.oKey;-this._objects.push(object);} else {o.parent = this;-o.isInGroup = true;-o.groupKey = this.oKey;-this._objects.push(o);}}diff --git a/packages/engine-render/src/layer.ts b/packages/engine-render/src/layer.tsindex 9e2c18c16a..c8fcde8a1e 100644--- a/packages/engine-render/src/layer.ts+++ b/packages/engine-render/src/layer.ts@@ -61,21 +61,21 @@ export class Layer extends Disposable {this._initialCacheCanvas();}- disableCache() {+ disableCache(): void {this._allowCache = false;this._cacheCanvas?.dispose();this._cacheCanvas = null;}- isAllowCache() {+ isAllowCache(): boolean {return this._allowCache;}/**- * get objects which is visible and not in a group.- * @returns BaseObject[]+ * Get direct visible children in order. (direct means object is not in group), default order is ascending by z-index.+ * @returns {BaseObject[]} objects*/- getObjectsByOrder() {+ getObjectsByOrder(): BaseObject[] {const objects: BaseObject[] = [];this._objects.sort(sortRules);for (const o of this._objects) {@@ -86,7 +86,11 @@ export class Layer extends Disposable {return objects;}- getObjectsByOrderForPick() {+ /**+ * Get visible and evented objects.+ * @returns {BaseObject[]} objects+ */+ getObjectsByOrderForPick(): BaseObject[] {const objects: BaseObject[] = [];this._objects.sort(sortRules);for (const o of this._objects) {@@ -98,17 +102,16 @@ export class Layer extends Disposable {return objects;}- getObjects() {+ getObjects(): BaseObject[] {return this._objects;}/**- * insert o to _objects[]- * if o is a group, insert all its children and group itself to _objects[]+ * Insert object to this._objects, if object is a group, insert all its children and group itself to _objects[]* @param o- * @returns this+ * @returns {Layer} this*/- addObject(o: BaseObject) {+ addObject(o: BaseObject): Layer {if (o.classType === RENDER_CLASS_TYPE.GROUP) {const objects = (o as BaseObject).getObjects();for (const object of objects) {@@ -151,7 +154,12 @@ export class Layer extends Disposable {}}- addObjects(objects: BaseObject[]) {+ /**+ * Insert objects to this._objects, if object is a group, insert all its children and group itself to _objects[]+ * @param objects+ * @returns {Layer} this+ */+ addObjects(objects: BaseObject[]): Layer {objects.forEach((o: BaseObject) => {this.addObject(o);});diff --git a/packages/engine-render/src/scene.ts b/packages/engine-render/src/scene.tsindex ed264b87f9..d09276baaf 100644--- a/packages/engine-render/src/scene.ts+++ b/packages/engine-render/src/scene.ts@@ -343,11 +343,11 @@ export class Scene extends ThinScene {return null;}- getLayers() {+ getLayers(): Layer[] {return this._layers;}- getLayer(zIndex: number = 1) {+ getLayer(zIndex: number = 1): Layer {for (const layer of this._layers) {if (layer.zIndex === zIndex) {return layer;@@ -367,11 +367,18 @@ export class Scene extends ThinScene {return maxIndex;}- addLayer(...argument: Layer[]) {+ addLayer(...argument: Layer[]): void {this._layers.push(...argument);}- override addObjects(objects: BaseObject[], zIndex: number = 1) {+ /**+ * Add objects to Layer( Layer is specfied by zIndex)+ * If object is a group, insert all its children and group itself to _objects[].+ * @param objects+ * @param zIndex+ * @returns {Scene} this+ */+ override addObjects(objects: BaseObject[], zIndex: number = 1): Scene {this.getLayer(zIndex)?.addObjects(objects);this._addObject$.next(this);return this;@@ -379,21 +386,23 @@ export class Scene extends ThinScene {/*** Add object to Layer (Layer is specified by zIndex).+ * If object is a group, insert all its children and group itself to _objects[].* @param o* @param zIndex layer index- * @returns scene+ * @returns {Scene} scene*/- override addObject(o: BaseObject, zIndex: number = 1) {+ override addObject(o: BaseObject, zIndex: number = 1): Scene {this.getLayer(zIndex)?.addObject(o);this._addObject$.next(this);return this;}/**- * make object parent to scene+ * Set Scene as object parent, if object has no parent.* @param o+ * @returns {void}*/- override setObjectBehavior(o: BaseObject) {+ override setObjectBehavior(o: BaseObject): void {if (!o.parent) {o.parent = this;}@@ -403,7 +412,8 @@ export class Scene extends ThinScene {o.onIsAddedToParent$.emitEvent(this);}- removeObject(object?: BaseObject | string) {+ // Why? return values is so strange! removeObject should return true/false, or didn't return anything.+ removeObject(object?: BaseObject | string): Nullable<Scene> {if (object == null) {return;}@@ -414,7 +424,7 @@ export class Scene extends ThinScene {return this;}- removeObjects(objects?: BaseObject[] | string[]) {+ removeObjects(objects?: BaseObject[] | string[]): Nullable<Scene> {if (objects == null) {return;}@@ -439,7 +449,7 @@ export class Scene extends ThinScene {// return this;// }- getObjectsByLayer(zIndex: number) {+ getObjectsByLayer(zIndex: number): BaseObject[] {const objects: BaseObject[] = [];this._layers.sort(sortRules);for (const layer of this._layers) {@@ -451,10 +461,23 @@ export class Scene extends ThinScene {}/**- * get objects which is visible and not in a group in each layer.+ * Get all objects of each Layer.+ * @returns {BaseObject[]} objects+ */+ getAllObjects(): BaseObject[] {+ const objects: BaseObject[] = [];+ this._layers.sort(sortRules);+ for (const layer of this._layers) {+ objects.push(...layer.getObjects());+ }+ return objects;+ }++ /**+ * Get objects which is visible and not in a group in each layer.* @returns BaseObject[]*/- getAllObjects() {+ getAllObjectsByOrder(): BaseObject[] {const objects: BaseObject[] = [];this._layers.sort(sortRules);for (const layer of this._layers) {@@ -468,7 +491,7 @@ export class Scene extends ThinScene {* @param isDesc* @returns BaseObject[]*/- getAllObjectsByOrder(isDesc: boolean = false) {+ getAllObjectsByDescOrder(isDesc: boolean = false): BaseObject[] {const objects: BaseObject[] = [];const useSortRules = isDesc ? sortRulesByDesc : sortRules;this._layers.sort(useSortRules);@@ -478,7 +501,12 @@ export class Scene extends ThinScene {return objects;}- getAllObjectsByOrderForPick(isDesc: boolean = false) {+ /**+ * Get visible and evented objects.+ * @param isDesc+ * @returns {BaseObject[]} objects+ */+ getAllObjectsByOrderForPick(isDesc: boolean = false): BaseObject[] {const objects: BaseObject[] = [];const useSortRules = isDesc ? sortRulesByDesc : sortRules;this._layers.sort(useSortRules);@@ -488,7 +516,7 @@ export class Scene extends ThinScene {return objects;}- override getObject(oKey: string) {+ override getObject(oKey: string): Nullable<BaseObject> {for (const layer of this._layers) {const objects = layer.getObjectsByOrder();for (const object of objects) {@@ -499,7 +527,7 @@ export class Scene extends ThinScene {}}- getObjectIncludeInGroup(oKey: string) {+ getObjectIncludeInGroup(oKey: string): Nullable<BaseObject> {for (const layer of this._layers) {const objects = layer.getObjects();for (const object of objects) {diff --git a/packages/engine-render/src/shape/shape.ts b/packages/engine-render/src/shape/shape.tsindex 8cfbe7233b..d671f6a382 100644--- a/packages/engine-render/src/shape/shape.ts+++ b/packages/engine-render/src/shape/shape.ts@@ -341,14 +341,18 @@ export abstract class Shape<T extends IShapeProps> extends BaseObject {return this;}- setProps(props?: T) {+ /**+ * this[_key] = props[key]+ * @param props+ */+ setProps(props?: T): Shape<T> {if (!props) {- return;+ return this;}const themeKeys = Object.keys(props);if (themeKeys.length === 0) {- return;+ return this;}themeKeys.forEach((key) => {if ((props as IKeyValue)[key] === undefined) {diff --git a/packages/engine-render/src/viewport.ts b/packages/engine-render/src/viewport.tsindex 8ba78e2ef2..d9b0c8b8ff 100644--- a/packages/engine-render/src/viewport.ts+++ b/packages/engine-render/src/viewport.ts@@ -757,7 +757,7 @@ export class Viewport {* @param objects* @param isMaxLayer*/- render(parentCtx?: UniverRenderingContext, objects: BaseObject[] = [], isMaxLayer = false) {+ render(parentCtx?: UniverRenderingContext, objects: BaseObject[] = [], isMaxLayer = false): void {if (!this.shouldIntoRender()) {return;}diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsxindex 928b060061..c9bacfd2df 100644--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx@@ -387,6 +387,7 @@ export const RuleList = (props: IRuleListProps) => {onClick={(e) => {e.stopPropagation();handleDelete(rule);+ currentRuleRangesSet([]);}}><DeleteSingle />diff --git a/packages/sheets-drawing-ui/src/controllers/drawing-popup-menu.controller.ts b/packages/sheets-drawing-ui/src/controllers/drawing-popup-menu.controller.tsindex d7c9edac81..c89af70813 100644--- a/packages/sheets-drawing-ui/src/controllers/drawing-popup-menu.controller.ts+++ b/packages/sheets-drawing-ui/src/controllers/drawing-popup-menu.controller.ts@@ -72,7 +72,7 @@ export class DrawingPopupMenuController extends RxDisposable {}private _hasCropObject(scene: Scene) {- const objects = scene.getAllObjects();+ const objects = scene.getAllObjectsByOrder();for (const object of objects) {if (object instanceof ImageCropperObject) {diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-permission.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-permission.controller.tsindex 66b08b6fe3..c6b94a5de6 100644--- a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-permission.controller.ts+++ b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-permission.controller.ts@@ -66,7 +66,7 @@ export class SheetDrawingPermissionController extends Disposable {if (scene == null) {return;}- const objects = scene.getAllObjects();+ const objects = scene.getAllObjectsByOrder();objects.forEach((object) => {if (object.classType === RENDER_CLASS_TYPE.IMAGE && drawingDataValues.some((item) => object.oKey.includes(item.drawingId))) {scene.removeObject(object);@@ -107,7 +107,7 @@ export class SheetDrawingPermissionController extends Disposable {if (scene == null) {return;}- const objects = scene.getAllObjects();+ const objects = scene.getAllObjectsByOrder();objects.forEach((object) => {if (object.classType === RENDER_CLASS_TYPE.IMAGE && drawingDataValues.some((item) => object.oKey.includes(item.drawingId))) {scene.detachTransformerFrom(object);@@ -147,7 +147,7 @@ export class SheetDrawingPermissionController extends Disposable {next: (permission) => {initialViewPermission = permission;this._drawingManagerService.setDrawingVisible(permission);- const objects = scene.getAllObjects();+ const objects = scene.getAllObjectsByOrder();const drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId);const drawingDataValues = Object.values(drawingData);if (permission) {@@ -207,7 +207,7 @@ export class SheetDrawingPermissionController extends Disposable {next: (permission) => {initialEditPermission = permission;this._drawingManagerService.setDrawingEditable(permission);- const objects = scene.getAllObjects();+ const objects = scene.getAllObjectsByOrder();const drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId);const drawingDataValues = Object.values(drawingData);if (permission) {@@ -244,7 +244,7 @@ export class SheetDrawingPermissionController extends Disposable {return;}this._drawingManagerService.setDrawingEditable(true);- const objects = scene.getAllObjects();+ const objects = scene.getAllObjectsByOrder();objects.forEach((object) => {if (object.classType === RENDER_CLASS_TYPE.IMAGE && drawingDataValues.some((item) => object.oKey.includes(item.drawingId))) {scene.detachTransformerFrom(object);diff --git a/packages/sheets-filter-ui/src/views/render-modules/sheets-filter.render-controller.ts b/packages/sheets-filter-ui/src/views/render-modules/sheets-filter.render-controller.tsindex afd4e405a0..8c5b008da1 100644--- a/packages/sheets-filter-ui/src/views/render-modules/sheets-filter.render-controller.ts+++ b/packages/sheets-filter-ui/src/views/render-modules/sheets-filter.render-controller.ts@@ -108,7 +108,7 @@ export class SheetsFilterRenderController extends RxDisposable implements IRende});const { rowHeaderWidth, columnHeaderHeight } = skeleton;- const filterRangeShape = this._filterRangeShape = new SelectionShape(scene, DEFAULT_Z_INDEX, true, this._themeService);+ const filterRangeShape = this._filterRangeShape = new SelectionShape(scene, DEFAULT_Z_INDEX, this._themeService, true);filterRangeShape.update(rangeWithCoord, rowHeaderWidth, columnHeaderHeight, {hasAutoFill: false,fill: 'rgba(0, 0, 0, 0.0)',diff --git a/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts b/packages/sheets-formula/src/controllers/formula-editor-show.controller.tsindex 0e0162dc61..711365ee2d 100644--- a/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts+++ b/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts@@ -15,7 +15,8 @@*/import type { ICellDataForSheetInterceptor, ICommandInfo, IObjectMatrixPrimitiveType, IRange, IRowAutoHeightInfo, Nullable, Workbook, Worksheet } from '@univerjs/core';-import { ColorKit, Disposable,+import {+ ColorKit, Disposable,ICommandService,ILogService,Inject,@@ -37,6 +38,7 @@ import { SetColHiddenMutation, SetColVisibleMutation, SetRowHiddenMutation, SetRimport {IEditorBridgeService,ISheetSelectionRenderService,+ SELECTION_SHAPE_DEPTH,SelectionShape,SheetSkeletonManagerService,} from '@univerjs/sheets-ui';@@ -257,7 +259,7 @@ export class FormulaEditorShowController extends Disposable implements IRenderMoconst skeleton = this._sheetSkeletonManagerService.getCurrentSkeleton();if (!scene || !skeleton) return;const { rowHeaderWidth, columnHeaderHeight } = skeleton;- const control = new SelectionShape(scene, 100, false, this._themeService);+ const control = new SelectionShape(scene, SELECTION_SHAPE_DEPTH.FORMULA_EDITOR_SHOW, this._themeService, false);control.update(rangeWithCoord, rowHeaderWidth, columnHeaderHeight, style, primaryWithCoord);control.setEvent(false);this._previousShape = control;diff --git a/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts b/packages/sheets-formula/src/services/render-services/ref-selections.render-service.tsindex b874b701f3..223b833666 100644--- a/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts+++ b/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts@@ -16,9 +16,10 @@import type { IDisposable, Nullable, Workbook } from '@univerjs/core';import { DisposableCollection, Inject, Injector, RANGE_TYPE, ThemeService, toDisposable } from '@univerjs/core';-import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule } from '@univerjs/engine-render';+import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Viewport } from '@univerjs/engine-render';import { ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';-import { convertSelectionDataToRange, getNormalSelectionStyle, IRefSelectionsService, type ISelectionWithCoordAndStyle, type ISelectionWithStyle, SelectionMoveType, type SheetsSelectionsService, type WorkbookSelections } from '@univerjs/sheets';+import type { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle, SheetsSelectionsService, WorkbookSelections } from '@univerjs/sheets';+import { convertSelectionDataToRange, getNormalSelectionStyle, IRefSelectionsService, SelectionMoveType } from '@univerjs/sheets';import { attachSelectionWithCoord, BaseSelectionRenderService, checkInHeaderRanges, getAllSelection, getCoordByOffset, getSheetObject, SheetSkeletonManagerService } from '@univerjs/sheets-ui';import { IShortcutService } from '@univerjs/ui';@@ -157,7 +158,7 @@ export class RefSelectionsRenderService extends BaseSelectionRenderService imple/*** Update selectionModel in this._workbookSelections by user action in spreadsheet area.*/- private _initUserActionSyncListener() {+ private _initUserActionSyncListener(): void {this.disposeWithMe(this.selectionMoveStart$.subscribe((selectionDataWithStyle) => {this._updateSelections(selectionDataWithStyle, SelectionMoveType.MOVE_START);}));@@ -169,7 +170,7 @@ export class RefSelectionsRenderService extends BaseSelectionRenderService imple}));}- private _updateSelections(selectionDataWithStyleList: ISelectionWithCoordAndStyle[], type: SelectionMoveType) {+ private _updateSelections(selectionDataWithStyleList: ISelectionWithCoordAndStyle[], type: SelectionMoveType): void {const workbook = this._context.unit;const sheetId = workbook.getActiveSheet()!.getSheetId();@@ -223,7 +224,7 @@ export class RefSelectionsRenderService extends BaseSelectionRenderService imple}));}- protected override _refreshSelectionControl(selectionsData: readonly ISelectionWithStyle[]) {+ protected override _refreshSelectionControl(selectionsData: readonly ISelectionWithStyle[]): void {const selections = selectionsData.map((selectionWithStyle) => {const selectionData = attachSelectionWithCoord(selectionWithStyle, this._skeleton);return selectionData;@@ -231,7 +232,7 @@ export class RefSelectionsRenderService extends BaseSelectionRenderService implethis.updateControlForCurrentByRangeData(selections);}- private _getActiveViewport(evt: IPointerEvent | IMouseEvent) {+ private _getActiveViewport(evt: IPointerEvent | IMouseEvent): Nullable<Viewport> {const sheetObject = this._getSheetObject();return sheetObject?.scene.getActiveViewportByCoord(Vector2.FromArray([evt.offsetX, evt.offsetY]));}@@ -246,7 +247,7 @@ export class RefSelectionsRenderService extends BaseSelectionRenderService imple* @param themeService* @returns The selection's style.*/-function getDefaultRefSelectionStyle(themeService: ThemeService) {+function getDefaultRefSelectionStyle(themeService: ThemeService): ISelectionStyle {const style = getNormalSelectionStyle(themeService);style.hasAutoFill = false;style.hasRowHeader = false;diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.tsindex c30b777322..62dab92b72 100644--- a/packages/sheets-ui/src/index.ts+++ b/packages/sheets-ui/src/index.ts@@ -177,5 +177,5 @@ export { type IBaseSheetBarProps } from './views/sheet-bar/sheet-bar-tabs/SheetBexport { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT } from './components/font-family/interface';export { FONT_SIZE_COMPONENT } from './components/font-size/interface';export { attachSelectionWithCoord, attachPrimaryWithCoord } from './services/selection/util';-+export { SELECTION_SHAPE_DEPTH } from './services/selection/const';// #endregiondiff --git a/packages/sheets-ui/src/services/mark-selection/mark-selection.service.ts b/packages/sheets-ui/src/services/mark-selection/mark-selection.service.tsindex 242d0d376f..0b314d5381 100644--- a/packages/sheets-ui/src/services/mark-selection/mark-selection.service.ts+++ b/packages/sheets-ui/src/services/mark-selection/mark-selection.service.ts@@ -23,6 +23,7 @@ import type { ISelectionWithStyle } from '@univerjs/sheets';import { SelectionControl } from '../selection/selection-shape';import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';import { ISheetSelectionRenderService } from '../selection/base-selection-render.service';+import { SELECTION_SHAPE_DEPTH } from '../selection/const';export interface IMarkSelectionService {addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;@@ -41,9 +42,12 @@ interface IMarkSelectionInfo {exits: string[];}-const DEFAULT_Z_INDEX = 10000;+const DEFAULT_Z_INDEX = SELECTION_SHAPE_DEPTH.MARK_SELECTION; ;export const IMarkSelectionService = createIdentifier<IMarkSelectionService>('univer.mark-selection-service');+/**+ * For condition format selection.+ */export class MarkSelectionService extends Disposable implements IMarkSelectionService {private _shapeMap: Map<string, IMarkSelectionInfo> = new Map();@@ -73,7 +77,7 @@ export class MarkSelectionService extends Disposable implements IMarkSelectionSereturn id;}- refreshShapes() {+ refreshShapes(): void {const currentSheet = this._currentService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);if (!currentSheet) return;@@ -81,14 +85,12 @@ export class MarkSelectionService extends Disposable implements IMarkSelectionSeconst currentSubUnitId = currentSheet.getActiveSheet()?.getSheetId();this._shapeMap.forEach((shape) => {const { unitId, subUnitId, selection, control: oldControl, zIndex } = shape;-- oldControl && oldControl.dispose();+ oldControl?.dispose();if (unitId !== currentUnitId || subUnitId !== currentSubUnitId) {return;}- const { style } = selection;const renderUnit = this._renderManagerService.getRenderById(unitId);if (!renderUnit) return;@@ -97,9 +99,13 @@ export class MarkSelectionService extends Disposable implements IMarkSelectionSeconst { scene } = renderUnit;const { rowHeaderWidth, columnHeaderHeight } = skeleton;- const control = new SelectionControl(scene, zIndex, false, this._themeService);+ const control = new SelectionControl(scene, zIndex, this._themeService, false, { rowHeaderWidth, columnHeaderHeight });const { rangeWithCoord, primaryWithCoord } = renderUnit.with(ISheetSelectionRenderService).attachSelectionWithCoord(selection);- control.update(rangeWithCoord, rowHeaderWidth, columnHeaderHeight, style, primaryWithCoord);+ control.updateRange(rangeWithCoord, primaryWithCoord);+ const { style } = selection;+ if (style) {+ control.updateStyle(style);+ }shape.control = control;});}@@ -112,14 +118,14 @@ export class MarkSelectionService extends Disposable implements IMarkSelectionSeconst shapeInfo = this._shapeMap.get(id);if (!shapeInfo) return;const { control } = shapeInfo;- control && control.dispose();+ control?.dispose();this._shapeMap.delete(id);}removeAllShapes(): void {for (const shape of this._shapeMap.values()) {const { control } = shape;- control && control.dispose();+ control?.dispose();}this._shapeMap.clear();}diff --git a/packages/sheets-ui/src/services/selection/base-selection-render.service.ts b/packages/sheets-ui/src/services/selection/base-selection-render.service.tsindex 8c857bfa90..a5b599274d 100644--- a/packages/sheets-ui/src/services/selection/base-selection-render.service.ts+++ b/packages/sheets-ui/src/services/selection/base-selection-render.service.ts@@ -217,7 +217,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSeleconst { rangeWithCoord, primaryWithCoord } = selection;const { rangeType } = rangeWithCoord;- const control = this.newSelectionControl(scene, rangeType || RANGE_TYPE.NORMAL);+ const control = this.newSelectionControl(scene, rangeType || RANGE_TYPE.NORMAL, skeleton);// TODO: memory leak? This extension seems never released.// eslint-disable-next-line no-new@@ -228,14 +228,17 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele});const { rowHeaderWidth, columnHeaderHeight } = skeleton;-control.update(rangeWithCoord, rowHeaderWidth, columnHeaderHeight, style, primaryWithCoord);}- newSelectionControl(scene: Scene, _rangeType: RANGE_TYPE): SelectionControl {+ newSelectionControl(scene: Scene, _rangeType: RANGE_TYPE, skeleton: SpreadsheetSkeleton): SelectionControl {const selectionControls = this.getSelectionControls();-- const control = new SelectionControl(scene, selectionControls.length, this._isHeaderHighlight, this._themeService);+ const zIndex = selectionControls.length;+ const { rowHeaderWidth, columnHeaderHeight } = skeleton;+ const control = new SelectionControl(scene, zIndex, this._themeService, this._isHeaderHighlight, {+ rowHeaderWidth,+ columnHeaderHeight,+ });this._selectionControls.push(control);return control;@@ -411,7 +414,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSeleevt: IPointerEvent | IMouseEvent,_zIndex = 0,rangeType: RANGE_TYPE = RANGE_TYPE.NORMAL,- viewport?: Viewport,+ viewport: Nullable<Viewport>,scrollTimerType: ScrollTimerType = ScrollTimerType.ALL): void {this._shouldDetectMergedCells = rangeType === RANGE_TYPE.NORMAL;@@ -494,7 +497,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele);} else {// Create new control as default- activeSelectionControl = this.newSelectionControl(scene, rangeType);+ activeSelectionControl = this.newSelectionControl(scene, rangeType, skeleton);this._updateSelectionControlByRange(activeSelectionControl,cursorCellRangeWithRangeType,diff --git a/packages/sheets-ui/src/services/selection/const.ts b/packages/sheets-ui/src/services/selection/const.tsindex c6923c1304..f87ee4a479 100644--- a/packages/sheets-ui/src/services/selection/const.ts+++ b/packages/sheets-ui/src/services/selection/const.ts@@ -19,3 +19,8 @@ import type { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';export const RANGE_MOVE_PERMISSION_CHECK = createInterceptorKey<boolean, null>('rangeMovePermissionCheck');export const RANGE_FILL_PERMISSION_CHECK = createInterceptorKey<boolean, { x: number; y: number; skeleton: SpreadsheetSkeleton; scene: Scene }>('rangeFillPermissionCheck');++export enum SELECTION_SHAPE_DEPTH {+ FORMULA_EDITOR_SHOW = 100, // see packages/sheets-formula/src/controllers/formula-editor-show.controller.ts+ MARK_SELECTION = 10000,+};diff --git a/packages/sheets-ui/src/services/selection/mobile-selection-render.service.ts b/packages/sheets-ui/src/services/selection/mobile-selection-render.service.tsindex 28c1bab5a1..a1f20e7a84 100644--- a/packages/sheets-ui/src/services/selection/mobile-selection-render.service.ts+++ b/packages/sheets-ui/src/services/selection/mobile-selection-render.service.ts@@ -387,7 +387,7 @@ export class MobileSheetsSelectionRenderService extends BaseSelectionRenderServi* @param rangeType* @returns*/- override newSelectionControl(scene: Scene, rangeType: RANGE_TYPE) {+ override newSelectionControl(scene: Scene, rangeType: RANGE_TYPE): MobileSelectionControl {const selectionControls = this.getSelectionControls();const control = new MobileSelectionControl(scene, selectionControls.length, this._isHeaderHighlight, this._themeService, rangeType);@@ -686,7 +686,7 @@ export class MobileSheetsSelectionRenderService extends BaseSelectionRenderServi}}- private _updateControlPointWhenScrolling() {+ private _updateControlPointWhenScrolling(): void {const { scene } = this._context;const viewportMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);if (!viewportMain) return;diff --git a/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts b/packages/sheets-ui/src/services/selection/mobile-selection-shape.tsindex decda80446..2b2db1d360 100644--- a/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts+++ b/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts@@ -44,16 +44,16 @@ export class MobileSelectionControl extends SelectionControl {constructor(protected override _scene: Scene,protected override _zIndex: number,- protected override _isHeaderHighlight: boolean = true,+ protected override _highlightHeader: boolean = true,protected override readonly _themeService: ThemeService,protected _rangeType: RANGE_TYPE = RANGE_TYPE.NORMAL) {- super(_scene, _zIndex, _isHeaderHighlight, _themeService);+ super(_scene, _zIndex, _themeService, _highlightHeader);// window.sp = this;this.initControlPoints();}- initControlPoints() {+ initControlPoints(): void {const defaultStyle = this.defaultStyle!;const expandCornerSize = defaultStyle.expandCornerSize || 0;const expandCornerInnerSize = (defaultStyle.expandCornerSize || 0) / 4;@@ -149,19 +149,18 @@ export class MobileSelectionControl extends SelectionControl {this._rangeType = value;}- override dispose() {+ override dispose(): void {this._fillControlBottomRight?.dispose();this._fillControlTopLeft?.dispose();super.dispose();}- override updateRange(range: IRangeWithCoord) {+ override updateRange(range: IRangeWithCoord): void {this._selectionModel.setValue(range);- this._updateControlStyleAndLayout(null, this._rowHeaderWidth, this._columnHeaderHeight);}- protected override _updateControlStyleAndLayout(style: Nullable<ISelectionStyle>, rowHeaderWidth: number, columnHeaderHeight: number) {- super._updateControlStyleAndLayout(style, rowHeaderWidth, columnHeaderHeight);+ protected override _updateControlStyleAndLayout(style: Nullable<ISelectionStyle>): void {+ super._updateControlStyleAndLayout(style);// const rangeType = this.rangeType;// startX startY shares same coordinate with viewport.(include row & colheader)@@ -213,7 +212,7 @@ export class MobileSelectionControl extends SelectionControl {* @param sheetContentHeight max sheet content height, for very short sheet, control pointer shoud not out of sheet*/// eslint-disable-next-line max-lines-per-function- transformControlPoint(viewportScrollX: number = 0, viewportScrollY: number = 0, sheetContentWidth: number = 0, sheetContentHeight: number = 0) {+ transformControlPoint(viewportScrollX: number = 0, viewportScrollY: number = 0, sheetContentWidth: number = 0, sheetContentHeight: number = 0): void {const style = this.currentStyle!;const rangeType = this.selectionModel.rangeType;const expandCornerSizeInner = style.expandCornerSize! / 4;diff --git a/packages/sheets-ui/src/services/selection/selection-shape.ts b/packages/sheets-ui/src/services/selection/selection-shape.tsindex 799886612f..1661088586 100644--- a/packages/sheets-ui/src/services/selection/selection-shape.ts+++ b/packages/sheets-ui/src/services/selection/selection-shape.ts@@ -92,11 +92,11 @@ export class SelectionControl extends Disposable {private _rowHeaderBackground!: Rect;private _rowHeaderBorder!: Rect;private _rowHeaderGroup!: Group;- private _rowHeaderHighlight!: Rect;+ // private _rowHeaderHighlight!: Rect;private _columnHeaderBackground!: Rect;private _columnHeaderBorder!: Rect;private _columnHeaderGroup!: Group;- private _columnHeaderHighlight!: Rect;+ // private _columnHeaderHighlight!: Rect;private _topLeftWidget!: Rect;private _topCenterWidget!: Rect;@@ -143,106 +143,112 @@ export class SelectionControl extends Disposable {constructor(protected _scene: Scene,protected _zIndex: number,- protected _isHeaderHighlight: boolean = true,- protected readonly _themeService: ThemeService+ protected readonly _themeService: ThemeService,+ protected _highlightHeader: boolean = true,+ options?: {+ rowHeaderWidth: number;+ columnHeaderHeight: number;+ }) {super();+ this._rowHeaderWidth = (options?.rowHeaderWidth) || 0;+ this._columnHeaderHeight = (options?.columnHeaderHeight) || 0;this._initialize();}- get zIndex() {+ get zIndex(): number {return this._zIndex;}- get leftControl() {+ get leftControl(): Rect {return this._leftControl;}- get rightControl() {+ get rightControl(): Rect {return this._rightControl;}- get topControl() {+ get topControl(): Rect {return this._topControl;}- get bottomControl() {+ get bottomControl(): Rect {return this._bottomControl;}- get fillControl() {+ get fillControl(): Rect {return this._fillControl;}- get backgroundControlTop() {+ get backgroundControlTop(): Rect {return this._backgroundControlTop;}- get backgroundControlBottom() {+ get backgroundControlBottom(): Rect {return this._backgroundControlBottom;}- get backgroundControlMiddleLeft() {+ get backgroundControlMiddleLeft(): Rect {return this._backgroundControlMiddleLeft;}- get backgroundControlMiddleRight() {+ get backgroundControlMiddleRight(): Rect {return this._backgroundControlMiddleRight;}- get selectionShape() {+ get selectionShape(): Group {return this._selectionShapeGroup;}- get columnHeaderGroup() {+ get columnHeaderGroup(): Group {return this._columnHeaderGroup;}- get rowHeaderGroup() {+ get rowHeaderGroup(): Group {return this._rowHeaderGroup;}- get selectionShapeGroup() {+ get selectionShapeGroup(): Group {return this._selectionShapeGroup;}- get model() {+ get model(): SelectionRenderModel {return this._selectionModel;}- get topLeftWidget() {+ get topLeftWidget(): Rect {return this._topLeftWidget;}- get topCenterWidget() {+ get topCenterWidget(): Rect {return this._topCenterWidget;}- get topRightWidget() {+ get topRightWidget(): Rect {return this._topRightWidget;}- get middleLeftWidget() {+ get middleLeftWidget(): Rect {return this._middleLeftWidget;}- get middleRightWidget() {+ get middleRightWidget(): Rect {return this._middleRightWidget;}- get bottomLeftWidget() {+ get bottomLeftWidget(): Rect {return this._bottomLeftWidget;}- get bottomCenterWidget() {+ get bottomCenterWidget(): Rect {return this._bottomCenterWidget;}- get bottomRightWidget() {+ get bottomRightWidget(): Rect {return this._bottomRightWidget;}- get themeService() {+ get themeService(): ThemeService {return this._themeService;}@@ -254,7 +260,7 @@ export class SelectionControl extends Disposable {// this._selectionStyle = style;// }- get selectionModel() {+ get selectionModel(): SelectionRenderModel {return this._selectionModel;}@@ -262,7 +268,7 @@ export class SelectionControl extends Disposable {this._selectionModel = model;}- get defaultStyle() {+ get defaultStyle(): ISelectionStyle {return this._defaultStyle;}@@ -270,11 +276,11 @@ export class SelectionControl extends Disposable {this._defaultStyle = style;}- get dashRect() {+ get dashRect(): Rect {return this._dashRect;}- get currentStyle() {+ get currentStyle(): Nullable<ISelectionStyle> {return this._currentStyle;}@@ -284,11 +290,11 @@ export class SelectionControl extends Disposable {}}- get isHelperSelection() {+ get isHelperSelection(): boolean {return this._isHelperSelection;}- get rowHeaderWidth() {+ get rowHeaderWidth(): number {return this._rowHeaderWidth;}@@ -296,7 +302,7 @@ export class SelectionControl extends Disposable {this._rowHeaderWidth = width;}- get columnHeaderHeight() {+ get columnHeaderHeight(): number {return this._columnHeaderHeight;}@@ -304,14 +310,14 @@ export class SelectionControl extends Disposable {this._columnHeaderHeight = height;}- setEvent(state: boolean) {+ setEvent(state: boolean): void {this.leftControl.evented = state;this.rightControl.evented = state;this.topControl.evented = state;this.bottomControl.evented = state;}- refreshSelectionFilled(val: IRangeWithCoord) {+ refreshSelectionFilled(val: IRangeWithCoord): void {this._selectionFilled$.next(val);}@@ -319,10 +325,10 @@ export class SelectionControl extends Disposable {* invoked when update selection style & range change, invoked by updateStyle, updateRange, update*/// eslint-disable-next-line max-lines-per-function- protected _updateControlStyleAndLayout(selectionStyle: Nullable<ISelectionStyle>, rowHeaderWidth: number, columnHeaderHeight: number) {+ protected _updateControlStyleAndLayout(selectionStyle: Nullable<ISelectionStyle>): void {// this._selectionStyle = selectionStyle;- this._rowHeaderWidth = rowHeaderWidth || 0;- this._columnHeaderHeight = columnHeaderHeight || 0;+ // this._rowHeaderWidth = (rowHeaderWidth ?? this._rowHeaderWidth) || 0;+ // this._columnHeaderHeight = (columnHeaderHeight ?? this._columnHeaderHeight) || 0;// startX startY shares same coordinate with viewport.(include row & colheader)const { startX, startY, endX, endY } = this._selectionModel;@@ -458,7 +464,7 @@ export class SelectionControl extends Disposable {this._updateBackgroundControl(selectionStyle);- this._updateBackgroundTitle(selectionStyle, rowHeaderWidth, columnHeaderHeight);+ this._updateHeaderBackground(selectionStyle);this._updateWidgets(selectionStyle);@@ -474,15 +480,15 @@ export class SelectionControl extends Disposable {this.selectionShape.makeDirtyNoDebounce(true);}- updateStyle(style: ISelectionStyle) {- this._updateControlStyleAndLayout(style, this._rowHeaderWidth, this._columnHeaderHeight);+ updateStyle(style: ISelectionStyle): void {+ this._updateControlStyleAndLayout(style);}- updateRange(range: IRangeWithCoord, primaryCell: Nullable<ISelectionCellWithMergeInfo>) {+ updateRange(range: IRangeWithCoord, primaryCell: Nullable<ISelectionCellWithMergeInfo>): void {this._selectionModel.setValue(range, primaryCell);// TODO @lumixraku// why update rowHeaderWidth and columnHeaderHeight at the same time? Did they change when update range?- this._updateControlStyleAndLayout(this._currentStyle, this._rowHeaderWidth, this._columnHeaderHeight);+ this._updateControlStyleAndLayout(this._currentStyle);}/**@@ -500,30 +506,34 @@ export class SelectionControl extends Disposable {columnHeaderHeight: number = 0,style?: Nullable<ISelectionStyle>,primaryCell?: Nullable<ISelectionCellWithMergeInfo>- ) {+ ): void {this._selectionModel.setValue(newSelectionRange, primaryCell);- this._updateControlStyleAndLayout(style || this._currentStyle, rowHeaderWidth, columnHeaderHeight);+ // this._selectionStyle = selectionStyle;+ this._rowHeaderWidth = rowHeaderWidth;+ this._columnHeaderHeight = columnHeaderHeight;++ this._updateControlStyleAndLayout(style || this._currentStyle);}/*** update primary range* @param primaryCell model.current (aka: highlight)*/- updateCurrCell(primaryCell?: Nullable<ISelectionCellWithMergeInfo>) {+ updateCurrCell(primaryCell?: Nullable<ISelectionCellWithMergeInfo>): void {this._selectionModel.setCurrentCell(primaryCell);}- clearHighlight() {+ clearHighlight(): void {this._selectionModel.clearCurrentCell();- this._updateControlStyleAndLayout(this._currentStyle, this._rowHeaderWidth, this._columnHeaderHeight);+ this._updateControlStyleAndLayout(this._currentStyle);}- getScene() {+ getScene(): Scene {return this._scene;}// eslint-disable-next-line complexity- override dispose() {+ override dispose(): void {this._leftControl?.dispose();this._rightControl?.dispose();this._topControl?.dispose();@@ -605,15 +615,15 @@ export class SelectionControl extends Disposable {};}- getRange() {+ getRange(): IRangeWithCoord {return this._selectionModel.getValue().rangeWithCoord;}- enableHelperSelection() {+ enableHelperSelection(): void {this._isHelperSelection = true;}- disableHelperSelection() {+ disableHelperSelection(): void {this._isHelperSelection = false;}@@ -625,7 +635,7 @@ export class SelectionControl extends Disposable {// }// eslint-disable-next-line max-lines-per-function- private _initialize() {+ private _initialize(): void {this._defaultStyle = getNormalSelectionStyle(this._themeService);this._currentStyle = getNormalSelectionStyle(this._themeService);@@ -695,7 +705,6 @@ export class SelectionControl extends Disposable {this._selectionShapeGroup.zIndex = zIndex;const scene = this.getScene();-scene.addObject(this._selectionShapeGroup, SHEET_COMPONENT_SELECTION_LAYER_INDEX);this.disposeWithMe(@@ -705,15 +714,15 @@ export class SelectionControl extends Disposable {return;}- this._updateControlStyleAndLayout(this._currentStyle, this._rowHeaderWidth, this._columnHeaderHeight);+ this._updateControlStyleAndLayout(this._currentStyle);})));- this._initialTitle();+ this._initialHeader();}- private _initialTitle() {+ private _initialHeader(): void {const zIndex = this._zIndex;this._rowHeaderBackground = new Rect(SELECTION_MANAGER_KEY.rowHeaderBackground + zIndex, {zIndex: zIndex - 1,@@ -732,9 +741,7 @@ export class SelectionControl extends Disposable {);this._rowHeaderGroup.hide();-this._rowHeaderGroup.evented = false;-this._rowHeaderGroup.zIndex = zIndex;this._columnHeaderBackground = new Rect(SELECTION_MANAGER_KEY.columnHeaderBackground + zIndex, {@@ -754,16 +761,14 @@ export class SelectionControl extends Disposable {);this._columnHeaderGroup.hide();-this._columnHeaderGroup.evented = false;-this._columnHeaderGroup.zIndex = zIndex;const scene = this.getScene();scene.addObjects([this._rowHeaderGroup, this._columnHeaderGroup], SHEET_COMPONENT_HEADER_SELECTION_LAYER_INDEX);}- private _initialWidget() {+ private _initialWidget(): Rect[] {const zIndex = this._zIndex;this._topLeftWidget = new Rect(SELECTION_MANAGER_KEY.topLeftWidget + zIndex, {zIndex: zIndex + 1,@@ -809,7 +814,7 @@ export class SelectionControl extends Disposable {];}- private _updateBackgroundTitle(style: Nullable<ISelectionStyle>, rowHeaderWidth: number, columnHeaderHeight: number) {+ private _updateHeaderBackground(style: Nullable<ISelectionStyle>): void {const { startX, startY, endX, endY, rangeType } = this._selectionModel;const defaultStyle = this._defaultStyle;@@ -831,12 +836,13 @@ export class SelectionControl extends Disposable {} = style;rowHeaderStrokeWidth /= scale;-columnHeaderStrokeWidth /= scale;+ const rowHeaderWidth = this._rowHeaderWidth;+ const columnHeaderHeight = this._columnHeaderHeight;if (hasColumnHeader === true) {let highlightTitleColor = columnHeaderFill;- if (this._isHeaderHighlight && rangeType === RANGE_TYPE.COLUMN) {+ if (this._highlightHeader && rangeType === RANGE_TYPE.COLUMN) {highlightTitleColor = new ColorKit(stroke).setAlpha(SELECTION_TITLE_HIGHLIGHT_ALPHA).toString();}this._columnHeaderBackground.setProps({@@ -863,7 +869,7 @@ export class SelectionControl extends Disposable {if (hasRowHeader === true) {let highlightTitleColor = rowHeaderFill;- if (this._isHeaderHighlight && rangeType === RANGE_TYPE.ROW) {+ if (this._highlightHeader && rangeType === RANGE_TYPE.ROW) {highlightTitleColor = new ColorKit(stroke).setAlpha(SELECTION_TITLE_HIGHLIGHT_ALPHA).toString();}this._rowHeaderBackground.setProps({@@ -889,7 +895,7 @@ export class SelectionControl extends Disposable {this._rowHeaderGroup.makeDirty(true);}- private _updateBackgroundControl(style: Nullable<ISelectionStyle>) {+ private _updateBackgroundControl(style: Nullable<ISelectionStyle>): void {const { startX, startY, endX, endY } = this._selectionModel;const defaultStyle = this._defaultStyle;@@ -970,7 +976,7 @@ export class SelectionControl extends Disposable {this._backgroundControlBottom.setProps({ fill });}- private _updateWidgets(style: Nullable<ISelectionStyle>) {+ private _updateWidgets(style: Nullable<ISelectionStyle>): void {const { startX, startY, endX, endY } = this._selectionModel;const defaultStyle = this._defaultStyle;@@ -1049,7 +1055,7 @@ export class SelectionControl extends Disposable {}}- protected _hasWidgets(widgets: ISelectionWidgetConfig) {+ protected _hasWidgets(widgets: ISelectionWidgetConfig): boolean {if (widgets == null) {return false;}@@ -1069,7 +1075,7 @@ export class SelectionControl extends Disposable {return true;}- private _getScale() {+ private _getScale(): number {const { scaleX, scaleY } = this._scene.getAncestorScale();return Math.max(scaleX, scaleY);}@@ -1078,12 +1084,12 @@ export class SelectionControl extends Disposable {private _antRequestNewFrame: number = -1;- private _stopAntLineAnimation() {+ private _stopAntLineAnimation(): void {this._antLineOffset = 0;cancelRequestFrame(this._antRequestNewFrame);}- private _startAntLineAnimation() {+ private _startAntLineAnimation(): void {const scale = this._getScale();this._antLineOffset += 0.6 / scale;if (this._antLineOffset > 160 / scale) {diff --git a/packages/sheets-ui/src/services/selection/util.ts b/packages/sheets-ui/src/services/selection/util.tsindex 4051b5b5e7..9b24e09cdf 100644--- a/packages/sheets-ui/src/services/selection/util.ts+++ b/packages/sheets-ui/src/services/selection/util.ts@@ -18,7 +18,6 @@ import type { ISelectionCell, ISelectionCellWithMergeInfo } from '@univerjs/coreimport type { SpreadsheetSkeleton } from '@univerjs/engine-render';import type { ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';import { attachRangeWithCoord } from '../sheet-skeleton-manager.service';-// const nilSelection = {// startRow: -1,// startColumn: -1,@@ -31,7 +30,7 @@ import { attachRangeWithCoord } from '../sheet-skeleton-manager.service';// rangeType: RANGE_TYPE.NORMAL,// }-export function attachSelectionWithCoord(selection: ISelectionWithStyle, skeleton: SpreadsheetSkeleton) {+export function attachSelectionWithCoord(selection: ISelectionWithStyle, skeleton: SpreadsheetSkeleton): ISelectionWithCoordAndStyle {const { range, primary, style } = selection;const rangeWithCoord = attachRangeWithCoord(skeleton, range);diff --git a/packages/sheets-ui/src/views/editor-container/index.module.less b/packages/sheets-ui/src/views/editor-container/index.module.lessindex 37c8508a3a..ec4ab4cb5d 100644--- a/packages/sheets-ui/src/views/editor-container/index.module.less+++ b/packages/sheets-ui/src/views/editor-container/index.module.less@@ -27,8 +27,8 @@canvas {position: absolute;- top: -1px !important;- left: -1px !important;+ // top: -1px !important;+ // left: -1px !important;}}}