Browse Source

fix: table scss remove simple format token

DaiQiangReal 3 years ago
parent
commit
edcfb7538e

+ 2 - 2
packages/semi-foundation/table/mixin.scss

@@ -1,5 +1,5 @@
 @mixin genResizing() {
-    border-right: $border-table_resizer;
+    border-right: $width-table_resizer_border solid $color-table_resizer-bg-default;
 
     .react-resizable-handle {
 
@@ -7,4 +7,4 @@
             background-color: unset;
         }
     }
-}
+}

+ 8 - 8
packages/semi-foundation/table/rtl.scss

@@ -19,7 +19,7 @@ $module: #{$prefix}-table;
 
                             &.resizing {
                                 // rtl override mixin
-                                border-left: $border-table_resizer;
+                                border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                             }
                         }
 
@@ -28,7 +28,7 @@ $module: #{$prefix}-table;
                             border-right: 1px solid $color-table_shadow-border-default;
 
                             &.resizing {
-                                border-left: $border-table_resizer;
+                                border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                             }
 
                             &[x-type="column-scrollbar"] {
@@ -40,7 +40,7 @@ $module: #{$prefix}-table;
                 }
 
                 .resizing {
-                    border-left: $border-table_resizer;
+                    border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                 }
 
                 .react-resizable-handle {
@@ -57,7 +57,7 @@ $module: #{$prefix}-table;
 
                     &.resizing {
                         border-right: 0;
-                        border-left: $border-table_resizer;
+                        border-left: $width-table_resizer_border solid $color-table_resizer-bg-default;
                     }
                 }
 
@@ -112,17 +112,17 @@ $module: #{$prefix}-table;
         &-bordered {
             .#{$module}-container {
                 border-left: 0;
-                border-right: $border-table;
+                border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             .#{$module}-thead > .#{$module}-row > .#{$module}-row-head,
             .#{$module}-tbody > .#{$module}-row > .#{$module}-row-cell {
                 border-right: 0;
-                border-left: $border-table;
+                border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             .#{$module}-placeholder {
-                border-left: $border-table;
+                border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 border-right: 0;
             }
 
@@ -130,7 +130,7 @@ $module: #{$prefix}-table;
 
                 &::-webkit-scrollbar {
                     border-right: 0;
-                    border-left: $border-table;
+                    border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 }
             }
         }

+ 16 - 16
packages/semi-foundation/table/table.scss

@@ -60,7 +60,7 @@ $module: #{$prefix}-table;
 
         &::-webkit-scrollbar {
             background-color: transparent;
-            border-bottom: $border-table_head-bottom;
+            border-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default;
         }
         scrollbar-base-color: transparent;
     }
@@ -91,7 +91,7 @@ $module: #{$prefix}-table;
                 color: $color-table_th-text-default;
                 font-weight: $font-weight-bold;
                 text-align: left;
-                border-bottom: $border-table_head-bottom;
+                border-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default;
                 padding-left: $spacing-table_row_head-paddingX;
                 padding-right: $spacing-table_row_head-paddingX;
                 padding-top: $spacing-table_row_head-paddingY;
@@ -223,14 +223,14 @@ $module: #{$prefix}-table;
                 word-break: break-all;
                 border-left: none;
                 border-right: none;
-                border-bottom: $border-table;
+                border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
                 padding: $spacing-table_tbody_rowCell-padding;
                 box-sizing: border-box;
                 position: relative;
                 vertical-align: middle;
 
                 &.resizing {
-                    border-right: $border-table_resizer;
+                    border-right: $width-table_resizer_border solid $color-table_resizer-bg-default;
                 }
             }
             &.#{$module}-row {
@@ -276,7 +276,7 @@ $module: #{$prefix}-table;
 
             & > .#{$module}-row-cell {
                 background-color: $color-table_selection-bg-default;
-                border-bottom: $border-table;
+                border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
 
             & > .#{$module}-row-cell:not(.#{$module}-column-selection) {
@@ -431,27 +431,27 @@ $module: #{$prefix}-table;
         .#{$module}-title {
             padding-left: $spacing-table_bordered_titler-paddingLeft;
             padding-right: $spacing-table_bordered_titler-paddingRight;
-            border-top: $border-table;
-            border-right: $border-table;
-            border-left: $border-table;
+            border-top: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-container {
-            border: $border-table;
+            border: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             border-right: 0;
             border-bottom: 0;
         }
 
         .#{$module}-header {
             &::-webkit-scrollbar {
-                border-right: $border-table;
+                border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
             }
         }
 
         .#{$module}-footer {
-            border-left: $border-table;
-            border-right: $border-table;
-            border-bottom: $border-table;
+            border-left: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
+            border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-thead > .#{$module}-row > .#{$module}-row-head {
@@ -462,11 +462,11 @@ $module: #{$prefix}-table;
 
         .#{$module}-thead > .#{$module}-row > .#{$module}-row-head,
         .#{$module}-tbody > .#{$module}-row > .#{$module}-row-cell {
-            border-right: $border-table;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
 
         .#{$module}-placeholder {
-            border-right: $border-table;
+            border-right: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         }
     }
 
@@ -478,7 +478,7 @@ $module: #{$prefix}-table;
         font-size: #{$font-table_base-fontSize};
         text-align: center;
         background: $color-table_pl-bg-default;
-        border-bottom: $border-table;
+        border-bottom: $width-table_base_border $border-table_base-borderStyle $color-table-border-default;
         border-radius: 0 0 #{$radius-table_base} #{$radius-table_base};
     }
 

+ 0 - 3
packages/semi-foundation/table/variables.scss

@@ -80,9 +80,6 @@ $font-table_base-fontSize: 14px; // 表格默认文本字号
 $border-table_base-borderStyle: solid; // 表格描边样式
 $shadow-table_left: -3px 0 0 0 $color-table_shadow-bg-default; // 表格滚动阴影 - 左侧
 $shadow-table_right: 3px 0 0 0 $color-table_shadow-bg-default; // 表格滚动阴影 - 右侧
-$border-table: $width-table_base_border $border-table_base-borderStyle $color-table-border-default; // 表格默认描边
-$border-table_head-bottom: $width-table_header_border $border-table_base-borderStyle $color-table_th-border-default; // 表头单元格描边 - 底部
-$border-table_resizer: $width-table_resizer_border solid $color-table_resizer-bg-default; // 表格拉伸标识描边
 
 $z-table-fixed: 101!default; // fixed列的zIndex值
 $z-table_fixed_column: $z-table-fixed; // fixed列的zIndex值