fix(Dropdown): 修改展开位置在下方时，关闭动画异常问题 (#1813)

* fix(Dropdown): 修改展开位置在下方时，关闭动画异常问题 * fix(EditableSelect): 远程搜索时，loading结束再显示无数据
DevCloudFE · Mar 28, 2024 · 578f03f · 578f03f
1 parent db83658
commit 578f03f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/packages/devui-vue/devui/dropdown/src/dropdown.tsx b/packages/devui-vue/devui/dropdown/src/dropdown.tsx
@@ -33,7 +33,7 @@ export default defineComponent({
       props,
       emit,
     });
-    useDropdown(id, visible, isOpen, origin, dropdownRef, currentPosition, emit);
+    useDropdown(id, visible, isOpen, origin, dropdownRef, emit);
     const { overlayModelValue, overlayShowValue, styles, classes, handlePositionChange } = useOverlayProps(props, currentPosition, isOpen);
 
     watch(overlayShowValue, (overlayShowValueVal) => {

diff --git a/packages/devui-vue/devui/dropdown/src/use-dropdown.ts b/packages/devui-vue/devui/dropdown/src/use-dropdown.ts
@@ -112,20 +112,8 @@ export function useDropdown(
   isOpen: Ref<boolean>,
   origin: Ref<HTMLElement | undefined>,
   dropdownRef: Ref<HTMLElement | undefined>,
-  popDirection: Ref<string>,
   emit: EmitEvent
 ): void {
-  const calcPopDirection = (dropdownEl: HTMLElement) => {
-    const elementHeight = dropdownEl.offsetHeight;
-    const bottomDistance = window.innerHeight - (origin.value as HTMLElement).getBoundingClientRect().bottom;
-    const isBottomEnough = bottomDistance >= elementHeight;
-    if (!isBottomEnough) {
-      popDirection.value = 'top';
-    } else {
-      popDirection.value = 'bottom';
-    }
-  };
-
   watch(
     visible,
     (newVal, oldVal) => {
@@ -153,9 +141,6 @@ export function useDropdown(
         }
       }
     }
-    if (dropdownEl) {
-      calcPopDirection(dropdownEl);
-    }
   });
   onMounted(() => {
     dropdownMap.set(id, { toggleEl: origin.value });

diff --git a/packages/devui-vue/devui/editable-select/src/components/dropdown/dropdown.tsx b/packages/devui-vue/devui/editable-select/src/components/dropdown/dropdown.tsx
@@ -32,7 +32,7 @@ export default defineComponent({
 
     // 渲染options
     const renderOption = () => {
-      if (props.options.length === 0) {
+      if (props.options.length === 0 && !select.loading.value) {
         return <li class={ns.em('item', 'no-data-tip')}>{slots.noResultItem ? slots.noResultItem() : emptyText.value}</li>;
       }
 

diff --git a/packages/devui-vue/package.json b/packages/devui-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-devui",
-  "version": "1.6.4-select.0",
+  "version": "1.6.5",
   "license": "MIT",
   "description": "DevUI components based on Vite and Vue3",
   "keywords": [