diff --git a/packages/devui-vue/devui/dropdown/src/dropdown.tsx b/packages/devui-vue/devui/dropdown/src/dropdown.tsx index 148f4ae3f4..da5d9bf241 100644 --- 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 index 4dac8e5dc3..358c8dcf40 100644 --- 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, origin: Ref, dropdownRef: Ref, - popDirection: Ref, 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 index 52a00bde66..df31fca66e 100644 --- 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
  • {slots.noResultItem ? slots.noResultItem() : emptyText.value}
  • ; } diff --git a/packages/devui-vue/package.json b/packages/devui-vue/package.json index 020273c475..b012f367c0 100644 --- 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": [