chore: 在每次展开面板的时候调整高亮

Tencent · Oct 31, 2024 · 05fb2e4 · 05fb2e4
1 parent 16b08cc
commit 05fb2e4
Showing 1 changed file with 11 additions and 17 deletions.
diff --git a/src/toolbars/Toolbar.js b/src/toolbars/Toolbar.js
@@ -194,14 +194,7 @@ export default class Toolbar {
           const btn = subMenu.createBtn(true);
           // 二级菜单的dom认定为一级菜单的
           subMenu.dom = subMenu.dom ? subMenu.dom : this.menus.hooks[name].dom;
-          btn.addEventListener(
-            'click',
-            (event) => {
-              this.onClick(event, level2Name, true);
-              this.activeSubMenuItem(name);
-            },
-            false,
-          );
+          btn.addEventListener('click', (event) => this.onClick(event, level2Name, true), false);
           this.subMenus[name].appendChild(btn);
         }
       });
@@ -212,14 +205,7 @@ export default class Toolbar {
       subMenuConfig.forEach((config) => {
         const btn = this.menus.hooks[name].createSubBtnByConfig(config);
         if (!config?.disabledHideAllSubMenu) {
-          btn.addEventListener(
-            'click',
-            () => {
-              this.hideAllSubMenu();
-              this.activeSubMenuItem(name);
-            },
-            false,
-          );
+          btn.addEventListener('click', () => this.hideAllSubMenu(), false);
         }
         this.subMenus[name].appendChild(btn);
       });
@@ -238,10 +224,17 @@ export default class Toolbar {
     if (this.isHasSubMenu(name) && !focusEvent) {
       this.toggleSubMenu(name);
     } else {
-      this.hideAllSubMenu();
+      // 如果是颜色选择器，则隐藏其他二级菜单，但不隐藏自己（因为颜色选择器的二级菜单是自己实现的独立逻辑）
+      if (name === 'color') {
+        // @ts-ignore
+        menu.hideOtherSubMenu(() => this.hideAllSubMenu());
+      } else {
+        this.hideAllSubMenu();
+      }
       menu.fire(event, name);
     }
   }
+
   /**
    * 激活二级菜单添加选中颜色
    * @param {string} name
@@ -271,6 +264,7 @@ export default class Toolbar {
       this.hideAllSubMenu();
       this.subMenus[name].style.display = 'block';
       this.setSubMenuPosition(this.menus.hooks[name], this.subMenus[name]);
+      this.activeSubMenuItem(name);
     } else {
       // 如果是显示的，则隐藏当前二级菜单
       this.subMenus[name].style.display = 'none';