bkui-vue 1.0.3-beta.60.scrollbar.5 → 1.0.3-beta.61

package/lib/table/table.variable.css

@@ -144,84 +144,11 @@
 .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;
@@ -1199,9 +1126,9 @@
 }
 .bk-table {
   position: relative;
-  width: 100%;
   height: auto;
   overflow: hidden;
+  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1217,9 +1144,19 @@
 }
 .bk-table .bk-table-body {
   position: relative;
-  overflow: hidden;
+  overflow: auto;
+  scrollbar-gutter: stable;
   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));
 }
@@ -1246,6 +1183,17 @@
   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;
@@ -1298,8 +1246,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 {
-  height: 100%;
   font-size: 14px;
+  height: 100%;
 }
 .bk-table .bk-table-head table th .cell.has-sort,
 .bk-table .bk-table-body table th .cell.has-sort,
@@ -1424,7 +1372,7 @@
 .bk-table .bk-table-body table thead th .cell {
   display: flex;
   align-items: center;
-  height: calc(var(--row-height) - 2px);
+  height: calc(var(--row-height) - 1px);
   color: #313238;
 }
 .bk-table .bk-table-head table thead th.active,
@@ -1441,27 +1389,28 @@
 .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%;
-  line-height: calc(var(--row-height) - 2px);
+  height: 100%;
+  line-height: calc(var(--row-height) - 1px);
   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 {
-  text-align: center;
   cursor: move;
+  text-align: center;
 }
 .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) {
@@ -1474,6 +1423,7 @@
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
+  scrollbar-gutter: stable;
   overflow: hidden;
   background-color: var(--background-color);
 }
@@ -1523,10 +1473,10 @@
 .bk-table.bordered-row .bk-table-head {
   border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-row .bk-table-body tbody tr td {
-  border-bottom-color: #dcdee5;
+.bk-table.bordered-row td {
+  border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-row .bk-table-body tbody tr:last-child td {
+.bk-table.bordered-row tr:last-child td {
   border-bottom: none;
 }
 .bk-table.bordered-outer {
@@ -1547,18 +1497,14 @@
 .bk-table.bordered-horizontal .__is-empty .bk-table-body-content {
   border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-col th {
+.bk-table.bordered-col th,
+.bk-table.bordered-col td {
   border-right: 1px solid #dcdee5;
 }
-.bk-table.bordered-col th:last-child {
+.bk-table.bordered-col th:last-child,
+.bk-table.bordered-col td: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, head: any, root: any, resetTableHeight: any) => {
+declare const _default: (props: TablePropTypes, context: SetupContext<any>, tableResp: ITableResponse, styleRef: any, 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

@@ -256,7 +256,7 @@ var COLUMN_ATTRIBUTE = {
 /**
  * Y 轴滚动条宽度
  */
-var SCROLLY_WIDTH = 0;
+var SCROLLY_WIDTH = 6;
 /**
  * 默认行高
  */

package/lib/timeline/index.js

@@ -1,4 +1,5 @@
 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/tree/tree.css

@@ -15,84 +15,11 @@
 .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;

package/lib/tree/tree.variable.css

@@ -144,84 +144,11 @@
 .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;

package/lib/upload/index.d.ts

@@ -84,6 +84,9 @@ declare const Upload: {
             default: string;
         };
         customRequest: import("vue").PropType<import("./upload.type").UploadRequestHandler>;
+        selectChange: {
+            type: import("vue").PropType<(event: Event) => boolean | void>;
+        };
         beforeUpload: {
             type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
         };
@@ -198,6 +201,9 @@ declare const Upload: {
             default: string;
         };
         customRequest: import("vue").PropType<import("./upload.type").UploadRequestHandler>;
+        selectChange: {
+            type: import("vue").PropType<(event: Event) => boolean | void>;
+        };
         beforeUpload: {
             type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
         };
@@ -341,6 +347,9 @@ declare const Upload: {
             default: string;
         };
         customRequest: import("vue").PropType<import("./upload.type").UploadRequestHandler>;
+        selectChange: {
+            type: import("vue").PropType<(event: Event) => boolean | void>;
+        };
         beforeUpload: {
             type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
         };
@@ -481,6 +490,9 @@ declare const Upload: {
         default: string;
     };
     customRequest: import("vue").PropType<import("./upload.type").UploadRequestHandler>;
+    selectChange: {
+        type: import("vue").PropType<(event: Event) => boolean | void>;
+    };
     beforeUpload: {
         type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
     };

package/lib/upload/index.js

@@ -1431,6 +1431,9 @@ var themes = [EThemes.BUTTON, EThemes.DRAGGABLE, EThemes.PICTURE];
     "default": ''
   },
   customRequest: Function,
+  selectChange: {
+    type: Function
+  },
   beforeUpload: {
     type: Function
   },
@@ -1796,7 +1799,8 @@ const button_less_namespaceObject = button_less_x({  });
     accept: props.accept,
     file: {
       type: Object
-    }
+    },
+    selectChange: props.selectChange
   },
   emits: ['change', 'remove'],
   setup: function setup(props, _ref) {
@@ -1835,6 +1839,10 @@ const button_less_namespaceObject = button_less_x({  });
       inputEl.value.click();
     };
     var handleFileChange = function handleFileChange(e) {
+      var _props$selectChange;
+      if (props.selectChange && ((_props$selectChange = props.selectChange) === null || _props$selectChange === void 0 ? void 0 : _props$selectChange.call(props, e)) === false) {
+        return false;
+      }
       var files = e.target.files;
       emit('change', Array.from(files));
     };
@@ -1861,39 +1869,17 @@ const button_less_namespaceObject = button_less_x({  });
     var dragover = (0,external_vue_namespaceObject.ref)(false);
     var Dragger = function Dragger() {
       var handleDrop = function handleDrop(e) {
+        var _props$selectChange2;
         if (disabled.value) {
           return;
         }
         e.preventDefault();
         dragover.value = false;
-        var files = Array.from(e.dataTransfer.files);
-        if (!acceptTypes.value) {
-          emit('change', files);
-          return;
+        if (props.selectChange && ((_props$selectChange2 = props.selectChange) === null || _props$selectChange2 === void 0 ? void 0 : _props$selectChange2.call(props, e)) === false) {
+          return false;
         }
-        var filesFiltered = files.filter(function (file) {
-          var type = file.type,
-            name = file.name;
-          var extension = name.includes('.') ? ".".concat(name.split('.').pop()) : '';
-          var baseType = type.replace(/\/.*$/, '');
-          return acceptTypes.value.split(',').map(function (type) {
-            return type.trim();
-          }).filter(function (type) {
-            return type;
-          }).some(function (acceptedType) {
-            if (acceptedType.startsWith('.')) {
-              return extension === acceptedType;
-            }
-            if (/\/\*$/.test(acceptedType)) {
-              return baseType === acceptedType.replace(/\/\*$/, '');
-            }
-            if (/^[^/]+\/[^/]+$/.test(acceptedType)) {
-              return type === acceptedType;
-            }
-            return false;
-          });
-        });
-        emit('change', filesFiltered);
+        var files = Array.from(e.dataTransfer.files);
+        emit('change', files);
       };
       var handleDragover = function handleDragover(e) {
         e.preventDefault();
@@ -2639,7 +2625,8 @@ function upload_arrayLikeToArray(arr, len) { if (len == null || len > arr.length
         theme: props.theme,
         multiple: props.multiple,
         disabled: props.disabled,
-        accept: props.accept
+        accept: props.accept,
+        selectChange: props.selectChange
       };
     });
     function onRemove(file, fileList) {
@@ -2660,10 +2647,14 @@ function upload_arrayLikeToArray(arr, len) { if (len == null || len > arr.length
         return;
       }
       // limit检查
-      if (props.limit && fileList.value.length + files.length > props.limit) {
+      if (props.limit > 1 && fileList.value.length + files.length > props.limit) {
         emit('exceed', files, fileList.value);
         return;
       }
+      // 限制1个时使用替换方式，将之前的列表清空
+      if (!props.multiple && props.limit === 1) {
+        fileList.value = [];
+      }
       var sendFiles = files;
       if (!props.multiple || props.limit === 1) {
         sendFiles = files.slice(0, 1);

package/lib/upload/props.d.ts

@@ -85,6 +85,9 @@ declare const _default: {
         default: string;
     };
     customRequest: PropType<UploadRequestHandler>;
+    selectChange: {
+        type: PropType<(event: Event) => boolean | void>;
+    };
     beforeUpload: {
         type: PropType<(file: UploadRawFile) => Promise<boolean> | boolean>;
     };

package/lib/upload/upload-trigger.d.ts

@@ -20,6 +20,9 @@ declare const _default: import("vue").DefineComponent<{
     file: {
         type: PropType<UploadFile>;
     };
+    selectChange: {
+        type: PropType<(event: Event) => boolean | void>;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "remove")[], "change" | "remove", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     theme: {
         type: PropType<"button" | "picture" | "draggable">;
@@ -40,6 +43,9 @@ declare const _default: import("vue").DefineComponent<{
     file: {
         type: PropType<UploadFile>;
     };
+    selectChange: {
+        type: PropType<(event: Event) => boolean | void>;
+    };
 }>> & {
     onChange?: (...args: any[]) => any;
     onRemove?: (...args: any[]) => any;

package/lib/upload/upload.d.ts

@@ -84,6 +84,9 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     customRequest: import("vue").PropType<import("./upload.type").UploadRequestHandler>;
+    selectChange: {
+        type: import("vue").PropType<(event: Event) => boolean | void>;
+    };
     beforeUpload: {
         type: import("vue").PropType<(file: UploadRawFile) => boolean | Promise<boolean>>;
     };
@@ -191,6 +194,9 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     customRequest: import("vue").PropType<import("./upload.type").UploadRequestHandler>;
+    selectChange: {
+        type: import("vue").PropType<(event: Event) => boolean | void>;
+    };
     beforeUpload: {
         type: import("vue").PropType<(file: UploadRawFile) => boolean | Promise<boolean>>;
     };

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

@@ -124,7 +124,6 @@ declare const BkVirtualRender: {
         } & {
             default: boolean;
         };
-        scrollbar: import("vue-types").VueTypeDef<import("./props").IScrollbarOption>;
         autoReset: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
@@ -262,7 +261,6 @@ declare const BkVirtualRender: {
         } & {
             default: boolean;
         };
-        scrollbar: import("vue-types").VueTypeDef<import("./props").IScrollbarOption>;
         autoReset: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
@@ -442,7 +440,6 @@ declare const BkVirtualRender: {
         } & {
             default: boolean;
         };
-        scrollbar: import("vue-types").VueTypeDef<import("./props").IScrollbarOption>;
         autoReset: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
@@ -616,7 +613,6 @@ declare const BkVirtualRender: {
     } & {
         default: boolean;
     };
-    scrollbar: import("vue-types").VueTypeDef<import("./props").IScrollbarOption>;
     autoReset: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {