Skip to content

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.

fix(sheets-ui): set frozen to max column should limited & doc list-paragraph optimize (#2983)

zhangw64917c2ace99
diff --git a/packages/docs-ui/src/controllers/doc-auto-format.controller.ts b/packages/docs-ui/src/controllers/doc-auto-format.controller.ts
index 34de7d881d..d79f3648da 100644
--- a/packages/docs-ui/src/controllers/doc-auto-format.controller.ts
+++ b/packages/docs-ui/src/controllers/doc-auto-format.controller.ts
@@ -37,10 +37,17 @@ export class DocAutoFormatController extends Disposable {
this._docAutoFormatService.registerAutoFormat({
id: TabCommand.id,
match: (context) => {
- const { selection, paragraphs } = context;
+ const { selection, paragraphs, unit } = context;
+
// 1. match 1 bullet paragraph, range.start == paragraph.start
- if (paragraphs.length === 1 && selection.startOffset === paragraphs[0].paragraphStart) {
- // 2. cross paragraphs, some paragraph is bullet
+ if (paragraphs.length === 1 && selection.startOffset === paragraphs[0].paragraphStart && paragraphs[0].bullet) {
+ // 2. cross paragraphs, some paragraph is bullet
+ const allParagraphs = unit.getBody()?.paragraphs;
+ // 3. disable first bullet indent
+ const bulletParagraphs = allParagraphs?.filter((p) => p.bullet?.listId === paragraphs[0].bullet!.listId);
+ if (bulletParagraphs?.findIndex((p) => p.startIndex === paragraphs[0].startIndex) === 0) {
+ return false;
+ }
return true;
} else if (paragraphs.length > 1) {
return true;
diff --git a/packages/docs/src/commands/commands/list.command.ts b/packages/docs/src/commands/commands/list.command.ts
index 8c70a9998a..4c8719e533 100644
--- a/packages/docs/src/commands/commands/list.command.ts
+++ b/packages/docs/src/commands/commands/list.command.ts
@@ -16,6 +16,7 @@
import type { ICommand, IListData, IMutationInfo, IParagraph, IParagraphRange, ISectionBreak } from '@univerjs/core';
import {
+ BooleanNumber,
CommandType,
GridType,
ICommandService,
@@ -125,7 +126,7 @@ export const ListOperationCommand: ICommand<IListOperationCommandParams> = {
const { defaultTabStop = 36 } = docDataModel.getSnapshot().documentStyle;
for (const paragraph of currentParagraphs) {
- const { startIndex, paragraphStyle = {} } = paragraph;
+ const { startIndex, paragraphStyle = {}, bullet } = paragraph;
const { indentFirstLine, snapToGrid, indentStart } = paragraphStyle;
const paragraphProperties = lists[listType].nestingLevel[0].paragraphProperties || {};
const { hanging: listHanging, indentStart: listIndentStart } = paragraphProperties;
@@ -170,18 +171,23 @@ export const ListOperationCommand: ICommand<IListOperationCommandParams> = {
textStyle: {
...paragraphStyle.textStyle,
...bulletParagraphTextStyle,
+ ...bullet?.listType === PresetListType.CHECK_LIST_CHECKED
+ ? {
+ st: {
+ s: BooleanNumber.FALSE,
+ },
+ }
+ : null,
},
indentFirstLine: undefined,
hanging: listHanging,
indentStart: { v: getNumberUnitValue(listIndentStart, charSpaceApply) - getNumberUnitValue(listHanging, charSpaceApply) + getNumberUnitValue(indentFirstLine, charSpaceApply) + getNumberUnitValue(indentStart, charSpaceApply) },
},
bullet: {
- ...(paragraph.bullet ?? {
- nestingLevel: 0,
- textStyle: {
- fs: 20,
- },
- }),
+ nestingLevel: bullet?.nestingLevel ?? 0,
+ textStyle: {
+ fs: 20,
+ },
listType,
listId,
},
@@ -214,7 +220,7 @@ interface IChangeListTypeCommandParams {
export const ChangeListTypeCommand: ICommand<IChangeListTypeCommandParams> = {
id: 'doc.command.change-list-type',
type: CommandType.COMMAND,
- // eslint-disable-next-line max-lines-per-function
+ // eslint-disable-next-line max-lines-per-function, complexity
handler: (accessor, params: IChangeListTypeCommandParams) => {
const textSelectionManagerService = accessor.get(TextSelectionManagerService);
const univerInstanceService = accessor.get(IUniverInstanceService);
@@ -267,7 +273,7 @@ export const ChangeListTypeCommand: ICommand<IChangeListTypeCommandParams> = {
const { defaultTabStop = 36 } = docDataModel.getSnapshot().documentStyle;
for (const paragraph of currentParagraphs) {
- const { startIndex, paragraphStyle = {} } = paragraph;
+ const { startIndex, paragraphStyle = {}, bullet } = paragraph;
const { indentFirstLine, snapToGrid, indentStart } = paragraphStyle;
const paragraphProperties = lists[listType].nestingLevel[0].paragraphProperties || {};
const bulletParagraphTextStyle = paragraphProperties.textStyle;
@@ -295,18 +301,25 @@ export const ChangeListTypeCommand: ICommand<IChangeListTypeCommandParams> = {
textStyle: {
...paragraphStyle.textStyle,
...bulletParagraphTextStyle,
+ ...bullet?.listType === PresetListType.CHECK_LIST_CHECKED
+ ? {
+ st: {
+ s: BooleanNumber.FALSE,
+ },
+ }
+ : null,
},
indentFirstLine: undefined,
hanging: listHanging,
indentStart: { v: getNumberUnitValue(listIndentStart, charSpaceApply) - getNumberUnitValue(listHanging, charSpaceApply) + getNumberUnitValue(indentFirstLine, charSpaceApply) + getNumberUnitValue(indentStart, charSpaceApply) },
},
bullet: {
- ...(paragraph.bullet ?? {
- nestingLevel: 0,
- textStyle: {
+ nestingLevel: bullet?.nestingLevel ?? 0,
+ textStyle: bullet?.listType === listType
+ ? bullet.textStyle
+ : {
fs: 20,
},
- }),
listType,
listId,
},
diff --git a/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
index 7c907f28a5..d395dfb085 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
@@ -391,7 +391,8 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
// );
}
- private _getCurrentLastVisibleRow() {
+ // eslint-disable-next-line complexity
+ private _getCurrentLastVisible() {
const sheetObject = this._getSheetObject();
if (sheetObject == null) {
return;
@@ -407,15 +408,15 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
const currentScroll = this._scrollManagerService.getCurrentScrollState();
const skeletonViewHeight = (sheetObject.engine.height - skeleton.columnHeaderHeight) / scale;
- const start = currentScroll?.sheetViewStartRow ?? 0;
- const startHeight =
- start === 0
- ? -(currentScroll?.offsetY ?? 0)
- : skeleton.rowHeightAccumulation[start - 1] - (currentScroll?.offsetY ?? 0);
+ const skeletonViewWidth = (sheetObject.engine.width - skeleton.rowHeaderWidth) / scale;
+ const startRow = currentScroll?.sheetViewStartRow ?? 0;
+ const startHeight = startRow === 0
+ ? -(currentScroll?.offsetY ?? 0)
+ : skeleton.rowHeightAccumulation[startRow - 1] - (currentScroll?.offsetY ?? 0);
let lastRow = 0;
let hadFind = false;
- for (let i = start, len = skeleton.rowHeightAccumulation.length; i < len; i++) {
+ for (let i = startRow, len = skeleton.rowHeightAccumulation.length; i < len; i++) {
const height = skeleton.rowHeightAccumulation[i];
if (height - startHeight > skeletonViewHeight) {
lastRow = i;
@@ -429,7 +430,27 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
lastRow = skeleton.rowHeightAccumulation.length - 1;
}
- return lastRow;
+ const startColumn = currentScroll?.sheetViewStartColumn ?? 0;
+ const startWidth = startColumn === 0
+ ? -(currentScroll?.offsetX ?? 0)
+ : skeleton.columnWidthAccumulation[startColumn - 1] - (currentScroll?.offsetX ?? 0);
+
+ let lastColumn = 0;
+ let hadFindCol = false;
+ for (let i = startColumn, len = skeleton.columnWidthAccumulation.length; i < len; i++) {
+ const width = skeleton.columnWidthAccumulation[i];
+ if (width - startWidth > skeletonViewWidth) {
+ lastColumn = i;
+ hadFindCol = true;
+ break;
+ }
+ }
+
+ if (!hadFindCol) {
+ lastColumn = skeleton.columnWidthAccumulation.length - 1;
+ }
+
+ return { lastRow, lastColumn };
}
private _getActiveViewport(evt: IPointerEvent | IMouseEvent) {
@@ -469,8 +490,9 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
scene.disableEvent();
- const lastRow = this._getCurrentLastVisibleRow();
- const lastRowY = lastRow === undefined ? Number.POSITIVE_INFINITY : skeleton.rowHeightAccumulation[lastRow];
+ const last = this._getCurrentLastVisible();
+ const lastRowY = last === undefined ? Number.POSITIVE_INFINITY : skeleton.rowHeightAccumulation[last.lastRow];
+ const lastColumnX = last === undefined ? Number.POSITIVE_INFINITY : skeleton.columnWidthAccumulation[last.lastColumn - 1] + skeleton.rowHeaderWidth;
this._activeViewport = null;
const oldFreeze = this._getFreeze();
@@ -514,26 +536,26 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
?.setProps({
fill: this._freezeNormalHeaderColor,
});
- this._changeToRow = lastRow === undefined ? row : Math.min(row, lastRow);
+ this._changeToRow = last === undefined ? row : Math.min(row, last.lastRow);
this._changeToOffsetY = Math.min(startY, lastRowY);
this._activeViewport = activeViewport;
} else {
freezeObjectHeaderRect
.transformByState({
- left: startX - FREEZE_SIZE / 2,
+ left: Math.min(startX, lastColumnX) - FREEZE_SIZE / 2,
})
?.setProps({
fill: this._freezeActiveColor,
});
freezeObjectMainRect
.transformByState({
- left: startX - FREEZE_SIZE / 2,
+ left: Math.min(startX, lastColumnX) - FREEZE_SIZE / 2,
})
?.setProps({
fill: this._freezeNormalHeaderColor,
});
- this._changeToColumn = column;
+ this._changeToColumn = last === undefined ? column : Math.min(column, last.lastColumn);
this._changeToOffsetX = startX;
this._activeViewport = activeViewport;
}
diff --git a/packages/slides-ui/src/controllers/slide-editing.render-controller.ts b/packages/slides-ui/src/controllers/slide-editing.render-controller.ts
index 5ed273fe9b..f9d5fda3cc 100644
--- a/packages/slides-ui/src/controllers/slide-editing.render-controller.ts
+++ b/packages/slides-ui/src/controllers/slide-editing.render-controller.ts
@@ -727,7 +727,11 @@ export class SlideEditingRenderController extends Disposable implements IRenderM
}
private _editingChangedHandler() {
- const editingRichText = this._editorBridgeService.getEditorRect().richTextObj;
+ const editRect = this._editorBridgeService.getEditorRect();
+ if (!editRect) {
+ return;
+ }
+ const editingRichText = editRect.richTextObj;
editingRichText.refreshDocumentByDocData();
editingRichText.resizeToContentSize();