@gedit/editor-2d 0.2.45 → 0.2.47

package/lib/browser/utils/snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAEL,UAAU,EAEV,cAAc,EACd,OAAO,EACP,eAAe,EACf,UAAU,EAEX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,OAAO,EAAE,YAAY,CAAA;CACtB;AAaD,wBAAsB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAK1G;AAID,qBAAa,eAAgB,SAAQ,cAAc;IAS/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY;IARvC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAC7B,SAAS,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC7C,SAAS,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAM;IACnD,SAAS,CAAC,cAAc,EAAE,aAAa,EAAE,CAAM;IAC/C,SAAS,CAAC,eAAe,gBAAuB;IAChD,QAAQ,CAAC,QAAQ,qCAA8B;IAC/C,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;gBAEb,IAAI,EAAE,YAAY;IAmBvC;;OAEG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAO7C,kBAAkB,IAAI,QAAQ,EAAE;IAGhC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAGvC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAGxC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAUxD,SAAS,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ClC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,IAAI,GAAG,IAAI;IAwBrC;;;;;;OAMG;IACH,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,EAAE,OAAO,SAAM,EAAE,KAAK,SAAO,GAAG,UAAU;CAgBnH"}
+{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAGL,UAAU,EAEV,cAAc,EACd,OAAO,EACP,eAAe,EACf,UAAU,EAEX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,OAAO,EAAE,YAAY,CAAA;CACtB;AAaD,wBAAsB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAK1G;AAID,qBAAa,eAAgB,SAAQ,cAAc;IAS/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY;IARvC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAC7B,SAAS,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC7C,SAAS,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAM;IACnD,SAAS,CAAC,cAAc,EAAE,aAAa,EAAE,CAAM;IAC/C,SAAS,CAAC,eAAe,gBAAuB;IAChD,QAAQ,CAAC,QAAQ,qCAA8B;IAC/C,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;gBAEb,IAAI,EAAE,YAAY;IAmBvC;;OAEG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAO7C,kBAAkB,IAAI,QAAQ,EAAE;IAGhC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAGvC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAGxC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAUxD,SAAS,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ClC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY;IAQlD,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,IAAI,GAAG,IAAI;IA0BrC;;;;;;OAMG;IACH,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,EAAE,OAAO,SAAM,EAAE,KAAK,SAAO,GAAG,UAAU;CAgBnH"}

package/lib/browser/utils/snapshot.js

@@ -117,6 +117,15 @@ class SnapshotCreator extends utils_1.DisposableImpl {
         this.next(() => dispose.dispose());
         return deferred.promise;
     }
+    setParent(n) {
+        if (!n.children)
+            return n;
+        n.children.forEach((c) => {
+            c.parent = n;
+            this.setParent(c);
+        });
+        return n;
+    }
     next(end) {
         var _a, _b;
         const next = this.processingData.shift();
@@ -131,6 +140,8 @@ class SnapshotCreator extends utils_1.DisposableImpl {
                 const attrs = this.opts.renderEngine.getDisplayDefaultData(this.opts.engineName, content.displayType);
                 Object.assign(content, Object.assign({}, attrs));
             }
+            // 设置 parent, 保持 id 一致； mask 里用的是 path id;
+            content = this.setParent((0, utils_1.deepClone)(content));
             this.drawer.update({
                 visible: true,
                 uri: next.uri,

package/lib/browser/utils/snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gedit/editor-2d",
-  "version": "0.2.45",
+  "version": "0.2.47",
   "license": "MIT",
   "main": "lib/browser/index",
   "typings": "lib/browser/index.d.ts",
@@ -9,11 +9,13 @@
     "src"
   ],
   "dependencies": {
-    "@gedit/app-config": "^0.2.39",
-    "@gedit/editor": "^0.2.12",
-    "@gedit/playground": "^0.2.17",
-    "@gedit/render-engine-ide": "^0.2.36",
-    "@gedit/workspace-2d": "^0.2.17",
+    "@gedit/app-config": "^0.2.40",
+    "@gedit/canvas-draw": "^0.2.32",
+    "@gedit/editor": "^0.2.13",
+    "@gedit/playground": "^0.2.18",
+    "@gedit/render-engine-ide": "^0.2.38",
+    "@gedit/theme": "^0.2.10",
+    "@gedit/workspace-2d": "^0.2.18",
     "bezier-js": "^4.0.3",
     "clsx": "^1.1.1",
     "json-stringify-pretty-compact": "^2.0.0",
@@ -37,5 +39,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "620b52f857da2c24f109e3044f98ffeb73cdb4de"
+  "gitHead": "3556856ee2671257bd0c588bdfdc18ac0d57dab4"
 }

package/src/browser/model/editor2d-document.ts

@@ -30,6 +30,8 @@ import { WorkspaceResourceService } from '@gedit/workspace-2d';
 import { ResourceProvider, ResourceRefError } from '@gedit/resource';
 import { AppConfigService } from '@gedit/app-config';
 import { Editor2dIterator } from './editor2d-iterator';
+import { ThemeService } from '@gedit/theme';
+import { followKeyType, getFollowValue } from '@gedit/render-engine-pixi';
 // import { getAnimationKeys, getChangeAnimationData } from './utils';
 
 export const maskShowArray: GameObjectType[] = [
@@ -41,7 +43,8 @@ export const maskShowArray: GameObjectType[] = [
   GameObjectBaseType.TEXT,
   GameObjectBaseType.TRIANGLE,
   GameObjectBaseType.COMPONENT,
-  GameObjectBaseType.ANIM_FRAMES
+  GameObjectBaseType.ANIM_FRAMES,
+  GameObjectBaseType.STAR,
 ];
 export const maskEnabledArray: GameObjectType[] = [
   GameObjectBaseType.GROUP,
@@ -91,7 +94,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
   }
 
   constructor(
-    @inject(MessageService) protected readonly message: MessageService,
+    @inject(MessageService) readonly message: MessageService,
     @inject(Editor2dModelOptions) protected readonly options: Editor2dModelOptions,
     @inject(ResourceProvider) protected readonly resourceProvider: ResourceProvider,
     @inject(ResourceAutoSaveService) protected readonly resourceAutoSaveService: ResourceAutoSaveService,
@@ -99,6 +102,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     @inject(RenderEngineIDEService) readonly engineService: RenderEngineIDEService,
     @inject(AppConfigService) readonly appConfig: AppConfigService,
     @inject(Editor2dComponentProvider) @optional() readonly componentProvider?: Editor2dComponentProvider,
+    @inject(ThemeService) @optional() readonly themeService?: ThemeService,
   ) {
     super();
     this.toDispose.push(this.onContentChangedEmitter);
@@ -886,8 +890,11 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     if (!checkSuccess) return false;
     const siblings = (targetNode as Editor2dContainerNode).children || [];
     if (childDeco.single) {
-      const addedNodes = siblings.filter(s => s.displayType === childDisplayType);
-      if (addedNodes.length > 0) return false;
+      const single = typeof childDeco.single === 'function' ? childDeco.single(this.themeService?.mode) : childDeco.single;
+      if (single) {
+        const addedNodes = siblings.filter(s => s.displayType === childDisplayType);
+        if (addedNodes.length > 0) return false;
+      }
     }
     if (childDeco.canbeAddedAsChild !== undefined) {
       return childDeco.canbeAddedAsChild(targetNode, siblings);
@@ -1110,9 +1117,24 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
         x: moveType === 'x' ? position.x + moveDelta : position.x,
         y: moveType === 'y' ? position.y + moveDelta : position.y,
       };
-      this.updateNode(node, {position: newPosition, }, true, true, true);
+      // 锁定跟随图层
+      if (node.follow) {
+        const { open, target, type } = node.follow;
+        if (open && target && node.position) {
+          this.message.warn(
+            `元素开启了跟随，${type
+              ?.map(c => followKeyType[c])
+              .join(',')} 被锁定`,
+            {timeout: 2000 }
+          );
+          const p = this.getFollowPosition(node);
+          p.forEach(c => {
+            newPosition[c.type] = c.value;
+          });
+        }
+      }
+      this.updateNode(node, { position: newPosition }, true, true, true);
     });
-    this.clearSelectNodeFollow();
     this.fireContentChanged(nodes, 'update');
   }
 
@@ -1139,6 +1161,22 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     return 0;
   }
 
+  /**
+   * 锁定节点的 follow
+   */
+  getFollowPosition(node: Editor2dNode): { value: number; type: 'x' | 'y' }[] {
+    if (node.follow) {
+      const { open, target } = node.follow;
+      if (open && target && node.position) {
+        const targetNode = this.getNodeById(target);
+        if (targetNode && targetNode.position) {
+          const t = getFollowValue(node.follow, targetNode);
+          return t;
+        }
+      }
+    }
+    return [];
+  }
   /**
    * 清除节点的 follow
    */

package/src/browser/model/editor2d-model-container.ts

@@ -2,6 +2,7 @@ import { Container, interfaces } from 'inversify';
 import {
   Editor2dDocument,
   Editor2dDocumentContextMenuPath,
+  Editor2dDocumentContextMenuPathEditPath,
   Editor2dModel,
   Editor2dModelOptions,
   Editor2dSelection,
@@ -39,6 +40,7 @@ export function createEditor2dModelContainer(parent: interfaces.Container, opts:
       ...createDefaultPlaygroundConfig(),
       autoFocus: false,
       contextMenuPath: Editor2dDocumentContextMenuPath,
+      contextMenuPathEditPath: Editor2dDocumentContextMenuPathEditPath,
       ...opts.playgroundConfig,
     });
     c.bind(PlaygroundContribution).toService(PlaygroundContribution2d);

package/src/browser/model/editor2d-model.ts

@@ -6,6 +6,7 @@ import { Editor2dModelOptions } from './editor2d';
 import { Editor2dSelection } from './editor2d-selection';
 import { Editor2dWidget } from './editor2d-widget';
 import type { Editor2dPlayGround } from '../playground/playground-context';
+import { PathPointSelectionService } from '@gedit/playground';
 
 export const Editor2dModelFactory = Symbol('Editor2dModelFactory');
 export type Editor2dModelFactory = (options: Editor2dModelOptions) => Editor2dModel;
@@ -26,6 +27,7 @@ export class Editor2dModel implements Editor {
   @inject(Editor2dModelOptions) protected readonly options: Editor2dModelOptions;
   @inject(Editor2dDocument) readonly document: Editor2dDocument;
   @inject(Editor2dSelection) readonly selection: Editor2dSelection;
+  @inject(PathPointSelectionService) readonly pathPointSelection: PathPointSelectionService;
   node: HTMLElement;
 
   @postConstruct()

package/src/browser/model/editor2d.ts

@@ -29,7 +29,9 @@ export interface Editor2dContent {
 }
 
 // 文档内容菜单
-export const Editor2dDocumentContextMenuPath = ['editor2d-docuemnt-menu'];
+export const Editor2dDocumentContextMenuPath = ['editor2d-document-menu'];
+// 路径编辑态的菜单
+export const Editor2dDocumentContextMenuPathEditPath = ['editor2d-document-path-menu'];
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function omitNode(node?: Editor2dNode | Editor2dContainerNode, omitKeys: string[] = [], assign?: (n: Editor2dNode) => Editor2dNode): any {
@@ -91,6 +93,7 @@ export interface Editor2dNode extends TreeNode, EditorDocumentNode, Lockable, Se
  */
 export interface Editor2dPathNode extends Editor2dNode {
   [GameObjectBaseType.PATH]: {
+    closed?: boolean;
     paths: PathChild[]
   }
 }

package/src/browser/playground/canvas-draw.ts

@@ -272,47 +272,52 @@ export class CanvasDraw extends DisposableImpl {
         return depth;
       }
       gameObjectCache.set(nodePath, gameObject);
+      const updateParent = (node?: Editor2dNode, obj?: GameObject, type: GameObjectEventType = GameObjectEventType.UPDATE) => {
+        // 如果父级是组件或分组更新中心点；
+        if (
+          node &&
+          obj &&
+          !Editor2dNode.isRootNode(node)
+        ) {
+          this.onGameObjectChangeEmitter.fire({
+            type,
+            gameObject: obj!,
+            node: node!,
+          });
+          if (node.parent && obj.parent) {
+            updateParent(node.parent, obj.parent, type);
+          }
+        }
+      };
       scene.onGameObjectDispose(gameObject, () => {
-        const parentObject = parentId ? this.gameObjectCache.get(parentId) : undefined;
-        const parentNode = parentId ? this.nodeCache.get(parentId) : undefined;
         const node = this.nodeCache.get(nodePath)!;
-        this.gameObjectCache.delete(nodePath);
-        this.nodeVersionCache.delete(nodePath);
-        this.nodeCache.delete(nodePath);
-        this.maskCache.delete(nodePath);
         this.onGameObjectChangeEmitter.fire({
           type: GameObjectEventType.DESTROY,
           gameObject: gameObject!,
-          parentObject,
-          parentNode,
           node,
         });
+        updateParent(node, gameObject);
+        this.gameObjectCache.delete(nodePath);
+        this.nodeVersionCache.delete(nodePath);
+        this.nodeCache.delete(nodePath);
+        this.maskCache.delete(nodePath);
       });
       scene.onGameObjectUpdate(gameObject, () => {
-        const parentObject = parentId ? this.gameObjectCache.get(parentId) : undefined;
-        const parentNode = parentId ? this.nodeCache.get(parentId) : undefined;
-        this.onGameObjectChangeEmitter.fire({
+        const node = this.nodeCache.get(nodePath);
+        /*  this.onGameObjectChangeEmitter.fire({
           type: GameObjectEventType.UPDATE,
           gameObject: gameObject!,
-          parentObject,
-          parentNode,
-          node: this.nodeCache.get(nodePath)!,
-        });
+          node: node!,
+        }); */
+        // 更新父级
+        updateParent(node, gameObject);
       });
       scene.onGameObjectCreate(gameObject, () => {
         this.nodeVersionCache.set(nodePath, newVersion);
         this.maskCache.set(nodePath, { mask: node.mask, isMask: node.isMask, ignoreMask: node.ignoreMask });
-        const parentObject = parentId ? this.gameObjectCache.get(parentId) : undefined;
-        const parentNode = parentId ? this.nodeCache.get(parentId) : undefined;
-        this.onGameObjectChangeEmitter.fire({
-          type: GameObjectEventType.CREATE_READY,
-          gameObject: gameObject!,
-          node: this.nodeCache.get(nodePath)!,
-          parentObject,
-          parentNode
-        });
         // 根节点创建完成则代表加载完成
         this.fireLoading(Editor2dNode.isRootNode(this.nodeCache.get(nodePath)!));
+        updateParent(this.nodeCache.get(nodePath), gameObject);
       });
       scene.onGameObjectError(gameObject, error => {
         this.onGameObjectChangeEmitter.fire({
@@ -360,7 +365,7 @@ export class CanvasDraw extends DisposableImpl {
         this.maskCache.set(nodePath, { mask: node.mask, isMask: node.isMask, ignoreMask: node.ignoreMask });
       }
     };
-    if (!firstCreate && gameObject.created) {
+    if (!firstCreate && gameObject?.created) {
       try {
         update();
       } catch (e) {

package/src/browser/playground/canvas-layer.ts

@@ -2,19 +2,83 @@ import { entity, Layer, PipelineDimension } from '@gedit/playground';
 import { DocumentEntity, Editor2dEntity } from './entities';
 import { domUtils } from '@gedit/utils/lib/browser';
 import { PlaygroundContext2d } from './playground-context';
-import { Editor2dDocument } from '../model';
+import { Editor2dDocument, Editor2dNode } from '../model';
 import { Rectangle } from '@gedit/math';
 import { SelectionEntityManager } from './selection-entity-manager';
 import { CanvasDraw, CanvasDrawLoadingState, GameObjectChangeEvent, GameObjectEventType } from './canvas-draw';
 import { debounce, OriginSchema } from '@gedit/utils';
-import { GameObjectBaseType, GameWidgetIDE } from '@gedit/render-engine-ide';
+import { GameObject, GameObjectBaseType, GameWidgetIDE } from '@gedit/render-engine-ide';
+import { toFixedValue as toFixedValueFunc } from '@gedit/canvas-draw';
+/**
+ * 四舍五入并保留小数点
+ * @param value
+ * @param fixed  需要保留的小数位，默认两位
+ */
+export const toFixedValue = toFixedValueFunc;
 
+const childrenMap = (list: GameObject[], c: GameObject) => {
+  if (c.disposed) {
+    return;
+  }
+  if (!list.includes(c)) {
+    list.push(c);
+  }
+  if (c.children) {
+    c.children.forEach(d => {
+      childrenMap(list, d);
+    });
+  }
+};
+const parentMap = (list: GameObject[], p: GameObject) => {
+  if (p.disposed) {
+    return;
+  }
+  if (!list.includes(p)) {
+    list.push(p);
+  }
+  if (p.parent) {
+    parentMap(list , p.parent);
+  }
+};
+
+const getListData = (list: GameObject[]) => {
+  let updateList: GameObject[] = [];
+
+  // 遍历更新节点；
+  list.forEach(item => {
+    if (item.disposed) {
+      return;
+    }
+    if (!updateList.includes(item)) {
+      updateList.push(item);
+    }
+    // 子级遍历
+    if (item.children) {
+      item.children.forEach(c => {
+        childrenMap(updateList, c);
+      });
+    }
+    // 父级遍历
+    if (item.parent) {
+      childrenMap(updateList, item.parent);
+    }
+  });
+  updateList = updateList.filter(c => !c.disposed).sort((a, b) => {
+    const aa = a.getDepth?.() || 0;
+    const bb = b.getDepth?.() || 0;
+    return aa - bb;
+  });
+  return updateList;
+};
 export class CanvasLayer extends Layer<PlaygroundContext2d> {
   @entity(DocumentEntity) documentEntity: DocumentEntity;
   node = domUtils.createDivWithClass('gedit-canvas-layer');
   protected scene?: HTMLElement;
   protected selectionEntityManager: SelectionEntityManager;
   protected canvasDrawer?: CanvasDraw;
+  protected updateList: GameObject[] = [];
+  protected nodeCache: Map<string, Editor2dNode> = new Map();
+  protected updateTimeout: NodeJS.Timeout;
   onReady(): void {
     this.selectionEntityManager = new SelectionEntityManager(
       this.entityManager,
@@ -50,19 +114,19 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
     if (config.appConfig?.engine !== 'pixi' || !entity) {
       return;
     }
-    const { node } = entity;
+    const node = this.nodeCache.get(entity.id);
     const type = node?.displayType;
     // 分组与组件创建完后初始化中心点;
     if (
-      node && (type === GameObjectBaseType.GROUP ||
-      type === GameObjectBaseType.COMPONENT)
+      node && (type === GameObjectBaseType.COMPONENT)
     ) {
       const { transform } = entity;
       const { origin: org, localBounds } = transform;
-      const { x: minX, y: minY, width, height } = localBounds;
+      // console.log(localBounds, entity.gameObject.rendererObject._localBoundsRect);
+      const { x: minX, y: minY, width, height } = localBounds; // entity.gameObject.rendererObject._localBoundsRect;
       // 算出组件与组的 0 点位置；
-      const x = (-minX / width) || 0;
-      const y = (-minY / height) || 0;
+      const x = toFixedValue((-minX / width) || 0, 6);
+      const y = toFixedValue((-minY / height) || 0, 6);
       const initOrigin = { x, y };
       const o: OriginSchema = update ? org : initOrigin;
       if (update || typeof o.initX === 'undefined') {
@@ -74,69 +138,50 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
           initY: initOrigin.y || 0
         };
         // group origin 始终为 0;
-        if (type === GameObjectBaseType.GROUP) {
-          origin.x = initOrigin.x || 0;
-          origin.y = initOrigin.y || 0;
-        }
         // transform.update({ origin });
         this.document?.updateNode(node, {
           origin,
         });
+        // console.log('--------------origin--------------', origin);
+        // obj.data.origin = origin;
         // this.selectionEntityManager.updateEntity(obj.id, obj);
       }
     }
   };
+  onUpdateEntity(update: boolean): void {
+    clearTimeout(this.updateTimeout);
+    this.updateTimeout = setTimeout(() => {
+      const updateList = getListData(this.updateList);
+      updateList.forEach(item => {
+        if (item.disposed) {
+          return;
+        }
+        // console.log('------------------updateddddddddddddddd-----------', item.name);
+        this.selectionEntityManager.updateEntity(item.id, item);
+        const entity = this.selectionEntityManager.nodeEntitiesCache.get(item.id);
+        this.onContainerInitOrigin(entity, update);
+      });
+      this.updateList = [];
+    }, 150);
+  }
   onGameObjectChange(e: GameObjectChangeEvent): void {
-    const { gameObject, parentObject, parentNode, state } = e;
+    const { gameObject, state } = e;
     switch (e.type) {
       case GameObjectEventType.CREATE:
         this.document?.updateNode(e.node, { error: undefined });
         this.selectionEntityManager.createEntity(gameObject.id, e.node, gameObject!, !!state?.selectable, !!state?.adsorbable);
         break;
-      case GameObjectEventType.CREATE_READY:
-        // 避免元素创后的回调；必须在元素创建完实例后执行；
-        setTimeout(() => {
-          const entity = this.selectionEntityManager.nodeEntitiesCache.get(gameObject.id);
-          // 旧的没有中心点
-          if (typeof entity?.transform.origin.initX === 'undefined') {
-            this.selectionEntityManager.updateEntity(gameObject.id, gameObject!);
-            this.onContainerInitOrigin(entity);
-          }
-          if (
-            parentObject &&
-            parentNode &&
-            (parentObject.type === GameObjectBaseType.GROUP ||
-              parentObject.type === GameObjectBaseType.COMPONENT)
-          ) {
-            this.document?.updateNode(parentNode, undefined, true);
-          }
-        });
-        break;
       case GameObjectEventType.DESTROY:
         this.selectionEntityManager.removeEntity(gameObject.id);
-        // destroy 后 gameObject 没有 parent;
-        if (parentNode) {
-          this.document?.updateNode(parentNode, undefined, true);
-        }
+        this.nodeCache.delete(gameObject.id);
         break;
       case GameObjectEventType.UPDATE:
-        this.selectionEntityManager.updateEntity(gameObject.id, gameObject!);
-        // TODO 父节点更新则通知子节点更新, 用于刷新transform
-        gameObject!.children.forEach(c => {
-          this.selectionEntityManager.updateEntity(c.id as string, c);
-        });
-        if (
-          parentObject &&
-          parentObject.parent &&
-          (parentObject.type === GameObjectBaseType.GROUP ||
-            parentObject.type === GameObjectBaseType.COMPONENT)
-        ) {
-          // 需要等 parent 数据没有更后再执行；
-          setTimeout(() => {
-            const entity = this.selectionEntityManager.nodeEntitiesCache.get(parentObject.id);
-            this.onContainerInitOrigin(entity, true);
-          });
+        // console.log('------------------update-----------', gameObject.name);
+        if (!this.updateList.includes(gameObject)) {
+          this.updateList.push(gameObject);
+          this.nodeCache.set(gameObject.id, e.node);
         }
+        this.onUpdateEntity(true);
         break;
       case GameObjectEventType.ERROR:
         this.document?.updateNode(e.node, {error: e.error});

package/src/browser/playground/index.ts

@@ -7,3 +7,5 @@ export * from './canvas-draw';
 export { SelectorExtendType } from './selector-extend-icons';
 export * from './selector-extend-renderer';
 export * from './extend-edit-layer';
+export * from './path-edit';
+export * from './path-edit-layer';

package/src/browser/playground/path-edit/index.ts

@@ -0,0 +1,3 @@
+export * from './path-edit-layer-move-point';
+export * from './path-edit-layer-svg-path';
+export * from './utils';

package/src/browser/playground/path-edit/path-edit-layer-move-point.tsx

@@ -0,0 +1,108 @@
+import * as React from 'react';
+import { PathChild, PATH_FUNC_TYPE, getPointsToPath } from '@gedit/canvas-draw';
+import { PositionSchema } from '@gedit/playground';
+import { PathEditLayerEventContext } from '../path-edit-layer';
+import clsx from 'clsx';
+
+export interface PointSchema extends PositionSchema {
+  id?: string;
+}
+
+export interface PointDefaultProps {
+  getPosFromMouseEvent: (
+    event: {
+      clientX: number;
+      clientY: number;
+    },
+    addScale?: boolean
+  ) => PositionSchema;
+  paths: PathChild[];
+  scale: number;
+  closePath: boolean; // 显示闭合路径图标
+  currentPointId?: string;
+}
+
+export const PointMoveDefault = ({
+  getPosFromMouseEvent,
+  paths,
+  scale,
+  closePath,
+  currentPointId,
+}: PointDefaultProps) => {
+  const [movePoint, setMovePoint] = React.useState<PathChild>();
+  const { onSceneAddEvent } = React.useContext(PathEditLayerEventContext);
+  const endPoint = paths[paths.length - 1];
+  const startPoint = paths[0];
+  /**
+   * 选中起始点的情况，显示移动点，绘制起点到移动点的路径，反转点的 x1=x2, y1=y2；
+   * @param lineStartPoint 选中的起始点
+   * @param lineEndPoint 选中的结束点
+   * @param reverse 是否反转
+   */
+  let lineStartPoint = paths.find(c => c.id === currentPointId);
+  let lineEndPoint = lineStartPoint === startPoint ? endPoint : startPoint;
+  const reverse = lineStartPoint === startPoint && lineStartPoint !== endPoint;
+  if (reverse && lineStartPoint) {
+    const { x1, x2, y1, y2 } = lineStartPoint;
+    lineStartPoint = {
+      ...lineStartPoint,
+      x1: x2,
+      x2: x1,
+      y1: y2,
+      y2: y1,
+    };
+    const { x1: e1, x2: e2, y1: r1, y2: r2 } = lineEndPoint;
+    lineEndPoint = {
+      ...lineEndPoint,
+      x1: e2,
+      x2: e1,
+      y1: r2,
+      y2: r1,
+    };
+  }
+  const onMove = (e: MouseEvent) => {
+    const pos = getPosFromMouseEvent(e);
+    setMovePoint({
+      ...pos,
+      type: PATH_FUNC_TYPE.STRAIGHT,
+    });
+  };
+  React.useEffect(() => {
+    const event = onSceneAddEvent('mousemove', onMove);
+    const event2 = onSceneAddEvent('mouseleave', () => {
+      setMovePoint(undefined);
+    });
+    return () => {
+      event.dispose();
+      event2.dispose();
+    };
+  }, []);
+  if (!movePoint) {
+    return null;
+  }
+  const line =
+    lineStartPoint &&
+    getPointsToPath([lineStartPoint, closePath ? lineEndPoint : movePoint]);
+  return (
+    <>
+      {line && (
+        <path
+          className="gedit-path-edit-layer-line"
+          d={line}
+          strokeLinecap="round"
+          strokeWidth={1.5 / scale}
+        />
+      )}
+      <circle
+        className={clsx(
+          'gedit-path-edit-layer-point',
+          'gedit-path-edit-layer-point-move',
+          'gedit-path-edit-layer-pen'
+        )}
+        cx={closePath ? startPoint.x : movePoint.x}
+        cy={closePath ? startPoint.y : movePoint.y}
+        r={4 / scale}
+      />
+    </>
+  );
+};