From 425219910a6cd25f715cae8d9b50f98827192245 Mon Sep 17 00:00:00 2001
From: Oliver <1069035666@qq.com>
Date: Mon, 28 Feb 2022 04:38:03 +0000
Subject: [PATCH] =?UTF-8?q?CollapseContainer=20=E7=BB=84=E4=BB=B6=20=20?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=AE=BE=E7=BD=AE=20=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=20=20Description=20title=20?=
 =?UTF-8?q?=E6=8F=92=E6=A7=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Container/src/collapse/CollapseContainer.vue | 16 +++++++++++++++-
 src/components/Container/src/typing.ts           |  1 +
 src/components/Description/src/Description.vue   |  8 +++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/Container/src/collapse/CollapseContainer.vue b/src/components/Container/src/collapse/CollapseContainer.vue
index 06ea41b..1abdf4a 100644
--- a/src/components/Container/src/collapse/CollapseContainer.vue
+++ b/src/components/Container/src/collapse/CollapseContainer.vue
@@ -24,7 +24,7 @@
 </template>
 <script lang="ts" setup>
   import type { PropType } from 'vue';
-  import { ref } from 'vue';
+  import { ref, watch } from 'vue';
   // component
   import { Skeleton } from 'ant-design-vue';
   import { CollapseTransition } from '/@/components/Transition';
@@ -41,6 +41,10 @@
      *  Can it be expanded
      */
     canExpan: { type: Boolean, default: true },
+     /**
+     *  expanded
+     */
+    expand: { type: Boolean, default: true },
     /**
      * Warm reminder on the right side of the title
      */
@@ -63,6 +67,16 @@
 
   const { prefixCls } = useDesign('collapse-container');
 
+  watch(
+    () => props.expand,
+    (newExpand) => {
+      if (show.value != newExpand) {
+        handleExpand();
+      }
+    },
+    { immediate: true },
+  );
+
   /**
    * @description: Handling development events
    */
diff --git a/src/components/Container/src/typing.ts b/src/components/Container/src/typing.ts
index 86c03be..2f2643a 100644
--- a/src/components/Container/src/typing.ts
+++ b/src/components/Container/src/typing.ts
@@ -2,6 +2,7 @@ export type ScrollType = 'default' | 'main';
 
 export interface CollapseContainerOptions {
   canExpand?: boolean;
+  expand?: boolean;
   title?: string;
   helpMessage?: Array<any> | string;
 }
diff --git a/src/components/Description/src/Description.vue b/src/components/Description/src/Description.vue
index 17b8c74..07ce540 100644
--- a/src/components/Description/src/Description.vue
+++ b/src/components/Description/src/Description.vue
@@ -67,7 +67,7 @@
       /**
        * @description: Whether to setting title
        */
-      const useWrapper = computed(() => !!unref(getMergeProps).title);
+      const useWrapper = computed(() => !!unref(getMergeProps).title || !!slots.title);
 
       /**
        * @description: Get configuration Collapse
@@ -76,6 +76,7 @@
         return {
           // Cannot be expanded by default
           canExpand: false,
+          expand: true,
           ...unref(getProps).collapseOptions,
         };
       });
@@ -157,14 +158,15 @@
           return content;
         }
 
-        const { canExpand, helpMessage } = unref(getCollapseOptions);
+        const { canExpand, expand, helpMessage } = unref(getCollapseOptions);
         const { title } = unref(getMergeProps);
 
         return (
-          <CollapseContainer title={title} canExpan={canExpand} helpMessage={helpMessage}>
+          <CollapseContainer title={title} canExpan={canExpand} expand={expand} helpMessage={helpMessage}>
             {{
               default: () => content,
               action: () => getSlot(slots, 'action'),
+              title: () => getSlot(slots, 'title'),
             }}
           </CollapseContainer>
         );
-- 
Gitee