fix(comp:contro-trigger): overlay closes when scrolling with virtual …

…scroll (#1978)
IDuxFE · Jul 30, 2024 · c2944df · c2944df
1 parent 0778970
commit c2944df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/packages/components/control-trigger/src/ControlTriggerOverlay.tsx b/packages/components/control-trigger/src/ControlTriggerOverlay.tsx
@@ -72,6 +72,11 @@ export default defineComponent({
 
       resetTriggerFocus()
     })
+    useEventListener(popperElRef, 'wheel', () => {
+      if (overlayFocused.value) {
+        resetTriggerFocus()
+      }
+    })
 
     onMounted(() => {
       bindOverlayMonitor(overlayRef, overlayOpened)

diff --git a/packages/pro/tag-select/src/content/TagDataEditPanel.tsx b/packages/pro/tag-select/src/content/TagDataEditPanel.tsx
@@ -68,6 +68,13 @@ export default defineComponent({
       handleTagDataRemove(props.data)
     }
 
+    const handlePanelMousedown = (evt: MouseEvent) => {
+      if (!(evt.target instanceof HTMLInputElement)) {
+        evt.preventDefault()
+        evt.stopImmediatePropagation()
+      }
+    }
+
     const renderColorItem = (prefixCls: string, color: TagSelectColor) => {
       const isSelected = color.key === props.data.color.key
       const colorItemPrefixCls = `${prefixCls}-item`
@@ -113,7 +120,7 @@ export default defineComponent({
       const prefixCls = `${mergedPrefixCls.value}-edit-panel`
 
       return (
-        <div class={[prefixCls, globalHashId.value, hashId.value]}>
+        <div class={[prefixCls, globalHashId.value, hashId.value]} onMousedown={handlePanelMousedown}>
           <div class={`${prefixCls}-input`}>
             <IxFormItem
               messageTooltip