From a78c15b11bb935753f9e7b467f8ac9629d86d070 Mon Sep 17 00:00:00 2001 From: ChenX Date: Fri, 4 Aug 2017 14:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=BE=97=E7=82=B9?= =?UTF-8?q?=E5=87=BD=E6=95=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DatabaseServices/Entity.ts | 2 +- src/DatabaseServices/UndoData.ts | 1 + src/Editor/Editor.ts | 4 ++-- src/GraphicsSystem/Viewer.ts | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/DatabaseServices/Entity.ts b/src/DatabaseServices/Entity.ts index 364ce86f6..55c3c914f 100644 --- a/src/DatabaseServices/Entity.ts +++ b/src/DatabaseServices/Entity.ts @@ -79,7 +79,7 @@ export class Entity { this.m_Data = EntityData.create(); } - erase(isErase: boolean = true) + erase(isErase) { this.m_Data.setErase(isErase); } diff --git a/src/DatabaseServices/UndoData.ts b/src/DatabaseServices/UndoData.ts index 56fa47c39..08434fe72 100644 --- a/src/DatabaseServices/UndoData.ts +++ b/src/DatabaseServices/UndoData.ts @@ -35,6 +35,7 @@ export class UndoData for (var index = min; index < max; index++) { this.m_App.m_Database.disposeEntity(index); + console.log('del index: ', index); } this.m_UndoDataList = this.m_UndoDataList.splice(0, this.m_UndoDataList.length - this.m_UndoIndex); } diff --git a/src/Editor/Editor.ts b/src/Editor/Editor.ts index 88f2d4b9f..65d6c655d 100644 --- a/src/Editor/Editor.ts +++ b/src/Editor/Editor.ts @@ -55,13 +55,13 @@ export class Editor let dispose = () => { this.m_InputState = InputState.None; - resolve(retValue); remove(); if (prompt) { removeDrag(); - line.erase(); + line.erase(true); } + resolve(retValue); } let remove = xaop.end(this.m_MouseCtrl, this.m_MouseCtrl.onMouseDown, () => { diff --git a/src/GraphicsSystem/Viewer.ts b/src/GraphicsSystem/Viewer.ts index af4f65e31..3d471e37a 100644 --- a/src/GraphicsSystem/Viewer.ts +++ b/src/GraphicsSystem/Viewer.ts @@ -54,7 +54,7 @@ export class Viewer let injectEntity = (ent: Entity) => { - let remove = xaop.begin(ent, ent.erase, (b: boolean) => + let remove = xaop.begin(ent, ent.erase, function (b: boolean) { let obj = ent.Draw(this.m_RenderType); obj.visible = !b;