From 202bd439b921c5cf361dfe62edd2622e9cfddad2 Mon Sep 17 00:00:00 2001 From: Kagol Date: Fri, 18 Mar 2022 14:59:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(fullscreen):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=96=87=E4=BB=B6=E7=9A=84=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/devui/fullscreen/index.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/devui-vue/devui/fullscreen/index.ts b/packages/devui-vue/devui/fullscreen/index.ts index f231d15afc..7c2e07a529 100644 --- a/packages/devui-vue/devui/fullscreen/index.ts +++ b/packages/devui-vue/devui/fullscreen/index.ts @@ -1,9 +1,7 @@ import type { App } from 'vue'; import Fullscreen from './src/fullscreen'; -Fullscreen.install = function(app: App): void { - app.component(Fullscreen.name, Fullscreen); -}; +export * from './src/fullscreen-types'; export { Fullscreen }; @@ -12,6 +10,6 @@ export default { category: '通用', status: '100%', install(app: App): void { - app.use(Fullscreen as any); + app.component(Fullscreen.name, Fullscreen); } }; From b18f73ac8f19f16e2a9f6f590e7a7db652ceba83 Mon Sep 17 00:00:00 2001 From: Kagol Date: Fri, 18 Mar 2022 15:05:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor(icon):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=96=87=E4=BB=B6=E7=9A=84=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/devui/icon/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/devui-vue/devui/icon/index.ts b/packages/devui-vue/devui/icon/index.ts index f2c5b6ca49..afd010133f 100644 --- a/packages/devui-vue/devui/icon/index.ts +++ b/packages/devui-vue/devui/icon/index.ts @@ -1,6 +1,8 @@ import type { App } from 'vue'; import Icon from './src/icon'; +export * from './src/icon-types'; + export { Icon }; export default { From 6b6b797fd7e79b5c6132568088e4887888682d6f Mon Sep 17 00:00:00 2001 From: Kagol Date: Fri, 18 Mar 2022 16:16:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor(overlay):=20=E4=BC=98=E5=8C=96Over?= =?UTF-8?q?lay=E7=BB=84=E4=BB=B6=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui/overlay/__tests__/overlay.spec.ts | 111 ++++++++++-------- packages/devui-vue/devui/overlay/index.ts | 4 +- .../src/{overlay.scss => base-overlay.scss} | 23 ---- .../{common-overlay.tsx => base-overlay.tsx} | 2 +- .../src/fixed-overlay/fixed-overlay-types.ts | 44 +++++++ .../src/fixed-overlay/fixed-overlay.scss | 22 ++++ .../index.tsx} | 8 +- .../use-fixed-overlay.ts} | 2 +- .../flexible-overlay-types.ts} | 54 ++------- .../flexible-overlay.scss | 2 +- .../index.tsx} | 2 +- .../use-flexible-overlay.ts | 4 +- .../utils.ts} | 0 13 files changed, 151 insertions(+), 127 deletions(-) rename packages/devui-vue/devui/overlay/src/{overlay.scss => base-overlay.scss} (59%) rename packages/devui-vue/devui/overlay/src/{common-overlay.tsx => base-overlay.tsx} (92%) create mode 100644 packages/devui-vue/devui/overlay/src/fixed-overlay/fixed-overlay-types.ts create mode 100644 packages/devui-vue/devui/overlay/src/fixed-overlay/fixed-overlay.scss rename packages/devui-vue/devui/overlay/src/{fixed-overlay.tsx => fixed-overlay/index.tsx} (83%) rename packages/devui-vue/devui/overlay/src/{utils.ts => fixed-overlay/use-fixed-overlay.ts} (96%) rename packages/devui-vue/devui/overlay/src/{overlay-types.ts => flexible-overlay/flexible-overlay-types.ts} (57%) rename packages/devui-vue/devui/overlay/src/{ => flexible-overlay}/flexible-overlay.scss (88%) rename packages/devui-vue/devui/overlay/src/{flexible-overlay.tsx => flexible-overlay/index.tsx} (89%) rename packages/devui-vue/devui/overlay/src/{ => flexible-overlay}/use-flexible-overlay.ts (97%) rename packages/devui-vue/devui/overlay/src/{flexible-utils.ts => flexible-overlay/utils.ts} (100%) diff --git a/packages/devui-vue/devui/overlay/__tests__/overlay.spec.ts b/packages/devui-vue/devui/overlay/__tests__/overlay.spec.ts index 47033be3f9..2b449f504b 100644 --- a/packages/devui-vue/devui/overlay/__tests__/overlay.spec.ts +++ b/packages/devui-vue/devui/overlay/__tests__/overlay.spec.ts @@ -1,8 +1,27 @@ import { mount } from '@vue/test-utils'; +import { ComponentPublicInstance, nextTick, Ref } from 'vue'; import { FixedOverlay } from '../src/fixed-overlay'; -import { nextTick } from 'vue'; import { FlexibleOverlay } from '../src/flexible-overlay'; -import { OriginOrDomRef, Rect, ConnectionPosition } from '../src/overlay-types'; + +interface Rect { + x: number; + y: number; + width?: number; + height?: number; +} + +type HorizontalConnectionPos = 'left' | 'center' | 'right'; +type VerticalConnectionPos = 'top' | 'center' | 'bottom'; + +interface ConnectionPosition { + originX: HorizontalConnectionPos; + originY: VerticalConnectionPos; + overlayX: HorizontalConnectionPos; + overlayY: VerticalConnectionPos; +} + +type OriginOrDomRef = Element | ComponentPublicInstance | Ref | Rect | null; + let overlayContianerElement: HTMLElement; let origin: OriginOrDomRef; @@ -16,30 +35,29 @@ describe('overlay', () => { }); describe('fixed overlay', () => { - - it('should be create', async() => { + it('should be create', async () => { const wrapper = mount(FixedOverlay, { props: { - visible: true - } + visible: true, + }, }); await nextTick(); let bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; expect(bgElement.getAttribute('style')).toBeNull(); - await wrapper.setProps({visible: false}); + await wrapper.setProps({ visible: false }); await nextTick(); bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; expect(bgElement.style.display).toBe('none'); wrapper.unmount(); }); - it('test backgroundClass, backgroundStyle, overlayStyle', async() => { + it('test backgroundClass, backgroundStyle, overlayStyle', async () => { const wrapper = mount(FixedOverlay, { props: { visible: true, backgroundClass: 'bgColor', backgroundStyle: 'width: 100px', - overlayStyle: 'width: 100%' - } + overlayStyle: 'width: 100%', + }, }); await nextTick(); const bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; @@ -48,32 +66,32 @@ describe('overlay', () => { expect((overlayContianerElement.querySelector('.devui-overlay') as HTMLElement).style.width).toBe('100%'); wrapper.unmount(); }); - it('test hasBackdrop', async() => { + it('test hasBackdrop', async () => { const wrapper = mount(FixedOverlay, { props: { visible: true, - hasBackdrop: false - } + hasBackdrop: false, + }, }); await nextTick(); let bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; expect(bgElement.classList).toContain('devui-overlay-background__disabled'); - await wrapper.setProps({hasBackdrop: true}); + await wrapper.setProps({ hasBackdrop: true }); await nextTick(); bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; expect(bgElement.classList).toContain('devui-overlay-background__color'); wrapper.unmount(); }); - it('test emit update:visible and onBackdropClick', async() => { + it('test emit update:visible and onBackdropClick', async () => { const wrapper = mount(FixedOverlay, { props: { - visible: true - } + visible: true, + }, }); await nextTick(); const bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; const fn = jest.fn(); - await wrapper.setProps({onBackdropClick: fn}); + await wrapper.setProps({ onBackdropClick: fn }); bgElement.click(); expect(wrapper.emitted('update:visible').length).toBe(1); expect(fn).toHaveBeenCalled(); @@ -83,21 +101,23 @@ describe('overlay', () => { describe('flexible overlay', () => { beforeEach(() => { - origin = {x:100, y: 100, width: 100, height: 100} as Rect; + origin = { x: 100, y: 100, width: 100, height: 100 } as Rect; // 解决 ResizeObserver is not defined - global.ResizeObserver = window.ResizeObserver || jest.fn().mockImplementation(() => ({ - disconnect: jest.fn(), - observe: jest.fn(), - unobserve: jest.fn(), - })); + global.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); }); - it('should be creat', async() => { + it('should be creat', async () => { const wrapper = mount(FlexibleOverlay, { props: { origin: origin, - visible: true - } + visible: true, + }, }); await nextTick(); let bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; @@ -108,14 +128,14 @@ describe('overlay', () => { expect(bgElement.style.display).toBe('none'); wrapper.unmount(); }); - it('test backgroundClass, backgroundStyle', async() => { + it('test backgroundClass, backgroundStyle', async () => { const wrapper = mount(FlexibleOverlay, { props: { origin: origin, visible: true, backgroundClass: 'bgColor', - backgroundStyle: 'width: 100px' - } + backgroundStyle: 'width: 100px', + }, }); await nextTick(); const bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; @@ -123,45 +143,45 @@ describe('overlay', () => { expect(bgElement.style.width).toBe('100px'); wrapper.unmount(); }); - it('test hasBackdrop', async() => { + it('test hasBackdrop', async () => { const wrapper = mount(FlexibleOverlay, { props: { origin: origin, visible: true, - hasBackdrop: false - } + hasBackdrop: false, + }, }); await nextTick(); let bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; expect(bgElement.classList).toContain('devui-overlay-background__disabled'); - await wrapper.setProps({hasBackdrop: true}); + await wrapper.setProps({ hasBackdrop: true }); await nextTick(); bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; expect(bgElement.classList).toContain('devui-overlay-background__color'); wrapper.unmount(); }); - it('test emit update:visible and onBackdropClick', async() => { + it('test emit update:visible and onBackdropClick', async () => { const wrapper = mount(FlexibleOverlay, { props: { origin: origin, - visible: true - } + visible: true, + }, }); await nextTick(); const bgElement = overlayContianerElement.querySelector('.devui-overlay-background') as HTMLElement; const fn = jest.fn(); - await wrapper.setProps({onBackdropClick: fn}); + await wrapper.setProps({ onBackdropClick: fn }); bgElement.click(); expect(wrapper.emitted('update:visible').length).toBe(1); expect(fn).toHaveBeenCalled(); wrapper.unmount(); }); - it('test position', async() => { + it('test position', async () => { const position = { originX: 'left', originY: 'top', overlayX: 'left', - overlayY: 'top' + overlayY: 'top', } as ConnectionPosition; const wrapper = mount(FlexibleOverlay, { props: { @@ -169,24 +189,24 @@ describe('overlay', () => { visible: true, }, slots: { - default: '
' - } + default: '
', + }, }); - await wrapper.setProps({position: position}); + await wrapper.setProps({ position: position }); await nextTick(); let overlayElement = overlayContianerElement.querySelector('.devui-overlay') as HTMLElement; expect(overlayElement.style.left).toBe('100px'); expect(overlayElement.style.top).toBe('100px'); position.originX = 'center'; position.originY = 'center'; - await wrapper.setProps({position: Object.assign({}, position)}); + await wrapper.setProps({ position: Object.assign({}, position) }); await nextTick(); overlayElement = overlayContianerElement.querySelector('.devui-overlay') as HTMLElement; expect(overlayElement.style.left).toBe('150px'); expect(overlayElement.style.top).toBe('150px'); position.originX = 'right'; position.originY = 'bottom'; - await wrapper.setProps({position: Object.assign({}, position)}); + await wrapper.setProps({ position: Object.assign({}, position) }); await nextTick(); overlayElement = overlayContianerElement.querySelector('.devui-overlay') as HTMLElement; expect(overlayElement.style.left).toBe('200px'); @@ -195,4 +215,3 @@ describe('overlay', () => { }); }); }); - diff --git a/packages/devui-vue/devui/overlay/index.ts b/packages/devui-vue/devui/overlay/index.ts index b18849933c..8790f57ae2 100644 --- a/packages/devui-vue/devui/overlay/index.ts +++ b/packages/devui-vue/devui/overlay/index.ts @@ -2,7 +2,9 @@ import type { App } from 'vue'; import { FixedOverlay } from './src/fixed-overlay'; import { FlexibleOverlay } from './src/flexible-overlay'; import { inBrowser } from '../shared/util/common-var'; -export * from './src/overlay-types'; + +export * from './src/fixed-overlay/fixed-overlay-types'; +export * from './src/flexible-overlay/flexible-overlay-types'; export { FlexibleOverlay, FixedOverlay }; diff --git a/packages/devui-vue/devui/overlay/src/overlay.scss b/packages/devui-vue/devui/overlay/src/base-overlay.scss similarity index 59% rename from packages/devui-vue/devui/overlay/src/overlay.scss rename to packages/devui-vue/devui/overlay/src/base-overlay.scss index d9c754e5c1..8f4959ba71 100644 --- a/packages/devui-vue/devui/overlay/src/overlay.scss +++ b/packages/devui-vue/devui/overlay/src/base-overlay.scss @@ -1,26 +1,3 @@ -.devui-overlay-background { - position: fixed; - top: 0; - left: 0; - height: 100vh; - width: 100vw; - display: flex; - - &__color { - background: rgba(0, 0, 0, 0.4); - } - - .devui-overlay { - position: relative; - z-index: 1000; - pointer-events: auto; - } - - &__disabled { - pointer-events: none; - } -} - .devui-overlay-fade { @mixin d-overlay-fade-animation { animation-name: d-overlay-fade; diff --git a/packages/devui-vue/devui/overlay/src/common-overlay.tsx b/packages/devui-vue/devui/overlay/src/base-overlay.tsx similarity index 92% rename from packages/devui-vue/devui/overlay/src/common-overlay.tsx rename to packages/devui-vue/devui/overlay/src/base-overlay.tsx index 51a9e5dfbc..49696fe576 100644 --- a/packages/devui-vue/devui/overlay/src/common-overlay.tsx +++ b/packages/devui-vue/devui/overlay/src/base-overlay.tsx @@ -1,5 +1,5 @@ import { defineComponent, renderSlot, Teleport, Transition } from 'vue'; -import './overlay.scss'; +import './base-overlay.scss'; export const CommonOverlay = defineComponent({ setup(props, ctx) { diff --git a/packages/devui-vue/devui/overlay/src/fixed-overlay/fixed-overlay-types.ts b/packages/devui-vue/devui/overlay/src/fixed-overlay/fixed-overlay-types.ts new file mode 100644 index 0000000000..d9fca250a1 --- /dev/null +++ b/packages/devui-vue/devui/overlay/src/fixed-overlay/fixed-overlay-types.ts @@ -0,0 +1,44 @@ +import type { ExtractPropTypes, PropType, StyleValue } from 'vue'; + +export const overlayProps = { + visible: { + type: Boolean, + }, + backgroundBlock: { + type: Boolean, + default: false, + }, + backgroundClass: { + type: String, + default: '', + }, + backgroundStyle: { + type: [String, Object] as PropType, + }, + onBackdropClick: { + type: Function, + }, + backdropClose: { + type: Boolean, + default: true, + }, + hasBackdrop: { + type: Boolean, + default: true, + }, +} as const; + +export type OverlayProps = ExtractPropTypes; + +export const fixedOverlayProps = { + ...overlayProps, + overlayStyle: { + type: [String, Object] as PropType, + default: undefined, + }, +}; + +export type FixedOverlayProps = ExtractPropTypes; + +export const overlayEmits = ['update:visible', 'backdropClick'] as ['update:visible', 'backdropClick']; + diff --git a/packages/devui-vue/devui/overlay/src/fixed-overlay/fixed-overlay.scss b/packages/devui-vue/devui/overlay/src/fixed-overlay/fixed-overlay.scss new file mode 100644 index 0000000000..f08cef4f8a --- /dev/null +++ b/packages/devui-vue/devui/overlay/src/fixed-overlay/fixed-overlay.scss @@ -0,0 +1,22 @@ +.devui-overlay-background { + position: fixed; + top: 0; + left: 0; + height: 100vh; + width: 100vw; + display: flex; + + &__color { + background: rgba(0, 0, 0, 0.4); + } + + .devui-overlay { + position: relative; + z-index: 1000; + pointer-events: auto; + } + + &__disabled { + pointer-events: none; + } +} diff --git a/packages/devui-vue/devui/overlay/src/fixed-overlay.tsx b/packages/devui-vue/devui/overlay/src/fixed-overlay/index.tsx similarity index 83% rename from packages/devui-vue/devui/overlay/src/fixed-overlay.tsx rename to packages/devui-vue/devui/overlay/src/fixed-overlay/index.tsx index 0bb70d9b31..c8028925db 100644 --- a/packages/devui-vue/devui/overlay/src/fixed-overlay.tsx +++ b/packages/devui-vue/devui/overlay/src/fixed-overlay/index.tsx @@ -1,8 +1,8 @@ import { defineComponent, renderSlot } from 'vue'; -import { CommonOverlay } from './common-overlay'; -import { fixedOverlayProps, FixedOverlayProps, overlayEmits } from './overlay-types'; -import { useOverlayLogic } from './utils'; -import './overlay.scss'; +import { CommonOverlay } from '../base-overlay'; +import { fixedOverlayProps, FixedOverlayProps, overlayEmits } from './fixed-overlay-types'; +import { useOverlayLogic } from './use-fixed-overlay'; +import './fixed-overlay.scss'; export const FixedOverlay = defineComponent({ name: 'DFixedOverlay', diff --git a/packages/devui-vue/devui/overlay/src/utils.ts b/packages/devui-vue/devui/overlay/src/fixed-overlay/use-fixed-overlay.ts similarity index 96% rename from packages/devui-vue/devui/overlay/src/utils.ts rename to packages/devui-vue/devui/overlay/src/fixed-overlay/use-fixed-overlay.ts index 1b0fec935f..d8512da2d5 100644 --- a/packages/devui-vue/devui/overlay/src/utils.ts +++ b/packages/devui-vue/devui/overlay/src/fixed-overlay/use-fixed-overlay.ts @@ -1,5 +1,5 @@ import { onUnmounted, watch, computed, ComputedRef, onMounted, SetupContext } from 'vue'; -import { overlayEmits, OverlayProps } from './overlay-types'; +import { OverlayProps, overlayEmits } from './fixed-overlay-types'; interface CommonInfo { backgroundClass: ComputedRef; diff --git a/packages/devui-vue/devui/overlay/src/overlay-types.ts b/packages/devui-vue/devui/overlay/src/flexible-overlay/flexible-overlay-types.ts similarity index 57% rename from packages/devui-vue/devui/overlay/src/overlay-types.ts rename to packages/devui-vue/devui/overlay/src/flexible-overlay/flexible-overlay-types.ts index 52365888e3..b5dde82a6e 100644 --- a/packages/devui-vue/devui/overlay/src/overlay-types.ts +++ b/packages/devui-vue/devui/overlay/src/flexible-overlay/flexible-overlay-types.ts @@ -1,44 +1,4 @@ -import type { ExtractPropTypes, PropType, StyleValue, Ref } from 'vue'; - -export const overlayProps = { - visible: { - type: Boolean, - }, - backgroundBlock: { - type: Boolean, - default: false, - }, - backgroundClass: { - type: String, - default: '', - }, - backgroundStyle: { - type: [String, Object] as PropType, - }, - onBackdropClick: { - type: Function, - }, - backdropClose: { - type: Boolean, - default: true, - }, - hasBackdrop: { - type: Boolean, - default: true, - }, -} as const; - -export const overlayEmits = ['update:visible', 'backdropClick'] as ['update:visible', 'backdropClick']; -export type OverlayProps = ExtractPropTypes; - -export const fixedOverlayProps = { - ...overlayProps, - overlayStyle: { - type: [String, Object] as PropType, - default: undefined, - }, -}; -export type FixedOverlayProps = ExtractPropTypes; +import type { ExtractPropTypes, PropType, Ref } from 'vue'; export type Placement = | 'top' @@ -57,6 +17,12 @@ export type Placement = export type Alignment = 'start' | 'end'; export type OffsetOptions = { mainAxis?: number; crossAxis?: number }; +export type Point = { x?: number; y?: number }; + +export type UseOverlayFn = { arrowRef: Ref; overlayRef: Ref }; + +export type EmitEventFn = (event: 'positionChange' | 'update:modelValue', result?: unknown) => void; + export const flexibleOverlayProps = { modelValue: { type: Boolean, @@ -88,10 +54,4 @@ export const flexibleOverlayProps = { }, }; -export type Point = { x?: number; y?: number }; - -export type UseOverlayFn = { arrowRef: Ref; overlayRef: Ref }; - -export type EmitEventFn = (event: 'positionChange' | 'update:modelValue', result?: unknown) => void; - export type FlexibleOverlayProps = ExtractPropTypes; diff --git a/packages/devui-vue/devui/overlay/src/flexible-overlay.scss b/packages/devui-vue/devui/overlay/src/flexible-overlay/flexible-overlay.scss similarity index 88% rename from packages/devui-vue/devui/overlay/src/flexible-overlay.scss rename to packages/devui-vue/devui/overlay/src/flexible-overlay/flexible-overlay.scss index c5965590b8..13e0777a40 100644 --- a/packages/devui-vue/devui/overlay/src/flexible-overlay.scss +++ b/packages/devui-vue/devui/overlay/src/flexible-overlay/flexible-overlay.scss @@ -1,4 +1,4 @@ -@import '../../styles-var/devui-var.scss'; +@import '../../../styles-var/devui-var.scss'; .devui-flexible-overlay { position: fixed; diff --git a/packages/devui-vue/devui/overlay/src/flexible-overlay.tsx b/packages/devui-vue/devui/overlay/src/flexible-overlay/index.tsx similarity index 89% rename from packages/devui-vue/devui/overlay/src/flexible-overlay.tsx rename to packages/devui-vue/devui/overlay/src/flexible-overlay/index.tsx index 6ca3d5ac60..a88b31284c 100644 --- a/packages/devui-vue/devui/overlay/src/flexible-overlay.tsx +++ b/packages/devui-vue/devui/overlay/src/flexible-overlay/index.tsx @@ -1,5 +1,5 @@ import { defineComponent } from 'vue'; -import { flexibleOverlayProps, FlexibleOverlayProps } from './overlay-types'; +import { flexibleOverlayProps, FlexibleOverlayProps } from './flexible-overlay-types'; import { useOverlay } from './use-flexible-overlay'; import './flexible-overlay.scss'; diff --git a/packages/devui-vue/devui/overlay/src/use-flexible-overlay.ts b/packages/devui-vue/devui/overlay/src/flexible-overlay/use-flexible-overlay.ts similarity index 97% rename from packages/devui-vue/devui/overlay/src/use-flexible-overlay.ts rename to packages/devui-vue/devui/overlay/src/flexible-overlay/use-flexible-overlay.ts index c4e8f5c49f..4ebf0a3b9a 100644 --- a/packages/devui-vue/devui/overlay/src/use-flexible-overlay.ts +++ b/packages/devui-vue/devui/overlay/src/flexible-overlay/use-flexible-overlay.ts @@ -1,7 +1,7 @@ import { ref, unref, watch, nextTick, onUnmounted } from 'vue'; -import { FlexibleOverlayProps, Placement, Point, UseOverlayFn, EmitEventFn } from './overlay-types'; import { arrow, autoPlacement, computePosition, offset } from '@floating-ui/dom'; -import { getScrollParent } from './flexible-utils'; +import { FlexibleOverlayProps, Placement, Point, UseOverlayFn, EmitEventFn } from './flexible-overlay-types'; +import { getScrollParent } from './utils'; function adjustArrowPosition(isArrowCenter: boolean, point: Point, placement: Placement, originRect: any): Point { let { x, y } = point; diff --git a/packages/devui-vue/devui/overlay/src/flexible-utils.ts b/packages/devui-vue/devui/overlay/src/flexible-overlay/utils.ts similarity index 100% rename from packages/devui-vue/devui/overlay/src/flexible-utils.ts rename to packages/devui-vue/devui/overlay/src/flexible-overlay/utils.ts