From c0ae4a6b3ac4c83dfe69b0f3b12996c35f9b62be Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Mon, 9 Aug 2021 16:58:03 +0800 Subject: [PATCH] style: type --- components/locale-provider/index.tsx | 4 ++-- components/locale-provider/ku_KU.ts | 3 --- components/locale/ar_EG.tsx | 2 +- components/locale/az_AZ.tsx | 2 +- components/locale/bg_BG.tsx | 2 +- components/locale/by_BY.tsx | 4 ++-- components/locale/ca_ES.tsx | 2 +- components/locale/cs_CZ.tsx | 2 +- components/locale/da_DK.tsx | 2 +- components/locale/de_DE.tsx | 2 +- components/locale/default.tsx | 2 +- components/locale/el_GR.tsx | 2 +- components/locale/en_GB.tsx | 2 +- components/locale/es_ES.tsx | 2 +- components/locale/et_EE.tsx | 2 +- components/locale/fa_IR.tsx | 2 +- components/locale/fi_FI.tsx | 2 +- components/locale/fr_BE.tsx | 2 +- components/locale/fr_CA.tsx | 2 +- components/locale/fr_FR.tsx | 2 +- components/locale/ga_IE.tsx | 2 +- components/locale/gl_ES.tsx | 2 +- components/locale/he_IL.tsx | 2 +- components/locale/hi_IN.tsx | 2 +- components/locale/hr_HR.tsx | 2 +- components/locale/hu_HU.tsx | 2 +- components/locale/hy_AM.tsx | 4 ++-- components/locale/id_ID.tsx | 2 +- components/locale/is_IS.tsx | 2 +- components/locale/it_IT.tsx | 2 +- components/locale/ja_JP.tsx | 2 +- components/locale/kk_KZ.tsx | 4 ++-- components/locale/kmr_IQ.tsx | 2 +- components/locale/kn_IN.tsx | 2 +- components/locale/ko_KR.tsx | 2 +- components/locale/ku_IQ.tsx | 2 +- components/locale/lt_LT.tsx | 4 ++-- components/locale/lv_LV.tsx | 2 +- components/locale/mk_MK.tsx | 2 +- components/locale/mn_MN.tsx | 2 +- components/locale/ms_MY.tsx | 2 +- components/locale/nb_NO.tsx | 2 +- components/locale/ne_NP.tsx | 2 +- components/locale/nl_BE.tsx | 2 +- components/locale/nl_NL.tsx | 2 +- components/locale/pl_PL.tsx | 2 +- components/locale/pt_BR.tsx | 2 +- components/locale/pt_PT.tsx | 2 +- components/locale/ro_RO.tsx | 2 +- components/locale/ru_RU.tsx | 4 ++-- components/locale/sk_SK.tsx | 2 +- components/locale/sl_SI.tsx | 2 +- components/locale/sr_RS.tsx | 2 +- components/locale/sv_SE.tsx | 2 +- components/locale/ta_IN.tsx | 2 +- components/locale/th_TH.tsx | 2 +- components/locale/tr_TR.tsx | 2 +- components/locale/uk_UA.tsx | 2 +- components/locale/vi_VN.tsx | 2 +- components/locale/zh_CN.tsx | 2 +- components/locale/zh_HK.tsx | 2 +- components/locale/zh_TW.tsx | 2 +- components/time-picker/time-picker.tsx | 8 ++++---- components/vc-picker/Picker.tsx | 11 +++++------ components/vc-picker/PickerPanel.tsx | 3 +-- components/vc-picker/RangePicker.tsx | 3 +-- 66 files changed, 78 insertions(+), 84 deletions(-) delete mode 100644 components/locale-provider/ku_KU.ts diff --git a/components/locale-provider/index.tsx b/components/locale-provider/index.tsx index a7cdaa64c..fd61dc534 100644 --- a/components/locale-provider/index.tsx +++ b/components/locale-provider/index.tsx @@ -6,8 +6,8 @@ import { changeConfirmLocale } from '../modal/locale'; import warning from '../_util/warning'; import { withInstall } from '../_util/type'; import type { ValidateMessages } from '../form/interface'; -import { TransferLocale } from '../transfer'; -import { PickerLocale as DatePickerLocale } from '../date-picker/generatePicker'; +import type { TransferLocale } from '../transfer'; +import type { PickerLocale as DatePickerLocale } from '../date-picker/generatePicker'; interface TransferLocaleForEmpty { description: string; diff --git a/components/locale-provider/ku_KU.ts b/components/locale-provider/ku_KU.ts deleted file mode 100644 index 16ca16ce3..000000000 --- a/components/locale-provider/ku_KU.ts +++ /dev/null @@ -1,3 +0,0 @@ -import locale from '../locale/ku_KU'; - -export default locale; diff --git a/components/locale/ar_EG.tsx b/components/locale/ar_EG.tsx index d333d5c90..356e5446b 100644 --- a/components/locale/ar_EG.tsx +++ b/components/locale/ar_EG.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/ar_EG'; import DatePicker from '../date-picker/locale/ar_EG'; import TimePicker from '../time-picker/locale/ar_EG'; import Calendar from '../calendar/locale/ar_EG'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = 'ليس ${label} من نوع ${type} صالحًا'; diff --git a/components/locale/az_AZ.tsx b/components/locale/az_AZ.tsx index 587ab678f..aa2d2ce38 100644 --- a/components/locale/az_AZ.tsx +++ b/components/locale/az_AZ.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/az_AZ'; import DatePicker from '../date-picker/locale/az_AZ'; import TimePicker from '../time-picker/locale/az_AZ'; import Calendar from '../calendar/locale/az_AZ'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'az', diff --git a/components/locale/bg_BG.tsx b/components/locale/bg_BG.tsx index 267ed45cf..e5887e937 100644 --- a/components/locale/bg_BG.tsx +++ b/components/locale/bg_BG.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/bg_BG'; import DatePicker from '../date-picker/locale/bg_BG'; import TimePicker from '../time-picker/locale/bg_BG'; import Calendar from '../calendar/locale/bg_BG'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'bg', diff --git a/components/locale/by_BY.tsx b/components/locale/by_BY.tsx index 2a7db8c38..87317669d 100644 --- a/components/locale/by_BY.tsx +++ b/components/locale/by_BY.tsx @@ -3,9 +3,9 @@ import Pagination from '../vc-pagination/locale/by_BY'; import DatePicker from '../date-picker/locale/by_BY'; import TimePicker from '../time-picker/locale/by_BY'; import Calendar from '../calendar/locale/by_BY'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; -const typeTemplate: string = "${label} не з'яўляецца тыпам ${type}"; +const typeTemplate = "${label} не з'яўляецца тыпам ${type}"; const localeValues: Locale = { locale: 'by', diff --git a/components/locale/ca_ES.tsx b/components/locale/ca_ES.tsx index a0e803c8f..7142e52fe 100644 --- a/components/locale/ca_ES.tsx +++ b/components/locale/ca_ES.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/ca_ES'; import DatePicker from '../date-picker/locale/ca_ES'; import TimePicker from '../time-picker/locale/ca_ES'; import Calendar from '../calendar/locale/ca_ES'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} no és un ${type} vàlid'; diff --git a/components/locale/cs_CZ.tsx b/components/locale/cs_CZ.tsx index dd88656e9..b9746b44d 100644 --- a/components/locale/cs_CZ.tsx +++ b/components/locale/cs_CZ.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/cs_CZ'; import DatePicker from '../date-picker/locale/cs_CZ'; import TimePicker from '../time-picker/locale/cs_CZ'; import Calendar from '../calendar/locale/cs_CZ'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'cs', diff --git a/components/locale/da_DK.tsx b/components/locale/da_DK.tsx index 0cc2dfd78..951a4e012 100644 --- a/components/locale/da_DK.tsx +++ b/components/locale/da_DK.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/da_DK'; import DatePicker from '../date-picker/locale/da_DK'; import TimePicker from '../time-picker/locale/da_DK'; import Calendar from '../calendar/locale/da_DK'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'da', diff --git a/components/locale/de_DE.tsx b/components/locale/de_DE.tsx index 8568cc11d..5eef76622 100644 --- a/components/locale/de_DE.tsx +++ b/components/locale/de_DE.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/de_DE'; import DatePicker from '../date-picker/locale/de_DE'; import TimePicker from '../time-picker/locale/de_DE'; import Calendar from '../calendar/locale/de_DE'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} ist nicht gültig. ${type} erwartet'; diff --git a/components/locale/default.tsx b/components/locale/default.tsx index f99501f9b..cb9f096af 100644 --- a/components/locale/default.tsx +++ b/components/locale/default.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/en_US'; import DatePicker from '../date-picker/locale/en_US'; import TimePicker from '../time-picker/locale/en_US'; import Calendar from '../calendar/locale/en_US'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} is not a valid ${type}'; diff --git a/components/locale/el_GR.tsx b/components/locale/el_GR.tsx index e93cbe64c..9262d97d5 100644 --- a/components/locale/el_GR.tsx +++ b/components/locale/el_GR.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/el_GR'; import DatePicker from '../date-picker/locale/el_GR'; import TimePicker from '../time-picker/locale/el_GR'; import Calendar from '../calendar/locale/el_GR'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'el', diff --git a/components/locale/en_GB.tsx b/components/locale/en_GB.tsx index ca80a036a..dd3cd9c6d 100644 --- a/components/locale/en_GB.tsx +++ b/components/locale/en_GB.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/en_GB'; import DatePicker from '../date-picker/locale/en_GB'; import TimePicker from '../time-picker/locale/en_GB'; import Calendar from '../calendar/locale/en_GB'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} is not a valid ${type}'; diff --git a/components/locale/es_ES.tsx b/components/locale/es_ES.tsx index 712c9553d..d08e824da 100644 --- a/components/locale/es_ES.tsx +++ b/components/locale/es_ES.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/es_ES'; import DatePicker from '../date-picker/locale/es_ES'; import TimePicker from '../time-picker/locale/es_ES'; import Calendar from '../calendar/locale/es_ES'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} no es un ${type} válido'; diff --git a/components/locale/et_EE.tsx b/components/locale/et_EE.tsx index 909846956..c840327be 100644 --- a/components/locale/et_EE.tsx +++ b/components/locale/et_EE.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/et_EE'; import DatePicker from '../date-picker/locale/et_EE'; import TimePicker from '../time-picker/locale/et_EE'; import Calendar from '../calendar/locale/et_EE'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'et', diff --git a/components/locale/fa_IR.tsx b/components/locale/fa_IR.tsx index 5db1f9e31..cbf2f677f 100644 --- a/components/locale/fa_IR.tsx +++ b/components/locale/fa_IR.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/fa_IR'; import DatePicker from '../date-picker/locale/fa_IR'; import TimePicker from '../time-picker/locale/fa_IR'; import Calendar from '../calendar/locale/fa_IR'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} از نوع ${type} معتبر نیست'; diff --git a/components/locale/fi_FI.tsx b/components/locale/fi_FI.tsx index 4f25417b0..a8858b6b8 100644 --- a/components/locale/fi_FI.tsx +++ b/components/locale/fi_FI.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/fi_FI'; import DatePicker from '../date-picker/locale/fi_FI'; import TimePicker from '../time-picker/locale/fi_FI'; import Calendar from '../calendar/locale/fi_FI'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'fi', diff --git a/components/locale/fr_BE.tsx b/components/locale/fr_BE.tsx index 589d4d107..ce0f28b71 100644 --- a/components/locale/fr_BE.tsx +++ b/components/locale/fr_BE.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/fr_BE'; import DatePicker from '../date-picker/locale/fr_BE'; import TimePicker from '../time-picker/locale/fr_BE'; import Calendar from '../calendar/locale/fr_BE'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'fr', diff --git a/components/locale/fr_CA.tsx b/components/locale/fr_CA.tsx index 7d5ee6176..d7cd566c2 100644 --- a/components/locale/fr_CA.tsx +++ b/components/locale/fr_CA.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/fr_CA'; import DatePicker from '../date-picker/locale/fr_CA'; import TimePicker from '../time-picker/locale/fr_CA'; import Calendar from '../calendar/locale/fr_CA'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'fr', diff --git a/components/locale/fr_FR.tsx b/components/locale/fr_FR.tsx index cbf6cd9b0..340175351 100644 --- a/components/locale/fr_FR.tsx +++ b/components/locale/fr_FR.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/fr_FR'; import DatePicker from '../date-picker/locale/fr_FR'; import TimePicker from '../time-picker/locale/fr_FR'; import Calendar from '../calendar/locale/fr_FR'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = "La valeur du champ ${label} n'est pas valide pour le type ${type}"; diff --git a/components/locale/ga_IE.tsx b/components/locale/ga_IE.tsx index 54e6e8e4c..b1c35159c 100644 --- a/components/locale/ga_IE.tsx +++ b/components/locale/ga_IE.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/ga_IE'; import DatePicker from '../date-picker/locale/ga_IE'; import TimePicker from '../time-picker/locale/ga_IE'; import Calendar from '../calendar/locale/ga_IE'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} is not a valid ${type}'; diff --git a/components/locale/gl_ES.tsx b/components/locale/gl_ES.tsx index b0fcb585e..4c54b0787 100644 --- a/components/locale/gl_ES.tsx +++ b/components/locale/gl_ES.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/gl_ES'; import DatePicker from '../date-picker/locale/gl_ES'; import TimePicker from '../time-picker/locale/gl_ES'; import Calendar from '../calendar/locale/gl_ES'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} non é un ${type} válido'; diff --git a/components/locale/he_IL.tsx b/components/locale/he_IL.tsx index 964fd1f4d..0a305aabb 100644 --- a/components/locale/he_IL.tsx +++ b/components/locale/he_IL.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/he_IL'; import DatePicker from '../date-picker/locale/he_IL'; import TimePicker from '../time-picker/locale/he_IL'; import Calendar from '../calendar/locale/he_IL'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} הוא לא ${type} תקין'; diff --git a/components/locale/hi_IN.tsx b/components/locale/hi_IN.tsx index b7b2c436a..208abf836 100644 --- a/components/locale/hi_IN.tsx +++ b/components/locale/hi_IN.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/hi_IN'; import DatePicker from '../date-picker/locale/hi_IN'; import TimePicker from '../time-picker/locale/hi_IN'; import Calendar from '../calendar/locale/hi_IN'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} मान्य ${type} नहीं है'; diff --git a/components/locale/hr_HR.tsx b/components/locale/hr_HR.tsx index d00ac9800..d91aea4c8 100644 --- a/components/locale/hr_HR.tsx +++ b/components/locale/hr_HR.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/hr_HR'; import DatePicker from '../date-picker/locale/hr_HR'; import TimePicker from '../time-picker/locale/hr_HR'; import Calendar from '../calendar/locale/hr_HR'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} nije valjan ${type}'; diff --git a/components/locale/hu_HU.tsx b/components/locale/hu_HU.tsx index e63b9b8e0..290c5254f 100644 --- a/components/locale/hu_HU.tsx +++ b/components/locale/hu_HU.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/hu_HU'; import DatePicker from '../date-picker/locale/hu_HU'; import TimePicker from '../time-picker/locale/hu_HU'; import Calendar from '../calendar/locale/hu_HU'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'hu', diff --git a/components/locale/hy_AM.tsx b/components/locale/hy_AM.tsx index 92a2a96be..a324b3c98 100644 --- a/components/locale/hy_AM.tsx +++ b/components/locale/hy_AM.tsx @@ -1,5 +1,5 @@ -import { Locale } from '../locale-provider'; -import { PickerLocale } from '../date-picker/generatePicker'; +import type { Locale } from '../locale-provider'; +import type { PickerLocale } from '../date-picker/generatePicker'; const datePickerLocale: PickerLocale = { lang: { diff --git a/components/locale/id_ID.tsx b/components/locale/id_ID.tsx index 9a5a00eac..a389523b9 100644 --- a/components/locale/id_ID.tsx +++ b/components/locale/id_ID.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/id_ID'; import DatePicker from '../date-picker/locale/id_ID'; import TimePicker from '../time-picker/locale/id_ID'; import Calendar from '../calendar/locale/id_ID'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'id', diff --git a/components/locale/is_IS.tsx b/components/locale/is_IS.tsx index 580d7d474..356ace19f 100644 --- a/components/locale/is_IS.tsx +++ b/components/locale/is_IS.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/is_IS'; import DatePicker from '../date-picker/locale/is_IS'; import TimePicker from '../time-picker/locale/is_IS'; import Calendar from '../calendar/locale/is_IS'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'is', diff --git a/components/locale/it_IT.tsx b/components/locale/it_IT.tsx index 67c240343..dc9531fd7 100644 --- a/components/locale/it_IT.tsx +++ b/components/locale/it_IT.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/it_IT'; import DatePicker from '../date-picker/locale/it_IT'; import TimePicker from '../time-picker/locale/it_IT'; import Calendar from '../calendar/locale/it_IT'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'it', diff --git a/components/locale/ja_JP.tsx b/components/locale/ja_JP.tsx index e2e9a90b3..3627466ea 100644 --- a/components/locale/ja_JP.tsx +++ b/components/locale/ja_JP.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/ja_JP'; import DatePicker from '../date-picker/locale/ja_JP'; import TimePicker from '../time-picker/locale/ja_JP'; import Calendar from '../calendar/locale/ja_JP'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label}は有効な${type}ではありません'; diff --git a/components/locale/kk_KZ.tsx b/components/locale/kk_KZ.tsx index 404daa24d..457a73237 100644 --- a/components/locale/kk_KZ.tsx +++ b/components/locale/kk_KZ.tsx @@ -4,9 +4,9 @@ import Pagination from '../vc-pagination/locale/kk_KZ'; import DatePicker from '../date-picker/locale/kk_KZ'; import TimePicker from '../time-picker/locale/kk_KZ'; import Calendar from '../calendar/locale/kk_KZ'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; -const typeTemplate: string = '${label} ${type} типі емес'; +const typeTemplate = '${label} ${type} типі емес'; const localeValues: Locale = { locale: 'kk', diff --git a/components/locale/kmr_IQ.tsx b/components/locale/kmr_IQ.tsx index f8a096938..18d878888 100644 --- a/components/locale/kmr_IQ.tsx +++ b/components/locale/kmr_IQ.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/kmr_IQ'; import DatePicker from '../date-picker/locale/kmr_IQ'; import TimePicker from '../time-picker/locale/kmr_IQ'; import Calendar from '../calendar/locale/kmr_IQ'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'ku', diff --git a/components/locale/kn_IN.tsx b/components/locale/kn_IN.tsx index 9ab662c62..157432094 100644 --- a/components/locale/kn_IN.tsx +++ b/components/locale/kn_IN.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/kn_IN'; import DatePicker from '../date-picker/locale/kn_IN'; import TimePicker from '../time-picker/locale/kn_IN'; import Calendar from '../calendar/locale/kn_IN'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'kn', diff --git a/components/locale/ko_KR.tsx b/components/locale/ko_KR.tsx index e8043311b..a1b1eb3ac 100644 --- a/components/locale/ko_KR.tsx +++ b/components/locale/ko_KR.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/ko_KR'; import DatePicker from '../date-picker/locale/ko_KR'; import TimePicker from '../time-picker/locale/ko_KR'; import Calendar from '../calendar/locale/ko_KR'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} 유효하지 않은 ${type}'; diff --git a/components/locale/ku_IQ.tsx b/components/locale/ku_IQ.tsx index 1d549924a..3dc4d7e7d 100755 --- a/components/locale/ku_IQ.tsx +++ b/components/locale/ku_IQ.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/kmr_IQ'; import DatePicker from '../date-picker/locale/kmr_IQ'; import TimePicker from '../time-picker/locale/kmr_IQ'; import Calendar from '../calendar/locale/kmr_IQ'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; // please use antd/lib/locale/kmr_IQ instead // keep this file for compatibility diff --git a/components/locale/lt_LT.tsx b/components/locale/lt_LT.tsx index c32b63c1e..2dd991ab6 100644 --- a/components/locale/lt_LT.tsx +++ b/components/locale/lt_LT.tsx @@ -4,9 +4,9 @@ import Pagination from '../vc-pagination/locale/lt_LT'; import DatePicker from '../date-picker/locale/lt_LT'; import TimePicker from '../time-picker/locale/lt_LT'; import Calendar from '../calendar/locale/lt_LT'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; -const typeTemplate: string = '${label} не является типом ${type}'; +const typeTemplate = '${label} не является типом ${type}'; const localeValues: Locale = { locale: 'lt', diff --git a/components/locale/lv_LV.tsx b/components/locale/lv_LV.tsx index 248001acf..f175bd611 100644 --- a/components/locale/lv_LV.tsx +++ b/components/locale/lv_LV.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/lv_LV'; import DatePicker from '../date-picker/locale/lv_LV'; import TimePicker from '../time-picker/locale/lv_LV'; import Calendar from '../calendar/locale/lv_LV'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'lv', diff --git a/components/locale/mk_MK.tsx b/components/locale/mk_MK.tsx index 1691856d8..6110ddda6 100644 --- a/components/locale/mk_MK.tsx +++ b/components/locale/mk_MK.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/mk_MK'; import DatePicker from '../date-picker/locale/mk_MK'; import TimePicker from '../time-picker/locale/mk_MK'; import Calendar from '../calendar/locale/mk_MK'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'mk', diff --git a/components/locale/mn_MN.tsx b/components/locale/mn_MN.tsx index 5397c95ea..748ec1a30 100644 --- a/components/locale/mn_MN.tsx +++ b/components/locale/mn_MN.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/mn_MN'; import DatePicker from '../date-picker/locale/mn_MN'; import TimePicker from '../time-picker/locale/mn_MN'; import Calendar from '../calendar/locale/mn_MN'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'mn-mn', diff --git a/components/locale/ms_MY.tsx b/components/locale/ms_MY.tsx index df0f0948d..c301c923d 100644 --- a/components/locale/ms_MY.tsx +++ b/components/locale/ms_MY.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/ms_MY'; import DatePicker from '../date-picker/locale/ms_MY'; import TimePicker from '../time-picker/locale/ms_MY'; import Calendar from '../calendar/locale/ms_MY'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'ms-my', diff --git a/components/locale/nb_NO.tsx b/components/locale/nb_NO.tsx index 9a1339bc9..fb90879ac 100644 --- a/components/locale/nb_NO.tsx +++ b/components/locale/nb_NO.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/nb_NO'; import DatePicker from '../date-picker/locale/nb_NO'; import TimePicker from '../time-picker/locale/nb_NO'; import Calendar from '../calendar/locale/nb_NO'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} er ikke et gyldig ${type}'; diff --git a/components/locale/ne_NP.tsx b/components/locale/ne_NP.tsx index b28e6452a..a7553e074 100644 --- a/components/locale/ne_NP.tsx +++ b/components/locale/ne_NP.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/en_US'; import DatePicker from '../date-picker/locale/en_US'; import TimePicker from '../time-picker/locale/en_US'; import Calendar from '../calendar/locale/en_US'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'ne-np', diff --git a/components/locale/nl_BE.tsx b/components/locale/nl_BE.tsx index 529296082..0172a9aa5 100644 --- a/components/locale/nl_BE.tsx +++ b/components/locale/nl_BE.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/nl_BE'; import DatePicker from '../date-picker/locale/nl_BE'; import TimePicker from '../time-picker/locale/nl_BE'; import Calendar from '../calendar/locale/nl_BE'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} is geen geldige ${type}'; diff --git a/components/locale/nl_NL.tsx b/components/locale/nl_NL.tsx index 385075869..64d261b61 100644 --- a/components/locale/nl_NL.tsx +++ b/components/locale/nl_NL.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/nl_NL'; import DatePicker from '../date-picker/locale/nl_NL'; import TimePicker from '../time-picker/locale/nl_NL'; import Calendar from '../calendar/locale/nl_NL'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} is geen geldige ${type}'; diff --git a/components/locale/pl_PL.tsx b/components/locale/pl_PL.tsx index 227ddcbae..278326df8 100644 --- a/components/locale/pl_PL.tsx +++ b/components/locale/pl_PL.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/pl_PL'; import DatePicker from '../date-picker/locale/pl_PL'; import TimePicker from '../time-picker/locale/pl_PL'; import Calendar from '../calendar/locale/pl_PL'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'pl', diff --git a/components/locale/pt_BR.tsx b/components/locale/pt_BR.tsx index 816641e18..ec779f0cb 100644 --- a/components/locale/pt_BR.tsx +++ b/components/locale/pt_BR.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/pt_BR'; import DatePicker from '../date-picker/locale/pt_BR'; import TimePicker from '../time-picker/locale/pt_BR'; import Calendar from '../calendar/locale/pt_BR'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} não é um ${type} válido'; diff --git a/components/locale/pt_PT.tsx b/components/locale/pt_PT.tsx index c9b0ec391..a91bf0a8a 100644 --- a/components/locale/pt_PT.tsx +++ b/components/locale/pt_PT.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/pt_PT'; import DatePicker from '../date-picker/locale/pt_PT'; import TimePicker from '../time-picker/locale/pt_PT'; import Calendar from '../calendar/locale/pt_PT'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'pt', diff --git a/components/locale/ro_RO.tsx b/components/locale/ro_RO.tsx index ddfa2f139..281207a81 100644 --- a/components/locale/ro_RO.tsx +++ b/components/locale/ro_RO.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/ro_RO'; import DatePicker from '../date-picker/locale/ro_RO'; import TimePicker from '../time-picker/locale/ro_RO'; import Calendar from '../calendar/locale/ro_RO'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} nu conține tipul corect (${type})'; diff --git a/components/locale/ru_RU.tsx b/components/locale/ru_RU.tsx index 2ee033aef..d57964fe5 100644 --- a/components/locale/ru_RU.tsx +++ b/components/locale/ru_RU.tsx @@ -4,9 +4,9 @@ import Pagination from '../vc-pagination/locale/ru_RU'; import DatePicker from '../date-picker/locale/ru_RU'; import TimePicker from '../time-picker/locale/ru_RU'; import Calendar from '../calendar/locale/ru_RU'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; -const typeTemplate: string = '${label} не является типом ${type}'; +const typeTemplate = '${label} не является типом ${type}'; const localeValues: Locale = { locale: 'ru', diff --git a/components/locale/sk_SK.tsx b/components/locale/sk_SK.tsx index 308cfd8ff..3d7aee58b 100644 --- a/components/locale/sk_SK.tsx +++ b/components/locale/sk_SK.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/sk_SK'; import DatePicker from '../date-picker/locale/sk_SK'; import TimePicker from '../time-picker/locale/sk_SK'; import Calendar from '../calendar/locale/sk_SK'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'sk', diff --git a/components/locale/sl_SI.tsx b/components/locale/sl_SI.tsx index 409c44dc9..b651af612 100644 --- a/components/locale/sl_SI.tsx +++ b/components/locale/sl_SI.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/sl_SI'; import DatePicker from '../date-picker/locale/sl_SI'; import TimePicker from '../time-picker/locale/sl_SI'; import Calendar from '../calendar/locale/sl_SI'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'sl', diff --git a/components/locale/sr_RS.tsx b/components/locale/sr_RS.tsx index 1b8d09a52..715f2dfa5 100644 --- a/components/locale/sr_RS.tsx +++ b/components/locale/sr_RS.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/sr_RS'; import DatePicker from '../date-picker/locale/sr_RS'; import TimePicker from '../time-picker/locale/sr_RS'; import Calendar from '../calendar/locale/sr_RS'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} nije važeći ${type}'; diff --git a/components/locale/sv_SE.tsx b/components/locale/sv_SE.tsx index 7e6e7cdf9..001c23e50 100644 --- a/components/locale/sv_SE.tsx +++ b/components/locale/sv_SE.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/sv_SE'; import DatePicker from '../date-picker/locale/sv_SE'; import TimePicker from '../time-picker/locale/sv_SE'; import Calendar from '../calendar/locale/sv_SE'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} är inte en giltig ${type}'; diff --git a/components/locale/ta_IN.tsx b/components/locale/ta_IN.tsx index ce4a9b0ea..2d4d26a8c 100644 --- a/components/locale/ta_IN.tsx +++ b/components/locale/ta_IN.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/ta_IN'; import DatePicker from '../date-picker/locale/ta_IN'; import TimePicker from '../time-picker/locale/ta_IN'; import Calendar from '../calendar/locale/ta_IN'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'ta', diff --git a/components/locale/th_TH.tsx b/components/locale/th_TH.tsx index d9cb45796..32e8bbcc1 100644 --- a/components/locale/th_TH.tsx +++ b/components/locale/th_TH.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/th_TH'; import DatePicker from '../date-picker/locale/th_TH'; import TimePicker from '../time-picker/locale/th_TH'; import Calendar from '../calendar/locale/th_TH'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} ไม่ใช่ ${type} ที่ถูกต้อง'; diff --git a/components/locale/tr_TR.tsx b/components/locale/tr_TR.tsx index 404b18cb9..4ab979f85 100644 --- a/components/locale/tr_TR.tsx +++ b/components/locale/tr_TR.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/tr_TR'; import DatePicker from '../date-picker/locale/tr_TR'; import TimePicker from '../time-picker/locale/tr_TR'; import Calendar from '../calendar/locale/tr_TR'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label} geçerli bir ${type} değil'; diff --git a/components/locale/uk_UA.tsx b/components/locale/uk_UA.tsx index 73a844410..3ef547d56 100644 --- a/components/locale/uk_UA.tsx +++ b/components/locale/uk_UA.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/uk_UA'; import DatePicker from '../date-picker/locale/uk_UA'; import TimePicker from '../time-picker/locale/uk_UA'; import Calendar from '../calendar/locale/uk_UA'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'uk', diff --git a/components/locale/vi_VN.tsx b/components/locale/vi_VN.tsx index 3b6f70442..3bc626aec 100644 --- a/components/locale/vi_VN.tsx +++ b/components/locale/vi_VN.tsx @@ -2,7 +2,7 @@ import Pagination from '../vc-pagination/locale/vi_VN'; import DatePicker from '../date-picker/locale/vi_VN'; import TimePicker from '../time-picker/locale/vi_VN'; import Calendar from '../calendar/locale/vi_VN'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const localeValues: Locale = { locale: 'vi', diff --git a/components/locale/zh_CN.tsx b/components/locale/zh_CN.tsx index 0cdbd9e23..72ae7238e 100644 --- a/components/locale/zh_CN.tsx +++ b/components/locale/zh_CN.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/zh_CN'; import DatePicker from '../date-picker/locale/zh_CN'; import TimePicker from '../time-picker/locale/zh_CN'; import Calendar from '../calendar/locale/zh_CN'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label}不是一个有效的${type}'; diff --git a/components/locale/zh_HK.tsx b/components/locale/zh_HK.tsx index 1bc426c29..3cdc22e11 100644 --- a/components/locale/zh_HK.tsx +++ b/components/locale/zh_HK.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/zh_TW'; import DatePicker from '../date-picker/locale/zh_TW'; import TimePicker from '../time-picker/locale/zh_TW'; import Calendar from '../calendar/locale/zh_TW'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label}不是一個有效的${type}'; diff --git a/components/locale/zh_TW.tsx b/components/locale/zh_TW.tsx index d58b968c4..dfa21765b 100644 --- a/components/locale/zh_TW.tsx +++ b/components/locale/zh_TW.tsx @@ -3,7 +3,7 @@ import Pagination from '../vc-pagination/locale/zh_TW'; import DatePicker from '../date-picker/locale/zh_TW'; import TimePicker from '../time-picker/locale/zh_TW'; import Calendar from '../calendar/locale/zh_TW'; -import { Locale } from '../locale-provider'; +import type { Locale } from '../locale-provider'; const typeTemplate = '${label}不是一個有效的${type}'; diff --git a/components/time-picker/time-picker.tsx b/components/time-picker/time-picker.tsx index dc651324d..63c6e1ac1 100644 --- a/components/time-picker/time-picker.tsx +++ b/components/time-picker/time-picker.tsx @@ -36,14 +36,14 @@ function createTimePicker(generateConfig: GenerateConfig) { order: { type: Boolean, default: true }, }); const { TimePicker: InternalTimePicker, RangePicker: InternalRangePicker } = DatePicker as any; - interface TimeRangePickerProps extends Omit, 'picker'> { + type TimeRangePickerProps = Omit, 'picker'> & { popupClassName?: string; valueFormat?: string; - } - interface TimePickerProps extends Omit, 'picker'> { + }; + type TimePickerProps = Omit, 'picker'> & { popupClassName?: string; valueFormat?: string; - } + }; const TimePicker = defineComponent({ name: 'ATimePicker', inheritAttrs: false, diff --git a/components/vc-picker/Picker.tsx b/components/vc-picker/Picker.tsx index fd951126e..deaac2267 100644 --- a/components/vc-picker/Picker.tsx +++ b/components/vc-picker/Picker.tsx @@ -28,7 +28,7 @@ import usePickerInput from './hooks/usePickerInput'; import useTextValueMapping from './hooks/useTextValueMapping'; import useValueTexts from './hooks/useValueTexts'; import useHoverValue from './hooks/useHoverValue'; -import type { CSSProperties, HtmlHTMLAttributes, Ref } from 'vue'; +import type { CSSProperties, Ref } from 'vue'; import { computed, defineComponent, ref, toRef, watch } from 'vue'; import type { ChangeEvent, FocusEventHandler, MouseEventHandler } from '../_util/EventInterface'; import type { VueNode } from '../_util/type'; @@ -93,7 +93,7 @@ export type PickerSharedProps = { direction?: 'ltr' | 'rtl'; showToday?: boolean; showTime?: boolean | SharedTimeProps; -} & HtmlHTMLAttributes; +}; type OmitPanelProps = Omit< Props, @@ -442,7 +442,9 @@ function Picker() { // Remove `picker` & `format` here since TimePicker is little different with other panel ...(props as Omit, 'picker' | 'format'>), ...attrs, - class: undefined, + class: classNames({ + [`${prefixCls}-panel-focused`]: !typing.value, + }), style: undefined, pickerValue: undefined, onPickerValueChange: undefined, @@ -453,9 +455,6 @@ function Picker() { = { /** @private Internal usage. Do not use in your production env */ components?: Components; -} & Omit; +}; export type PickerPanelBaseProps = { picker: Exclude; diff --git a/components/vc-picker/RangePicker.tsx b/components/vc-picker/RangePicker.tsx index 6f8f2c2dc..8e20bae8d 100644 --- a/components/vc-picker/RangePicker.tsx +++ b/components/vc-picker/RangePicker.tsx @@ -30,7 +30,6 @@ import type { DateRender } from './panels/DatePanel/DateBody'; import useHoverValue from './hooks/useHoverValue'; import type { VueNode } from '../_util/type'; import type { ChangeEvent, FocusEventHandler, MouseEventHandler } from '../_util/EventInterface'; -import type { HTMLAttributes } from 'vue'; import { computed, defineComponent, ref, toRef, watch, watchEffect } from 'vue'; import useMergedState from '../_util/hooks/useMergedState'; import { warning } from '../vc-util/warning'; @@ -114,7 +113,7 @@ export type RangePickerSharedProps = { activePickerIndex?: 0 | 1; dateRender?: RangeDateRender; panelRender?: (originPanel: VueNode) => VueNode; -} & HTMLAttributes; +}; type OmitPickerProps = Omit< Props,