feat: fix bug close #1023 #1021 #1018

ksc-fe · Jul 31, 2024 · 9c2af2c · 9c2af2c
1 parent d9b4d8a
commit 9c2af2c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/components/dropdown/item.ts b/components/dropdown/item.ts
@@ -7,6 +7,7 @@ import {DropdownMenu, DROPDOWN_MENU} from './menu';
 import {IgnoreClickEvent} from '../../hooks/useDocumentClick';
 import { Dropdown as ExportDropdown, DropdownMenu as ExportDropdownMenu } from '.';
 import { useConfigContext } from '../config';
+import type { Tooltip } from '../tooltip/tooltip';
 
 export interface DropdownItemProps {
     disabled?: boolean
@@ -61,8 +62,12 @@ export class DropdownItem extends Component<DropdownItemProps, DropdownItemEvent
         if (this.get('hideOnSelect')) {
             // hide all dropdowns
             let dropdown = this.dropdown;
-            do { dropdown!.hide(true); }
-            while (dropdown = dropdown!.dropdown);
+            do {
+                if (!(dropdown as Tooltip).$isTooltip) {
+                    dropdown!.hide(true);
+                }
+                dropdown = dropdown!.dropdown;
+            } while (dropdown);
         }
     }
 

diff --git a/components/menu/styles.ts b/components/menu/styles.ts
@@ -273,6 +273,9 @@ export const makeMenuStyles = cache(function makeMenuStyles(k: string) {
         &.${k}-collapsed-arrow {
             width: 0px;
             border-left: none;
+            .${k}-menu-header {
+                padding: 0;
+            }
             .${k}-menu-body {
                 overflow: hidden;
                 padding: 0;

diff --git a/components/table/styles.ts b/components/table/styles.ts
@@ -90,7 +90,7 @@ export const makeStyles = cache(function makeStyles(k: string) {
         }
         table {
             width: 100%;
-            // border-collapse: collapse;
+            border-collapse: separate;
             border-spacing: 0;
             table-layout: fixed;
             // td, 

diff --git a/components/tooltip/tooltip.ts b/components/tooltip/tooltip.ts
@@ -73,6 +73,8 @@ export class Tooltip<
     static defaults = defaults;
     static events = events;
 
+    public $isTooltip = true;
+
     show(shouldFocus: boolean = false) {
         if (this.get('disabled')) return;