Merge branch 'develop' into 20231105_fix_upload_drag_accept

Tencent · Nov 5, 2023 · b76d842 · b76d842
2 parents 0f73607 + a93f68d
commit b76d842
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 19 deletions.
diff --git a/style/mobile/components/image-viewer/v2/_index.less b/style/mobile/components/image-viewer/v2/_index.less
@@ -30,6 +30,7 @@
     top: 50%;
     transform: translateY(-50%);
     z-index: 1005;
+    border-radius: 0;
   }
 
   &__swiper-item {

diff --git a/style/web/components/menu/_index.less b/style/web/components/menu/_index.less
@@ -60,7 +60,6 @@ a.@{prefix}-menu__item {
     flex: 1;
     display: flex;
     align-items: center;
-    // overflow: auto hidden;
   }
 
   .@{prefix}-menu__operations {
@@ -136,6 +135,12 @@ a.@{prefix}-menu__item {
   &.@{prefix}-is-collapsed {
     width: @default-menu-collapse-width;
 
+    .@{prefix}-menu__logo {
+      & > * {
+        margin-left: @comp-margin-l;
+      }
+    }
+
     .@{prefix}-menu {
       .@{prefix}-menu__item {
         padding: 0 14px;
@@ -202,6 +207,18 @@ a.@{prefix}-menu__item {
       }
     }
 
+    .@{prefix}-menu-group {
+      &:first-child {
+        .@{prefix}-menu-group__title {
+          display: none;
+
+          & + * {
+            margin-top: 0;
+          }
+        }
+      }
+    }
+
     .@{prefix}-menu-group__title {
       padding: 0;
       font-size: 0;
@@ -249,7 +266,6 @@ a.@{prefix}-menu__item {
     .@{prefix}-menu {
       padding: @comp-paddingTB-l @comp-paddingLR-s;
       position: relative;
-      // overflow: hidden auto;
       flex: 1;
 
       &--scroll {
@@ -258,6 +274,20 @@ a.@{prefix}-menu__item {
         overflow-y: auto;
         overflow-x: hidden;
       }
+
+      & > *:not(.@{prefix}-menu-group) {
+        &:not(:first-child) {
+          margin-top: @comp-margin-xs;
+        }
+      }
+
+      .@{prefix}-menu-group,
+      .@{prefix}-menu__sub,
+      .@{prefix}-submenu {
+        & > *:not(:first-child) {
+          margin-top: @comp-margin-xs;
+        }
+      }
     }
 
     .@{prefix}-menu-group {
@@ -273,7 +303,6 @@ a.@{prefix}-menu__item {
   }
 
   .@{prefix}-submenu {
-    margin-bottom: @comp-margin-xs;
     position: relative;
   }
 
@@ -301,7 +330,6 @@ a.@{prefix}-menu__item {
 
   .@{prefix}-menu__item {
     &.@{prefix}-is-opened {
-      margin: @comp-margin-xs 0;
       color: @menu-color-light;
       background-color: unset;
 
@@ -328,7 +356,6 @@ a.@{prefix}-menu__item {
 
   .@{prefix}-menu__item {
     position: relative;
-    margin: @comp-margin-xs 0;
     padding: 0 10px 0 16px;
     height: @default-menu-item-height;
     line-height: @default-menu-item-height;
@@ -339,14 +366,6 @@ a.@{prefix}-menu__item {
       padding @anim-duration-slow @anim-time-fn-easing;
     box-sizing: border-box;
 
-    &:first-child {
-      margin-top: 0;
-    }
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-
     .t-icon {
       width: 20px;
       height: 20px;
@@ -759,10 +778,8 @@ a.@{prefix}-menu__item {
 
   .@{prefix}-menu__item,
   .@{prefix}-submenu {
-    margin: @comp-margin-xxs 0 0 0;
-
-    &:first-child {
-      margin-top: 0;
+    &:not(:first-child) {
+      margin-top: @comp-margin-xxs;
     }
   }
 }

diff --git a/style/web/components/radio/_index.less b/style/web/components/radio/_index.less
@@ -59,6 +59,10 @@
         border-radius: 0 @border-radius-default @border-radius-default 0;
       }
 
+      &:only-child {
+        border-radius: @border-radius-default;
+      }
+
       &.@{prefix}-is-checked {
         color: @radio-button-color-outline-checked;
       }

diff --git a/style/web/components/tabs/_index.less b/style/web/components/tabs/_index.less
@@ -352,3 +352,9 @@
     position: relative;
   }
 }
+
+.@{prefix}-tab-panel {
+  &.@{prefix}-is-hidden {
+    display: none;
+  }
+}
diff --git a/style/web/components/tag-input/_index.less b/style/web/components/tag-input/_index.less
@@ -27,7 +27,7 @@
     .t-input-suffix-icon(@comp-margin-s);
 
     &.@{prefix}-size-s {
-      padding: 0 @comp-paddingLR-xxs 0 @comp-margin-xs;
+      padding: 0 @comp-paddingLR-s 0 @comp-margin-xs;
       min-height: @tag-input-height-s;
       .@{prefix}-tag {
         margin: 1px @comp-margin-xs 1px 0;
@@ -36,7 +36,7 @@
 
     &.@{prefix}-size-l {
       min-height: @tag-input-height-l;
-      padding-right: @comp-paddingLR-m;
+      padding: 0 @comp-paddingLR-m 0 @comp-margin-s;
       .t-input-suffix-icon(@comp-margin-m);
     }
   }