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
feat: auto col (#3798)
lumixc66cff0e815d
diff --git a/.vscode/settings.json b/.vscode/settings.jsonindex 5e2a73314a..c5c9418afe 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -33,6 +33,7 @@"Duplicatable","Dushusir","endindex",+ "endregion","esbuild","Ethi","evented",diff --git a/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts b/e2e/visual-comparison/sheets/sheets-gridlines.spec.tsindex 19ce7edcaa..d59146f6b9 100644--- a/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts+++ b/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts@@ -39,9 +39,10 @@ test('sheets no gridlines', async () => {const screenshot = await page.screenshot({mask: [page.locator('.univer-headerbar'),+ page.locator('.univer-workbench-container-header'),+ page.locator('.univer-formula-box'),],fullPage: true,});expect(screenshot).toMatchSnapshot(filename, { maxDiffPixels: 5 });});-diff --git a/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.pngindex 913df1d462..c538e8b2c6 100644Binary files a/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png differdiff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.tsindex 7455ddaf85..8cb8590434 100644--- a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts+++ b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts@@ -32,12 +32,13 @@ test('diff default sheet toolbar', async () => {await page.goto('http://localhost:3000/sheets/');await page.waitForTimeout(2000);await page.evaluate(() => window.E2EControllerAPI.loadDefaultSheet());- await page.waitForTimeout(5000);+ await page.waitForTimeout(2000);const filename = generateSnapshotName('default-sheet-fullpage');const screenshot = await page.screenshot({mask: [page.locator('.univer-headerbar'),+ page.locator('.univer-defined-name'),],fullPage: true,});diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-ci-chromium-linux.pngindex 7c578ec922..6917685851 100644Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-ci-chromium-linux.png differdiff --git a/packages/core/src/sheets/column-manager.ts b/packages/core/src/sheets/column-manager.tsindex e8e3d4705f..731949a0da 100644--- a/packages/core/src/sheets/column-manager.ts+++ b/packages/core/src/sheets/column-manager.ts@@ -195,7 +195,6 @@ export class ColumnManager {/*** get given column data* @param columnPos column index- * @returns*/getColumn(columnPos: number): Nullable<Partial<IColumnData>> {const column = this._columnData[columnPos];diff --git a/packages/core/src/sheets/sheet-snapshot-utils.ts b/packages/core/src/sheets/sheet-snapshot-utils.tsindex 73c5ae6ee7..580ffd6965 100644--- a/packages/core/src/sheets/sheet-snapshot-utils.ts+++ b/packages/core/src/sheets/sheet-snapshot-utils.ts@@ -14,8 +14,8 @@* limitations under the License.*/-import { BooleanNumber } from '../types/enum/text-style';import type { IWorksheetData } from './typedef';+import { BooleanNumber } from '../types/enum/text-style';// TODO@wzhudev: default value should not be exposed, but the keys.diff --git a/packages/core/src/sheets/typedef.ts b/packages/core/src/sheets/typedef.tsindex b1fed277b0..cf07f503bc 100644--- a/packages/core/src/sheets/typedef.ts+++ b/packages/core/src/sheets/typedef.ts@@ -196,6 +196,11 @@ export interface IColumnData {s?: Nullable<IStyleData | string>;}+export interface IColAutoWidthInfo {+ col: number;+ width?: number;+}+/*** Cell value type*/@@ -259,6 +264,7 @@ export interface ICellDataForSheetInterceptor extends ICellData {markers?: ICellMarks;customRender?: Nullable<ICellCustomRender[]>;interceptorAutoHeight?: () => number | undefined;+ interceptorAutoWidth?: () => number | undefined;/*** can cell be covered when sibling is overflow*/diff --git a/packages/data-validation/src/validators/base-widget.ts b/packages/data-validation/src/validators/base-widget.tsindex 2505002a6e..be11c410c6 100644--- a/packages/data-validation/src/validators/base-widget.ts+++ b/packages/data-validation/src/validators/base-widget.ts@@ -18,4 +18,5 @@ import type { ICellCustomRender, ICellRenderContext } from '@univerjs/core';export interface IBaseDataValidationWidget extends ICellCustomRender {calcCellAutoHeight(info: ICellRenderContext): number | undefined;+ calcCellAutoWidth(info: ICellRenderContext): number | undefined;}diff --git a/packages/docs-ui/src/controllers/render-controllers/doc.render-controller.ts b/packages/docs-ui/src/controllers/render-controllers/doc.render-controller.tsindex 25474f16f3..6a8e661979 100644--- a/packages/docs-ui/src/controllers/render-controllers/doc.render-controller.ts+++ b/packages/docs-ui/src/controllers/render-controllers/doc.render-controller.ts@@ -76,8 +76,6 @@ export class DocRenderController extends RxDisposable implements IRenderModule {top: 0,bottom: 0,right: 0,- explicitViewportWidthSet: false,- explicitViewportHeightSet: false,isWheelPreventDefaultX: true,});diff --git a/packages/engine-render/src/basics/const.ts b/packages/engine-render/src/basics/const.tsindex e674fafcbd..b3afa219a9 100644--- a/packages/engine-render/src/basics/const.ts+++ b/packages/engine-render/src/basics/const.ts@@ -133,6 +133,7 @@ export enum RENDER_CLASS_TYPE {}export const MAXIMUM_ROW_HEIGHT = 2000;+export const MAXIMUM_COL_WIDTH = 2000;export const FIX_ONE_PIXEL_BLUR_OFFSET = 0.5;diff --git a/packages/engine-render/src/components/sheets/column-header.ts b/packages/engine-render/src/components/sheets/column-header.tsindex 6998f900e9..1a12953020 100644--- a/packages/engine-render/src/components/sheets/column-header.ts+++ b/packages/engine-render/src/components/sheets/column-header.ts@@ -19,10 +19,10 @@import type { Nullable } from '@univerjs/core';import type { IViewportInfo, Vector2 } from '../../basics/vector2';import type { UniverRenderingContext } from '../../context';-import { SheetColumnHeaderExtensionRegistry } from '../extension';import type { ColumnHeaderLayout, IColumnsHeaderCfgParam } from './extensions/column-header-layout';-import { SpreadsheetHeader } from './sheet-component';import type { SpreadsheetSkeleton } from './sheet-skeleton';+import { SheetColumnHeaderExtensionRegistry } from '../extension';+import { SpreadsheetHeader } from './sheet-component';export class SpreadsheetColumnHeader extends SpreadsheetHeader {override getDocuments(): void {@@ -54,7 +54,7 @@ export class SpreadsheetColumnHeader extends SpreadsheetHeader {if (!spreadsheetSkeleton) return;const parentScale = this.getParentScale();- spreadsheetSkeleton.calculateSegment(bounds);+ spreadsheetSkeleton.updateVisibleRange(bounds);const segment = spreadsheetSkeleton.rowColumnSegment;if (!segment) return;diff --git a/packages/engine-render/src/components/sheets/constants.ts b/packages/engine-render/src/components/sheets/constants.tsindex bb761c77f7..3491a45a67 100644--- a/packages/engine-render/src/components/sheets/constants.ts+++ b/packages/engine-render/src/components/sheets/constants.ts@@ -14,9 +14,15 @@* limitations under the License.*/+import { SHEET_VIEWPORT_KEY } from './interfaces';+export const BORDER_Z_INDEX = 50;export const FONT_EXTENSION_Z_INDEX = 45;export const BG_Z_INDEX = 21;export const PRINTING_BG_Z_INDEX = 21;export const EXPAND_SIZE_FOR_RENDER_OVERFLOW = 20;++export const sheetContentViewportKeys = [SHEET_VIEWPORT_KEY.VIEW_MAIN, SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP, SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP, SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT];++export const sheetHeaderViewportKeys = [SHEET_VIEWPORT_KEY.VIEW_ROW_TOP, SHEET_VIEWPORT_KEY.VIEW_ROW_BOTTOM, SHEET_VIEWPORT_KEY.VIEW_COLUMN_LEFT, SHEET_VIEWPORT_KEY.VIEW_COLUMN_RIGHT, SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP];diff --git a/packages/engine-render/src/components/sheets/extensions/font.ts b/packages/engine-render/src/components/sheets/extensions/font.tsindex 411fd67d50..629726f53c 100644--- a/packages/engine-render/src/components/sheets/extensions/font.ts+++ b/packages/engine-render/src/components/sheets/extensions/font.ts@@ -154,8 +154,12 @@ export class Font extends SheetExtension {const { ctx, viewRanges, diffRanges, spreadsheetSkeleton, cellInfo } = renderFontCtx;//#region merged cell- let { startY, endY, startX, endX } = cellInfo;+ const { startY, endY, startX, endX } = cellInfo;const { isMerged, isMergedMainCell, mergeInfo } = cellInfo;+ renderFontCtx.startX = startX;+ renderFontCtx.startY = startY;+ renderFontCtx.endX = endX;+ renderFontCtx.endY = endY;// merged, but not primary cell, then skip. DO NOT RENDER AGAIN, or that would cause font blurry.if (isMerged && !isMergedMainCell) {@@ -164,11 +168,12 @@ export class Font extends SheetExtension {// merged and primary cellif (isMergedMainCell) {- startY = mergeInfo.startY;- endY = mergeInfo.endY;- startX = mergeInfo.startX;- endX = mergeInfo.endX;+ renderFontCtx.startX = mergeInfo.startX;+ renderFontCtx.startY = mergeInfo.startY;+ renderFontCtx.endX = mergeInfo.endX;+ renderFontCtx.endY = mergeInfo.endY;}+//#endregionconst fontsConfig = fontMatrix.getValue(row, col);@@ -205,14 +210,10 @@ export class Font extends SheetExtension {//#region text overflowrenderFontCtx.overflowRectangle = overflowRange;renderFontCtx.cellData = cellData;- renderFontCtx.startX = startX;- renderFontCtx.startY = startY;- renderFontCtx.endX = endX;- renderFontCtx.endY = endY;this._setFontRenderBounds(renderFontCtx, row, col, fontMatrix);//#endregion- ctx.translate(startX + FIX_ONE_PIXEL_BLUR_OFFSET, startY + FIX_ONE_PIXEL_BLUR_OFFSET);+ ctx.translate(renderFontCtx.startX + FIX_ONE_PIXEL_BLUR_OFFSET, renderFontCtx.startY + FIX_ONE_PIXEL_BLUR_OFFSET);this._renderDocuments(ctx, fontsConfig, renderFontCtx.startX, renderFontCtx.startY, renderFontCtx.endX, renderFontCtx.endY, row, col, spreadsheetSkeleton.overflowCache);ctx.closePath();@@ -309,7 +310,7 @@ export class Font extends SheetExtension {}} else {ctx.rectByPrecision(startX + 1 / scale, startY + 1 / scale, cellWidth - 2 / scale, cellHeight - 2 / scale);- // for normal cell, forbid text overflow cellarea+ // for normal cell, forbid text overflow cell areactx.clip();}renderFontContext.startX = startX;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 54d90d7720..bcc594a3c6 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@@ -16,13 +16,13 @@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 { 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';import { SheetExtension } from './sheet-extension';-import type { UniverRenderingContext } from '../../../context';-import type { IARowCfg, IARowCfgObj, IColumnStyleCfg, IRowStyleCfg } from '../interfaces';-import type { SpreadsheetSkeleton } from '../sheet-skeleton';const UNIQUE_KEY = 'DefaultRowHeaderLayoutExtension';diff --git a/packages/engine-render/src/components/sheets/row-header.ts b/packages/engine-render/src/components/sheets/row-header.tsindex ac485c909a..eab3eef615 100644--- a/packages/engine-render/src/components/sheets/row-header.ts+++ b/packages/engine-render/src/components/sheets/row-header.ts@@ -15,12 +15,12 @@*/import type { Nullable } from '@univerjs/core';-import { SheetRowHeaderExtensionRegistry } from '../extension';-import { SpreadsheetHeader } from './sheet-component';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 { SheetRowHeaderExtensionRegistry } from '../extension';+import { SpreadsheetHeader } from './sheet-component';export class SpreadsheetRowHeader extends SpreadsheetHeader {override getDocuments() {@@ -58,7 +58,7 @@ export class SpreadsheetRowHeader extends SpreadsheetHeader {const parentScale = this.getParentScale();- spreadsheetSkeleton.calculateSegment(bounds);+ spreadsheetSkeleton.updateVisibleRange(bounds);const segment = spreadsheetSkeleton.rowColumnSegment;diff --git a/packages/engine-render/src/components/sheets/sheet-skeleton.ts b/packages/engine-render/src/components/sheets/sheet-skeleton.tsindex 71c2c190c6..cb12bffcef 100644--- a/packages/engine-render/src/components/sheets/sheet-skeleton.ts+++ b/packages/engine-render/src/components/sheets/sheet-skeleton.ts@@ -19,6 +19,7 @@ import type {IBorderStyleData,ICellData,ICellDataForSheetInterceptor,+ IColAutoWidthInfo,IColumnData,IColumnRange,IDocumentData,@@ -46,7 +47,7 @@ import type {import type { IDocumentSkeletonColumn } from '../../basics/i-document-skeleton-cached';import type { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';-import type { BorderCache, IFontCacheItem, IStylesCache } from './interfaces';+import { type BorderCache, type IFontCacheItem, type IStylesCache, SHEET_VIEWPORT_KEY } from './interfaces';/* eslint-disable max-lines-per-function *//* eslint-disable no-param-reassign */import {@@ -77,7 +78,7 @@ import {WrapStrategy,} from '@univerjs/core';import { distinctUntilChanged, startWith } from 'rxjs';-import { BORDER_TYPE as BORDER_LTRB, COLOR_BLACK_RGB, MAXIMUM_ROW_HEIGHT } from '../../basics/const';+import { BORDER_TYPE as BORDER_LTRB, COLOR_BLACK_RGB, MAXIMUM_COL_WIDTH, MAXIMUM_ROW_HEIGHT } from '../../basics/const';import { getRotateOffsetAndFarthestHypotenuse } from '../../basics/draw';import { convertTextRotation, VERTICAL_ROTATE_ANGLE } from '../../basics/text-rotation';import {@@ -92,6 +93,7 @@ import { DocumentSkeleton } from '../docs/layout/doc-skeleton';import { columnIterator } from '../docs/layout/tools';import { DocumentViewModel } from '../docs/view-model/document-view-model';import { Skeleton } from '../skeleton';+import { EXPAND_SIZE_FOR_RENDER_OVERFLOW } from './constants';function addLinkToDocumentModel(documentModel: DocumentDataModel, linkUrl: string, linkId: string): void {const body = documentModel.getBody()!;@@ -252,7 +254,8 @@ export class SpreadsheetSkeleton extends Skeleton {private _columnHeaderHeight = 0;/**- * Range of visible area(range in viewBounds)+ * Range viewBounds. only update by viewBounds.+ * It would change multiple times in one frame if there is multiple viewport (after freeze row&col)*/private _visibleRange: IRowColumnRange = {startRow: -1,@@ -261,6 +264,8 @@ export class SpreadsheetSkeleton extends Skeleton {endColumn: -1,};+ private _visibleRangeMap: Map<SHEET_VIEWPORT_KEY, IRowColumnRange> = new Map();+// private _dataMergeCache: IRange[] = [];private _overflowCache: ObjectMatrix<IRange> = new ObjectMatrix();private _stylesCache: IStylesCache = {@@ -340,8 +345,8 @@ export class SpreadsheetSkeleton extends Skeleton {return this._visibleRange;}- get visibleArea(): IRowColumnRange {- return this._visibleRange;+ visibleRangeByViewportKey(viewportKey: SHEET_VIEWPORT_KEY): Nullable<IRowColumnRange> {+ return this._visibleRangeMap.get(viewportKey);}// get dataMergeCache(): IRange[] {@@ -461,7 +466,7 @@ export class SpreadsheetSkeleton extends Skeleton {* @param bounds* @returns boolean*/- calculateSegment(bounds?: IViewportInfo): boolean {+ updateVisibleRange(bounds?: IViewportInfo): boolean {if (!this._worksheetData) {return false;}@@ -473,24 +478,57 @@ export class SpreadsheetSkeleton extends Skeleton {}if (bounds != null) {- this._visibleRange = this.getRowColumnSegment(bounds);+ const range = this.getRowColumnSegment(bounds);+ this._visibleRange = range;+ this._visibleRangeMap.set(bounds.viewportKey as SHEET_VIEWPORT_KEY, range);}return true;}- calculateWithoutClearingCache(bounds?: IViewportInfo): Nullable<SpreadsheetSkeleton> {- if (!this.calculateSegment(bounds)) {+ /**+ * Set border background and font to this._stylesCache by visible range, which derives from bounds)+ * @param bounds viewBounds+ */+ setStylesCache(bounds?: IViewportInfo): Nullable<SpreadsheetSkeleton> {+ if (!this.updateVisibleRange(bounds)) {return;}- // const { mergeData } = this._worksheetData;+ const rowColumnSegment = this._visibleRange;+ const columnWidthAccumulation = this.columnWidthAccumulation;+ const { startRow: visibleStartRow, endRow: visibleEndRow, startColumn: visibleStartColumn, endColumn: visibleEndColumn } = rowColumnSegment;- // // this._dataMergeCache = mergeData && this._getMergeCells(mergeData, this._rowColumnSegment);- // const rowColumnSegment = this._rowColumnSegment;- // const { startRow, endRow, startColumn, endColumn } = rowColumnSegment;+ if (visibleEndColumn === -1 || visibleEndRow === -1) return;++ const mergeRanges = this.getCurrentRowColumnSegmentMergeData(this._visibleRange);+ for (const mergeRange of mergeRanges) {+ this._setStylesCacheForOneCell(mergeRange.startRow, mergeRange.startColumn, {+ mergeRange,+ });+ }++ // expandStartCol & expandEndCol is slightly expand curr col range. This is for calculating text for overflow situations.+ const expandStartCol = Math.max(0, visibleStartColumn - EXPAND_SIZE_FOR_RENDER_OVERFLOW);+ const expandEndCol = Math.min(columnWidthAccumulation.length - 1, visibleEndColumn + EXPAND_SIZE_FOR_RENDER_OVERFLOW);+ for (let r = visibleStartRow; r <= visibleEndRow; r++) {+ if (this.worksheet.getRowVisible(r) === false) continue;++ for (let c = visibleStartColumn; c <= visibleEndColumn; c++) {+ this._setStylesCacheForOneCell(r, c, { cacheItem: { bg: true, border: true } });+ }- this._calculateStylesCache();+ // Calculate the text length for overflow situations, focusing on the leftmost column within the visible range.+ for (let c = expandStartCol; c < visibleEndColumn; c++) {+ this._setStylesCacheForOneCell(r, c, { cacheItem: { bg: false, border: false } });+ }+ if (visibleEndColumn === 0) continue;++ // Calculate the text length for overflow situations, focusing on the rightmost column within the visible range.+ for (let c = visibleEndColumn + 1; c < expandEndCol; c++) {+ this._setStylesCacheForOneCell(r, c, { cacheItem: { bg: false, border: false } });+ }+ }return this;}@@ -498,11 +536,34 @@ export class SpreadsheetSkeleton extends Skeleton {calculate(bounds?: IViewportInfo): Nullable<SpreadsheetSkeleton> {this._resetCache();- this.calculateWithoutClearingCache(bounds);+ this.setStylesCache(bounds);return this;}+ private _hasUnMergedCellInRow(rowIndex: number, startColumn: number, endColumn: number): boolean {+ const mergeData = this.worksheet.getMergeData();+ if (!mergeData) {+ return false;+ }++ for (let i = startColumn; i <= endColumn; i++) {+ const { isMerged, isMergedMainCell } = this._getCellMergeInfo(rowIndex, i);++ if (!isMerged && !isMergedMainCell) {+ return true;+ }+ }++ return false;+ }++ //#region auto height+ /**+ * Calc all auto height by getDocsSkeletonPageSize in ranges+ * @param ranges+ * @returns {IRowAutoHeightInfo[]} result+ */calculateAutoHeightInRange(ranges: Nullable<IRange[]>): IRowAutoHeightInfo[] {if (!Tools.isArray(ranges)) {return [];@@ -543,33 +604,11 @@ export class SpreadsheetSkeleton extends Skeleton {return results;}- private _hasUnMergedCellInRow(rowIndex: number, startColumn: number, endColumn: number): boolean {- const mergeData = this.worksheet.getMergeData();- if (!mergeData) {- return false;- }-- for (let i = startColumn; i <= endColumn; i++) {- const { isMerged, isMergedMainCell } = this._getCellMergeInfo(rowIndex, i);-- if (!isMerged && !isMergedMainCell) {- return true;- }- }-- return false;- }-- // TODO: auto heightprivate _calculateRowAutoHeight(rowNum: number): number {+ const worksheet = this.worksheet;const { columnCount, columnData, defaultRowHeight, defaultColumnWidth } = this._worksheetData;let height = defaultRowHeight;- const worksheet = this.worksheet;- if (!worksheet) {- return height;- }-for (let i = 0; i < columnCount; i++) {// When calculating the automatic height of a row, if a cell is in a merged cell,// skip the cell directly, which currently follows the logic of Excel@@ -636,6 +675,195 @@ export class SpreadsheetSkeleton extends Skeleton {return Math.min(height, MAXIMUM_ROW_HEIGHT);}+ //#endregion++ //#region calculate auto width+ calculateAutoWidthInRange(ranges: Nullable<IRange[]>): IColAutoWidthInfo[] {+ if (!Tools.isArray(ranges)) {+ return [];+ }++ const results: IColAutoWidthInfo[] = [];+ const calculatedCols = new Set<number>();++ for (const range of ranges) {+ const { startColumn, endColumn } = range;++ for (let colIndex = startColumn; colIndex <= endColumn; colIndex++) {+ if (!this.worksheet.getColVisible(colIndex)) continue;+ // If the row has already been calculated, it does not need to be recalculated+ if (calculatedCols.has(colIndex)) continue;++ const autoWidth = this._calculateColWidth(colIndex);+ calculatedCols.add(colIndex);+ results.push({+ col: colIndex,+ width: autoWidth,+ });+ }+ }++ return results;+ }++ /**+ * Iterate rows in visible area(and rows around it) and return column width of the specified column(by column index)+ *+ * @param colIndex+ * @returns {number} width+ */+ private _calculateColWidth(colIndex: number): number {+ const MEASURE_EXTENT = 10000;+ const MEASURE_EXTENT_FOR_PARAGRAPH = MEASURE_EXTENT / 10;+ const worksheet = this.worksheet;++ // row has default height, but col does not, col can be very narrow near zero+ let colWidth = 0;++ // for cell with only v, auto size for content width in visible range and ± 10000 rows around.+ // for cell with p, auto width for content in visible range and ± 1000 rows, 1/10 of situation above.+ // first row and last row should be considered.+ // skip hidden row+ // also handle multiple viewport situation (freeze row & freeze row&col)+ // if there are no content in this column, return current column width.+ const visibleRangeViewMain = this.visibleRangeByViewportKey(SHEET_VIEWPORT_KEY.VIEW_MAIN);+ if (!visibleRangeViewMain) return colWidth;++ const { startRow: startRowOfViewMain, endRow: endRowOfViewMain } = visibleRangeViewMain;+ const rowCount = this.worksheet.getRowCount();+ const checkStart = Math.max(0, startRowOfViewMain - MEASURE_EXTENT); // 0+ const checkEnd = Math.min(rowCount, endRowOfViewMain + MEASURE_EXTENT); // rowCount++ // check width of first row and last row,+ const otherRowIndex: Set<number> = new Set();+ otherRowIndex.add(0);+ otherRowIndex.add(rowCount - 1);++ // add rows in viewMainTop(viewMainTopLeft are included)+ const visibleRangeViewMainTop = this.visibleRangeByViewportKey(SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP);+ if (visibleRangeViewMainTop) {+ const { startRow: startRowOfViewMainTop, endRow: endRowOfViewMainTop } = visibleRangeViewMainTop;+ for (let i = startRowOfViewMainTop; i <= endRowOfViewMainTop; i++) {+ otherRowIndex.add(i);+ }+ }++ // create a array, which contains all rows need to check+ // array [start ... end] + additional arr+ const createRowSequence = (start: number, end: number, additionalArr: number[] | Set<number>) => {+ const range = Array.from(+ { length: end - start + 1 },+ (_, i) => i + start+ );+ return [...range, ...additionalArr];+ };++ const rowIdxArr = createRowSequence(checkStart, checkEnd, otherRowIndex);++ const preColIndex = Math.max(0, colIndex - 1);+ const currColWidth = this._columnWidthAccumulation[colIndex] - this._columnWidthAccumulation[preColIndex];+ for (let i = 0; i < rowIdxArr.length; i++) {+ const row = rowIdxArr[i];++ const { isMerged, isMergedMainCell } = this._getCellMergeInfo(colIndex, row);+ if (isMerged && !isMergedMainCell) continue;++ if (!this.worksheet.getRowVisible(row)) continue;++ const cell = worksheet.getCell(row, colIndex);+ if (!cell) continue;++ // for cell with paragraph, only check ±1000 rows around visible area, continue the loop if out of range+ if (cell.p) {+ if (row + MEASURE_EXTENT_FOR_PARAGRAPH <= startRowOfViewMain || row - MEASURE_EXTENT_FOR_PARAGRAPH >= endRowOfViewMain) {+ continue;+ }+ }++ let measuredWidth = this._getMeasuredWidthByCell(cell, currColWidth);++ if (cell.fontRenderExtension) {+ measuredWidth += ((cell.fontRenderExtension?.leftOffset || 0) + (cell.fontRenderExtension?.rightOffset || 0));+ }++ colWidth = Math.max(colWidth, measuredWidth);++ // early return, if maxColWidth is larger than MAXIMUM_COL_WIDTH+ if (colWidth >= MAXIMUM_COL_WIDTH) {+ return MAXIMUM_COL_WIDTH;+ }+ }++ // if there are no content in this column( measure result is 0), return current column width.+ if (colWidth === 0) {+ return currColWidth;+ }+ return colWidth;+ }++ /**+ * For _calculateColMaxWidth+ * @param cell+ * @returns {number} width+ */+ _getMeasuredWidthByCell(cell: ICellDataForSheetInterceptor, currColWidth: number) {+ let measuredWidth = 0;++ // isSkip means the text in this cell would not rendering.+ if (cell.fontRenderExtension?.isSkip && cell?.interceptorAutoWidth) {+ const cellWidth = cell.interceptorAutoWidth?.();+ if (cellWidth) {+ return cellWidth;+ }+ }++ const modelObject = this._getCellDocumentModel(cell);+ if (modelObject == null) {+ return measuredWidth;+ }++ const { documentModel, textRotation } = modelObject;+ if (documentModel == null) {+ return measuredWidth;+ }++ const documentViewModel = new DocumentViewModel(documentModel);+ const { vertexAngle: angle } = convertTextRotation(textRotation);+ const cellStyle = this._styles.getStyleByCell(cell);++ if (cellStyle?.tb === WrapStrategy.WRAP) {+ documentModel.updateDocumentDataPageSize(currColWidth, Infinity);+ } else {+ documentModel.updateDocumentDataPageSize(Infinity, Infinity);+ }++ const documentSkeleton = DocumentSkeleton.create(documentViewModel, this._localService);++ documentSkeleton.calculate();+ // key+ measuredWidth = (getDocsSkeletonPageSize(documentSkeleton, angle) ?? { width: 0 }).width;+ // When calculating the auto Height, need take the margin information into account,+ // because there is margin information when rendering+ if (documentSkeleton) {+ const skeletonData = documentSkeleton.getSkeletonData()!;+ const {+ marginTop: t,+ marginBottom: b,+ marginLeft: l,+ marginRight: r,+ } = skeletonData.pages[skeletonData.pages.length - 1];++ const absAngleInRad = Math.abs(degToRad(angle));++ measuredWidth +=+ t * Math.sin(absAngleInRad) ++ r * Math.cos(absAngleInRad) ++ b * Math.sin(absAngleInRad) ++ l * Math.cos(absAngleInRad);+ }+ return measuredWidth;+ };+ //#endregion/*** Calculate data for row col & cell position, then update position value to this._rowHeaderWidth & this._rowHeightAccumulation & this._columnHeaderHeight & this._columnWidthAccumulation.@@ -1545,6 +1773,12 @@ export class SpreadsheetSkeleton extends Skeleton {};}+ /**+ * Calc columnWidthAccumulation by columnData+ * @param colCount+ * @param columnData+ * @param defaultColumnWidth+ */private _generateColumnMatrixCache(colCount: number,columnData: IObjectArrayPrimitiveType<Partial<IColumnData>>,@@ -1564,7 +1798,6 @@ export class SpreadsheetSkeleton extends Skeleton {if (!columnDataItem) {continue;}-if (columnDataItem.w != null) {columnWidth = columnDataItem.w;}@@ -1575,7 +1808,6 @@ export class SpreadsheetSkeleton extends Skeleton {}columnTotalWidth += columnWidth;-columnWidthAccumulation.push(columnTotalWidth); // 列的临时长度分布}@@ -1695,41 +1927,6 @@ export class SpreadsheetSkeleton extends Skeleton {return this.worksheet.getSpanModel().getMergedCellRangeForSkeleton(range.startRow, range.startColumn, range.endRow, range.endColumn);}- private _calculateStylesCache(): void {- const rowColumnSegment = this._visibleRange;- const columnWidthAccumulation = this.columnWidthAccumulation;- const { startRow, endRow, startColumn, endColumn } = rowColumnSegment;-- if (endColumn === -1 || endRow === -1) return;-- const mergeRanges = this.getCurrentRowColumnSegmentMergeData(this._visibleRange);- for (const mergeRange of mergeRanges) {- this._setStylesCache(mergeRange.startRow, mergeRange.startColumn, {- mergeRange,- });- }-- // const mergeRange = mergeRanges.length ? mergeRanges[0] : undefined;- for (let r = startRow; r <= endRow; r++) {- if (this.worksheet.getRowVisible(r) === false) continue;-- for (let c = startColumn; c <= endColumn; c++) {- this._setStylesCache(r, c, { cacheItem: { bg: true, border: true } });- }-- // Calculate the text length for overflow situations, focusing on the leftmost column within the visible range.- for (let c = 0; c < startColumn; c++) {- this._setStylesCache(r, c, { cacheItem: { bg: false, border: false } });- }- if (endColumn === 0) continue;-- // Calculate the text length for overflow situations, focusing on the rightmost column within the visible range.- for (let c = endColumn + 1; c < columnWidthAccumulation.length; c++) {- this._setStylesCache(r, c, { cacheItem: { bg: false, border: false } });- }- }- }-resetCache(): void {this._resetCache();}@@ -1856,12 +2053,12 @@ export class SpreadsheetSkeleton extends Skeleton {}/**- * Set border background and font to this._stylesCache+ * Set border background and font to this._stylesCache cell by cell.* @param row {number}* @param col {number}* @param options {{ mergeRange: IRange; cacheItem: ICacheItem } | undefined}*/- private _setStylesCache(row: number, col: number, options: { mergeRange?: IRange; cacheItem?: ICacheItem }): void {+ private _setStylesCacheForOneCell(row: number, col: number, options: { mergeRange?: IRange; cacheItem?: ICacheItem }): void {if (row === -1 || col === -1) {return;}diff --git a/packages/engine-render/src/components/sheets/spreadsheet.ts b/packages/engine-render/src/components/sheets/spreadsheet.tsindex b696fbf6c8..ee724dca7a 100644--- a/packages/engine-render/src/components/sheets/spreadsheet.ts+++ b/packages/engine-render/src/components/sheets/spreadsheet.ts@@ -25,14 +25,15 @@ import type { IDrawInfo } from '../extension';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 { BooleanNumber, sortRules, Tools } from '@univerjs/core';import { FIX_ONE_PIXEL_BLUR_OFFSET, RENDER_CLASS_TYPE } from '../../basics/const';import { getCellPositionByIndex, getColor } from '../../basics/tools';import { Documents } from '../docs/document';import { SpreadsheetExtensionRegistry } from '../extension';+import { sheetContentViewportKeys, sheetHeaderViewportKeys } from './constants';import { SHEET_EXTENSION_PREFIX } from './extensions/sheet-extension';-import { type IPaintForRefresh, type IPaintForScrolling, SHEET_VIEWPORT_KEY } from './interfaces';import { SheetComponent } from './sheet-component';const OBJECT_KEY = '__SHEET_EXTENSION_FONT_DOCUMENT_INSTANCE__';@@ -375,7 +376,7 @@ export class Spreadsheet extends SheetComponent {if (!spreadsheetSkeleton) {return;}- spreadsheetSkeleton.calculateWithoutClearingCache(viewportInfo);+ spreadsheetSkeleton.setStylesCache(viewportInfo);const segment = spreadsheetSkeleton.rowColumnSegment;@@ -407,13 +408,13 @@ export class Spreadsheet extends SheetComponent {// SHEET_COMPONENT_HEADER_SELECTION_LAYER_INDEX selection this.getObjectsByOrder() ---> [_Rect, Group]// SpreadsheetRowHeader SpreadsheetColumnHeader is not render by spreadsheet- if (this.sheetContentViewport().includes(viewportKey as SHEET_VIEWPORT_KEY)) {+ if (sheetContentViewportKeys.includes(viewportKey as SHEET_VIEWPORT_KEY)) {if (viewportInfo && viewportInfo.cacheCanvas) {this.renderByViewport(mainCtx, viewportInfo, spreadsheetSkeleton);} else {this._draw(mainCtx, viewportInfo);}- } else if (this.sheetHeaderViewport().includes(viewportKey as SHEET_VIEWPORT_KEY)) {+ } else if (sheetHeaderViewportKeys.includes(viewportKey as SHEET_VIEWPORT_KEY)) {// doing nothing, other components(SpreadsheetRowHeader...) will render} else {// embed in doc & slide@@ -685,14 +686,6 @@ export class Spreadsheet extends SheetComponent {});}- sheetContentViewport() {- return [SHEET_VIEWPORT_KEY.VIEW_MAIN, SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP, SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP, SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT];- }-- sheetHeaderViewport() {- return [SHEET_VIEWPORT_KEY.VIEW_ROW_TOP, SHEET_VIEWPORT_KEY.VIEW_ROW_BOTTOM, SHEET_VIEWPORT_KEY.VIEW_COLUMN_LEFT, SHEET_VIEWPORT_KEY.VIEW_COLUMN_RIGHT, SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP];- }-testShowRuler(cacheCtx: UniverRenderingContext2D, viewportInfo: IViewportInfo): void {const { cacheBound } = viewportInfo;const spreadsheetSkeleton = this.getSkeleton()!;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.tsindex aa7edf66f5..0f8a7d2aa0 100644--- a/packages/sheets-data-validation-ui/src/controllers/dv-render.controller.ts+++ b/packages/sheets-data-validation-ui/src/controllers/dv-render.controller.ts@@ -225,6 +225,37 @@ export class SheetsDataValidationRenderController extends RxDisposable {};return validator?.canvasRender?.calcCellAutoHeight?.(info);},+ interceptorAutoWidth: () => {+ const skeleton = this._renderManagerService.getRenderById(unitId)+ ?.with(SheetSkeletonManagerService)+ .getWorksheetSkeleton(subUnitId)+ ?.skeleton;+ if (!skeleton) {+ return undefined;+ }+ const mergeCell = skeleton.worksheet.getMergedCell(row, col);++ const info: ICellRenderContext = {+ data: {+ ...cell,+ dataValidation: {+ ruleId,+ validStatus,+ rule,+ validator,+ },+ },+ style: skeleton.getsStyles().getStyleByCell(cell),+ primaryWithCoord: skeleton.getCellByIndex(mergeCell?.startRow ?? row, mergeCell?.startColumn ?? col),+ unitId,+ subUnitId,+ row,+ col,+ workbook,+ worksheet,+ };+ return validator?.canvasRender?.calcCellAutoWidth?.(info);+ },coverable: (cell?.coverable ?? true) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE),});},@@ -390,4 +421,3 @@ export class SheetsDataValidationMobileRenderController extends RxDisposable {});}}-diff --git a/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.ts b/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.tsindex e9c5ddb3b3..bd12d85c6b 100644--- a/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.ts+++ b/packages/sheets-data-validation-ui/src/views/widgets/checkbox-widget.ts@@ -80,6 +80,11 @@ export class CheckboxRender implements IBaseDataValidationWidget {return (style?.fs ?? 10) * 1.6;}+ calcCellAutoWidth(info: ICellRenderContext): number | undefined {+ const { style } = info;+ return (style?.fs ?? 10) * 1.6;+ }+private async _parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult> {const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule;const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);diff --git a/packages/sheets-data-validation-ui/src/views/widgets/dropdown-multiple-widget.ts b/packages/sheets-data-validation-ui/src/views/widgets/dropdown-multiple-widget.tsindex ccb97675ec..d61a5cb43d 100644--- a/packages/sheets-data-validation-ui/src/views/widgets/dropdown-multiple-widget.ts+++ b/packages/sheets-data-validation-ui/src/views/widgets/dropdown-multiple-widget.ts@@ -194,6 +194,32 @@ export class DropdownMultipleWidget implements IBaseDataValidationWidget {return layout.cellAutoHeight;}+ calcCellAutoWidth(info: ICellRenderContext): number | undefined {+ const { primaryWithCoord, style, data } = info;+ const fontRenderExtension = data.fontRenderExtension;+ const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};+ const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;+ const cellBounding = {+ startX: _cellBounding.startX + leftOffset,+ endX: _cellBounding.endX - rightOffset,+ startY: _cellBounding.startY + topOffset,+ endY: _cellBounding.endY - downOffset,+ };+ const validation = data.dataValidation;+ if (!validation) {+ return undefined;+ }+ const cellWidth = cellBounding.endX - cellBounding.startX;+ const cellHeight = cellBounding.endY - cellBounding.startY;+ const cellValue = getCellValueOrigin(data) ?? '';+ const { validator: _validator } = validation;+ const validator = _validator as ListMultipleValidator;+ const items = validator.parseCellValue(cellValue);+ const fontStyle = getFontStyleString(style ?? undefined);+ const layout = layoutDropdowns(items, fontStyle, cellWidth, cellHeight);+ return layout.calcAutoWidth;+ }+isHit(position: { x: number; y: number }, info: ICellRenderContext) {const { primaryWithCoord } = info;const cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;diff --git a/packages/sheets-data-validation-ui/src/views/widgets/dropdown-widget.ts b/packages/sheets-data-validation-ui/src/views/widgets/dropdown-widget.tsindex 707247b45d..e8647f3561 100644--- a/packages/sheets-data-validation-ui/src/views/widgets/dropdown-widget.ts+++ b/packages/sheets-data-validation-ui/src/views/widgets/dropdown-widget.ts@@ -25,11 +25,19 @@ import { getCellValueOrigin } from '@univerjs/sheets-data-validation';import { ShowDataValidationDropdown } from '../../commands/operations/data-validation.operation';import { DROP_DOWN_DEFAULT_COLOR } from '../../const';+/**+ * padding in Capsule+ */const PADDING_H = 4;const ICON_SIZE = 4;const ICON_PLACE = 14;++/**+ * margin for Capsule, that means distance between capsule and cell border+ */const MARGIN_H = 6;const MARGIN_V = 4;+const RADIUS_BG = 8;const DROP_DOWN_ICON_COLOR = '#565656';const downPath = new Path2D('M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z');@@ -319,7 +327,7 @@ export class DropdownWidget implements IBaseDataValidationWidget {width: rectWidth,height: rectHeight,fill: activeItem?.color || DROP_DOWN_DEFAULT_COLOR,- radius: 8,+ radius: RADIUS_BG,});ctx.save();ctx.translateWithPrecision(PADDING_H, 0);@@ -410,6 +418,56 @@ export class DropdownWidget implements IBaseDataValidationWidget {}}+ calcCellAutoWidth(info: ICellRenderContext): number | undefined {+ const { primaryWithCoord, style, data } = info;+ const cellRange = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;++ const fontRenderExtension = data.fontRenderExtension;+ const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};++ const rule = data.dataValidation?.rule;+ if (!rule) return;+ if (rule.renderMode === DataValidationRenderMode.TEXT) return;++ const cellBounding = {+ startX: cellRange.startX + leftOffset,+ endX: cellRange.endX - rightOffset,+ startY: cellRange.startY + topOffset,+ endY: cellRange.endY - downOffset,+ };+ const cellWidth = cellBounding.endX - cellBounding.startX;+ const value = getCellValueOrigin(data);+ const valueStr = `${value ?? ''}`;++ let { tb, pd } = style || {};+ const { l = DEFAULT_STYLES.pd.l, r = DEFAULT_STYLES.pd.r } = (pd ?? {});+ tb = tb ?? WrapStrategy.WRAP;++ let paddingAll = MARGIN_H * 2 + ICON_PLACE;+ switch (rule.renderMode) {+ case DataValidationRenderMode.ARROW:+ paddingAll = ICON_PLACE + MARGIN_H * 2 + r + l;+ break;+ case DataValidationRenderMode.CUSTOM:+ // + 1 is must, or last character will be cut+ paddingAll = ICON_PLACE + MARGIN_H * 2 + PADDING_H * 2 + r + l + RADIUS_BG / 2 + 1;+ break;+ // default is CUSTOM+ default:+ paddingAll = ICON_PLACE + MARGIN_H * 2 + PADDING_H * 2 + r + l + RADIUS_BG / 2 + 1;+ }+ const widthForTextLayout = cellWidth - paddingAll;+ const { documentSkeleton, docModel } = createDocuments(valueStr, this._localeService, style);+ if (tb === WrapStrategy.WRAP) {+ docModel.updateDocumentDataPageSize(Math.max(widthForTextLayout, 1));+ }++ documentSkeleton.calculate();+ documentSkeleton.getActualSize();+ const textLayout = getDocsSkeletonPageSize(documentSkeleton)!;+ return textLayout.width + paddingAll;+ }+isHit(position: { x: number; y: number }, info: ICellRenderContext) {const { data, subUnitId, row, col } = info;const map = this._ensureMap(subUnitId);diff --git a/packages/sheets-data-validation-ui/src/views/widgets/shape/layout.ts b/packages/sheets-data-validation-ui/src/views/widgets/shape/layout.tsindex bf83bc26e1..5979e23188 100644--- a/packages/sheets-data-validation-ui/src/views/widgets/shape/layout.ts+++ b/packages/sheets-data-validation-ui/src/views/widgets/shape/layout.ts@@ -61,8 +61,9 @@ export interface IDropdownLine {}export function layoutDropdowns(items: string[], fontStyle: IDocumentSkeletonFontStyle, cellWidth: number, cellHeight: number) {- const contentWidth = cellWidth - ICON_PLACE - CELL_PADDING_H;- const contentHeight = cellHeight - CELL_PADDING_V * 2;+ const cellPaddingH = ICON_PLACE + CELL_PADDING_H * 2;+ const widthAvailableForContent = cellWidth - cellPaddingH;+ const heightAvailableForContent = cellHeight - CELL_PADDING_V * 2;const textLayout = items.map((item) => ({layout: getDropdownItemSize(item, fontStyle),text: item,@@ -75,7 +76,7 @@ export function layoutDropdowns(items: string[], fontStyle: IDocumentSkeletonFonconst { layout } = item;const { width, height } = layout;- if (!currentLine || ((currentLine.width + width + MARGIN_H) > contentWidth)) {+ if (!currentLine || ((currentLine.width + width + MARGIN_H) > widthAvailableForContent)) {currentLine = {width,height,@@ -94,7 +95,9 @@ export function layoutDropdowns(items: string[], fontStyle: IDocumentSkeletonFon}});let totalHeight = 0;+ let maxLineWidth = 0;lines.forEach((line, index) => {+ maxLineWidth = Math.max(maxLineWidth, line.width);if (index === lines.length - 1) {totalHeight += line.height;} else {@@ -105,8 +108,9 @@ export function layoutDropdowns(items: string[], fontStyle: IDocumentSkeletonFonreturn {lines,totalHeight,- contentWidth,- contentHeight,+ contentWidth: widthAvailableForContent,+ contentHeight: heightAvailableForContent,cellAutoHeight: totalHeight + CELL_PADDING_V * 2,+ calcAutoWidth: maxLineWidth + cellPaddingH,};}diff --git a/packages/sheets-ui/src/commands/commands/set-worksheet-auto-col-width.command.ts b/packages/sheets-ui/src/commands/commands/set-worksheet-auto-col-width.command.tsnew file mode 100644index 0000000000..372caaf91d--- /dev/null+++ b/packages/sheets-ui/src/commands/commands/set-worksheet-auto-col-width.command.ts@@ -0,0 +1,88 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { IAccessor, ICommand, IRange } from '@univerjs/core';++import {+ CommandType,+ ICommandService,+ IUndoRedoService,+ IUniverInstanceService,+ sequenceExecute,+} from '@univerjs/core';+import {+ getSheetCommandTarget,+ SheetsSelectionsService,+} from '@univerjs/sheets';+import { AutoWidthController } from '../../controllers/auto-width.controller';++export interface ISetWorksheetColIsAutoWidthCommandParams {+ unitId?: string;+ subUnitId?: string;+ ranges?: IRange[]; // For Facade API+}++export const SetWorksheetColAutoWidthCommand: ICommand = {+ type: CommandType.COMMAND,+ id: 'sheet.command.set-col-auto-width',+ handler: async (accessor: IAccessor, params?: ISetWorksheetColIsAutoWidthCommandParams) => {+ const commandService = accessor.get(ICommandService);+ const undoRedoService = accessor.get(IUndoRedoService);+ const selectionManagerService = accessor.get(SheetsSelectionsService);+ const univerInstanceService = accessor.get(IUniverInstanceService);++ const target = getSheetCommandTarget(univerInstanceService, params);+ if (!target) return false;++ const { unitId, subUnitId } = target;++ let ranges = [];+ if (params?.ranges) {+ ranges = [...params.ranges];+ } else {+ const selections = selectionManagerService.getCurrentSelections();+ for (let i = 0; i < selections.length; i++) {+ ranges.push(selections[i].range);+ }+ }++ if (!ranges?.length) {+ return false;+ }++ const redoMutationParams: Required<ISetWorksheetColIsAutoWidthCommandParams> = {+ unitId,+ subUnitId,+ ranges,+ };++ // undos redos comes from auto-width.controller+ const { redos, undos } = accessor.get(AutoWidthController).getUndoRedoParamsOfColWidth(redoMutationParams);++ const result = sequenceExecute([...redos], commandService);+ if (result.result) {+ undoRedoService.pushUndoRedo({+ unitID: unitId,+ undoMutations: [...undos],+ redoMutations: [...redos],+ });++ return true;+ }++ return false;+ },+};diff --git a/packages/sheets-ui/src/controllers/auto-width.controller.ts b/packages/sheets-ui/src/controllers/auto-width.controller.tsnew file mode 100644index 0000000000..55efee3f6f--- /dev/null+++ b/packages/sheets-ui/src/controllers/auto-width.controller.ts@@ -0,0 +1,106 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { IColAutoWidthInfo, IObjectArrayPrimitiveType, Nullable, Worksheet } from '@univerjs/core';+import type { RenderManagerService } from '@univerjs/engine-render';+import type {+ ISetWorksheetColWidthMutationParams,+} from '@univerjs/sheets';+import type { ISetWorksheetColIsAutoWidthCommandParams } from '../commands/commands/set-worksheet-auto-col-width.command';+import { Disposable, Inject, IUniverInstanceService } from '@univerjs/core';+import { IRenderManagerService } from '@univerjs/engine-render';+import {+ getSheetCommandTarget,+ SetWorksheetColWidthMutation,+} from '@univerjs/sheets';+import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';++export const AFFECT_LAYOUT_STYLES = ['ff', 'fs', 'tr', 'tb'];++export const createAutoColWidthUndoMutationsByRedos = (+ params: ISetWorksheetColWidthMutationParams,+ worksheet: Worksheet+): ISetWorksheetColWidthMutationParams => {+ const { unitId, subUnitId, ranges } = params;+ const colWidthObj: IObjectArrayPrimitiveType<Nullable<number>> = {};+ const manager = worksheet.getColumnManager();++ for (let i = 0; i < ranges.length; i++) {+ const range = ranges[i];+ for (let j = range.startColumn; j < range.endColumn + 1; j++) {+ const col = manager.getColumnOrCreate(j);+ colWidthObj[j] = col.w;+ }+ }++ return {+ unitId,+ subUnitId,+ ranges,+ colWidth: colWidthObj,+ };+};++export class AutoWidthController extends Disposable {+ constructor(+ @IRenderManagerService private readonly _renderManagerService: RenderManagerService,+ @Inject(IUniverInstanceService) private readonly _univerInstanceService: IUniverInstanceService+ ) {+ super();+ }++ getUndoRedoParamsOfColWidth(params: Required<ISetWorksheetColIsAutoWidthCommandParams>) {+ const defaultValue = { redos: [], undos: [] };+ const { _univerInstanceService: univerInstanceService } = this;++ const target = getSheetCommandTarget(univerInstanceService);+ if (!target) return defaultValue;++ const { unitId, subUnitId, worksheet } = target;+ const sheetSkeletonService = this._renderManagerService.getRenderById(unitId)!.with<SheetSkeletonManagerService>(SheetSkeletonManagerService);++ if (!sheetSkeletonService.getCurrent()) return defaultValue;++ const { skeleton } = sheetSkeletonService.getCurrent()!;+ const colsAutoWidthInfo: IColAutoWidthInfo[] = skeleton.calculateAutoWidthInRange(params.ranges);++ const colWidthObject: IObjectArrayPrimitiveType<Nullable<number>> = {};+ for (const { col, width } of colsAutoWidthInfo) {+ colWidthObject[col] = width;+ }+ const redoParams: ISetWorksheetColWidthMutationParams = {+ subUnitId,+ unitId,+ ranges: params.ranges,+ colWidth: colWidthObject,+ };+ const undoParams: ISetWorksheetColWidthMutationParams = createAutoColWidthUndoMutationsByRedos(redoParams, worksheet);+ return {+ undos: [+ {+ id: SetWorksheetColWidthMutation.id,+ params: undoParams,+ },+ ],+ redos: [+ {+ id: SetWorksheetColWidthMutation.id,+ params: redoParams,+ },+ ],+ };+ }+}diff --git a/packages/sheets-ui/src/controllers/menu.schema.ts b/packages/sheets-ui/src/controllers/menu.schema.tsindex eb044bb90d..a93394dd31 100644--- a/packages/sheets-ui/src/controllers/menu.schema.ts+++ b/packages/sheets-ui/src/controllers/menu.schema.ts@@ -80,6 +80,7 @@ import { RemoveColConfirmCommand, RemoveRowConfirmCommand } from '../commands/coimport { RemoveSheetConfirmCommand } from '../commands/commands/remove-sheet-confirm.command';import { SetOnceFormatPainterCommand } from '../commands/commands/set-format-painter.command';import { CancelFrozenCommand, SetColumnFrozenCommand, SetRowFrozenCommand, SetSelectionFrozenCommand } from '../commands/commands/set-frozen.command';+import { SetWorksheetColAutoWidthCommand } from '../commands/commands/set-worksheet-auto-col-width.command';import { ShowMenuListCommand } from '../commands/commands/unhide.command';import {ChangeSheetProtectionFromSheetBarCommand,@@ -107,6 +108,7 @@ import {BackgroundColorSelectorMenuItemFactory,BoldMenuItemFactory,CancelFrozenMenuItemFactory,+ ColAutoWidthMenuItemFactory,CopyMenuItemFactory,// CutMenuItemFactory,FitContentMenuItemFactory,@@ -486,8 +488,12 @@ export const menuSchema: MenuSchemaType = {order: 3,menuItemFactory: SetColWidthMenuItemFactory,},- [SHEET_FROZEN_HEADER_MENU_ID]: {+ [SetWorksheetColAutoWidthCommand.id]: {order: 4,+ menuItemFactory: ColAutoWidthMenuItemFactory,+ },+ [SHEET_FROZEN_HEADER_MENU_ID]: {+ order: 5,menuItemFactory: SheetFrozenHeaderMenuItemFactory,[SetSelectionFrozenCommand.id]: {order: 0,@@ -499,7 +505,7 @@ export const menuSchema: MenuSchemaType = {},},[SHEET_PERMISSION_CONTEXT_MENU_ID]: {- order: 5,+ order: 6,menuItemFactory: sheetPermissionContextMenuFactory,[AddRangeProtectionFromContextMenuCommand.id]: {order: 0,diff --git a/packages/sheets-ui/src/controllers/menu/menu.ts b/packages/sheets-ui/src/controllers/menu/menu.tsindex 8353ffb5c0..da71934a3a 100644--- a/packages/sheets-ui/src/controllers/menu/menu.ts+++ b/packages/sheets-ui/src/controllers/menu/menu.ts@@ -110,6 +110,7 @@ import {SetRowFrozenCommand,SetSelectionFrozenCommand,} from '../../commands/commands/set-frozen.command';+import { SetWorksheetColAutoWidthCommand } from '../../commands/commands/set-worksheet-auto-col-width.command';import { COLOR_PICKER_COMPONENT } from '../../components/color-picker';import { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT } from '../../components/font-family';import { FONT_SIZE_COMPONENT } from '../../components/font-size';@@ -991,6 +992,17 @@ export function FitContentMenuItemFactory(accessor: IAccessor): IMenuButtonItem};}+export function ColAutoWidthMenuItemFactory(accessor: IAccessor): IMenuButtonItem {+ return {+ id: SetWorksheetColAutoWidthCommand.id,+ type: MenuItemType.BUTTON,+ icon: 'AutoWidth',+ title: 'rightClick.fitContent',+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),+ };+}+export const SHEET_FROZEN_MENU_ID = 'sheet.menu.sheet-frozen';export function SheetFrozenMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string> {diff --git a/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.tsindex 432fc81012..2c0d96e153 100644--- a/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts@@ -17,25 +17,30 @@/* eslint-disable max-lines-per-function *//* eslint-disable complexity */+import type { EventState, IRange, Nullable, Workbook } from '@univerjs/core';+import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';+import type {+ IDeltaColumnWidthCommandParams,+ IDeltaRowHeightCommand,+ ISetWorksheetRowIsAutoHeightCommandParams,+} from '@univerjs/sheets';+import type { ISetWorksheetColIsAutoWidthCommandParams } from '../../commands/commands/set-worksheet-auto-col-width.command';import {createInterceptorKey,Disposable,ICommandService,Inject,InterceptorManager,- toDisposable,+ RANGE_TYPE,} from '@univerjs/core';import { CURSOR_TYPE, Rect, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';-import { DeltaColumnWidthCommand, DeltaRowHeightCommand, SetWorksheetRowIsAutoHeightCommand } from '@univerjs/sheets';-import { Subscription } from 'rxjs';-import type { EventState, Nullable, Workbook } from '@univerjs/core';-import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';-import type {- IDeltaColumnWidthCommandParams,- IDeltaRowHeightCommand,- ISetWorksheetRowIsAutoHeightCommandParams,+import {+ DeltaColumnWidthCommand,+ DeltaRowHeightCommand, SetWorksheetRowIsAutoHeightCommand, SheetsSelectionsService,} from '@univerjs/sheets';+import { Subscription } from 'rxjs';+import { SetWorksheetColAutoWidthCommand } from '../../commands/commands/set-worksheet-auto-col-width.command';import { SHEET_COMPONENT_HEADER_LAYER_INDEX, SHEET_VIEW_KEY } from '../../common/keys';import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';import {@@ -92,6 +97,7 @@ export class HeaderResizeRenderController extends Disposable implements IRenderMconstructor(private readonly _context: IRenderContext<Workbook>,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,+ @Inject(SheetsSelectionsService) private readonly _selectionManagerService: SheetsSelectionsService,@ICommandService private readonly _commandService: ICommandService) {super();@@ -274,240 +280,270 @@ export class HeaderResizeRenderController extends Disposable implements IRenderM}this.disposeWithMe(- toDisposable(- eventBindingObject.onPointerEnter$.subscribeEvent(() => {- if (eventBindingObject == null) {- return;- }+ eventBindingObject.onPointerEnter$.subscribeEvent(() => {+ if (eventBindingObject == null) {+ return;+ }- eventBindingObject.show();+ eventBindingObject.show();- scene.setCursor(- initialType === HEADER_RESIZE_TYPE.ROW ? CURSOR_TYPE.ROW_RESIZE : CURSOR_TYPE.COLUMN_RESIZE- );- })- )+ scene.setCursor(+ initialType === HEADER_RESIZE_TYPE.ROW ? CURSOR_TYPE.ROW_RESIZE : CURSOR_TYPE.COLUMN_RESIZE+ );+ }));this.disposeWithMe(- toDisposable(- eventBindingObject.onPointerLeave$.subscribeEvent(() => {- if (eventBindingObject == null) {- return;- }+ eventBindingObject.onPointerLeave$.subscribeEvent(() => {+ if (eventBindingObject == null) {+ return;+ }- eventBindingObject.hide();+ eventBindingObject.hide();- scene.resetCursor();- })- )+ scene.resetCursor();+ }));this.disposeWithMe(- toDisposable(- eventBindingObject.onPointerDown$.subscribeEvent((evt: IPointerEvent | IMouseEvent) => {- const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;- if (skeleton == null) return;+ eventBindingObject.onPointerDown$.subscribeEvent((evt: IPointerEvent | IMouseEvent) => {+ const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;+ if (skeleton == null) return;- const scene = this._context.scene;+ const scene = this._context.scene;- const engine = scene.getEngine();- const canvasMaxHeight = engine?.height || 0;- const canvasMaxWidth = engine?.width || 0;- const viewPort = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);+ const engine = scene.getEngine();+ const canvasMaxHeight = engine?.height || 0;+ const canvasMaxWidth = engine?.width || 0;+ const viewPort = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);- const scrollBarHorizontalHeight = (viewPort?.getScrollBar()?.horizonScrollTrack?.height || 0) + 10;- const scrollBarVerticalWidth = (viewPort?.getScrollBar()?.verticalScrollTrack?.width || 0) + 10;- const transformCoord = getTransformCoord(evt.offsetX, evt.offsetY, scene, skeleton);- const { scaleX, scaleY } = scene.getAncestorScale();+ const scrollBarHorizontalHeight = (viewPort?.getScrollBar()?.horizonScrollTrack?.height || 0) + 10;+ const scrollBarVerticalWidth = (viewPort?.getScrollBar()?.verticalScrollTrack?.width || 0) + 10;+ const transformCoord = getTransformCoord(evt.offsetX, evt.offsetY, scene, skeleton);+ const { scaleX, scaleY } = scene.getAncestorScale();- this._startOffsetX = transformCoord.x;+ this._startOffsetX = transformCoord.x;- this._startOffsetY = transformCoord.y;+ this._startOffsetY = transformCoord.y;- const currentOffsetX = skeleton.getOffsetByPositionX(this._currentColumn);- const currentOffsetY = skeleton.getOffsetByPositionY(this._currentRow);- const cell = skeleton.getNoMergeCellPositionByIndex(this._currentRow, this._currentColumn);+ const currentOffsetX = skeleton.getOffsetByPositionX(this._currentColumn);+ const currentOffsetY = skeleton.getOffsetByPositionY(this._currentRow);+ const cell = skeleton.getNoMergeCellPositionByIndex(this._currentRow, this._currentColumn);- let isStartMove = false;- let moveChangeX = 0;- let moveChangeY = 0;+ let isStartMove = false;+ let moveChangeX = 0;+ let moveChangeY = 0;- const { columnTotalWidth, rowHeaderWidth, rowTotalHeight, columnHeaderHeight } = skeleton;+ const { columnTotalWidth, rowHeaderWidth, rowTotalHeight, columnHeaderHeight } = skeleton;- const shapeWidth = canvasMaxWidth > columnTotalWidth + rowHeaderWidth- ? canvasMaxWidth- : columnTotalWidth + rowHeaderWidth;+ const shapeWidth = canvasMaxWidth > columnTotalWidth + rowHeaderWidth+ ? canvasMaxWidth+ : columnTotalWidth + rowHeaderWidth;- const shapeHeight = canvasMaxHeight > rowTotalHeight + columnHeaderHeight- ? canvasMaxHeight- : rowTotalHeight + columnHeaderHeight;+ const shapeHeight = canvasMaxHeight > rowTotalHeight + columnHeaderHeight+ ? canvasMaxHeight+ : rowTotalHeight + columnHeaderHeight;- const scale = Math.max(scaleX, scaleY);-- const HEADER_MENU_SHAPE_THUMB_SIZE_SCALE = HEADER_MENU_SHAPE_THUMB_SIZE / scale;+ const scale = Math.max(scaleX, scaleY);- if (initialType === HEADER_RESIZE_TYPE.ROW) {- this._resizeHelperShape = new Rect(HEADER_RESIZE_CONTROLLER_SHAPE_HELPER, {- width: shapeWidth,- height: HEADER_MENU_SHAPE_THUMB_SIZE_SCALE,- fill: HEADER_RESIZE_CONTROLLER_SHAPE_HELPER_COLOR,- left: 0,- top: currentOffsetY - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2,- });- } else {- this._resizeHelperShape = new Rect(HEADER_RESIZE_CONTROLLER_SHAPE_HELPER, {- width: HEADER_MENU_SHAPE_THUMB_SIZE_SCALE,- height: shapeHeight,- fill: HEADER_RESIZE_CONTROLLER_SHAPE_HELPER_COLOR,- left: currentOffsetX - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2,- top: 0,- });- }+ const HEADER_MENU_SHAPE_THUMB_SIZE_SCALE = HEADER_MENU_SHAPE_THUMB_SIZE / scale;- const rowResizeRectX = this._columnResizeRect?.left || 0;-- const rowResizeRectY = this._rowResizeRect?.top || 0;-- scene.addObject(this._resizeHelperShape, SHEET_COMPONENT_HEADER_LAYER_INDEX);-- scene.disableObjectsEvent();-- // TODO: do it in another way- // this._editorBridgeService.changeVisible({- // visible: false,- // eventType: DeviceInputEventType.PointerDown,- // });+ if (initialType === HEADER_RESIZE_TYPE.ROW) {+ this._resizeHelperShape = new Rect(HEADER_RESIZE_CONTROLLER_SHAPE_HELPER, {+ width: shapeWidth,+ height: HEADER_MENU_SHAPE_THUMB_SIZE_SCALE,+ fill: HEADER_RESIZE_CONTROLLER_SHAPE_HELPER_COLOR,+ left: 0,+ top: currentOffsetY - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2,+ });+ } else {+ this._resizeHelperShape = new Rect(HEADER_RESIZE_CONTROLLER_SHAPE_HELPER, {+ width: HEADER_MENU_SHAPE_THUMB_SIZE_SCALE,+ height: shapeHeight,+ fill: HEADER_RESIZE_CONTROLLER_SHAPE_HELPER_COLOR,+ left: currentOffsetX - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2,+ top: 0,+ });+ }- this._scenePointerMoveSub = scene.onPointerMove$.subscribeEvent((moveEvt: IPointerEvent | IMouseEvent) => {- const relativeCoords = scene.getRelativeToViewportCoord(- Vector2.FromArray([this._startOffsetX, this._startOffsetY])- );+ const rowResizeRectX = this._columnResizeRect?.left || 0;+ const rowResizeRectY = this._rowResizeRect?.top || 0;+ scene.addObject(this._resizeHelperShape, SHEET_COMPONENT_HEADER_LAYER_INDEX);+ scene.disableObjectsEvent();- const scrollXY = scene.getVpScrollXYInfoByPosToVp(relativeCoords, viewPort);+ // TODO: do it in another way+ // this._editorBridgeService.changeVisible({+ // visible: false,+ // eventType: DeviceInputEventType.PointerDown,+ // });- const transformCoord = getTransformCoord(moveEvt.offsetX, moveEvt.offsetY, scene, skeleton);+ this._scenePointerMoveSub = scene.onPointerMove$.subscribeEvent((moveEvt: IPointerEvent | IMouseEvent) => {+ const relativeCoords = scene.getRelativeToViewportCoord(+ Vector2.FromArray([this._startOffsetX, this._startOffsetY])+ );- const { x: moveOffsetX, y: moveOffsetY } = transformCoord;+ const scrollXY = scene.getVpScrollXYInfoByPosToVp(relativeCoords, viewPort);- const { scaleX, scaleY } = scene.getAncestorScale();+ const transformCoord = getTransformCoord(moveEvt.offsetX, moveEvt.offsetY, scene, skeleton);- const scale = Math.max(scaleX, scaleY);+ const { x: moveOffsetX, y: moveOffsetY } = transformCoord;+ const { scaleX, scaleY } = scene.getAncestorScale();+ const scale = Math.max(scaleX, scaleY);+ const HEADER_MENU_SHAPE_THUMB_SIZE_SCALE = HEADER_MENU_SHAPE_THUMB_SIZE / scale;- const HEADER_MENU_SHAPE_THUMB_SIZE_SCALE = HEADER_MENU_SHAPE_THUMB_SIZE / scale;+ moveChangeX = moveOffsetX - this._startOffsetX - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2;- moveChangeX = moveOffsetX - this._startOffsetX - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2;+ moveChangeY = moveOffsetY - this._startOffsetY - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2;- moveChangeY = moveOffsetY - this._startOffsetY - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2;+ if (+ Math.abs(initialType === HEADER_RESIZE_TYPE.ROW ? moveChangeY : moveChangeX) >=+ MINIMAL_OFFSET+ ) {+ isStartMove = true;+ }- if (- Math.abs(initialType === HEADER_RESIZE_TYPE.ROW ? moveChangeY : moveChangeX) >=- MINIMAL_OFFSET- ) {- isStartMove = true;+ if (initialType === HEADER_RESIZE_TYPE.ROW) {+ if (moveChangeY > canvasMaxHeight - scrollBarHorizontalHeight + scrollXY.y - cell.startY) {+ moveChangeY = canvasMaxHeight - scrollBarHorizontalHeight + scrollXY.y - cell.startY;}- if (initialType === HEADER_RESIZE_TYPE.ROW) {- if (moveChangeY > canvasMaxHeight - scrollBarHorizontalHeight + scrollXY.y - cell.startY) {- moveChangeY = canvasMaxHeight - scrollBarHorizontalHeight + scrollXY.y - cell.startY;- }-- if (moveChangeY < -(cell.endY - cell.startY) + 2) {- moveChangeY = -(cell.endY - cell.startY) + 2;- }+ if (moveChangeY < -(cell.endY - cell.startY) + 2) {+ moveChangeY = -(cell.endY - cell.startY) + 2;+ }- if (isStartMove) {- this._resizeHelperShape?.transformByState({- top: currentOffsetY + moveChangeY,- });+ if (isStartMove) {+ this._resizeHelperShape?.transformByState({+ top: currentOffsetY + moveChangeY,+ });- this._rowResizeRect?.transformByState({- top: rowResizeRectY + moveChangeY + HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2,- });+ this._rowResizeRect?.transformByState({+ top: rowResizeRectY + moveChangeY + HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2,+ });- this._rowResizeRect?.show();+ this._rowResizeRect?.show();- scene.setCursor(CURSOR_TYPE.ROW_RESIZE);- }- } else {- if (moveChangeX > canvasMaxWidth - scrollBarVerticalWidth + scrollXY.x - cell.startX) {- moveChangeX = canvasMaxWidth - scrollBarVerticalWidth + scrollXY.x - cell.startX;- }+ scene.setCursor(CURSOR_TYPE.ROW_RESIZE);+ }+ } else {+ if (moveChangeX > canvasMaxWidth - scrollBarVerticalWidth + scrollXY.x - cell.startX) {+ moveChangeX = canvasMaxWidth - scrollBarVerticalWidth + scrollXY.x - cell.startX;+ }- if (moveChangeX < -(cell.endX - cell.startX) + 2) {- moveChangeX = -(cell.endX - cell.startX) + 2;- }+ if (moveChangeX < -(cell.endX - cell.startX) + 2) {+ moveChangeX = -(cell.endX - cell.startX) + 2;+ }- if (isStartMove) {- this._resizeHelperShape?.transformByState({- left: currentOffsetX + moveChangeX,- });+ if (isStartMove) {+ this._resizeHelperShape?.transformByState({+ left: currentOffsetX + moveChangeX,+ });- this._columnResizeRect?.transformByState({- left: rowResizeRectX + moveChangeX + HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2,- });+ this._columnResizeRect?.transformByState({+ left: rowResizeRectX + moveChangeX + HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2,+ });- this._columnResizeRect?.show();+ this._columnResizeRect?.show();- scene.setCursor(CURSOR_TYPE.COLUMN_RESIZE);- }+ scene.setCursor(CURSOR_TYPE.COLUMN_RESIZE);}- });+ }+ });- this._scenePointerUpSub = scene.onPointerUp$.subscribeEvent((upEvt: IPointerEvent | IMouseEvent) => {- const scene = this._context.scene;+ this._scenePointerUpSub = scene.onPointerUp$.subscribeEvent((upEvt: IPointerEvent | IMouseEvent) => {+ const scene = this._context.scene;- this._clearObserverEvent();- this._resizeHelperShape?.dispose();- this._resizeHelperShape = null;+ this._clearObserverEvent();+ this._resizeHelperShape?.dispose();+ this._resizeHelperShape = null;- scene.enableObjectsEvent();+ scene.enableObjectsEvent();- if (isStartMove) {- scene.resetCursor();+ if (isStartMove) {+ scene.resetCursor();- this._rowResizeRect?.hide();- this._columnResizeRect?.hide();+ this._rowResizeRect?.hide();+ this._columnResizeRect?.hide();- if (initialType === HEADER_RESIZE_TYPE.ROW) {- this._commandService.executeCommand<IDeltaRowHeightCommand>(DeltaRowHeightCommand.id, {- deltaY: moveChangeY,- anchorRow: this._currentRow,- });- } else {- this._commandService.executeCommand<IDeltaColumnWidthCommandParams>(- DeltaColumnWidthCommand.id,- {- deltaX: moveChangeX,- anchorCol: this._currentColumn,- }- );- }+ if (initialType === HEADER_RESIZE_TYPE.ROW) {+ this._commandService.executeCommand<IDeltaRowHeightCommand>(DeltaRowHeightCommand.id, {+ deltaY: moveChangeY,+ anchorRow: this._currentRow,+ });+ } else {+ this._commandService.executeCommand<IDeltaColumnWidthCommandParams>(+ DeltaColumnWidthCommand.id,+ {+ deltaX: moveChangeX,+ anchorCol: this._currentColumn,+ }+ );}- });- })- )+ }+ });+ }));this.disposeWithMe(- toDisposable(- eventBindingObject.onDblclick$.subscribeEvent(() => {- if (initialType === HEADER_RESIZE_TYPE.ROW) {- const scene = this._context.scene;-- scene.resetCursor();+ eventBindingObject.onDblclick$.subscribeEvent(() => {+ const scene = this._context.scene;+ scene.resetCursor();++ const sk = this._sheetSkeletonManagerService.getCurrent()?.skeleton;+ if (!sk) return;++ const startRow = 0;+ const startColumn = 0;+ const endRow = sk.worksheet.getRowCount() - 1 || 0;+ const endColumn = sk.worksheet.getColumnCount() - 1 || 0;+ switch (initialType) {+ case HEADER_RESIZE_TYPE.COLUMN: {+ const curSelections = this._selectionManagerService.getCurrentSelections();+ const ranges: IRange[] = [];+ for (let i = 0; i < curSelections.length; i++) {+ const selection = curSelections[i];++ // if dbclick column is in selection range, then the selection range should put into auto col process.+ if (selection.range.rangeType === RANGE_TYPE.COLUMN && this._currentColumn <= selection.range.endColumn && this._currentColumn >= selection.range.startColumn) {+ ranges.push({+ startColumn: selection.range.startColumn,+ endColumn: selection.range.endColumn,+ startRow,+ endRow,+ });+ }+ }+ // if _currentColumn (dblick column) is not in selection range, then auto width currentColumn+ if (ranges.length === 0) {+ ranges.push({+ startColumn: this._currentColumn,+ endColumn: this._currentColumn,+ startRow,+ endRow,+ });+ }+ this._commandService.executeCommand<ISetWorksheetColIsAutoWidthCommandParams>(+ SetWorksheetColAutoWidthCommand.id, { ranges }+ );+ this._columnResizeRect?.hide();+ break;+ }+ case HEADER_RESIZE_TYPE.ROW:this._commandService.executeCommand<ISetWorksheetRowIsAutoHeightCommandParams>(SetWorksheetRowIsAutoHeightCommand.id,{- ranges: [{ startRow: this._currentRow, endRow: this._currentRow, startColumn: 0, endColumn: this._sheetSkeletonManagerService.getCurrent()?.skeleton.worksheet.getColumnCount() || 0 }],+ ranges: [{+ startRow: this._currentRow,+ endRow: this._currentRow,+ startColumn,+ endColumn,+ }],});-this._rowResizeRect?.hide();- }- })- )+ break;+ }+ }));}diff --git a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts b/packages/sheets-ui/src/controllers/sheet-ui.controller.tsindex a05da2f8f3..ea68dfe4ef 100644--- a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts+++ b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts@@ -75,6 +75,7 @@ import {MoveSelectionEnterAndTabCommand,SelectAllCommand,} from '../commands/commands/set-selection.command';+import { SetWorksheetColAutoWidthCommand } from '../commands/commands/set-worksheet-auto-col-width.command';import { ChangeZoomRatioCommand, SetZoomRatioCommand } from '../commands/commands/set-zoom-ratio.command';import { ShowMenuListCommand } from '../commands/commands/unhide.command';import { AddWorksheetProtectionCommand, ChangeSheetProtectionFromSheetBarCommand, DeleteWorksheetProtectionCommand, DeleteWorksheetProtectionFormSheetBarCommand, SetWorksheetProtectionCommand } from '../commands/commands/worksheet-protection.command';@@ -93,8 +94,8 @@ import { SheetPermissionOpenDialogOperation } from '../commands/operations/sheetimport { SheetPermissionOpenPanelOperation } from '../commands/operations/sheet-permission-open-panel.operation';import { SidebarDefinedNameOperation } from '../commands/operations/sidebar-defined-name.operation';import { BorderPanel } from '../components/border-panel/BorderPanel';-import { BORDER_PANEL_COMPONENT } from '../components/border-panel/interface';+import { BORDER_PANEL_COMPONENT } from '../components/border-panel/interface';import { COLOR_PICKER_COMPONENT, ColorPicker } from '../components/color-picker';import {FONT_FAMILY_COMPONENT,@@ -280,6 +281,7 @@ export class SheetUIController extends Disposable {SetWorksheetProtectionCommand,DeleteWorksheetProtectionFormSheetBarCommand,SetProtectionCommand,+ SetWorksheetColAutoWidthCommand,].forEach((c) => {this.disposeWithMe(this._commandService.registerCommand(c));});diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.tsindex e73ddaab5b..f641aa22ca 100644--- a/packages/sheets-ui/src/index.ts+++ b/packages/sheets-ui/src/index.ts@@ -81,6 +81,7 @@ export type { IDiscreteRange } from './controllers/utils/range-tools';export { rangeToDiscreteRange, virtualizeDiscreteRanges } from './controllers/utils/range-tools';export { type IHoverCellPosition } from './services/hover-manager.service';export { AFFECT_LAYOUT_STYLES, AutoHeightController } from './controllers/auto-height.controller';+export { AutoWidthController } from './controllers/auto-width.controller';export { type IDragCellPosition } from './services/drag-manager.service';export { SheetMenuPosition } from './controllers/menu/menu';export { useHighlightRange } from './hooks/useHighlightRange';diff --git a/packages/sheets-ui/src/locale/zh-TW.ts b/packages/sheets-ui/src/locale/zh-TW.tsindex bc8cad25d5..e49fdee8a8 100644--- a/packages/sheets-ui/src/locale/zh-TW.ts+++ b/packages/sheets-ui/src/locale/zh-TW.ts@@ -630,4 +630,3 @@ const locale: typeof zhCN = {},};export default locale;-diff --git a/packages/sheets-ui/src/plugin.ts b/packages/sheets-ui/src/plugin.tsindex ac053c6fbf..bf97200caf 100644--- a/packages/sheets-ui/src/plugin.ts+++ b/packages/sheets-ui/src/plugin.ts@@ -25,6 +25,7 @@ import { filter } from 'rxjs/operators';import { ActiveWorksheetController } from './controllers/active-worksheet/active-worksheet.controller';import { AutoFillController } from './controllers/auto-fill.controller';import { AutoHeightController } from './controllers/auto-height.controller';+import { AutoWidthController } from './controllers/auto-width.controller';import { CellAlertRenderController } from './controllers/cell-alert.controller';import { CellCustomRenderController } from './controllers/cell-custom-render.controller';import { SheetCheckboxController } from './controllers/checkbox.controller';@@ -136,6 +137,7 @@ export class UniverSheetsUIPlugin extends Plugin {// controllers[ActiveWorksheetController],[AutoHeightController],+ [AutoWidthController],[FormulaEditorController],[SheetClipboardController],[SheetsRenderService],@@ -189,6 +191,7 @@ export class UniverSheetsUIPlugin extends Plugin {[SheetsDefinedNameController],[StatusBarController],[AutoHeightController],+ [AutoWidthController],[EditorDataSyncController],[SheetCheckboxController],]);diff --git a/packages/sheets/src/commands/commands/set-worksheet-col-width.command.ts b/packages/sheets/src/commands/commands/set-worksheet-col-width.command.tsindex b254cb83c3..e1e2190509 100644--- a/packages/sheets/src/commands/commands/set-worksheet-col-width.command.ts+++ b/packages/sheets/src/commands/commands/set-worksheet-col-width.command.ts@@ -15,6 +15,8 @@*/import type { IAccessor, ICommand, IRange } from '@univerjs/core';+import type { ISetWorksheetColWidthMutationParams } from '../mutations/set-worksheet-col-width.mutation';+import {CommandType,ICommandService,@@ -24,10 +26,8 @@ import {Rectangle,sequenceExecute,} from '@univerjs/core';-import { SheetsSelectionsService } from '../../services/selections/selection-manager.service';import { SheetInterceptorService } from '../../services/sheet-interceptor/sheet-interceptor.service';-import type { ISetWorksheetColWidthMutationParams } from '../mutations/set-worksheet-col-width.mutation';import {SetWorksheetColWidthMutation,SetWorksheetColWidthMutationFactory,@@ -203,3 +203,65 @@ export const SetColWidthCommand: ICommand = {return false;},};++export interface ISetWorksheetColIsAutoWidthCommandParams {+ unitId?: string;+ subUnitId?: string;+ ranges?: IRange[]; // For Facade API+}++export const SetWorksheetColIsAutoWidthCommand: ICommand = {+ type: CommandType.COMMAND,+ id: 'sheet.command.set-col-is-auto-width',+ handler: async (accessor: IAccessor, params?: ISetWorksheetColIsAutoWidthCommandParams) => {+ const commandService = accessor.get(ICommandService);+ const undoRedoService = accessor.get(IUndoRedoService);+ const selectionManagerService = accessor.get(SheetsSelectionsService);+ const univerInstanceService = accessor.get(IUniverInstanceService);++ const target = getSheetCommandTarget(univerInstanceService, params);+ if (!target) return false;++ const { unitId, subUnitId } = target;++ let ranges = [];+ if (params?.ranges) {+ ranges = [...params.ranges];+ } else {+ const selections = selectionManagerService.getCurrentSelections();+ for (let i = 0; i < selections.length; i++) {+ ranges.push(selections[i].range);+ }+ }++ if (!ranges?.length) {+ return false;+ }++ const redoMutationParams: Required<ISetWorksheetColIsAutoWidthCommandParams> = {+ unitId,+ subUnitId,+ ranges,+ };++ // undos redos comes from auto-width.controller+ // for intercept 'sheet.command.set-col-is-auto-width' command.+ const { undos, redos } = accessor.get(SheetInterceptorService).onCommandExecute({+ id: SetWorksheetColIsAutoWidthCommand.id,+ params: redoMutationParams,+ });++ const result = sequenceExecute([...redos], commandService);+ if (result.result) {+ undoRedoService.pushUndoRedo({+ unitID: unitId,+ undoMutations: [...undos],+ redoMutations: [...redos],+ });++ return true;+ }++ return false;+ },+};diff --git a/packages/sheets/src/commands/commands/set-worksheet-row-height.command.ts b/packages/sheets/src/commands/commands/set-worksheet-row-height.command.tsindex cbfafae0df..3c2c53e10a 100644--- a/packages/sheets/src/commands/commands/set-worksheet-row-height.command.ts+++ b/packages/sheets/src/commands/commands/set-worksheet-row-height.command.ts@@ -15,6 +15,11 @@*/import type { IAccessor, ICommand, IRange } from '@univerjs/core';+import type {+ ISetWorksheetRowHeightMutationParams,+ ISetWorksheetRowIsAutoHeightMutationParams,+} from '../mutations/set-worksheet-row-height.mutation';+import {BooleanNumber,CommandType,@@ -25,13 +30,8 @@ import {Rectangle,sequenceExecute,} from '@univerjs/core';-import { SheetsSelectionsService } from '../../services/selections/selection-manager.service';import { SheetInterceptorService } from '../../services/sheet-interceptor/sheet-interceptor.service';-import type {- ISetWorksheetRowHeightMutationParams,- ISetWorksheetRowIsAutoHeightMutationParams,-} from '../mutations/set-worksheet-row-height.mutation';import {SetWorksheetRowHeightMutation,SetWorksheetRowHeightMutationFactory,diff --git a/packages/sheets/src/commands/mutations/set-worksheet-col-width.mutation.ts b/packages/sheets/src/commands/mutations/set-worksheet-col-width.mutation.tsindex 12408ea46b..12dfc5e9e5 100644--- a/packages/sheets/src/commands/mutations/set-worksheet-col-width.mutation.ts+++ b/packages/sheets/src/commands/mutations/set-worksheet-col-width.mutation.ts@@ -56,6 +56,9 @@ export const SetWorksheetColWidthMutationFactory = (};};+/**+ * Set width of column manually+ */export const SetWorksheetColWidthMutation: IMutation<ISetWorksheetColWidthMutationParams> = {id: 'sheet.mutation.set-worksheet-col-width',type: CommandType.MUTATION,@@ -68,10 +71,11 @@ export const SetWorksheetColWidthMutation: IMutation<ISetWorksheetColWidthMutaticonst defaultColumnWidth = worksheet.getConfig().defaultColumnWidth;const manager = worksheet.getColumnManager();const ranges = params.ranges;-for (let i = 0; i < ranges.length; i++) {const range = ranges[i];for (let j = range.startColumn; j < range.endColumn + 1; j++) {+ const visible = worksheet.getColVisible(j);+ if (!visible) continue;const column = manager.getColumnOrCreate(j);if (typeof params.colWidth === 'number') {column.w = params.colWidth;diff --git a/packages/sheets/src/controllers/basic-worksheet.controller.ts b/packages/sheets/src/controllers/basic-worksheet.controller.tsindex f154247cb6..25c5099929 100644--- a/packages/sheets/src/controllers/basic-worksheet.controller.ts+++ b/packages/sheets/src/controllers/basic-worksheet.controller.ts@@ -172,7 +172,6 @@ export class BasicWorksheetController extends Disposable implements IDisposableSetNumfmtMutation,ReorderRangeMutation,EmptyMutation,- SetWorksheetColWidthMutation,SetWorksheetDefaultStyleMutation,SetWorksheetRowColumnStyleMutation,] as IMutation<object>[]).forEach((mutation) => {@@ -250,10 +249,14 @@ export class BasicWorksheetController extends Disposable implements IDisposableSetWorksheetNameCommand,SetWorksheetOrderCommand,SetWorksheetOrderMutation,+SetWorksheetRowAutoHeightMutation,SetWorksheetRowHeightMutation,SetWorksheetRowIsAutoHeightCommand,SetWorksheetRowIsAutoHeightMutation,+ SetWorksheetColWidthMutation,+ // SetWorksheetColIsAutoWidthCommand,+SetSelectionsOperation,ScrollToCellOperation,InsertDefinedNameCommand,diff --git a/packages/sheets/src/index.ts b/packages/sheets/src/index.tsindex 6762d9bad3..638d1a0506 100644--- a/packages/sheets/src/index.ts+++ b/packages/sheets/src/index.ts@@ -392,6 +392,7 @@ export {type ISetWorksheetRowAutoHeightMutationParams,type ISetWorksheetRowHeightMutationParams,type ISetWorksheetRowIsAutoHeightMutationParams,+SetWorksheetRowAutoHeightMutation,SetWorksheetRowAutoHeightMutationFactory,SetWorksheetRowHeightMutation,diff --git a/packages/ui/src/common/component-manager.ts b/packages/ui/src/common/component-manager.tsindex 6eab080032..9f11c43a4c 100644--- a/packages/ui/src/common/component-manager.ts+++ b/packages/ui/src/common/component-manager.ts@@ -29,6 +29,7 @@ import {AllBorderSingle,AmplifySingle,AutoHeight,+ AutoWidth,AutowrapSingle,AvgSingle,BackSlashSingle,@@ -220,6 +221,7 @@ export class ComponentManager {Hide,HorizontalBorder,AutoHeight,+ AutoWidth,AdjustHeight,AdjustWidth,AvgSingle,