From 5d604f969c173a045b98f8c62b0e612d337cda7a Mon Sep 17 00:00:00 2001 From: danranVm Date: Thu, 12 Jan 2023 16:16:00 +0800 Subject: [PATCH] test(comp:*): resovle overlay warnings and stepper snapshots (#1402) * test(comp:*): resovle overlay warnings and stepper snapshots * style: update with style lint --- packages/cdk/drag-drop/src/composables/useDraggable.ts | 6 +++--- packages/cdk/drag-drop/src/composables/useDroppable.ts | 2 +- packages/cdk/drag-drop/src/composables/withBoundary.ts | 2 +- packages/cdk/drag-drop/src/composables/withDragFree.ts | 2 +- packages/cdk/drag-drop/src/draggable/Draggable.tsx | 2 +- packages/cdk/forms/src/models/formArray.ts | 2 +- packages/cdk/forms/src/models/formControl.ts | 2 +- packages/cdk/forms/src/models/formGroup.ts | 2 +- packages/cdk/scroll/src/strategy/blockScrollStrategy.ts | 2 +- .../cdk/scroll/src/virtual/composables/useScrollState.ts | 2 +- .../_private/date-panel/src/panel-body/PanelBody.tsx | 2 +- .../_private/date-panel/src/panel-body/PanelRow.tsx | 2 +- .../components/_private/overlay/__tests__/overlay.spec.ts | 7 +++++-- .../components/cascader/src/composables/useActiveState.ts | 2 +- .../components/cascader/src/composables/useExpandable.ts | 2 +- .../components/cascader/src/composables/useSearchable.ts | 2 +- .../cascader/src/composables/useSelectedState.ts | 2 +- .../components/cascader/src/contents/OverlayContent.tsx | 2 +- .../cascader/src/contents/OverlayOptionGroup.tsx | 2 +- .../components/date-picker/src/composables/useControl.ts | 2 +- .../date-picker/src/composables/useOverlayState.ts | 2 +- .../date-picker/src/composables/useRangeControl.ts | 2 +- packages/components/form/src/composables/useFormItem.ts | 2 +- packages/components/menu/src/contents/MenuItem.tsx | 2 +- packages/components/menu/src/contents/MenuItemGroup.tsx | 2 +- packages/components/menu/src/contents/Utils.tsx | 2 +- packages/components/menu/src/contents/menu-sub/MenuSub.tsx | 6 +++--- packages/components/select/src/composables/useOptions.ts | 2 +- .../components/select/src/composables/useSelectedState.ts | 2 +- packages/components/select/src/panel/Panel.tsx | 6 +++--- packages/components/stepper/demo/Dot.vue | 2 +- packages/components/stepper/src/StepperItem.tsx | 3 +-- packages/components/table/src/composables/useDataSource.ts | 2 +- packages/components/table/src/composables/useExpandable.ts | 2 +- packages/components/table/src/composables/useFilterable.ts | 2 +- packages/components/table/src/composables/useScroll.ts | 2 +- .../components/table/src/composables/useScrollOnChange.ts | 2 +- packages/components/table/src/composables/useSelectable.ts | 2 +- packages/components/table/src/composables/useSortable.ts | 2 +- .../components/table/src/composables/useTableLayout.ts | 2 +- packages/components/table/src/main/FixedHolder.tsx | 2 +- packages/components/table/src/main/MainTable.tsx | 4 ++-- packages/components/table/src/main/body/Body.tsx | 2 +- packages/components/table/src/main/body/BodyRow.tsx | 2 +- packages/components/table/src/main/body/MeasureRow.tsx | 2 +- packages/components/table/src/main/head/Head.tsx | 2 +- packages/components/table/src/main/head/HeadCell.tsx | 6 +++--- packages/components/table/src/main/head/HeadRow.tsx | 2 +- .../components/textarea/src/composables/useAutoRows.ts | 2 +- .../time-picker/src/composables/useOverlayState.ts | 2 +- .../time-picker/src/composables/useRangeControl.ts | 2 +- .../transfer/src/composables/useTransferBindings.ts | 2 +- .../components/transfer/src/composables/useTransferData.ts | 2 +- .../transfer/src/composables/useTransferOperations.ts | 2 +- .../transfer/src/composables/useTransferSelectState.ts | 2 +- packages/components/transfer/src/content/Content.tsx | 4 ++-- packages/components/transfer/src/list/List.tsx | 2 +- .../tree-select/src/composables/useSelectedState.ts | 2 +- packages/components/tree/src/composables/useCheckable.ts | 2 +- packages/components/tree/src/composables/useDataSource.ts | 2 +- packages/components/tree/src/composables/useDragDrop.ts | 4 ++-- packages/components/tree/src/composables/useEvents.ts | 2 +- packages/components/tree/src/composables/useExpandable.ts | 2 +- packages/components/tree/src/composables/useSearchable.ts | 2 +- packages/components/tree/src/composables/useSelectable.ts | 2 +- packages/components/tree/src/node/TreeNode.tsx | 6 +++--- packages/components/upload/src/component/ImageCardList.tsx | 2 +- packages/pro/form/src/composables/useForm.ts | 2 +- packages/pro/layout/src/contents/Header.tsx | 2 +- packages/pro/layout/src/contents/Sider.tsx | 2 +- packages/pro/search/src/composables/useFocusedState.ts | 2 +- packages/pro/search/src/composables/useSearchItem.ts | 2 +- packages/pro/search/src/searchItem/SearchItem.tsx | 4 ++-- packages/pro/table/src/contents/LayoutToolContent.tsx | 2 +- packages/pro/textarea/src/content/Content.tsx | 2 +- .../pro/transfer/src/composables/useTransferTreeProps.ts | 2 +- .../pro/transfer/src/composables/useTreeDataStrategy.ts | 2 +- packages/pro/transfer/src/content/ProTransferTree.tsx | 2 +- .../site/src/components/layout/footer/LayoutFooter.vue | 2 +- packages/site/src/components/views/home/Home.vue | 2 +- 80 files changed, 98 insertions(+), 96 deletions(-) diff --git a/packages/cdk/drag-drop/src/composables/useDraggable.ts b/packages/cdk/drag-drop/src/composables/useDraggable.ts index 445fc1db9..ad0261465 100644 --- a/packages/cdk/drag-drop/src/composables/useDraggable.ts +++ b/packages/cdk/drag-drop/src/composables/useDraggable.ts @@ -5,18 +5,18 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import type { DnDEventName, DnDEventType, DnDPosition, DraggableOptions } from '../types' import type { DnDContext } from './useDragDropContext' +import type { DnDEventName, DnDEventType, DnDPosition, DraggableOptions } from '../types' import { type ComputedRef, computed, ref, watch } from 'vue' import { type MaybeElementRef, convertElement, tryOnScopeDispose, useEventListener } from '@idux/cdk/utils' -import { DnDState } from '../state' -import { extraMove, initContext, reMoveElement } from '../utils' import { withBoundary } from './withBoundary' import { withDragFree } from './withDragFree' import { withDragHandle } from './withDragHandle' +import { DnDState } from '../state' +import { extraMove, initContext, reMoveElement } from '../utils' /** * make a element draggable diff --git a/packages/cdk/drag-drop/src/composables/useDroppable.ts b/packages/cdk/drag-drop/src/composables/useDroppable.ts index 8e2cfebb6..3a49b9e14 100644 --- a/packages/cdk/drag-drop/src/composables/useDroppable.ts +++ b/packages/cdk/drag-drop/src/composables/useDroppable.ts @@ -11,8 +11,8 @@ import { watch } from 'vue' import { type MaybeElementRef, convertElement, tryOnScopeDispose } from '@idux/cdk/utils' -import { initContext } from '../utils' import { type DnDContext } from './useDragDropContext' +import { initContext } from '../utils' /** * make a element droppable as a container and accept draggable element diff --git a/packages/cdk/drag-drop/src/composables/withBoundary.ts b/packages/cdk/drag-drop/src/composables/withBoundary.ts index 046509800..5f17d3938 100644 --- a/packages/cdk/drag-drop/src/composables/withBoundary.ts +++ b/packages/cdk/drag-drop/src/composables/withBoundary.ts @@ -5,8 +5,8 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import { LockAxisType } from '../types' import { type DnDContext } from './useDragDropContext' +import { LockAxisType } from '../types' export const withBoundary = ( sourceEl: HTMLElement, diff --git a/packages/cdk/drag-drop/src/composables/withDragFree.ts b/packages/cdk/drag-drop/src/composables/withDragFree.ts index bbd805c63..5999f42d1 100644 --- a/packages/cdk/drag-drop/src/composables/withDragFree.ts +++ b/packages/cdk/drag-drop/src/composables/withDragFree.ts @@ -7,8 +7,8 @@ import type { DnDEventType } from '../types' -import { moveElement } from '../utils' import { type DnDContext } from './useDragDropContext' +import { moveElement } from '../utils' export const withDragFree = (sourceEl: HTMLElement, context: DnDContext): void => { const registry = context.registry diff --git a/packages/cdk/drag-drop/src/draggable/Draggable.tsx b/packages/cdk/drag-drop/src/draggable/Draggable.tsx index 69bc3ff11..83006bd4f 100644 --- a/packages/cdk/drag-drop/src/draggable/Draggable.tsx +++ b/packages/cdk/drag-drop/src/draggable/Draggable.tsx @@ -11,8 +11,8 @@ import { computed, defineComponent, normalizeClass, reactive, ref } from 'vue' import { callEmit } from '@idux/cdk/utils' -import { useDraggable } from '../composables/useDraggable' import { draggableProps } from './types' +import { useDraggable } from '../composables/useDraggable' const style = { width: 'fit-content', diff --git a/packages/cdk/forms/src/models/formArray.ts b/packages/cdk/forms/src/models/formArray.ts index 84a5271a6..eddfb06fe 100644 --- a/packages/cdk/forms/src/models/formArray.ts +++ b/packages/cdk/forms/src/models/formArray.ts @@ -7,8 +7,8 @@ import { type ComputedRef, computed, watch, watchEffect } from 'vue' -import { type AsyncValidatorFn, type ValidateStatus, type ValidatorFn, type ValidatorOptions } from '../types' import { AbstractControl } from './abstractControl' +import { type AsyncValidatorFn, type ValidateStatus, type ValidatorFn, type ValidatorOptions } from '../types' // eslint-disable-next-line @typescript-eslint/no-explicit-any export class FormArray extends AbstractControl { diff --git a/packages/cdk/forms/src/models/formControl.ts b/packages/cdk/forms/src/models/formControl.ts index a7a1e8880..f60601de0 100644 --- a/packages/cdk/forms/src/models/formControl.ts +++ b/packages/cdk/forms/src/models/formControl.ts @@ -7,8 +7,8 @@ import { watch } from 'vue' -import { type AsyncValidatorFn, type ValidatorFn, type ValidatorOptions } from '../types' import { AbstractControl } from './abstractControl' +import { type AsyncValidatorFn, type ValidatorFn, type ValidatorOptions } from '../types' // eslint-disable-next-line @typescript-eslint/no-explicit-any export class FormControl extends AbstractControl { diff --git a/packages/cdk/forms/src/models/formGroup.ts b/packages/cdk/forms/src/models/formGroup.ts index 0db6b2ee1..fec3848b1 100644 --- a/packages/cdk/forms/src/models/formGroup.ts +++ b/packages/cdk/forms/src/models/formGroup.ts @@ -9,8 +9,8 @@ import { watch, watchEffect } from 'vue' import { hasOwnProperty } from '@idux/cdk/utils' -import { type AsyncValidatorFn, type ValidateStatus, type ValidatorFn, type ValidatorOptions } from '../types' import { AbstractControl, type GroupControls, type OptionalKeys } from './abstractControl' +import { type AsyncValidatorFn, type ValidateStatus, type ValidatorFn, type ValidatorOptions } from '../types' export class FormGroup extends AbstractControl { constructor( diff --git a/packages/cdk/scroll/src/strategy/blockScrollStrategy.ts b/packages/cdk/scroll/src/strategy/blockScrollStrategy.ts index d367951d0..d7d4c0768 100644 --- a/packages/cdk/scroll/src/strategy/blockScrollStrategy.ts +++ b/packages/cdk/scroll/src/strategy/blockScrollStrategy.ts @@ -7,8 +7,8 @@ import { addClass, removeClass } from '@idux/cdk/utils' -import { getScrollBarSize } from '../utils' import { ScrollStrategy } from './scrollStrategy' +import { getScrollBarSize } from '../utils' export interface BlockScrollStrategyOptions { target?: HTMLElement diff --git a/packages/cdk/scroll/src/virtual/composables/useScrollState.ts b/packages/cdk/scroll/src/virtual/composables/useScrollState.ts index 167aa2f5c..f5b2d897f 100644 --- a/packages/cdk/scroll/src/virtual/composables/useScrollState.ts +++ b/packages/cdk/scroll/src/virtual/composables/useScrollState.ts @@ -5,8 +5,8 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import type { VirtualScrollProps } from '../types' import type { GetKey } from './useGetKey' +import type { VirtualScrollProps } from '../types' import type { VKey } from '@idux/cdk/utils' import type { ComputedRef, Ref } from 'vue' diff --git a/packages/components/_private/date-panel/src/panel-body/PanelBody.tsx b/packages/components/_private/date-panel/src/panel-body/PanelBody.tsx index da840d65d..e50a25524 100644 --- a/packages/components/_private/date-panel/src/panel-body/PanelBody.tsx +++ b/packages/components/_private/date-panel/src/panel-body/PanelBody.tsx @@ -11,8 +11,8 @@ import type { ComputedRef, VNode } from 'vue' import { computed, defineComponent, inject } from 'vue' -import { datePanelToken } from '../token' import PanelRow from './PanelRow' +import { datePanelToken } from '../token' export default defineComponent({ setup() { diff --git a/packages/components/_private/date-panel/src/panel-body/PanelRow.tsx b/packages/components/_private/date-panel/src/panel-body/PanelRow.tsx index 32f83f4bf..121dd791e 100644 --- a/packages/components/_private/date-panel/src/panel-body/PanelRow.tsx +++ b/packages/components/_private/date-panel/src/panel-body/PanelRow.tsx @@ -7,9 +7,9 @@ import { computed, defineComponent, inject } from 'vue' +import PanelCell from './PanelCell' import { datePanelToken } from '../token' import { panelRowProps } from '../types' -import PanelCell from './PanelCell' interface TbodyCell { key: string diff --git a/packages/components/_private/overlay/__tests__/overlay.spec.ts b/packages/components/_private/overlay/__tests__/overlay.spec.ts index a88e94e8b..b4d7b4429 100644 --- a/packages/components/_private/overlay/__tests__/overlay.spec.ts +++ b/packages/components/_private/overlay/__tests__/overlay.spec.ts @@ -12,7 +12,7 @@ describe('Overlay', () => { const OverlayMount = (options?: MountingOptions>) => { const { props, ...rest } = options || {} return mount(Overlay, { - props: { container: () => '.ix-overlay-container', ...props }, + props: { container: () => '.ix-overlay-container', containerFallback: '.ix-overlay-container', ...props }, ...rest, } as MountingOptions) } @@ -26,7 +26,10 @@ describe('Overlay', () => { document.querySelector('.ix-overlay-container')!.innerHTML = '' }) - renderWork(Overlay, { props: { container: () => '.ix-overlay-container', visible: true }, slots }) + renderWork(Overlay, { + props: { container: () => '.ix-overlay-container', containerFallback: '.ix-overlay-container', visible: true }, + slots, + }) test('visible work', async () => { const onUpdateVisible = vi.fn() diff --git a/packages/components/cascader/src/composables/useActiveState.ts b/packages/components/cascader/src/composables/useActiveState.ts index 4c3cdfe55..f0fc6048d 100644 --- a/packages/components/cascader/src/composables/useActiveState.ts +++ b/packages/components/cascader/src/composables/useActiveState.ts @@ -9,8 +9,8 @@ import { type ComputedRef, type Ref, computed } from 'vue' import { type VKey, useState } from '@idux/cdk/utils' -import { type CascaderProps } from '../types' import { type MergedData } from './useDataSource' +import { type CascaderProps } from '../types' export interface ActiveStateContext { activeKey: Ref diff --git a/packages/components/cascader/src/composables/useExpandable.ts b/packages/components/cascader/src/composables/useExpandable.ts index ae9753e24..6f7a562f1 100644 --- a/packages/components/cascader/src/composables/useExpandable.ts +++ b/packages/components/cascader/src/composables/useExpandable.ts @@ -12,9 +12,9 @@ import { isNil } from 'lodash-es' import { type VKey, callEmit, useControlledProp } from '@idux/cdk/utils' import { type GetKeyFn } from '@idux/components/utils' +import { type MergedData, convertMergedData, convertMergedDataMap } from './useDataSource' import { type CascaderData, type CascaderProps } from '../types' import { callChange, getParentKeys } from '../utils' -import { type MergedData, convertMergedData, convertMergedDataMap } from './useDataSource' export interface ExpandableContext { expandedKeys: ComputedRef diff --git a/packages/components/cascader/src/composables/useSearchable.ts b/packages/components/cascader/src/composables/useSearchable.ts index 9799e8f29..bf5bd6af7 100644 --- a/packages/components/cascader/src/composables/useSearchable.ts +++ b/packages/components/cascader/src/composables/useSearchable.ts @@ -11,8 +11,8 @@ import { isFunction } from 'lodash-es' import { NoopArray, type VKey } from '@idux/cdk/utils' -import { type CascaderData, type CascaderProps, type CascaderSearchFn } from '../types' import { type MergedData } from './useDataSource' +import { type CascaderData, type CascaderProps, type CascaderSearchFn } from '../types' export interface SearchableContext { searchedData: ComputedRef diff --git a/packages/components/cascader/src/composables/useSelectedState.ts b/packages/components/cascader/src/composables/useSelectedState.ts index 13670ca20..e17a4aec4 100644 --- a/packages/components/cascader/src/composables/useSelectedState.ts +++ b/packages/components/cascader/src/composables/useSelectedState.ts @@ -13,9 +13,9 @@ import { type FormAccessor } from '@idux/cdk/forms' import { NoopArray, type VKey, callEmit, convertArray } from '@idux/cdk/utils' import { useGlobalConfig } from '@idux/components/config' +import { type MergedData } from './useDataSource' import { type CascaderProps, type CascaderStrategy } from '../types' import { getChildrenKeys, getParentKeys } from '../utils' -import { type MergedData } from './useDataSource' export interface SelectedStateContext { selectedKeys: ComputedRef diff --git a/packages/components/cascader/src/contents/OverlayContent.tsx b/packages/components/cascader/src/contents/OverlayContent.tsx index a40e55a0a..2884a0d89 100644 --- a/packages/components/cascader/src/contents/OverlayContent.tsx +++ b/packages/components/cascader/src/contents/OverlayContent.tsx @@ -12,8 +12,8 @@ import { type VNode, computed, defineComponent, inject, watch } from 'vue' import { type VKey, callEmit } from '@idux/cdk/utils' import { ɵInput } from '@idux/components/_private/input' -import { cascaderToken } from '../token' import OverlayOptionGroup from './OverlayOptionGroup' +import { cascaderToken } from '../token' export default defineComponent({ setup() { diff --git a/packages/components/cascader/src/contents/OverlayOptionGroup.tsx b/packages/components/cascader/src/contents/OverlayOptionGroup.tsx index 29eda0461..0fa7d8e5c 100644 --- a/packages/components/cascader/src/contents/OverlayOptionGroup.tsx +++ b/packages/components/cascader/src/contents/OverlayOptionGroup.tsx @@ -10,9 +10,9 @@ import { type PropType, type VNode, computed, defineComponent, inject, normalize import { CdkVirtualScroll, type VirtualItemRenderFn } from '@idux/cdk/scroll' import { ɵEmpty } from '@idux/components/_private/empty' +import OverlayOption from './OverlayOption' import { type MergedData } from '../composables/useDataSource' import { cascaderToken } from '../token' -import OverlayOption from './OverlayOption' export default defineComponent({ props: { diff --git a/packages/components/date-picker/src/composables/useControl.ts b/packages/components/date-picker/src/composables/useControl.ts index d6233915b..b37ad07a0 100644 --- a/packages/components/date-picker/src/composables/useControl.ts +++ b/packages/components/date-picker/src/composables/useControl.ts @@ -10,9 +10,9 @@ import { type ComputedRef, type Ref, watch } from 'vue' import { useState } from '@idux/cdk/utils' import { type DateConfig } from '@idux/components/config' -import { applyDateTime, convertToDate, isSameDateTime } from '../utils' import { type FormatContext } from './useFormat' import { type InputEnableStatus } from './useInputEnableStatus' +import { applyDateTime, convertToDate, isSameDateTime } from '../utils' export interface PickerControlContext { inputValue: ComputedRef diff --git a/packages/components/date-picker/src/composables/useOverlayState.ts b/packages/components/date-picker/src/composables/useOverlayState.ts index 5af8abcfb..ce138e4d1 100644 --- a/packages/components/date-picker/src/composables/useOverlayState.ts +++ b/packages/components/date-picker/src/composables/useOverlayState.ts @@ -5,9 +5,9 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import type { DatePickerProps, DateRangePickerProps } from '../types' import type { PickerControlContext } from './useControl' import type { PickerRangeControlContext } from './useRangeControl' +import type { DatePickerProps, DateRangePickerProps } from '../types' import type { ComputedRef } from 'vue' import { onMounted, watch } from 'vue' diff --git a/packages/components/date-picker/src/composables/useRangeControl.ts b/packages/components/date-picker/src/composables/useRangeControl.ts index fe5485caf..0150549d6 100644 --- a/packages/components/date-picker/src/composables/useRangeControl.ts +++ b/packages/components/date-picker/src/composables/useRangeControl.ts @@ -10,10 +10,10 @@ import { type ComputedRef, type Ref, computed, watch } from 'vue' import { convertArray, useState } from '@idux/cdk/utils' import { type DateConfig } from '@idux/components/config' -import { compareDateTime, convertToDate, sortRangeValue } from '../utils' import { type PickerControlContext, useControl } from './useControl' import { type FormatContext } from './useFormat' import { type InputEnableStatus } from './useInputEnableStatus' +import { compareDateTime, convertToDate, sortRangeValue } from '../utils' export interface PickerRangeControlContext { buffer: ComputedRef<(Date | undefined)[] | undefined> diff --git a/packages/components/form/src/composables/useFormItem.ts b/packages/components/form/src/composables/useFormItem.ts index 5ce88a7b3..2235aea6b 100644 --- a/packages/components/form/src/composables/useFormItem.ts +++ b/packages/components/form/src/composables/useFormItem.ts @@ -23,9 +23,9 @@ import { type VKey, hasOwnProperty } from '@idux/cdk/utils' import { useGlobalConfig } from '@idux/components/config' import { type Locale } from '@idux/components/locales' +import { useFormStatus } from './public' import { FORM_ITEM_TOKEN } from '../token' import { type FormItemProps } from '../types' -import { useFormStatus } from './public' export function useFormItem(props: FormItemProps): { status: ComputedRef diff --git a/packages/components/menu/src/contents/MenuItem.tsx b/packages/components/menu/src/contents/MenuItem.tsx index 79ec4e069..812b1f7b1 100644 --- a/packages/components/menu/src/contents/MenuItem.tsx +++ b/packages/components/menu/src/contents/MenuItem.tsx @@ -11,10 +11,10 @@ import { isString } from 'lodash-es' import { useKey } from '@idux/components/utils' +import { coverIcon } from './Utils' import { usePaddingLeft } from '../composables/usePaddingLeft' import { menuItemGroupToken, menuSubToken, menuToken } from '../token' import { menuItemProps } from '../types' -import { coverIcon } from './Utils' export default defineComponent({ name: 'MenuItem', diff --git a/packages/components/menu/src/contents/MenuItemGroup.tsx b/packages/components/menu/src/contents/MenuItemGroup.tsx index a34570ce3..19aa540d5 100644 --- a/packages/components/menu/src/contents/MenuItemGroup.tsx +++ b/packages/components/menu/src/contents/MenuItemGroup.tsx @@ -11,10 +11,10 @@ import { isString } from 'lodash-es' import { useKey } from '@idux/components/utils' +import { coverChildren, coverIcon } from './Utils' import { usePaddingLeft } from '../composables/usePaddingLeft' import { menuItemGroupToken, menuSubToken, menuToken } from '../token' import { menuItemGroupProps } from '../types' -import { coverChildren, coverIcon } from './Utils' export default defineComponent({ name: 'MenuItemGroup', diff --git a/packages/components/menu/src/contents/Utils.tsx b/packages/components/menu/src/contents/Utils.tsx index cf8ba8086..6661a2391 100644 --- a/packages/components/menu/src/contents/Utils.tsx +++ b/packages/components/menu/src/contents/Utils.tsx @@ -13,11 +13,11 @@ import { Logger } from '@idux/cdk/utils' import { IxIcon } from '@idux/components/icon' import { type GetKeyFn } from '@idux/components/utils' -import { type MenuData } from '../types' import MenuDivider from './MenuDivider' import MenuItem from './MenuItem' import MenuItemGroup from './MenuItemGroup' import MenuSub from './menu-sub/MenuSub' +import { type MenuData } from '../types' export function coverChildren(data: MenuData[] | undefined, getKetFn: GetKeyFn): VNode[] { if (!data || data.length === 0) { diff --git a/packages/components/menu/src/contents/menu-sub/MenuSub.tsx b/packages/components/menu/src/contents/menu-sub/MenuSub.tsx index 2d16e787a..7e9ded1fc 100644 --- a/packages/components/menu/src/contents/menu-sub/MenuSub.tsx +++ b/packages/components/menu/src/contents/menu-sub/MenuSub.tsx @@ -25,12 +25,12 @@ import { ɵOverlay } from '@idux/components/_private/overlay' import { useGlobalConfig } from '@idux/components/config' import { useKey } from '@idux/components/utils' -import { usePaddingLeft } from '../../composables/usePaddingLeft' -import { type MenuSubContext, menuItemGroupToken, menuSubToken, menuToken } from '../../token' -import { type MenuData, type MenuProps, type MenuSubProps, menuSubProps } from '../../types' import InlineContent from './InlineContent' import Label from './Label' import OverlayContent from './OverlayContent' +import { usePaddingLeft } from '../../composables/usePaddingLeft' +import { type MenuSubContext, menuItemGroupToken, menuSubToken, menuToken } from '../../token' +import { type MenuData, type MenuProps, type MenuSubProps, menuSubProps } from '../../types' export default defineComponent({ name: 'MenuSub', diff --git a/packages/components/select/src/composables/useOptions.ts b/packages/components/select/src/composables/useOptions.ts index 50b707acc..ad8225843 100644 --- a/packages/components/select/src/composables/useOptions.ts +++ b/packages/components/select/src/composables/useOptions.ts @@ -16,9 +16,9 @@ import { isFunction, isNil } from 'lodash-es' import { type VKey, flattenNode } from '@idux/cdk/utils' +import { GetKeyFn } from './useGetOptionKey' import { optionGroupKey, optionKey } from '../option' import { generateOption } from '../utils/generateOption' -import { GetKeyFn } from './useGetOptionKey' export interface FlattenedOption { key: VKey diff --git a/packages/components/select/src/composables/useSelectedState.ts b/packages/components/select/src/composables/useSelectedState.ts index d35c941df..2c457d2fc 100644 --- a/packages/components/select/src/composables/useSelectedState.ts +++ b/packages/components/select/src/composables/useSelectedState.ts @@ -12,9 +12,9 @@ import { type ComputedRef, computed, toRaw } from 'vue' import { type FormAccessor } from '@idux/cdk/forms' import { type VKey, callEmit, convertArray } from '@idux/cdk/utils' +import { type FlattenedOption } from './useOptions' import { type SelectProps } from '../types' import { generateOption } from '../utils/generateOption' -import { type FlattenedOption } from './useOptions' export interface SelectedStateContext { selectedValue: ComputedRef diff --git a/packages/components/select/src/panel/Panel.tsx b/packages/components/select/src/panel/Panel.tsx index 2dceccc9d..c8028cdea 100644 --- a/packages/components/select/src/panel/Panel.tsx +++ b/packages/components/select/src/panel/Panel.tsx @@ -19,15 +19,15 @@ import { callEmit } from '@idux/cdk/utils' import { ɵEmpty } from '@idux/components/_private/empty' import { type SelectConfig, useGlobalConfig } from '@idux/components/config' +import ListBox from './ListBox' +import Option from './Option' +import OptionGroup from './OptionGroup' import { usePanelGetOptionKey } from '../composables/useGetOptionKey' import { useFlattenedOptions } from '../composables/useOptions' import { usePanelActiveState } from '../composables/usePanelActiveState' import { useSelectedState } from '../composables/usePanelSelectedState' import { SELECT_PANEL_DATA_TOKEN, selectPanelContext } from '../token' import { type SelectPanelProps, selectPanelProps } from '../types' -import ListBox from './ListBox' -import Option from './Option' -import OptionGroup from './OptionGroup' export default defineComponent({ name: 'IxSelectPanel', diff --git a/packages/components/stepper/demo/Dot.vue b/packages/components/stepper/demo/Dot.vue index 4fb5432e8..1072e5dad 100644 --- a/packages/components/stepper/demo/Dot.vue +++ b/packages/components/stepper/demo/Dot.vue @@ -1,5 +1,5 @@