From 32e48d833f6a19e22ad5bd2f55273dda325ee6d6 Mon Sep 17 00:00:00 2001 From: danranVm Date: Tue, 26 Jul 2022 20:45:50 +0800 Subject: [PATCH] refactor(comp:*): update motion mixin (#1040) * refactor(comp:*): update motion mixin * test(comp:drawer): fix test --- .eslintrc.js | 7 +- .gitignore | 2 + .prettierignore | 1 + .../components/_private/mask/src/Mask.tsx | 3 +- .../components/_private/mask/src/types.ts | 15 +-- .../components/date-picker/src/DatePicker.tsx | 1 + .../date-picker/src/DateRangePicker.tsx | 1 + .../src/composables/useOverlayProps.ts | 4 +- packages/components/date-picker/src/token.ts | 4 +- .../drawer/__tests__/drawer.spec.ts | 16 ++-- .../components/drawer/src/DrawerWrapper.tsx | 91 ++++++++++--------- packages/components/drawer/src/types.ts | 4 + packages/components/form/style/status.less | 9 +- .../__tests__/useLoadingBar.spec.ts | 41 --------- packages/components/menu/style/menu.less | 1 - packages/components/popover/src/Popover.tsx | 7 +- .../stepper/style/labelPlacement.less | 4 +- packages/components/style/motion/fade.less | 8 +- packages/components/style/motion/move.less | 12 +-- packages/components/style/motion/slide.less | 12 +-- packages/components/style/motion/zoom.less | 12 +-- .../components/time-picker/src/TimePicker.tsx | 1 + .../time-picker/src/TimeRangePicker.tsx | 1 + .../src/composables/useOverlayProps.ts | 4 +- packages/components/time-picker/src/tokens.ts | 3 +- .../site/src/components/global/themeConfig.ts | 5 +- 26 files changed, 118 insertions(+), 151 deletions(-) delete mode 100644 packages/components/loading-bar/__tests__/useLoadingBar.spec.ts diff --git a/.eslintrc.js b/.eslintrc.js index b5e4a6739..2ac382dba 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -182,5 +182,10 @@ module.exports = { }, ], }, - ignorePatterns: ['dist', 'packages/site/src/router.ts', 'packages/site/src/sideNav.ts'], + ignorePatterns: [ + 'dist', + 'packages/site/src/router.ts', + 'packages/site/src/sideNav.ts', + 'packages/site/src/components/global/themeConfig.ts', + ], } diff --git a/.gitignore b/.gitignore index 2fdfd4f2f..fb18d56f8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ pnpm-lock.yaml /packages/site/public/icon-svg /packages/site/src/router.ts /packages/site/src/sideNav.ts +/packages/site/src/styles/themes/index.less /packages/site/components.d.ts # old site files @@ -24,6 +25,7 @@ pnpm-lock.yaml /site/docs/router.ts /site/docs/sideNav.ts + /site/docs/public /site/docs/src /site/docs/index.html diff --git a/.prettierignore b/.prettierignore index 5ab0c5e32..afeb7c626 100644 --- a/.prettierignore +++ b/.prettierignore @@ -16,3 +16,4 @@ packages/components/icon/src/definitions.ts packages/site/components.d.ts packages/site/src/router.ts packages/site/src/sideNav.ts +packages/site/src/components/global/themeConfig.ts \ No newline at end of file diff --git a/packages/components/_private/mask/src/Mask.tsx b/packages/components/_private/mask/src/Mask.tsx index c05bcf6b4..21e78c2b4 100644 --- a/packages/components/_private/mask/src/Mask.tsx +++ b/packages/components/_private/mask/src/Mask.tsx @@ -23,9 +23,8 @@ export default defineComponent({ if (!mask) { return null } - return ( - +
) diff --git a/packages/components/_private/mask/src/types.ts b/packages/components/_private/mask/src/types.ts index cd0849ca5..63f7f9756 100644 --- a/packages/components/_private/mask/src/types.ts +++ b/packages/components/_private/mask/src/types.ts @@ -9,18 +9,9 @@ import type { ExtractInnerPropTypes, ExtractPublicPropTypes } from '@idux/cdk/ut import type { DefineComponent, HTMLAttributes } from 'vue' export const maskProps = { - mask: { - type: Boolean, - default: true, - }, - transitionName: { - type: String, - default: 'ix-fade', - }, - visible: { - type: Boolean, - default: true, - }, + mask: { type: Boolean, default: true }, + transitionName: String, + visible: { type: Boolean, default: true }, zIndex: Number, } as const diff --git a/packages/components/date-picker/src/DatePicker.tsx b/packages/components/date-picker/src/DatePicker.tsx index 7bf343a86..5842c8a30 100644 --- a/packages/components/date-picker/src/DatePicker.tsx +++ b/packages/components/date-picker/src/DatePicker.tsx @@ -57,6 +57,7 @@ export default defineComponent({ const context = { props, slots, + common, locale, config, mergedPrefixCls, diff --git a/packages/components/date-picker/src/DateRangePicker.tsx b/packages/components/date-picker/src/DateRangePicker.tsx index 3c3b47a95..12c1465d8 100644 --- a/packages/components/date-picker/src/DateRangePicker.tsx +++ b/packages/components/date-picker/src/DateRangePicker.tsx @@ -56,6 +56,7 @@ export default defineComponent({ const context = { props, slots, + common, locale, config, mergedPrefixCls, diff --git a/packages/components/date-picker/src/composables/useOverlayProps.ts b/packages/components/date-picker/src/composables/useOverlayProps.ts index 8b7a7d849..513706dc8 100644 --- a/packages/components/date-picker/src/composables/useOverlayProps.ts +++ b/packages/components/date-picker/src/composables/useOverlayProps.ts @@ -13,13 +13,13 @@ import { type ComputedRef, computed } from 'vue' const defaultOffset: [number, number] = [0, 8] export function useOverlayProps(context: DatePickerContext | DateRangePickerContext): ComputedRef<ɵOverlayProps> { return computed(() => { - const { props, config, accessor, mergedPrefixCls, overlayOpened, setOverlayOpened, onAfterLeave } = context + const { props, common, config, accessor, mergedPrefixCls, overlayOpened, setOverlayOpened, onAfterLeave } = context return { clickOutside: true, disabled: accessor.disabled || props.readonly, offset: defaultOffset, placement: 'bottomStart', - transitionName: 'ix-fade', + transitionName: `${common.prefixCls}-fade`, target: props.overlayContainer ?? config.overlayContainer ?? `${mergedPrefixCls.value}-overlay-container`, trigger: 'manual', visible: overlayOpened.value, diff --git a/packages/components/date-picker/src/token.ts b/packages/components/date-picker/src/token.ts index 79df89eb2..440555712 100644 --- a/packages/components/date-picker/src/token.ts +++ b/packages/components/date-picker/src/token.ts @@ -16,13 +16,14 @@ import type { OverlayStateContext } from './composables/useOverlayState' import type { PickerStateContext } from './composables/usePickerState' import type { PickerRangeControlContext } from './composables/useRangeControl' import type { DatePickerProps, DateRangePickerProps } from './types' -import type { DateConfig, DatePickerConfig } from '@idux/components/config' +import type { CommonConfig, DateConfig, DatePickerConfig } from '@idux/components/config' import type { Locale } from '@idux/components/locales' import type { ComputedRef, InjectionKey, Ref, Slots, VNodeTypes } from 'vue' export interface DatePickerContext extends OverlayStateContext, FormatContext, PickerStateContext { props: DatePickerProps slots: Slots + common: CommonConfig locale: Locale config: DatePickerConfig mergedPrefixCls: ComputedRef @@ -39,6 +40,7 @@ export interface DateRangePickerContext PickerStateContext { props: DateRangePickerProps slots: Slots + common: CommonConfig locale: Locale config: DatePickerConfig mergedPrefixCls: ComputedRef diff --git a/packages/components/drawer/__tests__/drawer.spec.ts b/packages/components/drawer/__tests__/drawer.spec.ts index eadd3a04a..733d94bd0 100644 --- a/packages/components/drawer/__tests__/drawer.spec.ts +++ b/packages/components/drawer/__tests__/drawer.spec.ts @@ -102,13 +102,13 @@ describe('Drawer', () => { const wrapper = DrawerMount({ props: { closeOnEsc: false, 'onUpdate:visible': onUpdateVisible } }) const drawerWrapper = wrapper.getComponent(DrawerWrapper) - await drawerWrapper.find('.ix-drawer-wrapper').trigger('keydown', { code: 'Escape' }) + await drawerWrapper.trigger('keydown', { code: 'Escape' }) expect(drawerWrapper.find('.ix-drawer').isVisible()).toBe(true) await wrapper.setProps({ closeOnEsc: true }) - await drawerWrapper.find('.ix-drawer-wrapper').trigger('keydown', { code: 'Escape' }) + await drawerWrapper.trigger('keydown', { code: 'Escape' }) expect(onUpdateVisible).toBeCalledWith(false) }) @@ -223,12 +223,12 @@ describe('Drawer', () => { const wrapper = DrawerMount({ props: { maskClosable: false, 'onUpdate:visible': onUpdateVisible } }) const drawerWrapper = wrapper.getComponent(DrawerWrapper) - await drawerWrapper.find('.ix-drawer-wrapper').trigger('click') + await drawerWrapper.trigger('click') expect(drawerWrapper.find('.ix-drawer').isVisible()).toBe(true) await wrapper.setProps({ maskClosable: true }) - await drawerWrapper.find('.ix-drawer-wrapper').trigger('click') + await drawerWrapper.trigger('click') expect(onUpdateVisible).toBeCalledWith(false) }) @@ -250,11 +250,11 @@ describe('Drawer', () => { const wrapper = DrawerMount({ props: { placement: 'start' } }) const drawerWrapper = wrapper.getComponent(DrawerWrapper) - expect(drawerWrapper.find('.ix-drawer-wrapper').classes()).toContain('ix-drawer-start') + expect(drawerWrapper.classes()).toContain('ix-drawer-start') await wrapper.setProps({ placement: 'top' }) - expect(drawerWrapper.find('.ix-drawer-wrapper').classes()).toContain('ix-drawer-top') + expect(drawerWrapper.classes()).toContain('ix-drawer-top') }) test('target work', async () => { @@ -292,13 +292,13 @@ describe('Drawer', () => { const wrapper = DrawerMount({ props: { wrapperClassName } }) const drawerWrapper = wrapper.getComponent(DrawerWrapper) - expect(drawerWrapper.find('.ix-drawer-wrapper').classes()).toContain(wrapperClassName) + expect(drawerWrapper.classes()).toContain(wrapperClassName) wrapperClassName = 'test-container2' await wrapper.setProps({ wrapperClassName }) - expect(drawerWrapper.find('.ix-drawer-wrapper').classes()).toContain(wrapperClassName) + expect(drawerWrapper.classes()).toContain(wrapperClassName) }) test('zIndex work', async () => { diff --git a/packages/components/drawer/src/DrawerWrapper.tsx b/packages/components/drawer/src/DrawerWrapper.tsx index 4942a2afd..e272170a7 100644 --- a/packages/components/drawer/src/DrawerWrapper.tsx +++ b/packages/components/drawer/src/DrawerWrapper.tsx @@ -41,8 +41,18 @@ const defaultDistance = 160 export default defineComponent({ inheritAttrs: false, setup(_, { attrs }) { - const { props, slots, common, config, mergedPrefixCls, visible, animatedVisible, level, levelAction } = - inject(drawerToken)! + const { + props, + slots, + common, + config, + mergedPrefixCls, + visible, + animatedVisible, + mergedVisible, + level, + levelAction, + } = inject(drawerToken)! const { close } = inject(DRAWER_TOKEN)! const { closable, closeIcon, closeOnEsc, mask, maskClosable, zIndex } = useConfig(props, config) @@ -125,48 +135,47 @@ export default defineComponent({ const prefixCls = mergedPrefixCls.value return ( - -
- -
-
-
- <ɵHeader - v-slots={slots} - closable={closable.value} - closeIcon={closeIcon.value} - header={props.header} - onClose={close} - /> -
{slots.default?.()}
- <ɵFooter v-slots={slots} class={`${prefixCls}-footer`} footer={props.footer}> -
-
+
+
+
+ <ɵHeader + v-slots={slots} + closable={closable.value} + closeIcon={closeIcon.value} + header={props.header} + onClose={close} + /> +
{slots.default?.()}
+ <ɵFooter v-slots={slots} class={`${prefixCls}-footer`} footer={props.footer}>
- -
- +
+
+ +
) } }, diff --git a/packages/components/drawer/src/types.ts b/packages/components/drawer/src/types.ts index 4f0b08e2f..926058566 100644 --- a/packages/components/drawer/src/types.ts +++ b/packages/components/drawer/src/types.ts @@ -33,6 +33,10 @@ export const drawerProps = { type: Boolean, default: undefined, }, + animatable: { + type: Boolean, + default: true, + }, closable: { type: Boolean, default: undefined, diff --git a/packages/components/form/style/status.less b/packages/components/form/style/status.less index 9cc7def65..36e0946f2 100644 --- a/packages/components/form/style/status.less +++ b/packages/components/form/style/status.less @@ -134,21 +134,20 @@ } // time/date-picker - .@{idux-prefix}-time-picker, + .@{idux-prefix}-time-picker, .@{idux-prefix}-time-range-picker, - .@{idux-prefix}-date-picker, + .@{idux-prefix}-date-picker, .@{idux-prefix}-date-range-picker { &.@{idux-prefix}-trigger:not(.@{idux-prefix}-trigger-disabled), - &.@{idux-prefix}-trigger:hover:not(.@{idux-prefix}-trigger-disabled):not(.@{idux-prefix}-trigger-borderless){ + &.@{idux-prefix}-trigger:hover:not(.@{idux-prefix}-trigger-disabled):not(.@{idux-prefix}-trigger-borderless) { border-color: @form-item-invalid-color; } - &.@{idux-prefix}-trigger-focused{ + &.@{idux-prefix}-trigger-focused { border-color: @form-item-invalid-color; box-shadow: @form-item-invalid-box-shadow; } } - } // === Validating === diff --git a/packages/components/loading-bar/__tests__/useLoadingBar.spec.ts b/packages/components/loading-bar/__tests__/useLoadingBar.spec.ts deleted file mode 100644 index 458524e51..000000000 --- a/packages/components/loading-bar/__tests__/useLoadingBar.spec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* eslint-disable vue/one-component-per-file */ - -import { mount } from '@vue/test-utils' -import { defineComponent } from 'vue' - -import IxLoadingBarProvider from '../src/LoadingBarProvider' -import { LoadingBarProviderInstance } from '../src/types' -import { useLoadingBar } from '../src/useLoadingBar' - -describe('LoadingBarProvider', () => { - test('no provider', async () => { - const Test = defineComponent({ - setup() { - useLoadingBar() - }, - }) - expect(() => mount(Test)).toThrowError(/IxLoadingBarProvider/) - }) - - test('provider', async () => { - const Test = defineComponent({ - setup(props, { expose }) { - expose(useLoadingBar()) - }, - render() { - return null - }, - }) - const wrapper = mount({ - template: '', - components: { - IxLoadingBarProvider, - Test, - }, - }) - const instance = wrapper.vm.$refs['test'] as LoadingBarProviderInstance - expect(instance.start).not.toBeNull() - expect(instance.finish).not.toBeNull() - expect(instance.error).not.toBeNull() - }) -}) diff --git a/packages/components/menu/style/menu.less b/packages/components/menu/style/menu.less index 7ff1582bc..1fac4c4c6 100644 --- a/packages/components/menu/style/menu.less +++ b/packages/components/menu/style/menu.less @@ -111,7 +111,6 @@ background-color: @menu-background-color; border-radius: @menu-overlay-border-radius; box-shadow: @menu-overlay-box-shadow; - transition: background-color @transition-duration-slow, width @transition-duration-slow; .@{menu-prefix} .@{menu-prefix}-item::after { border-right: 0; diff --git a/packages/components/popover/src/Popover.tsx b/packages/components/popover/src/Popover.tsx index ecf9615f8..9eb6881a2 100644 --- a/packages/components/popover/src/Popover.tsx +++ b/packages/components/popover/src/Popover.tsx @@ -23,11 +23,7 @@ export default defineComponent({ const common = useGlobalConfig('common') const mergedPrefixCls = computed(() => `${common.prefixCls}-popover`) const config = useGlobalConfig('popover') - const { overlayRef, updatePopper, overlayProps, visible, setVisible } = ɵUseTooltipOverlay( - props, - config, - mergedPrefixCls, - ) + const { overlayRef, updatePopper, overlayProps, setVisible } = ɵUseTooltipOverlay(props, config, mergedPrefixCls) expose({ updatePopper }) @@ -40,7 +36,6 @@ export default defineComponent({ ref={overlayRef} class={prefixCls} {...overlayProps.value} - visible={visible.value} v-slots={{ default: slots.default, content: () => renderContent(props, slots, closeIcon, setVisible, prefixCls), diff --git a/packages/components/stepper/style/labelPlacement.less b/packages/components/stepper/style/labelPlacement.less index 974d1d5af..2bb855667 100644 --- a/packages/components/stepper/style/labelPlacement.less +++ b/packages/components/stepper/style/labelPlacement.less @@ -44,7 +44,7 @@ } &:first-child { - .ix-stepper-item-tail { + .@{stepper-item-prefix}-tail { margin-left: 48px; padding: 16px 20px; } @@ -61,7 +61,7 @@ } &:first-child { - .ix-stepper-item-tail { + .@{stepper-item-prefix}-tail { margin-left: 48px; padding: 12px 20px; } diff --git a/packages/components/style/motion/fade.less b/packages/components/style/motion/fade.less index 368f4ebaa..e6a4d05d7 100644 --- a/packages/components/style/motion/fade.less +++ b/packages/components/style/motion/fade.less @@ -1,15 +1,15 @@ @import '../variable/animation.less'; .fade-motion(@className, @duration: @transition-duration-base) { - .ix-@{className}-enter-active, - .ix-@{className}-leave-active { + .@{idux-prefix}-@{className}-enter-active, + .@{idux-prefix}-@{className}-leave-active { transition-property: opacity; transition-duration: @duration; transition-timing-function: linear; } - .ix-@{className}-enter-from, - .ix-@{className}-leave-to { + .@{idux-prefix}-@{className}-enter-from, + .@{idux-prefix}-@{className}-leave-to { opacity: 0; } } diff --git a/packages/components/style/motion/move.less b/packages/components/style/motion/move.less index 103cf24bb..43f89dc59 100644 --- a/packages/components/style/motion/move.less +++ b/packages/components/style/motion/move.less @@ -1,22 +1,22 @@ @import '../variable/animation.less'; .move-motion(@className, @translate, @duration: @transition-duration-base) { - .ix-@{className}-enter-active, - .ix-@{className}-leave-active { + .@{idux-prefix}-@{className}-enter-active, + .@{idux-prefix}-@{className}-leave-active { transition-property: transform, opacity; transition-duration: @duration; } - .ix-@{className}-enter-active { + .@{idux-prefix}-@{className}-enter-active { transition-timing-function: @ease-out-circ; } - .ix-@{className}-leave-active { + .@{idux-prefix}-@{className}-leave-active { transition-timing-function: @ease-in-circ; } - .ix-@{className}-enter-from, - .ix-@{className}-leave-to { + .@{idux-prefix}-@{className}-enter-from, + .@{idux-prefix}-@{className}-leave-to { transform: @translate; opacity: 0; } diff --git a/packages/components/style/motion/slide.less b/packages/components/style/motion/slide.less index 30dc9868f..55ccd21cc 100644 --- a/packages/components/style/motion/slide.less +++ b/packages/components/style/motion/slide.less @@ -1,23 +1,23 @@ @import '../variable/animation.less'; .slide-motion(@className, @origin, @scale, @duration: @transition-duration-base) { - .ix-@{className}-enter-active, - .ix-@{className}-leave-active { + .@{idux-prefix}-@{className}-enter-active, + .@{idux-prefix}-@{className}-leave-active { transform-origin: @origin; transition-property: transform, opacity; transition-duration: @duration; } - .ix-@{className}-enter-active { + .@{idux-prefix}-@{className}-enter-active { transition-timing-function: @ease-out-quint; } - .ix-@{className}-leave-active { + .@{idux-prefix}-@{className}-leave-active { transition-timing-function: @ease-in-quint; } - .ix-@{className}-enter-from, - .ix-@{className}-leave-to { + .@{idux-prefix}-@{className}-enter-from, + .@{idux-prefix}-@{className}-leave-to { transform: @scale; opacity: 0; } diff --git a/packages/components/style/motion/zoom.less b/packages/components/style/motion/zoom.less index 24fa55a16..02f7ab2fa 100644 --- a/packages/components/style/motion/zoom.less +++ b/packages/components/style/motion/zoom.less @@ -1,23 +1,23 @@ @import '../variable/animation.less'; .zoom-motion(@className, @origin: @scale-origin-zoom-center, @scale: @scale-zoom-big, @duration: @transition-duration-base) { - .ix-@{className}-enter-active, - .ix-@{className}-leave-active { + .@{idux-prefix}-@{className}-enter-active, + .@{idux-prefix}-@{className}-leave-active { transform-origin: @origin; transition-property: opacity, transform; transition-duration: @duration; } - .ix-@{className}-enter-active { + .@{idux-prefix}-@{className}-enter-active { transition-timing-function: @ease-out-circ; } - .ix-@{className}-leave-active { + .@{idux-prefix}-@{className}-leave-active { transition-timing-function: @ease-in-out-circ; } - .ix-@{className}-enter-from, - .ix-@{className}-leave-to { + .@{idux-prefix}-@{className}-enter-from, + .@{idux-prefix}-@{className}-leave-to { opacity: 0; transform: ~'scale(@{scale})'; } diff --git a/packages/components/time-picker/src/TimePicker.tsx b/packages/components/time-picker/src/TimePicker.tsx index ff3bec65f..02400d5b3 100644 --- a/packages/components/time-picker/src/TimePicker.tsx +++ b/packages/components/time-picker/src/TimePicker.tsx @@ -49,6 +49,7 @@ export default defineComponent({ props, slots, dateConfig, + common, locale, config, mergedPrefixCls, diff --git a/packages/components/time-picker/src/TimeRangePicker.tsx b/packages/components/time-picker/src/TimeRangePicker.tsx index a6d7936f4..0b507bca1 100644 --- a/packages/components/time-picker/src/TimeRangePicker.tsx +++ b/packages/components/time-picker/src/TimeRangePicker.tsx @@ -54,6 +54,7 @@ export default defineComponent({ props, slots, dateConfig, + common, locale, config, mergedPrefixCls, diff --git a/packages/components/time-picker/src/composables/useOverlayProps.ts b/packages/components/time-picker/src/composables/useOverlayProps.ts index 1969f87f6..6714c8734 100644 --- a/packages/components/time-picker/src/composables/useOverlayProps.ts +++ b/packages/components/time-picker/src/composables/useOverlayProps.ts @@ -14,13 +14,13 @@ import { TimePickerContext, TimeRangePickerContext } from '../tokens' const defaultOffset: [number, number] = [0, 8] export function useOverlayProps(context: TimePickerContext | TimeRangePickerContext): ComputedRef<ɵOverlayProps> { return computed(() => { - const { props, config, accessor, mergedPrefixCls, overlayOpened, setOverlayOpened } = context + const { props, common, config, accessor, mergedPrefixCls, overlayOpened, setOverlayOpened } = context return { clickOutside: true, disabled: accessor.disabled || props.readonly, offset: defaultOffset, placement: 'bottomStart', - transitionName: 'ix-fade', + transitionName: `${common.prefixCls}-fade`, target: props.overlayContainer ?? config.overlayContainer ?? `${mergedPrefixCls.value}-overlay-container`, trigger: 'manual', visible: overlayOpened.value, diff --git a/packages/components/time-picker/src/tokens.ts b/packages/components/time-picker/src/tokens.ts index 0941af466..4b3c00d67 100644 --- a/packages/components/time-picker/src/tokens.ts +++ b/packages/components/time-picker/src/tokens.ts @@ -11,7 +11,7 @@ import type { OverlayStateContext } from './composables/useOverlayState' import type { PickerStateContext } from './composables/usePickerState' import type { PickerRangeControlContext } from './composables/useRangeControl' import type { TimePickerProps, TimeRangePickerProps } from './types' -import type { DateConfig, TimePickerConfig } from '@idux/components/config' +import type { CommonConfig, DateConfig, TimePickerConfig } from '@idux/components/config' import type { FormContext } from '@idux/components/form' import type { Locale } from '@idux/components/locales' import type { ComputedRef, InjectionKey, Ref, Slots, VNodeTypes } from 'vue' @@ -22,6 +22,7 @@ interface BasePickerContext props: T slots: Slots dateConfig: DateConfig + common: CommonConfig locale: Locale config: TimePickerConfig inputRef: Ref diff --git a/packages/site/src/components/global/themeConfig.ts b/packages/site/src/components/global/themeConfig.ts index c1d6457ca..dbf0455db 100644 --- a/packages/site/src/components/global/themeConfig.ts +++ b/packages/site/src/components/global/themeConfig.ts @@ -1,4 +1 @@ -export const themeConfig = [ - { key: 'default', label: 'Default' }, - { key: 'seer', label: 'Seer' }, -] +export const themeConfig = [{"key":"default","label":"Default"},{"key":"seer","label":"Seer"}] \ No newline at end of file