feat: 1. Add '⌘' undo|redo hotkeys to support mac keyboard; 2. Fix un…

…do render logic issue (#303)
ikuaitu · Jan 17, 2024 · 1de2e33 · 1de2e33
1 parent 436d61a
commit 1de2e33
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/src/core/ServersPlugin.ts b/src/core/ServersPlugin.ts
@@ -74,6 +74,7 @@ class ServersPlugin {
         // 加载后钩子
         this.editor.hooksEntity.hookImportAfter.callAsync(jsonFile, () => {
           this.canvas.renderAll();
+          // this.editor.getPlugin('HistoryPlugin').history.clear();
         });
       });
     });

diff --git a/src/core/core.ts b/src/core/core.ts
@@ -25,14 +25,7 @@ class Editor extends EventEmitter {
   private hooksEntity: {
     [propName: string]: AsyncSeriesHook;
   } = {};
-  // constructor(canvas: fabric.Canvas) {
-  //   super();
-  //   this.canvas = canvas;
-  //   this._initContextMenu();
-  //   this._bindContextMenu();
-  //   this._initActionHooks();
-  //   this._initServersPlugin();
-  // }
+
   init(canvas: fabric.Canvas) {
     this.canvas = canvas;
     this._initContextMenu();

diff --git a/src/core/plugin/GroupPlugin.ts b/src/core/plugin/GroupPlugin.ts
@@ -52,7 +52,6 @@ class GroupPlugin {
 
   contextMenu() {
     const activeObject = this.canvas.getActiveObject();
-    console.log(activeObject, '111');
     if (activeObject && activeObject.type === 'group') {
       return [
         { text: '拆分组合', hotkey: 'Ctrl+V', disabled: false, onclick: () => this.unGroup() },

diff --git a/src/core/plugin/HistoryPlugin.ts b/src/core/plugin/HistoryPlugin.ts
@@ -12,15 +12,14 @@ import Editor from '../core';
 import { ref } from 'vue';
 import { useRefHistory } from '@vueuse/core';
 type IEditor = Editor;
-// import { v4 as uuid } from 'uuid';
 
 class HistoryPlugin {
   public canvas: fabric.Canvas;
   public editor: IEditor;
   static pluginName = 'HistoryPlugin';
   static apis = ['undo', 'redo', 'getHistory'];
   static events = ['historyInitSuccess'];
-  public hotkeys: string[] = ['ctrl+z'];
+  public hotkeys: string[] = ['ctrl+z', 'ctrl+shift+z', '⌘+z', '⌘+shift+z'];
   history: any;
   constructor(canvas: fabric.Canvas, editor: IEditor) {
     this.canvas = canvas;
@@ -38,6 +37,16 @@ class HistoryPlugin {
       'object:modified': (event) => this._save(event),
       'selection:updated': (event) => this._save(event),
     });
+    window.addEventListener('beforeunload', function (e) {
+      if (history.length > 0) {
+        (e || window.event).returnValue = '确认离开';
+      }
+    });
+  }
+
+  // 导入模板之后，清理 History 缓存
+  hookImportAfter() {
+    this.history.clear();
   }
 
   getHistory() {
@@ -58,8 +67,8 @@ class HistoryPlugin {
 
   undo() {
     if (this.history.canUndo.value) {
-      this.renderCanvas();
       this.history.undo();
+      this.renderCanvas();
     }
   }
 
@@ -79,13 +88,19 @@ class HistoryPlugin {
 
   // 快捷键扩展回调
   hotkeyEvent(eventName: string, e: any) {
-    if (eventName === 'ctrl+z' && e.type === 'keydown') {
-      this.undo();
+    if (e.type === 'keydown') {
+      switch (eventName) {
+        case 'ctrl+z':
+        case '⌘+z':
+          this.undo();
+          break;
+        case 'ctrl+shift+z':
+        case '⌘+shift+z':
+          this.redo();
+          break;
+      }
     }
   }
-  destroy() {
-    console.log('pluginDestroy');
-  }
 }
 
 export default HistoryPlugin;
diff --git a/src/core/plugin/WorkspacePlugin.ts b/src/core/plugin/WorkspacePlugin.ts
@@ -43,12 +43,6 @@ class WorkspacePlugin {
     this._bindWheel();
   }
 
-  // hookImportBefore() {
-  //   return new Promise((resolve, reject) => {
-  //     resolve();
-  //   });
-  // }
-
   hookImportAfter() {
     return new Promise((resolve) => {
       const workspace = this.canvas.getObjects().find((item) => item.id === 'workspace');