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

package/lib/table/index.js

@@ -295,7 +295,7 @@ var COLUMN_ATTRIBUTE = {
 /**
  * Y 轴滚动条宽度
  */
-var SCROLLY_WIDTH = 6;
+var SCROLLY_WIDTH = 0;
 /**
  * 默认行高
  */
@@ -1495,7 +1495,6 @@ function _toConsumableArray(arr) {
  */
 
 
-
 /**
  * 固定列Hooks
  */
@@ -1582,13 +1581,12 @@ function _toConsumableArray(arr) {
    * @returns
    */
   var resolveFixedColumnStyle = function resolveFixedColumnStyle(column) {
-    var hasScrollY = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     if (!column.fixed || isHiddenColumn(column)) {
       return {};
     }
     var fixedOffset = {
       left: 0,
-      right: hasScrollY ? SCROLLY_WIDTH : -1
+      right: -1
     };
     var fixedPos = resolveFixColPos(column);
     fixedOffset[fixedPos] = getPreColumnOffset(fixedPos, column, fixedOffset[fixedPos]);
@@ -3198,6 +3196,7 @@ const loading_less_namespaceObject = loading_less_x({  });
     return refScrollLoading.value !== null && (typeof refScrollLoading.value === 'boolean' && refScrollLoading.value || typeof_typeof(refScrollLoading.value) === 'object');
   });
   var renderScrollLoading = function renderScrollLoading() {
+    var _ctx$slots$fixedBotto3, _ctx$slots$fixedBotto4, _ctx$slots2;
     if (isRender.value) {
       var _ctx$slots$fixedBotto, _ctx$slots$fixedBotto2, _ctx$slots;
       var _getLoadingOption = getLoadingOption(),
@@ -3216,6 +3215,7 @@ const loading_less_namespaceObject = loading_less_x({  });
         indicator: indicator
       }, null);
     }
+    return (_ctx$slots$fixedBotto3 = (_ctx$slots$fixedBotto4 = (_ctx$slots2 = ctx.slots).fixedBottom) === null || _ctx$slots$fixedBotto4 === void 0 ? void 0 : _ctx$slots$fixedBotto4.call(_ctx$slots2)) !== null && _ctx$slots$fixedBotto3 !== void 0 ? _ctx$slots$fixedBotto3 : null;
   };
   return {
     renderScrollLoading: renderScrollLoading
@@ -3303,9 +3303,9 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     if (!props.pagination) {
       return;
     }
-    localPagination.value = props.remotePagination ? pagination : use_pagination_objectSpread(use_pagination_objectSpread({}, pagination), {}, {
+    localPagination.value = props.remotePagination ? pagination : use_pagination_objectSpread({
       count: indexData.length
-    });
+    }, pagination);
   };
   /**
    * 重置当前分页开始位置 & 结束位置
@@ -3370,35 +3370,35 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     }
     pageData.length = 0;
     pageData.push.apply(pageData, _toConsumableArray(sourceData.slice(startIndex.value, endIndex.value)));
-    filter(pageData, filterFn);
+    if (Array.isArray(filterFn)) {
+      multiFilter(filterFn, pageData);
+    } else {
+      filter(pageData, filterFn);
+    }
     sort(pageData, sortFn, column, type, sortScope);
     resolveLocalPagination();
   };
   var resolvePageDataBySortList = function resolvePageDataBySortList(multiCol) {
     resolvePageData(null, null, null, null, null, multiCol);
   };
-  var multiFilter = function multiFilter(filterFnList) {
-    var sourceData = indexData.slice();
+  var getCurrentPageData = function getCurrentPageData() {
+    return indexData.slice(startIndex.value, endIndex.value);
+  };
+  var multiFilter = function multiFilter(filterFnList, origin) {
+    var sourceData = (origin !== null && origin !== void 0 ? origin : indexData).slice();
     var target = filterFnList.reduce(function (result, fn) {
       return filter(result, fn);
     }, sourceData);
     pageData.length = 0;
     pageData.push.apply(pageData, _toConsumableArray(getRawData(target)));
   };
-  var handlePaginationChange = function handlePaginationChange() {
+  var handlePaginationChange = function handlePaginationChange(filterFn, sortFn) {
     pagination = resolvePaginationOption(props.pagination, pagination);
     resolveLocalPagination();
     resetStartEndIndex();
-    resolvePageData();
+    resolvePageData(filterFn, sortFn);
   };
   handlePaginationChange();
-  (0,external_vue_namespaceObject.watch)(function () {
-    return [props.pagination];
-  }, function () {
-    handlePaginationChange();
-  }, {
-    deep: true
-  });
   return {
     pageData: pageData,
     indexData: indexData,
@@ -3406,7 +3406,9 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     resolvePageData: resolvePageData,
     resolveIndexData: resolveIndexData,
     resolvePageDataBySortList: resolvePageDataBySortList,
+    handlePaginationChange: handlePaginationChange,
     resetStartEndIndex: resetStartEndIndex,
+    getCurrentPageData: getCurrentPageData,
     multiFilter: multiFilter,
     sort: sort
   };
@@ -3485,6 +3487,8 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
     localPagination = _usePagination.localPagination,
     resolvePageData = _usePagination.resolvePageData,
     resolvePageDataBySortList = _usePagination.resolvePageDataBySortList,
+    handlePaginationChange = _usePagination.handlePaginationChange,
+    getCurrentPageData = _usePagination.getCurrentPageData,
     multiFilter = _usePagination.multiFilter,
     sort = _usePagination.sort,
     resetStartEndIndex = _usePagination.resetStartEndIndex,
@@ -3607,13 +3611,15 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
   var getColumnFilterFn = function getColumnFilterFn(col) {
     return getColumnAttribute(col, COLUMN_ATTRIBUTE.COL_FILTER_FN);
   };
-  var filter = function filter() {
-    var filterFnList = formatData.columns.filter(function (col) {
+  var getFilterFnList = function getFilterFnList() {
+    return formatData.columns.filter(function (col) {
       return !isHiddenColumn(col) && typeof getColumnFilterFn(col) === 'function';
     }).map(function (col) {
       return getColumnFilterFn(col);
     });
-    multiFilter(filterFnList);
+  };
+  var filter = function filter() {
+    multiFilter(getFilterFnList(), getCurrentPageData());
   };
   /**
    * 按照指定列排序
@@ -4074,6 +4080,13 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
   var setIndexData = function setIndexData() {
     return resolveIndexData();
   };
+  (0,external_vue_namespaceObject.watch)(function () {
+    return [props.pagination];
+  }, function () {
+    handlePaginationChange(getFilterFnList());
+  }, {
+    deep: true
+  });
   return {
     formatColumns: formatColumns,
     formatDataSchema: formatDataSchema,
@@ -4111,7 +4124,8 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
     pageData: pageData,
     localPagination: localPagination,
     formatData: formatData,
-    setIndexData: setIndexData
+    setIndexData: setIndexData,
+    getFilterFnList: getFilterFnList
   };
 };
 /* harmony default export */ const use_attributes = (tableSchemaResponse);
@@ -6164,7 +6178,7 @@ function use_render_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
 function use_render_isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0,external_vue_namespaceObject.isVNode)(s);
 }
-/* harmony default export */ const use_render = (function (props, context, tableResp, styleRef, head, root, resetTableHeight) {
+/* harmony default export */ const use_render = (function (props, context, tableResp, head, root, resetTableHeight) {
   var t = (0,config_provider_namespaceObject.useLocale)('table');
   var uuid = esm_browser_v4();
   var formatData = (0,external_vue_namespaceObject.computed)(function () {
@@ -6302,8 +6316,7 @@ function use_render_isSlot(s) {
       '--row-height': "".concat(resolvePropVal(config, 'height', ['thead']), "px"),
       backgroundColor: props.thead.color
     };
-    var _useFixedColumn = use_fixed_column(props, tableResp, head),
-      resolveFixedColumnStyle = _useFixedColumn.resolveFixedColumnStyle;
+    // const { resolveFixedColumnStyle } = useFixedColumn(props, tableResp, head);
     return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [(0,external_vue_namespaceObject.createVNode)("thead", {
       "style": rowStyle
     }, [(0,external_vue_namespaceObject.createVNode)(table_row, null, {
@@ -6312,7 +6325,7 @@ function use_render_isSlot(s) {
           var _props$thead$color, _props$thead;
           var _useHeadCell = use_head_cell(props, context, column, tableResp),
             getTH = _useHeadCell.getTH;
-          var headStyle = Object.assign({}, resolveFixedColumnStyle(column, styleRef.value.hasScrollY), {
+          var headStyle = Object.assign({}, resolveFixedColumnStyle(column), {
             '--background-color': DEF_COLOR[(_props$thead$color = (_props$thead = props.thead) === null || _props$thead === void 0 ? void 0 : _props$thead.color) !== null && _props$thead$color !== void 0 ? _props$thead$color : IHeadColor.DEF1]
           });
           var classList = [getHeadColumnClass(column, index), getColumnCustomClass(column), column.align || props.headerAlign || props.align];
@@ -6388,13 +6401,14 @@ function use_render_isSlot(s) {
       return result;
     })]);
   };
-  var _useFixedColumn2 = use_fixed_column(props, tableResp, head),
-    resolveFixedColumnStyle = _useFixedColumn2.resolveFixedColumnStyle;
+  var _useFixedColumn = use_fixed_column(props, tableResp, head),
+    resolveFixedColumnStyle = _useFixedColumn.resolveFixedColumnStyle;
   var getRowRender = function getRowRender(row, rowIndex, preRow, rows, rowSpanMap, needRowSpan) {
     var isChild = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     var rowLength = rows.length;
     var rowStyle = [].concat(_toConsumableArray(formatPropAsArray(props.rowStyle, [row, rowIndex])), [{
-      '--row-height': "".concat(getRowHeight(row, rowIndex), "px")
+      '--row-height': "".concat(getRowHeight(row, rowIndex), "px"),
+      '--scroll-x': "".concat(tableResp.formatData.layout.translateX, "px")
     }]);
     var rowClass = [].concat(_toConsumableArray(formatPropAsArray(props.rowClass, [row, rowIndex])), ["hover-".concat(props.rowHover), rowIndex % 2 === 1 && props.stripe ? 'stripe-row' : '']);
     var rowId = tableResp.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_UID);
@@ -6809,7 +6823,6 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
       wrapperStyle = _useClass.wrapperStyle,
       contentStyle = _useClass.contentStyle,
       headStyle = _useClass.headStyle,
-      hasScrollYRef = _useClass.hasScrollYRef,
       hasFooter = _useClass.hasFooter,
       footerStyle = _useClass.footerStyle,
       tableBodyClass = _useClass.tableBodyClass,
@@ -6830,17 +6843,12 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
       updateFixClass = _useFixedColumn.updateFixClass;
     var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
       resolveClassName = _usePrefix.resolveClassName;
-    var styleRef = (0,external_vue_namespaceObject.computed)(function () {
-      return {
-        hasScrollY: hasScrollYRef.value
-      };
-    });
     use_observer_resize(root, function () {
       (0,external_vue_namespaceObject.nextTick)(function () {
         resolveFixedColumns(tableOffsetRight.value);
       });
     });
-    var _useRender = use_render(props, ctx, tableSchema, styleRef, head, root, resetTableHeight),
+    var _useRender = use_render(props, ctx, tableSchema, head, root, resetTableHeight),
       renderTableBodySchema = _useRender.renderTableBodySchema,
       renderTableFooter = _useRender.renderTableFooter,
       renderTableHeadSchema = _useRender.renderTableHeadSchema;
@@ -6862,13 +6870,12 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
       tableSchema.formatColumns(columns);
       resolveFixedColumns(tableOffsetRight.value);
       tableSchema.setIndexData().then(function () {
-        // tableSchema.formatDataSchema(props.data);
         tableSchema.resetStartEndIndex();
         if (isFirstLoad.value) {
           tableSchema.resolveByDefColumns();
           isFirstLoad.value = false;
         } else {
-          tableSchema.resolvePageData();
+          tableSchema.resolvePageData(tableSchema.getFilterFnList());
         }
         registerResizeEvent();
         (0,external_vue_namespaceObject.nextTick)(function () {
@@ -6982,6 +6989,9 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
         "throttleDelay": 120,
         "scrollEvent": true,
         "rowKey": props.rowKey,
+        "scrollbar": {
+          enabled: true
+        },
         "enabled": props.virtualEnabled,
         "keepAlive": true
       }), {
@@ -6992,8 +7002,7 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
           return renderTableBodySchema(scope.data);
         },
         afterSection: function afterSection() {
-          return [// <div class={fixedBottomBorder.value}></div>,
-          (0,external_vue_namespaceObject.createVNode)("div", {
+          return [(0,external_vue_namespaceObject.createVNode)("div", {
             "class": resizeColumnClass,
             "style": resizeColumnStyle.value
           }, null)];

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/table.css

@@ -15,11 +15,84 @@
 .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;
+}
+.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;
@@ -997,9 +1070,9 @@
 }
 .bk-table {
   position: relative;
+  width: 100%;
   height: auto;
   overflow: hidden;
-  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1015,19 +1088,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 +1117,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 +1169,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 +1295,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 +1312,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 +1345,6 @@
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
-  scrollbar-gutter: stable;
   overflow: hidden;
   background-color: var(--background-color);
 }
@@ -1337,6 +1387,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 +1395,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 +1419,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;