bkui-vue 2.0.1-beta.15.table.3 → 2.0.1-beta.15.table.4

package/lib/table/table.less

@@ -15,7 +15,6 @@
   width: 100%;
   height: 100%;
   overflow: hidden;
-  border-collapse: separate;
   border-spacing: 0;
 
   &-flex {
@@ -37,7 +36,6 @@
   .@{bk-prefix}-table-body {
     position: relative;
     overflow: hidden;
-    // border-bottom: 1px solid @table-border-color;
 
     .prepend-row {
       transform: translateX(var(--prepend-left));
@@ -100,7 +98,8 @@
 
     table {
       width: 100%;
-      border-collapse: collapse;
+      border-collapse: separate;
+
       transform: translateZ(0);
       table-layout: fixed;
       align-self: flex-start;
@@ -228,18 +227,6 @@
             }
           }
 
-          &.column_fixed {
-            &::after {
-              position: absolute;
-              content: '';
-              right: -2px;
-              top: 0;
-              bottom: 0;
-              width: 2px;
-              background-color: @table-head-bg-color;
-            }
-          }
-
           .cell {
             display: flex;
             align-items: center;
@@ -251,12 +238,6 @@
           &:hover {
             cursor: pointer;
             background: @table-row-active-bg-color;
-
-            &.column_fixed {
-              &::after {
-                background-color: @table-row-hover-bg-color;
-              }
-            }
           }
 
           &.column_fixed {
@@ -290,18 +271,6 @@
                 cursor: move;
               }
             }
-
-            &.column_fixed {
-              &::after {
-                position: absolute;
-                content: '';
-                right: -2px;
-                top: 0;
-                bottom: 0;
-                width: 2px;
-                background-color: @table-bg-color;
-              }
-            }
           }
 
           &:hover {
@@ -311,12 +280,6 @@
                   background: @table-row-hover-bg-color;
                   border-right-color: @table-row-hover-bg-color;
                 }
-
-                &.column_fixed {
-                  &::after {
-                    background-color: @table-row-hover-bg-color;
-                  }
-                }
               }
             }
           }
@@ -434,13 +397,8 @@
 
   &.bordered-col {
     th {
-      border-right: 1px solid @table-border-color;
+      border-right: 1px solid var(--background-color);
 
-      &.column_fixed {
-        &::after {
-          border-left: solid 1px @table-border-color;
-        }
-      }
       &:last-child {
         border-right: none;
       }
@@ -451,12 +409,6 @@
         tr {
           td {
             border-right-color: @table-border-color;
-
-            &.column_fixed {
-              &::after {
-                border-left: solid 1px @table-border-color;
-              }
-            }
           }
         }
       }

package/lib/table/table.variable.css

@@ -1595,7 +1595,6 @@
   width: 100%;
   height: 100%;
   overflow: hidden;
-  border-collapse: separate;
   border-spacing: 0;
 }
 .bk-table-flex {
@@ -1658,7 +1657,7 @@
 .bk-table .bk-table-head table,
 .bk-table .bk-table-body table {
   width: 100%;
-  border-collapse: collapse;
+  border-collapse: separate;
   transform: translateZ(0);
   table-layout: fixed;
   align-self: flex-start;
@@ -1805,16 +1804,6 @@
   content: '';
   transform: translateX(50%);
 }
-.bk-table .bk-table-head table thead th.column_fixed::after,
-.bk-table .bk-table-body table thead th.column_fixed::after {
-  position: absolute;
-  content: '';
-  right: -2px;
-  top: 0;
-  bottom: 0;
-  width: 2px;
-  background-color: var(--table-head-bg-color);
-}
 .bk-table .bk-table-head table thead th .cell,
 .bk-table .bk-table-body table thead th .cell {
   display: flex;
@@ -1829,12 +1818,6 @@
   cursor: pointer;
   background: var(--table-row-active-bg-color);
 }
-.bk-table .bk-table-head table thead th.active.column_fixed::after,
-.bk-table .bk-table-body table thead th.active.column_fixed::after,
-.bk-table .bk-table-head table thead th:hover.column_fixed::after,
-.bk-table .bk-table-body table thead th:hover.column_fixed::after {
-  background-color: var(--table-row-hover-bg-color);
-}
 .bk-table .bk-table-head table thead th.column_fixed,
 .bk-table .bk-table-body table thead th.column_fixed {
   transform: translateX(var(--scroll-left));
@@ -1863,25 +1846,11 @@
   text-align: center;
   cursor: move;
 }
-.bk-table .bk-table-head table tbody tr td.column_fixed::after,
-.bk-table .bk-table-body table tbody tr td.column_fixed::after {
-  position: absolute;
-  content: '';
-  right: -2px;
-  top: 0;
-  bottom: 0;
-  width: 2px;
-  background-color: var(--table-bg-color);
-}
 .bk-table .bk-table-head table tbody tr:hover.hover-highlight td:not(.empty-cell),
 .bk-table .bk-table-body table tbody tr:hover.hover-highlight td:not(.empty-cell) {
   background: var(--table-row-hover-bg-color);
   border-right-color: var(--table-row-hover-bg-color);
 }
-.bk-table .bk-table-head table tbody tr:hover.hover-highlight td.column_fixed::after,
-.bk-table .bk-table-body table tbody tr:hover.hover-highlight td.column_fixed::after {
-  background-color: var(--table-row-hover-bg-color);
-}
 .bk-table .bk-table-head table tbody tr.--drag-start td,
 .bk-table .bk-table-body table tbody tr.--drag-start td {
   background: #fff !important;
@@ -1961,10 +1930,7 @@
   border-bottom: 1px solid var(--table-border-color);
 }
 .bk-table.bordered-col th {
-  border-right: 1px solid var(--table-border-color);
-}
-.bk-table.bordered-col th.column_fixed::after {
-  border-left: solid 1px var(--table-border-color);
+  border-right: 1px solid var(--background-color);
 }
 .bk-table.bordered-col th:last-child {
   border-right: none;
@@ -1972,9 +1938,6 @@
 .bk-table.bordered-col .bk-table-body tbody tr td {
   border-right-color: var(--table-border-color);
 }
-.bk-table.bordered-col .bk-table-body tbody tr td.column_fixed::after {
-  border-left: solid 1px var(--table-border-color);
-}
 .bk-table th,
 .bk-table td {
   border-right: 1px solid var(--table-bg-color);

package/lib/table/utils.d.ts

@@ -150,3 +150,10 @@ export declare const resolveColumnFilterProp: (col: Column) => {
     checked: any[];
 };
 export declare const getRawData: (data: any) => any;
+/**
+ * 转换 px | % 为实际数值
+ * @param val
+ * @param parentVal
+ * @returns
+ */
+export declare const getNumberOrPercentValue: (val: string | number, parentVal?: number) => number;

package/lib/table-column/index.d.ts

@@ -72,6 +72,7 @@ declare const BkTableColumn: {
             showOverflowTooltip?: boolean | {
                 content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
                 disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
+                allowHtml?: boolean;
                 watchCellResize?: boolean;
                 mode?: "auto" | "static";
                 popoverOption?: any;
@@ -208,6 +209,7 @@ declare const BkTableColumn: {
             showOverflowTooltip?: boolean | {
                 content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
                 disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
+                allowHtml?: boolean;
                 watchCellResize?: boolean;
                 mode?: "auto" | "static";
                 popoverOption?: any;
@@ -302,6 +304,7 @@ declare const BkTableColumn: {
         showOverflowTooltip?: boolean | {
             content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
             disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
+            allowHtml?: boolean;
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;

package/lib/table-column/index.js

@@ -406,9 +406,9 @@ var tableProps = {
   stripe: shared_namespaceObject.PropTypes.bool.def(false),
   /**
    * 设置表格最小高度
-   * 默认：300
+   * 默认：LINE_HEIGHT * 4
    */
-  minHeight: StringNumberType(LINE_HEIGHT * 2),
+  minHeight: StringNumberType(LINE_HEIGHT * 4),
   /**
    * 设置表格最d大高度
    * 默认：auto，依赖外层高度

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.15.table.3",
+  "version": "2.0.1-beta.15.table.4",
   "workspaces": [
     "packages/**",
     "scripts/cli",