bkui-vue 0.0.2-beta.9 → 0.0.2-table-refactor.2

package/lib/table/props.d.ts

@@ -1,4 +1,4 @@
-import { ExtractPropTypes, Slot } from 'vue';
+import { ExtractPropTypes } from 'vue';
 import { IHeadColor, ROW_HOVER, SORT_OPTION } from './const';
 export declare enum SortScope {
     CURRENT = "current",
@@ -43,35 +43,20 @@ export declare enum FixedEnum {
     RIGHT = "right"
 }
 export declare const fixedType: import("vue-types").VueTypeValidableDef<"right" | "left">;
-export type IOverflowTooltip = {
-    content: string | Function;
-    disabled?: boolean;
-    watchCellResize?: boolean;
-    mode?: `${OverflowModeEnum}`;
-};
 export type IOverflowTooltipProp = {
     content: string | Function;
-    disabled?: boolean;
+    disabled?: (col: Column, row: any) => boolean | boolean;
     watchCellResize?: boolean;
     mode?: `${OverflowModeEnum}`;
+    popoverOption?: any;
+    resizerWay?: ResizerWay;
 } | boolean;
-export declare const IOverflowTooltipPropType: import("vue-types").VueTypeDef<IOverflowTooltipProp> & {
-    default: boolean | (() => {
-        content: string | Function;
-        disabled?: boolean;
-        watchCellResize?: boolean;
-        mode?: `${OverflowModeEnum}`;
-    });
-};
-export declare const IOverflowTooltipType: import("vue-types").VueTypeDef<IOverflowTooltip> & {
-    default: () => IOverflowTooltip;
-};
+export type IOverflowTooltip = IOverflowTooltipProp;
+export declare const IOverflowTooltipPropType: import("vue-types").VueTypeDef<IOverflowTooltipProp>;
 export type ISortOption = {
     [key: string]: SORT_OPTION;
 };
-export declare const ISortType: import("vue-types").VueTypeDef<ISortPropShape> & {
-    default: string | boolean | (() => ISortShape);
-};
+export declare const ISortType: import("vue-types").VueTypeDef<ISortPropShape>;
 export type ISortShape = {
     sortFn?: Function;
     sortScope?: SortScope;
@@ -86,11 +71,10 @@ export type IFilterShape = {
     filterScope?: SortScope;
     btnSave?: boolean | string;
     btnReset?: boolean | string;
+    maxHeight?: number;
 };
 export type IFilterPropShape = IFilterShape | boolean | string;
-export declare const IFilterType: import("vue-types").VueTypeDef<IFilterPropShape> & {
-    default: string | boolean | (() => IFilterShape);
-};
+export declare const IFilterType: import("vue-types").VueTypeDef<IFilterPropShape>;
 export declare enum ColumnPickEnum {
     MULTI = "multi",
     SINGLE = "single",
@@ -101,9 +85,7 @@ export declare enum ResizerWay {
     THROTTLE = "throttle"
 }
 export declare const IColumnType: import("vue-types").VueTypeDef<Column>;
-export declare const ITableSettings: import("vue-types").VueTypeDef<ISettingPropType> & {
-    default: boolean | (() => Settings);
-};
+export declare const ITableSettings: import("vue-types").VueTypeDef<ISettingPropType>;
 /**
  * 配置自定义行高选项
  */
@@ -128,10 +110,46 @@ export type Field = {
     id?: string;
     name?: string;
 };
+export type LabelFunctionString = ((_column: any, _index: any) => string | number | boolean | JSX.Element) | string | number | boolean;
+export declare const LabelFunctionStringType: import("vue-types").VueTypeDef<LabelFunctionString>;
+export type RenderFunctionString = ({ cell, data, row, column, index, rows, }: {
+    cell: any;
+    data: any;
+    row: any;
+    column: any;
+    index: any;
+    rows: any;
+}) => string | number | boolean | JSX.Element;
+export declare const RenderFunctionStringType: import("vue-types").VueTypeDef<RenderFunctionString>;
+export type SpanFunctionString = (({ column, colIndex, row, rowIndex }: {
+    column: any;
+    colIndex: any;
+    row: any;
+    rowIndex: any;
+}) => number) | Number;
+export declare const SpanFunctionStringType: import("vue-types").VueTypeDef<SpanFunctionString>;
+export type RowClassFunctionString = ((row: any) => 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 declare const RowHeightFunctionNumberType: import("vue-types").VueTypeDef<RowHeightFunctionNumber>;
+type FunctionNumber = Function | number;
+export declare const FunctionNumberType: import("vue-types").VueTypeDef<FunctionNumber>;
+type StringNumber = string | number;
+export declare const StringNumberType: (val: number | string) => import("vue-types").VueTypeDef<StringNumber> & {
+    default: StringNumber;
+};
+/**
+ * 表格字段解释说明
+ */
+export type IColumnExplain = {
+    content: LabelFunctionString;
+    head: LabelFunctionString | boolean;
+} | boolean;
 export type Column = {
-    label: Function | string;
-    field?: Function | string;
-    render?: Function | string | Slot;
+    label: LabelFunctionString;
+    field?: LabelFunctionString;
+    render?: RenderFunctionString;
+    renderHead?: RenderFunctionString;
     width?: number | string;
     minWidth?: number | string;
     columnKey?: string;
@@ -141,17 +159,16 @@ export type Column = {
     resizable?: boolean;
     sort?: ISortShape | boolean | string;
     filter?: IFilterShape | boolean | string;
-    colspan?: Function | Number;
-    rowspan?: Function | Number;
-    textAlign?: String;
-    className?: string | Function;
+    colspan?: SpanFunctionString;
+    rowspan?: SpanFunctionString;
+    textAlign?: string;
+    className?: RowClassFunctionString;
     align?: string;
-    prop?: string;
+    prop?: LabelFunctionString;
     index?: Number;
+    explain?: IColumnExplain;
 };
-export declare const IColumnProp: import("vue-types").VueTypeDef<Column> & {
-    default: () => Column;
-};
+export declare const IColumnProp: import("vue-types").VueTypeDef<Column>;
 export type Thead = {
     height?: Number;
     isShow?: boolean;
@@ -188,6 +205,16 @@ export type Colgroups = Column & {
     resizeWidth: number;
     listeners: Map<string, Function>;
 };
+export declare enum IColSortBehavior {
+    /**
+     * 列排序是相互依赖的
+     */
+    interdependent = "interdependent",
+    /**
+     * 列与列之间的排序是独立的，互斥的
+     */
+    independent = "independent"
+}
 export declare const tableProps: {
     /**
      * 渲染列表
@@ -219,8 +246,8 @@ export declare const tableProps: {
      * 默认：auto 根据行数自动填充高度
      * 100%，依赖初始化时父级容器高度
      */
-    height: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
+    height: import("vue-types").VueTypeDef<StringNumber> & {
+        default: StringNumber;
     };
     /**
      * 是否为斑马纹 Table
@@ -234,22 +261,22 @@ export declare const tableProps: {
      * 设置表格最小高度
      * 默认：300
      */
-    minHeight: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
+    minHeight: import("vue-types").VueTypeDef<StringNumber> & {
+        default: StringNumber;
     };
     /**
      * 设置表格最d大高度
      * 默认：auto，依赖外层高度
      */
-    maxHeight: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
+    maxHeight: import("vue-types").VueTypeDef<StringNumber> & {
+        default: StringNumber;
     };
     /**
      * 行高，可以为固定数值类型
      * 可以是函数，返回当前行的高度，返回值为数值类型
      */
-    rowHeight: import("vue-types").VueTypeDef<any> & {
-        default: any;
+    rowHeight: import("vue-types").VueTypeDef<RowHeightFunctionNumber> & {
+        default: RowHeightFunctionNumber;
     };
     /**
      * Thead行高，可以为固定数值类型
@@ -320,6 +347,14 @@ export declare const tableProps: {
     } & {
         default: boolean;
     };
+    /**
+     * 是否支持跨页全选
+     */
+    acrossAll: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
     /**
      * 空数据展示
      */
@@ -327,11 +362,15 @@ export declare const tableProps: {
         default: string;
     };
     /**
-     * bk-table-setting-content
+     * 单元格数据为空展示
      */
-    settings: import("vue-types").VueTypeDef<ISettingPropType> & {
-        default: boolean | (() => Settings);
+    emptyCellText: import("vue-types").VueTypeDef<any> & {
+        default: any;
     };
+    /**
+     * bk-table-setting-content
+     */
+    settings: import("vue-types").VueTypeDef<ISettingPropType>;
     /**
      * 行的 class 的回调方法，也可以使用一个固定的 Object 为所有行设置一样的 Style
      */
@@ -385,6 +424,17 @@ export declare const tableProps: {
     } & {
         default: string;
     };
+    /**
+     * 默认选中行
+     * 仅对设置了selection的情况下生效
+     * 值可以为 [key1, key2, key3, ...] 或者 [row1, row2, row3, ...]
+     * 如果设置为key，则 selectionKey 必须设置，内部匹配逻辑为：row[selectionKey] === key
+     */
+    checked: import("vue-types").VueTypeValidableDef<unknown[]> & {
+        default: () => unknown[];
+    } & {
+        default: () => unknown[];
+    };
     /**
      * 提供自定义判定当前行是否选中
      * 如果设置了此属性，其他判定均不生效
@@ -408,14 +458,7 @@ export declare const tableProps: {
      * 当内容过长被隐藏时显示 tooltip, 此处为全局配置, 如果只配置此处，整个table都启用
      * column内部可以单个配置覆盖此配置
      */
-    showOverflowTooltip: import("vue-types").VueTypeDef<IOverflowTooltipProp> & {
-        default: boolean | (() => {
-            content: string | Function;
-            disabled?: boolean;
-            watchCellResize?: boolean;
-            mode?: `${OverflowModeEnum}`;
-        });
-    };
+    showOverflowTooltip: import("vue-types").VueTypeDef<IOverflowTooltipProp>;
     /**
      * 为避免不必要的数据修改导致的不可控组件更新
      * 默认组件不会对传入组件的data进行任何修改
@@ -475,4 +518,20 @@ export declare const tableProps: {
     prependStyle: import("vue-types").VueTypeDef<import("vue").CSSProperties> & {
         default: () => import("vue").CSSProperties;
     };
+    /**
+     * 列排序行为
+     * independent：列与列之间的排序是独立的，互斥的
+     * interdependent：列排序是相互影响、依赖的
+     *
+     */
+    colSortBehavior: import("vue-types").VueTypeDef<IColSortBehavior>;
+    /**
+     * 是否采用flex布局表格
+     */
+    isFlex: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
 };
+export {};

package/lib/table/render.d.ts

@@ -1,12 +1,12 @@
 import { ComputedRef, Ref, SetupContext } from 'vue';
 import type { Language } from '../locale';
 import { TablePlugins } from './plugins';
-import { GroupColumn, IColumnActive, IReactiveProp, TablePropTypes } from './props';
+import { Column, TablePropTypes } from './props';
+import { ITableFormatData, ITableResponse } from './use-attributes';
 export default class TableRender {
     props: TablePropTypes;
     context: SetupContext;
-    reactiveProp: IReactiveProp;
-    colgroups: GroupColumn[];
+    tableResp: ITableResponse;
     uuid: string;
     events: Map<string, any[]>;
     styleRef: ComputedRef<{
@@ -15,8 +15,9 @@ export default class TableRender {
     t: ComputedRef<Language['table']>;
     activeSortIndex: Ref<number>;
     plugins: TablePlugins;
-    constructor(props: any, ctx: any, reactiveProp: IReactiveProp, colgroups: GroupColumn[], styleRef: any, t: ComputedRef<Language['table']>);
-    get propActiveCols(): IColumnActive[];
+    constructor(props: any, ctx: any, tableResp: ITableResponse, styleRef: any, t: ComputedRef<Language['table']>);
+    get formatData(): ITableFormatData;
+    get columns(): Column[];
     /**
      * 渲染Table Head
      */
@@ -38,12 +39,6 @@ export default class TableRender {
      */
     on(eventName: string, watcher: Function): this;
     destroy(): void;
-    /**
-     * 派发事件
-     * @param eventName
-     * @param args
-     */
-    private emitEvent;
     private handlePageLimitChange;
     private handlePageChange;
     /**
@@ -51,7 +46,7 @@ export default class TableRender {
      * @param index 指定选中的列Index
      * @param single 是否重置其他列，当只允许选中一列的情况下需要先重置
      */
-    private setColumnActive;
+    private getSortFnByColumn;
     /**
      * 点击选中一列事件
      * @param index 当前选中列Index
@@ -123,7 +118,6 @@ export default class TableRender {
      * @param colIndex 指定列Index
      * @returns
      */
-    private isColActive;
     /**
      * 渲染表格Col分组
      * @returns
@@ -133,8 +127,4 @@ export default class TableRender {
      * 过滤当前可渲染的列
      */
     private get filterColGroups();
-    /**
-     * 当前Table Setting
-     */
-    private get setting();
 }

package/lib/table/table.css

@@ -178,6 +178,11 @@
   border-color: #5594fa;
   color: white;
 }
+.bk-button.bk-button-primary.is-outline:active {
+  background-color: #2c77f4;
+  border-color: #2c77f4;
+  color: white;
+}
 .bk-button.bk-button-primary.is-text {
   color: #3a84ff;
   background-color: transparent;
@@ -224,6 +229,11 @@
   border-color: #ffb848;
   color: white;
 }
+.bk-button.bk-button-warning.is-outline:active {
+  background-color: #eb9000;
+  border-color: #eb9000;
+  color: white;
+}
 .bk-button.bk-button-warning.is-text {
   color: #ff9c01;
   background-color: transparent;
@@ -270,6 +280,11 @@
   border-color: #45e35f;
   color: white;
 }
+.bk-button.bk-button-success.is-outline:active {
+  background-color: #1ab943;
+  border-color: #1ab943;
+  color: white;
+}
 .bk-button.bk-button-success.is-text {
   color: #2dcb56;
   background-color: transparent;
@@ -316,6 +331,11 @@
   border-color: #ff5656;
   color: white;
 }
+.bk-button.bk-button-danger.is-outline:active {
+  background-color: #db2626;
+  border-color: #db2626;
+  color: white;
+}
 .bk-button.bk-button-danger.is-text {
   color: #ea3636;
   background-color: transparent;
@@ -710,6 +730,7 @@
 }
 .bk-popover.bk-pop2-content .bk-pop2-arrow {
   position: absolute;
+  z-index: -1;
   width: 8px;
   height: 8px;
   background: #333;
@@ -732,6 +753,9 @@
   cursor: pointer;
   align-items: center;
 }
+.bk-table-head-action:last-of-type {
+  margin-right: -10px;
+}
 .bk-table-head-action.active {
   color: #3a84ff;
 }
@@ -985,6 +1009,15 @@
   height: auto;
   overflow: hidden;
 }
+.bk-table-flex {
+  display: flex;
+  flex-direction: column;
+  max-height: 100%;
+}
+.bk-table-flex .bk-table-body {
+  flex: 1;
+  overflow: auto;
+}
 .bk-table.has-scroll-y .bk-table-head {
   padding-right: 4px;
 }
@@ -993,7 +1026,7 @@
   overflow: auto;
 }
 .bk-table .bk-table-body::-webkit-scrollbar {
-  width: 6px;
+  width: 5px;
   height: 6px;
 }
 .bk-table .bk-table-body::-webkit-scrollbar-thumb {
@@ -1028,8 +1061,8 @@
 }
 .bk-table .bk-table-head::-webkit-scrollbar,
 .bk-table .bk-table-body::-webkit-scrollbar {
-  width: 4px;
-  height: 4px;
+  width: 5px;
+  height: 5px;
 }
 .bk-table .bk-table-head::-webkit-scrollbar-thumb,
 .bk-table .bk-table-body::-webkit-scrollbar-thumb {
@@ -1066,7 +1099,6 @@
   height: var(--row-height);
   min-width: 30px;
   clear: both;
-  background-color: #fff;
 }
 .bk-table .bk-table-head table th.expand-row .expand-btn-action,
 .bk-table .bk-table-body table th.expand-row .expand-btn-action,
@@ -1091,6 +1123,13 @@
 .bk-table .bk-table-body table td .cell.has-sort {
   cursor: pointer;
 }
+.bk-table .bk-table-head table th .cell.explain,
+.bk-table .bk-table-body table th .cell.explain,
+.bk-table .bk-table-head table td .cell.explain,
+.bk-table .bk-table-body table td .cell.explain {
+  text-decoration-style: dashed;
+  text-decoration-line: underline;
+}
 .bk-table .bk-table-head table th .cell .head-text,
 .bk-table .bk-table-body table th .cell .head-text,
 .bk-table .bk-table-head table td .cell .head-text,
@@ -1181,6 +1220,21 @@
 .bk-table .bk-table-head table thead th,
 .bk-table .bk-table-body table thead th {
   font-weight: 400;
+  background-color: var(--background-color);
+  position: relative;
+}
+.bk-table .bk-table-head table thead th.col-resize-hover::after,
+.bk-table .bk-table-body table thead th.col-resize-hover::after {
+  content: '';
+  position: absolute;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  width: 6px;
+  transform: translateX(50%);
+  background-color: #3785FF;
+  z-index: 1;
+  pointer-events: none;
 }
 .bk-table .bk-table-head table thead th .cell,
 .bk-table .bk-table-body table thead th .cell {
@@ -1194,11 +1248,16 @@
 .bk-table .bk-table-head table thead th:hover,
 .bk-table .bk-table-body table thead th:hover {
   background: #f0f1f5;
+  cursor: pointer;
 }
 .bk-table .bk-table-head table thead th.column_fixed,
 .bk-table .bk-table-body table thead th.column_fixed {
   transform: translateX(var(--scroll-left));
 }
+.bk-table .bk-table-head table tbody tr td,
+.bk-table .bk-table-body table tbody tr td {
+  background-color: #fff;
+}
 .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;
@@ -1224,6 +1283,16 @@
   position: relative;
   transform: translateX(var(--scroll-head-left));
 }
+.bk-table .bk-table-head .col-resize-drag {
+  position: absolute;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  width: 6px;
+  transform: translateX(-50%);
+  background-color: #3785FF;
+  z-index: 1;
+}
 .bk-table .bk-table-head .table-head-settings {
   position: absolute;
   top: 0;
@@ -1247,12 +1316,11 @@
   width: 1rem;
   height: 1rem;
 }
-.bk-table .bk-table-head .bk-table-fixed .column_fixed.column_fixed_right.shadow {
-  box-shadow: -2px 2px 10px 0px rgba(0, 0, 0, 0.12);
-}
 .bk-table .bk-table-footer {
   height: var(--footer-height);
-  line-height: var(--footer-height);
+  width: 100%;
+  display: flex;
+  align-items: center;
 }
 .bk-table .bk-table-footer.is-hidden {
   display: none;
@@ -1301,13 +1369,14 @@
   position: absolute;
   top: 0;
   right: 0;
-  bottom: 0;
+  bottom: var(--footer-height);
+  max-height: var(--fix-max-height);
   left: 0;
+  height: var(--fix-height);
   pointer-events: none;
 }
 .bk-table .bk-table-fixed .column_fixed {
   position: absolute;
-  transform: translate(var(--var-scroll-left), var(--var-scroll-top));
 }
 .bk-table .bk-table-fixed .column_fixed.column_fixed_left {
   top: 0;