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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(drawing): preserve nested update and undo operations (#7713)
白熱1571db4fc218
diff --git a/packages/drawing/src/services/__tests__/drawing-manager-impl.service.spec.ts b/packages/drawing/src/services/__tests__/drawing-manager-impl.service.spec.tsindex 6386bd340c..8b2be1a59d 100644--- a/packages/drawing/src/services/__tests__/drawing-manager-impl.service.spec.ts+++ b/packages/drawing/src/services/__tests__/drawing-manager-impl.service.spec.ts@@ -179,6 +179,35 @@ describe('UnitDrawingService', () => {});});+ it('updates and restores nested chart coordinates without losing the drawing operation', () => {+ const drawing = {+ ...createDrawing('chart', { drawingType: DrawingTypeEnum.DRAWING_CHART }),+ transform: { left: 100, top: 100, width: 200, height: 80, angle: 15 },+ sheetTransform: {+ from: { column: 1, columnOffset: 10, row: 2, rowOffset: 20 },+ to: { column: 4, columnOffset: 30, row: 6, rowOffset: 40 },+ },+ };+ const updated = {+ ...drawing,+ transform: { left: 360, top: 200, width: 240, height: 80, flipX: true },+ sheetTransform: {+ from: { column: 5, columnOffset: 15, row: 4, rowOffset: 25 },+ to: { column: 9, columnOffset: 35, row: 8, rowOffset: 45 },+ },+ };+ service.applyJson1(unitId, subUnitId, service.getBatchAddOp([drawing]).redo);++ const updateOp = service.getBatchUpdateOp([updated]);++ expect(updateOp.objects).toEqual([createSearch('chart')]);+ service.applyJson1(unitId, subUnitId, updateOp.redo);+ expect(service.getDrawingByParam(createSearch('chart'))).toEqual(updated);++ service.applyJson1(unitId, subUnitId, updateOp.undo);+ expect(service.getDrawingByParam(createSearch('chart'))).toEqual(drawing);+ });+it('preserves disjoint nested fields across concurrent drawing updates', () => {const base: NestedDrawingTestParam = {...createDrawing('shape-1'),diff --git a/packages/drawing/src/services/drawing-manager-impl.service.ts b/packages/drawing/src/services/drawing-manager-impl.service.tsindex 5a779055d4..75dda742b1 100644--- a/packages/drawing/src/services/drawing-manager-impl.service.ts+++ b/packages/drawing/src/services/drawing-manager-impl.service.ts@@ -151,14 +151,15 @@ function appendJsonUpdateOps(hasOnlyEnumerableOwnProperties(oldValue) &&hasOnlyEnumerableOwnProperties(newValue)) {- const keys = new Set([...Object.keys(oldValue), ...Object.keys(newValue)]);- keys.forEach((key) => appendJsonUpdateOps(- ops,- [...path, key],- newValue[key],- oldValue[key],- Object.prototype.hasOwnProperty.call(oldValue, key) && oldValue[key] !== undefined- ));+ for (const key of new Set([...Object.keys(oldValue), ...Object.keys(newValue)])) {+ appendJsonUpdateOps(+ ops,+ [...path, key],+ newValue[key],+ oldValue[key],+ Object.prototype.hasOwnProperty.call(oldValue, key) && oldValue[key] !== undefined+ );+ }return;}