Merge branch 'develop' into feature/anchor-child-level

docs/web/api/cascader.md

@@ -66,12 +66,18 @@ spline: form
 
 {{ value-mode }}
 
-### 自定义选项内容
+### 自定义下拉选项内容
 
-可以自定义选项的内容展示
+可以自定义下拉选项的内容展示
 
 {{ custom-options }}
 
+### 自定义选中项内容
+
+可以自定义输入框中显示的选中项内容展示
+
+{{ value-display }}
+
 ### 不同的触发方式
 
 可通过不同的触发方式来加载子菜单。

style/mobile/components/textarea/v2/_index.less

@@ -77,5 +77,10 @@
 
   &--disabled {
     color: @textarea-disabled-text-color;
+    cursor: not-allowed;
+  }
+
+  &--readonly {
+    cursor: pointer;
   }
 }

style/web/components/breadcrumb/_index.less

@@ -14,6 +14,10 @@
     margin: @breadcrumb-separator-margin;
     display: flex;
     align-items: center;
+
+    .t-icon {
+      color: @breadcrumb-icon-color-current;
+    }
   }
 
   &__item {

style/web/components/list/_index.less

@@ -10,11 +10,15 @@
 
 @import "../../mixins/_reset.less";
 
+@import "../../mixins/_scrollbar.less";
+
 .@{prefix}-list {
   .reset;
+  .scrollbar();
 
   overflow: auto;
   color: @list-font-color;
+  background: @list-bg-color-default;
 
   &__inner {
     .list-style-none();
@@ -23,7 +27,6 @@
   &-item {
     font: @list-item-font;
     padding: @list-item-spacer-default;
-    background: @list-bg-color-default;
     display: flex;
     justify-content: space-between;
     align-items: center;

style/web/components/menu/_docs.less

@@ -78,26 +78,11 @@
   }
 }
 
-.t-menu__logo {
-  & > * {
-    margin-left: 24px;
-  }
-}
-
-.t-is-collapsed {
-  .t-menu__logo {
-    & > * {
-      margin: 0 auto;
-    }
-  }
-}
-
 .@{d-prefix}-demo-item--menu {
   --bg-color-demo: var(--bg-color-demo-secondary);
 }
 
 .@{d-prefix}-demo-item--menu-multiple {
-
   .@{d-prefix}-demo-item__body {
     overflow: unset;
   }
@@ -144,7 +129,6 @@
 
 :root[theme-mode="dark"] {
   .tdesign-demo-item--menu {
-
     .@{d-prefix}-demo-item__body {
       background-color: transparent;
     }

style/web/components/menu/_index.less

@@ -22,6 +22,12 @@ a.@{prefix}-menu__item {
   }
 }
 
+.@{prefix}-menu__logo {
+  & > * {
+    margin-left: @comp-margin-xxl;
+  }
+}
+
 // head-menu
 .@{prefix}-head-menu {
   .reset;
@@ -134,6 +140,7 @@ a.@{prefix}-menu__item {
       .@{prefix}-menu__item {
         padding: 0 14px;
         justify-content: center;
+
         .@{prefix}-menu__item-link {
           opacity: 0;
           content: "";
@@ -219,6 +226,12 @@ a.@{prefix}-menu__item {
         display: block;
       }
     }
+
+    .@{prefix}-menu__log {
+      & > * {
+        margin: 0 auto;
+      }
+    }
   }
 
   &__inner {
@@ -250,7 +263,8 @@ a.@{prefix}-menu__item {
     .@{prefix}-menu-group {
       &__title {
         position: relative;
-        padding: @comp-paddingTB-l @comp-paddingLR-l @comp-paddingTB-xs @comp-paddingLR-l;
+        padding: @comp-paddingTB-l @comp-paddingLR-l @comp-paddingTB-xs
+          @comp-paddingLR-l;
         color: @menu-menu-group-title-color;
         font-size: @menu-extra-font-size;
         box-sizing: border-box;
@@ -401,7 +415,6 @@ a.@{prefix}-menu__item {
       }
 
       .@{prefix}-menu__item {
-
         &.@{prefix}-is-active.@{prefix}-is-opened {
           background-color: @default-menu-active-color--dark;
           color: @menu-item-active-color--dark;
@@ -556,7 +569,9 @@ a.@{prefix}-menu__item {
       color: @menu-item-active-color--light;
     }
 
-    &:hover:not(.@{prefix}-is-active):not(.@{prefix}-is-opened):not(.@{prefix}-is-disabled) {
+    &:hover:not(.@{prefix}-is-active):not(.@{prefix}-is-opened):not(
+    .@{prefix}-is-disabled
+  ) {
       background-color: @menu-item-hover-bg--light;
     }
 
@@ -604,7 +619,9 @@ a.@{prefix}-menu__item {
         color: @menu-item-disabled-color-dark;
       }
 
-      &:hover:not(.@{prefix}-is-active):not(.@{prefix}-is-opened):not(.@{prefix}-is-disabled) {
+      &:hover:not(.@{prefix}-is-active):not(.@{prefix}-is-opened):not(
+      .@{prefix}-is-disabled
+    ) {
         background-color: @menu-item-hover-bg--dark;
       }
 
@@ -740,7 +757,8 @@ a.@{prefix}-menu__item {
   top: 0;
   left: calc(100% - @pop-padding-m);
 
-  .@{prefix}-menu__item, .@{prefix}-submenu {
+  .@{prefix}-menu__item,
+  .@{prefix}-submenu {
     margin: @comp-margin-xxs 0 0 0;
 
     &:first-child {
@@ -751,7 +769,9 @@ a.@{prefix}-menu__item {
 
 .@{prefix}-is-head-menu {
   .@{prefix}-menu__popup {
-    margin-top: calc((@menu-height-default - @head-menu-item-height) / 2) !important;
+    margin-top: calc(
+      (@menu-height-default - @head-menu-item-height) / 2
+    ) !important;
   }
 }
 

style/web/components/select/_index.less

@@ -258,3 +258,11 @@
     }
   }
 }
+
+.@{prefix}-is-selected.@{prefix}-select-option__hover {
+  background-color: @brand-color-light-hover;
+
+  .@{prefix}-checkbox__label {
+    color: @select-selected-color;
+  }
+}

style/web/components/table/_index.less

@@ -463,11 +463,6 @@
     color: @table-row-disabled-color;
   }
 
-  /** 表格行点击高亮 */
-  .@{prefix}-table__row--active {
-    background-color: @brand-color-light;
-  }
-
   // 复杂表头容器
   .@{prefix}-table__cell--title {
     display: flex;
@@ -500,15 +495,20 @@
 }
 
 /** 表格行点击高亮悬浮态 */
-.@{prefix}-table.@{prefix}-table--hoverable {
-  .@{prefix}-table__row--active {
-    &:hover {
-      background-color: @brand-color-light-hover;
-    }
+.@{prefix}-table.@{prefix}-table__row--active-single,
+.@{prefix}-table.@{prefix}-table__row--active-multiple {
+  tbody > tr.@{prefix}-table__row--active {
+    background-color: @brand-color-light;
   }
 
-  &.@{prefix}-table__row--active-multiple {
-    .@{prefix}-table__row--active.@{prefix}-table__row--hover {
+  tbody > tr.@{prefix}-table__row--active.@{prefix}-table__row--hover {
+    background-color: @brand-color-light-hover;
+  }
+}
+
+.@{prefix}-table.@{prefix}-table--hoverable {
+  tbody > tr.@{prefix}-table__row--active {
+    &:hover {
       background-color: @brand-color-light-hover;
     }
   }
@@ -520,7 +520,7 @@
   &.@{prefix}-table--row-select,
   &.@{prefix}-table__row--active-multiple {
     tbody > tr {
-      &.@{prefix}-table__row--hover:not(&.@{prefix}-table__row--active) {
+      &.@{prefix}-table__row--hover {
         background-color: @table-highlight-dark-bg-color;
       }
     }