From 6936adb2c2af3c0bfbd238be1d61933601ff2b88 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Tue, 3 Nov 2020 23:31:32 +0800
Subject: [PATCH] fix(form): fix the form item setting  not taking effect

---
 CHANGELOG.zh_CN.md                   | 1 +
 src/components/Form/src/FormItem.tsx | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 996a4701..444ed800 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -17,6 +17,7 @@
 - 修复升级之后 table 类型问题
 - 修复分割菜单且左侧菜单没有数据时候，继续展示上一次子菜单的问题
 - 修复`useMessage`类型问题
+- 修复表单项设置`disabled`不生效问题
 
 ## 2.0.0-rc.8 (2020-11-2)
 
diff --git a/src/components/Form/src/FormItem.tsx b/src/components/Form/src/FormItem.tsx
index b2dc5c8d..3a37de09 100644
--- a/src/components/Form/src/FormItem.tsx
+++ b/src/components/Form/src/FormItem.tsx
@@ -56,8 +56,9 @@ export default defineComponent({
 
     const getDisableRef = computed(() => {
       const { disabled: globDisabled } = props.formProps;
-      const { dynamicDisabled } = props.schema;
-      let disabled = !!globDisabled;
+      const { dynamicDisabled, componentProps = {} } = props.schema;
+      const { disabled: itemDisabled = false } = componentProps;
+      let disabled = !!globDisabled || itemDisabled;
       if (isBoolean(dynamicDisabled)) {
         disabled = dynamicDisabled;
       }
-- 
GitLab