bkui-vue 1.0.3-beta.66.dialog.3 → 1.0.3-beta.67

package/lib/table/index.js

@@ -122,7 +122,7 @@ function defineProperty_defineProperty(obj, key, value) {
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["provide"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.provide, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch, ["watchEffect"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watchEffect });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["provide"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.provide, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch, ["watchEffect"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watchEffect });
 ;// CONCATENATED MODULE: ../../node_modules/uuid/dist/esm-browser/native.js
 const randomUUID = typeof crypto !== 'undefined' && crypto.randomUUID && crypto.randomUUID.bind(crypto);
 /* harmony default export */ const esm_browser_native = ({
@@ -295,7 +295,7 @@ var COLUMN_ATTRIBUTE = {
 /**
  * Y 轴滚动条宽度
  */
-var SCROLLY_WIDTH = 0;
+var SCROLLY_WIDTH = 6;
 /**
  * 默认行高
  */
@@ -723,11 +723,7 @@ var tableProps = {
   /**
    * 是否支持行拖拽排序
    */
-  rowDraggable: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.func, shared_namespaceObject.PropTypes.bool, shared_namespaceObject.PropTypes.object]).def(false),
-  /**
-   * 是否支持shift键多行选择
-   */
-  shiftMultiChecked: shared_namespaceObject.PropTypes.bool.def(false)
+  rowDraggable: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.func, shared_namespaceObject.PropTypes.bool, shared_namespaceObject.PropTypes.object]).def(false)
 };
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-column.tsx
 
@@ -1500,6 +1496,7 @@ function _toConsumableArray(arr) {
  */
 
 
+
 /**
  * 固定列Hooks
  */
@@ -1586,12 +1583,13 @@ 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: -1
+      right: hasScrollY ? SCROLLY_WIDTH : -1
     };
     var fixedPos = resolveFixColPos(column);
     fixedOffset[fixedPos] = getPreColumnOffset(fixedPos, column, fixedOffset[fixedPos]);
@@ -3201,7 +3199,6 @@ 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(),
@@ -3220,7 +3217,6 @@ 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
@@ -3308,9 +3304,9 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     if (!props.pagination) {
       return;
     }
-    localPagination.value = props.remotePagination ? pagination : use_pagination_objectSpread({
+    localPagination.value = props.remotePagination ? pagination : use_pagination_objectSpread(use_pagination_objectSpread({}, pagination), {}, {
       count: indexData.length
-    }, pagination);
+    });
   };
   /**
    * 重置当前分页开始位置 & 结束位置
@@ -3375,35 +3371,35 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     }
     pageData.length = 0;
     pageData.push.apply(pageData, _toConsumableArray(sourceData.slice(startIndex.value, endIndex.value)));
-    if (Array.isArray(filterFn)) {
-      multiFilter(filterFn, pageData);
-    } else {
-      filter(pageData, filterFn);
-    }
+    filter(pageData, filterFn);
     sort(pageData, sortFn, column, type, sortScope);
     resolveLocalPagination();
   };
   var resolvePageDataBySortList = function resolvePageDataBySortList(multiCol) {
     resolvePageData(null, null, null, null, null, multiCol);
   };
-  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 multiFilter = function multiFilter(filterFnList) {
+    var sourceData = 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(filterFn, sortFn) {
+  var handlePaginationChange = function handlePaginationChange() {
     pagination = resolvePaginationOption(props.pagination, pagination);
     resolveLocalPagination();
     resetStartEndIndex();
-    resolvePageData(filterFn, sortFn);
+    resolvePageData();
   };
   handlePaginationChange();
+  (0,external_vue_namespaceObject.watch)(function () {
+    return [props.pagination];
+  }, function () {
+    handlePaginationChange();
+  }, {
+    deep: true
+  });
   return {
     pageData: pageData,
     indexData: indexData,
@@ -3411,9 +3407,7 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     resolvePageData: resolvePageData,
     resolveIndexData: resolveIndexData,
     resolvePageDataBySortList: resolvePageDataBySortList,
-    handlePaginationChange: handlePaginationChange,
     resetStartEndIndex: resetStartEndIndex,
-    getCurrentPageData: getCurrentPageData,
     multiFilter: multiFilter,
     sort: sort
   };
@@ -3492,8 +3486,6 @@ 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,
@@ -3616,15 +3608,13 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
   var getColumnFilterFn = function getColumnFilterFn(col) {
     return getColumnAttribute(col, COLUMN_ATTRIBUTE.COL_FILTER_FN);
   };
-  var getFilterFnList = function getFilterFnList() {
-    return formatData.columns.filter(function (col) {
+  var filter = function filter() {
+    var filterFnList = formatData.columns.filter(function (col) {
       return !isHiddenColumn(col) && typeof getColumnFilterFn(col) === 'function';
     }).map(function (col) {
       return getColumnFilterFn(col);
     });
-  };
-  var filter = function filter() {
-    multiFilter(getFilterFnList(), getCurrentPageData());
+    multiFilter(filterFnList);
   };
   /**
    * 按照指定列排序
@@ -4085,13 +4075,6 @@ 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,
@@ -4129,8 +4112,7 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
     pageData: pageData,
     localPagination: localPagination,
     formatData: formatData,
-    setIndexData: setIndexData,
-    getFilterFnList: getFilterFnList
+    setIndexData: setIndexData
   };
 };
 /* harmony default export */ const use_attributes = (tableSchemaResponse);
@@ -5439,15 +5421,15 @@ const input_less_namespaceObject = input_less_x({  });
 
 
 
+
 function head_filter_isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0,external_vue_namespaceObject.isVNode)(s);
 }
-var ROW_HEIGHT = 32;
 /* harmony default export */ const head_filter = ((0,external_vue_namespaceObject.defineComponent)({
   name: 'HeadFilter',
   props: {
     column: IColumnType,
-    height: shared_namespaceObject.PropTypes.number.def(ROW_HEIGHT)
+    height: shared_namespaceObject.PropTypes.number.def(LINE_HEIGHT)
   },
   emits: ['change', 'filterSave'],
   setup: function setup(props, _ref) {
@@ -5469,6 +5451,14 @@ var ROW_HEIGHT = 32;
       isOpen: false,
       checked: checked.value
     });
+    var maxHeight = (0,external_vue_namespaceObject.computed)(function () {
+      var _filter$value$maxHeig, _filter$value2;
+      return (_filter$value$maxHeig = (_filter$value2 = filter.value) === null || _filter$value2 === void 0 ? void 0 : _filter$value2.maxHeight) !== null && _filter$value$maxHeig !== void 0 ? _filter$value$maxHeig : LINE_HEIGHT * 15;
+    });
+    var height = (0,external_vue_namespaceObject.computed)(function () {
+      var _filter$value3;
+      return ((_filter$value3 = filter.value) === null || _filter$value3 === void 0 ? void 0 : _filter$value3.height) || '100%';
+    });
     (0,external_vue_namespaceObject.watch)(function () {
       return filter.value;
     }, function () {
@@ -5500,22 +5490,6 @@ var ROW_HEIGHT = 32;
       });
       return filterList;
     });
-    var maxLength = 5;
-    var maxHeight = (0,external_vue_namespaceObject.computed)(function () {
-      var _filter$value$maxHeig, _filter$value2;
-      return (_filter$value$maxHeig = (_filter$value2 = filter.value) === null || _filter$value2 === void 0 ? void 0 : _filter$value2.maxHeight) !== null && _filter$value$maxHeig !== void 0 ? _filter$value$maxHeig : ROW_HEIGHT * maxLength;
-    });
-    var height = (0,external_vue_namespaceObject.computed)(function () {
-      var _filter$value3;
-      return ((_filter$value3 = filter.value) === null || _filter$value3 === void 0 ? void 0 : _filter$value3.height) || '100%';
-    });
-    var minHeight = (0,external_vue_namespaceObject.computed)(function () {
-      var defaultMin = ROW_HEIGHT * 2;
-      if (localData.value.length > maxLength) {
-        return maxHeight.value;
-      }
-      return defaultMin;
-    });
     var getRegExp = function getRegExp(val) {
       var flags = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'ig';
       return new RegExp("".concat(val).replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'), flags);
@@ -5630,10 +5604,10 @@ var ROW_HEIGHT = 32;
       if (scope.data.length) {
         return scope.data.map(function (item) {
           return (0,external_vue_namespaceObject.createVNode)("div", {
-            "class": "list-item",
-            "key": item.value
+            "class": "list-item"
           }, [(0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject["default"], {
             "label": item.value,
+            "key": item.$index,
             "immediateEmitChange": false,
             "checked": state.checked.includes(item.value),
             "modelValue": state.checked.includes(item.value),
@@ -5651,6 +5625,16 @@ var ROW_HEIGHT = 32;
         "class": "list-item is-empty"
       }, [t.value.emptyText]);
     };
+    /* 监听过滤筛选值，更新表格
+    onMounted(() => {
+      watch(() => filter.value.checked, (val) => {
+        if (val?.length) {
+          state.checked = val;
+          emit('change', val, filterFn);
+        }
+      }, { immediate: true });
+    });
+    */
     return function () {
       return (0,external_vue_namespaceObject.createVNode)(popover_namespaceObject["default"], (0,external_vue_namespaceObject.mergeProps)({
         "trigger": "click",
@@ -5690,7 +5674,6 @@ var ROW_HEIGHT = 32;
             "default": function _default() {
               return [(0,external_vue_namespaceObject.createVNode)(virtual_render_namespaceObject["default"], {
                 "maxHeight": maxHeight.value,
-                "minHeight": minHeight.value,
                 "height": height.value,
                 "lineHeight": 32,
                 "list": localData.value,
@@ -5926,11 +5909,11 @@ function use_head_cell_isSlot(s) {
       }));
     }, {});
   };
-  var getSortFnByColumn = function getSortFnByColumn(column, fn, a, b, type) {
+  var getSortFnByColumn = function getSortFnByColumn(column, fn, a, b) {
     if (column.type === 'index') {
-      return fn(tableResp.getRowAttribute(a, TABLE_ROW_ATTRIBUTE.ROW_INDEX), tableResp.getRowAttribute(b, TABLE_ROW_ATTRIBUTE.ROW_INDEX), type);
+      return fn(tableResp.getRowAttribute(a, TABLE_ROW_ATTRIBUTE.ROW_INDEX), tableResp.getRowAttribute(b, TABLE_ROW_ATTRIBUTE.ROW_INDEX));
     }
-    return fn(a, b, type);
+    return fn(a, b);
   };
   /**
    * 点击选中一列事件
@@ -5945,7 +5928,7 @@ function use_head_cell_isSlot(s) {
       var type = tableResp.getColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_TYPE);
       nextSort.value = getNextSortType(type);
       var sortFn = function sortFn(a, b) {
-        return getSortFnByColumn(column, getSortFn(column, nextSort.value, props.sortValFormat), a, b, type);
+        return getSortFnByColumn(column, getSortFn(column, nextSort.value, props.sortValFormat), a, b);
       };
       tableResp.setColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_TYPE, nextSort.value);
       tableResp.setColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_FN, sortFn);
@@ -6013,9 +5996,8 @@ function use_head_cell_isSlot(s) {
      * @param type 排序类型
      */
     var handleSortClick = function handleSortClick(sortFn, type) {
-      console.log('handleSortClick', type);
       var fn = function fn(a, b) {
-        return getSortFnByColumn(column, sortFn, a, b, type);
+        return getSortFnByColumn(column, sortFn, a, b);
       };
       tableResp.setColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_TYPE, type);
       tableResp.setColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_FN, fn);
@@ -6130,88 +6112,6 @@ function use_head_cell_isSlot(s) {
     getTH: getTH
   };
 });
-;// CONCATENATED MODULE: ../../packages/table/src/plugins/use-shift-key.tsx
-/*
- * Tencent is pleased to support the open source community by making
- * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available.
- *
- * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
- *
- * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) is licensed under the MIT License.
- *
- * License for 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition):
- *
- * ---------------------------------------------------
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
- * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
- * the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
- * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-/* harmony default export */ const use_shift_key = (function (props) {
-  var isShiftKeyDown = (0,external_vue_namespaceObject.ref)(false);
-  var store = {
-    start: null,
-    end: null
-  };
-  var handleKeyDown = function handleKeyDown(e) {
-    if (e.key === 'Shift') {
-      isShiftKeyDown.value = true;
-    }
-  };
-  var handleKeyUp = function handleKeyUp(e) {
-    if (e.key === 'Shift') {
-      isShiftKeyDown.value = false;
-      clearStore();
-    }
-  };
-  var setStore = function setStore(row, index) {
-    if (store.start === null && store.end === null) {
-      store.start = {
-        index: index,
-        row: row
-      };
-      return false;
-    }
-    store.end = {
-      index: index,
-      row: row
-    };
-    return true;
-  };
-  var clearStore = function clearStore() {
-    store.start = null;
-    store.end = null;
-  };
-  if (props.shiftMultiChecked) {
-    window.addEventListener('keydown', handleKeyDown);
-    window.addEventListener('keyup', handleKeyUp);
-  }
-  var getStore = function getStore() {
-    return store;
-  };
-  (0,external_vue_namespaceObject.onUnmounted)(function () {
-    if (props.shiftMultiChecked) {
-      window.removeEventListener('keydown', handleKeyDown);
-      window.removeEventListener('keyup', handleKeyUp);
-    }
-  });
-  return {
-    isShiftKeyDown: isShiftKeyDown,
-    setStore: setStore,
-    getStore: getStore,
-    clearStore: clearStore
-  };
-});
 ;// CONCATENATED MODULE: ../../packages/table/src/use-render.tsx
 
 
@@ -6263,11 +6163,10 @@ 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, head, root, resetTableHeight) {
+/* harmony default export */ const use_render = (function (props, context, tableResp, styleRef, head, root, resetTableHeight) {
   var t = (0,config_provider_namespaceObject.useLocale)('table');
   var uuid = esm_browser_v4();
   var formatData = (0,external_vue_namespaceObject.computed)(function () {
@@ -6279,10 +6178,6 @@ function use_render_isSlot(s) {
   var settings = (0,external_vue_namespaceObject.computed)(function () {
     return formatData.value.settings;
   });
-  var _useShiftKey = use_shift_key(props),
-    isShiftKeyDown = _useShiftKey.isShiftKeyDown,
-    getStore = _useShiftKey.getStore,
-    setStore = _useShiftKey.setStore;
   // const activeSortIndex = ref(null);
   /**
    * 过滤当前可渲染的列
@@ -6392,17 +6287,11 @@ function use_render_isSlot(s) {
     context.emit(EMIT_EVENTS.PAGE_LIMIT_CHANGE, limit);
   };
   var handlePageChange = function handlePageChange(current) {
-    if (typeof_typeof(props.pagination) === 'object' && current !== props.pagination.current) {
-      Object.assign(props.pagination, {
-        current: current,
-        value: current
-      });
-      context.emit(EMIT_EVENTS.PAGE_VALUE_CHANGE, current);
-      return;
-    }
-    if (typeof props.pagination === 'boolean' && props.pagination !== false) {
-      context.emit(EMIT_EVENTS.PAGE_VALUE_CHANGE, current);
-    }
+    Object.assign(props.pagination, {
+      current: current,
+      value: current
+    });
+    context.emit(EMIT_EVENTS.PAGE_VALUE_CHANGE, current);
   };
   /**
    * 渲染Table Header
@@ -6415,7 +6304,8 @@ function use_render_isSlot(s) {
       '--row-height': "".concat(resolvePropVal(config, 'height', ['thead']), "px"),
       backgroundColor: props.thead.color
     };
-    // const { resolveFixedColumnStyle } = useFixedColumn(props, tableResp, head);
+    var _useFixedColumn = use_fixed_column(props, tableResp, head),
+      resolveFixedColumnStyle = _useFixedColumn.resolveFixedColumnStyle;
     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, {
@@ -6424,7 +6314,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), {
+          var headStyle = Object.assign({}, resolveFixedColumnStyle(column, styleRef.value.hasScrollY), {
             '--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];
@@ -6500,14 +6390,13 @@ function use_render_isSlot(s) {
       return result;
     })]);
   };
-  var _useFixedColumn = use_fixed_column(props, tableResp, head),
-    resolveFixedColumnStyle = _useFixedColumn.resolveFixedColumnStyle;
+  var _useFixedColumn2 = use_fixed_column(props, tableResp, head),
+    resolveFixedColumnStyle = _useFixedColumn2.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"),
-      '--scroll-x': "".concat(tableResp.formatData.layout.translateX, "px")
+      '--row-height': "".concat(getRowHeight(row, rowIndex), "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);
@@ -6518,6 +6407,7 @@ function use_render_isSlot(s) {
         return [(0,external_vue_namespaceObject.createVNode)("tr", (0,external_vue_namespaceObject.mergeProps)({
           "style": rowStyle,
           "class": rowClass,
+          "data-row-id": rowId,
           "key": rowId,
           "data-row-index": rowIndex,
           "onClick": function onClick(e) {
@@ -6568,14 +6458,11 @@ function use_render_isSlot(s) {
               };
               context.emit(type, args);
             };
-            var columnKey = "".concat(rowId, "_").concat(index);
-            var cellKey = "".concat(rowId, "_").concat(index, "_cell");
             return (0,external_vue_namespaceObject.createVNode)("td", {
               "class": cellClass,
               "style": cellStyle,
               "colspan": colspan,
               "rowspan": rowspan,
-              "key": columnKey,
               "onClick": function onClick(event) {
                 return handleEmit(event, EMIT_EVENTS.CELL_CLICK);
               },
@@ -6583,7 +6470,6 @@ function use_render_isSlot(s) {
                 return handleEmit(event, EMIT_EVENTS.CELL_DBL_CLICK);
               }
             }, [(0,external_vue_namespaceObject.createVNode)(table_cell, {
-              "key": cellKey,
               "class": tdCtxClass,
               "column": column,
               "row": row,
@@ -6715,38 +6601,6 @@ function use_render_isSlot(s) {
         data: props.data
       });
     };
-    var beforeRowChange = function beforeRowChange() {
-      if (isShiftKeyDown.value && !isAll) {
-        var result = setStore(row, index);
-        if (result) {
-          var _tableResp$pageData$s;
-          var _getStore = getStore(),
-            start = _getStore.start,
-            end = _getStore.end;
-          var startIndex = start.index < end.index ? start.index : end.index;
-          var endIndex = start.index < end.index ? end.index : start.index;
-          ((_tableResp$pageData$s = tableResp.pageData.slice(startIndex, endIndex + 1)) !== null && _tableResp$pageData$s !== void 0 ? _tableResp$pageData$s : []).forEach(function (item) {
-            tableResp.setRowSelection(item, true);
-          });
-        }
-        context.emit(EMIT_EVENTS.ROW_SELECT, {
-          row: row,
-          index: index,
-          checked: true,
-          data: props.data,
-          isShiftKeyDown: true
-        });
-        context.emit(EMIT_EVENTS.ROW_SELECT_CHANGE, {
-          row: row,
-          index: index,
-          checked: true,
-          data: props.data,
-          isShiftKeyDown: true
-        });
-        return Promise.resolve(!result);
-      }
-      return Promise.resolve(true);
-    };
     var indeterminate = tableResp.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_SELECTION_INDETERMINATE);
     var isChecked = tableResp.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_SELECTION);
     var isEnable = isRowSelectEnable(props, {
@@ -6758,8 +6612,7 @@ function use_render_isSlot(s) {
       "onChange": handleChecked,
       "disabled": !isEnable,
       "modelValue": isChecked,
-      "indeterminate": indeterminate,
-      "beforeChange": beforeRowChange
+      "indeterminate": indeterminate
     }, null);
   };
   var renderExpandColumn = function renderExpandColumn(row, column, index, rows) {
@@ -6958,6 +6811,7 @@ 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,
@@ -6978,12 +6832,17 @@ 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, head, root, resetTableHeight),
+    var _useRender = use_render(props, ctx, tableSchema, styleRef, head, root, resetTableHeight),
       renderTableBodySchema = _useRender.renderTableBodySchema,
       renderTableFooter = _useRender.renderTableFooter,
       renderTableHeadSchema = _useRender.renderTableHeadSchema;
@@ -7005,12 +6864,13 @@ 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.getFilterFnList());
+          tableSchema.resolvePageData();
         }
         registerResizeEvent();
         (0,external_vue_namespaceObject.nextTick)(function () {
@@ -7124,12 +6984,8 @@ 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,
-        "autoIndex": false
+        "keepAlive": true
       }), {
         beforeContent: function beforeContent() {
           return renderPrepend();
@@ -7138,7 +6994,8 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
           return renderTableBodySchema(scope.data);
         },
         afterSection: function afterSection() {
-          return [(0,external_vue_namespaceObject.createVNode)("div", {
+          return [// <div class={fixedBottomBorder.value}></div>,
+          (0,external_vue_namespaceObject.createVNode)("div", {
             "class": resizeColumnClass,
             "style": resizeColumnStyle.value
           }, null)];

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;