refactor: CFormRadio, CSwitch: change radio checked prop mechanism

Author: woothu

src/components/Form/CFormCheckbox.vue

@@ -75,8 +75,8 @@ export default {
   watch: {
     checked: {
       immediate: true,
-      handler () {
-        this.state = this.getCheckState()
+      handler (val) {
+        this.state = val
       }
     }
   },
@@ -124,19 +124,10 @@ export default {
     // }
   },
   methods: {
-    getCheckState () {
-      return this.checked
-    },
-
     onChange (e) {
       this.state = e.target.checked
-      this.$emit('update:checked', this.getValue(e), e)
-    },
-
-    getValue (e) {
-      return e.target.checked
+      this.$emit('update:checked', e.target.checked, e)
     }
-
   },
 }
 </script>

src/components/Form/CFormRadio.vue

@@ -1,18 +1,9 @@
 <script>
 import CFormCheckbox from './CFormCheckbox'
-import { formRadioProps as props } from './formProps'
 
 export default {
   name: 'CFormRadio',
-  extends: Object.assign({}, CFormCheckbox, { props }),
-  type: 'radio',
-  methods: {
-    getCheckState () {
-      return this.checked === this.value
-    },
-    getValue () {
-      return this.value
-    }
-  }
+  extends: CFormCheckbox,
+  type: 'radio'
 }
 </script>

src/components/Form/formProps.js

@@ -75,9 +75,9 @@ export const formSelectProps = Object.assign(
 })
 
 // Html props: id, disabled, required
-export const formRadioProps = Object.assign(
+export const formCheckboxProps = Object.assign(
   {}, formGroupAlwaysSharedProps, universalProps, {
-  checked: [Boolean, String, Number],
+  checked: Boolean,
   value: {
     type: [String, Number, Boolean],
     default: undefined
@@ -86,8 +86,3 @@ export const formRadioProps = Object.assign(
   inline: Boolean
 })
 
-// Html props: id, disabled, required
-export const formCheckboxProps = Object.assign(
-  {}, formRadioProps, {
-  checked: Boolean
-})

src/components/Switch/CSwitch.vue

@@ -57,8 +57,8 @@ export default {
   watch: {
     checked: {
       immediate: true,
-      handler () {
-        this.state = this.getCheckState()
+      handler (val) {
+        this.state = val
       }
     }
   },
@@ -78,19 +78,9 @@ export default {
     }
   },
   methods: {
-    getCheckState () {
-      if (this.type === 'radio') {
-        return this.checked === this.value
-      } else {
-        return this.checked
-      }
-    },
-    onChange (event) {
-      this.state = event.target.checked
-      this.$emit('update:checked', this.getValue(event.target.checked), event)
-    },
-    getValue (checked) {
-      return this.type === 'radio' ? this.value : checked
+    onChange (e) {
+      this.state = e.target.checked
+      this.$emit('update:checked', e.target.checked, e)
     }
   }
 }