bkui-vue 2.0.1-beta.60 → 2.0.1-beta.60.fix.1

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

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

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

@@ -1,11 +1,24 @@
 import { Ref } from 'vue';
-import BkScrollbar, { VirtualElement } from '../scrollbar';
+import BkScrollbar from '../scrollbar';
 import { VirtualRenderProps } from './props';
-declare const _default: (props: VirtualRenderProps) => {
-    init: (target: Ref<Partial<Element> & Partial<VirtualElement>>) => void;
+declare const _default: (target: Ref<HTMLElement>, props: VirtualRenderProps) => {
+    init: (scrollFn?: any, delegateXContent?: any, delegateYContent?: any) => void;
     instance: BkScrollbar;
     scrollTo: (x: any, y: any) => void;
-    update: () => 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;
+    };
     updateScrollHeight: (height: number) => void;
 };
 export default _default;

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

@@ -1,6 +1,4 @@
-export declare function getMatchedIndex(maxCount: number, maxHeight: number, callback: (agrs: {
-    index: number;
-}) => 0): {
+export declare function getMatchedIndex(maxCount: number, maxHeight: number, groupItemCount: number, callback: (index: number, items: any[]) => 0): {
     startIndex: number;
     height: number;
     diffHeight: number;
@@ -16,11 +14,7 @@ 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

@@ -1,133 +1,3 @@
-:root {
-  --bk-prefix: bk;
-  --popover-max-height: 216px;
-  --primary-color: #3a84ff;
-  --success-color: #2dcb56;
-  --warning-color: #ff9c01;
-  --danger-color: #ea3636;
-  --default-color: #63656e;
-  --gray-color: #979ba5;
-  --light-gray: #c4c6cc;
-  --white-color: white;
-  --whitesmoke-color: #fafbfd;
-  --disable-color: #dcdee5;
-  --disable-bg-color: #f9fafd;
-  --border-color: #dcdee5;
-  --font-size-base: 12px;
-  --font-size-medium: 14px;
-  --font-size-large: 16px;
-  --line-height-base: 16px;
-  --line-height-medium: 16px;
-  --line-height-large: 18px;
-  --component-size-small: 26px;
-  --component-size-base: 32px;
-  --component-size-large: 40px;
-  --component-size-small-padding: 0 12px;
-  --component-size-base-padding: 0 14px;
-  --component-size-large-padding: 0 16px;
-  --border-width-base: 1px;
-  --border-style-base: solid;
-  --border-radius-base: 2px;
-  --border-style-color: var(--light-gray);
-  --input-disabled-bg: #fafbfd;
-  --input-disabled-border: var(--disable-color);
-  --input-height-base: var(--component-size-base);
-  --input-color: var(--default-color);
-  --input-bg: white;
-  --input-border-color: var(--light-gray);
-  --input-broder-radius: 3px;
-  --input-shadow-color: #a3c5fd;
-  --input-horizontal-padding: 8px;
-  --input-block-color: #f5f7fa;
-  --input-block-hover-color: #eaebf0;
-  --input-icon-size: var(--font-size-medium);
-  --input-maxlength-color: #979ba5;
-  --button-primary-hover-color: #5594fa;
-  --button-danger-hover-color: #ff5656;
-  --button-success-hover-color: #45e35f;
-  --button-warning-hover-color: #ffb848;
-  --button-default-hover-border-color: #979ba5;
-  --button-primary-active-color: #2c77f4;
-  --button-danger-active-color: #db2626;
-  --button-success-active-color: #1ab943;
-  --button-warning-active-color: #eb9000;
-  --button-selected-bg-color: #e1ecff;
-  --button-disabled-selected-bg-color: #f0f1f5;
-  --radio-font-color: #63656e;
-  --radio-active-color: #3a84ff;
-  --radio-hover-border-color: #979ba5;
-  --radio-disabled-border: #dcdee5;
-  --radio-disabled-font-color: #c4c6cc;
-  --radio-disabled-checked-bg: #a3c5fd;
-  --radio-button-checked-bg: #e1ecff;
-  --radio-button-disabled-checked-bg: #fafbfd;
-  --checkbox-disabled-checked-bg: #a3c5fd;
-  --fixed-navbar-background: #fff;
-  --fixed-navbar-boxshadow-color: rgba(0, 0, 0, 0.1);
-  --switch-default-color: #fff;
-  --switch-grey-color: #c4c6cc;
-  --breadcrumb-black-color: #979ba5;
-  --breadcrumb-primary-hover-color: #0082ff;
-  --breadcrumb-fn-main-color: #63656e;
-  --link-default-hover-color: #979ba5;
-  --link-primary-hover-color: #699df4;
-  --link-success-hover-color: #45e35f;
-  --link-warning-hover-color: #ffb848;
-  --link-danger-hover-color: #ff5656;
-  --link-default-disabled-color: #dcdee5;
-  --link-primary-disabled-color: #a3c5fd;
-  --link-success-disabled-color: #94f5a4;
-  --link-warning-disabled-color: #ffd695;
-  --link-danger-disabled-color: #fd9c9c;
-  --message-color: var(--default-color);
-  --message-primary-bg-color: #f0f8ff;
-  --message-primary-border-color: #e1ecff;
-  --message-primary-shadow-color: #e1e8f4;
-  --message-warning-bg-color: #fff4e2;
-  --message-warning-border-color: #ffe8c3;
-  --message-warning-shadow-color: #ede6db;
-  --message-success-bg-color: #f2fff4;
-  --message-success-border-color: #dcffe2;
-  --message-success-shadow-color: #cef0d7;
-  --message-danger-bg-color: #ffeded;
-  --message-danger-border-color: #ffdddd;
-  --message-danger-shadow-color: #f6dada;
-  --slider-default-bg: #dcdee5;
-  --slider-disable-bar-bg: #979ba5;
-  --menu-bg-color: #182132;
-  --submenu-bg-color: #151d2c;
-  --menu-active-bg-color: linear-gradient(90deg, #3f87ff 0%, #3a84ff 100%);
-  --menu-color: #96a2b9;
-  --menu-group-color: var(--default-color);
-  --menu-width: 260px;
-  --menu-collapse-width: 60px;
-  --menu-active-color: white;
-  --nav-header-bg-color: #182132;
-  --nav-bg-color: #182132;
-  --date-picker-disabled-bg: #fafbfd;
-  --date-picker-dropdown-mb: 4px;
-  --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;
-  --table-row-hover-bg-color: #f5f7fa;
-  --table-row-active-bg-color: #f0f1f5;
-  --cascader-panel-border-color: #dcdee5;
-  --cascader-panel-hover: #f5f7fa;
-  --cascader-panel-active: #e1ecff;
-  --cascader-panel-disabled-bg: #fff;
-  --search-select-focus-border-color: var(--primary-color);
-  --search-select-focus-color: #3c96ff;
-  --search-select-font-color: var(--default-color);
-  --search-select-placeholder-color: var(--light-gray);
-  --search-select-message-color: var(--danger-color);
-  --search-select-menu-border-color: var(--disable-color);
-  --select-active-color: #e1ecff;
-  --select-hover-color: #f5f7fa;
-}
 .bk-F-scroll-x {
   overflow-x: auto;
   scrollbar-color: #a0a0a0 transparent;
@@ -145,118 +15,92 @@
 .bk-F-scroll-y::-webkit-scrollbar-thumb {
   border-radius: 4px;
 }
-.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 {
+  position: relative;
+  overflow: hidden;
 }
-.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-content-el {
+  display: inline-flex;
+  flex-direction: column;
+  width: 100%;
 }
-.bk-scrollbar .bk__rail-x {
-  display: none;
-  opacity: 0;
-  transition: background-color 0.2s linear, opacity 0.2s linear;
-  height: 10px;
-  bottom: 0px;
+.bk-scrollbar-wrapper .bk-scrollbar-track {
+  z-index: 1;
   position: absolute;
+  right: 0;
+  bottom: 0;
+  pointer-events: none;
+  overflow: hidden;
 }
-.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 {
+  background-color: #F0F1F5;
+  cursor: pointer;
 }
-.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-hover .bk-scrollbar::before {
+  background-color: #979BA5;
 }
-.bk-scrollbar .bk__rail-y.bk-size-small {
+.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 .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;
+.bk-scrollbar-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal {
+  left: 0;
   height: 8px;
-  bottom: 0px;
+  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 {
   position: absolute;
+  left: 0;
+  right: 0;
+  min-height: 8px;
 }
-.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;
+.bk-scrollbar-wrapper .bk-scrollbar::before {
   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 .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-scrollbar-wrapper .bk-scrollbar.bk-scrollbar-visible::before {
+  opacity: 0.9;
+  transition-delay: 0s;
+  transition-duration: 0s;
 }
 .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,7 +29,9 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
-    maxHeight: import("vue-types").VueTypeDef<string | number>;
+    maxHeight: import("vue-types").VueTypeValidableDef<number> & {
+        default: number;
+    };
     height: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
@@ -94,6 +96,11 @@ 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;
     } & {
@@ -163,7 +170,9 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
-    maxHeight: import("vue-types").VueTypeDef<string | number>;
+    maxHeight: import("vue-types").VueTypeValidableDef<number> & {
+        default: number;
+    };
     height: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
@@ -228,6 +237,11 @@ 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;
     } & {
@@ -275,6 +289,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     width: string | number;
     height: string | number;
+    maxHeight: number;
     contentClassName: string | {
         [key: string]: any;
     };
@@ -295,6 +310,7 @@ declare const _default: import("vue").DefineComponent<{
     groupItemCount: number;
     preloadItemCount: number;
     renderAs: string;
+    contentAs: string;
     scrollOffsetTop: number;
     scrollPosition: string;
     abosuteHeight: string | number;
@@ -304,9 +320,9 @@ declare const _default: import("vue").DefineComponent<{
     autoReset: boolean;
     autoIndex: boolean;
 }, SlotsType<{
-    default?: Record<string, object>;
-    beforeContent?: Record<string, object>;
-    afterContent?: Record<string, object>;
-    afterSection?: Record<string, object>;
+    default?: any;
+    beforeContent?: any;
+    afterContent?: any;
+    afterSection?: any;
 }>>;
 export default _default;

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

@@ -1,12 +1,21 @@
 @import '../styles/themes/themes.less';
 @import '../styles/mixins/scroll.less';
-@import '../scrollbar/css/scrollbar.less';
+@import '../scrollbar/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;
   }
-}
+}