diff --git a/.eslintrc.js b/.eslintrc.js index 2ac382dba..0d7296644 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -184,6 +184,7 @@ module.exports = { }, ignorePatterns: [ 'dist', + 'packages/site/components.ts', 'packages/site/src/router.ts', 'packages/site/src/sideNav.ts', 'packages/site/src/components/global/themeConfig.ts', diff --git a/packages/components/_private/overlay/__tests__/overlay.spec.ts b/packages/components/_private/overlay/__tests__/overlay.spec.ts index e1b1eb8ab..0d91ad5c2 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', ...props }, ...rest, } as MountingOptions) } @@ -26,7 +26,7 @@ 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', visible: true }, slots }) test('visible work', async () => { const onUpdateVisible = vi.fn() @@ -81,7 +81,7 @@ describe('Overlay', () => { test('container work', async () => { const wrapper = OverlayMount({ - props: { container: 'ix-test-container', visible: true }, + props: { container: '.ix-test-container', visible: true }, slots, }) @@ -99,7 +99,7 @@ describe('Overlay', () => { test('zIndex work', async () => { let zIndex = 1001 const wrapper = OverlayMount({ - props: { container: 'ix-test-container', visible: true, zIndex }, + props: { container: '.ix-test-container', visible: true, zIndex }, slots, }) diff --git a/packages/components/config/src/defaultConfig.ts b/packages/components/config/src/defaultConfig.ts index 3bcec037d..c2e97d592 100644 --- a/packages/components/config/src/defaultConfig.ts +++ b/packages/components/config/src/defaultConfig.ts @@ -285,9 +285,6 @@ export const defaultConfig: GlobalConfig = { childrenKey: 'children', getKey: 'key', size: 'md', - extra: { - icon: 'ellipsis', - }, pagination: { position: 'bottomEnd', }, diff --git a/packages/components/config/src/types.ts b/packages/components/config/src/types.ts index 709b7bc3c..03de3a6ee 100644 --- a/packages/components/config/src/types.ts +++ b/packages/components/config/src/types.ts @@ -32,12 +32,18 @@ import type { SelectData } from '@idux/components/select' import type { SpaceSize } from '@idux/components/space' import type { SpinSize, SpinTipAlignType } from '@idux/components/spin' import type { StepperLabelPlacement, StepperSize } from '@idux/components/stepper' -import type { TableColumnAlign, TableColumnSortOrder, TablePaginationPosition, TableSize } from '@idux/components/table' +import type { + TableColumnAlign, + TableColumnSortOrder, + TableEmptyCellOptions, + TablePaginationPosition, + TableSize, +} from '@idux/components/table' import type { TagShape } from '@idux/components/tag' import type { TextareaAutoRows, TextareaResize } from '@idux/components/textarea' import type { TreeNode } from '@idux/components/tree' import type { UploadFilesType, UploadIconType, UploadRequestMethod, UploadRequestOption } from '@idux/components/upload' -import type { VNode } from 'vue' +import type { VNode, VNodeChild } from 'vue' export interface GlobalConfig { common: CommonConfig @@ -478,7 +484,8 @@ export interface TableConfig { rowKey?: string size: TableSize - extra: { icon: string } + emptyCell?: string | ((options: TableEmptyCellOptions) => VNodeChild) + pagination: { position: TablePaginationPosition } & Partial columnBase: TableColumnBaseConfig diff --git a/packages/components/table/__tests__/__snapshots__/table.spec.ts.snap b/packages/components/table/__tests__/__snapshots__/table.spec.ts.snap index 0d646fecb..7c4b4bf3d 100644 --- a/packages/components/table/__tests__/__snapshots__/table.spec.ts.snap +++ b/packages/components/table/__tests__/__snapshots__/table.spec.ts.snap @@ -39,7 +39,7 @@ exports[`Table > basic work > render work 1`] = ` - + expandable