From c05a5438b69723c4056dcc83ae282a4fbcb5b16c Mon Sep 17 00:00:00 2001
From: Oliver <1069035666@qq.com>
Date: Mon, 28 Feb 2022 03:26:54 +0000
Subject: [PATCH] =?UTF-8?q?CollapeContainer=20=E5=8F=AF=E4=BB=A5=20?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=20=E6=94=B9=E5=8F=98=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/Container/src/collapse/CollapseContainer.vue b/src/components/Container/src/collapse/CollapseContainer.vue
index 06ea41b..72ae416 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';
@@ -37,6 +37,7 @@
   const props = defineProps({
     title: { type: String, default: '' },
     loading: { type: Boolean },
+    expand: { type: Boolean, default: true },
     /**
      *  Can it be expanded
      */
@@ -63,6 +64,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/Description/src/Description.vue b/src/components/Description/src/Description.vue
index 17b8c74..fa7c1d7 100644
--- a/src/components/Description/src/Description.vue
+++ b/src/components/Description/src/Description.vue
@@ -14,6 +14,7 @@
 
   const props = {
     useCollapse: { type: Boolean, default: true },
+    expand: { type: Boolean, default: true },
     title: { type: String, default: '' },
     size: {
       type: String,
@@ -158,10 +159,10 @@
         }
 
         const { canExpand, helpMessage } = unref(getCollapseOptions);
-        const { title } = unref(getMergeProps);
+        const { title, expand } = unref(getMergeProps);
 
         return (
-          <CollapseContainer title={title} canExpan={canExpand} helpMessage={helpMessage}>
+          <CollapseContainer expand={expand} title={title} canExpan={canExpand} helpMessage={helpMessage}>
             {{
               default: () => content,
               action: () => getSlot(slots, 'action'),
diff --git a/src/components/Description/src/typing.ts b/src/components/Description/src/typing.ts
index ee96084..60a691a 100644
--- a/src/components/Description/src/typing.ts
+++ b/src/components/Description/src/typing.ts
@@ -19,6 +19,7 @@ export interface DescItem {
 }
 
 export interface DescriptionProps extends DescriptionsProps {
+  expand?: boolean;
   // Whether to include the collapse component
   useCollapse?: boolean;
   /**
-- 
Gitee