bkui-vue 2.0.1-beta.11 → 2.0.1-beta.111

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

@@ -1,6 +1,7 @@
 import { ExtractPropTypes } from 'vue';
 export type IScrollbarOption = {
     enabled: boolean;
+    size?: 'normal' | 'small';
 };
 export declare const virtualRenderProps: {
     onContentScroll: FunctionConstructor;
@@ -49,9 +50,7 @@ export declare const virtualRenderProps: {
         default: number;
     };
     /** 整体最大高度 */
-    maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-        default: number;
-    };
+    maxHeight: import("vue-types").VueTypeDef<string | number>;
     /**
      * 整体高度
      * 可设置具体值，如果设置为 100%，则组件会自动计算外层DOM元素offsetHeight，用于计算可渲染行数
@@ -132,12 +131,6 @@ export declare const virtualRenderProps: {
     } & {
         default: string;
     };
-    /** 内容层渲染成目标元素 */
-    contentAs: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    } & {
-        default: string;
-    };
     /** top 滚动填充 */
     scrollOffsetTop: import("vue-types").VueTypeValidableDef<number> & {
         default: number;

package/lib/virtual-render/use-fix-top.d.ts

@@ -3,7 +3,7 @@ type IFixToTopParams = {
     index?: number;
     id?: string;
     item?: {
-        [key: string]: any;
+        [key: string]: unknown;
     };
     position: number[];
 };

package/lib/virtual-render/use-scrollbar.d.ts

@@ -1,24 +1,11 @@
 import { Ref } from 'vue';
-import BkScrollbar from '../scrollbar';
+import BkScrollbar, { VirtualElement } from '../scrollbar';
 import { VirtualRenderProps } from './props';
-declare const _default: (target: Ref<HTMLElement>, props: VirtualRenderProps) => {
-    init: (scrollFn?: any, delegateXContent?: any, delegateYContent?: any) => void;
+declare const _default: (props: VirtualRenderProps) => {
+    init: (target: Ref<Partial<Element> & Partial<VirtualElement>>) => void;
     instance: BkScrollbar;
     scrollTo: (x: any, y: any) => void;
-    classNames: {
-        contentEl: string;
-        wrapper: string;
-        scrollbar: string;
-        track: string;
-        visible: string;
-        horizontal: string;
-        vertical: string;
-        hover: string;
-        dragging: string;
-        scrolling: string;
-        scrollable: string;
-        mouseEntered: string;
-    };
+    update: () => void;
     updateScrollHeight: (height: number) => void;
 };
 export default _default;

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

@@ -1,4 +1,6 @@
-export declare function getMatchedIndex(maxCount: number, maxHeight: number, groupItemCount: number, callback: (index: number, items: any[]) => 0): {
+export declare function getMatchedIndex(maxCount: number, maxHeight: number, callback: (agrs: {
+    index: number;
+}) => 0): {
     startIndex: number;
     height: number;
     diffHeight: number;
@@ -14,7 +16,11 @@ export declare class VisibleRender {
     private binding;
     private wrapper;
     private delay;
+    private delegateWrapper;
     constructor(binding: any, el: any);
+    get scrollHeight(): any;
+    get offsetHeight(): any;
+    setDelegateWrapper(el: any): void;
     render(e: any): void;
     executeThrottledRender(e: any): void;
     install(): void;

package/lib/virtual-render/virtual-render.css

@@ -15,92 +15,118 @@
 .bk-F-scroll-y::-webkit-scrollbar-thumb {
   border-radius: 4px;
 }
-.bk-scrollbar-wrapper {
-  position: relative;
-  overflow: hidden;
+.bk-scrollbar {
+  overflow: hidden !important;
+  overflow-anchor: none;
+  touch-action: auto;
+  /*
+ * Scrollbar rail styles
+ */
+  /*
+ * Scrollbar thumb styles
+ */
+}
+.bk-scrollbar.bk--active-x > .bk__rail-x,
+.bk-scrollbar.bk--active-y > .bk__rail-y {
+  display: block;
+}
+.bk-scrollbar .bk__rail-x:hover,
+.bk-scrollbar .bk__rail-y:hover,
+.bk-scrollbar .bk__rail-x:focus,
+.bk-scrollbar .bk__rail-y:focus,
+.bk-scrollbar .bk__rail-x.bk--clicking,
+.bk-scrollbar .bk__rail-y.bk--clicking {
+  background-color: #f0f1f5;
+}
+.bk-scrollbar .bk__rail-x {
+  display: none;
+  opacity: 0;
+  transition: background-color 0.2s linear, opacity 0.2s linear;
+  height: 10px;
+  bottom: 0px;
+  position: absolute;
+}
+.bk-scrollbar .bk__rail-x.bk-size-small {
+  height: 8px;
 }
-.bk-scrollbar-wrapper .bk-scrollbar-content-el {
-  display: inline-flex;
-  flex-direction: column;
-  width: 100%;
+.bk-scrollbar .bk__rail-x.bk-size-small .bk__thumb-x {
+  height: 6px;
 }
-.bk-scrollbar-wrapper .bk-scrollbar-track {
-  z-index: 1;
+.bk-scrollbar .bk__rail-y {
+  display: none;
+  opacity: 0;
+  transition: background-color 0.2s linear, opacity 0.2s linear;
+  width: 10px;
+  right: 0px;
   position: absolute;
-  right: 0;
-  bottom: 0;
-  pointer-events: none;
-  overflow: hidden;
+  margin-right: 2px;
 }
-.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover {
-  background-color: #F0F1F5;
-  cursor: pointer;
+.bk-scrollbar .bk__rail-y.bk-size-small {
+  width: 8px;
 }
-.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover .bk-scrollbar::before {
-  background-color: #979BA5;
+.bk-scrollbar .bk__rail-y.bk-size-small .bk__thumb-y {
+  width: 6px;
 }
-.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:hover > .bk__rail-x,
+.bk-scrollbar:hover > .bk__rail-y,
+.bk-scrollbar.bk--focus > .bk__rail-x,
+.bk-scrollbar.bk--focus > .bk__rail-y,
+.bk-scrollbar.bk--scrolling-x > .bk__rail-x,
+.bk-scrollbar.bk--scrolling-y > .bk__rail-y {
+  opacity: 0.9;
 }
-.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal {
-  left: 0;
+.bk-scrollbar .bk__thumb-x {
+  background-color: #dcdee5;
+  border-radius: 8px;
+  transition: background-color 0.2s linear, height 0.2s ease-in-out;
   height: 8px;
-  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: 8px;
-  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 {
+  bottom: 0px;
   position: absolute;
-  left: 0;
-  right: 0;
-  min-height: 8px;
 }
-.bk-scrollbar-wrapper .bk-scrollbar::before {
+.bk-scrollbar .bk__thumb-y {
+  background-color: #dcdee5;
+  border-radius: 8px;
+  transition: background-color 0.2s linear, width 0.2s ease-in-out;
+  width: 8px;
+  right: 0px;
   position: absolute;
-  content: '';
-  background: #DCDEE5;
-  border-radius: 6px;
-  left: 1px;
-  right: 1px;
-  top: 1px;
-  bottom: 1px;
-  opacity: 0;
-  transition: opacity 0.2s 0.9s linear;
 }
-.bk-scrollbar-wrapper .bk-scrollbar.bk-scrollbar-visible::before {
-  opacity: 0.9;
-  transition-delay: 0s;
-  transition-duration: 0s;
+.bk-scrollbar .bk__rail-x:hover > .bk__thumb-x,
+.bk-scrollbar .bk__rail-x:focus > .bk__thumb-x,
+.bk-scrollbar .bk__rail-x.bk--clicking .bk__thumb-x {
+  background-color: #979ba5;
+  height: 10px;
+}
+.bk-scrollbar .bk__rail-y:hover > .bk__thumb-y,
+.bk-scrollbar .bk__rail-y:focus > .bk__thumb-y,
+.bk-scrollbar .bk__rail-y.bk--clicking .bk__thumb-y {
+  background-color: #979ba5;
+  width: 10px;
+}
+.bk-scrollbar .bk-size-small > .bk__thumb-x,
+.bk-scrollbar .bk-size-small > .bk__thumb-x,
+.bk-scrollbar .bk-size-small.bk--clicking .bk__thumb-x {
+  height: 8px;
+}
+.bk-scrollbar .bk-size-small:hover > .bk__thumb-y,
+.bk-scrollbar .bk-size-small:focus > .bk__thumb-y,
+.bk-scrollbar .bk-size-small.bk--clicking .bk__thumb-y {
+  width: 8px;
+}
+/* MS supports */
+@supports (-ms-overflow-style: none) {
+  .bk-scrollbar {
+    overflow: auto !important;
+  }
+}
+@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+  .bk-scrollbar {
+    overflow: auto !important;
+  }
 }
 .bk-virtual-render {
   position: relative;
 }
-.bk-virtual-render .bk-virtual-content {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
 .bk-virtual-render .bk-virtual-section {
   width: 1px;
   background: transparent;

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

@@ -29,9 +29,7 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
-    maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-        default: number;
-    };
+    maxHeight: import("vue-types").VueTypeDef<string | number>;
     height: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
@@ -96,11 +94,6 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: string;
     };
-    contentAs: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    } & {
-        default: string;
-    };
     scrollOffsetTop: import("vue-types").VueTypeValidableDef<number> & {
         default: number;
     } & {
@@ -170,9 +163,7 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
-    maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-        default: number;
-    };
+    maxHeight: import("vue-types").VueTypeDef<string | number>;
     height: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
@@ -237,11 +228,6 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: string;
     };
-    contentAs: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    } & {
-        default: string;
-    };
     scrollOffsetTop: import("vue-types").VueTypeValidableDef<number> & {
         default: number;
     } & {
@@ -289,18 +275,17 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     width: string | number;
     height: string | number;
-    maxHeight: number;
     contentClassName: string | {
         [key: string]: any;
     };
     enabled: boolean;
     list: unknown[];
+    lineHeight: any;
     minHeight: number;
     wrapperStyle: any;
     className: string | {
         [key: string]: any;
     };
-    lineHeight: any;
     scrollEvent: boolean;
     contentStyle: {
         [key: string]: any;
@@ -310,7 +295,6 @@ declare const _default: import("vue").DefineComponent<{
     groupItemCount: number;
     preloadItemCount: number;
     renderAs: string;
-    contentAs: string;
     scrollOffsetTop: number;
     scrollPosition: string;
     abosuteHeight: string | number;
@@ -320,9 +304,9 @@ declare const _default: import("vue").DefineComponent<{
     autoReset: boolean;
     autoIndex: boolean;
 }, 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>;
 }>>;
 export default _default;

package/lib/virtual-render/virtual-render.less

@@ -1,21 +1,12 @@
 @import '../styles/themes/themes.less';
 @import '../styles/mixins/scroll.less';
-@import '../scrollbar/scrollbar.less';
+@import '../scrollbar/css/scrollbar.less';
 
 .@{bk-prefix}-virtual-render {
   position: relative;
 
-  .@{bk-prefix}-virtual-content {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-  }
-
   .@{bk-prefix}-virtual-section {
     width: 1px;
     background: transparent;
   }
-}
+}

package/lib/virtual-render/virtual-render.variable.css

@@ -109,6 +109,7 @@
   --date-picker-dropdown-bg: #fff;
   --table-bg-color: var(--white-color);
   --table-border-color: #dcdee5;
+  --table-strip-color: #fafbfd;
   --table-head-bg-color: #fafbfd;
   --table-head-font-color: #313238;
   --table-body-font-color: #63656E;
@@ -144,92 +145,118 @@
 .bk-F-scroll-y::-webkit-scrollbar-thumb {
   border-radius: 4px;
 }
-.bk-scrollbar-wrapper {
-  position: relative;
-  overflow: hidden;
+.bk-scrollbar {
+  overflow: hidden !important;
+  overflow-anchor: none;
+  touch-action: auto;
+  /*
+ * Scrollbar rail styles
+ */
+  /*
+ * Scrollbar thumb styles
+ */
+}
+.bk-scrollbar.bk--active-x > .bk__rail-x,
+.bk-scrollbar.bk--active-y > .bk__rail-y {
+  display: block;
 }
-.bk-scrollbar-wrapper .bk-scrollbar-content-el {
-  display: inline-flex;
-  flex-direction: column;
-  width: 100%;
+.bk-scrollbar .bk__rail-x:hover,
+.bk-scrollbar .bk__rail-y:hover,
+.bk-scrollbar .bk__rail-x:focus,
+.bk-scrollbar .bk__rail-y:focus,
+.bk-scrollbar .bk__rail-x.bk--clicking,
+.bk-scrollbar .bk__rail-y.bk--clicking {
+  background-color: #f0f1f5;
 }
-.bk-scrollbar-wrapper .bk-scrollbar-track {
-  z-index: 1;
+.bk-scrollbar .bk__rail-x {
+  display: none;
+  opacity: 0;
+  transition: background-color 0.2s linear, opacity 0.2s linear;
+  height: 10px;
+  bottom: 0px;
   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 .bk__rail-x.bk-size-small {
+  height: 8px;
+}
+.bk-scrollbar .bk__rail-x.bk-size-small .bk__thumb-x {
+  height: 6px;
 }
-.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-hover .bk-scrollbar::before {
-  background-color: #979BA5;
+.bk-scrollbar .bk__rail-y {
+  display: none;
+  opacity: 0;
+  transition: background-color 0.2s linear, opacity 0.2s linear;
+  width: 10px;
+  right: 0px;
+  position: absolute;
+  margin-right: 2px;
 }
-.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-vertical {
-  top: 0;
+.bk-scrollbar .bk__rail-y.bk-size-small {
   width: 8px;
-  transform: translate(var(--scroll-offset-x), var(--scroll-offset-y));
 }
-.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal {
-  left: 0;
+.bk-scrollbar .bk__rail-y.bk-size-small .bk__thumb-y {
+  width: 6px;
+}
+.bk-scrollbar:hover > .bk__rail-x,
+.bk-scrollbar:hover > .bk__rail-y,
+.bk-scrollbar.bk--focus > .bk__rail-x,
+.bk-scrollbar.bk--focus > .bk__rail-y,
+.bk-scrollbar.bk--scrolling-x > .bk__rail-x,
+.bk-scrollbar.bk--scrolling-y > .bk__rail-y {
+  opacity: 0.9;
+}
+.bk-scrollbar .bk__thumb-x {
+  background-color: #dcdee5;
+  border-radius: 8px;
+  transition: background-color 0.2s linear, height 0.2s ease-in-out;
   height: 8px;
-  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: 8px;
-  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 {
+  bottom: 0px;
   position: absolute;
-  left: 0;
-  right: 0;
-  min-height: 8px;
 }
-.bk-scrollbar-wrapper .bk-scrollbar::before {
+.bk-scrollbar .bk__thumb-y {
+  background-color: #dcdee5;
+  border-radius: 8px;
+  transition: background-color 0.2s linear, width 0.2s ease-in-out;
+  width: 8px;
+  right: 0px;
   position: absolute;
-  content: '';
-  background: #DCDEE5;
-  border-radius: 6px;
-  left: 1px;
-  right: 1px;
-  top: 1px;
-  bottom: 1px;
-  opacity: 0;
-  transition: opacity 0.2s 0.9s linear;
 }
-.bk-scrollbar-wrapper .bk-scrollbar.bk-scrollbar-visible::before {
-  opacity: 0.9;
-  transition-delay: 0s;
-  transition-duration: 0s;
+.bk-scrollbar .bk__rail-x:hover > .bk__thumb-x,
+.bk-scrollbar .bk__rail-x:focus > .bk__thumb-x,
+.bk-scrollbar .bk__rail-x.bk--clicking .bk__thumb-x {
+  background-color: #979ba5;
+  height: 10px;
+}
+.bk-scrollbar .bk__rail-y:hover > .bk__thumb-y,
+.bk-scrollbar .bk__rail-y:focus > .bk__thumb-y,
+.bk-scrollbar .bk__rail-y.bk--clicking .bk__thumb-y {
+  background-color: #979ba5;
+  width: 10px;
+}
+.bk-scrollbar .bk-size-small > .bk__thumb-x,
+.bk-scrollbar .bk-size-small > .bk__thumb-x,
+.bk-scrollbar .bk-size-small.bk--clicking .bk__thumb-x {
+  height: 8px;
+}
+.bk-scrollbar .bk-size-small:hover > .bk__thumb-y,
+.bk-scrollbar .bk-size-small:focus > .bk__thumb-y,
+.bk-scrollbar .bk-size-small.bk--clicking .bk__thumb-y {
+  width: 8px;
+}
+/* MS supports */
+@supports (-ms-overflow-style: none) {
+  .bk-scrollbar {
+    overflow: auto !important;
+  }
+}
+@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+  .bk-scrollbar {
+    overflow: auto !important;
+  }
 }
 .bk-virtual-render {
   position: relative;
 }
-.bk-virtual-render .bk-virtual-content {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
 .bk-virtual-render .bk-virtual-section {
   width: 1px;
   background: transparent;

package/lib/volar.components.d.ts

@@ -71,6 +71,8 @@ declare module '@vue/runtime-core' {
     BkSteps: typeof import('./steps/steps').default;
     BkSwitcher: typeof import('./switcher/switcher').default;
     BkTable: typeof import('./table/table').default;
+    BkTableColumn: typeof import('./table/components/table-column').default;
+    BkCollapse: typeof import('./collapse/collapse').default;
     BkTag: typeof import('./tag/tag').default;
     BkTagInput: typeof import('./tag-input/tag-input').default;
     BkDivider: typeof import('./divider/divider').default;