fix: 🐛 修复部分可为null的props丢失null类型的问题

Author: xuqingkai

package.json

@@ -130,8 +130,7 @@
     "ios >= 9"
   ],
   "lint-staged": {
-    "*.{js,ts,vue}": "eslint --fix --ext .js,.vue,.ts src",
-    "*.{ts,vue}": "vue-tsc --noEmit"
+    "*.{js,ts,vue}": "eslint --fix --ext .js,.vue,.ts src"
   },
   "uni-app": {
     "scripts": {

src/uni_modules/wot-design-uni/components/common/util.ts

@@ -416,8 +416,8 @@ export function objToStyle(styles: Record<string, any> | Record<string, any>[]):
   return ''
 }
 
-export const requestAnimationFrame = (cb = () => void 0) => {
-  return new Promise((resolve, reject) => {
+export const requestAnimationFrame = (cb = () => {}) => {
+  return new Promise((resolve) => {
     const timer = setInterval(() => {
       clearInterval(timer)
       resolve(true)

src/uni_modules/wot-design-uni/components/wd-badge/types.ts

@@ -1,14 +1,14 @@
 /*
  * @Author: weisheng
  * @Date: 2024-03-15 11:36:12
- * @LastEditTime: 2024-03-18 13:19:32
+ * @LastEditTime: 2024-03-19 16:33:12
  * @LastEditors: weisheng
  * @Description:
  * @FilePath: \wot-design-uni\src\uni_modules\wot-design-uni\components\wd-badge\types.ts
  * 记得注释
  */
-import type { ExtractPropTypes } from 'vue'
-import { baseProps, makeBooleanProp, makeNumericProp, makeStringProp } from '../common/props'
+import type { ExtractPropTypes, PropType } from 'vue'
+import { baseProps, makeBooleanProp, makeStringProp } from '../common/props'
 
 export type BadgeType = 'primary' | 'success' | 'warning' | 'danger' | 'info'
 
@@ -17,7 +17,10 @@ export const badgeProps = {
   /**
    * 显示值
    */
-  modelValue: makeNumericProp(null),
+  modelValue: {
+    type: [Number, String, null] as PropType<number | string | null>,
+    default: null
+  },
   /** 当数值为 0 时，是否展示徽标 */
   showZero: makeBooleanProp(false),
   bgColor: String,

src/uni_modules/wot-design-uni/components/wd-calendar-view/yearPanel/year-panel.vue

@@ -66,7 +66,7 @@ onMounted(() => {
   scrollIntoView()
 })
 
-const requestAnimationFrame = (cb = () => void 0) => {
+const requestAnimationFrame = (cb = () => {}) => {
   return new Promise((resolve, reject) => {
     uni
       .createSelectorQuery()

src/uni_modules/wot-design-uni/components/wd-checkbox/types.ts

@@ -1,5 +1,5 @@
-import type { ExtractPropTypes } from 'vue'
-import { baseProps, makeBooleanProp, makeStringProp } from '../common/props'
+import type { ExtractPropTypes, PropType } from 'vue'
+import { baseProps, makeStringProp } from '../common/props'
 
 export type CheckShape = 'circle' | 'square' | 'button'
 
@@ -26,7 +26,10 @@ export const checkboxProps = {
   /**
    * 禁用
    */
-  disabled: makeBooleanProp(null),
+  disabled: {
+    type: [Boolean, null] as PropType<boolean | null>,
+    default: null
+  },
   /**
    * 选中值，在 checkbox-group 中使用无效，需同 false-value 一块使用
    */

src/uni_modules/wot-design-uni/components/wd-sidebar-item/types.ts

@@ -1,5 +1,5 @@
-import type { ExtractPropTypes, PropType } from 'vue'
-import { baseProps, makeBooleanProp, makeNumberProp, makeNumericProp, makeRequiredProp } from '../common/props'
+import type { ExtractPropTypes, Prop, PropType } from 'vue'
+import { baseProps, makeBooleanProp, makeNumberProp, makeRequiredProp } from '../common/props'
 import type { BadgeProps } from '../wd-badge/types'
 
 export const sidebarItemProps = {
@@ -9,7 +9,10 @@ export const sidebarItemProps = {
   /** 当前选项的值，唯一标识 */
   value: makeRequiredProp([Number, String]),
   /** 徽标显示值 */
-  badge: makeNumericProp(null),
+  badge: {
+    type: [String, Number, null] as PropType<string | number | null>,
+    default: null
+  },
   /** 徽标属性，透传给 Badge 组件 */
   badgeProps: Object as PropType<Partial<BadgeProps>>,
   /** 图标 */

src/uni_modules/wot-design-uni/components/wd-tabbar-item/types.ts

@@ -1,5 +1,5 @@
 import type { ExtractPropTypes, PropType } from 'vue'
-import { baseProps, makeNumberProp, makeNumericProp, numericProp } from '../common/props'
+import { baseProps, makeNumberProp, numericProp } from '../common/props'
 import type { BadgeProps } from '../wd-badge/types'
 
 /**
@@ -27,7 +27,10 @@ export const tabbarItemProps = {
   /**
    * 徽标显示值
    */
-  value: makeNumericProp(null),
+  value: {
+    type: [Number, String, null] as PropType<number | string | null>,
+    default: null
+  },
   /**
    * 是否点状徽标
    */