@univerjs/docs-drawing 0.2.4 → 0.2.6

package/lib/cjs/index.js

@@ -1 +1 @@
-"use strict";var p=Object.defineProperty;var U=(i,r,e)=>r in i?p(i,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):i[r]=e;var v=(i,r,e)=>U(i,typeof r!="symbol"?r+"":r,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("@univerjs/core"),l=require("@wendellhu/redi"),f=require("@univerjs/drawing"),w=require("rxjs/operators");class _ extends f.UnitDrawingService{}const u=l.createIdentifier("univer.doc.plugin.doc-drawing.service");var O=Object.defineProperty,y=Object.getOwnPropertyDescriptor,h=(i,r,e,t)=>{for(var n=t>1?void 0:t?y(r,e):r,s=i.length-1,c;s>=0;s--)(c=i[s])&&(n=(t?c(r,e,n):c(n))||n);return t&&n&&O(r,e,n),n},o=(i,r)=>(e,t)=>r(e,t,i);const S="DOC_DRAWING_PLUGIN";let D=class extends a.Disposable{constructor(i){super(),this._commandService=i}};D=h([a.OnLifecycle(a.LifecycleStages.Starting,D),o(0,a.ICommandService)],D);let d=class extends a.Disposable{constructor(i,r,e,t,n){super(),this._docDrawingService=i,this._drawingManagerService=r,this._resourceManagerService=e,this._univerInstanceService=t,this._lifecycleService=n,this._init()}_init(){this._initSnapshot(),this._drawingInitializeListener()}_initSnapshot(){const i=e=>{const t=this._docDrawingService.getDrawingDataForUnit(e);return t!=null&&t[e]?JSON.stringify(t==null?void 0:t[e]):""},r=e=>{if(!e)return{data:{},order:[]};try{return JSON.parse(e)}catch{return{data:{},order:[]}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:S,businesses:[a.UniverInstanceType.UNIVER_DOC],toJson:e=>i(e),parseJson:e=>r(e),onUnLoad:e=>{this._setDrawingDataForUnit(e,{data:{},order:[]})},onLoad:(e,t)=>{var n,s;this._setDrawingDataForUnit(e,{data:(n=t.data)!=null?n:{},order:(s=t.order)!=null?s:[]})}}))}_setDrawingDataForUnit(i,r){const e=this._univerInstanceService.getUnit(i);e!=null&&(e.resetDrawing(r.data,r.order),this._initDataLoader())}_initDataLoader(){const i=this._univerInstanceService.getCurrentUnitForType(a.UniverInstanceType.UNIVER_DOC);if(!i)return!1;const r=i.getUnitId(),e=r,t=i.getDrawings(),n=i.getDrawingsOrder();if(!t||!n)return!1;Object.keys(t).forEach(c=>{const I=t[c];t[c]={...I}});const s={[e]:{unitId:r,subUnitId:e,data:t,order:n}};return this._docDrawingService.registerDrawingData(r,s),this._drawingManagerService.registerDrawingData(r,s),!0}_drawingInitializeListener(){this._lifecycleService.lifecycle$.pipe(w.filter(i=>i===a.LifecycleStages.Rendered),w.first()).subscribe(i=>{var e;const r=(e=this._univerInstanceService.getCurrentUnitForType(a.UniverInstanceType.UNIVER_DOC))==null?void 0:e.getUnitId();r&&(this._docDrawingService.initializeNotification(r),this._drawingManagerService.initializeNotification(r))})}};d=h([a.OnLifecycle(a.LifecycleStages.Starting,d),o(0,u),o(1,f.IDrawingManagerService),o(2,a.IResourceManagerService),o(3,a.IUniverInstanceService),o(4,l.Inject(a.LifecycleService))],d);var P=Object.defineProperty,L=Object.getOwnPropertyDescriptor,N=(i,r,e,t)=>{for(var n=t>1?void 0:t?L(r,e):r,s=i.length-1,c;s>=0;s--)(c=i[s])&&(n=(t?c(r,e,n):c(n))||n);return t&&n&&P(r,e,n),n},C=(i,r)=>(e,t)=>r(e,t,i),g;exports.UniverDocsDrawingPlugin=(g=class extends a.Plugin{constructor(r,e){super(),this._injector=e}onStarting(r){[[D],[d],[_],[u,{useClass:_}]].forEach(e=>r.add(e))}},v(g,"pluginName",S),v(g,"type",a.UniverInstanceType.UNIVER_DOC),g);exports.UniverDocsDrawingPlugin=N([C(1,l.Inject(l.Injector))],exports.UniverDocsDrawingPlugin);exports.DOCS_DRAWING_PLUGIN=S;exports.DocDrawingService=_;exports.IDocDrawingService=u;
+"use strict";var __defProp=Object.defineProperty;var __defNormalProp=(obj,key,value)=>key in obj?__defProp(obj,key,{enumerable:!0,configurable:!0,writable:!0,value}):obj[key]=value;var __name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __publicField=(obj,key,value)=>__defNormalProp(obj,typeof key!="symbol"?key+"":key,value);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const core=require("@univerjs/core"),drawing=require("@univerjs/drawing"),operators=require("rxjs/operators"),_DocDrawingService=class _DocDrawingService extends drawing.UnitDrawingService{};__name(_DocDrawingService,"DocDrawingService");let DocDrawingService=_DocDrawingService;const IDocDrawingService=core.createIdentifier("univer.doc.plugin.doc-drawing.service");var __defProp$1=Object.defineProperty,__getOwnPropDesc$1=Object.getOwnPropertyDescriptor,__decorateClass$1=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc$1(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp$1(target,key,result),result},"__decorateClass$1"),__decorateParam$1=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam$1");const DOCS_DRAWING_PLUGIN="DOC_DRAWING_PLUGIN";var _a;let DocDrawingLoadController=(_a=class extends core.Disposable{constructor(_commandService){super(),this._commandService=_commandService}},__name(_a,"DocDrawingLoadController"),_a);DocDrawingLoadController=__decorateClass$1([core.OnLifecycle(core.LifecycleStages.Starting,DocDrawingLoadController),__decorateParam$1(0,core.ICommandService)],DocDrawingLoadController);var _a2;let DocDrawingController=(_a2=class extends core.Disposable{constructor(_docDrawingService,_drawingManagerService,_resourceManagerService,_univerInstanceService,_lifecycleService){super(),this._docDrawingService=_docDrawingService,this._drawingManagerService=_drawingManagerService,this._resourceManagerService=_resourceManagerService,this._univerInstanceService=_univerInstanceService,this._lifecycleService=_lifecycleService,this._init()}_init(){this._initSnapshot(),this._drawingInitializeListener()}_initSnapshot(){const toJson=__name(unitId=>{const map=this._docDrawingService.getDrawingDataForUnit(unitId);return map!=null&&map[unitId]?JSON.stringify(map==null?void 0:map[unitId]):""},"toJson"),parseJson=__name(json=>{if(!json)return{data:{},order:[]};try{return JSON.parse(json)}catch{return{data:{},order:[]}}},"parseJson");this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:DOCS_DRAWING_PLUGIN,businesses:[core.UniverInstanceType.UNIVER_DOC],toJson:__name(unitId=>toJson(unitId),"toJson"),parseJson:__name(json=>parseJson(json),"parseJson"),onUnLoad:__name(unitId=>{this._setDrawingDataForUnit(unitId,{data:{},order:[]})},"onUnLoad"),onLoad:__name((unitId,value)=>{var _a4,_b;this._setDrawingDataForUnit(unitId,{data:(_a4=value.data)!=null?_a4:{},order:(_b=value.order)!=null?_b:[]})},"onLoad")}))}_setDrawingDataForUnit(unitId,drawingMapItem){const documentDataModel=this._univerInstanceService.getUnit(unitId);documentDataModel!=null&&(documentDataModel.resetDrawing(drawingMapItem.data,drawingMapItem.order),this._initDataLoader())}_initDataLoader(){const dataModel=this._univerInstanceService.getCurrentUnitForType(core.UniverInstanceType.UNIVER_DOC);if(!dataModel)return!1;const unitId=dataModel.getUnitId(),subUnitId=unitId,drawingDataModels=dataModel.getDrawings(),drawingOrderModel=dataModel.getDrawingsOrder();if(!drawingDataModels||!drawingOrderModel)return!1;Object.keys(drawingDataModels).forEach(drawingId=>{const drawingDataModel=drawingDataModels[drawingId];drawingDataModels[drawingId]={...drawingDataModel}});const subDrawings={[subUnitId]:{unitId,subUnitId,data:drawingDataModels,order:drawingOrderModel}};return this._docDrawingService.registerDrawingData(unitId,subDrawings),this._drawingManagerService.registerDrawingData(unitId,subDrawings),!0}_drawingInitializeListener(){this._lifecycleService.lifecycle$.pipe(operators.filter(stage=>stage===core.LifecycleStages.Rendered),operators.first()).subscribe(stage=>{var _a4;const unitId=(_a4=this._univerInstanceService.getCurrentUnitForType(core.UniverInstanceType.UNIVER_DOC))==null?void 0:_a4.getUnitId();unitId&&(this._docDrawingService.initializeNotification(unitId),this._drawingManagerService.initializeNotification(unitId))})}},__name(_a2,"DocDrawingController"),_a2);DocDrawingController=__decorateClass$1([core.OnLifecycle(core.LifecycleStages.Starting,DocDrawingController),__decorateParam$1(0,IDocDrawingService),__decorateParam$1(1,drawing.IDrawingManagerService),__decorateParam$1(2,core.IResourceManagerService),__decorateParam$1(3,core.IUniverInstanceService),__decorateParam$1(4,core.Inject(core.LifecycleService))],DocDrawingController);var __defProp2=Object.defineProperty,__getOwnPropDesc=Object.getOwnPropertyDescriptor,__decorateClass=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp2(target,key,result),result},"__decorateClass"),__decorateParam=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam"),_a3;exports.UniverDocsDrawingPlugin=(_a3=class extends core.Plugin{constructor(_config,_injector){super(),this._injector=_injector}onStarting(){[[DocDrawingLoadController],[DocDrawingController],[DocDrawingService],[IDocDrawingService,{useClass:DocDrawingService}]].forEach(dependency=>this._injector.add(dependency))}},__name(_a3,"UniverDocsDrawingPlugin"),__publicField(_a3,"pluginName",DOCS_DRAWING_PLUGIN),__publicField(_a3,"type",core.UniverInstanceType.UNIVER_DOC),_a3);exports.UniverDocsDrawingPlugin=__decorateClass([__decorateParam(1,core.Inject(core.Injector))],exports.UniverDocsDrawingPlugin);exports.DOCS_DRAWING_PLUGIN=DOCS_DRAWING_PLUGIN;exports.DocDrawingService=DocDrawingService;exports.IDocDrawingService=IDocDrawingService;

package/lib/es/index.js

@@ -1,129 +1,133 @@
-var O = Object.defineProperty;
-var P = (i, r, e) => r in i ? O(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
-var D = (i, r, e) => P(i, typeof r != "symbol" ? r + "" : r, e);
-import { OnLifecycle as f, LifecycleStages as l, LifecycleService as C, Disposable as S, ICommandService as N, UniverInstanceType as g, IResourceManagerService as m, IUniverInstanceService as y, Plugin as L } from "@univerjs/core";
-import { createIdentifier as M, Inject as h, Injector as b } from "@wendellhu/redi";
-import { UnitDrawingService as R, IDrawingManagerService as j } from "@univerjs/drawing";
-import { filter as E, first as F } from "rxjs/operators";
-class v extends R {
-}
-const w = M("univer.doc.plugin.doc-drawing.service");
-var J = Object.defineProperty, x = Object.getOwnPropertyDescriptor, p = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? x(r, e) : r, a = i.length - 1, s; a >= 0; a--)
-    (s = i[a]) && (n = (t ? s(r, e, n) : s(n)) || n);
-  return t && n && J(r, e, n), n;
-}, c = (i, r) => (e, t) => r(e, t, i);
-const I = "DOC_DRAWING_PLUGIN";
-let d = class extends S {
-  constructor(i) {
-    super(), this._commandService = i;
-  }
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
+import { createIdentifier, OnLifecycle, LifecycleStages, Inject, LifecycleService, Disposable, ICommandService, UniverInstanceType, IResourceManagerService, IUniverInstanceService, Plugin, Injector } from "@univerjs/core";
+import { UnitDrawingService, IDrawingManagerService } from "@univerjs/drawing";
+import { filter, first } from "rxjs/operators";
+const _DocDrawingService = class _DocDrawingService extends UnitDrawingService {
 };
-d = p([
-  f(l.Starting, d),
-  c(0, N)
-], d);
-let _ = class extends S {
-  constructor(i, r, e, t, n) {
-    super(), this._docDrawingService = i, this._drawingManagerService = r, this._resourceManagerService = e, this._univerInstanceService = t, this._lifecycleService = n, this._init();
+__name(_DocDrawingService, "DocDrawingService");
+let DocDrawingService = _DocDrawingService;
+const IDocDrawingService = createIdentifier("univer.doc.plugin.doc-drawing.service");
+var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$1(target, key, result), result;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1");
+const DOCS_DRAWING_PLUGIN = "DOC_DRAWING_PLUGIN";
+var _a;
+let DocDrawingLoadController = (_a = class extends Disposable {
+  constructor(_commandService) {
+    super(), this._commandService = _commandService;
+  }
+}, __name(_a, "DocDrawingLoadController"), _a);
+DocDrawingLoadController = __decorateClass$1([
+  OnLifecycle(LifecycleStages.Starting, DocDrawingLoadController),
+  __decorateParam$1(0, ICommandService)
+], DocDrawingLoadController);
+var _a2;
+let DocDrawingController = (_a2 = class extends Disposable {
+  constructor(_docDrawingService, _drawingManagerService, _resourceManagerService, _univerInstanceService, _lifecycleService) {
+    super(), this._docDrawingService = _docDrawingService, this._drawingManagerService = _drawingManagerService, this._resourceManagerService = _resourceManagerService, this._univerInstanceService = _univerInstanceService, this._lifecycleService = _lifecycleService, this._init();
   }
   _init() {
     this._initSnapshot(), this._drawingInitializeListener();
   }
   _initSnapshot() {
-    const i = (e) => {
-      const t = this._docDrawingService.getDrawingDataForUnit(e);
-      return t != null && t[e] ? JSON.stringify(t == null ? void 0 : t[e]) : "";
-    }, r = (e) => {
-      if (!e)
+    const toJson = /* @__PURE__ */ __name((unitId) => {
+      const map = this._docDrawingService.getDrawingDataForUnit(unitId);
+      return map != null && map[unitId] ? JSON.stringify(map == null ? void 0 : map[unitId]) : "";
+    }, "toJson"), parseJson = /* @__PURE__ */ __name((json) => {
+      if (!json)
         return { data: {}, order: [] };
       try {
-        return JSON.parse(e);
+        return JSON.parse(json);
       } catch {
         return { data: {}, order: [] };
       }
-    };
+    }, "parseJson");
     this.disposeWithMe(
       this._resourceManagerService.registerPluginResource({
-        pluginName: I,
-        businesses: [g.UNIVER_DOC],
-        toJson: (e) => i(e),
-        parseJson: (e) => r(e),
-        onUnLoad: (e) => {
-          this._setDrawingDataForUnit(e, { data: {}, order: [] });
-        },
-        onLoad: (e, t) => {
-          var n, a;
-          this._setDrawingDataForUnit(e, { data: (n = t.data) != null ? n : {}, order: (a = t.order) != null ? a : [] });
-        }
+        pluginName: DOCS_DRAWING_PLUGIN,
+        businesses: [UniverInstanceType.UNIVER_DOC],
+        toJson: /* @__PURE__ */ __name((unitId) => toJson(unitId), "toJson"),
+        parseJson: /* @__PURE__ */ __name((json) => parseJson(json), "parseJson"),
+        onUnLoad: /* @__PURE__ */ __name((unitId) => {
+          this._setDrawingDataForUnit(unitId, { data: {}, order: [] });
+        }, "onUnLoad"),
+        onLoad: /* @__PURE__ */ __name((unitId, value) => {
+          var _a4, _b;
+          this._setDrawingDataForUnit(unitId, { data: (_a4 = value.data) != null ? _a4 : {}, order: (_b = value.order) != null ? _b : [] });
+        }, "onLoad")
       })
     );
   }
-  _setDrawingDataForUnit(i, r) {
-    const e = this._univerInstanceService.getUnit(i);
-    e != null && (e.resetDrawing(r.data, r.order), this._initDataLoader());
+  _setDrawingDataForUnit(unitId, drawingMapItem) {
+    const documentDataModel = this._univerInstanceService.getUnit(unitId);
+    documentDataModel != null && (documentDataModel.resetDrawing(drawingMapItem.data, drawingMapItem.order), this._initDataLoader());
   }
   _initDataLoader() {
-    const i = this._univerInstanceService.getCurrentUnitForType(g.UNIVER_DOC);
-    if (!i)
+    const dataModel = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_DOC);
+    if (!dataModel)
       return !1;
-    const r = i.getUnitId(), e = r, t = i.getDrawings(), n = i.getDrawingsOrder();
-    if (!t || !n)
+    const unitId = dataModel.getUnitId(), subUnitId = unitId, drawingDataModels = dataModel.getDrawings(), drawingOrderModel = dataModel.getDrawingsOrder();
+    if (!drawingDataModels || !drawingOrderModel)
       return !1;
-    Object.keys(t).forEach((s) => {
-      const U = t[s];
-      t[s] = { ...U };
+    Object.keys(drawingDataModels).forEach((drawingId) => {
+      const drawingDataModel = drawingDataModels[drawingId];
+      drawingDataModels[drawingId] = { ...drawingDataModel };
     });
-    const a = {
-      [e]: {
-        unitId: r,
-        subUnitId: e,
-        data: t,
-        order: n
+    const subDrawings = {
+      [subUnitId]: {
+        unitId,
+        subUnitId,
+        data: drawingDataModels,
+        order: drawingOrderModel
       }
     };
-    return this._docDrawingService.registerDrawingData(r, a), this._drawingManagerService.registerDrawingData(r, a), !0;
+    return this._docDrawingService.registerDrawingData(unitId, subDrawings), this._drawingManagerService.registerDrawingData(unitId, subDrawings), !0;
   }
   _drawingInitializeListener() {
-    this._lifecycleService.lifecycle$.pipe(E((i) => i === l.Rendered), F()).subscribe((i) => {
-      var e;
-      const r = (e = this._univerInstanceService.getCurrentUnitForType(g.UNIVER_DOC)) == null ? void 0 : e.getUnitId();
-      r && (this._docDrawingService.initializeNotification(r), this._drawingManagerService.initializeNotification(r));
+    this._lifecycleService.lifecycle$.pipe(filter((stage) => stage === LifecycleStages.Rendered), first()).subscribe((stage) => {
+      var _a4;
+      const unitId = (_a4 = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_DOC)) == null ? void 0 : _a4.getUnitId();
+      unitId && (this._docDrawingService.initializeNotification(unitId), this._drawingManagerService.initializeNotification(unitId));
     });
   }
-};
-_ = p([
-  f(l.Starting, _),
-  c(0, w),
-  c(1, j),
-  c(2, m),
-  c(3, y),
-  c(4, h(C))
-], _);
-var $ = Object.defineProperty, z = Object.getOwnPropertyDescriptor, G = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? z(r, e) : r, a = i.length - 1, s; a >= 0; a--)
-    (s = i[a]) && (n = (t ? s(r, e, n) : s(n)) || n);
-  return t && n && $(r, e, n), n;
-}, V = (i, r) => (e, t) => r(e, t, i), o;
-let u = (o = class extends L {
-  constructor(i, r) {
-    super(), this._injector = r;
+}, __name(_a2, "DocDrawingController"), _a2);
+DocDrawingController = __decorateClass$1([
+  OnLifecycle(LifecycleStages.Starting, DocDrawingController),
+  __decorateParam$1(0, IDocDrawingService),
+  __decorateParam$1(1, IDrawingManagerService),
+  __decorateParam$1(2, IResourceManagerService),
+  __decorateParam$1(3, IUniverInstanceService),
+  __decorateParam$1(4, Inject(LifecycleService))
+], DocDrawingController);
+var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp2(target, key, result), result;
+}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), _a3;
+let UniverDocsDrawingPlugin = (_a3 = class extends Plugin {
+  constructor(_config, _injector) {
+    super(), this._injector = _injector;
   }
-  onStarting(i) {
+  onStarting() {
     [
-      [d],
-      [_],
-      [v],
-      [w, { useClass: v }]
-    ].forEach((r) => i.add(r));
+      [DocDrawingLoadController],
+      [DocDrawingController],
+      [DocDrawingService],
+      [IDocDrawingService, { useClass: DocDrawingService }]
+    ].forEach((dependency) => this._injector.add(dependency));
   }
-}, D(o, "pluginName", I), D(o, "type", g.UNIVER_DOC), o);
-u = G([
-  V(1, h(b))
-], u);
+}, __name(_a3, "UniverDocsDrawingPlugin"), __publicField(_a3, "pluginName", DOCS_DRAWING_PLUGIN), __publicField(_a3, "type", UniverInstanceType.UNIVER_DOC), _a3);
+UniverDocsDrawingPlugin = __decorateClass([
+  __decorateParam(1, Inject(Injector))
+], UniverDocsDrawingPlugin);
 export {
-  I as DOCS_DRAWING_PLUGIN,
-  v as DocDrawingService,
-  w as IDocDrawingService,
-  u as UniverDocsDrawingPlugin
+  DOCS_DRAWING_PLUGIN,
+  DocDrawingService,
+  IDocDrawingService,
+  UniverDocsDrawingPlugin
 };

package/lib/types/plugin.d.ts

@@ -1,10 +1,9 @@
-import { Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, Plugin, UniverInstanceType } from '@univerjs/core';
 
 export declare class UniverDocsDrawingPlugin extends Plugin {
     _injector: Injector;
     static pluginName: string;
     static type: UniverInstanceType;
     constructor(_config: undefined, _injector: Injector);
-    onStarting(_injector: Injector): void;
+    onStarting(): void;
 }

package/lib/types/services/doc-drawing.service.d.ts

@@ -15,5 +15,5 @@ export declare class DocDrawingService extends UnitDrawingService<IDocDrawing> {
 }
 export interface IDocDrawingService extends IUnitDrawingService<IDocDrawing> {
 }
-export declare const IDocDrawingService: import('@wendellhu/redi').IdentifierDecorator<IDocDrawingService>;
+export declare const IDocDrawingService: import('@univerjs/core').IdentifierDecorator<IDocDrawingService>;
 export {};

package/lib/umd/index.js

@@ -1 +1 @@
-(function(s,n){typeof exports=="object"&&typeof module<"u"?n(exports,require("@univerjs/core"),require("@wendellhu/redi"),require("@univerjs/drawing"),require("rxjs/operators")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@wendellhu/redi","@univerjs/drawing","rxjs/operators"],n):(s=typeof globalThis<"u"?globalThis:s||self,n(s.UniverDocsDrawing={},s.UniverCore,s["@wendellhu/redi"],s.UniverDrawing,s.rxjs.operators))})(this,function(s,n,g,S,h){"use strict";var L=Object.defineProperty;var N=(s,n,g)=>n in s?L(s,n,{enumerable:!0,configurable:!0,writable:!0,value:g}):s[n]=g;var w=(s,n,g)=>N(s,typeof n!="symbol"?n+"":n,g);var v;class l extends S.UnitDrawingService{}const _=g.createIdentifier("univer.doc.plugin.doc-drawing.service");var I=Object.defineProperty,U=Object.getOwnPropertyDescriptor,p=(t,i,e,r)=>{for(var a=r>1?void 0:r?U(i,e):i,c=t.length-1,o;c>=0;c--)(o=t[c])&&(a=(r?o(i,e,a):o(a))||a);return r&&a&&I(i,e,a),a},d=(t,i)=>(e,r)=>i(e,r,t);const f="DOC_DRAWING_PLUGIN";let u=class extends n.Disposable{constructor(t){super(),this._commandService=t}};u=p([n.OnLifecycle(n.LifecycleStages.Starting,u),d(0,n.ICommandService)],u);let D=class extends n.Disposable{constructor(t,i,e,r,a){super(),this._docDrawingService=t,this._drawingManagerService=i,this._resourceManagerService=e,this._univerInstanceService=r,this._lifecycleService=a,this._init()}_init(){this._initSnapshot(),this._drawingInitializeListener()}_initSnapshot(){const t=e=>{const r=this._docDrawingService.getDrawingDataForUnit(e);return r!=null&&r[e]?JSON.stringify(r==null?void 0:r[e]):""},i=e=>{if(!e)return{data:{},order:[]};try{return JSON.parse(e)}catch{return{data:{},order:[]}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:f,businesses:[n.UniverInstanceType.UNIVER_DOC],toJson:e=>t(e),parseJson:e=>i(e),onUnLoad:e=>{this._setDrawingDataForUnit(e,{data:{},order:[]})},onLoad:(e,r)=>{var a,c;this._setDrawingDataForUnit(e,{data:(a=r.data)!=null?a:{},order:(c=r.order)!=null?c:[]})}}))}_setDrawingDataForUnit(t,i){const e=this._univerInstanceService.getUnit(t);e!=null&&(e.resetDrawing(i.data,i.order),this._initDataLoader())}_initDataLoader(){const t=this._univerInstanceService.getCurrentUnitForType(n.UniverInstanceType.UNIVER_DOC);if(!t)return!1;const i=t.getUnitId(),e=i,r=t.getDrawings(),a=t.getDrawingsOrder();if(!r||!a)return!1;Object.keys(r).forEach(o=>{const C=r[o];r[o]={...C}});const c={[e]:{unitId:i,subUnitId:e,data:r,order:a}};return this._docDrawingService.registerDrawingData(i,c),this._drawingManagerService.registerDrawingData(i,c),!0}_drawingInitializeListener(){this._lifecycleService.lifecycle$.pipe(h.filter(t=>t===n.LifecycleStages.Rendered),h.first()).subscribe(t=>{var e;const i=(e=this._univerInstanceService.getCurrentUnitForType(n.UniverInstanceType.UNIVER_DOC))==null?void 0:e.getUnitId();i&&(this._docDrawingService.initializeNotification(i),this._drawingManagerService.initializeNotification(i))})}};D=p([n.OnLifecycle(n.LifecycleStages.Starting,D),d(0,_),d(1,S.IDrawingManagerService),d(2,n.IResourceManagerService),d(3,n.IUniverInstanceService),d(4,g.Inject(n.LifecycleService))],D);var y=Object.defineProperty,O=Object.getOwnPropertyDescriptor,P=(t,i,e,r)=>{for(var a=r>1?void 0:r?O(i,e):i,c=t.length-1,o;c>=0;c--)(o=t[c])&&(a=(r?o(i,e,a):o(a))||a);return r&&a&&y(i,e,a),a},j=(t,i)=>(e,r)=>i(e,r,t);s.UniverDocsDrawingPlugin=(v=class extends n.Plugin{constructor(i,e){super(),this._injector=e}onStarting(i){[[u],[D],[l],[_,{useClass:l}]].forEach(e=>i.add(e))}},w(v,"pluginName",f),w(v,"type",n.UniverInstanceType.UNIVER_DOC),v),s.UniverDocsDrawingPlugin=P([j(1,g.Inject(g.Injector))],s.UniverDocsDrawingPlugin),s.DOCS_DRAWING_PLUGIN=f,s.DocDrawingService=l,s.IDocDrawingService=_,Object.defineProperty(s,Symbol.toStringTag,{value:"Module"})});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?factory(exports,require("@univerjs/core"),require("@univerjs/drawing"),require("rxjs/operators")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@univerjs/drawing","rxjs/operators"],factory):(global=typeof globalThis<"u"?globalThis:global||self,factory(global.UniverDocsDrawing={},global.UniverCore,global.UniverDrawing,global.rxjs.operators))})(this,function(exports2,core,drawing,operators){"use strict";var __defProp=Object.defineProperty;var __defNormalProp=(obj,key,value)=>key in obj?__defProp(obj,key,{enumerable:!0,configurable:!0,writable:!0,value}):obj[key]=value;var __name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __publicField=(obj,key,value)=>__defNormalProp(obj,typeof key!="symbol"?key+"":key,value);var _a,_b,_c;const _DocDrawingService=class _DocDrawingService extends drawing.UnitDrawingService{};__name(_DocDrawingService,"DocDrawingService");let DocDrawingService=_DocDrawingService;const IDocDrawingService=core.createIdentifier("univer.doc.plugin.doc-drawing.service");var __defProp$1=Object.defineProperty,__getOwnPropDesc$1=Object.getOwnPropertyDescriptor,__decorateClass$1=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc$1(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp$1(target,key,result),result},"__decorateClass$1"),__decorateParam$1=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam$1");const DOCS_DRAWING_PLUGIN="DOC_DRAWING_PLUGIN";let DocDrawingLoadController=(_a=class extends core.Disposable{constructor(_commandService){super(),this._commandService=_commandService}},__name(_a,"DocDrawingLoadController"),_a);DocDrawingLoadController=__decorateClass$1([core.OnLifecycle(core.LifecycleStages.Starting,DocDrawingLoadController),__decorateParam$1(0,core.ICommandService)],DocDrawingLoadController);let DocDrawingController=(_b=class extends core.Disposable{constructor(_docDrawingService,_drawingManagerService,_resourceManagerService,_univerInstanceService,_lifecycleService){super(),this._docDrawingService=_docDrawingService,this._drawingManagerService=_drawingManagerService,this._resourceManagerService=_resourceManagerService,this._univerInstanceService=_univerInstanceService,this._lifecycleService=_lifecycleService,this._init()}_init(){this._initSnapshot(),this._drawingInitializeListener()}_initSnapshot(){const toJson=__name(unitId=>{const map=this._docDrawingService.getDrawingDataForUnit(unitId);return map!=null&&map[unitId]?JSON.stringify(map==null?void 0:map[unitId]):""},"toJson"),parseJson=__name(json=>{if(!json)return{data:{},order:[]};try{return JSON.parse(json)}catch{return{data:{},order:[]}}},"parseJson");this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:DOCS_DRAWING_PLUGIN,businesses:[core.UniverInstanceType.UNIVER_DOC],toJson:__name(unitId=>toJson(unitId),"toJson"),parseJson:__name(json=>parseJson(json),"parseJson"),onUnLoad:__name(unitId=>{this._setDrawingDataForUnit(unitId,{data:{},order:[]})},"onUnLoad"),onLoad:__name((unitId,value)=>{var _a2,_b2;this._setDrawingDataForUnit(unitId,{data:(_a2=value.data)!=null?_a2:{},order:(_b2=value.order)!=null?_b2:[]})},"onLoad")}))}_setDrawingDataForUnit(unitId,drawingMapItem){const documentDataModel=this._univerInstanceService.getUnit(unitId);documentDataModel!=null&&(documentDataModel.resetDrawing(drawingMapItem.data,drawingMapItem.order),this._initDataLoader())}_initDataLoader(){const dataModel=this._univerInstanceService.getCurrentUnitForType(core.UniverInstanceType.UNIVER_DOC);if(!dataModel)return!1;const unitId=dataModel.getUnitId(),subUnitId=unitId,drawingDataModels=dataModel.getDrawings(),drawingOrderModel=dataModel.getDrawingsOrder();if(!drawingDataModels||!drawingOrderModel)return!1;Object.keys(drawingDataModels).forEach(drawingId=>{const drawingDataModel=drawingDataModels[drawingId];drawingDataModels[drawingId]={...drawingDataModel}});const subDrawings={[subUnitId]:{unitId,subUnitId,data:drawingDataModels,order:drawingOrderModel}};return this._docDrawingService.registerDrawingData(unitId,subDrawings),this._drawingManagerService.registerDrawingData(unitId,subDrawings),!0}_drawingInitializeListener(){this._lifecycleService.lifecycle$.pipe(operators.filter(stage=>stage===core.LifecycleStages.Rendered),operators.first()).subscribe(stage=>{var _a2;const unitId=(_a2=this._univerInstanceService.getCurrentUnitForType(core.UniverInstanceType.UNIVER_DOC))==null?void 0:_a2.getUnitId();unitId&&(this._docDrawingService.initializeNotification(unitId),this._drawingManagerService.initializeNotification(unitId))})}},__name(_b,"DocDrawingController"),_b);DocDrawingController=__decorateClass$1([core.OnLifecycle(core.LifecycleStages.Starting,DocDrawingController),__decorateParam$1(0,IDocDrawingService),__decorateParam$1(1,drawing.IDrawingManagerService),__decorateParam$1(2,core.IResourceManagerService),__decorateParam$1(3,core.IUniverInstanceService),__decorateParam$1(4,core.Inject(core.LifecycleService))],DocDrawingController);var __defProp2=Object.defineProperty,__getOwnPropDesc=Object.getOwnPropertyDescriptor,__decorateClass=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp2(target,key,result),result},"__decorateClass"),__decorateParam=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam");exports2.UniverDocsDrawingPlugin=(_c=class extends core.Plugin{constructor(_config,_injector){super(),this._injector=_injector}onStarting(){[[DocDrawingLoadController],[DocDrawingController],[DocDrawingService],[IDocDrawingService,{useClass:DocDrawingService}]].forEach(dependency=>this._injector.add(dependency))}},__name(_c,"UniverDocsDrawingPlugin"),__publicField(_c,"pluginName",DOCS_DRAWING_PLUGIN),__publicField(_c,"type",core.UniverInstanceType.UNIVER_DOC),_c),exports2.UniverDocsDrawingPlugin=__decorateClass([__decorateParam(1,core.Inject(core.Injector))],exports2.UniverDocsDrawingPlugin),exports2.DOCS_DRAWING_PLUGIN=DOCS_DRAWING_PLUGIN,exports2.DocDrawingService=DocDrawingService,exports2.IDocDrawingService=IDocDrawingService,Object.defineProperty(exports2,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/docs-drawing",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "private": false,
   "description": "",
   "author": "DreamNum <developer@univer.ai>",
@@ -44,21 +44,19 @@
     "lib"
   ],
   "peerDependencies": {
-    "@wendellhu/redi": "0.16.0",
     "rxjs": ">=7.0.0",
-    "@univerjs/core": "0.2.4",
-    "@univerjs/drawing": "0.2.4"
+    "@univerjs/core": "0.2.6",
+    "@univerjs/drawing": "0.2.6"
   },
   "devDependencies": {
-    "@wendellhu/redi": "0.16.0",
-    "typescript": "^5.5.3",
-    "vite": "^5.3.4",
-    "vitest": "^2.0.3",
-    "@univerjs/core": "0.2.4",
-    "@univerjs/docs": "0.2.4",
-    "@univerjs/drawing": "0.2.4",
-    "@univerjs/engine-render": "0.2.4",
-    "@univerjs/shared": "0.2.4"
+    "typescript": "^5.5.4",
+    "vite": "^5.3.5",
+    "vitest": "^2.0.4",
+    "@univerjs/core": "0.2.6",
+    "@univerjs/engine-render": "0.2.6",
+    "@univerjs/drawing": "0.2.6",
+    "@univerjs/docs": "0.2.6",
+    "@univerjs/shared": "0.2.6"
   },
   "univerSpace": {
     ".": {