From c8ef82b2c11c9938f0f7a7f6a1a10010b82979dc Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Wed, 18 Nov 2020 00:06:44 +0800
Subject: [PATCH] fix(form): fix baseColProps not work

---
 CHANGELOG.zh_CN.md                           | 2 ++
 src/components/Form/src/FormItem.tsx         | 6 +++++-
 src/components/Form/src/hooks/useAdvanced.ts | 9 +++++++--
 src/components/Table/src/BasicTable.vue      | 2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 8427647b..36b19d22 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -17,6 +17,8 @@
 
 - 修复表单 inputNumber 校验错误
 - 修复表单默认值设置错误
+- 修复菜单折叠按钮隐藏时占位问题
+- 修复表单 baseColProps 不生效
 
 ## 2.0.0-rc.10 (2020-11-13)
 
diff --git a/src/components/Form/src/FormItem.tsx b/src/components/Form/src/FormItem.tsx
index b5862ffe..e6ecdfc0 100644
--- a/src/components/Form/src/FormItem.tsx
+++ b/src/components/Form/src/FormItem.tsx
@@ -91,7 +91,11 @@ export default defineComponent({
     function getShow() {
       const { show, ifShow } = props.schema;
       const { showAdvancedButton } = props.formProps;
-      const itemIsAdvanced = showAdvancedButton ? !!props.schema.isAdvanced : true;
+      const itemIsAdvanced = showAdvancedButton
+        ? isBoolean(props.schema.isAdvanced)
+          ? props.schema.isAdvanced
+          : true
+        : true;
       let isShow = true;
       let isIfShow = true;
 
diff --git a/src/components/Form/src/hooks/useAdvanced.ts b/src/components/Form/src/hooks/useAdvanced.ts
index d43d9bcd..7e46bfcf 100644
--- a/src/components/Form/src/hooks/useAdvanced.ts
+++ b/src/components/Form/src/hooks/useAdvanced.ts
@@ -132,6 +132,8 @@ export default function ({
   function updateAdvanced() {
     let itemColSum = 0;
     let realItemColSum = 0;
+    const { baseColProps = {} } = unref(getProps);
+
     for (const schema of unref(getSchema)) {
       const { show, colProps } = schema;
       let isShow = true;
@@ -152,8 +154,11 @@ export default function ({
         });
       }
 
-      if (isShow && colProps) {
-        const { itemColSum: sum, isAdvanced } = getAdvanced(colProps, itemColSum);
+      if (isShow && (colProps || baseColProps)) {
+        const { itemColSum: sum, isAdvanced } = getAdvanced(
+          { ...baseColProps, ...colProps },
+          itemColSum
+        );
 
         itemColSum = sum || 0;
         if (isAdvanced) {
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index e7673660..9cd904b8 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -8,9 +8,9 @@
     }"
   >
     <BasicForm
+      :submitOnReset="true"
       v-bind="getFormProps"
       v-if="getBindValues.useSearchForm"
-      :submitOnReset="true"
       :submitButtonOptions="{ loading }"
       :tableAction="tableAction"
       @register="registerForm"