@gedit/editor-2d 0.1.90 → 0.1.93

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

@@ -0,0 +1,47 @@
+import { CanvasDraw, CanvasDrawOpts } from '../playground/canvas-draw';
+import { DisposableImpl, Emitter, PromiseDeferred, SizeSchema } from '@gedit/utils';
+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);
+    getSnapshot(uri: string): Snapshot | undefined;
+    draw(scenes: SnapshotInput[]): Promise<Snapshot[]>;
+    getResult(): Snapshot[];
+    protected process(): Promise<void>;
+    protected next(end: () => void): void;
+}
+//# 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,EAAoC,cAAc,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACtH,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,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAGxC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAUxD,SAAS,IAAI,QAAQ,EAAE;cAGP,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2CxC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,IAAI,GAAG,IAAI;CAiBtC"}

package/lib/browser/utils/snapshot.js

@@ -0,0 +1,219 @@
+"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");
+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.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.getResult = function () {
+        var _this = this;
+        return Object.keys(this.result).map(function (k) { return _this.result[k]; });
+    };
+    SnapshotCreator.prototype.process = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var deferred, drawer, dispose;
+            var _this = this;
+            return __generator(this, function (_a) {
+                if (this.processing) {
+                    return [2 /*return*/, this.processing.promise];
+                }
+                deferred = this.processing = new utils_1.PromiseDeferred();
+                drawer = this.drawer;
+                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 [2 /*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;
+            this.drawer.update({
+                visible: true,
+                uri: next.uri,
+                engineName: this.opts.engineName,
+                appConfig: appConfig,
+                content: next.content,
+            });
+        }
+        else {
+            end();
+        }
+    };
+    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.90",
+  "version": "0.1.93",
   "license": "MIT",
   "main": "lib/browser/index",
   "typings": "lib/browser/index.d.ts",
@@ -9,11 +9,11 @@
     "src"
   ],
   "dependencies": {
-    "@gedit/app-config": "^0.1.84",
-    "@gedit/editor": "^0.1.67",
-    "@gedit/playground": "^0.1.74",
-    "@gedit/render-engine-ide": "^0.1.90",
-    "@gedit/workspace-2d": "^0.1.70",
+    "@gedit/app-config": "^0.1.87",
+    "@gedit/editor": "^0.1.69",
+    "@gedit/playground": "^0.1.77",
+    "@gedit/render-engine-ide": "^0.1.93",
+    "@gedit/workspace-2d": "^0.1.73",
     "json-stringify-pretty-compact": "^2.0.0"
   },
   "geditExtensions": [
@@ -34,5 +34,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "9fb7da34df87de47a24422d2ae6c590fb3fc26c1"
+  "gitHead": "f76d857b72ca85cb6090328623331a727eaf2815"
 }

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

@@ -23,6 +23,7 @@ import { WorkspaceResourceService } from '@gedit/workspace-2d';
 import { ResourceProvider, ResourceRefError } from '@gedit/resource';
 import { AppConfigService } from '@gedit/app-config';
 import { Editor2dIterator } from './editor2d-iterator';
+import { getAnimationKeys, getChangeAnimationData } from './utils';
 
 let versionId = 0;
 
@@ -60,7 +61,7 @@ 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.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 () => {
@@ -152,6 +153,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
       const name = this.getUniqueName((parent.children || []) as Editor2dNode[], nodeData.name!, nodeData.displayType);
       Object.assign(newNode, { name });
       const children = parent.children as TreeNode[];
+      if (!children) parent.children = [];
       // 加到当前节点的后边
       children.splice(index, 0, newNode);
       CompositeTreeNode.setParent(newNode, index, parent);
@@ -573,6 +575,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
           return this.animationIds.some(id => (id === n.id) || getNodesToChildrenById(n, id));
         });
         if (nodes.length) {
+          // TODO: 音乐素材变更
+          console.log('document update to timeline', nodes, e.type);
           onNodeChange(nodes, e.type);
         }
       }
@@ -582,10 +586,22 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
         toDispose.dispose();
         // reset node data
         cache.forEach(nodeData => {
-          this.updateNode(nodeData.id, {
-            ...nodeData,
-            name: this.getNodeById(nodeData.id)?.name, // name 值不回滚
-          }, true);
+          const { displayType } = nodeData;
+          const currentNode = this.getNodeById(nodeData.id);
+          if (!currentNode) {
+            return;
+          }
+          const register = this.engineService.getGameObjectIDERegister(this.engineService.engineName, displayType);
+          const {
+            timelineDisabledKeys = [],
+          } = this.engineService.getGameObjectDecoration(
+            this.engineService.engineName,
+            displayType,
+          );
+          const keysList = getAnimationKeys(this.engineService, register, timelineDisabledKeys);
+          const changeData: {[key: string]: any} = getChangeAnimationData(keysList, currentNode, nodeData);
+          changeData.name = currentNode?.name;
+          this.updateNode(nodeData.id, changeData, true);
         });
         // this.animationStarted = false;
         this.animationIds = [];

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

@@ -7,7 +7,6 @@ import { Editor2dNode } from './editor2d';
 import { DocumentData, DocumentEntity, Editor2dPlayGround } from '../playground';
 import { RenderEngineIDEService } from '@gedit/render-engine-ide';
 import { AppConfigData, AppConfigService } from '@gedit/app-config';
-import { SnaplineConfigEntity } from '@gedit/playground';
 
 /**
  * 画布渲染组件
@@ -46,19 +45,19 @@ export class Editor2dWidget extends BaseWidget implements IStatefulWidget {
   }
   initModel(model: Editor2dModel): void {
     this.model = model;
-    const snaplineConfigEntity = this.playground.getConfigEntity<SnaplineConfigEntity>(SnaplineConfigEntity)!;
+    // const snaplineConfigEntity = this.playground.getConfigEntity<SnaplineConfigEntity>(SnaplineConfigEntity)!;
     this.toDispose.pushAll([
-      snaplineConfigEntity.onConfigChanged(() => {
-        if (!model.document.loading) {
-          model.document.snaplines = snaplineConfigEntity.toDataJSON().lines;
-        }
-      }),
+      // snaplineConfigEntity.onConfigChanged(() => {
+      //   if (!model.document.loading) {
+      //     model.document.snaplines = snaplineConfigEntity.toDataJSON().lines;
+      //   }
+      // }),
       model.onDocumentContentChanged(e => {
-        if (e.document.loading) {
-          snaplineConfigEntity.updateConfig({
-            lines: model.document.snaplines || [],
-          });
-        }
+        // if (e.document.loading) {
+        //   snaplineConfigEntity.updateConfig({
+        //     lines: model.document.snaplines || [],
+        //   });
+        // }
         this.updateDocument(e);
         this.playground.focus();
       }),

package/src/browser/model/index.ts

@@ -4,4 +4,4 @@ export * from './editor2d-document';
 export * from './editor2d-selection';
 export * from './editor2d-iterator';
 export * from './editor2d-widget';
-
+export * from './utils';

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

@@ -0,0 +1,81 @@
+import { GameObjectData } from '@gedit/render-engine';
+import { GameObjectIDERegister } from '@gedit/render-engine-ide';
+import { RenderEngineIDEService as RenderEngineService } from '@gedit/render-engine-ide';
+import { SchemaDecoration, SchemaType } from '@gedit/playground';
+import { Editor2dNode } from '../editor2d';
+import { getByKey, setByKey } from '@gedit/utils';
+
+interface KeysValue {
+  key: string;
+  name: string;
+}
+
+const supportKeys: SchemaType[] = ['integer', 'float', 'color'];
+function readAnimationKeys(
+  deco: SchemaDecoration,
+  keyList: { key: string; name: string }[],
+  currentKey?: string,
+  parentName?: string,
+  parentKey?: string
+): void {
+  const currentLabel =
+    parentName && deco.label ? `${parentName}.${deco.label}` : deco.label;
+  currentKey =
+    parentKey && currentKey ? `${parentKey}.${currentKey}` : currentKey;
+  if (deco.properties) {
+    Object.keys(deco.properties).forEach((property: string) => {
+      readAnimationKeys(
+        deco.properties![property] as SchemaDecoration,
+        keyList,
+        property,
+        currentLabel,
+        currentKey
+      );
+    });
+  } else if (
+    currentLabel &&
+    currentKey &&
+    supportKeys.includes(deco.type) &&
+    !currentKey.match(/^(origin)/) // 干掉原点
+  ) {
+    keyList.push({
+      key: currentKey,
+      name: currentLabel.toUpperCase(),
+    });
+  }
+}
+
+export const getAnimationKeys = (
+  renderEngineService: RenderEngineService,
+  register: GameObjectIDERegister<GameObjectData>,
+  timelineDisabledKeys: string[]
+): KeysValue[] => {
+  let keyList: { key: string; name: string }[] = [];
+  if (register.defaultDataDecoration) {
+    const deco =
+      typeof register.defaultDataDecoration === 'function'
+        ? register.defaultDataDecoration(renderEngineService)
+        : register.defaultDataDecoration;
+    readAnimationKeys(deco, keyList);
+  }
+  keyList = keyList.filter(
+    f => !timelineDisabledKeys.find(c => f.key.indexOf(c) >= 0)
+  );
+  return keyList;
+};
+
+export const getChangeAnimationData = (
+  values: KeysValue[],
+  nodeData: Editor2dNode,
+  newData: Editor2dNode
+): { [key: string]: any } => {
+  const data = Editor2dNode.clone(nodeData);
+  Object.assign(data, { id: nodeData.id });
+  values.forEach(item => {
+    const v = getByKey(newData, item.key);
+    if (typeof v !== 'undefined') {
+      setByKey(data, item.key, v);
+    }
+  });
+  return data;
+};

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

@@ -0,0 +1 @@
+export * from './anim.utils';

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/playground-contribution.ts

@@ -33,12 +33,20 @@ export class PlaygroundContribution2d implements PlaygroundContribution {
     });
     // 开启缩放
     playground.zoomEnable = true;
-    // 模板编辑器模式
-    if (this.modelOpts.isTemplate) {
-      playground.getConfigEntity<RulerConfigEntity>(RulerConfigEntity).updateConfig({
-        gridVisible: false,
+    const rulerEntity = playground.entityManager.getEntity<RulerConfigEntity>(RulerConfigEntity);
+    // 新版隐藏标尺
+    if (rulerEntity) {
+      rulerEntity.updateConfig({
         scaleVisible: false,
+        gridVisible: false,
       });
+    }
+    // 模板编辑器模式
+    if (this.modelOpts.isTemplate) {
+      // playground.getConfigEntity<RulerConfigEntity>(RulerConfigEntity).updateConfig({
+      //   gridVisible: false,
+      //   scaleVisible: false,
+      // });
       playground.getConfigEntity<ToolbarConfigEntity>(ToolbarConfigEntity).updateConfig({
         visible: false,
         percentageInfoVisible: false,

package/src/browser/playground/selection-entity-manager.tsx

@@ -96,7 +96,22 @@ export class SelectionEntityManager {
         return;
       }; */
       // const delta = TransformSchema.getDelta(lastTransform, newTransform);
-      document.updateNode(entity.nodeId, newTransform, true);
+      const numberToFixed4 = (data: {[key: string]: any}) => {
+        const d: any = {};
+        Object.keys(data).forEach(key => {
+          const value = data[key];
+          if (typeof value === 'number') {
+            d[key] = parseFloat(value.toFixed(6));
+          } else if (typeof value === 'object') {
+            d[key] = numberToFixed4(value);
+          } else {
+            d[key] = key;
+          }
+        });
+        return d;
+      };
+
+      document.updateNode(entity.nodeId, numberToFixed4(newTransform), true);
       // lastTransform = newTransform;
     });
     // 设置控制key

package/src/browser/style/canvas-layer.css

@@ -36,5 +36,5 @@
 }
 
 .gedit-canvas-transparent {
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAADKADAAQAAAABAAAADAAAAAATDPpdAAAAfUlEQVQoFbVQQQ7AIAgD7Sf8/8s8+gd1s0vIptMlHkZiUGyBVmOMRwux4B2AhBDEOWflK6uqgICRYLVn3Zh9C6t+5G3CcqXVkKYPnQYCvfdSSpFaa8ejaM05N223S0QQmFJ6NeIfaN1I4JtnNmFb9L8Ergm6MWrg7jP36NIJC0BbmAiDWGoAAAAASUVORK5CYII=');
+  background-image: var(--g-mask-transparent);
 }

package/src/browser/style/index.less

@@ -3,6 +3,7 @@
 @import './canvas-draw-layer.less';
 
 :root {
+    --g-mask-transparent: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAADKADAAQAAAABAAAADAAAAAATDPpdAAAAfUlEQVQoFbVQQQ7AIAgD7Sf8/8s8+gd1s0vIptMlHkZiUGyBVmOMRwux4B2AhBDEOWflK6uqgICRYLVn3Zh9C6t+5G3CcqXVkKYPnQYCvfdSSpFaa8ejaM05N223S0QQmFJ6NeIfaN1I4JtnNmFb9L8Ergm6MWrg7jP36NIJC0BbmAiDWGoAAAAASUVORK5CYII=');;
     --g-icon-2d-origin: url('../svg/origin.svg');
     --g-icon-2d-fullscreen: url('../svg/fullscreen.svg');
     --g-icon-2d-zoomin: url('../svg/zoomin.svg');