diff --git a/packages/vant/src/action-sheet/types.ts b/packages/vant/src/action-sheet/types.ts index e9250816b..90a516eb3 100644 --- a/packages/vant/src/action-sheet/types.ts +++ b/packages/vant/src/action-sheet/types.ts @@ -4,15 +4,15 @@ export type ActionSheetThemeVars = { actionSheetHeaderFontSize?: string; actionSheetDescriptionColor?: string; actionSheetDescriptionFontSize?: string; - actionSheetDescriptionLineHeight?: string; + actionSheetDescriptionLineHeight?: number | string; actionSheetItemBackground?: string; actionSheetItemFontSize?: string; - actionSheetItemLineHeight?: string; + actionSheetItemLineHeight?: number | string; actionSheetItemTextColor?: string; actionSheetItemDisabledTextColor?: string; actionSheetSubnameColor?: string; actionSheetSubnameFontSize?: string; - actionSheetSubnameLineHeight?: string; + actionSheetSubnameLineHeight?: number | string; actionSheetCloseIconSize?: string; actionSheetCloseIconColor?: string; actionSheetCloseIconPadding?: string; diff --git a/packages/vant/src/address-list/types.ts b/packages/vant/src/address-list/types.ts index 6f12ab89a..d6def0f08 100644 --- a/packages/vant/src/address-list/types.ts +++ b/packages/vant/src/address-list/types.ts @@ -3,13 +3,13 @@ export type AddressListThemeVars = { addressListDisabledTextColor?: string; addressListDisabledTextPadding?: string; addressListDisabledTextFontSize?: string; - addressListDisabledTextLineHeight?: string; - addressListAddButtonZIndex?: string; + addressListDisabledTextLineHeight?: number | string; + addressListAddButtonZIndex?: number | string; addressListItemPadding?: string; addressListItemTextColor?: string; addressListItemDisabledTextColor?: string; addressListItemFontSize?: string; - addressListItemLineHeight?: string; + addressListItemLineHeight?: number | string; addressListRadioColor?: string; addressListEditIconSize?: string; }; diff --git a/packages/vant/src/button/types.ts b/packages/vant/src/button/types.ts index 4273fbb5f..a8184356a 100644 --- a/packages/vant/src/button/types.ts +++ b/packages/vant/src/button/types.ts @@ -24,7 +24,7 @@ export type ButtonThemeVars = { buttonNormalFontSize?: string; buttonLargeHeight?: string; buttonDefaultHeight?: string; - buttonDefaultLineHeight?: string; + buttonDefaultLineHeight?: number | string; buttonDefaultFontSize?: string; buttonDefaultColor?: string; buttonDefaultBackground?: string; @@ -45,7 +45,7 @@ export type ButtonThemeVars = { buttonRadius?: string; buttonRoundRadius?: string; buttonPlainBackground?: string; - buttonDisabledOpacity?: string; + buttonDisabledOpacity?: number | string; buttonIconSize?: string; buttonLoadingIconSize?: string; }; diff --git a/packages/vant/src/calendar/types.ts b/packages/vant/src/calendar/types.ts index befdae252..67433e9e5 100644 --- a/packages/vant/src/calendar/types.ts +++ b/packages/vant/src/calendar/types.ts @@ -67,11 +67,11 @@ export type CalendarThemeVars = { calendarRangeEdgeColor?: string; calendarRangeEdgeBackground?: string; calendarRangeMiddleColor?: string; - calendarRangeMiddleBackgroundOpacity?: string; + calendarRangeMiddleBackgroundOpacity?: number | string; calendarSelectedDaySize?: string; calendarSelectedDayColor?: string; calendarInfoFontSize?: string; - calendarInfoLineHeight?: string; + calendarInfoLineHeight?: number | string; calendarSelectedDayBackground?: string; calendarDayDisabledColor?: string; calendarConfirmButtonHeight?: string; diff --git a/packages/vant/src/card/types.ts b/packages/vant/src/card/types.ts index e57ecc861..9ffae29d8 100644 --- a/packages/vant/src/card/types.ts +++ b/packages/vant/src/card/types.ts @@ -5,9 +5,9 @@ export type CardThemeVars = { cardBackground?: string; cardThumbSize?: string; cardThumbRadius?: string; - cardTitleLineHeight?: string; + cardTitleLineHeight?: number | string; cardDescColor?: string; - cardDescLineHeight?: string; + cardDescLineHeight?: number | string; cardPriceColor?: string; cardOriginPriceColor?: string; cardNumColor?: string; diff --git a/packages/vant/src/cascader/types.ts b/packages/vant/src/cascader/types.ts index 704e0a5c2..ab9ae2a85 100644 --- a/packages/vant/src/cascader/types.ts +++ b/packages/vant/src/cascader/types.ts @@ -26,7 +26,7 @@ export type CascaderThemeVars = { cascaderHeaderHeight?: string; cascaderHeaderPadding?: string; cascaderTitleFontSize?: string; - cascaderTitleLineHeight?: string; + cascaderTitleLineHeight?: number | string; cascaderCloseIconSize?: string; cascaderCloseIconColor?: string; cascaderSelectedIconSize?: string; diff --git a/packages/vant/src/cell-group/types.ts b/packages/vant/src/cell-group/types.ts index 49baf42b6..b5d200007 100644 --- a/packages/vant/src/cell-group/types.ts +++ b/packages/vant/src/cell-group/types.ts @@ -3,7 +3,7 @@ export type CellGroupThemeVars = { cellGroupTitleColor?: string; cellGroupTitlePadding?: string; cellGroupTitleFontSize?: string; - cellGroupTitleLineHeight?: string; + cellGroupTitleLineHeight?: number | string; cellGroupInsetPadding?: string; cellGroupInsetRadius?: string; cellGroupInsetTitlePadding?: string; diff --git a/packages/vant/src/cell/types.ts b/packages/vant/src/cell/types.ts index 175badd5b..5f86392c0 100644 --- a/packages/vant/src/cell/types.ts +++ b/packages/vant/src/cell/types.ts @@ -1,6 +1,6 @@ export type CellThemeVars = { cellFontSize?: string; - cellLineHeight?: string; + cellLineHeight?: number | string; cellVerticalPadding?: string; cellHorizontalPadding?: string; cellTextColor?: string; @@ -10,7 +10,7 @@ export type CellThemeVars = { cellRequiredColor?: string; cellLabelColor?: string; cellLabelFontSize?: string; - cellLabelLineHeight?: string; + cellLabelLineHeight?: number | string; cellLabelMarginTop?: string; cellValueColor?: string; cellIconSize?: string; diff --git a/packages/vant/src/circle/types.ts b/packages/vant/src/circle/types.ts index 8cfeaa20f..eb4ba8951 100644 --- a/packages/vant/src/circle/types.ts +++ b/packages/vant/src/circle/types.ts @@ -5,5 +5,5 @@ export type CircleThemeVars = { circleTextColor?: string; circleTextFontWeight?: string; circleTextFontSize?: string; - circleTextLineHeight?: string; + circleTextLineHeight?: number | string; }; diff --git a/packages/vant/src/collapse-item/types.ts b/packages/vant/src/collapse-item/types.ts index c63278d51..745db298f 100644 --- a/packages/vant/src/collapse-item/types.ts +++ b/packages/vant/src/collapse-item/types.ts @@ -14,7 +14,7 @@ export type CollapseItemThemeVars = { collapseItemDuration?: string; collapseItemContentPadding?: string; collapseItemContentFontSize?: string; - collapseItemContentLineHeight?: string; + collapseItemContentLineHeight?: number | string; collapseItemContentTextColor?: string; collapseItemContentBackground?: string; collapseItemTitleDisabledColor?: string; diff --git a/packages/vant/src/contact-card/types.ts b/packages/vant/src/contact-card/types.ts index 73446265a..c7f32891d 100644 --- a/packages/vant/src/contact-card/types.ts +++ b/packages/vant/src/contact-card/types.ts @@ -2,5 +2,5 @@ export type ContactCardThemeVars = { contactCardPadding?: string; contactCardAddIconSize?: string; contactCardAddIconColor?: string; - contactCardTitleLineHeight?: string; + contactCardTitleLineHeight?: number | string; }; diff --git a/packages/vant/src/contact-list/types.ts b/packages/vant/src/contact-list/types.ts index 50ef39a52..82f6a2a2e 100644 --- a/packages/vant/src/contact-list/types.ts +++ b/packages/vant/src/contact-list/types.ts @@ -1,6 +1,6 @@ export type ContactListThemeVars = { contactListEditIconSize?: string; - contactListAddButtonZIndex?: string; + contactListAddButtonZIndex?: number | string; contactListRadioColor?: string; contactListItemPadding?: string; }; diff --git a/packages/vant/src/count-down/types.ts b/packages/vant/src/count-down/types.ts index a2bc71f77..b1ee3e371 100644 --- a/packages/vant/src/count-down/types.ts +++ b/packages/vant/src/count-down/types.ts @@ -18,5 +18,5 @@ export type CountDownCurrentTime = CurrentTime; export type CountDownThemeVars = { countDownTextColor?: string; countDownFontSize?: string; - countDownLineHeight?: string; + countDownLineHeight?: number | string; }; diff --git a/packages/vant/src/coupon-list/types.ts b/packages/vant/src/coupon-list/types.ts index 9b75f0ff3..2201e0923 100644 --- a/packages/vant/src/coupon-list/types.ts +++ b/packages/vant/src/coupon-list/types.ts @@ -5,5 +5,5 @@ export type CouponListThemeVars = { couponListCloseButtonHeight?: string; couponListEmptyTipColor?: string; couponListEmptyTipFontSize?: string; - couponListEmptyTipLineHeight?: string; + couponListEmptyTipLineHeight?: number | string; }; diff --git a/packages/vant/src/dialog/types.ts b/packages/vant/src/dialog/types.ts index 90310e4d1..31c760aa2 100644 --- a/packages/vant/src/dialog/types.ts +++ b/packages/vant/src/dialog/types.ts @@ -41,12 +41,12 @@ export type DialogThemeVars = { dialogRadius?: string; dialogBackground?: string; dialogHeaderFontWeight?: string; - dialogHeaderLineHeight?: string; + dialogHeaderLineHeight?: number | string; dialogHeaderPaddingTop?: string; dialogHeaderIsolatedPadding?: string; dialogMessagePadding?: string; dialogMessageFontSize?: string; - dialogMessageLineHeight?: string; + dialogMessageLineHeight?: number | string; dialogMessageMaxHeight?: string; dialogHasTitleMessageTextColor?: string; dialogHasTitleMessagePaddingTop?: string; diff --git a/packages/vant/src/divider/types.ts b/packages/vant/src/divider/types.ts index 175d68297..60ca13c57 100644 --- a/packages/vant/src/divider/types.ts +++ b/packages/vant/src/divider/types.ts @@ -2,7 +2,7 @@ export type DividerThemeVars = { dividerMargin?: string; dividerTextColor?: string; dividerFontSize?: string; - dividerLineHeight?: string; + dividerLineHeight?: number | string; dividerBorderColor?: string; dividerContentPadding?: string; dividerContentLeftWidth?: string; diff --git a/packages/vant/src/dropdown-item/types.ts b/packages/vant/src/dropdown-item/types.ts index 458544127..89fd8e1cb 100644 --- a/packages/vant/src/dropdown-item/types.ts +++ b/packages/vant/src/dropdown-item/types.ts @@ -31,5 +31,5 @@ export type DropdownItemInstance = ComponentPublicInstance< >; export type DropdownItemThemeVars = { - dropdownItemZIndex?: string; + dropdownItemZIndex?: number | string; }; diff --git a/packages/vant/src/dropdown-menu/types.ts b/packages/vant/src/dropdown-menu/types.ts index 024322804..2f6a84b76 100644 --- a/packages/vant/src/dropdown-menu/types.ts +++ b/packages/vant/src/dropdown-menu/types.ts @@ -18,7 +18,7 @@ export type DropdownMenuThemeVars = { dropdownMenuTitleActiveTextColor?: string; dropdownMenuTitleDisabledTextColor?: string; dropdownMenuTitlePadding?: string; - dropdownMenuTitleLineHeight?: string; + dropdownMenuTitleLineHeight?: number | string; dropdownMenuOptionActiveColor?: string; dropdownMenuContentMaxHeight?: string; }; diff --git a/packages/vant/src/empty/types.ts b/packages/vant/src/empty/types.ts index 57fd06aac..373868759 100644 --- a/packages/vant/src/empty/types.ts +++ b/packages/vant/src/empty/types.ts @@ -5,6 +5,6 @@ export type EmptyThemeVars = { emptyDescriptionPadding?: string; emptyDescriptionColor?: string; emptyDescriptionFontSize?: string; - emptyDescriptionLineHeight?: string; + emptyDescriptionLineHeight?: number | string; emptyBottomMarginTop?: string; }; diff --git a/packages/vant/src/field/types.ts b/packages/vant/src/field/types.ts index a0d776bb0..d1dab9d44 100644 --- a/packages/vant/src/field/types.ts +++ b/packages/vant/src/field/types.ts @@ -116,7 +116,7 @@ export type FieldThemeVars = { fieldTextAreaMinHeight?: string; fieldWordLimitColor?: string; fieldWordLimitFontSize?: string; - fieldWordLimitLineHeight?: string; + fieldWordLimitLineHeight?: number | string; fieldDisabledTextColor?: string; fieldRequiredMarkColor?: string; }; diff --git a/packages/vant/src/image-preview/types.ts b/packages/vant/src/image-preview/types.ts index 4bd44fef5..fd44ac43a 100644 --- a/packages/vant/src/image-preview/types.ts +++ b/packages/vant/src/image-preview/types.ts @@ -49,11 +49,11 @@ export type ImagePreviewInstance = ComponentPublicInstance< export type ImagePreviewThemeVars = { imagePreviewIndexTextColor?: string; imagePreviewIndexFontSize?: string; - imagePreviewIndexLineHeight?: string; + imagePreviewIndexLineHeight?: number | string; imagePreviewIndexTextShadow?: string; imagePreviewOverlayBackground?: string; imagePreviewCloseIconSize?: string; imagePreviewCloseIconColor?: string; imagePreviewCloseIconMargin?: string; - imagePreviewCloseIconZIndex?: string; + imagePreviewCloseIconZIndex?: number | string; }; diff --git a/packages/vant/src/index-anchor/types.ts b/packages/vant/src/index-anchor/types.ts index b10852a9a..3bceabc84 100644 --- a/packages/vant/src/index-anchor/types.ts +++ b/packages/vant/src/index-anchor/types.ts @@ -1,10 +1,10 @@ export type IndexAnchorThemeVars = { - indexAnchorZIndex?: string; + indexAnchorZIndex?: number | string; indexAnchorPadding?: string; indexAnchorTextColor?: string; indexAnchorFontWeight?: string; indexAnchorFontSize?: string; - indexAnchorLineHeight?: string; + indexAnchorLineHeight?: number | string; indexAnchorBackground?: string; indexAnchorStickyTextColor?: string; indexAnchorStickyBackground?: string; diff --git a/packages/vant/src/index-bar/types.ts b/packages/vant/src/index-bar/types.ts index db716bfd5..b2b75f79e 100644 --- a/packages/vant/src/index-bar/types.ts +++ b/packages/vant/src/index-bar/types.ts @@ -16,8 +16,8 @@ export type IndexBarInstance = ComponentPublicInstance< >; export type IndexBarThemeVars = { - indexBarSidebarZIndex?: string; + indexBarSidebarZIndex?: number | string; indexBarIndexFontSize?: string; - indexBarIndexLineHeight?: string; + indexBarIndexLineHeight?: number | string; indexBarIndexActiveColor?: string; }; diff --git a/packages/vant/src/list/types.ts b/packages/vant/src/list/types.ts index fe44a99d2..905fcbecd 100644 --- a/packages/vant/src/list/types.ts +++ b/packages/vant/src/list/types.ts @@ -12,6 +12,6 @@ export type ListInstance = ComponentPublicInstance; export type ListThemeVars = { listTextColor?: string; listTextFontSize?: string; - listTextLineHeight?: string; + listTextLineHeight?: number | string; listLoadingIconSize?: string; }; diff --git a/packages/vant/src/nav-bar/types.ts b/packages/vant/src/nav-bar/types.ts index f90a6b015..b2d73a016 100644 --- a/packages/vant/src/nav-bar/types.ts +++ b/packages/vant/src/nav-bar/types.ts @@ -6,5 +6,5 @@ export type NavBarThemeVars = { navBarTextColor?: string; navBarTitleFontSize?: string; navBarTitleTextColor?: string; - navBarZIndex?: string; + navBarZIndex?: number | string; }; diff --git a/packages/vant/src/notice-bar/types.ts b/packages/vant/src/notice-bar/types.ts index 9f0ec5565..fa8ef7012 100644 --- a/packages/vant/src/notice-bar/types.ts +++ b/packages/vant/src/notice-bar/types.ts @@ -18,7 +18,7 @@ export type NoticeBarThemeVars = { noticeBarWrapablePadding?: string; noticeBarTextColor?: string; noticeBarFontSize?: string; - noticeBarLineHeight?: string; + noticeBarLineHeight?: number | string; noticeBarBackground?: string; noticeBarIconSize?: string; noticeBarIconMinWidth?: string; diff --git a/packages/vant/src/notify/types.ts b/packages/vant/src/notify/types.ts index 8e38f125e..5f3a17ef9 100644 --- a/packages/vant/src/notify/types.ts +++ b/packages/vant/src/notify/types.ts @@ -24,7 +24,7 @@ export type NotifyThemeVars = { notifyTextColor?: string; notifyPadding?: string; notifyFontSize?: string; - notifyLineHeight?: string; + notifyLineHeight?: number | string; notifyPrimaryBackground?: string; notifySuccessBackground?: string; notifyDangerBackground?: string; diff --git a/packages/vant/src/number-keyboard/types.ts b/packages/vant/src/number-keyboard/types.ts index 36dca7aac..da21338dc 100644 --- a/packages/vant/src/number-keyboard/types.ts +++ b/packages/vant/src/number-keyboard/types.ts @@ -13,5 +13,5 @@ export type NumberKeyboardThemeVars = { numberKeyboardCloseFontSize?: string; numberKeyboardButtonTextColor?: string; numberKeyboardButtonBackground?: string; - numberKeyboardZIndex?: string; + numberKeyboardZIndex?: number | string; }; diff --git a/packages/vant/src/overlay/types.ts b/packages/vant/src/overlay/types.ts index 743a77773..560a59d6c 100644 --- a/packages/vant/src/overlay/types.ts +++ b/packages/vant/src/overlay/types.ts @@ -1,4 +1,4 @@ export type OverlayThemeVars = { - overlayZIndex?: string; + overlayZIndex?: number | string; overlayBackground?: string; }; diff --git a/packages/vant/src/pagination/types.ts b/packages/vant/src/pagination/types.ts index 3cd092dba..a7b24f964 100644 --- a/packages/vant/src/pagination/types.ts +++ b/packages/vant/src/pagination/types.ts @@ -7,5 +7,5 @@ export type PaginationThemeVars = { paginationItemDisabledBackground?: string; paginationBackground?: string; paginationDescColor?: string; - paginationDisabledOpacity?: string; + paginationDisabledOpacity?: number | string; }; diff --git a/packages/vant/src/picker/types.ts b/packages/vant/src/picker/types.ts index 07064424f..a85bd8e9c 100644 --- a/packages/vant/src/picker/types.ts +++ b/packages/vant/src/picker/types.ts @@ -59,7 +59,7 @@ export type PickerThemeVars = { pickerBackground?: string; pickerToolbarHeight?: string; pickerTitleFontSize?: string; - pickerTitleLineHeight?: string; + pickerTitleLineHeight?: number | string; pickerActionPadding?: string; pickerActionFontSize?: string; pickerConfirmActionColor?: string; @@ -67,7 +67,7 @@ export type PickerThemeVars = { pickerOptionFontSize?: string; pickerOptionPadding?: string; pickerOptionTextColor?: string; - pickerOptionDisabledOpacity?: string; + pickerOptionDisabledOpacity?: number | string; pickerLoadingIconColor?: string; pickerLoadingMaskColor?: string; pickerMaskColor?: string; diff --git a/packages/vant/src/popover/types.ts b/packages/vant/src/popover/types.ts index a4c3f1b00..6001e8042 100644 --- a/packages/vant/src/popover/types.ts +++ b/packages/vant/src/popover/types.ts @@ -29,7 +29,7 @@ export type PopoverThemeVars = { popoverActionWidth?: string; popoverActionHeight?: string; popoverActionFontSize?: string; - popoverActionLineHeight?: string; + popoverActionLineHeight?: number | string; popoverActionIconSize?: string; popoverLightTextColor?: string; popoverLightBackground?: string; diff --git a/packages/vant/src/popup/types.ts b/packages/vant/src/popup/types.ts index f29f6c29f..edfbccda2 100644 --- a/packages/vant/src/popup/types.ts +++ b/packages/vant/src/popup/types.ts @@ -22,5 +22,5 @@ export type PopupThemeVars = { popupCloseIconSize?: string; popupCloseIconColor?: string; popupCloseIconMargin?: string; - popupCloseIconZIndex?: string; + popupCloseIconZIndex?: number | string; }; diff --git a/packages/vant/src/progress/types.ts b/packages/vant/src/progress/types.ts index a91792759..4976ed381 100644 --- a/packages/vant/src/progress/types.ts +++ b/packages/vant/src/progress/types.ts @@ -18,6 +18,6 @@ export type ProgressThemeVars = { progressPivotPadding?: string; progressPivotTextColor?: string; progressPivotFontSize?: string; - progressPivotLineHeight?: string; + progressPivotLineHeight?: number | string; progressPivotBackground?: string; }; diff --git a/packages/vant/src/share-sheet/types.ts b/packages/vant/src/share-sheet/types.ts index 8d145caa6..4b04b201d 100644 --- a/packages/vant/src/share-sheet/types.ts +++ b/packages/vant/src/share-sheet/types.ts @@ -2,10 +2,10 @@ export type ShareSheetThemeVars = { shareSheetHeaderPadding?: string; shareSheetTitleColor?: string; shareSheetTitleFontSize?: string; - shareSheetTitleLineHeight?: string; + shareSheetTitleLineHeight?: number | string; shareSheetDescriptionColor?: string; shareSheetDescriptionFontSize?: string; - shareSheetDescriptionLineHeight?: string; + shareSheetDescriptionLineHeight?: number | string; shareSheetIconSize?: string; shareSheetOptionNameColor?: string; shareSheetOptionNameFontSize?: string; diff --git a/packages/vant/src/sidebar-item/types.ts b/packages/vant/src/sidebar-item/types.ts index 6f3e6cbf3..b26a72c4a 100644 --- a/packages/vant/src/sidebar-item/types.ts +++ b/packages/vant/src/sidebar-item/types.ts @@ -1,6 +1,6 @@ export type SidebarItemThemeVars = { sidebarFontSize?: string; - sidebarLineHeight?: string; + sidebarLineHeight?: number | string; sidebarTextColor?: string; sidebarDisabledTextColor?: string; sidebarPadding?: string; diff --git a/packages/vant/src/slider/types.ts b/packages/vant/src/slider/types.ts index 59346755e..98024c4cd 100644 --- a/packages/vant/src/slider/types.ts +++ b/packages/vant/src/slider/types.ts @@ -1,7 +1,7 @@ export type SliderThemeVars = { sliderActiveBackground?: string; sliderInactiveBackground?: string; - sliderDisabledOpacity?: string; + sliderDisabledOpacity?: number | string; sliderBarHeight?: string; sliderButtonWidth?: string; sliderButtonHeight?: string; diff --git a/packages/vant/src/stepper/types.ts b/packages/vant/src/stepper/types.ts index a9301e6f6..fffe4a932 100644 --- a/packages/vant/src/stepper/types.ts +++ b/packages/vant/src/stepper/types.ts @@ -7,7 +7,7 @@ export type StepperThemeVars = { stepperInputWidth?: string; stepperInputHeight?: string; stepperInputFontSize?: string; - stepperInputLineHeight?: string; + stepperInputLineHeight?: number | string; stepperInputTextColor?: string; stepperInputDisabledTextColor?: string; stepperInputDisabledBackground?: string; diff --git a/packages/vant/src/sticky/types.ts b/packages/vant/src/sticky/types.ts index b7f088734..c7e6e4a05 100644 --- a/packages/vant/src/sticky/types.ts +++ b/packages/vant/src/sticky/types.ts @@ -1,3 +1,3 @@ export type StickyThemeVars = { - stickyZIndex?: string; + stickyZIndex?: number | string; }; diff --git a/packages/vant/src/submit-bar/types.ts b/packages/vant/src/submit-bar/types.ts index eed0ee56e..059a37b12 100644 --- a/packages/vant/src/submit-bar/types.ts +++ b/packages/vant/src/submit-bar/types.ts @@ -1,6 +1,6 @@ export type SubmitBarThemeVars = { submitBarHeight?: string; - submitBarZIndex?: string; + submitBarZIndex?: number | string; submitBarBackground?: string; submitBarButtonWidth?: string; submitBarPriceColor?: string; @@ -12,7 +12,7 @@ export type SubmitBarThemeVars = { submitBarTextFontSize?: string; submitBarTipPadding?: string; submitBarTipFontSize?: string; - submitBarTipLineHeight?: string; + submitBarTipLineHeight?: number | string; submitBarTipColor?: string; submitBarTipBackground?: string; submitBarTipIconSize?: string; diff --git a/packages/vant/src/swipe/types.ts b/packages/vant/src/swipe/types.ts index 9e0f14e5a..ca02468f4 100644 --- a/packages/vant/src/swipe/types.ts +++ b/packages/vant/src/swipe/types.ts @@ -35,8 +35,8 @@ export type SwipeInstance = ComponentPublicInstance; export type SwipeThemeVars = { swipeIndicatorSize?: string; swipeIndicatorMargin?: string; - swipeIndicatorActiveOpacity?: string; - swipeIndicatorInactiveOpacity?: string; + swipeIndicatorActiveOpacity?: number | string; + swipeIndicatorInactiveOpacity?: number | string; swipeIndicatorActiveBackground?: string; swipeIndicatorInactiveBackground?: string; }; diff --git a/packages/vant/src/switch/types.ts b/packages/vant/src/switch/types.ts index 1717f3b59..879a04a67 100644 --- a/packages/vant/src/switch/types.ts +++ b/packages/vant/src/switch/types.ts @@ -8,5 +8,5 @@ export type SwitchThemeVars = { switchBackground?: string; switchOnBackground?: string; switchDuration?: string; - switchDisabledOpacity?: string; + switchDisabledOpacity?: number | string; }; diff --git a/packages/vant/src/tabbar-item/types.ts b/packages/vant/src/tabbar-item/types.ts index 742001c5e..66dc15149 100644 --- a/packages/vant/src/tabbar-item/types.ts +++ b/packages/vant/src/tabbar-item/types.ts @@ -3,7 +3,7 @@ export type TabbarItemThemeVars = { tabbarItemTextColor?: string; tabbarItemActiveColor?: string; tabbarItemActiveBackground?: string; - tabbarItemLineHeight?: string; + tabbarItemLineHeight?: number | string; tabbarItemIconSize?: string; tabbarItemIconMarginBottom?: string; }; diff --git a/packages/vant/src/tabbar/types.ts b/packages/vant/src/tabbar/types.ts index 3d8df9ce5..34e6b3de1 100644 --- a/packages/vant/src/tabbar/types.ts +++ b/packages/vant/src/tabbar/types.ts @@ -1,5 +1,5 @@ export type TabbarThemeVars = { tabbarHeight?: string; - tabbarZIndex?: string; + tabbarZIndex?: number | string; tabbarBackground?: string; }; diff --git a/packages/vant/src/tabs/types.ts b/packages/vant/src/tabs/types.ts index 0332db16c..7f0e7e25e 100644 --- a/packages/vant/src/tabs/types.ts +++ b/packages/vant/src/tabs/types.ts @@ -32,9 +32,9 @@ export type TabsThemeVars = { tabActiveTextColor?: string; tabDisabledTextColor?: string; tabFontSize?: string; - tabLineHeight?: string; + tabLineHeight?: number | string; tabsDefaultColor?: string; - tabsLineHeight?: string; + tabsLineHeight?: number | string; tabsCardHeight?: string; tabsNavBackground?: string; tabsBottomBarWidth?: string; diff --git a/packages/vant/src/tag/types.ts b/packages/vant/src/tag/types.ts index 73a51a37a..49c7bc927 100644 --- a/packages/vant/src/tag/types.ts +++ b/packages/vant/src/tag/types.ts @@ -7,7 +7,7 @@ export type TagThemeVars = { tagTextColor?: string; tagFontSize?: string; tagRadius?: string; - tagLineHeight?: string; + tagLineHeight?: number | string; tagMediumPadding?: string; tagLargePadding?: string; tagLargeRadius?: string; diff --git a/packages/vant/src/toast/types.ts b/packages/vant/src/toast/types.ts index 97e9e19d6..603e64d35 100644 --- a/packages/vant/src/toast/types.ts +++ b/packages/vant/src/toast/types.ts @@ -44,7 +44,7 @@ export type ToastThemeVars = { toastFontSize?: string; toastTextColor?: string; toastLoadingIconColor?: string; - toastLineHeight?: string; + toastLineHeight?: number | string; toastRadius?: string; toastBackground?: string; toastIconSize?: string; diff --git a/packages/vant/src/uploader/types.ts b/packages/vant/src/uploader/types.ts index 01e9aea16..d4eb51a75 100644 --- a/packages/vant/src/uploader/types.ts +++ b/packages/vant/src/uploader/types.ts @@ -68,8 +68,8 @@ export type UploaderThemeVars = { uploaderMaskBackground?: string; uploaderMaskIconSize?: string; uploaderMaskMessageFontSize?: string; - uploaderMaskMessageLineHeight?: string; + uploaderMaskMessageLineHeight?: number | string; uploaderLoadingIconSize?: string; uploaderLoadingIconColor?: string; - uploaderDisabledOpacity?: string; + uploaderDisabledOpacity?: number | string; };