@gedit/editor-2d 0.3.4 → 0.3.6

package/lib/browser/model/editor2d-document.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -11,54 +10,55 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Editor2dDocument = exports.Editor2dComponentProvider = exports.maskIgnoreArray = exports.maskEnabledArray = exports.maskShowArray = void 0;
-const inversify_1 = require("inversify");
-const utils_1 = require("@gedit/utils");
-const editor2d_1 = require("./editor2d");
-const render_engine_1 = require("@gedit/render-engine");
-const render_engine_ide_1 = require("@gedit/render-engine-ide");
-const tree_1 = require("@gedit/tree");
-const browser_1 = require("@gedit/resource/lib/browser");
-const connection_1 = require("@gedit/connection");
-const workspace_2d_1 = require("@gedit/workspace-2d");
-const resource_1 = require("@gedit/resource");
-const app_config_1 = require("@gedit/app-config");
-const editor2d_iterator_1 = require("./editor2d-iterator");
-const theme_1 = require("@gedit/theme");
-const render_engine_pixi_1 = require("@gedit/render-engine-pixi");
-const layout_1 = require("@gedit/layout");
-const canvas_draw_1 = require("@gedit/canvas-draw");
-const bounds_1 = require("../utils/bounds");
+import { inject, injectable, optional } from 'inversify';
+import { Compare, deepClone, Emitter, omit, debounce, PromiseDeferred, URI, getByKey, coverData, setByKey, } from '@gedit/utils';
+import { checkDuplicateNodes, Editor2dModelOptions, Editor2dNode,
+// Editor2dNodeCache,
+ } from './editor2d';
+import { GameObjectBaseType, GameObjectData, } from '@gedit/render-engine';
+import { RenderEngineIDEService } from '@gedit/render-engine-ide';
+import { CompositeTreeNode, TreeImpl, TreeNode } from '@gedit/tree';
+import { ResourceAutoSaveService } from '@gedit/resource/lib/browser';
+import { MessageService } from '@gedit/connection';
+import { WorkspaceResourceService } from '@gedit/workspace-2d';
+import { ResourceProvider } 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 { ConfirmDialog } from '@gedit/layout';
+import { toFixedValue } from '@gedit/canvas-draw';
+import { getPIXILocalBoundsByNode } from '../utils/bounds';
+import { sortFrame } from './utils';
 // import { getAnimationKeys, getChangeAnimationData } from './utils';
-exports.maskShowArray = [
-    render_engine_1.GameObjectBaseType.IMAGE,
-    render_engine_1.GameObjectBaseType.RECTANGLE,
-    render_engine_1.GameObjectBaseType.PATH,
-    render_engine_1.GameObjectBaseType.CIRCLE,
-    render_engine_1.GameObjectBaseType.POLYGON,
-    render_engine_1.GameObjectBaseType.TEXT,
-    render_engine_1.GameObjectBaseType.TRIANGLE,
-    render_engine_1.GameObjectBaseType.COMPONENT,
-    render_engine_1.GameObjectBaseType.ANIM_FRAMES,
-    render_engine_1.GameObjectBaseType.STAR,
-    render_engine_1.GameObjectBaseType.LOTTIE,
+export const maskShowArray = [
+    GameObjectBaseType.IMAGE,
+    GameObjectBaseType.RECTANGLE,
+    GameObjectBaseType.PATH,
+    GameObjectBaseType.CIRCLE,
+    GameObjectBaseType.POLYGON,
+    GameObjectBaseType.TEXT,
+    GameObjectBaseType.TRIANGLE,
+    GameObjectBaseType.COMPONENT,
+    GameObjectBaseType.ANIM_FRAMES,
+    GameObjectBaseType.STAR,
+    GameObjectBaseType.LOTTIE,
 ];
 // 不能当蒙板的元素，可以被蒙板
-exports.maskEnabledArray = [
-    render_engine_1.GameObjectBaseType.GROUP,
-    render_engine_1.GameObjectBaseType.PARTICLES,
+export const maskEnabledArray = [
+    GameObjectBaseType.GROUP,
+    GameObjectBaseType.PARTICLES,
 ];
 // 自动忽略蒙板的元素
-exports.maskIgnoreArray = [
-    render_engine_1.GameObjectBaseType.ANIMATION,
-    render_engine_1.GameObjectBaseType.AUDIO,
+export const maskIgnoreArray = [
+    GameObjectBaseType.ANIMATION,
+    GameObjectBaseType.AUDIO,
     // GameObjectBaseType.GROUP,
 ];
 let versionId = 0;
-exports.Editor2dComponentProvider = Symbol('Editor2dComponentProvider');
+export const Editor2dComponentProvider = Symbol('Editor2dComponentProvider');
 const replaceReg = (s) => s.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
-let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
+let Editor2dDocument = class Editor2dDocument extends TreeImpl {
     get uri() {
         return this.options.autoSaveService.resource.uri.toString();
     }
@@ -76,8 +76,8 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         this.appConfig = appConfig;
         this.componentProvider = componentProvider;
         this.themeService = themeService;
-        this.onContentChangedEmitter = new utils_1.Emitter();
-        this.onSavedEmitter = new utils_1.Emitter();
+        this.onContentChangedEmitter = new Emitter();
+        this.onSavedEmitter = new Emitter();
         this.onContentChanged = this.onContentChangedEmitter.event;
         this.onSaved = this.onSavedEmitter.event;
         this.animationStarted = false;
@@ -94,11 +94,11 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
             if (!this.root) {
                 return;
             }
-            const currentBound = (0, bounds_1.getPIXILocalBoundsByNode)(this.root);
+            const currentBound = getPIXILocalBoundsByNode(this.root);
             Object.keys(((_a = this.componentProvider) === null || _a === void 0 ? void 0 : _a.all) || {}).forEach(c => {
                 var _a, _b, _c, _d, _e, _f, _g, _h;
                 const item = (_a = this.componentProvider) === null || _a === void 0 ? void 0 : _a.all[c];
-                if (((_b = item === null || item === void 0 ? void 0 : item.content) === null || _b === void 0 ? void 0 : _b.displayType) === render_engine_1.GameObjectBaseType.COMPONENT &&
+                if (((_b = item === null || item === void 0 ? void 0 : item.content) === null || _b === void 0 ? void 0 : _b.displayType) === GameObjectBaseType.COMPONENT &&
                     item.stat.uri !== this.uri) {
                     const { content, stat, version } = item;
                     // 是否用过
@@ -107,8 +107,8 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
                         const { x: minX, y: minY, maxX, maxY } = currentBound;
                         const width = maxX - minX;
                         const height = maxY - minY;
-                        const x = (0, canvas_draw_1.toFixedValue)(-minX / width || 0, 6);
-                        const y = (0, canvas_draw_1.toFixedValue)(-minY / height || 0, 6);
+                        const x = toFixedValue(-minX / width || 0, 6);
+                        const y = toFixedValue(-minY / height || 0, 6);
                         if (((_d = useNode.size) === null || _d === void 0 ? void 0 : _d.width) !== width ||
                             ((_e = useNode.size) === null || _e === void 0 ? void 0 : _e.height) !== height ||
                             ((_f = useNode.origin) === null || _f === void 0 ? void 0 : _f.initX) !== x ||
@@ -140,7 +140,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
                 this.onSavedEmitter.fire({ document: this, contentChanges: contents, nodes, type });
             }
             // pixi 组件的宽高是计算的，如果是组件，更新数据将需要同步到组件中
-            if (this.appConfig.engineName === 'pixi' && ((_a = this.root) === null || _a === void 0 ? void 0 : _a.displayType) === render_engine_1.GameObjectBaseType.COMPONENT) {
+            if (this.appConfig.engineName === 'pixi' && ((_a = this.root) === null || _a === void 0 ? void 0 : _a.displayType) === GameObjectBaseType.COMPONENT) {
                 clearTimeout(this.syncTimeout);
                 this.syncTimeout = setTimeout(() => {
                     // console.log(node, this.document?.uri);
@@ -161,7 +161,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
                 this.fireContentChanged([], 'update', true);
             }));
             // 组件数据更新
-            this.toDispose.push(this.componentProvider.onComponentChanged((0, utils_1.debounce)((compUri) => {
+            this.toDispose.push(this.componentProvider.onComponentChanged(debounce((compUri) => {
                 if (this.uri === compUri.toString()) {
                     return;
                 }
@@ -183,10 +183,10 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         var _a;
         if (!this.root)
             return false;
-        for (const node of new editor2d_iterator_1.Editor2dIterator(this.root)) {
+        for (const node of new Editor2dIterator(this.root)) {
             if (node !== this.root
-                && node.displayType === render_engine_1.GameObjectBaseType.COMPONENT
-                && new utils_1.URI((_a = node.component) === null || _a === void 0 ? void 0 : _a.id).displayName === compUri.displayName) {
+                && node.displayType === GameObjectBaseType.COMPONENT
+                && new URI((_a = node.component) === null || _a === void 0 ? void 0 : _a.id).displayName === compUri.displayName) {
                 return true;
             }
         }
@@ -196,7 +196,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
      * 切换资源, 只有模板编辑器需要用到
      */
     async changeResource(uri) {
-        const uriObj = new utils_1.URI(uri);
+        const uriObj = new URI(uri);
         const resource = await this.resourceProvider(uriObj);
         this.resourceAutoSaveService.changeResource(resource);
         this.resourceAutoSaveService.sync();
@@ -233,24 +233,24 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         var _a;
         const symbols = ((_a = this.appConfig.getConfigDataBySync()) === null || _a === void 0 ? void 0 : _a.symbols) || [];
         if (this.root && this.root.displayType === 'component') {
-            return symbols.concat(render_engine_1.GameObjectData.getComponentSymbols(this.root));
+            return symbols.concat(GameObjectData.getComponentSymbols(this.root));
         }
         return symbols;
     }
     createDisplayNode(displayType, parent, position, index, data) {
         let parentNode;
-        if (!parent || editor2d_1.Editor2dNode.isRootNode(parent)) {
-            parentNode = this.getNode(editor2d_1.Editor2dNode.ROOT_NODE_ID);
+        if (!parent || Editor2dNode.isRootNode(parent)) {
+            parentNode = this.getNode(Editor2dNode.ROOT_NODE_ID);
         }
         else {
-            parentNode = editor2d_1.Editor2dNode.toContainerNode(parent);
+            parentNode = Editor2dNode.toContainerNode(parent);
         }
         // const lastChild = parentNode.children.slice().reverse().find(c => c.position !== undefined);
         const attrs = this.engineService.getDisplayDefaultData(this.engineName, displayType);
         if (attrs.position) {
             if (!position) {
                 const pos = 100 + Math.round(Math.random() * 100);
-                position = (displayType !== render_engine_1.GameObjectBaseType.GROUP && displayType !== render_engine_1.GameObjectBaseType.COMPONENT) ? {
+                position = (displayType !== GameObjectBaseType.GROUP && displayType !== GameObjectBaseType.COMPONENT) ? {
                     x: pos,
                     y: pos
                 } : { x: 0, y: 0 };
@@ -266,15 +266,15 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
             // }
         }
         const name = this.getUniqueName(parentNode.children || [], (data === null || data === void 0 ? void 0 : data.name) || this.engineService.getGameObjectIDERegister(this.engineName, displayType).decoration.name);
-        const node = editor2d_1.Editor2dNode.createNode(Object.assign(Object.assign(Object.assign({}, attrs), data), { name }), displayType, undefined, Object.keys(this.nodes));
-        if (exports.maskIgnoreArray.includes(node.displayType)) {
+        const node = Editor2dNode.createNode(Object.assign(Object.assign(Object.assign({}, attrs), data), { name }), displayType, undefined, Object.keys(this.nodes));
+        if (maskIgnoreArray.includes(node.displayType)) {
             node.ignoreMask = true;
         }
         this.addChildren(node, parentNode, index === undefined ? 0 : index);
         return node;
     }
     copyNode(targetNode) {
-        if (!targetNode || editor2d_1.Editor2dNode.isRootNode(targetNode))
+        if (!targetNode || Editor2dNode.isRootNode(targetNode))
             return;
         const parent = targetNode.parent;
         if (!this.canbeAddAsChild(parent, targetNode.displayType))
@@ -292,7 +292,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
             parent = parentNode.parent;
         }
         if (parent) {
-            const newNode = editor2d_1.Editor2dNode.clone(nodeData, [], Object.keys(this.nodes));
+            const newNode = Editor2dNode.clone(nodeData, [], Object.keys(this.nodes));
             // 单个复制删除 mask
             newNode.follow = {};
             delete newNode.followChild;
@@ -320,7 +320,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
             }
             // 加到当前节点的后边
             children.splice(index, 0, newNode);
-            tree_1.CompositeTreeNode.setParent(newNode, index, parent);
+            CompositeTreeNode.setParent(newNode, index, parent);
             this.refresh(parent);
             this.fireContentChanged([newNode], 'add');
             return newNode;
@@ -346,7 +346,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         }
     }
     async layerChangeDialog(name = this.deleteNames.join(',')) {
-        const dialog = new layout_1.ConfirmDialog({
+        const dialog = new ConfirmDialog({
             title: '警告',
             msg: `元素${name ? `(${name})` : ''}在代码中被使用，移动或删除将会出错！`,
             ok: '确定',
@@ -357,10 +357,10 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
     inCodeFunc(node) {
         var _a;
         // 获取所有代码片段，判断是否在代码片段内被使用；
-        const uri = new utils_1.URI(this.uri);
+        const uri = new URI(this.uri);
         const id = uri.displayName.split('.')[0];
         // const nodePath = Editor2dNode.getNodePath(node);
-        const nodePathName = editor2d_1.Editor2dNode.getNodeNamePath(node);
+        const nodePathName = Editor2dNode.getNodeNamePath(node);
         const scripts = (_a = this.componentProvider) === null || _a === void 0 ? void 0 : _a.getScriptsById(id);
         if (scripts && scripts.length) {
             const reg = new RegExp(`select(|ByNamePath)\\((\\"|\\')(${replaceReg(node.id)}${node.name ? `|${replaceReg(node.name)}` : ''}|${replaceReg(nodePathName)})(\\"|\\')\\)`, 'i');
@@ -415,7 +415,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
     async layerNamePathChange(nodes, targetNode) {
         var _a;
         const parentChange = targetNode ? nodes.filter(c => c.parent !== targetNode) : nodes;
-        const uri = new utils_1.URI(this.uri);
+        const uri = new URI(this.uri);
         const id = uri.displayName.split('.')[0];
         // const nodePath = Editor2dNode.getNodePath(node);
         const scripts = (_a = this.componentProvider) === null || _a === void 0 ? void 0 : _a.getScriptsById(id);
@@ -423,7 +423,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         let inCode = false;
         this.deleteNames = [];
         parentChange.forEach(c => {
-            const nodePathName = editor2d_1.Editor2dNode.getNodeNamePath(c);
+            const nodePathName = Editor2dNode.getNodeNamePath(c);
             const reg = new RegExp(`selectByNamePath\\((\\"|\\')(${replaceReg(nodePathName)})(\\"|\\')\\)`, 'i');
             const inCodeChild = scripts === null || scripts === void 0 ? void 0 : scripts.some(d => d.match(reg));
             if (inCodeChild) {
@@ -441,14 +441,14 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         return true;
     }
     deleteNode(targetNode, silent) {
-        if (!targetNode || editor2d_1.Editor2dNode.isRootNode(targetNode))
+        if (!targetNode || Editor2dNode.isRootNode(targetNode))
             return;
         const parent = targetNode.parent;
         this.delNodeSetMask(targetNode);
         this.removeNode(targetNode);
-        tree_1.CompositeTreeNode.removeChild(parent, targetNode);
-        if (!editor2d_1.Editor2dNode.isRootNode(parent) && parent.children.length === 0) {
-            editor2d_1.Editor2dNode.toLeafNode(parent);
+        CompositeTreeNode.removeChild(parent, targetNode);
+        if (!Editor2dNode.isRootNode(parent) && parent.children.length === 0) {
+            Editor2dNode.toLeafNode(parent);
         }
         this.refresh(parent);
         if (!silent) {
@@ -456,7 +456,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         }
     }
     async delNode(targetNode, silent, noDialog) {
-        if (!targetNode || editor2d_1.Editor2dNode.isRootNode(targetNode))
+        if (!targetNode || Editor2dNode.isRootNode(targetNode))
             return;
         if (!silent) {
             this.deleteNames = [];
@@ -485,7 +485,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         }
     }
     rename(targetNode, name) {
-        if (!name || !targetNode || editor2d_1.Editor2dNode.isRootNode(targetNode))
+        if (!name || !targetNode || Editor2dNode.isRootNode(targetNode))
             return;
         this.updateNode(targetNode, { name });
     }
@@ -497,7 +497,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         if (!parentNode.children)
             parentNode.children = [];
         parentNode.children.splice(index, 0, node);
-        tree_1.CompositeTreeNode.setParent(node, index, parentNode);
+        CompositeTreeNode.setParent(node, index, parentNode);
         parentNode.expanded = true;
         this.nextMaskToNode(node);
         this.refresh(parentNode);
@@ -507,12 +507,105 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
      * 打开节点
      */
     expandNode(node, expanded = true) {
-        if (tree_1.CompositeTreeNode.is(node)) {
+        if (CompositeTreeNode.is(node)) {
             node.expanded = expanded;
             this.refresh(node);
         }
     }
+    updateAnimationNode(node, data) {
+        var _a, _b;
+        if (!this.timelineService) {
+            return;
+        }
+        const frames = deepClone((_a = this.timelineService.currentTimelineData) === null || _a === void 0 ? void 0 : _a.frames) || [];
+        // 获取当前图层在动画中的数据;
+        const animItem = frames.find(c => c.id === node.id);
+        if (!animItem) {
+            return;
+        }
+        // 取出全部帧里的 key
+        const keys = Array.from(new Set(animItem.frame.value.map((item) => item.key)));
+        Object.keys(animItem.frame.current).forEach(key => {
+            if (!keys.includes(key)) {
+                const currentValue = getByKey(data, key);
+                // 更新当前帧的数据
+                animItem.frame.current[key] = currentValue !== null && currentValue !== void 0 ? currentValue : animItem.frame.current[key];
+            }
+        });
+        /**
+         * 如果是动画节点，更新数据到动画节点上
+         * 不是动画节点，更新到当前节点上
+         */
+        keys.forEach(key => {
+            const currentValue = getByKey(data, key);
+            if (typeof currentValue === 'undefined') {
+                return;
+            }
+            if (toFixedValue(currentValue, 2) !== toFixedValue(animItem.frame.current[key], 2)) {
+                animItem.frame.current[key] = currentValue !== null && currentValue !== void 0 ? currentValue : animItem.frame.current[key];
+                // 判断是否有帧
+                const frame = animItem.frame.value.find((item) => item.key === key && item.time === this.timelineService.currentTime);
+                if (frame) {
+                    frame.value = currentValue;
+                }
+                else {
+                    animItem.frame.value.push({
+                        key,
+                        time: this.timelineService.currentTime,
+                        value: currentValue,
+                    });
+                    animItem.frame.value = sortFrame(animItem.frame.value);
+                }
+            }
+            // 删除data里的当前帧的数据
+            const keyArr = key.split('.');
+            keyArr.reduce((v, k, i) => {
+                if (typeof v !== 'object') {
+                    return undefined;
+                }
+                if (i >= keyArr.length - 1) {
+                    delete v[k];
+                }
+                return v[k];
+            }, data);
+        });
+        // 属性栏更新数据会传回来 Editor2dNode; 清除不需要的数据
+        const newData = omit(data, ['nextSibling', 'previousSibling', 'parent']);
+        const nodeData = coverData(node, newData);
+        const gameObject = this.getGameObjectById(node.id);
+        if (gameObject) {
+            gameObject.data = Object.assign(Object.assign(Object.assign({}, gameObject.data), nodeData), { id: gameObject.data.id });
+        }
+        Object.assign(node, nodeData);
+        // 通过 animation 保存；
+        // node.version = (node.version || 0) + 1;
+        // this.fireContentChanged([node], 'update', false, true);
+        const animNode = this.getNodeById(this.timelineService.currentTimelineData.id);
+        if (!animNode) {
+            console.error('动画节点不存在');
+            return;
+        }
+        // 告知 node 变更，时间轴里数据更新；
+        // 使用 changeTimelineData 变更数据；
+        // const nodes = frames
+        //   .map(c => this.getNodeById(c.id))
+        //   .filter(c => c) as Editor2dNode[];
+        // const contents = nodes.map(n => ({ text: 'treeNode' }));
+        // this.onContentChangedEmitter.fire({
+        //   document: this,
+        //   contentChanges: contents,
+        //   nodes,
+        //   type: 'update',
+        // });
+        // 更新保存 animation 数据
+        this.updateNode(animNode, {
+            animation: Object.assign(Object.assign({}, animNode.animation), { frames })
+        }, true);
+        // 更新时间轴数据；
+        (_b = this.timelineService) === null || _b === void 0 ? void 0 : _b.changeTimelineData(animNode);
+    }
     updateNode(node, data = {}, forceUpdate = false, noSave, noFiredChanged) {
+        var _a;
         const treeNode = typeof node === 'string' ? this.nodes[node] : this.nodes[node.id];
         if (!treeNode)
             return;
@@ -522,13 +615,20 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         //     data = { ...data, name: treeNode.name };
         //   }
         // }
+        // 动画面板更新属性，直接更新到动画节点上, 不保存；
+        if (treeNode.useAnimationId &&
+            ((_a = this.timelineService) === null || _a === void 0 ? void 0 : _a.currentTimelineData) &&
+            this.timelineService.currentTimelineData.id === treeNode.useAnimationId) {
+            this.updateAnimationNode(treeNode, data);
+            return;
+        }
         // 这里采用深度比较, 因为数据层次定义不会太多
         if (data && data.id && data.id !== treeNode.id) {
             alert('节点更新出错，不同节点无法互相覆盖');
             console.error('无法覆盖同步节点数据: ', treeNode, data);
             return;
         }
-        const changed = forceUpdate ? true : utils_1.Compare.isDeepChanged(treeNode, data);
+        const changed = forceUpdate ? true : Compare.isDeepChanged(treeNode, data);
         if (changed) {
             Object.assign(treeNode, data);
             treeNode.version = (treeNode.version || 0) + 1;
@@ -571,6 +671,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         return [];
     }
     reloadContent(content) {
+        var _a, _b;
         let data = { version: this.version };
         this.loading = true;
         try {
@@ -584,7 +685,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
             this._localVersion = data.content.version;
             data.content.visible = false;
             this._saveVersion = data.version || 0;
-            this.root = (0, editor2d_1.checkDuplicateNodes)(data.content);
+            this.root = checkDuplicateNodes(data.content);
         }
         else {
             this.root = this.createRootNode();
@@ -595,6 +696,12 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         this.refresh();
         // this.loadRefInfos();
         this.fireContentChanged([], 'add', true);
+        if ((_a = this.timelineService) === null || _a === void 0 ? void 0 : _a.currentTimelineData) {
+            const animNode = this.getNodeById(this.timelineService.currentTimelineData.id);
+            if (animNode) {
+                (_b = this.timelineService) === null || _b === void 0 ? void 0 : _b.changeTimelineData(animNode);
+            }
+        }
     }
     reloadEnd() {
         if (this.loading) {
@@ -602,9 +709,9 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         }
     }
     createRootNode() {
-        const root = editor2d_1.Editor2dNode.createRootNode(new utils_1.URI(this.uri));
-        if (root.displayType === render_engine_1.GameObjectBaseType.SCENE) {
-            const defaultData = this.engineService.getDisplayDefaultData(this.engineName, render_engine_1.GameObjectBaseType.SCENE);
+        const root = Editor2dNode.createRootNode(new URI(this.uri));
+        if (root.displayType === GameObjectBaseType.SCENE) {
+            const defaultData = this.engineService.getDisplayDefaultData(this.engineName, GameObjectBaseType.SCENE);
             Object.assign(root, defaultData);
         }
         return root;
@@ -649,7 +756,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         const nextIsMask = nextNode && (nextNode.isMask || nextNode.mask && !nextNode.ignoreMask);
         // 如果底下有 mask；
         if (nextIsMask) {
-            if (!exports.maskIgnoreArray.includes(node.displayType)) {
+            if (!maskIgnoreArray.includes(node.displayType)) {
                 node.mask = nextNode.mask || nextNode.id;
                 // 底层忽略 mask 又是 mask 的情况，用底层的 id；
                 if (nextNode.ignoreMask && nextNode.isMask) {
@@ -674,7 +781,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         }
         const n = node;
         // 跳出不是 mask 实列
-        if (!exports.maskShowArray.concat(exports.maskEnabledArray).includes(n.displayType)) {
+        if (!maskShowArray.concat(maskEnabledArray).includes(n.displayType)) {
             return;
         }
         // this.updateNode(n, { mask: id });
@@ -693,7 +800,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         const prevNode = node.previousSibling;
         if (prevNode &&
             !n.ignoreMask &&
-            exports.maskShowArray.concat(exports.maskEnabledArray).includes(prevNode.displayType)) {
+            maskShowArray.concat(maskEnabledArray).includes(prevNode.displayType)) {
             // 清除时遇到 mask 图层，改成 mask 图层再附值；
             this.setPrevNodeMask(node.previousSibling, n.isMask && typeof id === 'undefined' ? n.id : id);
         }
@@ -751,7 +858,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         let group;
         const equalParent = nodes.every(n => n.parent === parent);
         const l = (parent === null || parent === void 0 ? void 0 : parent.children.length) === nodes.length;
-        if (equalParent && l && (parent === null || parent === void 0 ? void 0 : parent.displayType) === render_engine_1.GameObjectBaseType.GROUP) {
+        if (equalParent && l && (parent === null || parent === void 0 ? void 0 : parent.displayType) === GameObjectBaseType.GROUP) {
             group = parent;
         }
         group = group || await this.combineNodes(nodes);
@@ -841,7 +948,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
      */
     moveUpMore(nodes) {
         nodes = nodes.length > 1
-            ? nodes.slice().sort((n1, n2) => tree_1.CompositeTreeNode.indexOf(n1.parent, n1) - tree_1.CompositeTreeNode.indexOf(n2.parent, n2))
+            ? nodes.slice().sort((n1, n2) => CompositeTreeNode.indexOf(n1.parent, n1) - CompositeTreeNode.indexOf(n2.parent, n2))
             : nodes;
         nodes.forEach(n => this.moveUp(n));
     }
@@ -850,7 +957,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
      */
     moveDownMore(nodes) {
         nodes = nodes.length > 1
-            ? nodes.slice().sort((n1, n2) => tree_1.CompositeTreeNode.indexOf(n2.parent, n2) - tree_1.CompositeTreeNode.indexOf(n1.parent, n1))
+            ? nodes.slice().sort((n1, n2) => CompositeTreeNode.indexOf(n2.parent, n2) - CompositeTreeNode.indexOf(n1.parent, n1))
             : nodes;
         nodes.forEach(n => this.moveDown(n));
     }
@@ -868,11 +975,11 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
      * @param toAfter - 是否加到目标节点的后边，默认前面
      */
     async moveToNode(node, targetNode, toAfter) {
-        if (editor2d_1.Editor2dNode.isRootNode(targetNode) || tree_1.TreeNode.equals(node, targetNode))
+        if (Editor2dNode.isRootNode(targetNode) || TreeNode.equals(node, targetNode))
             return;
         // 判断是否有被 selectByPath 选择；
-        if (editor2d_1.Editor2dNode.getNodePath(node.parent) !==
-            editor2d_1.Editor2dNode.getNodePath(targetNode.parent)) {
+        if (Editor2dNode.getNodePath(node.parent) !==
+            Editor2dNode.getNodePath(targetNode.parent)) {
             const del = await this.layerNamePathChange([node], targetNode);
             if (!del) {
                 return;
@@ -963,8 +1070,26 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         }
         return nodes;
     }
-    getNodeById(nodeId) {
-        return this.nodes[nodeId];
+    getNodeById(nodeId, noMerge) {
+        var _a, _b;
+        const node = this.nodes[nodeId];
+        // 动画编辑，这里的 node 数据不会改变，还是没打开的数据；需要合并数据；
+        // 动画数据在 animation 里变更附值；不会改前 document 的 node 数据；
+        if (!noMerge && (node === null || node === void 0 ? void 0 : node.useAnimationId) &&
+            ((_b = (_a = this.timelineService) === null || _a === void 0 ? void 0 : _a.currentTimelineData) === null || _b === void 0 ? void 0 : _b.id) === node.useAnimationId) {
+            const animNode = this.nodes[this.timelineService.currentTimelineData.id];
+            if (animNode) {
+                const current = animNode.animation.frames.find((c) => c.id === node.id);
+                if (current) {
+                    const newNode = this.cloneNodeData(node);
+                    Object.keys(current.frame.current || {}).forEach(key => {
+                        setByKey(newNode, key, current.frame.current[key]);
+                    });
+                    return newNode;
+                }
+            }
+        }
+        return node;
     }
     getNodeIcon(node) {
         if (node.tags && node.tags.length > 0) {
@@ -989,7 +1114,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         return '';
     }
     getSelectedNodesWithoutRoot() {
-        return this.getSelectedNodes().filter(n => !editor2d_1.Editor2dNode.isRootNode(n));
+        return this.getSelectedNodes().filter(n => !Editor2dNode.isRootNode(n));
     }
     isContainNode(parent, id) {
         let target = this.nodes[id];
@@ -1014,8 +1139,8 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         if (nodes.length > 0) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const parent = nodes[0].parent;
-            const index = tree_1.CompositeTreeNode.indexOf(parent, nodes[0]);
-            const group = this.createDisplayNode(render_engine_1.GameObjectBaseType.GROUP, parent, undefined, index);
+            const index = CompositeTreeNode.indexOf(parent, nodes[0]);
+            const group = this.createDisplayNode(GameObjectBaseType.GROUP, parent, undefined, index);
             await this.moveToNodesAsChildren(nodes, group, true);
             return group;
         }
@@ -1032,7 +1157,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
             }
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const parentNode = node.parent;
-            const curIndex = tree_1.CompositeTreeNode.indexOf(parentNode, node);
+            const curIndex = CompositeTreeNode.indexOf(parentNode, node);
             node.children.slice().reverse().forEach((n) => {
                 this.addChildren(n, parentNode, curIndex);
             });
@@ -1049,7 +1174,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         var _a;
         if (childNode && childNode.parent === targetNode)
             return true;
-        const isRootNode = editor2d_1.Editor2dNode.isRootNode(targetNode);
+        const isRootNode = Editor2dNode.isRootNode(targetNode);
         const nodeDeco = this.engineService.getGameObjectDecoration(this.engineName, targetNode.displayType);
         const childDeco = this.engineService.getGameObjectDecoration(this.engineName, childDisplayType);
         const childTypes = typeof nodeDeco.childTypes === 'function' ? nodeDeco.childTypes(targetNode) : (nodeDeco.childTypes || []);
@@ -1085,17 +1210,18 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
     setAnimationStarted(b) {
         this.animationStarted = b;
     }
-    startRecordAnimation(animationIds, onNodeChange) {
+    startRecordAnimation(timelineService, onNodeChange) {
         // this.animationStarted = true;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const getNodesToChildrenById = (n, id) => n.children && n.children.some((c) => c.id === id || getNodesToChildrenById(c, id));
-        this.animationIds = animationIds();
+        this.timelineService = timelineService;
+        this.animationIds = timelineService.getAnimationIds();
         // 缓存移到 timeline 里处理
         /* const cache: Editor2dNode[] = this.animationIds
           .map(id => this.getNodeById(id)).filter(n => !!n)
           .map(node => this.cloneNodeData(node as Editor2dNode)); */
         const toDispose = this.onContentChanged(e => {
-            this.animationIds = animationIds();
+            this.animationIds = timelineService.getAnimationIds();
             // TODO 删除动画元件后，动画面板清空数据
             if (e.nodes) {
                 const nodes = e.nodes.filter((n) => 
@@ -1151,7 +1277,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
     refresh(raw) {
         if (!raw)
             return super.refresh();
-        const deferred = new utils_1.PromiseDeferred();
+        const deferred = new PromiseDeferred();
         if (this.refreshingNodes.has(raw)) {
             const cache = this.refreshingNodes.get(raw);
             cache.deferred.resolve(undefined);
@@ -1169,7 +1295,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         return deferred.promise;
     }
     cloneNodeData(node) {
-        return (0, utils_1.deepClone)((0, utils_1.omit)(node, ['parent', 'previousSibling', 'nextSibling', 'selected', 'canvasHide', 'version']));
+        return deepClone(omit(node, ['parent', 'previousSibling', 'nextSibling', 'selected', 'canvasHide', 'version']));
     }
     get version() {
         return this._localVersion;
@@ -1219,7 +1345,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         if (!this.root)
             return [];
         const nodes = [];
-        for (const node of new editor2d_iterator_1.Editor2dIterator(this.root)) {
+        for (const node of new Editor2dIterator(this.root)) {
             if (node !== this.root && (!types || types.includes(node.displayType))) {
                 nodes.push(node);
             }
@@ -1230,7 +1356,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
         const node = this.nodes[nodeId];
         if (!node)
             return '';
-        const objectId = editor2d_1.Editor2dNode.getNodePath(node);
+        const objectId = Editor2dNode.getNodePath(node);
         return objectId;
     }
     /**
@@ -1283,7 +1409,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
             if (node.follow) {
                 const { open, target, type } = node.follow;
                 if (open && target && node.position) {
-                    this.message.warn(`元素开启了跟随，${(type === null || type === void 0 ? void 0 : type.map(c => render_engine_pixi_1.followKeyType[c]).join(',')) || 'x'} 被锁定`, { timeout: 2000 });
+                    this.message.warn(`元素开启了跟随，${(type === null || type === void 0 ? void 0 : type.map(c => followKeyType[c]).join(',')) || 'x'} 被锁定`, { timeout: 2000 });
                     const p = this.getFollowPosition(node);
                     p.forEach(c => {
                         if (c.type === 'x' || c.type === 'y') {
@@ -1324,7 +1450,7 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
             if (open && target && node.position) {
                 const targetNode = this.getNodeById(target);
                 if (targetNode && targetNode.position) {
-                    const t = (0, render_engine_pixi_1.getFollowValue)(node.follow, targetNode);
+                    const t = getFollowValue(node.follow, targetNode);
                     return t;
                 }
             }
@@ -1356,35 +1482,24 @@ let Editor2dDocument = class Editor2dDocument extends tree_1.TreeImpl {
             }
         });
     }
-    /**
-     * 资源重新加载
-     */
-    async reloadAssets(assets) {
-        if (!assets.length) {
-            return;
-        }
-        const game = this.engineService.getGameWidgetByUri(this.uri);
-        const scene = game === null || game === void 0 ? void 0 : game.getCurrentScene();
-        await (scene === null || scene === void 0 ? void 0 : scene.refresh(assets));
-    }
 };
 Editor2dDocument = __decorate([
-    (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.inject)(connection_1.MessageService)),
-    __param(1, (0, inversify_1.inject)(editor2d_1.Editor2dModelOptions)),
-    __param(2, (0, inversify_1.inject)(resource_1.ResourceProvider)),
-    __param(3, (0, inversify_1.inject)(browser_1.ResourceAutoSaveService)),
-    __param(4, (0, inversify_1.inject)(workspace_2d_1.WorkspaceResourceService)),
-    __param(5, (0, inversify_1.inject)(render_engine_ide_1.RenderEngineIDEService)),
-    __param(6, (0, inversify_1.inject)(app_config_1.AppConfigService)),
-    __param(7, (0, inversify_1.inject)(exports.Editor2dComponentProvider)),
-    __param(7, (0, inversify_1.optional)()),
-    __param(8, (0, inversify_1.inject)(theme_1.ThemeService)),
-    __param(8, (0, inversify_1.optional)()),
-    __metadata("design:paramtypes", [connection_1.MessageService, Object, Function, browser_1.ResourceAutoSaveService,
-        workspace_2d_1.WorkspaceResourceService,
-        render_engine_ide_1.RenderEngineIDEService,
-        app_config_1.AppConfigService, Object, theme_1.ThemeService])
+    injectable(),
+    __param(0, inject(MessageService)),
+    __param(1, inject(Editor2dModelOptions)),
+    __param(2, inject(ResourceProvider)),
+    __param(3, inject(ResourceAutoSaveService)),
+    __param(4, inject(WorkspaceResourceService)),
+    __param(5, inject(RenderEngineIDEService)),
+    __param(6, inject(AppConfigService)),
+    __param(7, inject(Editor2dComponentProvider)),
+    __param(7, optional()),
+    __param(8, inject(ThemeService)),
+    __param(8, optional()),
+    __metadata("design:paramtypes", [MessageService, Object, Function, ResourceAutoSaveService,
+        WorkspaceResourceService,
+        RenderEngineIDEService,
+        AppConfigService, Object, ThemeService])
 ], Editor2dDocument);
-exports.Editor2dDocument = Editor2dDocument;
+export { Editor2dDocument };
 //# sourceMappingURL=editor2d-document.js.map