feat: preserve ocd value ids

2026-06-04 15:53:41 +08:00 · 2026-06-04 15:53:41 +08:00 · 6d74559a0f
commit 6d74559a0f
parent d34d1709ef
2 changed files with 2 additions and 1 deletions
--- a/src/editor/dataset/constant/Element.ts
+++ b/src/editor/dataset/constant/Element.ts
@ -39,6 +39,7 @@ export const EDITOR_ELEMENT_COPY_ATTR: Array<keyof IElement> = [
 ]

 export const EDITOR_ELEMENT_ZIP_ATTR: Array<keyof IElement> = [
+  'id',
  'type',
  'font',
  'size',
--- a/src/utils/ocd.ts
+++ b/src/utils/ocd.ts
@ -3,7 +3,7 @@ import { IEditorData } from '../editor'

 const CONFLICT_MARKER_HIGHLIGHT = '#fff3cd'
 const CONFLICT_MARKER_COLOR = '#b42318'
-const CONFLICT_MARKER_REG = /^(<<<<<<<|=======|>>>>>>>)\b/
+const CONFLICT_MARKER_REG = /^(<<<<<<<|=======|>>>>>>>).*/

 type UnknownRecord = Record<string, unknown>