bkui-vue 1.0.3-beta.60 → 1.0.3-beta.60.scrollbar.2

package/lib/table/table.less

@@ -12,9 +12,9 @@
 
 .@{bk-prefix}-table {
   position: relative;
+  width: 100%;
   height: auto;
   overflow: hidden;
-  width: 100%;
 
   &-flex {
     display: flex;
@@ -34,21 +34,9 @@
 
   .@{bk-prefix}-table-body {
     position: relative;
-    overflow: auto;
-    scrollbar-gutter: stable;
+    overflow: hidden;
     border-bottom: 1px solid @table-border-color;
 
-    &::-webkit-scrollbar {
-      width: 5px;
-      height: 6px;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      background: #dcdee5;
-      border-radius: 10px;
-      box-shadow: inset 0 0 6px rgba(204, 204, 204, .3);
-    }
-
     .prepend-row {
       transform: translateX(var(--prepend-left));
     }
@@ -93,17 +81,6 @@
     background: @table-bg-color;
     transform: translateZ(0);
 
-    &::-webkit-scrollbar {
-      width: 5px;
-      height: 5px;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      background: #ddd;
-      border-radius: 20px;
-      box-shadow: inset 0 0 6px rgba(204, 204, 204, .3);
-    }
-
     &.__is-empty {
       display: flex;
       height: 100%;
@@ -148,8 +125,8 @@
           white-space: nowrap;
 
           .drag-cell {
-            font-size: 14px;
             height: 100%;
+            font-size: 14px;
           }
 
           &.has-sort {
@@ -259,7 +236,7 @@
           .cell {
             display: flex;
             align-items: center;
-            height: calc(var(--row-height) - 1px);
+            height: calc(var(--row-height) - 2px);
             color: @table-head-font-color;
           }
 
@@ -279,26 +256,31 @@
         tr {
           td {
             background-color: #fff;
+            border-top: 1px solid transparent;
+            border-bottom: 1px solid transparent;
+            border-right: 1px solid transparent;
+
+            box-sizing: border-box;
 
             &.empty-cell {
               padding-bottom: 30px;
             }
 
             &.is-last {
-              border-bottom: none;
+              // border-bottom: none;
             }
 
             .cell {
               display: block;
               width: 100%;
-              height: 100%;
-              line-height: calc(var(--row-height) - 1px);
+              // height: 100%;
+              line-height: calc(var(--row-height) - 2px);
               box-sizing: border-box;
               align-items: center;
 
               &.drag {
-                cursor: move;
                 text-align: center;
+                cursor: move;
               }
             }
           }
@@ -313,18 +295,7 @@
             }
           }
 
-          // &.--drag-enter {
-          //   &.--bottom {
-          //     border-bottom: solid 1px #3785ff;
-          //   }
-
-          //   &.--top {
-          //     border-top: solid 1px #3785ff;
-          //   }
-          // }
-
           &.--drag-start {
-
             td {
               background: #fff!important;
             }
@@ -337,7 +308,6 @@
   .@{bk-prefix}-table-head {
     position: relative;
     z-index: 2;
-    scrollbar-gutter: stable;
     overflow: hidden;
     background-color: var(--background-color);
 
@@ -368,11 +338,8 @@
       cursor: pointer;
 
       background: @table-head-bg-color;
-      //border-right: 1px solid @table-border-color;
-      // border-bottom: 1px solid @table-border-color;
       border-left: 1px solid @table-border-color;
       border-radius: 0 2px 0 0;
-      // transform: translateX(var(--scroll-left));
       justify-content: center;
       align-items: center;
 
@@ -400,14 +367,18 @@
       border-bottom: 1px solid @table-border-color;
     }
 
-    td {
-      border-bottom: 1px solid @table-border-color;
-    }
+    .bk-table-body {
+      tbody {
+        tr {
+          td {
+            border-bottom-color: @table-border-color;
+          }
 
-    tr {
-      &:last-child {
-        td {
-          border-bottom: none;
+          &:last-child {
+            td {
+              border-bottom: none;
+            }
+          }
         }
       }
     }
@@ -442,8 +413,7 @@
   }
 
   &.bordered-col {
-    th,
-    td {
+    th {
       border-right: 1px solid @table-border-color;
 
       &:last-child {
@@ -451,9 +421,24 @@
       }
     }
 
+    .bk-table-body {
+      tbody {
+        tr {
+          td {
+            border-right-color: @table-border-color;
+
+            &:last-child {
+              border-right-color: transparent;
+            }
+          }
+        }
+      }
+    }
+
   }
 
-  th, td {
+  th,
+  td {
     border-right: 1px solid transparent;
   }
 

package/lib/table/table.variable.css

@@ -144,11 +144,84 @@
 .bk-F-scroll-y::-webkit-scrollbar-thumb {
   border-radius: 4px;
 }
+.bk-scrollbar-wrapper {
+  position: relative;
+  overflow: hidden;
+}
+.bk-scrollbar-wrapper .bk-scroll-content-el {
+  display: inline-flex;
+  flex-direction: column;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track {
+  z-index: 1;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  pointer-events: none;
+  overflow: hidden;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover {
+  background-color: #F0F1F5;
+  cursor: pointer;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover .bk-scrollbar::before {
+  background-color: #979BA5;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical {
+  top: 0;
+  width: 11px;
+  transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal {
+  left: 0;
+  height: 11px;
+  transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
+}
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal.bk-scrollbar {
+  right: auto;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  min-height: 0;
+  min-width: 10px;
+  width: auto;
+}
+.bk-scrollbar-wrapper .bk-scrollbar-dragging {
+  pointer-events: none;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.bk-scrollbar-wrapper .bk-scrollbar {
+  position: absolute;
+  left: 0;
+  right: 0;
+  min-height: 10px;
+}
+.bk-scrollbar-wrapper .bk-scrollbar::before {
+  position: absolute;
+  content: '';
+  background: #DcDEE5;
+  border-radius: 7px;
+  left: 2px;
+  right: 2px;
+  top: 2px;
+  bottom: 2px;
+  opacity: 0;
+  transition: opacity 0.2s 0.5s linear;
+}
+.bk-scrollbar-wrapper .bk-scrollbar.bk-scrollbar-visible::before {
+  opacity: 0.5;
+  transition-delay: 0s;
+  transition-duration: 0s;
+}
 .bk-virtual-render {
   position: relative;
 }
-.bk-virtual-render .bk-virtual-content,
-.bk-virtual-render.bk-virtual-content {
+.bk-virtual-render .bk-virtual-content {
   position: absolute;
   top: 0;
   bottom: 0;
@@ -1126,9 +1199,9 @@
 }
 .bk-table {
   position: relative;
+  width: 100%;
   height: auto;
   overflow: hidden;
-  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1144,19 +1217,9 @@
 }
 .bk-table .bk-table-body {
   position: relative;
-  overflow: auto;
-  scrollbar-gutter: stable;
+  overflow: hidden;
   border-bottom: 1px solid #dcdee5;
 }
-.bk-table .bk-table-body::-webkit-scrollbar {
-  width: 5px;
-  height: 6px;
-}
-.bk-table .bk-table-body::-webkit-scrollbar-thumb {
-  background: #dcdee5;
-  border-radius: 10px;
-  box-shadow: inset 0 0 6px rgba(204, 204, 204, 0.3);
-}
 .bk-table .bk-table-body .prepend-row {
   transform: translateX(var(--prepend-left));
 }
@@ -1183,17 +1246,6 @@
   background: white;
   transform: translateZ(0);
 }
-.bk-table .bk-table-head::-webkit-scrollbar,
-.bk-table .bk-table-body::-webkit-scrollbar {
-  width: 5px;
-  height: 5px;
-}
-.bk-table .bk-table-head::-webkit-scrollbar-thumb,
-.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-head.__is-empty,
 .bk-table .bk-table-body.__is-empty {
   display: flex;
@@ -1246,8 +1298,8 @@
 .bk-table .bk-table-body table th .cell .drag-cell,
 .bk-table .bk-table-head table td .cell .drag-cell,
 .bk-table .bk-table-body table td .cell .drag-cell {
-  font-size: 14px;
   height: 100%;
+  font-size: 14px;
 }
 .bk-table .bk-table-head table th .cell.has-sort,
 .bk-table .bk-table-body table th .cell.has-sort,
@@ -1372,7 +1424,7 @@
 .bk-table .bk-table-body table thead th .cell {
   display: flex;
   align-items: center;
-  height: calc(var(--row-height) - 1px);
+  height: calc(var(--row-height) - 2px);
   color: #313238;
 }
 .bk-table .bk-table-head table thead th.active,
@@ -1389,28 +1441,27 @@
 .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;
+  box-sizing: border-box;
 }
 .bk-table .bk-table-head table tbody tr td.empty-cell,
 .bk-table .bk-table-body table tbody tr td.empty-cell {
   padding-bottom: 30px;
 }
-.bk-table .bk-table-head table tbody tr td.is-last,
-.bk-table .bk-table-body table tbody tr td.is-last {
-  border-bottom: none;
-}
 .bk-table .bk-table-head table tbody tr td .cell,
 .bk-table .bk-table-body table tbody tr td .cell {
   display: block;
   width: 100%;
-  height: 100%;
-  line-height: calc(var(--row-height) - 1px);
+  line-height: calc(var(--row-height) - 2px);
   box-sizing: border-box;
   align-items: center;
 }
 .bk-table .bk-table-head table tbody tr td .cell.drag,
 .bk-table .bk-table-body table tbody tr td .cell.drag {
-  cursor: move;
   text-align: center;
+  cursor: move;
 }
 .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) {
@@ -1423,7 +1474,6 @@
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
-  scrollbar-gutter: stable;
   overflow: hidden;
   background-color: var(--background-color);
 }
@@ -1473,10 +1523,10 @@
 .bk-table.bordered-row .bk-table-head {
   border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-row td {
-  border-bottom: 1px solid #dcdee5;
+.bk-table.bordered-row .bk-table-body tbody tr td {
+  border-bottom-color: #dcdee5;
 }
-.bk-table.bordered-row tr:last-child td {
+.bk-table.bordered-row .bk-table-body tbody tr:last-child td {
   border-bottom: none;
 }
 .bk-table.bordered-outer {
@@ -1497,14 +1547,18 @@
 .bk-table.bordered-horizontal .__is-empty .bk-table-body-content {
   border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-col th,
-.bk-table.bordered-col td {
+.bk-table.bordered-col th {
   border-right: 1px solid #dcdee5;
 }
-.bk-table.bordered-col th:last-child,
-.bk-table.bordered-col td:last-child {
+.bk-table.bordered-col th:last-child {
   border-right: none;
 }
+.bk-table.bordered-col .bk-table-body tbody tr td {
+  border-right-color: #dcdee5;
+}
+.bk-table.bordered-col .bk-table-body tbody tr td:last-child {
+  border-right-color: transparent;
+}
 .bk-table th,
 .bk-table td {
   border-right: 1px solid transparent;

package/lib/table/use-render.d.ts

@@ -1,7 +1,7 @@
 import { SetupContext } from 'vue';
 import { TablePropTypes } from './props';
 import { ITableResponse } from './use-attributes';
-declare const _default: (props: TablePropTypes, context: SetupContext<any>, tableResp: ITableResponse, styleRef: any, head: any, root: any, resetTableHeight: any) => {
+declare const _default: (props: TablePropTypes, context: SetupContext<any>, tableResp: ITableResponse, head: any, root: any, resetTableHeight: any) => {
     renderTableHeadSchema: () => (string | JSX.Element)[];
     renderTableBodySchema: (rows: any[]) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;

package/lib/table-column/index.js

@@ -62,7 +62,7 @@ function toPrimitive(t, r) {
 
 function toPropertyKey(t) {
   var i = toPrimitive(t, "string");
-  return "symbol" == _typeof(i) ? i : String(i);
+  return "symbol" == _typeof(i) ? i : i + "";
 }
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
 
@@ -256,7 +256,7 @@ var COLUMN_ATTRIBUTE = {
 /**
  * Y 轴滚动条宽度
  */
-var SCROLLY_WIDTH = 6;
+var SCROLLY_WIDTH = 0;
 /**
  * 默认行高
  */

package/lib/tag/index.js

@@ -65,7 +65,7 @@ function toPrimitive(t, r) {
 
 function toPropertyKey(t) {
   var i = toPrimitive(t, "string");
-  return "symbol" == _typeof(i) ? i : String(i);
+  return "symbol" == _typeof(i) ? i : i + "";
 }
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
 

package/lib/tag-input/index.js

@@ -17424,7 +17424,7 @@ function toPrimitive(t, r) {
 
 function toPropertyKey(t) {
   var i = toPrimitive(t, "string");
-  return "symbol" == _typeof(i) ? i : String(i);
+  return "symbol" == _typeof(i) ? i : i + "";
 }
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
 
@@ -17688,8 +17688,7 @@ var useTagsOverflow = function useTagsOverflow(tagInputRef, collapseTags, select
  */
 
 
-
-/* harmony default export */ const list_tag_render = ((0,external_vue_namespaceObject.defineComponent)({
+/* harmony default export */ const list_tag_render = (defineComponent({
   name: 'ListTagRender',
   props: {
     node: shared_namespaceObject.PropTypes.object,
@@ -17713,7 +17712,7 @@ var useTagsOverflow = function useTagsOverflow(tagInputRef, collapseTags, select
       return value;
     };
     if (this.tpl) {
-      return this.tpl(this.node, highlightKeyword, external_vue_namespaceObject.h, this);
+      return this.tpl(this.node, highlightKeyword, h, this);
     }
     var displayText = this.node[this.displayKey];
     return (0,external_vue_namespaceObject.createVNode)("div", {

package/lib/timeline/index.js

@@ -1,5 +1,4 @@
 import "../styles/reset.css";
-import "./timeline.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_config_provider_fe8577a3__ from "../config-provider";

package/lib/transfer/index.d.ts

@@ -183,8 +183,8 @@ declare const Transfer: {
         extCls: string;
         multiple: boolean;
         displayKey: string;
-        searchPlaceholder: string;
         sortable: boolean;
+        searchPlaceholder: string;
         settingKey: string;
         sortKey: string;
         showOverflowTips: boolean;
@@ -297,8 +297,8 @@ declare const Transfer: {
         extCls: string;
         multiple: boolean;
         displayKey: string;
-        searchPlaceholder: string;
         sortable: boolean;
+        searchPlaceholder: string;
         settingKey: string;
         sortKey: string;
         showOverflowTips: boolean;
@@ -408,8 +408,8 @@ declare const Transfer: {
     extCls: string;
     multiple: boolean;
     displayKey: string;
-    searchPlaceholder: string;
     sortable: boolean;
+    searchPlaceholder: string;
     settingKey: string;
     sortKey: string;
     showOverflowTips: boolean;

package/lib/transfer/transfer.d.ts

@@ -179,8 +179,8 @@ declare const _default: import("vue").DefineComponent<{
     extCls: string;
     multiple: boolean;
     displayKey: string;
-    searchPlaceholder: string;
     sortable: boolean;
+    searchPlaceholder: string;
     settingKey: string;
     sortKey: string;
     showOverflowTips: boolean;

package/lib/tree/index.js

@@ -47,7 +47,7 @@ const shared_namespaceObject = x({ ["PropTypes"]: () => __WEBPACK_EXTERNAL_MODUL
 ;// CONCATENATED MODULE: external "vue"
 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({ ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
+const external_vue_namespaceObject = external_vue_x({ ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
 ;// CONCATENATED MODULE: external "../config-provider"
 var config_provider_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var config_provider_y = x => () => x
@@ -87,7 +87,7 @@ function toPrimitive(t, r) {
 
 function toPropertyKey(t) {
   var i = toPrimitive(t, "string");
-  return "symbol" == _typeof(i) ? i : String(i);
+  return "symbol" == _typeof(i) ? i : i + "";
 }
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
 
@@ -1037,7 +1037,6 @@ var showCheckbox = function showCheckbox(props, node) {
 
 
 var use_node_action_this = undefined;
-
 /*
  * Tencent is pleased to support the open source community by making
  * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available.
@@ -1128,7 +1127,7 @@ var use_node_action_this = undefined;
         className = val.className,
         text = val.text,
         style = val.style;
-      return (0,external_vue_namespaceObject.h)(node, {
+      return h(node, {
         "class": className,
         style: style
       }, text);
@@ -1420,7 +1419,7 @@ var use_node_action_this = undefined;
      */
     if (getNodeAttr(resolvedItem, NODE_ATTRIBUTES.IS_ASYNC)) {
       asyncNodeClick(resolvedItem).then(function () {
-        (0,external_vue_namespaceObject.nextTick)(function () {
+        nextTick(function () {
           nodeList.shift();
           setSelect(nodeList, selected, autoOpen);
         });
@@ -2372,8 +2371,7 @@ var use_tree_init_this = undefined;
 
 
 
-
-/* harmony default export */ const tree = ((0,external_vue_namespaceObject.defineComponent)({
+/* harmony default export */ const tree = (defineComponent({
   name: 'Tree',
   props: treeProps,
   emits: TreeEmitEventsType,
@@ -2398,7 +2396,7 @@ var use_tree_init_this = undefined;
       isSearchDisabled = _useSearch.isSearchDisabled,
       isTreeUI = _useSearch.isTreeUI,
       showChildNodes = _useSearch.showChildNodes;
-    var matchedNodePath = (0,external_vue_namespaceObject.reactive)([]);
+    var matchedNodePath = reactive([]);
     var filterFn = function filterFn(item) {
       if (isSearchActive.value) {
         if (showChildNodes) {
@@ -2412,7 +2410,7 @@ var use_tree_init_this = undefined;
       return checkNodeIsOpen(item);
     };
     // 计算当前需要渲染的节点信息
-    var renderData = (0,external_vue_namespaceObject.computed)(function () {
+    var renderData = computed(function () {
       return flatData.data.filter(function (item) {
         return filterFn(item);
       });
@@ -2439,14 +2437,14 @@ var use_tree_init_this = undefined;
       });
     });
     if (!isSearchDisabled) {
-      (0,external_vue_namespaceObject.watch)([refSearch], function () {
+      watch([refSearch], function () {
         handleSearch();
       }, {
         deep: true,
         immediate: true
       });
     }
-    var root = (0,external_vue_namespaceObject.ref)();
+    var root = ref();
     /**
      * 设置指定节点是否选中
      * @param item Node item | Node Id
@@ -2462,7 +2460,7 @@ var use_tree_init_this = undefined;
     var getData = function getData() {
       return flatData;
     };
-    (0,external_vue_namespaceObject.watch)(function () {
+    watch(function () {
       return [props.checked];
     }, function () {
       setChecked(props.checked, true);