bkui-vue 2.0.1-beta.27 → 2.0.1-beta.28.table.1

package/lib/index.js

@@ -4,5 +4,5 @@ export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
 export * as plugins from './plugins';
-export const version = "2.0.1-beta.27";
+export const version = "2.0.1-beta.28.table.1";
 window.__bkui_vue_version__ = version;

package/lib/scrollbar/index.js

@@ -18345,6 +18345,37 @@ var BkScrollbarCore = /*#__PURE__*/function () {
       var scrollAttr = this.axis[axis].scrollOffsetAttr;
       Object.assign(this.wrapperScrollMap, _defineProperty({}, scrollAttr, handleOffset));
       scrollbar.el.style.transform = axis === 'x' ? "translate3d(".concat(handleOffset, "px, 0, 0)") : "translate3d(0, ".concat(handleOffset, "px, 0)");
+      // const translateAxis = axis === 'x' ? 'translateX' : 'translateY';
+      // anime({
+      //   targets: scrollbar.el,
+      //   [translateAxis]: handleOffset,
+      //   duration: 300,
+      //   easing: 'easeOutQuad',
+      //   complete: () => {
+      //     this.options?.onScrollCallback?.({
+      //       x: this.wrapperScrollValue.scrollLeft,
+      //       y: this.wrapperScrollValue.scrollTop,
+      //     });
+      //   },
+      // });
+      // if (!this.isDragging) {
+      //   const translateAxis = axis === 'x' ? 'translateX' : 'translateY';
+      //   anime({
+      //     targets: scrollbar.el,
+      //     [translateAxis]: handleOffset,
+      //     duration: 300,
+      //     easing: 'easeOutQuad',
+      //     complete: () => {
+      //       this.options?.onScrollCallback?.({
+      //         x: this.wrapperScrollValue.scrollLeft,
+      //         y: this.wrapperScrollValue.scrollTop,
+      //       });
+      //     },
+      //   });
+      // } else {
+      //   scrollbar.el.style.transform =
+      //     axis === 'x' ? `translate3d(${handleOffset}px, 0, 0)` : `translate3d(0, ${handleOffset}px, 0)`;
+      // }
     }
   }, {
     key: "toggleTrackVisibility",
@@ -18562,6 +18593,7 @@ var BkScrollbarCore = /*#__PURE__*/function () {
   }, {
     key: "findChild",
     value: function findChild(el, query) {
+      // @ts-ignore
       var matches = el.matches || el.webkitMatchesSelector || el.mozMatchesSelector || el.msMatchesSelector;
       return Array.prototype.filter.call(el.children, function (child) {
         return matches.call(child, query);
@@ -18707,7 +18739,7 @@ var BkScrollBar = /*#__PURE__*/function (_BkScrollbarCore) {
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, BkScrollBar, [].concat(args));
-    // // Save a reference to the instance, so we know this DOM node has already been instancied
+    // Save a reference to the instance, so we know this DOM node has already been instancied
     BkScrollBar.instances.set(args[0], _assertThisInitialized(_this));
     return _this;
   }

package/lib/scrollbar/scrollbar-core/index.d.ts

@@ -1,5 +1,5 @@
 import * as helpers from './helpers';
-interface DebouncedFunc<T extends (...args: any[]) => any> {
+interface DebouncedFunc<T extends (...args: any[]) => void> {
     /**
      * Call the original function, but applying the debounce rules.
      *
@@ -77,13 +77,13 @@ type AxisProps = {
     isOverflowing: boolean;
     forceVisible: boolean;
     track: {
-        size: any;
+        size: number;
         el: HTMLElement | null;
         rect: DOMRect | null;
         isVisible: boolean;
     };
     scrollbar: {
-        size: any;
+        size: number;
         el: HTMLElement | null;
         rect: DOMRect | null;
         isVisible: boolean;
@@ -161,11 +161,11 @@ export default class BkScrollbarCore {
      * 模拟滚动条内部缩略滚动器滚动位置缓存器
      */
     wrapperScrollMap: {};
-    onMouseMove: (() => void) | DebouncedFunc<any>;
-    onWindowResize: (() => void) | DebouncedFunc<any>;
-    onStopScrolling: (() => void) | DebouncedFunc<any>;
-    onMouseEntered: (() => void) | DebouncedFunc<any>;
-    onMouseWheel: (() => void) | DebouncedFunc<any>;
+    onMouseMove: (() => void) | DebouncedFunc<(...args: any[]) => void>;
+    onWindowResize: (() => void) | DebouncedFunc<(...args: any[]) => void>;
+    onStopScrolling: (() => void) | DebouncedFunc<(...args: any[]) => void>;
+    onMouseEntered: (() => void) | DebouncedFunc<(...args: any[]) => void>;
+    onMouseWheel: (() => void) | DebouncedFunc<(...args: any[]) => void>;
     constructor(element: HTMLElement, options?: Partial<Options>);
     getScrollbarWidth(): number;
     init(): void;
@@ -191,27 +191,27 @@ export default class BkScrollbarCore {
     onMouseMoveForAxis(axis?: Axis): void;
     onMouseLeave: () => void;
     onMouseLeaveForAxis(axis?: Axis): void;
-    onPointerEvent: (e: any) => void;
+    onPointerEvent: (e: PointerEvent) => void;
     /**
      * on scrollbar handle drag movement starts
      */
-    onDragStart(e: any, axis?: Axis): void;
+    onDragStart(e: MouseEvent, axis?: Axis): void;
     /**
      * Drag scrollbar handle
      */
-    drag: (e: any) => void;
+    drag: (e: MouseEvent) => void;
     getPointerPosition: (dragPos: number, axis: Axis) => number;
     scrollToAxisPosition: (scrollPos: number, axisValue: Axis) => boolean;
     fixedScrollTo: (axisValue: Axis, resolvedValue: number) => void;
     /**
      * End scroll handle drag
      */
-    onEndDrag: (e: any) => void;
+    onEndDrag: (e: MouseEvent) => void;
     /**
      * Handler to ignore click events during drag
      */
-    preventClick: (e: any) => void;
-    onTrackClick(e: any, axis?: Axis): void;
+    preventClick: (e: MouseEvent) => void;
+    onTrackClick(e: MouseEvent, axis?: Axis): void;
     /**
      * Getter for content element
      */
@@ -232,7 +232,7 @@ export default class BkScrollbarCore {
     /**
      * Find element children matches query
      */
-    findChild(el: any, query: any): any;
+    findChild(el: HTMLElement, query: string): any;
     private mOnMouseWheel;
     private mOnStopScrolling;
     private mOnMouseEntered;

package/lib/select/index.d.ts

@@ -705,9 +705,11 @@ declare const BkSelect: {
         localSelectAllText: import("vue").ComputedRef<string>;
         resolveClassName: (cls: string) => string;
         handleCreateCustomOption: (val: string | number, e: KeyboardEvent) => void;
+        handlePopoverShown: () => void;
         virtualLineHeight: import("vue").Ref<number>;
         isEnableVirtualRender: import("vue").ComputedRef<boolean>;
         preloadItemCount: import("vue").ComputedRef<number>;
+        virtualRenderRef: import("vue").Ref<any>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("blur" | "change" | "focus" | "select" | "toggle" | "clear" | "update:modelValue" | "scroll-end" | "tag-remove" | "deselect" | "search-change")[], import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         modelValue: import("vue-types").VueTypeValidableDef<any>;
         multiple: import("vue-types").VueTypeValidableDef<boolean> & {
@@ -1788,9 +1790,11 @@ declare const BkSelect: {
         localSelectAllText: import("vue").ComputedRef<string>;
         resolveClassName: (cls: string) => string;
         handleCreateCustomOption: (val: string | number, e: KeyboardEvent) => void;
+        handlePopoverShown: () => void;
         virtualLineHeight: import("vue").Ref<number>;
         isEnableVirtualRender: import("vue").ComputedRef<boolean>;
         preloadItemCount: import("vue").ComputedRef<number>;
+        virtualRenderRef: import("vue").Ref<any>;
     }, {}, {}, {}, {
         prefix: string;
         size: "default" | "small" | "large" | "huge";
@@ -2542,9 +2546,11 @@ declare const BkSelect: {
     localSelectAllText: import("vue").ComputedRef<string>;
     resolveClassName: (cls: string) => string;
     handleCreateCustomOption: (val: string | number, e: KeyboardEvent) => void;
+    handlePopoverShown: () => void;
     virtualLineHeight: import("vue").Ref<number>;
     isEnableVirtualRender: import("vue").ComputedRef<boolean>;
     preloadItemCount: import("vue").ComputedRef<number>;
+    virtualRenderRef: import("vue").Ref<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("blur" | "change" | "focus" | "select" | "toggle" | "clear" | "update:modelValue" | "scroll-end" | "tag-remove" | "deselect" | "search-change")[], "blur" | "change" | "focus" | "select" | "toggle" | "clear" | "update:modelValue" | "scroll-end" | "tag-remove" | "deselect" | "search-change", {
     prefix: string;
     size: "default" | "small" | "large" | "huge";

package/lib/select/index.js

@@ -2690,6 +2690,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       searchWithPinyin = _toRefs.searchWithPinyin,
       highlightKeyword = _toRefs.highlightKeyword,
       disableFocusBehavior = _toRefs.disableFocusBehavior;
+    var virtualRenderRef = (0,external_vue_namespaceObject.ref)(null);
     var localNoDataText = (0,external_vue_namespaceObject.computed)(function () {
       if (props.noDataText === undefined) {
         return t.value.noData;
@@ -3340,6 +3341,10 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         autoFocus.value && focusInput();
       });
     });
+    var handlePopoverShown = function handlePopoverShown() {
+      var _virtualRenderRef$val;
+      (_virtualRenderRef$val = virtualRenderRef.value) === null || _virtualRenderRef$val === void 0 || _virtualRenderRef$val.scrollTo(0, 1);
+    };
     return {
       t: t,
       selected: selected,
@@ -3397,9 +3402,11 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       localSelectAllText: localSelectAllText,
       resolveClassName: resolveClassName,
       handleCreateCustomOption: handleCreateCustomOption,
+      handlePopoverShown: handlePopoverShown,
       virtualLineHeight: virtualLineHeight,
       isEnableVirtualRender: isEnableVirtualRender,
-      preloadItemCount: preloadItemCount
+      preloadItemCount: preloadItemCount,
+      virtualRenderRef: virtualRenderRef
     };
   },
   render: function render() {
@@ -3548,6 +3555,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
     // 渲染列表模式
     var renderList = function renderList() {
       return _this.isEnableVirtualRender ? (0,external_vue_namespaceObject.createVNode)(virtual_render_namespaceObject["default"], {
+        "ref": "virtualRenderRef",
         "height": _this.virtualHeight,
         "lineHeight": _this.virtualLineHeight,
         "list": _this.filterList,
@@ -3645,6 +3653,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       "class": selectClass
     }, [(0,external_vue_namespaceObject.createVNode)(popover_namespaceObject["default"], (0,external_vue_namespaceObject.mergeProps)(this.popoverConfig, {
       "ref": "popoverRef",
+      "onAfterShow": this.handlePopoverShown,
       "onClickoutside": this.handleClickOutside
     }), {
       "default": function _default() {

package/lib/select/select.d.ts

@@ -692,9 +692,11 @@ declare const _default: import("vue").DefineComponent<{
     localSelectAllText: import("vue").ComputedRef<string>;
     resolveClassName: (cls: string) => string;
     handleCreateCustomOption: (val: number | string, e: KeyboardEvent) => void;
+    handlePopoverShown: () => void;
     virtualLineHeight: import("vue").Ref<number>;
     isEnableVirtualRender: import("vue").ComputedRef<boolean>;
     preloadItemCount: import("vue").ComputedRef<number>;
+    virtualRenderRef: import("vue").Ref<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("blur" | "change" | "focus" | "select" | "toggle" | "clear" | "update:modelValue" | "scroll-end" | "tag-remove" | "deselect" | "search-change")[], "blur" | "change" | "focus" | "select" | "toggle" | "clear" | "update:modelValue" | "scroll-end" | "tag-remove" | "deselect" | "search-change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: import("vue-types").VueTypeValidableDef<any>;
     multiple: import("vue-types").VueTypeValidableDef<boolean> & {

package/lib/table/const.d.ts

@@ -65,7 +65,7 @@ export declare const COLUMN_ATTRIBUTE: {
 /**
  * Y 轴滚动条宽度
  */
-export declare const SCROLLY_WIDTH = 0;
+export declare const SCROLLY_WIDTH = 8;
 /**
  * 默认行高
  */
@@ -116,7 +116,7 @@ export declare const SORT_OPTIONS: SORT_OPTION[];
  * 列宽最小设置
  */
 export declare const COL_MIN_WIDTH = 80;
-export type IEmptyObject = {};
+export type IEmptyObject = Record<string, never>;
 /**
  * 全选对象
  */

package/lib/table/hooks/use-column-template.d.ts

@@ -1,5 +1,5 @@
-import { VNode } from 'vue';
+import { VNode, VNodeNormalizedChildren } from 'vue';
 declare const _default: () => {
-    resolveColumns: (children: VNode[]) => any[];
+    resolveColumns: (children: VNode[] | VNodeNormalizedChildren) => any[];
 };
 export default _default;

package/lib/table/hooks/use-columns.d.ts

@@ -1,16 +1,19 @@
 import { IEmptyObject } from '../const';
-import { Column, TablePropTypes } from '../props';
+import { Column, IHeadGroup, Settings, TablePropTypes } from '../props';
 declare const useColumns: (props: TablePropTypes) => {
     needColSpan: import("vue").ComputedRef<boolean>;
     needRowSpan: import("vue").ComputedRef<boolean>;
     tableColumnSchema: WeakMap<object, any> & Omit<WeakMap<object, any>, keyof WeakMap<any, any>>;
     tableColumnList: any[];
     visibleColumns: Column[];
-    debounceUpdateColumns: import("lodash").DebouncedFunc<(columns: any) => void>;
+    debounceUpdateColumns: import("lodash").DebouncedFunc<(columns: any, onComplete?: any) => void>;
     sortColumns: any[];
     filterColumns: any[];
+    columnGroup: Column[][];
+    columnGroupMap: WeakMap<Column, IHeadGroup>;
     clearColumnSort: () => void;
     formatColumns: () => void;
+    flatColumnTemplate: (cols: Column[]) => any[];
     isHiddenColumn: (col: Column) => any;
     getColumnId: (col: Column) => any;
     getColumnOrderWidth: (col: Column, orders?: string[]) => number;
@@ -29,18 +32,25 @@ declare const useColumns: (props: TablePropTypes) => {
     };
     getFixedStlye: (column: Column) => any;
     getColumnRect: (column: Column) => any;
-    getColumnCustomClass: (column: any, row?: any) => any;
+    getColumnCustomClass: (column: any, row?: Record<string, object>) => any;
     getColumnRefAttribute: (col: Column | IEmptyObject, attributeName: string) => any;
     getColumnCalcWidth: (column: Column) => any;
-    resolveEventListener: (col: Column) => any;
+    getColumnWidth: (column: Column) => any;
+    getGroupAttribute: (group: Column) => IHeadGroup;
+    resolveEventListener: (col: Column) => Record<string, (...args: any[]) => void> & {
+        [x: string]: (e: MouseEvent) => void;
+    };
     setColumnIsHidden: (column: Column, value?: boolean) => void;
     setColumnResizeWidth: (column: Column, value: number) => void;
-    setColumnSortOption: (column: Column, option: Record<string, any>) => void;
-    setColumnFilterOption: (column: Column, option: Record<string, any>) => void;
-    setColumnAttributeBySettings: (settings: any, checkedVal?: string[]) => void;
-    setColumnAttribute: (col: Column, attrName: string, attrValue: string | number | boolean | any[] | Record<string, any> | ((...args: any[]) => boolean | number | string | void)) => void;
+    setColumnSortOption: (column: Column, option: Record<string, object>) => void;
+    setColumnFilterOption: (column: Column, option: Record<string, object>) => void;
+    setColumnAttributeBySettings: (settings: Settings, checkedVal?: string[]) => void;
+    setColumnAttribute: (col: Column, attrName: string, attrValue: string | number | boolean | object | Record<string, object> | Record<string, object>[] | ((...args: any[]) => boolean | number | string | void)) => void;
     setColumnSortActive: (column: Column, active: boolean) => void;
-    setFixedStyle: (column: Column, style: any) => void;
+    setFixedStyle: (column: Column, style: {
+        left?: string;
+        right?: string;
+    }) => void;
     setColumnRect: (col: any, { left, right, width, height }: {
         left?: number;
         right?: number;
@@ -48,6 +58,7 @@ declare const useColumns: (props: TablePropTypes) => {
         height?: number;
     }) => void;
     setVisibleColumns: () => void;
+    setNextColumnWidth: (col: Column, newWidth: number) => void;
     resolveColsCalcWidth: (width: number) => void;
 };
 export type UseColumns = ReturnType<typeof useColumns>;

package/lib/table/hooks/use-head.d.ts

@@ -9,6 +9,7 @@ declare const _default: ({ props, columns, rows, ctx, column, index, }: {
     column: Column;
     index: number;
     rows: UseRows;
+    rowIndex: number;
 }) => {
     getTH: () => JSX.Element;
 };

package/lib/table/hooks/use-layout.d.ts

@@ -1,5 +1,5 @@
 import { Ref } from 'vue';
-import { TablePropTypes } from '../props';
+import { Column, TablePropTypes } from '../props';
 declare const _default: (props: TablePropTypes, ctx: any) => {
     renderContainer: (childrend: any) => JSX.Element;
     renderHeader: (childrend?: any, settings?: any, fixedRows?: any) => JSX.Element;
@@ -10,9 +10,10 @@ declare const _default: (props: TablePropTypes, ctx: any) => {
     setFootHeight: (height: number) => void;
     setTranslateX: (val: number) => void;
     setDragOffsetX: (val: number) => void;
-    setFixedColumns: (values: any[]) => void;
+    setFixedColumns: (values: Column[]) => void;
     setOffsetRight: () => void;
     setLineHeight: (val: number) => void;
+    setHeaderRowCount: (val: number) => void;
     initRootStyleVars: () => void;
     refRoot: Ref<HTMLElement>;
     refHead: Ref<HTMLElement>;

package/lib/table/hooks/use-rows.d.ts

@@ -1,18 +1,18 @@
 import { IEmptyObject } from '../const';
 import { TablePropTypes } from '../props';
 declare const useRows: (props: TablePropTypes) => {
-    setRowIndex: (row: any, index: number) => void;
-    setRowExpand: (row: any, isExpand: boolean) => void;
-    isRowChecked: (row: any, index: number) => any;
-    setPageRowList: (rowList: any[]) => void;
+    setRowIndex: (row: Record<string, unknown>, index: number) => void;
+    setRowExpand: (row: Record<string, unknown>, isExpand: boolean) => void;
+    isRowChecked: (row: Record<string, unknown>, index: number) => any;
+    setPageRowList: (rowList: Record<string, unknown>[]) => void;
     clearSelection: () => void;
     formatDataSchema: () => void;
-    toggleRowSelection: (row: any) => void;
+    toggleRowSelection: (row: Record<string, unknown>) => void;
     setRowSelectionAll: (val: boolean) => void;
-    setRowSelection: (row: any, isSelected: boolean, index?: number) => void;
+    setRowSelection: (row: Record<string, unknown>, isSelected: boolean, index?: number) => void;
     setAllRowExpand: (value?: boolean) => void;
     setTableIsNeedRowSpan: (val: boolean) => void;
-    getRowAttribute: (item: IEmptyObject | any, attrName: string) => any;
+    getRowAttribute: (item: IEmptyObject | object, attrName: string) => any;
     getRowSelection: () => any[];
     getRowIndeterminate: () => any;
     getRowCheckedAllValue: () => any;