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

package/lib/table/plugins/head-filter.css

@@ -27,6 +27,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;
@@ -39,19 +43,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;

package/lib/table/plugins/head-filter.less

@@ -35,6 +35,9 @@
         min-width: 200px;
 
         .content-items {
+          max-height: 200px;
+          min-height: 40px;
+
           .list-item {
             width: 100%;
             height: 32px;
@@ -49,10 +52,6 @@
             }
 
             label {
-              text-overflow: ellipsis;
-              white-space: nowrap;
-              overflow: hidden;
-              width: 100%;
               &:hover {
                 background: #f0f1f5;
               }
@@ -60,8 +59,6 @@
 
             .@{bk-prefix}-checkbox-label {
               white-space: nowrap;
-              text-overflow: ellipsis;
-              overflow: hidden;
             }
 
             .@{bk-prefix}-checkbox {

package/lib/table/plugins/head-filter.variable.css

@@ -156,6 +156,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;
@@ -168,19 +172,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;

package/lib/table/plugins/use-active-columns.d.ts

@@ -1,4 +1,4 @@
-import { TablePropTypes } from '../props';
+import { Column, TablePropTypes } from '../props';
 /**
  * 处理Props中的ActiveColumn，解析为统一的数组格式
  * @param props
@@ -10,7 +10,7 @@ export declare const resolveActiveColumns: (props: TablePropTypes) => number[];
  * @param props
  * @returns
  */
-declare const _default: (props: TablePropTypes) => {
+declare const _default: (props: TablePropTypes, targetColumns: Column[]) => {
     activeColumns: any[];
 };
 export default _default;

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

@@ -6,7 +6,7 @@ import { ITableResponse } from '../use-attributes';
  */
 declare const _default: (props: TablePropTypes, tableResp: ITableResponse, head?: Ref<HTMLElement>) => {
     fixedWrapperClass: string;
-    resolveFixedColumnStyle: (column: Column) => {
+    resolveFixedColumnStyle: (column: Column, hasScrollY?: boolean) => {
         [x: string]: string;
     };
     resolveFixedColumns: (tableOffsetRight: any) => void;

package/lib/table/plugins/use-pagination.d.ts

@@ -14,10 +14,8 @@ declare const _default: (props: TablePropTypes) => {
     resolvePageData: (filterFn?: any, sortFn?: any, column?: Column, type?: string, sortScope?: any, multiCol?: any) => void;
     resolveIndexData: () => Promise<void>;
     resolvePageDataBySortList: (multiCol?: any) => void;
-    handlePaginationChange: (filterFn?: any, sortFn?: any) => void;
     resetStartEndIndex: () => void;
-    getCurrentPageData: () => any[];
-    multiFilter: (filterFnList: ((row: any, index: any, data: any) => void)[], origin?: any) => void;
+    multiFilter: (filterFnList: ((row: any, index: any, data: any) => void)[]) => void;
     sort: (sourceData: any[], sortFn: any, column: Column, type: string, sortScope: SortScope) => void;
 };
 export default _default;

package/lib/table/props.d.ts

@@ -44,8 +44,8 @@ export declare enum FixedEnum {
 }
 export declare const fixedType: import("vue-types").VueTypeValidableDef<"right" | "left">;
 export type IOverflowTooltipOption = {
-    content: ((col: Column, row: any) => string) | string;
-    disabled?: ((col: Column, row: any) => boolean) | boolean;
+    content: string | Function;
+    disabled?: (col: Column, row: any) => boolean | boolean;
     watchCellResize?: boolean;
     mode?: `${OverflowModeEnum}`;
     popoverOption?: any;
@@ -165,7 +165,7 @@ export type Column = {
     width?: number | string;
     minWidth?: number | string;
     columnKey?: string;
-    showOverflowTooltip?: IOverflowTooltip;
+    showOverflowTooltip?: boolean | IOverflowTooltip;
     type?: string;
     fixed?: string | boolean;
     resizable?: boolean;
@@ -459,7 +459,7 @@ export declare const tableProps: {
     /**
      * 提供自定义判定当前行是否选中
      * 如果设置了此属性，其他判定均不生效
-     * ({ row }) => bool
+     * ({ row, cell, data }) => bool
      */
     isSelectedFn: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
         default: (...args: any[]) => any;
@@ -560,13 +560,5 @@ export declare const tableProps: {
     rowDraggable: import("vue-types").VueTypeDef<any> & {
         default: any;
     };
-    /**
-     * 是否支持shift键多行选择
-     */
-    shiftMultiChecked: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
 };
 export {};

package/lib/table/table.css

@@ -15,85 +15,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;
@@ -865,6 +791,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;
@@ -877,19 +807,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;
@@ -1075,9 +997,9 @@
 }
 .bk-table {
   position: relative;
-  width: 100%;
   height: auto;
   overflow: hidden;
+  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1093,9 +1015,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));
 }
@@ -1122,6 +1054,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;
@@ -1174,8 +1117,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,
@@ -1300,7 +1243,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,
@@ -1317,27 +1260,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) {
@@ -1350,6 +1294,7 @@
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
+  scrollbar-gutter: stable;
   overflow: hidden;
   background-color: var(--background-color);
 }
@@ -1392,7 +1337,6 @@
   width: 100%;
   height: var(--footer-height);
   align-items: center;
-  padding: 0 16px 0 22px;
 }
 .bk-table .bk-table-footer.is-hidden {
   display: none;
@@ -1400,10 +1344,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 {
@@ -1424,18 +1368,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/table.d.ts

@@ -157,11 +157,6 @@ declare const _default: import("vue").DefineComponent<{
     rowDraggable: import("vue-types").VueTypeDef<any> & {
         default: any;
     };
-    shiftMultiChecked: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     columnPick: (_cols: import("./props").IColumnActive[]) => boolean;
     columnFilter: (_args: {
@@ -403,11 +398,6 @@ declare const _default: import("vue").DefineComponent<{
     rowDraggable: import("vue-types").VueTypeDef<any> & {
         default: any;
     };
-    shiftMultiChecked: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
 }>> & {
     onDragend?: (_args: {
         sourceEvent: DragEvent;
@@ -534,6 +524,5 @@ declare const _default: import("vue").DefineComponent<{
     prependStyle: import("vue").CSSProperties;
     isFlex: boolean;
     rowDraggable: any;
-    shiftMultiChecked: boolean;
 }, {}>;
 export default _default;

package/lib/table/table.less

@@ -12,9 +12,9 @@
 
 .@{bk-prefix}-table {
   position: relative;
-  width: 100%;
   height: auto;
   overflow: hidden;
+  width: 100%;
 
   &-flex {
     display: flex;
@@ -34,9 +34,21 @@
 
   .@{bk-prefix}-table-body {
     position: relative;
-    overflow: hidden;
+    overflow: auto;
+    scrollbar-gutter: stable;
     border-bottom: 1px solid @table-border-color;
 
+    &::-webkit-scrollbar {
+      width: 5px;
+      height: 6px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #dcdee5;
+      border-radius: 10px;
+      box-shadow: inset 0 0 6px rgba(204, 204, 204, .3);
+    }
+
     .prepend-row {
       transform: translateX(var(--prepend-left));
     }
@@ -81,6 +93,17 @@
     background: @table-bg-color;
     transform: translateZ(0);
 
+    &::-webkit-scrollbar {
+      width: 5px;
+      height: 5px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #ddd;
+      border-radius: 20px;
+      box-shadow: inset 0 0 6px rgba(204, 204, 204, .3);
+    }
+
     &.__is-empty {
       display: flex;
       height: 100%;
@@ -125,8 +148,8 @@
           white-space: nowrap;
 
           .drag-cell {
-            height: 100%;
             font-size: 14px;
+            height: 100%;
           }
 
           &.has-sort {
@@ -236,7 +259,7 @@
           .cell {
             display: flex;
             align-items: center;
-            height: calc(var(--row-height) - 2px);
+            height: calc(var(--row-height) - 1px);
             color: @table-head-font-color;
           }
 
@@ -256,31 +279,26 @@
         tr {
           td {
             background-color: #fff;
-            border-top: 1px solid transparent;
-            border-bottom: 1px solid transparent;
-            border-right: 1px solid transparent;
-
-            box-sizing: border-box;
 
             &.empty-cell {
               padding-bottom: 30px;
             }
 
             &.is-last {
-              // border-bottom: none;
+              border-bottom: none;
             }
 
             .cell {
               display: block;
               width: 100%;
-              // height: 100%;
-              line-height: calc(var(--row-height) - 2px);
+              height: 100%;
+              line-height: calc(var(--row-height) - 1px);
               box-sizing: border-box;
               align-items: center;
 
               &.drag {
-                text-align: center;
                 cursor: move;
+                text-align: center;
               }
             }
           }
@@ -295,7 +313,18 @@
             }
           }
 
+          // &.--drag-enter {
+          //   &.--bottom {
+          //     border-bottom: solid 1px #3785ff;
+          //   }
+
+          //   &.--top {
+          //     border-top: solid 1px #3785ff;
+          //   }
+          // }
+
           &.--drag-start {
+
             td {
               background: #fff!important;
             }
@@ -308,6 +337,7 @@
   .@{bk-prefix}-table-head {
     position: relative;
     z-index: 2;
+    scrollbar-gutter: stable;
     overflow: hidden;
     background-color: var(--background-color);
 
@@ -338,8 +368,11 @@
       cursor: pointer;
 
       background: @table-head-bg-color;
+      //border-right: 1px solid @table-border-color;
+      // border-bottom: 1px solid @table-border-color;
       border-left: 1px solid @table-border-color;
       border-radius: 0 2px 0 0;
+      // transform: translateX(var(--scroll-left));
       justify-content: center;
       align-items: center;
 
@@ -356,7 +389,6 @@
     width: 100%;
     height: var(--footer-height);
     align-items: center;
-    padding: 0 16px 0 22px;
 
     &.is-hidden {
       display: none;
@@ -368,18 +400,14 @@
       border-bottom: 1px solid @table-border-color;
     }
 
-    .bk-table-body {
-      tbody {
-        tr {
-          td {
-            border-bottom-color: @table-border-color;
-          }
+    td {
+      border-bottom: 1px solid @table-border-color;
+    }
 
-          &:last-child {
-            td {
-              border-bottom: none;
-            }
-          }
+    tr {
+      &:last-child {
+        td {
+          border-bottom: none;
         }
       }
     }
@@ -414,7 +442,8 @@
   }
 
   &.bordered-col {
-    th {
+    th,
+    td {
       border-right: 1px solid @table-border-color;
 
       &:last-child {
@@ -422,24 +451,9 @@
       }
     }
 
-    .bk-table-body {
-      tbody {
-        tr {
-          td {
-            border-right-color: @table-border-color;
-
-            &:last-child {
-              border-right-color: transparent;
-            }
-          }
-        }
-      }
-    }
-
   }
 
-  th,
-  td {
+  th, td {
     border-right: 1px solid transparent;
   }
 
@@ -459,6 +473,7 @@
     right: 0;
     bottom: var(--footer-height);
     left: 0;
+    // height: var(--fix-height);
     pointer-events: none;
 
     .column_fixed {
@@ -517,4 +532,4 @@
   .stripe-row {
     background: #fafbfd;
   }
-}
+}