bkui-vue 2.0.1-beta.26 → 2.0.1-beta.28

package/lib/table/table.css

@@ -162,23 +162,41 @@
   pointer-events: none;
   overflow: hidden;
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-vertical {
+  width: 6px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-vertical.bk-scrollbar-hover {
+  width: 8px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-horizontal {
+  height: 6px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-horizontal.bk-scrollbar-hover {
+  height: 8px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover {
-  background-color: #F0F1F5;
+  background-color: #f0f1f5;
   cursor: pointer;
 }
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover .bk-scrollbar::before {
-  background-color: #979BA5;
+  background-color: #979ba5;
 }
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical {
   top: 0;
   width: 8px;
   transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical.bk-scrollbar-hover {
+  width: 10px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal {
   left: 0;
   height: 8px;
   transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal.bk-scrollbar-hover {
+  height: 10px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal.bk-scrollbar {
   right: auto;
   left: 0;
@@ -201,17 +219,18 @@
   position: absolute;
   left: 0;
   right: 0;
-  min-height: 8px;
+  top: 0;
+  bottom: 0;
 }
 .bk-scrollbar-wrapper .bk-scrollbar::before {
   position: absolute;
   content: '';
-  background: #DCDEE5;
+  background: #dcdee5;
   border-radius: 6px;
-  left: 1px;
-  right: 1px;
-  top: 1px;
-  bottom: 1px;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
   opacity: 0;
   transition: opacity 0.2s 0.9s linear;
 }
@@ -1216,9 +1235,21 @@
 }
 .bk-table .bk-table-body {
   position: relative;
-  overflow: hidden;
+  overflow: auto;
   flex: 1;
 }
+.bk-table .bk-table-body::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+.bk-table .bk-table-body::-webkit-scrollbar-thumb {
+  background: #ddd;
+  border-radius: 20px;
+  box-shadow: inset 0 0 6px rgba(204, 204, 204, 0.3);
+}
+.bk-table .bk-table-body.is-bk-scrollbar {
+  overflow: hidden;
+}
 .bk-table .bk-table-body .prepend-row {
   transform: translate3d(var(--translate-x), 0, 0);
 }
@@ -1542,15 +1573,27 @@
 .bk-table.bordered-horizontal .__is-empty .bk-table-body-content {
   border-bottom: 1px solid var(--table-border-color);
 }
+.bk-table.bordered-col .bk-table-head {
+  border-right: 1px solid var(--table-border-color);
+}
 .bk-table.bordered-col th {
   border-right: 1px solid var(--table-border-color);
 }
 .bk-table.bordered-col th:last-child {
   border-right: none;
 }
+.bk-table.bordered-col .bk-table-body {
+  border-right: 1px solid var(--table-border-color);
+}
 .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: none;
+}
+.bk-table.bordered-col .bk-table-body tbody tr:hover.hover-highlight td:not(.empty-cell) {
+  border-right-color: var(--table-border-color);
+}
 .bk-table th,
 .bk-table td {
   border-right: 1px solid var(--table-bg-color);

package/lib/table/table.less

@@ -22,9 +22,24 @@
 
   .@{bk-prefix}-table-body {
     position: relative;
-    overflow: hidden;
+    overflow: auto;
     flex: 1;
 
+    &::-webkit-scrollbar {
+      width: 8px;
+      height: 8px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #ddd;
+      border-radius: 20px;
+      box-shadow: inset 0 0 6px rgba(204, 204, 204, 0.3);
+    }
+
+    &.is-bk-scrollbar {
+      overflow: hidden;
+    }
+
     .prepend-row {
       transform: translate3d(var(--translate-x), 0, 0);
     }
@@ -389,6 +404,9 @@
   }
 
   &.bordered-col {
+    .@{bk-prefix}-table-head {
+      border-right: 1px solid @table-border-color;
+    }
     th {
       border-right: 1px solid @table-border-color;
 
@@ -397,11 +415,26 @@
       }
     }
 
-    .bk-table-body {
+    .@{bk-prefix}-table-body {
+      border-right: 1px solid @table-border-color;
       tbody {
         tr {
           td {
             border-right-color: @table-border-color;
+
+            &:last-child {
+              border-right: none;
+            }
+          }
+
+          &:hover {
+            &.hover-highlight {
+              td {
+                &:not(.empty-cell) {
+                  border-right-color: @table-border-color;
+                }
+              }
+            }
           }
         }
       }

package/lib/table/table.variable.css

@@ -552,23 +552,41 @@
   pointer-events: none;
   overflow: hidden;
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-vertical {
+  width: 6px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-vertical.bk-scrollbar-hover {
+  width: 8px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-horizontal {
+  height: 6px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-horizontal.bk-scrollbar-hover {
+  height: 8px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover {
-  background-color: #F0F1F5;
+  background-color: #f0f1f5;
   cursor: pointer;
 }
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover .bk-scrollbar::before {
-  background-color: #979BA5;
+  background-color: #979ba5;
 }
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical {
   top: 0;
   width: 8px;
   transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical.bk-scrollbar-hover {
+  width: 10px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal {
   left: 0;
   height: 8px;
   transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal.bk-scrollbar-hover {
+  height: 10px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal.bk-scrollbar {
   right: auto;
   left: 0;
@@ -591,17 +609,18 @@
   position: absolute;
   left: 0;
   right: 0;
-  min-height: 8px;
+  top: 0;
+  bottom: 0;
 }
 .bk-scrollbar-wrapper .bk-scrollbar::before {
   position: absolute;
   content: '';
-  background: #DCDEE5;
+  background: #dcdee5;
   border-radius: 6px;
-  left: 1px;
-  right: 1px;
-  top: 1px;
-  bottom: 1px;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
   opacity: 0;
   transition: opacity 0.2s 0.9s linear;
 }
@@ -1606,9 +1625,21 @@
 }
 .bk-table .bk-table-body {
   position: relative;
-  overflow: hidden;
+  overflow: auto;
   flex: 1;
 }
+.bk-table .bk-table-body::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+.bk-table .bk-table-body::-webkit-scrollbar-thumb {
+  background: #ddd;
+  border-radius: 20px;
+  box-shadow: inset 0 0 6px rgba(204, 204, 204, 0.3);
+}
+.bk-table .bk-table-body.is-bk-scrollbar {
+  overflow: hidden;
+}
 .bk-table .bk-table-body .prepend-row {
   transform: translate3d(var(--translate-x), 0, 0);
 }
@@ -1932,15 +1963,27 @@
 .bk-table.bordered-horizontal .__is-empty .bk-table-body-content {
   border-bottom: 1px solid var(--table-border-color);
 }
+.bk-table.bordered-col .bk-table-head {
+  border-right: 1px solid var(--table-border-color);
+}
 .bk-table.bordered-col th {
   border-right: 1px solid var(--table-border-color);
 }
 .bk-table.bordered-col th:last-child {
   border-right: none;
 }
+.bk-table.bordered-col .bk-table-body {
+  border-right: 1px solid var(--table-border-color);
+}
 .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: none;
+}
+.bk-table.bordered-col .bk-table-body tbody tr:hover.hover-highlight td:not(.empty-cell) {
+  border-right-color: var(--table-border-color);
+}
 .bk-table th,
 .bk-table td {
   border-right: 1px solid var(--table-bg-color);

package/lib/table/utils.d.ts

@@ -117,7 +117,7 @@ export declare const getNextSortType: (sortType: string) => string;
 export declare const resolveSort: (sort: ISortPropShape, column: any, format?: any[]) => ({
     sortFn: ((_a: any, _b: any) => boolean) | ((_a: any, _b: any, index0: any, index1: any) => number);
 } & import("./props").ISortShape) | {
-    sortFn?: Function;
+    sortFn?: (...args: any[]) => boolean;
     sortScope?: import("./props").SortScope;
     value: string;
 };
@@ -129,17 +129,20 @@ export declare const isRowSelectEnable: (props: any, { row, index, isCheckAll }:
 export declare const getRowId: (row: any, defVal: any, props: any) => any;
 export declare const resolveColumnSortProp: (col: Column, props: TablePropTypes) => {
     type: string;
-    fn: Function | ((((_a: any, _b: any) => boolean) | ((_a: any, _b: any, index0: any, index1: any) => number)) & Function);
+    fn: ((...args: any[]) => boolean) | ((((_a: any, _b: any) => boolean) | ((_a: any, _b: any, index0: any, index1: any) => number)) & ((...args: any[]) => boolean));
     scope: import("./props").SortScope;
     active: boolean;
     enabled: boolean;
 };
 export declare const resolveColumnFilterProp: (col: Column) => {
     enabled: boolean;
-    list: any[];
-    filterFn?: Function;
+    list: {
+        label: string;
+        value: string;
+    }[];
+    filterFn?: (...args: any[]) => boolean;
     match?: import("./props").FullEnum;
-    checked?: any[];
+    checked?: string[];
     filterScope?: import("./props").SortScope;
     btnSave?: string | boolean;
     btnReset?: string | boolean;

package/lib/table-column/index.js

@@ -17299,6 +17299,8 @@ const shared_namespaceObject = x({ ["PropTypes"]: () => __WEBPACK_EXTERNAL_MODUL
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
 const external_vue_namespaceObject = external_vue_x({ ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
+// EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
+var lodash = __webpack_require__(6635);
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
 function _typeof(o) {
   "@babel/helpers - typeof";
@@ -17440,7 +17442,7 @@ var COLUMN_ATTRIBUTE = {
 /**
  * Y 轴滚动条宽度
  */
-var SCROLLY_WIDTH = 0;
+var SCROLLY_WIDTH = 8;
 /**
  * 默认行高
  */
@@ -17887,8 +17889,6 @@ var tableProps = {
     }
   }).def(null)
 };
-// EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
-var lodash = __webpack_require__(6635);
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-column.tsx
 /*
  * Tencent is pleased to support the open source community by making
@@ -17946,12 +17946,13 @@ var TableColumnProp = {
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
     var initTableColumns = (0,external_vue_namespaceObject.inject)(PROVIDE_KEY_INIT_COL, function () {});
+    var lastPropsVal = {};
     (0,external_vue_namespaceObject.watch)(function () {
       return [props];
-    }, function (oldVal, newVal) {
-      var _newVal$;
-      if (!(0,lodash.isEqual)((0,external_vue_namespaceObject.toRaw)(oldVal === null || oldVal === void 0 ? void 0 : oldVal[0]), (0,external_vue_namespaceObject.toRaw)((_newVal$ = newVal === null || newVal === void 0 ? void 0 : newVal[0]) !== null && _newVal$ !== void 0 ? _newVal$ : {}))) {
+    }, function () {
+      if (!(0,lodash.isEqual)(lastPropsVal, (0,external_vue_namespaceObject.toRaw)(props))) {
         initTableColumns();
+        Object.assign(lastPropsVal, (0,external_vue_namespaceObject.toRaw)(props));
       }
     }, {
       immediate: true,

package/lib/tree/index.js

@@ -19933,9 +19933,6 @@ var use_tree_init_this = undefined;
         }
         setNodeAttribute(item, [NODE_ATTRIBUTES.IS_MATCH], [isMatch], isTreeUI.value && isMatch);
       });
-      (0,external_vue_namespaceObject.nextTick)(function () {
-        scrollToTop();
-      });
     });
     if (!isSearchDisabled) {
       (0,external_vue_namespaceObject.watch)([refSearch], function () {

package/lib/tree/tree.css

@@ -162,23 +162,41 @@
   pointer-events: none;
   overflow: hidden;
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-vertical {
+  width: 6px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-vertical.bk-scrollbar-hover {
+  width: 8px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-horizontal {
+  height: 6px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-horizontal.bk-scrollbar-hover {
+  height: 8px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover {
-  background-color: #F0F1F5;
+  background-color: #f0f1f5;
   cursor: pointer;
 }
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover .bk-scrollbar::before {
-  background-color: #979BA5;
+  background-color: #979ba5;
 }
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical {
   top: 0;
   width: 8px;
   transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical.bk-scrollbar-hover {
+  width: 10px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal {
   left: 0;
   height: 8px;
   transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal.bk-scrollbar-hover {
+  height: 10px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal.bk-scrollbar {
   right: auto;
   left: 0;
@@ -201,17 +219,18 @@
   position: absolute;
   left: 0;
   right: 0;
-  min-height: 8px;
+  top: 0;
+  bottom: 0;
 }
 .bk-scrollbar-wrapper .bk-scrollbar::before {
   position: absolute;
   content: '';
-  background: #DCDEE5;
+  background: #dcdee5;
   border-radius: 6px;
-  left: 1px;
-  right: 1px;
-  top: 1px;
-  bottom: 1px;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
   opacity: 0;
   transition: opacity 0.2s 0.9s linear;
 }

package/lib/tree/tree.variable.css

@@ -552,23 +552,41 @@
   pointer-events: none;
   overflow: hidden;
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-vertical {
+  width: 6px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-vertical.bk-scrollbar-hover {
+  width: 8px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-horizontal {
+  height: 6px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.track-small.bk-scrollbar-horizontal.bk-scrollbar-hover {
+  height: 8px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover {
-  background-color: #F0F1F5;
+  background-color: #f0f1f5;
   cursor: pointer;
 }
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover .bk-scrollbar::before {
-  background-color: #979BA5;
+  background-color: #979ba5;
 }
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical {
   top: 0;
   width: 8px;
   transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical.bk-scrollbar-hover {
+  width: 10px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal {
   left: 0;
   height: 8px;
   transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
 }
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal.bk-scrollbar-hover {
+  height: 10px;
+}
 .bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal.bk-scrollbar {
   right: auto;
   left: 0;
@@ -591,17 +609,18 @@
   position: absolute;
   left: 0;
   right: 0;
-  min-height: 8px;
+  top: 0;
+  bottom: 0;
 }
 .bk-scrollbar-wrapper .bk-scrollbar::before {
   position: absolute;
   content: '';
-  background: #DCDEE5;
+  background: #dcdee5;
   border-radius: 6px;
-  left: 1px;
-  right: 1px;
-  top: 1px;
-  bottom: 1px;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
   opacity: 0;
   transition: opacity 0.2s 0.9s linear;
 }

package/lib/virtual-render/index.d.ts

@@ -312,10 +312,10 @@ declare const BkVirtualRender: {
         autoReset: boolean;
         autoIndex: boolean;
     }, true, {}, import("vue").SlotsType<{
-        default?: any;
-        beforeContent?: any;
-        afterContent?: any;
-        afterSection?: any;
+        default?: Record<string, object>;
+        beforeContent?: Record<string, object>;
+        afterContent?: Record<string, object>;
+        afterSection?: Record<string, object>;
     }>, {
         P: {};
         B: {};
@@ -674,9 +674,9 @@ declare const BkVirtualRender: {
     autoReset: boolean;
     autoIndex: boolean;
 }, {}, string, import("vue").SlotsType<{
-    default?: any;
-    beforeContent?: any;
-    afterContent?: any;
-    afterSection?: any;
+    default?: Record<string, object>;
+    beforeContent?: Record<string, object>;
+    afterContent?: Record<string, object>;
+    afterSection?: Record<string, object>;
 }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("vue").Plugin<any[]>;
 export default BkVirtualRender;