fix: Radio.vue and RadioButton.vue get elForm disabled attribute error

Detailed description see: #317
hug-sun · Nov 6, 2020 · ae29201 · ae29201
1 parent e778c71
commit ae29201
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/packages/radio-button/RadioButton.vue b/packages/radio-button/RadioButton.vue
@@ -90,7 +90,7 @@ export default {
 }
 
 function useInject() {
-  const elForm = inject('elFrom', {})
+  const elForm = inject('elForm', {})
   const elFormItem = inject('elFormItem', {})
   return {
     elForm,
@@ -139,11 +139,10 @@ function useModel({ radioGroup }) {
 
 function useStyle({ radioGroup, disabled, value, label, elForm, elFormItem }) {
   const { ctx } = getCurrentInstance()
-  const elFormDisable = (elForm.props || {}).disabled
-  const elFormItemSize = (elFormItem.ctx || {}).elFormItemSize
+  const elFormDisable = elForm.disabled
 
   const size = computed(() => {
-    const temRadioSize = elFormItemSize || (ctx.$ELEMENT || {}).size
+    const temRadioSize = elFormItem.elFormItemSize || (ctx.$ELEMENT || {}).size
     return radioGroup.ctx.radioGroupSize || temRadioSize
   })
   const isDisabled = computed(() => {

diff --git a/packages/radio/Radio.vue b/packages/radio/Radio.vue
@@ -110,7 +110,7 @@ export default {
 }
 
 function useInject() {
-  const elForm = inject('elFrom', {})
+  const elForm = inject('elForm', {})
   const elFormItem = inject('elFormItem', {})
   return {
     elForm,
@@ -173,7 +173,7 @@ function useStyle({
   elFormItem
 }) {
   const { ctx } = getCurrentInstance()
-  const elFormDisable = (elForm.props || {}).disabled
+  const elFormDisable = elForm.disabled
   const radioSize = computed(() => {
     const temRadioSize =
       unref(size) || elFormItem.elFormItemSize || (ctx.$ELEMENT || {}).size