chore(button, divider): add withDefault (#2900)

jdf2e · Jan 30, 2024 · 759f9b3 · 759f9b3
1 parent 2f641f0
commit 759f9b3
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 114 deletions.
diff --git a/src/packages/__VUE/button/button.taro.vue b/src/packages/__VUE/button/button.taro.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, CSSProperties, toRefs, computed } from 'vue';
+import { CSSProperties, toRefs, computed } from 'vue';
 import { Loading } from '@nutui/icons-vue-taro';
 import Taro from '@tarojs/taro';
 import type { ButtonShape, ButtonType, ButtonSize, ButtonFormType } from './types';
@@ -26,43 +26,28 @@ defineOptions({
   name: 'NutButton'
 });
 
-const props = defineProps({
-  color: {
-    type: String,
-    default: ''
-  },
-  shape: {
-    type: String as PropType<ButtonShape>,
-    default: 'round'
-  },
-  plain: {
-    type: Boolean,
-    default: false
-  },
-  loading: {
-    type: Boolean,
-    default: false
-  },
-  disabled: {
-    type: Boolean,
-    default: false
-  },
-  type: {
-    type: String as PropType<ButtonType>,
-    default: 'default'
-  },
-  formType: {
-    type: String as PropType<ButtonFormType>,
-    default: 'button'
-  },
-  size: {
-    type: String as PropType<ButtonSize>,
-    default: 'normal'
-  },
-  block: {
-    type: Boolean,
-    default: false
-  }
+export type ButtonProps = Partial<{
+  color: string;
+  shape: ButtonShape;
+  plain: boolean;
+  loading: boolean;
+  disabled: boolean;
+  type: ButtonType;
+  size: ButtonSize;
+  block: boolean;
+  formType: ButtonFormType;
+}>;
+
+const props = withDefaults(defineProps<ButtonProps>(), {
+  color: '',
+  shape: 'round',
+  plain: false,
+  loading: false,
+  disabled: false,
+  type: 'default',
+  size: 'normal',
+  block: false,
+  formType: 'button'
 });
 
 const emit = defineEmits(['click']);

diff --git a/src/packages/__VUE/button/button.vue b/src/packages/__VUE/button/button.vue
@@ -11,47 +11,34 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, CSSProperties, toRefs, computed } from 'vue';
+import { CSSProperties, toRefs, computed } from 'vue';
 import type { ButtonShape, ButtonType, ButtonSize } from './types';
 import { Loading } from '@nutui/icons-vue';
 
 defineOptions({
   name: 'NutButton'
 });
 
-const props = defineProps({
-  color: {
-    type: String,
-    default: ''
-  },
-  shape: {
-    type: String as PropType<ButtonShape>,
-    default: 'round'
-  },
-  plain: {
-    type: Boolean,
-    default: false
-  },
-  loading: {
-    type: Boolean,
-    default: false
-  },
-  disabled: {
-    type: Boolean,
-    default: false
-  },
-  type: {
-    type: String as PropType<ButtonType>,
-    default: 'default'
-  },
-  size: {
-    type: String as PropType<ButtonSize>,
-    default: 'normal'
-  },
-  block: {
-    type: Boolean,
-    default: false
-  }
+export type ButtonProps = Partial<{
+  color: string;
+  shape: ButtonShape;
+  plain: boolean;
+  loading: boolean;
+  disabled: boolean;
+  type: ButtonType;
+  size: ButtonSize;
+  block: boolean;
+}>;
+
+const props = withDefaults(defineProps<ButtonProps>(), {
+  color: '',
+  shape: 'round',
+  plain: false,
+  loading: false,
+  disabled: false,
+  type: 'default',
+  size: 'normal',
+  block: false
 });
 
 const emit = defineEmits(['click']);

diff --git a/src/packages/__VUE/button/doc.en-US.md b/src/packages/__VUE/button/doc.en-US.md
@@ -92,7 +92,7 @@ The color of the button can be customized through the color property.
 | --- | --- | --- |
 | click | Emitted when component is clicked | `event: MouseEvent` |
 
-### Types v4.2.9
+### Types v4.3.0
 
 The component exports the following type definitions:
 
@@ -102,6 +102,7 @@ import type {
   ButtonSize,
   ButtonShape,
   ButtonFormType,
+  ButtonProps,
   ButtonInstance
 } from '@nutui/nutui';
 ```

diff --git a/src/packages/__VUE/button/doc.md b/src/packages/__VUE/button/doc.md
@@ -92,7 +92,7 @@ app.use(Button);
 | --- | --- | --- |
 | click | 点击按钮时触发 | `event: MouseEvent` |
 
-### 类型定义 v4.2.9
+### 类型定义 v4.3.0
 
 组件导出以下类型定义：
 
@@ -102,6 +102,7 @@ import type {
   ButtonSize,
   ButtonShape,
   ButtonFormType,
+  ButtonProps,
   ButtonInstance
 } from '@nutui/nutui';
 ```

diff --git a/src/packages/__VUE/button/doc.taro.md b/src/packages/__VUE/button/doc.taro.md
@@ -93,7 +93,7 @@ app.use(Button);
 | --- | --- | --- |
 | click | 点击按钮时触发 | `event: MouseEvent` |
 
-### 类型定义 v4.2.9
+### 类型定义 v4.3.0
 
 组件导出以下类型定义：
 
@@ -103,6 +103,7 @@ import type {
   ButtonSize,
   ButtonShape,
   ButtonFormType,
+  ButtonProps,
   ButtonInstance
 } from '@nutui/nutui-taro';
 ```

diff --git a/src/packages/__VUE/button/index.taro.ts b/src/packages/__VUE/button/index.taro.ts
@@ -4,6 +4,8 @@ import { withInstall } from '@/packages/utils';
 
 withInstall(Button);
 
+export type { ButtonProps } from './button.taro.vue';
+
 export type { ButtonType, ButtonSize, ButtonShape, ButtonFormType } from './types';
 
 export type ButtonInstance = ComponentPublicInstance & InstanceType<typeof Button>;

diff --git a/src/packages/__VUE/button/index.ts b/src/packages/__VUE/button/index.ts
@@ -4,6 +4,8 @@ import { withInstall } from '@/packages/utils';
 
 withInstall(Button);
 
+export type { ButtonProps } from './button.vue';
+
 export type { ButtonType, ButtonSize, ButtonShape, ButtonFormType } from './types';
 
 export type ButtonInstance = ComponentPublicInstance & InstanceType<typeof Button>;

diff --git a/src/packages/__VUE/divider/divider.taro.vue b/src/packages/__VUE/divider/divider.taro.vue
@@ -4,30 +4,25 @@
   </view>
 </template>
 <script setup lang="ts">
-import { PropType, computed } from 'vue';
+import { computed } from 'vue';
 import { DividerDirection, DividerPosition } from './types';
 
 defineOptions({
   name: 'NutDivider'
 });
 
-const props = defineProps({
-  contentPosition: {
-    type: String as PropType<DividerPosition>,
-    default: 'center'
-  },
-  dashed: {
-    type: Boolean,
-    default: false
-  },
-  hairline: {
-    type: Boolean,
-    default: true
-  },
-  direction: {
-    type: String as PropType<DividerDirection>,
-    default: 'horizontal'
-  }
+export type DividerProps = Partial<{
+  contentPosition: DividerPosition;
+  dashed: boolean;
+  hairline: boolean;
+  direction: DividerDirection;
+}>;
+
+const props = withDefaults(defineProps<DividerProps>(), {
+  contentPosition: 'center',
+  dashed: false,
+  hairline: true,
+  direction: 'horizontal'
 });
 
 const slots = defineSlots();

diff --git a/src/packages/__VUE/divider/divider.vue b/src/packages/__VUE/divider/divider.vue
@@ -4,30 +4,25 @@
   </view>
 </template>
 <script setup lang="ts">
-import { PropType, computed } from 'vue';
+import { computed } from 'vue';
 import { DividerDirection, DividerPosition } from './types';
 
 defineOptions({
   name: 'NutDivider'
 });
 
-const props = defineProps({
-  contentPosition: {
-    type: String as PropType<DividerPosition>,
-    default: 'center'
-  },
-  dashed: {
-    type: Boolean,
-    default: false
-  },
-  hairline: {
-    type: Boolean,
-    default: true
-  },
-  direction: {
-    type: String as PropType<DividerDirection>,
-    default: 'horizontal'
-  }
+export type DividerProps = Partial<{
+  contentPosition: DividerPosition;
+  dashed: boolean;
+  hairline: boolean;
+  direction: DividerDirection;
+}>;
+
+const props = withDefaults(defineProps<DividerProps>(), {
+  contentPosition: 'center',
+  dashed: false,
+  hairline: true,
+  direction: 'horizontal'
 });
 
 const slots = defineSlots();

diff --git a/src/packages/__VUE/divider/doc.en-US.md b/src/packages/__VUE/divider/doc.en-US.md
@@ -65,14 +65,15 @@ User can custom divider style with style attribute.
 | --- | --- |
 | default | Default slot, when `direction` = `horizontal` |
 
-### Types v4.2.9
+### Types v4.3.0
 
 The component exports the following type definitions:
 
 ```js
 import type {
   DividerPosition,
   DividerDirection,
+  DividerProps,
   DividerInstance
 } from '@nutui/nutui';
 ```

diff --git a/src/packages/__VUE/divider/doc.md b/src/packages/__VUE/divider/doc.md
@@ -65,14 +65,15 @@ app.use(Divider);
 | --- | --- |
 | default | 内容，仅在 `direction` 为 `horizontal` 时生效 |
 
-### 类型定义 v4.2.9
+### 类型定义 v4.3.0
 
 组件导出以下类型定义：
 
 ```js
 import type {
   DividerPosition,
   DividerDirection,
+  DividerProps,
   DividerInstance
 } from '@nutui/nutui';
 ```

diff --git a/src/packages/__VUE/divider/doc.taro.md b/src/packages/__VUE/divider/doc.taro.md
@@ -65,14 +65,15 @@ app.use(Divider);
 | --- | --- |
 | default | 内容，仅在 `direction` 为 `horizontal` 时生效 |
 
-### 类型定义 v4.2.9
+### 类型定义 v4.3.0
 
 组件导出以下类型定义：
 
 ```js
 import type {
   DividerPosition,
   DividerDirection,
+  DividerProps,
   DividerInstance
 } from '@nutui/nutui-taro';
 ```

diff --git a/src/packages/__VUE/divider/index.taro.ts b/src/packages/__VUE/divider/index.taro.ts
@@ -4,6 +4,8 @@ import { withInstall } from '@/packages/utils';
 
 withInstall(Divider);
 
+export type { DividerProps } from './divider.taro.vue';
+
 export type { DividerPosition, DividerDirection } from './types';
 
 export type DividerInstance = ComponentPublicInstance & InstanceType<typeof Divider>;

diff --git a/src/packages/__VUE/divider/index.ts b/src/packages/__VUE/divider/index.ts
@@ -4,6 +4,8 @@ import { withInstall } from '@/packages/utils';
 
 withInstall(Divider);
 
+export type { DividerProps } from './divider.vue';
+
 export type { DividerPosition, DividerDirection } from './types';
 
 export type DividerInstance = ComponentPublicInstance & InstanceType<typeof Divider>;