@gedit/editor-2d 0.1.92 → 0.1.98

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

@@ -0,0 +1,61 @@
+import { CanvasDraw, CanvasDrawOpts } from '../playground/canvas-draw';
+import { Disposable, DisposableImpl, Emitter, PromiseDeferred, SizeSchema } from '@gedit/utils';
+import type { Editor2dModel } from '../model/editor2d-model';
+import { Editor2dNode } from '../model';
+import { GameConfig } from '@gedit/render-engine/lib/common';
+export interface SnapshotOpts extends Omit<CanvasDrawOpts, 'host'> {
+    imageType?: string;
+    quility?: number;
+    limitSize?: SizeSchema;
+    appConfig: GameConfig | (() => GameConfig);
+    engineName: string;
+}
+export declare const SnapshotOptsDefault: {
+    quility: number;
+    imageType: string;
+};
+export interface Snapshot {
+    uri: string;
+    name?: string;
+    version?: string | number;
+    imageData: string;
+}
+export interface SnapshotInput {
+    uri: string;
+    name?: string;
+    version?: string | number;
+    content: Editor2dNode;
+}
+export declare function createSnapshots(opts: SnapshotOpts, sceneDatas: SnapshotInput[]): Promise<Snapshot[]>;
+export declare class SnapshotCreator extends DisposableImpl {
+    protected readonly opts: SnapshotOpts;
+    protected drawer: CanvasDraw;
+    protected processing?: PromiseDeferred<void>;
+    protected result: {
+        [key: string]: Snapshot;
+    };
+    protected processingData: SnapshotInput[];
+    protected onUpdateEmitter: Emitter<void>;
+    readonly onUpdate: import("@gedit/utils").Event<void>;
+    protected current?: SnapshotInput;
+    constructor(opts: SnapshotOpts);
+    /**
+     * 清楚缓存数据
+     */
+    clearResultCache(includeUris: string[]): void;
+    getResultFromCache(): Snapshot[];
+    updateResultCache(data: Snapshot): void;
+    getSnapshot(uri: string): Snapshot | undefined;
+    draw(scenes: SnapshotInput[]): Promise<Snapshot[]>;
+    protected process(): Promise<void>;
+    protected next(end: () => void): void;
+    /**
+     * 监听变化，并自动刷新缩略图缓存
+     * @param model
+     * @param fn
+     * @param quility 缩略图质量
+     * @param delay 延迟生成
+     */
+    listenModelChanged(model: Editor2dModel, fn: (imageData: string) => void, quility?: number, delay?: number): Disposable;
+}
+//# sourceMappingURL=snapshot.d.ts.map

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

@@ -0,0 +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,EACL,UAAU,EAEV,cAAc,EAEd,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;IAkBvC;;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;CAUnH"}

package/lib/browser/utils/snapshot.js

@@ -0,0 +1,257 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SnapshotCreator = exports.createSnapshots = exports.SnapshotOptsDefault = void 0;
+var canvas_draw_1 = require("../playground/canvas-draw");
+var utils_1 = require("@gedit/utils");
+var model_1 = require("../model");
+exports.SnapshotOptsDefault = {
+    quility: 0.8,
+    imageType: 'image/webp',
+};
+function fixDrawerScale(drawer, limitSize) {
+    // const appConfig = drawer.getData()?.appConfig;
+    // if (!appConfig) return;
+    var currentSize = drawer.getSceneSize();
+    var scale = utils_1.SizeSchema.fixSize(currentSize, {
+        width: limitSize.width,
+        height: limitSize.height,
+    });
+    drawer.refreshScale(false, scale);
+}
+function createSnapshots(opts, sceneDatas) {
+    return __awaiter(this, void 0, void 0, function () {
+        var creator, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    creator = new SnapshotCreator(opts);
+                    return [4 /*yield*/, creator.draw(sceneDatas)];
+                case 1:
+                    result = _a.sent();
+                    creator.dispose();
+                    return [2 /*return*/, result];
+            }
+        });
+    });
+}
+exports.createSnapshots = createSnapshots;
+var host;
+var SnapshotCreator = /** @class */ (function (_super) {
+    __extends(SnapshotCreator, _super);
+    function SnapshotCreator(opts) {
+        var _this = _super.call(this) || this;
+        _this.opts = opts;
+        _this.result = {};
+        _this.processingData = [];
+        _this.onUpdateEmitter = new utils_1.Emitter();
+        _this.onUpdate = _this.onUpdateEmitter.event;
+        if (!host) {
+            host = document.createElement('div');
+            host.className = 'gedit-editor-snapshots';
+            host.style.display = 'none';
+            document.body.appendChild(host);
+        }
+        _this.drawer = new canvas_draw_1.CanvasDraw(__assign({ host: host }, opts));
+        _this.toDispose.pushAll([
+            _this.drawer,
+            _this.onUpdateEmitter,
+        ]);
+        return _this;
+    }
+    /**
+     * 清楚缓存数据
+     */
+    SnapshotCreator.prototype.clearResultCache = function (includeUris) {
+        var _this = this;
+        Object.keys(this.result).forEach(function (key) {
+            if (!includeUris.includes(key)) {
+                delete _this.result[key];
+            }
+        });
+    };
+    SnapshotCreator.prototype.getResultFromCache = function () {
+        var _this = this;
+        return Object.keys(this.result).map(function (k) { return _this.result[k]; });
+    };
+    SnapshotCreator.prototype.updateResultCache = function (data) {
+        this.result[data.uri] = data;
+    };
+    SnapshotCreator.prototype.getSnapshot = function (uri) {
+        return this.result[uri];
+    };
+    SnapshotCreator.prototype.draw = function (scenes) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.processingData = scenes.filter(function (s) {
+                            var result = _this.result[s.uri];
+                            if (result && s.version === result.version)
+                                return false;
+                            if (_this.current && _this.current.version === s.version)
+                                return false;
+                            return true;
+                        });
+                        return [4 /*yield*/, this.process()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/, scenes.map(function (s) { return _this.result[s.uri]; })];
+                }
+            });
+        });
+    };
+    SnapshotCreator.prototype.process = function () {
+        var _this = this;
+        if (this.processing) {
+            return this.processing.promise;
+        }
+        var deferred = this.processing = new utils_1.PromiseDeferred();
+        var drawer = this.drawer;
+        var dispose = new utils_1.DisposableCollection();
+        dispose.push(utils_1.Disposable.create(function () {
+            deferred.resolve();
+            _this.current = undefined;
+            _this.processing = undefined;
+        }));
+        dispose.push(drawer.onLoading(function (e) {
+            var loaded = e.loaded, allCount = e.allCount, currentCount = e.currentCount;
+            if (loaded || allCount <= currentCount) {
+                var widget = drawer.renderWidget;
+                if (_this.opts.limitSize) {
+                    fixDrawerScale(drawer, _this.opts.limitSize);
+                }
+                else {
+                    drawer.refreshScale(false, 1);
+                }
+                widget.createSnapShot(_this.opts.imageType || exports.SnapshotOptsDefault.imageType, _this.opts.quility || exports.SnapshotOptsDefault.quility).then(function (imageData) {
+                    var current = _this.current;
+                    if (current) {
+                        _this.result[current.uri] = {
+                            uri: current.uri,
+                            version: current.version,
+                            name: current.name,
+                            imageData: imageData
+                        };
+                        _this.onUpdateEmitter.fire();
+                    }
+                    _this.next(function () { return dispose.dispose(); });
+                });
+            }
+        }));
+        this.next(function () { return dispose.dispose(); });
+        return deferred.promise;
+    };
+    SnapshotCreator.prototype.next = function (end) {
+        var _a, _b;
+        var next = this.processingData.shift();
+        if (next) {
+            this.current = next;
+            (_b = (_a = this.drawer.renderWidget) === null || _a === void 0 ? void 0 : _a.currentScene) === null || _b === void 0 ? void 0 : _b.dispose();
+            var appConfig = typeof this.opts.appConfig === 'function' ? this.opts.appConfig() : this.opts.appConfig;
+            var content = next.content;
+            // Empty
+            if (!content || !content.children || Object.keys(content).length === 0) {
+                content = model_1.Editor2dNode.createRootNode(new utils_1.URI(next.uri));
+                var attrs = this.opts.renderEngine.getDisplayDefaultData(this.opts.engineName, content.displayType);
+                Object.assign(content, __assign({}, attrs));
+            }
+            this.drawer.update({
+                visible: true,
+                uri: next.uri,
+                engineName: this.opts.engineName,
+                appConfig: appConfig,
+                content: content,
+            });
+        }
+        else {
+            end();
+        }
+    };
+    /**
+     * 监听变化，并自动刷新缩略图缓存
+     * @param model
+     * @param fn
+     * @param quility 缩略图质量
+     * @param delay 延迟生成
+     */
+    SnapshotCreator.prototype.listenModelChanged = function (model, fn, quility, delay) {
+        var _this = this;
+        if (quility === void 0) { quility = 0.1; }
+        if (delay === void 0) { delay = 1000; }
+        return model.playground.context.onCanvasDataChanged((0, utils_1.debounce)(function (drawer) {
+            var _a = drawer.getData() || {}, content = _a.content, visible = _a.visible;
+            if (!content || drawer.loading)
+                return;
+            if (visible) {
+                var widget = drawer.renderWidget;
+                widget.createSnapShot(_this.opts.imageType, quility).then(function (base64) { return fn(base64); });
+            }
+        }, delay));
+    };
+    return SnapshotCreator;
+}(utils_1.DisposableImpl));
+exports.SnapshotCreator = SnapshotCreator;
+//# sourceMappingURL=snapshot.js.map

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

@@ -0,0 +1 @@
+{"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.1.92",
+  "version": "0.1.98",
   "license": "MIT",
   "main": "lib/browser/index",
   "typings": "lib/browser/index.d.ts",
@@ -9,11 +9,11 @@
     "src"
   ],
   "dependencies": {
-    "@gedit/app-config": "^0.1.86",
-    "@gedit/editor": "^0.1.68",
-    "@gedit/playground": "^0.1.76",
-    "@gedit/render-engine-ide": "^0.1.92",
-    "@gedit/workspace-2d": "^0.1.72",
+    "@gedit/app-config": "^0.1.92",
+    "@gedit/editor": "^0.1.74",
+    "@gedit/playground": "^0.1.82",
+    "@gedit/render-engine-ide": "^0.1.98",
+    "@gedit/workspace-2d": "^0.1.78",
     "json-stringify-pretty-compact": "^2.0.0"
   },
   "geditExtensions": [
@@ -34,5 +34,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "db74e452a213a016b3be82938fe68df8fdde2e6b"
+  "gitHead": "b63ded2ca7a5d825937e4c58fb0b17d471bfb315"
 }

package/src/browser/editor2d-contribution.ts

@@ -118,12 +118,12 @@ export class Editor2dContribution implements FrontendApplicationContribution, Co
   }
 
   registerToolbarItems(toolbars: TabBarToolbarRegistry): void {
-    toolbars.registerItem({
+    /* toolbars.registerItem({
       id: Editor2dCommands.FULLSCREEN.id,
       command: Editor2dCommands.FULLSCREEN.id,
       tooltip: Editor2dCommands.FULLSCREEN.label,
       priority: 0,
-    });
+    }); */
     /*
         toolbars.registerItem({
           id: Editor2dCommands.ZOOM_IN.id,

package/src/browser/editor2d-frontend-module.ts

@@ -25,6 +25,7 @@ export default new ContainerModule(bind => {
     Editor2dRefProviderContribution,
     Editor2dContextKeyService,
   ]);
+  bind(Editor2dService.Provider).toFactory(ctx => () => ctx.container.get(Editor2dService));
   bindContributions(bind, Editor2dContribution, [
     FrontendApplicationContribution,
     CommandContribution,

package/src/browser/editor2d-service.ts

@@ -5,7 +5,7 @@ import {
   SelectionService,
 } from '@gedit/application-common';
 import { Editor2dModel } from './model/editor2d-model';
-import { EditorAccess, EditorManager, EditorWidget } from '@gedit/editor';
+import { EditorAccess, EditorDocumentChangeEvent, EditorManager, EditorWidget } from '@gedit/editor';
 import { Editor2dNode } from './model/editor2d';
 import { Editor2dDocument } from './model/editor2d-document';
 import { SelectableTreeNode, TreeSelection } from '@gedit/tree';
@@ -17,6 +17,10 @@ export interface Editor2dSelectedNodesChangedEvent {
   document: Editor2dDocument | undefined; // 如果为空，代表当前没有在编辑文档
 }
 
+export interface Editor2dModelContentChangedEvent extends Editor2dSelectedNodesChangedEvent {
+  event: EditorDocumentChangeEvent<Editor2dDocument>
+}
+
 @injectable()
 export class Editor2dService {
   @inject(SelectionService) protected readonly selectionService: SelectionService;
@@ -59,7 +63,21 @@ export class Editor2dService {
       fn(this.getCurrentModel());
     });
   }
-  onDeleteNode(fn: (e: Editor2dSelectedNodesChangedEvent & { deleteNodes: Editor2dNode[] }) => void): Disposable {
+  onDeleteNode(fn: (e: Editor2dModelContentChangedEvent & { deleteNodes: Editor2dNode[] }) => void): Disposable {
+    return this.onCurrentModelContentChanged(e => {
+      if (e.event.type === 'delete') {
+        return fn({
+          ...e,
+          deleteNodes: (e.event.nodes as Editor2dNode[]) || [],
+        });
+      }
+    });
+  }
+  /**
+   * 内容修改触发
+   * @param fn
+   */
+  onCurrentModelContentChanged(fn: (e: Editor2dModelContentChangedEvent) => void): Disposable {
     const self = this;
     let model: Editor2dModel | undefined;
     const toDispose = new DisposableCollection();
@@ -71,15 +89,13 @@ export class Editor2dService {
       preDispose.dispose();
       preDispose = new DisposableCollection();
       if (model) {
-        preDispose.push(model.onDocumentContentChanged(e => {
-          if (e.type === 'delete') {
-            fn({
-              selectedNodes: model?.selection.selectedNodes || [],
-              deleteNodes: (e.nodes as Editor2dNode[]) || [],
-              document: model?.document,
-              model,
-            });
-          }
+        preDispose.push(model.onDocumentContentChanged(event => {
+          fn({
+            selectedNodes: model?.selection.selectedNodes || [],
+            document: model?.document,
+            model,
+            event
+          });
         }));
       }
       toDispose.push(preDispose);
@@ -153,3 +169,9 @@ export class Editor2dService {
     return toDispose;
   }
 }
+
+export namespace Editor2dService {
+  // 动态获取, 用于循环依赖情况, 可以在AppShell加载之后使用
+  export type Provider = () => Editor2dService;
+  export const Provider = Symbol('Editor2dService.Provider');
+}

package/src/browser/index.ts

@@ -1,4 +1,5 @@
 export * from './model';
 export * from './editor2d-service';
 export * from './playground';
+export * from './utils/snapshot';
 

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

@@ -36,7 +36,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
   readonly onSaved = this.onSavedEmitter.event;
   public animationStarted: boolean = false;
   protected animationIds: string[] = []; // 当前正在录制的动画节点
-  private _localVersion: number = versionId++;
+  private _localVersion: number = 0;
+  private _saveVersion: number = 0;
   protected errors: ResourceRefError[] = [];
   protected componentContents: { [key: string]: Editor2dNode } = {};
   protected _snaplines: any[] = [];
@@ -61,7 +62,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     super();
     this.toDispose.push(this.onContentChangedEmitter);
     this.toDispose.push(this.onSavedEmitter);
-    this.toDispose.push(this.resourceAutoSaveService);
+    // this.toDispose.
+    // this.toDispose.push(this.resourceAutoSaveService);
     this.toDispose.push(this.resourceAutoSaveService.onSyncContent(content => this.reloadContent(content || '')));
     this.toDispose.push(this.onSaved(event => this.resourceAutoSaveService.fireDidChangeContent(event)));
     this.toDispose.push(this.resourceService.onRefsChange(async () => {
@@ -264,6 +266,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     }
     if (data.content) {
       this._localVersion = data.content.version;
+      (data.content as any).visible = false;
+      this._saveVersion = data.version || 0;
       this.root = data.content;
     } else {
       this.root = this.createRootNode();
@@ -296,6 +300,10 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
       this.onContentChangedEmitter.fire({ document: this, contentChanges: contents, nodes, type });
     }
     if (!this.loading && !noSave) {
+      this._saveVersion++;
+      if (this._saveVersion === Number.MAX_VALUE) {
+        this._saveVersion = 0;
+      }
       this.onSavedEmitter.fire({ document: this, contentChanges: contents, nodes, type });
     }
   };
@@ -756,4 +764,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
       this.fireContentChanged([], 'update');
     }
   }
+  get saveVersion(): number {
+    return this._saveVersion;
+  }
 }

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

@@ -2,10 +2,20 @@ import { injectable } from 'inversify';
 import { EditorDocumentSelection } from '@gedit/editor';
 import { TreeSelectionServiceImpl } from '@gedit/tree/lib/browser/tree-selection-impl';
 import { Editor2dNode } from './editor2d';
+import { SelectableTreeNode, TreeSelection } from '@gedit/tree';
+import SelectionType = TreeSelection.SelectionType;
 
 @injectable()
 export class Editor2dSelection extends TreeSelectionServiceImpl implements EditorDocumentSelection {
   get selectedNodes(): Editor2dNode[] {
     return this.state.selection() as Editor2dNode[];
   }
+  clearSelection(): void {
+    this.selectedNodes.forEach(node =>
+      this.addSelection({
+        node: node as Readonly<SelectableTreeNode>,
+        type: SelectionType.TOGGLE
+      })
+    );
+  }
 }

package/src/browser/model/editor2d.ts

@@ -86,6 +86,7 @@ export interface Editor2dContainerNode extends Editor2dNode, ExpandableTreeNode
 
 export namespace Editor2dNode {
   export const ROOT_NODE_ID = 'root';
+  export const GLOBAL_ADD_EVENT = 'global_add_event'; // 全局添加标记事件
   export function createNodeId(): string {
     return generateUuid();
   }
@@ -188,7 +189,7 @@ export namespace Editor2dNode {
       parent: undefined,
       name: uri.displayName,
       children: [],
-      visible: true,
+      visible: false,
       expanded: true,
       selected: false,
       locked: false,
@@ -247,7 +248,7 @@ export async function getEditor2dModelOpts(resource: Resource, resourceService:
   const options: ResourceAutoSaveOptions = {
     encoding,
     resource,
-    saveAsString: e => Editor2dContent.parseToString({version: e.document.version, content: e.document.root, snaplines: e.document.snaplines})
+    saveAsString: e => Editor2dContent.parseToString({version: e.document.saveVersion, content: e.document.root, snaplines: e.document.snaplines})
   };
   const autoSaveService = await resourceService.createAutoSaveResource(options);
   return {

package/src/browser/model/utils/anim.utils.ts

@@ -10,7 +10,7 @@ interface KeysValue {
   name: string;
 }
 
-const supportKeys: SchemaType[] = ['integer', 'float'];
+const supportKeys: SchemaType[] = ['integer', 'float', 'color'];
 function readAnimationKeys(
   deco: SchemaDecoration,
   keyList: { key: string; name: string }[],
@@ -32,7 +32,12 @@ function readAnimationKeys(
         currentKey
       );
     });
-  } else if (currentLabel && currentKey && supportKeys.includes(deco.type)) {
+  } else if (
+    currentLabel &&
+    currentKey &&
+    supportKeys.includes(deco.type) &&
+    !currentKey.match(/^(origin)/) // 干掉原点
+  ) {
     keyList.push({
       key: currentKey,
       name: currentLabel.toUpperCase(),

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

@@ -1,4 +1,4 @@
-import { GameConfig, GameObject, GameObjectBaseType, GameObjectData, GameObjectError } from '@gedit/render-engine';
+import { GameConfig, GameObject, GameObjectData, GameObjectError } from '@gedit/render-engine';
 import { Editor2dNode } from '../model/editor2d';
 import { GameSceneIDE, GameWidgetIDE, RenderEngineIDEService } from '@gedit/render-engine-ide';
 import { AppConfigData } from '@gedit/app-config/lib/common';
@@ -11,11 +11,6 @@ interface GameObjectState {
   adsorbable: boolean,
   isInside: boolean
 }
-interface GameSceneSizeConfig {
-  width?: number // 场景宽
-  height?: number // 场景高
-  autoSize?: boolean
-}
 
 export interface CanvasDrawOpts {
   host: HTMLElement,
@@ -87,7 +82,7 @@ function toNodeData(node: Editor2dNode, config: AppConfigData): GameObjectData {
  * 画布绘制逻辑
  */
 export class CanvasDraw extends DisposableImpl {
-  protected onDrawEmitter = new Emitter<GameSceneSizeConfig>();
+  protected onDrawEmitter = new Emitter<GameConfig.SceneSizeConfig>();
   protected onLoadingEmitter = new Emitter<CanvasDrawLoadingState>();
   protected onGameObjectChangeEmitter = new Emitter<GameObjectChangeEvent>();
   protected data?: CanvasDrawData;
@@ -353,14 +348,7 @@ export class CanvasDraw extends DisposableImpl {
     if (!this.data) return undefined;
     const { content, appConfig } = this.data;
     if (!appConfig || !content) return undefined;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const sizeConfig = (content as any)[GameObjectBaseType.SCENE] as GameSceneSizeConfig | undefined;
-    const config = GameConfig.toAutoSize(appConfig);
-    const isAuto = sizeConfig?.autoSize;
-    return {
-      width: isAuto ? config.width : sizeConfig?.width || config.width,
-      height: isAuto ? config.height : sizeConfig?.height || config.height
-    };
+    return GameConfig.getSceneSize(appConfig, content);
   }
   protected draw(): void {
     if (!this.data) return;
@@ -395,4 +383,3 @@ export class CanvasDraw extends DisposableImpl {
     this.onDrawEmitter.fire(size);
   }
 }
-

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

@@ -61,7 +61,7 @@ export class CanvasLayer extends Layer<PlaygroundContext2d> {
         this.document?.updateNode(e.node, {error: e.error});
         break;
     }
-    this.context.onCanvasDataChanged(this.canvasDrawer!);
+    this.context.onCanvasDataChangedEmitter.fire(this.canvasDrawer!);
   }
 
   getAssetsURI(): string {