Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(docs-ui): doc list render error after operation like break-line #3766

Merged
merged 10 commits into from
Oct 16, 2024
Merged

fix(docs-ui): doc list render error after operation like break-line #3766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6f57843
feat: update
weird94 Oct 15, 2024
7041dba
feat: update
weird94 Oct 15, 2024
65fbad5
Merge remote-tracking branch 'origin/dev' into feat/sheet-checkbox
weird94 Oct 15, 2024
c1ca428
feat: update
weird94 Oct 15, 2024
77d1b9b
feat: update
weird94 Oct 15, 2024
b892e9e
feat: update
weird94 Oct 15, 2024
b3e9ecb
feat: update
weird94 Oct 16, 2024
d5e6d78
feat: update
weird94 Oct 16, 2024
af8aa3e
feat: update
weird94 Oct 16, 2024
fa2ab3e
Merge branch 'dev' into feat/sheet-checkbox
weird94 Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 108 additions & 0 deletions mockdata/src/sheets/demo/default-workbook-data-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14287,6 +14287,114 @@ export const DEFAULT_WORKBOOK_DATA_DEMO: IWorkbookData = {
t: 1,
},
},
25: {
10: {
p: {
id: '__INTERNAL_EDITOR__ZEN_EDITOR',
documentStyle: {
pageSize: {
width: 37.2261962890625,
height: undefined,
},
documentFlavor: 1,
marginTop: 0,
marginBottom: 2,
marginRight: 2,
marginLeft: 2,
renderConfig: {
horizontalAlign: 2,
verticalAlign: 0,
centerAngle: 0,
vertexAngle: 0,
wrapStrategy: 0,
},
},
drawings: {},
drawingsOrder: [],
body: {
dataStream: '1\r\n',
textRuns: [],
paragraphs: [
{
startIndex: 1,
paragraphStyle: {
horizontalAlign: 2,
},
bullet: {
nestingLevel: 0,
textStyle: {
fs: 20,
},
listType: 'CHECK_LIST_CHECKED',
listId: 'w6THUh',
},
},
],
sectionBreaks: [
{
startIndex: 2,
},
],
customRanges: [],
customDecorations: [],
},
},
s: 'idtqdi',
},
11: {
p: {
id: '__INTERNAL_EDITOR__ZEN_EDITOR',
documentStyle: {
pageSize: {
width: 37.2261962890625,
height: undefined,
},
documentFlavor: 1,
marginTop: 0,
marginBottom: 2,
marginRight: 2,
marginLeft: 2,
renderConfig: {
horizontalAlign: 2,
verticalAlign: 0,
centerAngle: 0,
vertexAngle: 0,
wrapStrategy: 0,
},
},
drawings: {},
drawingsOrder: [],
body: {
dataStream: '1\r\n',
textRuns: [],
paragraphs: [
{
startIndex: 1,
paragraphStyle: {
horizontalAlign: 2,
},
bullet: {
nestingLevel: 0,
textStyle: {
fs: 20,
},
listType: 'CHECK_LIST',
listId: 'w6THUh',
},
},
],
sectionBreaks: [
{
startIndex: 2,
},
],
customRanges: [],
customDecorations: [],
},
},
s: 'idtqdi',
},
},
},

freeze: {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/docs/data-model/text-x/apply-utils/update-apply.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

import type { Nullable } from '../../../../shared';
import { Tools, UpdateDocsAttributeType } from '../../../../shared';
import type {
ICustomBlock,
ICustomDecoration,
Expand All @@ -26,6 +25,7 @@ import type {
ISectionBreak,
ITextRun,
} from '../../../../types/interfaces';
import { Tools, UpdateDocsAttributeType } from '../../../../shared';
import { PresetListType } from '../../preset-list-type';
import {
deleteCustomBlocks,
Expand All @@ -39,6 +39,7 @@ import {
insertCustomDecorations,
insertCustomRanges,
insertParagraphs,
insertSectionBreaks,
insertTables,
insertTextRuns,
normalizeTextRuns,
Expand Down Expand Up @@ -229,7 +230,6 @@ function updateParagraphs(
}

const removeParagraphs = deleteParagraphs(body, textLength, currentIndex);

if (coverType !== UpdateDocsAttributeType.REPLACE) {
const newUpdateParagraphs: IParagraph[] = [];
for (const updateParagraph of updateDataParagraphs) {
Expand Down Expand Up @@ -336,7 +336,7 @@ function updateSectionBreaks(
}
updateBody.sectionBreaks = newUpdateSectionBreaks;
}
insertParagraphs(body, updateBody, textLength, currentIndex);
insertSectionBreaks(body, updateBody, textLength, currentIndex);

return removeSectionBreaks;
}
Expand Down
10 changes: 10 additions & 0 deletions packages/core/src/docs/data-model/text-x/build-utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import { copyCustomRange, getCustomRangesInterestsWithRange, isIntersecting, shouldDeleteCustomRange } from './custom-range';
import { changeParagraphBulletNestLevel, setParagraphBullet, switchParagraphBullet, toggleChecklistParagraph } from './paragraph';
import { fromPlainText, getPlainText, isEmptyDocument } from './parse';
import { getDeleteSelection, getInsertSelection, getRetainAndDeleteFromReplace, isSegmentIntersects, makeSelection, normalizeSelection } from './selection';
import { addCustomRangeTextX, deleteCustomRangeTextX, getRetainAndDeleteAndExcludeLineBreak, replaceSelectionTextX } from './text-x-utils';
Expand Down Expand Up @@ -52,6 +53,15 @@ export class BuildTextUtils {
fromPlainText,
isEmptyDocument,
};

static paragraph = {
bullet: {
set: setParagraphBullet,
switch: switchParagraphBullet,
toggleChecklist: toggleChecklistParagraph,
changeNestLevel: changeParagraphBulletNestLevel,
},
};
}

export type { IAddCustomRangeTextXParam, IDeleteCustomRangeParam, IReplaceSelectionTextXParams } from './text-x-utils';
Loading
Loading