feat(segmented-controll): make prop fontSize accept both number and s…

…tring
b2nil · Dec 14, 2020 · c40d35a · c40d35a
1 parent b6b426f
commit c40d35a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/components/segmented-control/index.ts b/src/components/segmented-control/index.ts
@@ -23,8 +23,11 @@ const AtSegmentedControl = defineComponent({
       default: '#6190E8'
     },
     fontSize: {
-      type: Number,
-      default: 28
+      type: [Number, String],
+      default: 28,
+      validator: (prop: number | string) => {
+        return typeof parseInt(`${prop}`) === 'number'
+      }
     },
     disabled: {
       type: Boolean,
@@ -42,7 +45,7 @@ const AtSegmentedControl = defineComponent({
     },
   },
 
-  setup(props: AtSegmentedControlProps, { attrs, slots }) {
+  setup(props: AtSegmentedControlProps, { attrs }) {
 
     const rootClass = computed(() => ({
       'at-segmented-control': true,
@@ -60,14 +63,14 @@ const AtSegmentedControl = defineComponent({
 
     const itemStyle = computed(() => ({
       color: props.selectedColor,
-      fontSize: pxTransform(props.fontSize!),
+      fontSize: pxTransform(parseInt(`${props.fontSize!}`)),
       borderColor: props.selectedColor,
       backgroundColor: props.color
     }))
 
     const selectedItemStyle = computed(() => ({
       color: props.color,
-      fontSize: pxTransform(props.fontSize!),
+      fontSize: pxTransform(parseInt(`${props.fontSize!}`)),
       borderColor: props.selectedColor,
       backgroundColor: props.selectedColor
     }))

diff --git a/types/segmented-control.d.ts b/types/segmented-control.d.ts
@@ -20,10 +20,10 @@ export interface AtSegmentedControlProps extends AtComponent {
    */
   selectedColor?: string
   /**
-   * 字体大小，单位 h5 为 rem，小程序为 rem
+   * 字体大小，单位 h5 为 rem，小程序为 rpx
    * @default 28
    */
-  fontSize?: number
+  fontSize?: number | string
   /**
    * 是否禁止点击
    * @default false