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: float dom event (#4514)
lumix4d13d75fe7ae
diff --git a/packages-experimental/debugger/src/components/float-button.tsx b/packages-experimental/debugger/src/components/float-button.tsxindex bbac223ed8..bbe0fa83d2 100644--- a/packages-experimental/debugger/src/components/float-button.tsx+++ b/packages-experimental/debugger/src/components/float-button.tsx@@ -36,3 +36,51 @@ export const FloatButton = () => {</div>);};++export const AIButton = () => {+ const divStyle = {+ width: '80px',+ height: '50px',+ backgroundColor: '#fff',+ display: 'flex',+ justifyContent: 'center',+ alignItems: 'center',+ textAlign: 'center' as const,+ borderRadius: '25px',+ border: 'none',+ color: 'white',+ cursor: 'pointer',+ transition: 'all 0.3s ease',++ background: 'linear-gradient(90deg, #00C9FF 0%, #92FE9D 50%, #00C9FF 100%)',+ backgroundSize: '200% auto',+ animation: 'gradient 3s linear infinite',++ ':hover': {+ transform: 'translateY(-2px)',+ boxShadow: '0 10px 20px rgba(0, 201, 255, 0.3)',+ },+ };+ const clickHandler = () => {+ console.warn('click');+ };+ return (+ <button type="button" style={divStyle} onClick={clickHandler}>+ AI+ <style>+ {`+ @keyframes gradient {+ 0% { background-position: 0% 50%; }+ 50% { background-position: 100% 50%; }+ 100% { background-position: 0% 50%; }+ }++ button:hover {+ transform: translateY(-2px);+ box-shadow: 0 10px 20px rgba(0, 201, 255, 0.3);+ }+ `}+ </style>+ </button>+ );+};diff --git a/packages-experimental/debugger/src/controllers/debugger.controller.ts b/packages-experimental/debugger/src/controllers/debugger.controller.tsindex 56749569a3..f905b6f3fb 100644--- a/packages-experimental/debugger/src/controllers/debugger.controller.ts+++ b/packages-experimental/debugger/src/controllers/debugger.controller.ts@@ -33,9 +33,9 @@ import { SidebarOperation } from '../commands/operations/sidebar.operation';import { ThemeOperation } from '../commands/operations/theme.operation';+import { AIButton, FloatButton } from '../components/float-button';import { ImageDemo } from '../components/Image';import { RangeLoading } from '../components/range-loading';-import { FloatButton } from '../components/float-button';// @ts-ignoreimport VueI18nIcon from '../components/VueI18nIcon.vue';// import { TEST_EDITOR_CONTAINER_COMPONENT } from '../views/test-editor/component-name';@@ -92,5 +92,6 @@ export class DebuggerController extends Disposable {this.disposeWithMe(componentManager.register('ImageDemo', ImageDemo));this.disposeWithMe(componentManager.register('RangeLoading', RangeLoading));this.disposeWithMe(componentManager.register('FloatButton', FloatButton));+ this.disposeWithMe(componentManager.register('AIButton', AIButton));}}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 bae1a2b7b2..278a30e1eb 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@@ -17,7 +17,7 @@import type { IScale } from '@univerjs/core';import type { UniverRenderingContext } from '../../../context';-import type { IAColumnCfg, IAColumnCfgObj, IColumnStyleCfg } from '../interfaces';+import type { IAColumnCfg, IAColumnCfgObj, IHeaderStyleCfg } from '../interfaces';import type { SpreadsheetSkeleton } from '../sheet-skeleton';import { numberToABC } from '@univerjs/core';import { DEFAULT_FONTFACE_PLANE, FIX_ONE_PIXEL_BLUR_OFFSET, MIDDLE_CELL_POS_MAGIC_NUMBER } from '../../../basics/const';@@ -27,7 +27,7 @@ import { SheetExtension } from './sheet-extension';const UNIQUE_KEY = 'DefaultColumnHeaderLayoutExtension';export interface IColumnsHeaderCfgParam {- headerStyle?: Partial<IColumnStyleCfg>;+ headerStyle?: Partial<IHeaderStyleCfg>;columnsCfg?: IAColumnCfg[];}const DEFAULT_COLUMN_STYLE = {@@ -47,7 +47,7 @@ export class ColumnHeaderLayout extends SheetExtension {override uKey = UNIQUE_KEY;override Z_INDEX = 10;columnsCfg: IAColumnCfg[] = [];- headerStyle: IColumnStyleCfg = {+ headerStyle: IHeaderStyleCfg = {fontSize: DEFAULT_COLUMN_STYLE.fontSize,fontFamily: DEFAULT_COLUMN_STYLE.fontFamily,fontColor: DEFAULT_COLUMN_STYLE.fontColor,@@ -78,7 +78,7 @@ export class ColumnHeaderLayout extends SheetExtension {if (typeof columnsCfg[colIndex] == 'string') {columnsCfg[colIndex] = { text: columnsCfg[colIndex] } as IAColumnCfgObj;}- curColSpecCfg = columnsCfg[colIndex] as IColumnStyleCfg & { text: string };+ curColSpecCfg = columnsCfg[colIndex] as IHeaderStyleCfg & { text: string };mergeWithSpecCfg = { ...this.headerStyle, ...curColSpecCfg };} else {mergeWithSpecCfg = { ...this.headerStyle, text: numberToABC(colIndex) };@@ -87,7 +87,7 @@ export class ColumnHeaderLayout extends SheetExtension {return [mergeWithSpecCfg, specStyle] as [IAColumnCfgObj, boolean];}- setStyleToCtx(ctx: UniverRenderingContext, columnStyle: Partial<IColumnStyleCfg>): void {+ setStyleToCtx(ctx: UniverRenderingContext, columnStyle: Partial<IHeaderStyleCfg>): void {if (columnStyle.textAlign) ctx.textAlign = columnStyle.textAlign;if (columnStyle.textBaseline) ctx.textBaseline = columnStyle.textBaseline;if (columnStyle.fontColor) ctx.fillStyle = columnStyle.fontColor;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.tsindex bcc594a3c6..ca84cfc8e4 100644--- a/packages/engine-render/src/components/sheets/extensions/row-header-layout.ts+++ b/packages/engine-render/src/components/sheets/extensions/row-header-layout.ts@@ -17,7 +17,7 @@import type { IScale } from '@univerjs/core';import type { UniverRenderingContext } from '../../../context';-import type { IARowCfg, IARowCfgObj, IColumnStyleCfg, IRowStyleCfg } from '../interfaces';+import type { IARowCfg, IARowCfgObj, IHeaderStyleCfg, IRowStyleCfg } from '../interfaces';import type { SpreadsheetSkeleton } from '../sheet-skeleton';import { DEFAULT_FONTFACE_PLANE, FIX_ONE_PIXEL_BLUR_OFFSET, MIDDLE_CELL_POS_MAGIC_NUMBER } from '../../../basics/const';import { getColor } from '../../../basics/tools';@@ -85,7 +85,7 @@ export class RowHeaderLayout extends SheetExtension {return [mergeWithSpecCfg, specStyle] as [IARowCfgObj, boolean];}- setStyleToCtx(ctx: UniverRenderingContext, rowStyle: Partial<IColumnStyleCfg>) {+ setStyleToCtx(ctx: UniverRenderingContext, rowStyle: Partial<IHeaderStyleCfg>) {if (rowStyle.textAlign) ctx.textAlign = rowStyle.textAlign;if (rowStyle.textBaseline) ctx.textBaseline = rowStyle.textBaseline;if (rowStyle.fontColor) ctx.fillStyle = rowStyle.fontColor;diff --git a/packages/engine-render/src/components/sheets/interfaces.ts b/packages/engine-render/src/components/sheets/interfaces.tsindex 5d8784c946..aebafbe090 100644--- a/packages/engine-render/src/components/sheets/interfaces.ts+++ b/packages/engine-render/src/components/sheets/interfaces.ts@@ -105,7 +105,7 @@ export interface IPaintForScrolling {scaleX: number;scaleY: number;}-export interface IColumnStyleCfg {+export interface IHeaderStyleCfg {fontFamily: string;fontColor: string;fontSize: number;@@ -115,7 +115,7 @@ export interface IColumnStyleCfg {backgroundColor: string;}-export type IAColumnCfgObj = IColumnStyleCfg & { text: string };+export type IAColumnCfgObj = IHeaderStyleCfg & { text: string; headerHeight: number };export type IAColumnCfg = undefined | null | string | Partial<IAColumnCfgObj>;export interface IRowStyleCfg {@@ -128,5 +128,5 @@ export interface IRowStyleCfg {backgroundColor: string;}-export type IARowCfgObj = IColumnStyleCfg & { text: string };+export type IARowCfgObj = IHeaderStyleCfg & { text: string };export type IARowCfg = undefined | null | string | Partial<IARowCfgObj>;diff --git a/packages/sheets-drawing-ui/src/facade/f-worksheet.ts b/packages/sheets-drawing-ui/src/facade/f-worksheet.tsindex 2e8f535ace..75bf987c09 100644--- a/packages/sheets-drawing-ui/src/facade/f-worksheet.ts+++ b/packages/sheets-drawing-ui/src/facade/f-worksheet.ts@@ -87,9 +87,7 @@ export interface IFWorksheetLegacy {// another example-------------------{const sheet = univerAPI.getActiveWorkbook().getActiveSheet();- // const range = sheet.getRange(0, 0, 3, 3);- // univerAPI.getActiveWorkbook().setActiveRange(range);- univerAPI.getActiveWorkbook().getActiveSheet().getActiveRange()+ const range = univerAPI.getActiveWorkbook().getActiveSheet().getActiveRange()const {id, dispose } = sheet.addFloatDomToRange(range, {allowTransform: false,componentKey: 'FloatButton', // React comp key registered in ComponentManager@@ -102,10 +100,12 @@ export interface IFWorksheetLegacy {}, {width: 100,height: 30,- x: '100%',- y: '100%'},+ marginX: '100%', // margin percent to range width, or pixel+ marginY: '100%'+ },'AIButton') // dom id}+* ```*/addFloatDomToRange(range: FRange, layer: IFICanvasFloatDom, domLayout: IDOMRangeLayout, id?: string): Nullable<{@@ -130,11 +130,8 @@ export interface IFWorksheetLegacy {props: {a: 1,},- data: {- aa: '128',- },},- {width: 100, height: 40, x: 0, y: 0},+ {width: 100, height: 40, marginX: 0, marginY: 0, horizonOffsetAlign: 'right'},'ai-selector' // dom id)}diff --git a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.tsindex 8b8c508663..5ab62f650d 100644--- a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts+++ b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts@@ -22,9 +22,8 @@ import type { IDrawingJsonUndo1 } from '@univerjs/drawing';import type { BaseObject, IBoundRectNoAngle, IRectProps, IRender, Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';import type { ISetFrozenMutationParams, ISetWorksheetRowAutoHeightMutationParams } from '@univerjs/sheets';import type { IFloatDomData, ISheetDrawingPosition, ISheetFloatDom } from '@univerjs/sheets-drawing';-import type { IFloatDomLayout } from '@univerjs/ui';+import type { IFloatDom, IFloatDomLayout } from '@univerjs/ui';import type { IInsertDrawingCommandParams } from '../commands/commands/interfaces';-import { Disposable, DisposableCollection, DrawingTypeEnum, fromEventSubject, generateRandomId, ICommandService, Inject, IUniverInstanceService, LifecycleService, LifecycleStages, Tools, UniverInstanceType } from '@univerjs/core';import { getDrawingShapeKeyByDrawingSearch, IDrawingManagerService } from '@univerjs/drawing';import { DRAWING_OBJECT_LAYER_INDEX, IRenderManagerService, ObjectType, Rect, SHEET_VIEWPORT_KEY } from '@univerjs/engine-render';@@ -65,6 +64,11 @@ export interface ICanvasFloatDom {* the float-dom type*/type?: DrawingTypeEnum;++ /**+ * whether allow event pass through float dom to canvas.+ */+ eventPassThrough?: boolean;}enum ScrollDirectionResponse {@@ -85,8 +89,10 @@ interface ICanvasFloatDomInfo {export interface IDOMRangeLayout {width: number;height: number;- x?: number; // offsetX- y?: number; // offsetY+ horizonOffsetAlign?: 'left' | 'right';+ verticalOffsetAlign?: 'top' | 'bottom';+ marginX?: number;+ marginY?: number;}export interface ILimitBound extends IBoundRectNoAngle {@@ -119,16 +125,6 @@ export function transformBound2DOMBound(posOfFloatObject: IBoundRectNoAngle, sce};}const { left, right, top, bottom } = posOfFloatObject;- const freeze = worksheet.getFreeze();- const { startColumn, startRow, xSplit, ySplit } = freeze;- // freeze start- const startSheetView = skeleton.getNoMergeCellPositionByIndex(startRow - ySplit, startColumn - xSplit);- // freeze end- const endSheetView = skeleton.getNoMergeCellPositionByIndex(startRow, startColumn);- // const { rowHeaderWidth, columnHeaderHeight } = skeleton;- const freezeWidth = endSheetView.startX - startSheetView.startX;- const freezeHeight = endSheetView.startY - startSheetView.startY;-let { top: topBoundOfViewArea, left: leftBoundViewArea, viewportScrollX: actualScrollX, viewportScrollY: actualScrollY } = viewMain;// specify edge of viewbound. if not specify, use viewMain.@@ -154,11 +150,11 @@ export function transformBound2DOMBound(posOfFloatObject: IBoundRectNoAngle, sce// viewMain or viewTopif (left < leftBoundViewArea) {absolute.left = true;- offsetLeft = ((freezeWidth + leftBoundViewArea) + (left - leftBoundViewArea)) * scaleX;+ offsetLeft = ((leftBoundViewArea) + (left - leftBoundViewArea)) * scaleX;offsetRight = Math.max(Math.min(- ((freezeWidth + leftBoundViewArea) + (right - leftBoundViewArea)) * scaleX,- (freezeWidth + leftBoundViewArea) * scaleX+ ((leftBoundViewArea) + (right - leftBoundViewArea)) * scaleX,+ (leftBoundViewArea) * scaleX),(right - actualScrollX) * scaleX);} else {@@ -172,11 +168,11 @@ export function transformBound2DOMBound(posOfFloatObject: IBoundRectNoAngle, sce// viewMain or viewTopif (top < topBoundOfViewArea) {absolute.top = true;- offsetTop = ((freezeHeight + topBoundOfViewArea) + (top - topBoundOfViewArea)) * scaleY;+ offsetTop = ((topBoundOfViewArea) + (top - topBoundOfViewArea)) * scaleY;offsetBottom = Math.max(Math.min(- ((freezeHeight + topBoundOfViewArea) + (right - topBoundOfViewArea)) * scaleY,- (freezeHeight + topBoundOfViewArea) * scaleY+ ((topBoundOfViewArea) + (right - topBoundOfViewArea)) * scaleY,+ (topBoundOfViewArea) * scaleY),(bottom - actualScrollY) * scaleY);@@ -724,10 +720,10 @@ export class SheetCanvasFloatDomManagerService extends Disposable {};}- addFloatDomToRange(range: IRange, layer: ICanvasFloatDom, domPos: IDOMRangeLayout, propId?: string) {+ addFloatDomToRange(range: IRange, config: ICanvasFloatDom, domPos: IDOMRangeLayout, propId?: string) {const target = getSheetCommandTarget(this._univerInstanceService, {- unitId: layer.unitId,- subUnitId: layer.subUnitId,+ unitId: config.unitId,+ subUnitId: config.subUnitId,});if (!target) {throw new Error('cannot find current target!');@@ -741,7 +737,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {if (!skeletonParam) return;// const viewMain = renderObject.scene.getMainViewport();- const { componentKey, data, allowTransform = true } = layer;+ const { componentKey, data, allowTransform = true } = config;const id = propId ?? generateRandomId();// const drawingId = id;@@ -750,22 +746,21 @@ export class SheetCanvasFloatDomManagerService extends Disposable {if (sheetTransform == null) {return;}- // this._ensureMap for what?const map = this._ensureMap(unitId, subUnitId);- map.set(id, layer);+ map.set(id, config);const rangeWidth = rangePosition.endX - rangePosition.startX;const rangeHeight = rangePosition.endY - rangePosition.startY;const domWidth = domPos.width ?? rangeWidth;const domHeight = domPos.height ?? rangeHeight;- const domLeft = rangePosition.startX + calculateOffset(domPos.x, rangeWidth);- const domTop = rangePosition.startY + calculateOffset(domPos.y, rangeHeight);+ const domLeft = rangePosition.startX + calculateOffset(domPos.marginX, rangeWidth);+ const domTop = rangePosition.startY + calculateOffset(domPos.marginY, rangeHeight);const sheetDrawingParam: ISheetFloatDom = {unitId,subUnitId,drawingId: id,- drawingType: layer.type || DrawingTypeEnum.DRAWING_DOM,+ drawingType: config.type || DrawingTypeEnum.DRAWING_DOM,componentKey,sheetTransform,transform: {@@ -883,7 +878,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {bottom: viewMain.bottom,right: viewMain.right,};- // why call twice? there is another calcPosition below.const floatDomInfo = {dispose: disposableCollection,@@ -898,26 +892,35 @@ export class SheetCanvasFloatDomManagerService extends Disposable {const position$ = new BehaviorSubject<IFloatDomLayout>(initedPosition);floatDomInfo.position$ = position$;- this._canvasFloatDomService.addFloatDom({+ // used in FloatDom.tsx+ let floatDomCfg: IFloatDom = {position$,id: drawingId,componentKey: floatDomParam.componentKey,- onPointerDown: (evt) => {- canvas.dispatchEvent(new PointerEvent(evt.type, evt));- },- onPointerMove: (evt: PointerEvent | MouseEvent) => {- canvas.dispatchEvent(new PointerEvent(evt.type, evt));- },- onPointerUp: (evt: PointerEvent | MouseEvent) => {- canvas.dispatchEvent(new PointerEvent(evt.type, evt));- },+ onPointerDown: () => { },+ onPointerMove: () => { },+ onPointerUp: () => { },onWheel: (evt: WheelEvent) => {canvas.dispatchEvent(new WheelEvent(evt.type, evt));},- // props: map.get(drawingId)?.props ?? this._getFloatDomProps(drawingId),+ props: map.get(drawingId)?.props ?? this._getFloatDomProps(drawingId),data,unitId,- });+ };+ if (config.eventPassThrough) {+ floatDomCfg = { ...floatDomCfg,+ onPointerDown: (evt) => {+ canvas.dispatchEvent(new PointerEvent(evt.type, evt));+ },+ onPointerMove: (evt: PointerEvent | MouseEvent) => {+ canvas.dispatchEvent(new PointerEvent(evt.type, evt));+ },+ onPointerUp: (evt: PointerEvent | MouseEvent) => {+ canvas.dispatchEvent(new PointerEvent(evt.type, evt));+ },+ };+ }+ this._canvasFloatDomService.addFloatDom(floatDomCfg);const listener = domRect.onTransformChange$.subscribeEvent(() => {const newPosition = calcPosition(domRect, renderObject.renderUnit, skeleton.skeleton, target.worksheet, floatDomInfo);@@ -944,10 +947,10 @@ export class SheetCanvasFloatDomManagerService extends Disposable {};}- addFloatDomToColumnHeader(column: number, layer: ICanvasFloatDom, domLayout: IDOMRangeLayout, propId?: string) {+ addFloatDomToColumnHeader(column: number, config: ICanvasFloatDom, domLayout: IDOMRangeLayout, propId?: string) {const target = getSheetCommandTarget(this._univerInstanceService, {- unitId: layer.unitId,- subUnitId: layer.subUnitId,+ unitId: config.unitId,+ subUnitId: config.subUnitId,});if (!target) {throw new Error('cannot find current target!');@@ -961,7 +964,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {if (!skeletonParam) return;// const viewMain = renderObject.scene.getMainViewport();- const { componentKey, data, allowTransform = true } = layer;+ const { componentKey, data, allowTransform = true } = config;const id = propId ?? generateRandomId();// const drawingId = id;@@ -981,20 +984,34 @@ export class SheetCanvasFloatDomManagerService extends Disposable {}// this._ensureMap for what?const map = this._ensureMap(unitId, subUnitId);- map.set(id, layer);+ map.set(id, config);const rangeWidth = rangePosition.endX - rangePosition.startX;const rangeHeight = rangePosition.endY - rangePosition.startY;const domWidth = domLayout.width ?? rangeWidth;const domHeight = domLayout.height ?? rangeHeight;- const domLeft = headerPosition.startX + calculateOffset(domLayout.x, rangeWidth);- const domTop = headerPosition.startY + calculateOffset(domLayout.y, rangeHeight);+ let domLeft = 0;+ let domTop = 0;+ if (domLayout.horizonOffsetAlign === 'right') {+ const offsetX = calculateOffset(domLayout.marginX, rangeWidth);+ domLeft = headerPosition.endX - offsetX - domWidth;+ } else {+ // default align left+ domLeft = headerPosition.startX + calculateOffset(domLayout.marginX, rangeWidth);+ }++ if (domLayout.verticalOffsetAlign === 'bottom') {+ const offsetY = calculateOffset(domLayout.marginY, rangeHeight);+ domTop = headerPosition.endY - offsetY - domHeight;+ } else {+ domTop = headerPosition.startY + calculateOffset(domLayout.marginY, rangeHeight);+ }const sheetDrawingParam: ISheetFloatDom = {unitId,subUnitId,drawingId: id,- drawingType: layer.type || DrawingTypeEnum.DRAWING_DOM,+ drawingType: config.type || DrawingTypeEnum.DRAWING_DOM,componentKey,sheetTransform,transform: {@@ -1007,14 +1024,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {allowTransform,};- // mutation- // ---> this._drawingManagerService.add$.subscribe- // this._commandService.executeCommand(InsertSheetDrawingCommand.id, {- // unitId,- // drawings: [sheetDrawingParam],- // } as IInsertDrawingCommandParams);- // this._add$.next({ unitId, subUnitId, id }); // seems no use-{const { unitId, subUnitId, drawingId } = sheetDrawingParam;const target = getSheetCommandTarget(this._univerInstanceService, { unitId, subUnitId });@@ -1107,26 +1116,34 @@ export class SheetCanvasFloatDomManagerService extends Disposable {const position$ = new BehaviorSubject<IFloatDomLayout>(initedPosition);floatDomInfo.position$ = position$;- this._canvasFloatDomService.addFloatDom({+ let floatDomCfg: IFloatDom = {position$,id: drawingId,componentKey: floatDomParam.componentKey,- onPointerDown: (evt) => {- canvas.dispatchEvent(new PointerEvent(evt.type, evt));- },- onPointerMove: (evt: PointerEvent | MouseEvent) => {- canvas.dispatchEvent(new PointerEvent(evt.type, evt));- },- onPointerUp: (evt: PointerEvent | MouseEvent) => {- canvas.dispatchEvent(new PointerEvent(evt.type, evt));- },+ onPointerDown: () => { },+ onPointerMove: () => { },+ onPointerUp: () => { },onWheel: (evt: WheelEvent) => {canvas.dispatchEvent(new WheelEvent(evt.type, evt));},- // props: map.get(drawingId)?.props ?? this._getFloatDomProps(drawingId),+ props: map.get(drawingId)?.props ?? this._getFloatDomProps(drawingId),data,unitId,- });+ };+ if (config.eventPassThrough) {+ floatDomCfg = { ...floatDomCfg,+ onPointerDown: (evt) => {+ canvas.dispatchEvent(new PointerEvent(evt.type, evt));+ },+ onPointerMove: (evt: PointerEvent | MouseEvent) => {+ canvas.dispatchEvent(new PointerEvent(evt.type, evt));+ },+ onPointerUp: (evt: PointerEvent | MouseEvent) => {+ canvas.dispatchEvent(new PointerEvent(evt.type, evt));+ },+ };+ }+ this._canvasFloatDomService.addFloatDom(floatDomCfg);const listener = domRect.onTransformChange$.subscribeEvent(() => {const newPosition = calcPosition(domRect, renderObject.renderUnit, skeleton.skeleton, target.worksheet, floatDomInfo);diff --git a/packages/sheets/src/facade/f-worksheet.ts b/packages/sheets/src/facade/f-worksheet.tsindex 1b5a21d26c..da1f51dca7 100644--- a/packages/sheets/src/facade/f-worksheet.ts+++ b/packages/sheets/src/facade/f-worksheet.ts@@ -15,12 +15,12 @@*/import type { CustomData, ICellData, IColumnData, IColumnRange, IDisposable, IFreeze, IObjectArrayPrimitiveType, IRange, IRowData, IRowRange, IStyleData, Nullable, Workbook, Worksheet } from '@univerjs/core';-import type { ISetColDataCommandParams, ISetGridlinesColorCommandParams, ISetRangeValuesMutationParams, ISetRowDataCommandParams, IToggleGridlinesCommandParams } from '@univerjs/sheets';+import type { ISetColDataCommandParams, ISetGridlinesColorCommandParams, ISetRangeValuesMutationParams, ISetRowDataCommandParams, ISetTextWrapCommandParams, IToggleGridlinesCommandParams } from '@univerjs/sheets';import type { FDefinedName } from './f-defined-name';import type { FWorkbook } from './f-workbook';-import { BooleanNumber, Direction, FBaseInitialable, ICommandService, ILogService, Inject, Injector, ObjectMatrix, RANGE_TYPE } from '@univerjs/core';+import { BooleanNumber, Direction, FBaseInitialable, ICommandService, ILogService, Inject, Injector, ObjectMatrix, RANGE_TYPE, WrapStrategy } from '@univerjs/core';import { deserializeRangeWithSheet } from '@univerjs/engine-formula';-import { CancelFrozenCommand, ClearSelectionAllCommand, ClearSelectionContentCommand, ClearSelectionFormatCommand, copyRangeStyles, InsertColByRangeCommand, InsertRowByRangeCommand, MoveColsCommand, MoveRowsCommand, RemoveColByRangeCommand, RemoveRowByRangeCommand, SetColDataCommand, SetColHiddenCommand, SetColWidthCommand, SetFrozenCommand, SetGridlinesColorCommand, SetRangeValuesMutation, SetRowDataCommand, SetRowHeightCommand, SetRowHiddenCommand, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetTabColorCommand, SetWorksheetDefaultStyleMutation, SetWorksheetHideCommand, SetWorksheetNameCommand, SetWorksheetRowIsAutoHeightCommand, SetWorksheetRowIsAutoHeightMutation, SetWorksheetShowCommand, SheetsSelectionsService, ToggleGridlinesCommand } from '@univerjs/sheets';+import { CancelFrozenCommand, ClearSelectionAllCommand, ClearSelectionContentCommand, ClearSelectionFormatCommand, copyRangeStyles, InsertColByRangeCommand, InsertRowByRangeCommand, MoveColsCommand, MoveRowsCommand, RemoveColByRangeCommand, RemoveRowByRangeCommand, SetColDataCommand, SetColHiddenCommand, SetColWidthCommand, SetFrozenCommand, SetGridlinesColorCommand, SetRangeValuesMutation, SetRowDataCommand, SetRowHeightCommand, SetRowHiddenCommand, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetTabColorCommand, SetTextWrapCommand, SetWorksheetDefaultStyleMutation, SetWorksheetHideCommand, SetWorksheetNameCommand, SetWorksheetRowIsAutoHeightCommand, SetWorksheetRowIsAutoHeightMutation, SetWorksheetShowCommand, SheetsSelectionsService, ToggleGridlinesCommand } from '@univerjs/sheets';import { FDefinedNameBuilder } from './f-defined-name';import { FRange } from './f-range';import { FSelection } from './f-selection';@@ -765,7 +765,7 @@ export class FWorksheet extends FBaseInitialable {}/**- *+ * Make certain row wrap and auto height.* @param rowPosition* @param auto* @returns {FWorksheet} this@@ -785,6 +785,12 @@ export class FWorksheet extends FBaseInitialable {startColumn: 0,endColumn: this._worksheet.getColumnCount() - 1,}];+ this._commandService.syncExecuteCommand(SetTextWrapCommand.id, {+ unitId: this._workbook.getUnitId(),+ subUnitId: this._worksheet.getSheetId(),+ range: ranges[0],+ value: WrapStrategy.WRAP,+ } as ISetTextWrapCommandParams);this._commandService.syncExecuteCommand(SetWorksheetRowIsAutoHeightMutation.id,{unitId,diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.tsindex 3954633119..57c96c386e 100644--- a/packages/ui/src/index.ts+++ b/packages/ui/src/index.ts@@ -64,7 +64,7 @@ export {} from './services/contextmenu/contextmenu.service';export { DesktopDialogService } from './services/dialog/desktop-dialog.service';export { IDialogService } from './services/dialog/dialog.service';-export { CanvasFloatDomService, type IFloatDomLayout } from './services/dom/canvas-dom-layer.service';+export { CanvasFloatDomService, type IFloatDom, type IFloatDomLayout } from './services/dom/canvas-dom-layer.service';export { DesktopGlobalZoneService } from './services/global-zone/desktop-global-zone.service';export { IGlobalZoneService } from './services/global-zone/global-zone.service';export { DesktopLayoutService, ILayoutService } from './services/layout/layout.service';