feat(Container): 无title、headerRight时隐藏header

ant-design · Feb 8, 2023 · 97b24a2 · 97b24a2
1 parent 5e8a141
commit 97b24a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/demo/pages/Container/index.axml b/demo/pages/Container/index.axml
@@ -1,28 +1,28 @@
 <!-- 标题在容器内 -->
-<container title="标题" style="margin: 20px 0;">
+<container title="标题">
   <view class="content">
   </view>
 </container>
 
 
 <!-- 标题在容器外 -->
 
-<container headerInBox="{{false}}" style="margin-bottom: 40px;">
+<container headerInBox="{{false}}">
   <view slot="title">
     <view class="icon">
       <icon type="SmileOutline" style="margin-right: 8px;" />
       标题
     </view>
   </view>
-  <view slot="headerRight">右部内容</view>
+  <view slot="headerRight">右侧内容</view>
   <view class="content">
   </view>
 </container>
 
 
 <!-- 容器内多个盒子 -->
 <container title="标题">
-  <view slot="headerRight">右部内容</view>
+  <view slot="headerRight">右侧内容</view>
   <view class="content">
     <view class="box">
     </view>
@@ -37,10 +37,10 @@
 <container>
   <view class="content">
   </view>
-  <view slot="headerRight">右部内容</view>
+  <view slot="headerRight">右侧内容</view>
 </container>
 
-<!-- 不含标题 -->
+<!-- 不含标题、右侧内容 -->
 <container>
   <view class="content">
   </view>

diff --git a/src/Container/ContainerHeader/index.less b/src/Container/ContainerHeader/index.less
@@ -24,10 +24,14 @@
       display: flex;
       align-items: center;
       height: 96 * @rpx;
+      justify-content: flex-end;
       &:empty {
         display: none;
       }
     }
+    .@{containerPrefix}-header-title:empty+.@{containerPrefix}-header-right:not(:empty){
+      flex: 1;
+    }
   }
 
   &-headerInBox {
@@ -38,9 +42,5 @@
       position: relative;
       .hairline('bottom');
     }
-    .@{containerPrefix}-header-title:empty+.@{containerPrefix}-header-right:not(:empty){
-      flex: 1;
-      justify-content: flex-end;
-    }
   }
 }