feat: improve ocd conflict merge ids

src/editor/core/draw/Draw.ts

@@ -29,6 +29,7 @@ import {
 } from '../../interface/Element'
 import { IRow, IRowElement } from '../../interface/Row'
 import { deepClone, getUUID, nextTick } from '../../utils'
+import { prepareOcdDocumentForSave } from '../../../utils/ocd'
 import { Cursor } from '../cursor/Cursor'
 import { CanvasEvent } from '../event/CanvasEvent'
 import { GlobalEvent } from '../event/GlobalEvent'
@@ -1196,7 +1197,7 @@ export class Draw {
     }
     return {
       version,
-      data,
+      data: prepareOcdDocumentForSave(data),
       options: deepClone(this.options)
     }
   }

src/editor/core/worker/WorkerManager.ts

@@ -8,6 +8,7 @@ import { ICatalog } from '../../interface/Catalog'
 import { IEditorResult } from '../../interface/Editor'
 import { IGetValueOption } from '../../interface/Draw'
 import { deepClone } from '../../utils'
+import { prepareOcdDocumentForSave } from '../../../utils/ocd'
 
 export class WorkerManager {
   private draw: Draw
@@ -78,7 +79,7 @@ export class WorkerManager {
       this.valueWorker.onmessage = evt => {
         resolve({
           version,
-          data: evt.data,
+          data: prepareOcdDocumentForSave(evt.data),
           options: deepClone(this.draw.getOptions())
         })
       }