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

package/lib/table/index.js

@@ -101,7 +101,7 @@ function toPrimitive(t, r) {
 
 function toPropertyKey(t) {
   var i = toPrimitive(t, "string");
-  return "symbol" == typeof_typeof(i) ? i : String(i);
+  return "symbol" == typeof_typeof(i) ? i : i + "";
 }
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
 
@@ -295,7 +295,7 @@ var COLUMN_ATTRIBUTE = {
 /**
  * Y 轴滚动条宽度
  */
-var SCROLLY_WIDTH = 6;
+var SCROLLY_WIDTH = 0;
 /**
  * 默认行高
  */
@@ -1051,7 +1051,7 @@ var BkTableCache = /*#__PURE__*/function () {
     defineProperty_defineProperty(this, "defKey", Symbol('bk-table-cache-def-key'));
     this.storage = new WeakMap();
   }
-  _createClass(BkTableCache, [{
+  return _createClass(BkTableCache, [{
     key: "queueStack",
     value: function queueStack(methodName) {
       var _target$methodName;
@@ -1085,7 +1085,6 @@ var BkTableCache = /*#__PURE__*/function () {
       }
     }
   }]);
-  return BkTableCache;
 }();
 
 ;// CONCATENATED MODULE: ../../packages/table/src/events.ts
@@ -1496,7 +1495,6 @@ function _toConsumableArray(arr) {
  */
 
 
-
 /**
  * 固定列Hooks
  */
@@ -1583,13 +1581,12 @@ function _toConsumableArray(arr) {
    * @returns
    */
   var resolveFixedColumnStyle = function resolveFixedColumnStyle(column) {
-    var hasScrollY = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     if (!column.fixed || isHiddenColumn(column)) {
       return {};
     }
     var fixedOffset = {
       left: 0,
-      right: hasScrollY ? SCROLLY_WIDTH : -1
+      right: -1
     };
     var fixedPos = resolveFixColPos(column);
     fixedOffset[fixedPos] = getPreColumnOffset(fixedPos, column, fixedOffset[fixedPos]);
@@ -4808,7 +4805,7 @@ const directives_namespaceObject = directives_x({ ["bkEllipsisInstance"]: () =>
  * IN THE SOFTWARE.
  */
 
-/* harmony default export */ const table_row = ((0,external_vue_namespaceObject.defineComponent)({
+/* harmony default export */ const table_row = (defineComponent({
   name: 'TableRow',
   render: function render() {
     var _this$$slots$default, _this$$slots;
@@ -4854,8 +4851,7 @@ const exception_less_namespaceObject = exception_less_x({  });
 
 
 
-
-/* harmony default export */ const body_empty = ((0,external_vue_namespaceObject.defineComponent)({
+/* harmony default export */ const body_empty = (defineComponent({
   name: 'BodyEmpty',
   props: {
     list: shared_namespaceObject.PropTypes.array.def([]),
@@ -4865,13 +4861,13 @@ const exception_less_namespaceObject = exception_less_x({  });
   emits: ['change'],
   setup: function setup(props) {
     var t = (0,config_provider_namespaceObject.useLocale)('table');
-    var localEmptyText = (0,external_vue_namespaceObject.computed)(function () {
+    var localEmptyText = computed(function () {
       if (props.emptyText === undefined) {
         return t.value.emptyText;
       }
       return props.emptyText;
     });
-    var type = (0,external_vue_namespaceObject.computed)(function () {
+    var type = computed(function () {
       return props.list.length === 0 ? 'empty' : 'search-empty';
     });
     return function () {
@@ -6166,7 +6162,7 @@ function use_render_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
 function use_render_isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0,external_vue_namespaceObject.isVNode)(s);
 }
-/* harmony default export */ const use_render = (function (props, context, tableResp, styleRef, head, root, resetTableHeight) {
+/* harmony default export */ const use_render = (function (props, context, tableResp, head, root, resetTableHeight) {
   var t = (0,config_provider_namespaceObject.useLocale)('table');
   var uuid = esm_browser_v4();
   var formatData = (0,external_vue_namespaceObject.computed)(function () {
@@ -6304,8 +6300,7 @@ function use_render_isSlot(s) {
       '--row-height': "".concat(resolvePropVal(config, 'height', ['thead']), "px"),
       backgroundColor: props.thead.color
     };
-    var _useFixedColumn = use_fixed_column(props, tableResp, head),
-      resolveFixedColumnStyle = _useFixedColumn.resolveFixedColumnStyle;
+    // const { resolveFixedColumnStyle } = useFixedColumn(props, tableResp, head);
     return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [(0,external_vue_namespaceObject.createVNode)("thead", {
       "style": rowStyle
     }, [(0,external_vue_namespaceObject.createVNode)(table_row, null, {
@@ -6314,7 +6309,7 @@ function use_render_isSlot(s) {
           var _props$thead$color, _props$thead;
           var _useHeadCell = use_head_cell(props, context, column, tableResp),
             getTH = _useHeadCell.getTH;
-          var headStyle = Object.assign({}, resolveFixedColumnStyle(column, styleRef.value.hasScrollY), {
+          var headStyle = Object.assign({}, resolveFixedColumnStyle(column), {
             '--background-color': DEF_COLOR[(_props$thead$color = (_props$thead = props.thead) === null || _props$thead === void 0 ? void 0 : _props$thead.color) !== null && _props$thead$color !== void 0 ? _props$thead$color : IHeadColor.DEF1]
           });
           var classList = [getHeadColumnClass(column, index), getColumnCustomClass(column), column.align || props.headerAlign || props.align];
@@ -6390,13 +6385,14 @@ function use_render_isSlot(s) {
       return result;
     })]);
   };
-  var _useFixedColumn2 = use_fixed_column(props, tableResp, head),
-    resolveFixedColumnStyle = _useFixedColumn2.resolveFixedColumnStyle;
+  var _useFixedColumn = use_fixed_column(props, tableResp, head),
+    resolveFixedColumnStyle = _useFixedColumn.resolveFixedColumnStyle;
   var getRowRender = function getRowRender(row, rowIndex, preRow, rows, rowSpanMap, needRowSpan) {
     var isChild = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     var rowLength = rows.length;
     var rowStyle = [].concat(_toConsumableArray(formatPropAsArray(props.rowStyle, [row, rowIndex])), [{
-      '--row-height': "".concat(getRowHeight(row, rowIndex), "px")
+      '--row-height': "".concat(getRowHeight(row, rowIndex), "px"),
+      '--scroll-x': "".concat(tableResp.formatData.layout.translateX, "px")
     }]);
     var rowClass = [].concat(_toConsumableArray(formatPropAsArray(props.rowClass, [row, rowIndex])), ["hover-".concat(props.rowHover), rowIndex % 2 === 1 && props.stripe ? 'stripe-row' : '']);
     var rowId = tableResp.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_UID);
@@ -6811,7 +6807,6 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
       wrapperStyle = _useClass.wrapperStyle,
       contentStyle = _useClass.contentStyle,
       headStyle = _useClass.headStyle,
-      hasScrollYRef = _useClass.hasScrollYRef,
       hasFooter = _useClass.hasFooter,
       footerStyle = _useClass.footerStyle,
       tableBodyClass = _useClass.tableBodyClass,
@@ -6832,17 +6827,17 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
       updateFixClass = _useFixedColumn.updateFixClass;
     var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
       resolveClassName = _usePrefix.resolveClassName;
-    var styleRef = (0,external_vue_namespaceObject.computed)(function () {
-      return {
-        hasScrollY: hasScrollYRef.value
-      };
-    });
+    // const styleRef = computed(() => ({
+    //   hasScrollY: hasScrollYRef.value,
+    // }));
     use_observer_resize(root, function () {
       (0,external_vue_namespaceObject.nextTick)(function () {
         resolveFixedColumns(tableOffsetRight.value);
       });
     });
-    var _useRender = use_render(props, ctx, tableSchema, styleRef, head, root, resetTableHeight),
+    var _useRender = use_render(props, ctx, tableSchema,
+      // styleRef,
+      head, root, resetTableHeight),
       renderTableBodySchema = _useRender.renderTableBodySchema,
       renderTableFooter = _useRender.renderTableFooter,
       renderTableHeadSchema = _useRender.renderTableHeadSchema;
@@ -6984,6 +6979,9 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
         "throttleDelay": 120,
         "scrollEvent": true,
         "rowKey": props.rowKey,
+        "scrollbar": {
+          enabled: true
+        },
         "enabled": props.virtualEnabled,
         "keepAlive": true
       }), {

package/lib/table/plugins/use-fixed-column.d.ts

@@ -6,7 +6,7 @@ import { ITableResponse } from '../use-attributes';
  */
 declare const _default: (props: TablePropTypes, tableResp: ITableResponse, head?: Ref<HTMLElement>) => {
     fixedWrapperClass: string;
-    resolveFixedColumnStyle: (column: Column, hasScrollY?: boolean) => {
+    resolveFixedColumnStyle: (column: Column) => {
         [x: string]: string;
     };
     resolveFixedColumns: (tableOffsetRight: any) => void;

package/lib/table/table.css

@@ -15,11 +15,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;
@@ -997,9 +1070,9 @@
 }
 .bk-table {
   position: relative;
+  width: 100%;
   height: auto;
   overflow: hidden;
-  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1015,19 +1088,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));
 }
@@ -1054,17 +1117,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;
@@ -1117,8 +1169,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,
@@ -1243,7 +1295,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,
@@ -1260,28 +1312,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) {
@@ -1294,7 +1345,6 @@
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
-  scrollbar-gutter: stable;
   overflow: hidden;
   background-color: var(--background-color);
 }
@@ -1344,10 +1394,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 {
@@ -1368,14 +1418,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/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;
   }