bkui-vue 2.0.1-beta.15.table.1 → 2.0.1-beta.15.table.2

package/lib/table/table.variable.css

@@ -1595,6 +1595,8 @@
   width: 100%;
   height: 100%;
   overflow: hidden;
+  border-collapse: separate;
+  border-spacing: 0;
 }
 .bk-table-flex {
   display: flex;
@@ -1747,18 +1749,6 @@
   position: sticky;
   z-index: 1;
 }
-.bk-table .bk-table-head table th.column_fixed.column_fixed_left,
-.bk-table .bk-table-body table th.column_fixed.column_fixed_left,
-.bk-table .bk-table-head table td.column_fixed.column_fixed_left,
-.bk-table .bk-table-body table td.column_fixed.column_fixed_left {
-  left: 0;
-}
-.bk-table .bk-table-head table th.column_fixed.column_fixed_right,
-.bk-table .bk-table-body table th.column_fixed.column_fixed_right,
-.bk-table .bk-table-head table td.column_fixed.column_fixed_right,
-.bk-table .bk-table-body table td.column_fixed.column_fixed_right {
-  right: 0;
-}
 .bk-table .bk-table-head table th.row_expend .expand-cell-ctx,
 .bk-table .bk-table-body table th.row_expend .expand-cell-ctx,
 .bk-table .bk-table-head table td.row_expend .expand-cell-ctx,
@@ -1815,6 +1805,16 @@
   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,6 +1829,12 @@
   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));
@@ -1836,9 +1842,9 @@
 .bk-table .bk-table-head table tbody tr td,
 .bk-table .bk-table-body table tbody tr td {
   background-color: #fff;
-  border-top: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-  border-right: 1px solid transparent;
+  border-top: 1px solid var(--table-bg-color);
+  border-bottom: 1px solid var(--table-bg-color);
+  border-right: 1px solid var(--table-bg-color);
   box-sizing: border-box;
 }
 .bk-table .bk-table-head table tbody tr td.empty-cell,
@@ -1857,10 +1863,24 @@
   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: 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 {
@@ -1943,23 +1963,26 @@
 .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);
+}
 .bk-table.bordered-col th:last-child {
   border-right: none;
 }
 .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:last-child {
-  border-right-color: transparent;
+.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 transparent;
+  border-right: 1px solid var(--table-bg-color);
 }
 .bk-table.bordered-none th,
 .bk-table.bordered-none td {
   border-top: none;
-  border-right: 1px solid transparent;
+  border-right: 1px solid var(--table-bg-color);
   border-bottom: none;
   border-left: none;
 }
@@ -1996,6 +2019,7 @@
   right: 0;
   bottom: 0;
   left: 0;
+  text-align: center;
 }
 .bk-table colgroup col {
   background: var(--table-bg-color);

package/lib/table/utils.d.ts

@@ -136,11 +136,6 @@ export declare const resolveColumnSortProp: (col: Column, props: TablePropTypes)
 };
 export declare const resolveColumnFilterProp: (col: Column) => {
     enabled: boolean;
-    /**
-     * 格式化Border配置为标准Class
-     * @param val
-     * @returns
-     */
     list: any[];
     filterFn?: Function;
     match?: import("./props").FullEnum;

package/package.json

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

package/lib/styles/mixins/ellipsis.less

@@ -1,8 +0,0 @@
-.ellipsis-style (@maxWidth,
-@display: inline-block) {
-  display: @display;
-  max-width: @maxWidth;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}

package/lib/styles/mixins/popper.css

@@ -1,172 +0,0 @@
-:root {
-  --bk-prefix: bk;
-  --popover-max-height: 216px;
-  --primary-color: #3a84ff;
-  --success-color: #2dcb56;
-  --warning-color: #ff9c01;
-  --danger-color: #ea3636;
-  --default-color: #63656e;
-  --gray-color: #979ba5;
-  --light-gray: #c4c6cc;
-  --white-color: white;
-  --whitesmoke-color: #fafbfd;
-  --disable-color: #dcdee5;
-  --disable-bg-color: #f9fafd;
-  --border-color: #dcdee5;
-  --font-size-base: 12px;
-  --font-size-medium: 14px;
-  --font-size-large: 16px;
-  --line-height-base: 16px;
-  --line-height-medium: 16px;
-  --line-height-large: 18px;
-  --component-size-small: 26px;
-  --component-size-base: 32px;
-  --component-size-large: 40px;
-  --component-size-small-padding: 0 12px;
-  --component-size-base-padding: 0 14px;
-  --component-size-large-padding: 0 16px;
-  --border-width-base: 1px;
-  --border-style-base: solid;
-  --border-radius-base: 2px;
-  --border-style-color: var(--light-gray);
-  --input-disabled-bg: #fafbfd;
-  --input-disabled-border: var(--disable-color);
-  --input-height-base: var(--component-size-base);
-  --input-color: var(--default-color);
-  --input-bg: white;
-  --input-border-color: var(--light-gray);
-  --input-broder-radius: 3px;
-  --input-shadow-color: #a3c5fd;
-  --input-horizontal-padding: 8px;
-  --input-block-color: #f5f7fa;
-  --input-block-hover-color: #eaebf0;
-  --input-icon-size: var(--font-size-medium);
-  --input-maxlength-color: #979ba5;
-  --button-primary-hover-color: #5594fa;
-  --button-danger-hover-color: #ff5656;
-  --button-success-hover-color: #45e35f;
-  --button-warning-hover-color: #ffb848;
-  --button-default-hover-border-color: #979ba5;
-  --button-primary-active-color: #2c77f4;
-  --button-danger-active-color: #db2626;
-  --button-success-active-color: #1ab943;
-  --button-warning-active-color: #eb9000;
-  --button-selected-bg-color: #e1ecff;
-  --button-disabled-selected-bg-color: #f0f1f5;
-  --radio-font-color: #63656e;
-  --radio-active-color: #3a84ff;
-  --radio-hover-border-color: #979ba5;
-  --radio-disabled-border: #dcdee5;
-  --radio-disabled-font-color: #c4c6cc;
-  --radio-disabled-checked-bg: #a3c5fd;
-  --radio-button-checked-bg: #e1ecff;
-  --radio-button-disabled-checked-bg: #fafbfd;
-  --checkbox-disabled-checked-bg: #a3c5fd;
-  --fixed-navbar-background: #fff;
-  --fixed-navbar-boxshadow-color: rgba(0, 0, 0, 0.1);
-  --switch-default-color: #fff;
-  --switch-grey-color: #c4c6cc;
-  --breadcrumb-black-color: #979ba5;
-  --breadcrumb-primary-hover-color: #0082ff;
-  --breadcrumb-fn-main-color: #63656e;
-  --link-default-hover-color: #979ba5;
-  --link-primary-hover-color: #699df4;
-  --link-success-hover-color: #45e35f;
-  --link-warning-hover-color: #ffb848;
-  --link-danger-hover-color: #ff5656;
-  --link-default-disabled-color: #dcdee5;
-  --link-primary-disabled-color: #a3c5fd;
-  --link-success-disabled-color: #94f5a4;
-  --link-warning-disabled-color: #ffd695;
-  --link-danger-disabled-color: #fd9c9c;
-  --message-color: var(--default-color);
-  --message-primary-bg-color: #f0f8ff;
-  --message-primary-border-color: #e1ecff;
-  --message-primary-shadow-color: #e1e8f4;
-  --message-warning-bg-color: #fff4e2;
-  --message-warning-border-color: #ffe8c3;
-  --message-warning-shadow-color: #ede6db;
-  --message-success-bg-color: #f2fff4;
-  --message-success-border-color: #dcffe2;
-  --message-success-shadow-color: #cef0d7;
-  --message-danger-bg-color: #ffeded;
-  --message-danger-border-color: #ffdddd;
-  --message-danger-shadow-color: #f6dada;
-  --slider-default-bg: #dcdee5;
-  --slider-disable-bar-bg: #979ba5;
-  --menu-bg-color: #182132;
-  --submenu-bg-color: #151d2c;
-  --menu-active-bg-color: linear-gradient(90deg, #3f87ff 0%, #3a84ff 100%);
-  --menu-color: #96a2b9;
-  --menu-group-color: var(--default-color);
-  --menu-width: 260px;
-  --menu-collapse-width: 60px;
-  --menu-active-color: white;
-  --nav-header-bg-color: #182132;
-  --nav-bg-color: #182132;
-  --date-picker-disabled-bg: #fafbfd;
-  --date-picker-dropdown-mb: 4px;
-  --date-picker-dropdown-bg: #fff;
-  --table-bg-color: var(--white-color);
-  --table-border-color: #dcdee5;
-  --table-head-bg-color: #fafbfd;
-  --table-head-font-color: #313238;
-  --table-body-font-color: #63656E;
-  --table-row-hover-bg-color: #f5f7fa;
-  --table-row-active-bg-color: #f0f1f5;
-  --cascader-panel-border-color: #dcdee5;
-  --cascader-panel-hover: #f5f7fa;
-  --cascader-panel-active: #e1ecff;
-  --cascader-panel-disabled-bg: #fff;
-  --search-select-focus-border-color: var(--primary-color);
-  --search-select-focus-color: #3c96ff;
-  --search-select-font-color: var(--default-color);
-  --search-select-placeholder-color: var(--light-gray);
-  --search-select-message-color: var(--danger-color);
-  --search-select-menu-border-color: var(--disable-color);
-  --select-active-color: #e1ecff;
-  --select-hover-color: #f5f7fa;
-}
-.bk-popper {
-  display: none;
-  padding: 7px 14px;
-  font-size: 12px;
-  color: #fff;
-  background: #333;
-  border-radius: 4px;
-}
-.bk-popper.light {
-  color: #63656e;
-  background: #fff;
-  box-shadow: #dcdee5 0 0 6px 0;
-}
-.bk-popper .bk-popper-arrow,
-.bk-popper .bk-popper-arrow::before {
-  position: absolute;
-  width: 8px;
-  height: 8px;
-  background: inherit;
-}
-.bk-popper .bk-popper-arrow {
-  visibility: hidden;
-}
-.bk-popper .bk-popper-arrow::before {
-  content: '';
-  visibility: visible;
-  transform: rotate(45deg);
-}
-.bk-popper[data-show] {
-  display: block;
-}
-.bk-popper[data-popper-placement^='top'] > .bk-popper-arrow {
-  bottom: -4px;
-}
-.bk-popper[data-popper-placement^='bottom'] > .bk-popper-arrow {
-  top: -4px;
-}
-.bk-popper[data-popper-placement^='left'] > .bk-popper-arrow {
-  right: -4px;
-}
-.bk-popper[data-popper-placement^='right'] > .bk-popper-arrow {
-  left: -4px;
-}

package/lib/styles/mixins/popper.less

@@ -1,54 +0,0 @@
-@import '../../styles/themes/themes.less';
-
-.@{bk-prefix}-popper {
-  display: none;
-  padding: 7px 14px;
-  font-size: 12px;
-  color: #fff;
-  background: #333;
-  border-radius: 4px;
-
-  &.light {
-    color: #63656e;
-    background: #fff;
-    box-shadow: rgb(220, 222, 229) 0 0 6px 0;
-  }
-
-  .@{bk-prefix}-popper-arrow,
-  .@{bk-prefix}-popper-arrow::before {
-    position: absolute;
-    width: 8px;
-    height: 8px;
-    background: inherit;
-  }
-
-  .@{bk-prefix}-popper-arrow {
-    visibility: hidden;
-  }
-
-  .@{bk-prefix}-popper-arrow::before {
-    content: '';
-    visibility: visible;
-    transform: rotate(45deg);
-  }
-
-  &[data-show] {
-    display: block;
-  }
-}
-
-.@{bk-prefix}-popper[data-popper-placement^='top']>.@{bk-prefix}-popper-arrow {
-  bottom: -4px;
-}
-
-.@{bk-prefix}-popper[data-popper-placement^='bottom']>.@{bk-prefix}-popper-arrow {
-  top: -4px;
-}
-
-.@{bk-prefix}-popper[data-popper-placement^='left']>.@{bk-prefix}-popper-arrow {
-  right: -4px;
-}
-
-.@{bk-prefix}-popper[data-popper-placement^='right']>.@{bk-prefix}-popper-arrow {
-  left: -4px;
-}