From 2e4314385fd4cc4d1736893262cc7df26129cb8a Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Fri, 22 Dec 2023 16:31:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]TsContain=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=8C=E5=B1=82=E5=B5=8C=E5=A5=97=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98=20=20-?=
 =?UTF-8?q?=20[=E5=85=B3=E8=81=94]#[1051256934596608]TsContain=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=8C=E5=B1=82=E5=B5=8C=E5=A5=97=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/?=
 =?UTF-8?q?939050947543042/1051256934596608?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/components/TsContain/TsContain.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/resources/components/TsContain/TsContain.vue b/src/resources/components/TsContain/TsContain.vue
index a2581846..47d7dcfb 100644
--- a/src/resources/components/TsContain/TsContain.vue
+++ b/src/resources/components/TsContain/TsContain.vue
@@ -46,7 +46,8 @@
       :style="handleBodyHeight"
       @scroll.stop="scroll"
     >
-      <Layout style="height:100%">
+      <slot v-if="!$slots.sider && !$slots.right" name="content"></slot>
+      <Layout v-else style="height:100%">
         <Sider
           v-if="$slots.sider"
           v-model="siderHide"
@@ -200,7 +201,7 @@ export default {
         let contain = this.$refs.contain;
         let rect = contain?.getBoundingClientRect();
         if (rect && rect.top) {
-          this.containHeight = `calc(100vh - ${rect.top.toFixed(0)}px - 16px)`; // 减去底部的16
+          this.containHeight = this.containHeight = this.mode == 'window' ? `calc(100vh - ${rect.top.toFixed(0)}px - 16px)` : '100%'; // 底部间隙16; // 减去底部的16
         }
       });
     }
-- 
Gitee


From 7551ab4e51f91435d20228f5507eb680e9150716 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Fri, 22 Dec 2023 16:35:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/components/TsContain/TsContain.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/components/TsContain/TsContain.vue b/src/resources/components/TsContain/TsContain.vue
index 47d7dcfb..c4b7d147 100644
--- a/src/resources/components/TsContain/TsContain.vue
+++ b/src/resources/components/TsContain/TsContain.vue
@@ -201,7 +201,7 @@ export default {
         let contain = this.$refs.contain;
         let rect = contain?.getBoundingClientRect();
         if (rect && rect.top) {
-          this.containHeight = this.containHeight = this.mode == 'window' ? `calc(100vh - ${rect.top.toFixed(0)}px - 16px)` : '100%'; // 底部间隙16; // 减去底部的16
+          this.containHeight = this.containHeight = this.mode == 'window' ? `calc(100vh - ${rect.top.toFixed(0)}px - 16px)` : '100%'; // 减去底部间隙16
         }
       });
     }
-- 
Gitee