fix(Container): fix overflow style (#568)

ant-design · Feb 9, 2023 · bb7da18 · bb7da18
1 parent edc567c
commit bb7da18
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/src/Container/ContainerHeader/index.axml b/src/Container/ContainerHeader/index.axml
@@ -1,4 +1,4 @@
-<view class="ant-container-header {{ headerInBox ? 'ant-container-headerInBox' : '' }}">
+<view class="ant-container-header {{ headerInBox ? 'ant-container-header-headerInBox' : '' }}">
     <view class="ant-container-header-title">
       <slot name="title">{{title}}</slot>
     </view>

diff --git a/src/Container/ContainerHeader/index.less b/src/Container/ContainerHeader/index.less
@@ -32,15 +32,14 @@
     .@{containerPrefix}-header-title:empty+.@{containerPrefix}-header-right:not(:empty){
       flex: 1;
     }
-  }
-
-  &-headerInBox {
-    background-color: @container-background-color;
-    padding: 0 @container-spacing;
-    .@{containerPrefix}-header-title,
-    .@{containerPrefix}-header-right{
-      position: relative;
-      .hairline('bottom');
+    &-headerInBox {
+      padding: 0 @container-spacing;
+      .@{containerPrefix}-header-title,
+      .@{containerPrefix}-header-right{
+        position: relative;
+        .hairline('bottom');
+      }
     }
   }
+
 }
diff --git a/src/Container/index.axml b/src/Container/index.axml
@@ -1,9 +1,9 @@
-<view class="ant-container {{className ? className : ''}}" style="{{style}}">
+<view class="ant-container {{ headerInBox ? 'ant-container-headerInBox' : 'ant-container-headerNotInBox' }} {{className ? className : ''}}" style="{{style}}">
   <header title="{{title}}" headerInBox="{{headerInBox}}">
     <slot name="headerRight"></slot>
     <slot name="title" slot="title"></slot>
   </header>
-  <view class="ant-container-content {{ headerInBox ? 'ant-container-content-withHalfRadius' : 'ant-container-content-withRadius' }}">
+  <view class="ant-container-content">
     <slot />
   </view>
 </view>
diff --git a/src/Container/index.less b/src/Container/index.less
@@ -6,17 +6,12 @@
 .@{containerPrefix} {
   border-radius: @container-radius;
   margin-bottom: 24 * @rpx;
-  overflow: hidden;
+  &-headerInBox {
+    background-color: @container-background-color;
+  }
   &-content {
     padding: @container-spacing;
     background-color: @container-background-color;
-
-    &-withRadius {
-      border-radius: @container-radius;
-    }
-
-    &-withHalfRadius {
-      border-radius: 0 0 @container-radius @container-radius;
-    }
+    border-radius: @container-radius;
   }
 }