bkui-vue 1.0.3-beta.68 → 1.0.3-beta.68.dialog.1

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

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

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

@@ -156,10 +156,6 @@
   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;
@@ -172,11 +168,19 @@
 .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-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, hasScrollY?: boolean) => {
+    resolveFixedColumnStyle: (column: Column) => {
         [x: string]: string;
     };
     resolveFixedColumns: (tableOffsetRight: any) => void;

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

@@ -14,8 +14,10 @@ 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;
-    multiFilter: (filterFnList: ((row: any, index: any, data: any) => void)[]) => void;
+    getCurrentPageData: () => any[];
+    multiFilter: (filterFnList: ((row: any, index: any, data: any) => void)[], origin?: any) => void;
     sort: (sourceData: any[], sortFn: any, column: Column, type: string, sortScope: SortScope) => void;
 };
 export default _default;

package/lib/table/plugins/use-shift-key.d.ts

@@ -0,0 +1,11 @@
+import { TablePropTypes } from '../props';
+declare const _default: (props: TablePropTypes) => {
+    isShiftKeyDown: import("vue").Ref<boolean>;
+    setStore: (row: any, index: number) => boolean;
+    getStore: () => {
+        start: any;
+        end: any;
+    };
+    clearStore: () => 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: string | Function;
-    disabled?: (col: Column, row: any) => boolean | boolean;
+    content: ((col: Column, row: any) => string) | string;
+    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?: boolean | IOverflowTooltip;
+    showOverflowTooltip?: IOverflowTooltip;
     type?: string;
     fixed?: string | boolean;
     resizable?: boolean;
@@ -560,5 +560,13 @@ 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,11 +15,85 @@
 .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;
@@ -791,10 +865,6 @@
   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;
@@ -807,11 +877,19 @@
 .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;
@@ -997,9 +1075,9 @@
 }
 .bk-table {
   position: relative;
+  width: 100%;
   height: auto;
   overflow: hidden;
-  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1015,19 +1093,9 @@
 }
 .bk-table .bk-table-body {
   position: relative;
-  overflow: auto;
-  scrollbar-gutter: stable;
+  overflow: hidden;
   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));
 }
@@ -1054,17 +1122,6 @@
   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;
@@ -1117,8 +1174,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 {
-  font-size: 14px;
   height: 100%;
+  font-size: 14px;
 }
 .bk-table .bk-table-head table th .cell.has-sort,
 .bk-table .bk-table-body table th .cell.has-sort,
@@ -1243,7 +1300,7 @@
 .bk-table .bk-table-body table thead th .cell {
   display: flex;
   align-items: center;
-  height: calc(var(--row-height) - 1px);
+  height: calc(var(--row-height) - 2px);
   color: #313238;
 }
 .bk-table .bk-table-head table thead th.active,
@@ -1260,28 +1317,27 @@
 .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%;
-  height: 100%;
-  line-height: calc(var(--row-height) - 1px);
+  line-height: calc(var(--row-height) - 2px);
   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 {
-  cursor: move;
   text-align: center;
+  cursor: move;
 }
 .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) {
@@ -1294,7 +1350,6 @@
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
-  scrollbar-gutter: stable;
   overflow: hidden;
   background-color: var(--background-color);
 }
@@ -1337,6 +1392,7 @@
   width: 100%;
   height: var(--footer-height);
   align-items: center;
+  padding: 0 16px 0 22px;
 }
 .bk-table .bk-table-footer.is-hidden {
   display: none;
@@ -1344,10 +1400,10 @@
 .bk-table.bordered-row .bk-table-head {
   border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-row td {
-  border-bottom: 1px solid #dcdee5;
+.bk-table.bordered-row .bk-table-body tbody tr td {
+  border-bottom-color: #dcdee5;
 }
-.bk-table.bordered-row tr:last-child td {
+.bk-table.bordered-row .bk-table-body tbody tr:last-child td {
   border-bottom: none;
 }
 .bk-table.bordered-outer {
@@ -1368,14 +1424,18 @@
 .bk-table.bordered-horizontal .__is-empty .bk-table-body-content {
   border-bottom: 1px solid #dcdee5;
 }
-.bk-table.bordered-col th,
-.bk-table.bordered-col td {
+.bk-table.bordered-col th {
   border-right: 1px solid #dcdee5;
 }
-.bk-table.bordered-col th:last-child,
-.bk-table.bordered-col td:last-child {
+.bk-table.bordered-col th: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,6 +157,11 @@ 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: {
@@ -398,6 +403,11 @@ 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;
@@ -524,5 +534,6 @@ 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,21 +34,9 @@
 
   .@{bk-prefix}-table-body {
     position: relative;
-    overflow: auto;
-    scrollbar-gutter: stable;
+    overflow: hidden;
     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));
     }
@@ -93,17 +81,6 @@
     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%;
@@ -148,8 +125,8 @@
           white-space: nowrap;
 
           .drag-cell {
-            font-size: 14px;
             height: 100%;
+            font-size: 14px;
           }
 
           &.has-sort {
@@ -259,7 +236,7 @@
           .cell {
             display: flex;
             align-items: center;
-            height: calc(var(--row-height) - 1px);
+            height: calc(var(--row-height) - 2px);
             color: @table-head-font-color;
           }
 
@@ -279,26 +256,31 @@
         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) - 1px);
+              // height: 100%;
+              line-height: calc(var(--row-height) - 2px);
               box-sizing: border-box;
               align-items: center;
 
               &.drag {
-                cursor: move;
                 text-align: center;
+                cursor: move;
               }
             }
           }
@@ -313,18 +295,7 @@
             }
           }
 
-          // &.--drag-enter {
-          //   &.--bottom {
-          //     border-bottom: solid 1px #3785ff;
-          //   }
-
-          //   &.--top {
-          //     border-top: solid 1px #3785ff;
-          //   }
-          // }
-
           &.--drag-start {
-
             td {
               background: #fff!important;
             }
@@ -337,7 +308,6 @@
   .@{bk-prefix}-table-head {
     position: relative;
     z-index: 2;
-    scrollbar-gutter: stable;
     overflow: hidden;
     background-color: var(--background-color);
 
@@ -368,11 +338,8 @@
       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;
 
@@ -389,6 +356,7 @@
     width: 100%;
     height: var(--footer-height);
     align-items: center;
+    padding: 0 16px 0 22px;
 
     &.is-hidden {
       display: none;
@@ -400,14 +368,18 @@
       border-bottom: 1px solid @table-border-color;
     }
 
-    td {
-      border-bottom: 1px solid @table-border-color;
-    }
+    .bk-table-body {
+      tbody {
+        tr {
+          td {
+            border-bottom-color: @table-border-color;
+          }
 
-    tr {
-      &:last-child {
-        td {
-          border-bottom: none;
+          &:last-child {
+            td {
+              border-bottom: none;
+            }
+          }
         }
       }
     }
@@ -442,8 +414,7 @@
   }
 
   &.bordered-col {
-    th,
-    td {
+    th {
       border-right: 1px solid @table-border-color;
 
       &:last-child {
@@ -451,9 +422,24 @@
       }
     }
 
+    .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;
   }
 
@@ -473,7 +459,6 @@
     right: 0;
     bottom: var(--footer-height);
     left: 0;
-    // height: var(--fix-height);
     pointer-events: none;
 
     .column_fixed {
@@ -532,4 +517,4 @@
   .stripe-row {
     background: #fafbfd;
   }
-}
+}