bkui-vue 1.0.3-beta.9 → 2.0.1-beta.10

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,10 @@
             }
           }
 
-          &.--drag-enter {
-            &.--bottom {
-              border-bottom: solid 1px #3785ff;
-            }
-
-            &.--top {
-              border-top: solid 1px #3785ff;
-            }
-          }
-
           &.--drag-start {
-            background: #fff;
+            td {
+              background: #fff!important;
+            }
           }
         }
       }
@@ -334,7 +308,6 @@
   .@{bk-prefix}-table-head {
     position: relative;
     z-index: 2;
-    scrollbar-gutter: stable;
     overflow: hidden;
     background-color: var(--background-color);
 
@@ -365,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;
 
@@ -386,6 +356,7 @@
     width: 100%;
     height: var(--footer-height);
     align-items: center;
+    padding: 0 16px 0 22px;
 
     &.is-hidden {
       display: none;
@@ -397,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;
+            }
+          }
         }
       }
     }
@@ -439,8 +414,7 @@
   }
 
   &.bordered-col {
-    th,
-    td {
+    th {
       border-right: 1px solid @table-border-color;
 
       &:last-child {
@@ -448,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;
   }
 
@@ -470,7 +459,6 @@
     right: 0;
     bottom: var(--footer-height);
     left: 0;
-    // height: var(--fix-height);
     pointer-events: none;
 
     .column_fixed {
@@ -529,4 +517,4 @@
   .stripe-row {
     background: #fafbfd;
   }
-}
+}

package/lib/table/table.variable.css

@@ -12,6 +12,7 @@
   --whitesmoke-color: #fafbfd;
   --disable-color: #dcdee5;
   --disable-bg-color: #f9fafd;
+  --border-color: #dcdee5;
   --font-size-base: 12px;
   --font-size-medium: 14px;
   --font-size-large: 16px;
@@ -123,6 +124,8 @@
   --search-select-placeholder-color: var(--light-gray);
   --search-select-message-color: var(--danger-color);
   --search-select-menu-border-color: var(--disable-color);
+  --select-active-color: #e1ecff;
+  --select-hover-color: #f5f7fa;
 }
 .bk-F-scroll-x {
   overflow-x: auto;
@@ -141,11 +144,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;
@@ -862,7 +939,6 @@
 }
 .bk-popover.bk-pop2-content {
   position: absolute;
-  display: none;
   padding: 12px;
   font-size: 12px;
   color: #fff;
@@ -870,6 +946,9 @@
   border-radius: 4px;
   box-sizing: border-box;
 }
+.bk-popover.bk-pop2-content.hidden {
+  display: none;
+}
 .bk-popover.bk-pop2-content .bk-pop2-arrow {
   position: absolute;
   z-index: -1;
@@ -915,10 +994,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;
@@ -931,11 +1006,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;
@@ -1121,9 +1204,9 @@
 }
 .bk-table {
   position: relative;
+  width: 100%;
   height: auto;
   overflow: hidden;
-  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1139,19 +1222,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));
 }
@@ -1178,17 +1251,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;
@@ -1241,8 +1303,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,
@@ -1367,7 +1429,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,
@@ -1384,49 +1446,39 @@
 .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) {
   background: #f5f7fa;
 }
-.bk-table .bk-table-head table tbody tr.--drag-enter.--bottom,
-.bk-table .bk-table-body table tbody tr.--drag-enter.--bottom {
-  border-bottom: solid 1px #3785ff;
-}
-.bk-table .bk-table-head table tbody tr.--drag-enter.--top,
-.bk-table .bk-table-body table tbody tr.--drag-enter.--top {
-  border-top: solid 1px #3785ff;
-}
-.bk-table .bk-table-head table tbody tr.--drag-start,
-.bk-table .bk-table-body table tbody tr.--drag-start {
-  background: #fff;
+.bk-table .bk-table-head table tbody tr.--drag-start td,
+.bk-table .bk-table-body table tbody tr.--drag-start td {
+  background: #fff !important;
 }
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
-  scrollbar-gutter: stable;
   overflow: hidden;
   background-color: var(--background-color);
 }
@@ -1469,6 +1521,7 @@
   width: 100%;
   height: var(--footer-height);
   align-items: center;
+  padding: 0 16px 0 22px;
 }
 .bk-table .bk-table-footer.is-hidden {
   display: none;
@@ -1476,10 +1529,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 {
@@ -1500,14 +1553,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/use-attributes.d.ts

@@ -1,5 +1,5 @@
 import { IEmptyObject } from './const';
-import { Column, Field, Settings, SortScope, TablePropTypes } from './props';
+import { Column, Field, Settings, TablePropTypes } from './props';
 export type ITableFormatData = {
     data: any[];
     dataSchema: WeakMap<object, any>;
@@ -18,57 +18,18 @@ export type ITableFormatData = {
         translateY: number;
     };
 };
-export type ITableResponse = {
-    setIndexData: () => Promise<void>;
-    formatColumns: (columns: Column[]) => void;
-    formatDataSchema: (data: any[]) => 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: ((...args: any[]) => boolean | number | void | string) | string | boolean | number) => void;
-    setColumnAttributeBySettings: (settings: Settings, checkedVal?: string[]) => void;
-    setAllColumnAttribute: (attrName: string, attrValue: ((...args: any[]) => boolean | number | void | string) | string | boolean | number) => void;
-    getColumnAttribute: (col: Column, attributeName: string) => string | boolean | Record<string, any>;
-    getColumnId: (col: Column) => string;
-    getColumnOrderWidth: (column: Column, orders?: string[]) => number;
-    isActiveColumn: (col: Column) => boolean;
-    isHiddenColumn: (col: Column) => boolean;
-    resolvePageData: (filterFn?: any, sortFn?: any, column?: Column, type?: string, sortScope?: SortScope) => void;
-    resolveByDefColumns: () => void;
-    resetStartEndIndex: () => void;
-    toggleRowSelection: (row: any) => void;
-    toggleAllSelection: (value?: boolean) => void;
-    setAllRowExpand: (value?: boolean) => void;
-    clearSelection: () => void;
-    clearColumnSort: (reset?: boolean) => void;
-    setColumnSortActive: (column: Column, active: boolean) => void;
-    getRowAttribute: (row: any | IEmptyObject, attrName: string) => any;
-    getRowSelection: () => any[];
-    resolveColumnWidth: (root: HTMLElement, autoWidth?: any, offsetWidth?: any) => void;
-    filter: () => void;
-    sortData: (column: Column) => void;
-    isCheckedAll: () => boolean;
-    hasCheckedRow: () => boolean;
-    setRowSelectionAll: (val: boolean) => void;
-    setRowIndeterminate: () => void;
-    updateSettings: (settings?: Settings, rowHeight?: number) => void;
-    changePageRowIndex: (sourceIndex: number, targetIndex: number) => void;
-    pageData: any[];
-    localPagination: any;
-    formatData: ITableFormatData;
-};
-declare const _default: (props: TablePropTypes) => {
+declare const tableSchemaResponse: (props: TablePropTypes) => {
     formatColumns: (columns: Column[]) => void;
     formatDataSchema: (data: any[]) => void;
-    setRowSelection: (row: any, isSelected: boolean) => void;
+    setRowSelection: (row: any, isSelected: boolean, index?: number) => 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;
+    setColumnAttribute: (col: Column, attrName: string, attrValue: string | number | boolean | ((...args: any[]) => boolean | number | string | void)) => void;
     setColumnAttributeBySettings: (settings: Settings, checkedVal?: string[]) => void;
     setColumnSortActive: (column: Column, active: boolean) => void;
     setRowSelectionAll: (val: boolean) => void;
     setRowIndeterminate: () => void;
-    setAllColumnAttribute: (attributeName: string | string[], value: string | number | boolean | ((...args: any[]) => boolean | number | void | string)) => void;
+    setAllColumnAttribute: (attributeName: string | string[], value: string | number | boolean | ((...args: any[]) => boolean | number | string | void)) => void;
     getColumnAttribute: (col: Column | IEmptyObject, attributeName: string) => any;
     getColumnId: (col: Column) => any;
     getColumnOrderWidth: (col: Column, orders?: string[]) => number;
@@ -84,7 +45,7 @@ declare const _default: (props: TablePropTypes) => {
     clearSelection: () => void;
     clearColumnSort: (reset?: boolean) => void;
     toggleRowSelection: (row: any) => void;
-    getRowAttribute: (item: any | IEmptyObject, attrName: string) => any;
+    getRowAttribute: (item: IEmptyObject | any, attrName: string) => any;
     filter: () => void;
     sortData: (column: Column) => void;
     isCheckedAll: () => boolean;
@@ -95,5 +56,7 @@ declare const _default: (props: TablePropTypes) => {
     localPagination: import("vue").Ref<any>;
     formatData: ITableFormatData;
     setIndexData: () => Promise<void>;
+    getFilterFnList: () => any[];
 };
-export default _default;
+export type ITableResponse = ReturnType<typeof tableSchemaResponse>;
+export default tableSchemaResponse;