Merge branch 'v4' into split-radio

jdf2e · Dec 15, 2023 · b1f6848 · b1f6848
2 parents 57ed81e + ee96fa9
commit b1f6848
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 22 deletions.
diff --git a/src/packages/__VUE/radio/index.scss b/src/packages/__VUE/radio/index.scss
@@ -24,6 +24,7 @@
   display: flex;
   align-items: center;
   flex-shrink: 0;
+  cursor: pointer;
 
   &:last-child {
     margin-bottom: 0 !important;

diff --git a/src/packages/__VUE/radio/index.taro.vue b/src/packages/__VUE/radio/index.taro.vue
@@ -4,7 +4,7 @@ import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('radio');
 import { CheckNormal, CheckChecked } from '@nutui/icons-vue-taro';
 import { pxCheck } from '@/packages/utils/pxCheck';
-import { RADIO_KEY, RadioButtonSize } from './types';
+import { RADIO_KEY, RadioShape, RadioButtonSize } from './types';
 
 export default create({
   components: {
@@ -17,8 +17,8 @@ export default create({
       default: false
     },
     shape: {
-      type: String,
-      default: 'round' // button
+      type: String as PropType<RadioShape>,
+      default: 'round'
     },
     label: {
       type: [String, Number, Boolean],

diff --git a/src/packages/__VUE/radio/index.vue b/src/packages/__VUE/radio/index.vue
@@ -4,7 +4,7 @@ import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('radio');
 import { CheckNormal, CheckChecked } from '@nutui/icons-vue';
 import { pxCheck } from '@/packages/utils/pxCheck';
-import { RADIO_KEY, RadioButtonSize } from './types';
+import { RADIO_KEY, RadioShape, RadioButtonSize } from './types';
 
 export default create({
   components: {
@@ -17,8 +17,8 @@ export default create({
       default: false
     },
     shape: {
-      type: String,
-      default: 'round' // button
+      type: String as PropType<RadioShape>,
+      default: 'round'
     },
     label: {
       type: [String, Number, Boolean],

diff --git a/src/packages/__VUE/radio/types.ts b/src/packages/__VUE/radio/types.ts
@@ -1,2 +1,9 @@
 export const RADIO_KEY = Symbol('nut-radio');
-export type RadioButtonSize = 'large' | 'normal' | 'small' | 'mini';
+
+// Radio
+export type RadioShape = 'round' | 'button';
+export type RadioButtonSize = 'normal' | 'small' | 'mini';
+
+// RadioGroup
+export type RadioGroupTextPosition = 'right' | 'left';
+export type RadioGroupDirection = 'vertical' | 'horizontal';
diff --git a/src/packages/__VUE/radiogroup/index.scss b/src/packages/__VUE/radiogroup/index.scss
@@ -3,8 +3,6 @@
   .nut-radio {
     margin-bottom: 5px;
   }
-  &--vertical {
-  }
   &--horizontal {
     .nut-radio {
       display: inline-flex;
@@ -14,9 +12,6 @@
           margin: 0 6px;
         }
       }
-      &--button {
-        // ...
-      }
     }
   }
 }
diff --git a/src/packages/__VUE/radiogroup/index.taro.vue b/src/packages/__VUE/radiogroup/index.taro.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
-import { h, provide, computed, readonly, watch } from 'vue';
+import { h, provide, computed, readonly, watch, PropType } from 'vue';
 import { createComponent } from '@/packages/utils/create';
-import { RADIO_KEY } from '../radio/types';
+import { RADIO_KEY, RadioGroupTextPosition, RadioGroupDirection } from '../radio/types';
 const { componentName, create } = createComponent('radio-group');
 
 export default create({
@@ -11,11 +11,11 @@ export default create({
       default: ''
     },
     direction: {
-      type: String,
-      default: 'vertical' //horizontal
+      type: String as PropType<RadioGroupDirection>,
+      default: 'vertical'
     },
     textPosition: {
-      type: String,
+      type: String as PropType<RadioGroupTextPosition>,
       default: 'right'
     }
   },

diff --git a/src/packages/__VUE/radiogroup/index.vue b/src/packages/__VUE/radiogroup/index.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
-import { h, provide, computed, readonly, watch } from 'vue';
+import { h, provide, computed, readonly, watch, PropType } from 'vue';
 import { createComponent } from '@/packages/utils/create';
-import { RADIO_KEY } from '../radio/types';
+import { RADIO_KEY, RadioGroupTextPosition, RadioGroupDirection } from '../radio/types';
 const { componentName, create } = createComponent('radio-group');
 
 export default create({
@@ -11,11 +11,11 @@ export default create({
       default: ''
     },
     direction: {
-      type: String,
-      default: 'vertical' //horizontal
+      type: String as PropType<RadioGroupDirection>,
+      default: 'vertical'
     },
     textPosition: {
-      type: String,
+      type: String as PropType<RadioGroupTextPosition>,
       default: 'right'
     }
   },