boyun/by-onlineeditor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: preserve ocd value ids

Browse Source
This commit is contained in:
hanshiyang 2026-06-04 15:53:41 +08:00
parent d34d1709ef
commit 6d74559a0f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/editor/dataset/constant/Element.ts
View File

@ -39,6 +39,7 @@ export const EDITOR_ELEMENT_COPY_ATTR: Array<keyof IElement> = [
] ]
export const EDITOR_ELEMENT_ZIP_ATTR: Array<keyof IElement> = [ export const EDITOR_ELEMENT_ZIP_ATTR: Array<keyof IElement> = [
'id',
'type', 'type',
'font', 'font',
'size', 'size',

2
src/utils/ocd.ts
View File

@ -3,7 +3,7 @@ import { IEditorData } from '../editor'
const CONFLICT_MARKER_HIGHLIGHT = '#fff3cd' const CONFLICT_MARKER_HIGHLIGHT = '#fff3cd'
const CONFLICT_MARKER_COLOR = '#b42318' const CONFLICT_MARKER_COLOR = '#b42318'
const CONFLICT_MARKER_REG = /^(<<<<<<<|=======|>>>>>>>)\b/ const CONFLICT_MARKER_REG = /^(<<<<<<<|=======|>>>>>>>).*/
type UnknownRecord = Record<string, unknown> type UnknownRecord = Record<string, unknown>