From d69c0ad60fb5589e3d2928c22d2c59751e722157 Mon Sep 17 00:00:00 2001 From: CainXCain <74123674+CainXCain@users.noreply.github.com> Date: Sun, 3 Sep 2023 23:42:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20#560=20toolbar=E5=90=88=E5=B9=B6hooks?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=87=8D=E5=90=8D=E7=9A=84=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA=E4=BF=9D=E7=95=99toolbar?= =?UTF-8?q?=E5=8E=9F=E6=9C=89hook=20(#568)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/toolbars/Toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/toolbars/Toolbar.js b/src/toolbars/Toolbar.js index 50452289..d25bf9bd 100644 --- a/src/toolbars/Toolbar.js +++ b/src/toolbars/Toolbar.js @@ -205,7 +205,7 @@ export default class Toolbar { */ collectMenuInfo(toolbarObj) { this.toolbarHandlers = Object.assign({}, this.toolbarHandlers, toolbarObj.toolbarHandlers); - this.menus.hooks = Object.assign({}, this.menus.hooks, toolbarObj.menus.hooks); + this.menus.hooks = Object.assign({}, toolbarObj.menus.hooks, this.menus.hooks); // 只有没设置自定义快捷键的时候才需要收集其他toolbar对象的快捷键配置 if (!this.options.shortcutKey || Object.keys(this.options.shortcutKey).length <= 0) { this.shortcutKeyMap = Object.assign({}, this.shortcutKeyMap, toolbarObj.shortcutKeyMap);