bkui-vue 2.0.1-beta.7 → 2.0.1-beta.70.search.1

package/lib/table/table.variable.css

@@ -144,85 +144,11 @@
 .bk-F-scroll-y::-webkit-scrollbar-thumb {
   border-radius: 4px;
 }
-.bk-scrollbar-wrapper {
-  position: relative;
-  overflow: hidden;
-}
-.bk-scrollbar-wrapper .bk-scrollbar-content-el {
-  display: inline-flex;
-  flex-direction: column;
-  width: 100%;
-}
-.bk-scrollbar-wrapper .bk-scrollbar-track {
-  z-index: 1;
-  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-wrapper .bk-scrollbar-track.bk-scrollbar-hover .bk-scrollbar::before {
-  background-color: #979BA5;
-}
-.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-wrapper .bk-scrollbar-track.bk-scrollbar-horizontal {
-  left: 0;
-  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 {
-  position: absolute;
-  left: 0;
-  right: 0;
-  min-height: 8px;
-}
-.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-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 {
+.bk-virtual-render .bk-virtual-content,
+.bk-virtual-render.bk-virtual-content {
   position: absolute;
   top: 0;
   bottom: 0;
@@ -994,6 +920,10 @@
   max-width: 300px;
   min-width: 200px;
 }
+.bk-popover.bk-pop2-content.bk-table-head-filter .content-list .content-items {
+  max-height: 200px;
+  min-height: 40px;
+}
 .bk-popover.bk-pop2-content.bk-table-head-filter .content-list .content-items .list-item {
   width: 100%;
   height: 32px;
@@ -1006,19 +936,11 @@
 .bk-popover.bk-pop2-content.bk-table-head-filter .content-list .content-items .list-item:hover {
   background: #f0f1f5;
 }
-.bk-popover.bk-pop2-content.bk-table-head-filter .content-list .content-items .list-item label {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  width: 100%;
-}
 .bk-popover.bk-pop2-content.bk-table-head-filter .content-list .content-items .list-item label:hover {
   background: #f0f1f5;
 }
 .bk-popover.bk-pop2-content.bk-table-head-filter .content-list .content-items .list-item .bk-checkbox-label {
   white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
 }
 .bk-popover.bk-pop2-content.bk-table-head-filter .content-list .content-items .list-item .bk-checkbox {
   margin-left: 0;
@@ -1204,9 +1126,9 @@
 }
 .bk-table {
   position: relative;
-  width: 100%;
   height: auto;
   overflow: hidden;
+  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1222,9 +1144,19 @@
 }
 .bk-table .bk-table-body {
   position: relative;
-  overflow: hidden;
+  overflow: auto;
+  scrollbar-gutter: stable;
   border-bottom: 1px solid #dcdee5;
 }
+.bk-table .bk-table-body::-webkit-scrollbar {
+  width: 5px;
+  height: 6px;
+}
+.bk-table .bk-table-body::-webkit-scrollbar-thumb {
+  background: #dcdee5;
+  border-radius: 10px;
+  box-shadow: inset 0 0 6px rgba(204, 204, 204, 0.3);
+}
 .bk-table .bk-table-body .prepend-row {
   transform: translateX(var(--prepend-left));
 }
@@ -1251,6 +1183,17 @@
   background: white;
   transform: translateZ(0);
 }
+.bk-table .bk-table-head::-webkit-scrollbar,
+.bk-table .bk-table-body::-webkit-scrollbar {
+  width: 5px;
+  height: 5px;
+}
+.bk-table .bk-table-head::-webkit-scrollbar-thumb,
+.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-head.__is-empty,
 .bk-table .bk-table-body.__is-empty {
   display: flex;
@@ -1303,8 +1246,8 @@
 .bk-table .bk-table-body table th .cell .drag-cell,
 .bk-table .bk-table-head table td .cell .drag-cell,
 .bk-table .bk-table-body table td .cell .drag-cell {
-  height: 100%;
   font-size: 14px;
+  height: 100%;
 }
 .bk-table .bk-table-head table th .cell.has-sort,
 .bk-table .bk-table-body table th .cell.has-sort,
@@ -1429,7 +1372,7 @@
 .bk-table .bk-table-body table thead th .cell {
   display: flex;
   align-items: center;
-  height: calc(var(--row-height) - 2px);
+  height: calc(var(--row-height) - 1px);
   color: #313238;
 }
 .bk-table .bk-table-head table thead th.active,
@@ -1446,27 +1389,28 @@
 .bk-table .bk-table-head table tbody tr td,
 .bk-table .bk-table-body table tbody tr td {
   background-color: #fff;
-  border-top: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-  border-right: 1px solid transparent;
-  box-sizing: border-box;
 }
 .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;
 }
+.bk-table .bk-table-head table tbody tr td.is-last,
+.bk-table .bk-table-body table tbody tr td.is-last {
+  border-bottom: none;
+}
 .bk-table .bk-table-head table tbody tr td .cell,
 .bk-table .bk-table-body table tbody tr td .cell {
   display: block;
   width: 100%;
-  line-height: calc(var(--row-height) - 2px);
+  height: 100%;
+  line-height: calc(var(--row-height) - 1px);
   box-sizing: border-box;
   align-items: center;
 }
 .bk-table .bk-table-head table tbody tr td .cell.drag,
 .bk-table .bk-table-body table tbody tr td .cell.drag {
-  text-align: center;
   cursor: move;
+  text-align: center;
 }
 .bk-table .bk-table-head table tbody tr:hover.hover-highlight td:not(.empty-cell),
 .bk-table .bk-table-body table tbody tr:hover.hover-highlight td:not(.empty-cell) {
@@ -1479,6 +1423,7 @@
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
+  scrollbar-gutter: stable;
   overflow: hidden;
   background-color: var(--background-color);
 }
@@ -1521,7 +1466,6 @@
   width: 100%;
   height: var(--footer-height);
   align-items: center;
-  padding: 0 16px 0 22px;
 }
 .bk-table .bk-table-footer.is-hidden {
   display: none;
@@ -1529,10 +1473,10 @@
 .bk-table.bordered-row .bk-table-head {
   border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-row .bk-table-body tbody tr td {
-  border-bottom-color: #dcdee5;
+.bk-table.bordered-row td {
+  border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-row .bk-table-body tbody tr:last-child td {
+.bk-table.bordered-row tr:last-child td {
   border-bottom: none;
 }
 .bk-table.bordered-outer {
@@ -1553,18 +1497,14 @@
 .bk-table.bordered-horizontal .__is-empty .bk-table-body-content {
   border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-col th {
+.bk-table.bordered-col th,
+.bk-table.bordered-col td {
   border-right: 1px solid #dcdee5;
 }
-.bk-table.bordered-col th:last-child {
+.bk-table.bordered-col th:last-child,
+.bk-table.bordered-col td:last-child {
   border-right: none;
 }
-.bk-table.bordered-col .bk-table-body tbody tr td {
-  border-right-color: #dcdee5;
-}
-.bk-table.bordered-col .bk-table-body tbody tr td:last-child {
-  border-right-color: transparent;
-}
 .bk-table th,
 .bk-table td {
   border-right: 1px solid transparent;

package/lib/table/use-attributes.d.ts

@@ -21,7 +21,7 @@ export type ITableFormatData = {
 declare const tableSchemaResponse: (props: TablePropTypes) => {
     formatColumns: (columns: Column[]) => void;
     formatDataSchema: (data: any[]) => void;
-    setRowSelection: (row: any, isSelected: boolean, index?: number) => void;
+    setRowSelection: (row: any, isSelected: boolean) => void;
     setRowExpand: (row: any, isExpand: boolean) => void;
     setRowIndex: (row: any, index: number) => void;
     setColumnAttribute: (col: Column, attrName: string, attrValue: string | number | boolean | ((...args: any[]) => boolean | number | void | string)) => void;
@@ -56,7 +56,6 @@ declare const tableSchemaResponse: (props: TablePropTypes) => {
     localPagination: import("vue").Ref<any>;
     formatData: ITableFormatData;
     setIndexData: () => Promise<void>;
-    getFilterFnList: () => any[];
 };
 export type ITableResponse = ReturnType<typeof tableSchemaResponse>;
 export default tableSchemaResponse;

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

@@ -1,12 +1,13 @@
+import { ITableColumn } from './components/table-column';
 import { SORT_OPTION } from './const';
-import { TablePropTypes } from './props';
+import { Column, TablePropTypes } from './props';
 /**
  * 渲染column settings
  * @param props: TablePropTypes
  * @param targetColumns 解析之后的column配置（主要用来处理通过<bk-column>配置的数据结构）
  */
-declare const _default: (props: TablePropTypes) => {
-    initColumns: (tableInstance: any) => void;
+declare const _default: (props: TablePropTypes, targetColumns: ITableColumn[]) => {
+    initColumns: (column: ITableColumn[], remove?: boolean) => void;
     getColumns: () => {
         label: import("./props").LabelFunctionString;
         field?: import("./props").LabelFunctionString;
@@ -16,8 +17,8 @@ declare const _default: (props: TablePropTypes) => {
         minWidth?: string | number;
         columnKey?: string;
         showOverflowTooltip?: boolean | {
-            content: string | ((col: import("./props").Column, row: any) => string);
-            disabled?: boolean | ((col: import("./props").Column, row: any) => boolean);
+            content: string | Function;
+            disabled?: (col: Column, row: any) => boolean;
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;
@@ -104,8 +105,8 @@ declare const _default: (props: TablePropTypes) => {
         minWidth?: string | number;
         columnKey?: string;
         showOverflowTooltip?: boolean | {
-            content: string | ((col: import("./props").Column, row: any) => string);
-            disabled?: boolean | ((col: import("./props").Column, row: any) => boolean);
+            content: string | Function;
+            disabled?: (col: Column, row: any) => boolean;
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;
@@ -192,8 +193,8 @@ declare const _default: (props: TablePropTypes) => {
         minWidth?: string | number;
         columnKey?: string;
         showOverflowTooltip?: boolean | {
-            content: string | ((col: import("./props").Column, row: any) => string);
-            disabled?: boolean | ((col: import("./props").Column, row: any) => boolean);
+            content: string | Function;
+            disabled?: (col: Column, row: any) => boolean;
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;

package/lib/table/use-common.d.ts

@@ -9,7 +9,7 @@ import { ITableResponse } from './use-attributes';
  * @param TableSchema 组件内部定义的响应式对象
  * @param pageData 当前页数据
  */
-export declare const useClass: (props: TablePropTypes, _targetColumns: ITableColumn[], root?: any, TableSchema?: ITableResponse, pageData?: any[]) => {
+export declare const useClass: (props: TablePropTypes, targetColumns: ITableColumn[], root?: any, TableSchema?: ITableResponse, pageData?: any[]) => {
     tableClass: import("vue").ComputedRef<string>;
     headClass: string;
     contentClass: {

package/lib/table/use-render.d.ts

@@ -1,7 +1,7 @@
 import { SetupContext } from 'vue';
 import { TablePropTypes } from './props';
 import { ITableResponse } from './use-attributes';
-declare const _default: (props: TablePropTypes, context: SetupContext<any>, tableResp: ITableResponse, head: any, root: any, resetTableHeight: any) => {
+declare const _default: (props: TablePropTypes, context: SetupContext<any>, tableResp: ITableResponse, styleRef: any, head: any, root: any, resetTableHeight: any) => {
     renderTableHeadSchema: () => (string | JSX.Element)[];
     renderTableBodySchema: (rows: any[]) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;