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

package/lib/table/props.d.ts

@@ -44,12 +44,12 @@ export declare enum FixedEnum {
 }
 export declare const fixedType: import("vue-types").VueTypeValidableDef<"left" | "right">;
 export type IOverflowTooltipOption = {
-    content: ((col: Column, row: any) => string) | string;
-    disabled?: ((col: Column, row: any) => boolean) | boolean;
+    content: ((col: Column, row: Record<string, object>) => string) | string;
+    disabled?: ((col: Column, row: Record<string, object>) => boolean) | boolean;
     allowHtml?: boolean;
     watchCellResize?: boolean;
     mode?: `${OverflowModeEnum}`;
-    popoverOption?: any;
+    popoverOption?: Record<string, object>;
     resizerWay?: ResizerWay;
     showHead?: boolean;
 };
@@ -61,16 +61,19 @@ export type ISortOption = {
 };
 export declare const ISortType: import("vue-types").VueTypeDef<ISortPropShape>;
 export type ISortShape = {
-    sortFn?: Function;
+    sortFn?: (...args: any[]) => boolean;
     sortScope?: SortScope;
     value?: SORT_OPTION;
 };
 export type ISortPropShape = ISortShape | boolean | string;
 export type IFilterShape = {
-    list: any[];
-    filterFn?: Function;
+    list: {
+        label: string;
+        value: string;
+    }[];
+    filterFn?: (...args: any[]) => boolean;
     match?: FullEnum;
-    checked?: any[];
+    checked?: string[];
     filterScope?: SortScope;
     btnSave?: boolean | string;
     btnReset?: boolean | string;
@@ -119,12 +122,12 @@ export type Field = {
 export type LabelFunctionString = ((_column: any, _index: any) => JSX.Element | boolean | number | string) | boolean | number | string;
 export declare const LabelFunctionStringType: import("vue-types").VueTypeDef<LabelFunctionString>;
 export type HeadRenderArgs = {
-    cell?: any;
-    data?: any[];
-    row?: any;
+    cell?: Record<string, object>;
+    data?: Record<string, object>[];
+    row?: Record<string, object>;
     column: Column;
     index: number;
-    rows?: any[];
+    rows?: Record<string, object>[];
 };
 export type RenderFunctionString = (args: HeadRenderArgs) => JSX.Element | boolean | number | string;
 export declare const RenderFunctionStringType: import("vue-types").VueTypeDef<RenderFunctionString>;
@@ -135,11 +138,11 @@ export type SpanFunctionString = (({ column, colIndex, row, rowIndex }: {
     rowIndex: any;
 }) => number) | number;
 export declare const SpanFunctionStringType: import("vue-types").VueTypeDef<SpanFunctionString>;
-export type RowClassFunctionString = ((row: any) => string) | string;
+export type RowClassFunctionString = ((row: Record<string, object>) => string) | string;
 export declare const RowClassFunctionStringType: import("vue-types").VueTypeDef<RowClassFunctionString>;
-export type RowHeightFunctionNumber = ((_type: string, _row: any, _rowIndex: number, _size?: any) => number) | number;
+export type RowHeightFunctionNumber = ((type: string, row: Record<string, object>, rowIndex: number, size?: any) => number) | number;
 export declare const RowHeightFunctionNumberType: import("vue-types").VueTypeDef<RowHeightFunctionNumber>;
-type FunctionNumber = Function | number;
+type FunctionNumber = ((...args: any[]) => void) | number;
 export declare const FunctionNumberType: import("vue-types").VueTypeDef<FunctionNumber>;
 type StringNumber = number | string;
 export declare const StringNumberType: (val: number | string) => import("vue-types").VueTypeDef<StringNumber> & {
@@ -159,8 +162,16 @@ export type IDraggableRowOption = {
     icon?: JSX.Element;
     width?: number;
 };
+export type IHeadGroup = {
+    thColspan: number;
+    thRowspan: number;
+    isGroup: boolean;
+    parent?: IHeadGroup;
+    label?: string;
+    offsetLeft?: number;
+};
 export type Column = {
-    label: LabelFunctionString;
+    label?: LabelFunctionString;
     field?: LabelFunctionString;
     render?: RenderFunctionString;
     renderHead?: RenderFunctionString;
@@ -181,12 +192,13 @@ export type Column = {
     prop?: LabelFunctionString;
     index?: number;
     explain?: IColumnExplain;
+    children?: Column[];
 };
 export declare const IColumnProp: import("vue-types").VueTypeDef<Column>;
 export type Thead = {
     height?: number;
     isShow?: boolean;
-    cellFn?: Function;
+    cellFn?: (...args: any[]) => void;
     color?: IHeadColor | string;
 };
 export type Columns = ReadonlyArray<Column>;
@@ -195,7 +207,7 @@ export type GroupColumn = {
     calcWidth?: number;
     resizeWidth?: number;
     isHidden?: boolean;
-    listeners?: Map<string, any>;
+    listeners?: Map<string, (...args: any[]) => void>;
 } & Column;
 export type IColumnActive = {
     index: number;
@@ -203,21 +215,21 @@ export type IColumnActive = {
 };
 export type IReactiveProp = {
     activeColumns: IColumnActive[];
-    rowActions: Record<string, any>;
+    rowActions: Record<string, object>;
     scrollTranslateY: number;
     scrollTranslateX: number;
-    pos: Record<string, any>;
+    pos: Record<string, object>;
     settings: Settings | boolean;
     setting: {
         size: string;
         height: number;
     };
-    defaultSort: Record<string, any>;
+    defaultSort: Record<string, object>;
 };
 export type Colgroups = Column & {
     calcWidth: number;
     resizeWidth: number;
-    listeners: Map<string, Function>;
+    listeners: Map<string, (...args: any[]) => void>;
 };
 export declare enum IColSortBehavior {
     /**

package/lib/table/table.css

@@ -1235,9 +1235,21 @@
 }
 .bk-table .bk-table-body {
   position: relative;
-  overflow: hidden;
+  overflow: auto;
   flex: 1;
 }
+.bk-table .bk-table-body::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+.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-body.is-bk-scrollbar {
+  overflow: hidden;
+}
 .bk-table .bk-table-body .prepend-row {
   transform: translate3d(var(--translate-x), 0, 0);
 }
@@ -1492,6 +1504,15 @@
   background-color: var(--background-color);
   height: var(--row-height);
 }
+.bk-table .bk-table-head.has-group .is-head-group {
+  border-bottom: 1px solid var(--table-border-color);
+}
+.bk-table .bk-table-head.has-group th {
+  border-right: 1px solid var(--table-border-color);
+}
+.bk-table .bk-table-head.has-group th.is-last-child {
+  border-right: none;
+}
 .bk-table .bk-table-head .col-resize-drag {
   position: absolute;
   top: 0;
@@ -1561,15 +1582,30 @@
 .bk-table.bordered-horizontal .__is-empty .bk-table-body-content {
   border-bottom: 1px solid var(--table-border-color);
 }
+.bk-table.bordered-col .bk-table-head {
+  border-right: 1px solid var(--table-border-color);
+}
+.bk-table.bordered-col .bk-table-head .is-head-group {
+  border-bottom: 1px solid var(--table-border-color);
+}
 .bk-table.bordered-col th {
   border-right: 1px solid var(--table-border-color);
 }
 .bk-table.bordered-col th:last-child {
   border-right: none;
 }
+.bk-table.bordered-col .bk-table-body {
+  border-right: 1px solid var(--table-border-color);
+}
 .bk-table.bordered-col .bk-table-body tbody tr td {
   border-right-color: var(--table-border-color);
 }
+.bk-table.bordered-col .bk-table-body tbody tr td:last-child {
+  border-right: none;
+}
+.bk-table.bordered-col .bk-table-body tbody tr:hover.hover-highlight td:not(.empty-cell) {
+  border-right-color: var(--table-border-color);
+}
 .bk-table th,
 .bk-table td {
   border-right: 1px solid var(--table-bg-color);

package/lib/table/table.less

@@ -22,9 +22,24 @@
 
   .@{bk-prefix}-table-body {
     position: relative;
-    overflow: hidden;
+    overflow: auto;
     flex: 1;
 
+    &::-webkit-scrollbar {
+      width: 8px;
+      height: 8px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #ddd;
+      border-radius: 20px;
+      box-shadow: inset 0 0 6px rgba(204, 204, 204, 0.3);
+    }
+
+    &.is-bk-scrollbar {
+      overflow: hidden;
+    }
+
     .prepend-row {
       transform: translate3d(var(--translate-x), 0, 0);
     }
@@ -293,6 +308,20 @@
     background-color: var(--background-color);
     height: var(--row-height);
 
+    &.has-group {
+      .is-head-group {
+        border-bottom: 1px solid @table-border-color;
+      }
+
+      th {
+        border-right: 1px solid @table-border-color;
+
+        &.is-last-child {
+          border-right: none;
+        }
+      }
+    }
+
     .col-resize-drag {
       position: absolute;
       top: 0;
@@ -389,6 +418,12 @@
   }
 
   &.bordered-col {
+    .@{bk-prefix}-table-head {
+      border-right: 1px solid @table-border-color;
+      .is-head-group {
+        border-bottom: 1px solid @table-border-color;
+      }
+    }
     th {
       border-right: 1px solid @table-border-color;
 
@@ -397,11 +432,26 @@
       }
     }
 
-    .bk-table-body {
+    .@{bk-prefix}-table-body {
+      border-right: 1px solid @table-border-color;
       tbody {
         tr {
           td {
             border-right-color: @table-border-color;
+
+            &:last-child {
+              border-right: none;
+            }
+          }
+
+          &:hover {
+            &.hover-highlight {
+              td {
+                &:not(.empty-cell) {
+                  border-right-color: @table-border-color;
+                }
+              }
+            }
           }
         }
       }

package/lib/table/table.variable.css

@@ -1625,9 +1625,21 @@
 }
 .bk-table .bk-table-body {
   position: relative;
-  overflow: hidden;
+  overflow: auto;
   flex: 1;
 }
+.bk-table .bk-table-body::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+.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-body.is-bk-scrollbar {
+  overflow: hidden;
+}
 .bk-table .bk-table-body .prepend-row {
   transform: translate3d(var(--translate-x), 0, 0);
 }
@@ -1882,6 +1894,15 @@
   background-color: var(--background-color);
   height: var(--row-height);
 }
+.bk-table .bk-table-head.has-group .is-head-group {
+  border-bottom: 1px solid var(--table-border-color);
+}
+.bk-table .bk-table-head.has-group th {
+  border-right: 1px solid var(--table-border-color);
+}
+.bk-table .bk-table-head.has-group th.is-last-child {
+  border-right: none;
+}
 .bk-table .bk-table-head .col-resize-drag {
   position: absolute;
   top: 0;
@@ -1951,15 +1972,30 @@
 .bk-table.bordered-horizontal .__is-empty .bk-table-body-content {
   border-bottom: 1px solid var(--table-border-color);
 }
+.bk-table.bordered-col .bk-table-head {
+  border-right: 1px solid var(--table-border-color);
+}
+.bk-table.bordered-col .bk-table-head .is-head-group {
+  border-bottom: 1px solid var(--table-border-color);
+}
 .bk-table.bordered-col th {
   border-right: 1px solid var(--table-border-color);
 }
 .bk-table.bordered-col th:last-child {
   border-right: none;
 }
+.bk-table.bordered-col .bk-table-body {
+  border-right: 1px solid var(--table-border-color);
+}
 .bk-table.bordered-col .bk-table-body tbody tr td {
   border-right-color: var(--table-border-color);
 }
+.bk-table.bordered-col .bk-table-body tbody tr td:last-child {
+  border-right: none;
+}
+.bk-table.bordered-col .bk-table-body tbody tr:hover.hover-highlight td:not(.empty-cell) {
+  border-right-color: var(--table-border-color);
+}
 .bk-table th,
 .bk-table td {
   border-right: 1px solid var(--table-bg-color);

package/lib/table/utils.d.ts

@@ -6,7 +6,7 @@ import { Column, GroupColumn, ISortPropShape, TablePropTypes } from './props';
  * @param args 如果是函数，传递参数
  * @returns
  */
-export declare const resolvePropVal: (prop: any, key: string | string[], args: any[]) => any;
+export declare const resolvePropVal: (prop: Record<string, unknown>, key: string | string[], args: unknown[]) => any;
 /**
  * 处理Props中的ActiveColumn，解析为统一的数组格式
  * @param props
@@ -117,7 +117,7 @@ export declare const getNextSortType: (sortType: string) => string;
 export declare const resolveSort: (sort: ISortPropShape, column: any, format?: any[]) => ({
     sortFn: ((_a: any, _b: any) => boolean) | ((_a: any, _b: any, index0: any, index1: any) => number);
 } & import("./props").ISortShape) | {
-    sortFn?: Function;
+    sortFn?: (...args: any[]) => boolean;
     sortScope?: import("./props").SortScope;
     value: string;
 };
@@ -129,17 +129,20 @@ export declare const isRowSelectEnable: (props: any, { row, index, isCheckAll }:
 export declare const getRowId: (row: any, defVal: any, props: any) => any;
 export declare const resolveColumnSortProp: (col: Column, props: TablePropTypes) => {
     type: string;
-    fn: Function | ((((_a: any, _b: any) => boolean) | ((_a: any, _b: any, index0: any, index1: any) => number)) & Function);
+    fn: ((...args: any[]) => boolean) | ((((_a: any, _b: any) => boolean) | ((_a: any, _b: any, index0: any, index1: any) => number)) & ((...args: any[]) => boolean));
     scope: import("./props").SortScope;
     active: boolean;
     enabled: boolean;
 };
 export declare const resolveColumnFilterProp: (col: Column) => {
     enabled: boolean;
-    list: any[];
-    filterFn?: Function;
+    list: {
+        label: string;
+        value: string;
+    }[];
+    filterFn?: (...args: any[]) => boolean;
     match?: import("./props").FullEnum;
-    checked?: any[];
+    checked?: string[];
     filterScope?: import("./props").SortScope;
     btnSave?: string | boolean;
     btnReset?: string | boolean;
@@ -156,4 +159,4 @@ export declare const getRawData: (data: any) => any;
  * @param parentVal
  * @returns
  */
-export declare const getNumberOrPercentValue: (val: string | number, parentVal?: number) => number;
+export declare const getNumberOrPercentValue: (val: number | string, parentVal?: number) => number;

package/lib/table-column/index.js

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

package/lib/tree/index.js

@@ -19933,9 +19933,6 @@ var use_tree_init_this = undefined;
         }
         setNodeAttribute(item, [NODE_ATTRIBUTES.IS_MATCH], [isMatch], isTreeUI.value && isMatch);
       });
-      (0,external_vue_namespaceObject.nextTick)(function () {
-        scrollToTop();
-      });
     });
     if (!isSearchDisabled) {
       (0,external_vue_namespaceObject.watch)([refSearch], function () {

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

@@ -312,10 +312,10 @@ declare const BkVirtualRender: {
         autoReset: boolean;
         autoIndex: boolean;
     }, true, {}, import("vue").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>;
     }>, {
         P: {};
         B: {};
@@ -674,9 +674,9 @@ declare const BkVirtualRender: {
     autoReset: boolean;
     autoIndex: boolean;
 }, {}, string, import("vue").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>;
 }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("vue").Plugin<any[]>;
 export default BkVirtualRender;