diff --git a/src/core/manager/StateManager.ts b/src/core/manager/StateManager.ts
index ba68391..203a135 100644
--- a/src/core/manager/StateManager.ts
+++ b/src/core/manager/StateManager.ts
@@ -268,6 +268,8 @@ export default class StateManager {
     this.historyIndex--
     this.isChanged.value = true
     this.pendingChanges = true
+
+    system.msg('撤销完成')
   }
 
   /**
@@ -285,6 +287,8 @@ export default class StateManager {
 
     this.isChanged.value = true
     this.pendingChanges = true
+
+    system.msg('重做完成')
   }
 
   /**
diff --git a/src/editor/menus/EditMenu.ts b/src/editor/menus/EditMenu.ts
index 5998c64..9c7ab33 100644
--- a/src/editor/menus/EditMenu.ts
+++ b/src/editor/menus/EditMenu.ts
@@ -25,15 +25,19 @@ export default defineMenu((menus) => {
         }
       },
       {
-        name: 'undo', label: '撤销', icon: SvgCode.undo, order: 2, tip: 'Ctrl+Z', disabled: true,
+        name: 'undo', label: '撤销', icon: SvgCode.undo, order: 2, tip: 'Ctrl+Z',
         click: () => {
-          system.msg('撤销')
+          if (window['stateManager']) {
+            window['stateManager'].undo()
+          }
         }
       },
       {
         name: 'redo', label: '重做', icon: SvgCode.redo, order: 3, tip: 'Ctrl+Y', divided: true,
-        click() {
-          system.msg('重做')
+        click: () => {
+          if (window['stateManager']) {
+            window['stateManager'].redo()
+          }
         }
       },
       {