From 35129bf5010cd838365c8e062a5fbdabd7547f63 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Wed, 10 Feb 2021 13:12:44 +0800 Subject: [PATCH] refactor: rename NaiveDateLocale to NDateLocale --- src/config-provider/src/ConfigProvider.ts | 4 ++-- src/config-provider/src/interface.ts | 4 ++-- src/data-table/index.ts | 1 + src/date-picker/src/interface.ts | 4 ++-- src/locales/date/enUS.ts | 2 +- src/locales/index.ts | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/config-provider/src/ConfigProvider.ts b/src/config-provider/src/ConfigProvider.ts index 57fc29df5..d85b904d0 100644 --- a/src/config-provider/src/ConfigProvider.ts +++ b/src/config-provider/src/ConfigProvider.ts @@ -17,7 +17,7 @@ import { GlobalThemeOverrides, ComponentProps } from './interface' -import { NaiveDateLocale, NLocale } from '../../locales' +import { NDateLocale, NLocale } from '../../locales' export default defineComponent({ name: 'ConfigProvider', @@ -32,7 +32,7 @@ export default defineComponent({ default: undefined }, locale: Object as PropType<NLocale | null>, - dateLocale: Object as PropType<NaiveDateLocale | null>, + dateLocale: Object as PropType<NDateLocale | null>, namespace: String, tag: { type: String, diff --git a/src/config-provider/src/interface.ts b/src/config-provider/src/interface.ts index 1e8945df8..ff3d57a83 100644 --- a/src/config-provider/src/interface.ts +++ b/src/config-provider/src/interface.ts @@ -1,4 +1,4 @@ -import type { NaiveDateLocale, NLocale } from '../../locales' +import type { NDateLocale, NLocale } from '../../locales' import type { ThemeCommonVars } from '../../_styles/common' import type { AlertTheme } from '../../alert/styles' import type { AnchorTheme } from '../../anchor/styles' @@ -220,7 +220,7 @@ export interface ConfigProviderInjection { mergedBordered: boolean | undefined mergedNamespace: string | undefined mergedLocale: NLocale | undefined - mergedDateLocale: NaiveDateLocale | undefined + mergedDateLocale: NDateLocale | undefined mergedHljs: Hljs | undefined mergedComponentProps: ComponentProps | undefined // wip, unstable diff --git a/src/data-table/index.ts b/src/data-table/index.ts index de705a09c..3c7aea8b3 100644 --- a/src/data-table/index.ts +++ b/src/data-table/index.ts @@ -1 +1,2 @@ export { default as NDataTable } from './src/DataTable' +export { FilterRender, SorterRender } from './src/interface' diff --git a/src/date-picker/src/interface.ts b/src/date-picker/src/interface.ts index a7101ed30..8402fb8d0 100644 --- a/src/date-picker/src/interface.ts +++ b/src/date-picker/src/interface.ts @@ -1,5 +1,5 @@ import { UnwrapRef } from 'vue' -import { NLocale, NaiveDateLocale } from '../../locales' +import { NLocale, NDateLocale } from '../../locales' import { IsHourDisabled, IsMinuteDisabled, @@ -33,7 +33,7 @@ export type DatePickerInjection = { mergedTheme: MergedTheme<DatePickerTheme> timePickerSize: 'small' | 'medium' | 'large' locale: NLocale['DatePicker'] - dateLocale: NaiveDateLocale + dateLocale: NDateLocale value: Value | null isDateDisabled: IsDateDisabled } & UnwrapRef<ReturnType<typeof uniCalendarValidation>> & diff --git a/src/locales/date/enUS.ts b/src/locales/date/enUS.ts index e67c60c95..950bcdaa0 100644 --- a/src/locales/date/enUS.ts +++ b/src/locales/date/enUS.ts @@ -5,5 +5,5 @@ const dateEnUs = { locale: enUS } -export type NaiveDateLocale = typeof dateEnUs +export type NDateLocale = typeof dateEnUs export default dateEnUs diff --git a/src/locales/index.ts b/src/locales/index.ts index ad3fd339e..b9cf44e5c 100644 --- a/src/locales/index.ts +++ b/src/locales/index.ts @@ -3,4 +3,4 @@ export { default as enUS } from './common/enUS' export { default as dateZhCN } from './date/zhCN' export { default as dateEnUS } from './date/enUS' export type { NLocale } from './common/enUS' -export type { NaiveDateLocale } from './date/enUS' +export type { NDateLocale } from './date/enUS'