bkui-vue 2.0.1-beta.26 → 2.0.1-beta.28

package/lib/table/hooks/use-rows.d.ts

@@ -1,18 +1,18 @@
 import { IEmptyObject } from '../const';
 import { TablePropTypes } from '../props';
 declare const useRows: (props: TablePropTypes) => {
-    setRowIndex: (row: any, index: number) => void;
-    setRowExpand: (row: any, isExpand: boolean) => void;
-    isRowChecked: (row: any, index: number) => any;
-    setPageRowList: (rowList: any[]) => void;
+    setRowIndex: (row: Record<string, unknown>, index: number) => void;
+    setRowExpand: (row: Record<string, unknown>, isExpand: boolean) => void;
+    isRowChecked: (row: Record<string, unknown>, index: number) => any;
+    setPageRowList: (rowList: Record<string, unknown>[]) => void;
     clearSelection: () => void;
     formatDataSchema: () => void;
-    toggleRowSelection: (row: any) => void;
+    toggleRowSelection: (row: Record<string, unknown>) => void;
     setRowSelectionAll: (val: boolean) => void;
-    setRowSelection: (row: any, isSelected: boolean, index?: number) => void;
+    setRowSelection: (row: Record<string, unknown>, isSelected: boolean, index?: number) => void;
     setAllRowExpand: (value?: boolean) => void;
     setTableIsNeedRowSpan: (val: boolean) => void;
-    getRowAttribute: (item: IEmptyObject | any, attrName: string) => any;
+    getRowAttribute: (item: IEmptyObject | object, attrName: string) => any;
     getRowSelection: () => any[];
     getRowIndeterminate: () => any;
     getRowCheckedAllValue: () => any;

package/lib/table/index.js

@@ -17324,6 +17324,8 @@ const shared_namespaceObject = x({ ["PropTypes"]: () => __WEBPACK_EXTERNAL_MODUL
 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, ["getCurrentInstance"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.getCurrentInstance, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isRef, ["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 });
+// EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
+var lodash = __webpack_require__(6635);
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
 function typeof_typeof(o) {
   "@babel/helpers - typeof";
@@ -17465,7 +17467,7 @@ var COLUMN_ATTRIBUTE = {
 /**
  * Y 轴滚动条宽度
  */
-var SCROLLY_WIDTH = 0;
+var SCROLLY_WIDTH = 8;
 /**
  * 默认行高
  */
@@ -17912,8 +17914,6 @@ var tableProps = {
     }
   }).def(null)
 };
-// EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
-var lodash = __webpack_require__(6635);
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-column.tsx
 /*
  * Tencent is pleased to support the open source community by making
@@ -17971,12 +17971,13 @@ var TableColumnProp = {
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
     var initTableColumns = (0,external_vue_namespaceObject.inject)(PROVIDE_KEY_INIT_COL, function () {});
+    var lastPropsVal = {};
     (0,external_vue_namespaceObject.watch)(function () {
       return [props];
-    }, function (oldVal, newVal) {
-      var _newVal$;
-      if (!(0,lodash.isEqual)((0,external_vue_namespaceObject.toRaw)(oldVal === null || oldVal === void 0 ? void 0 : oldVal[0]), (0,external_vue_namespaceObject.toRaw)((_newVal$ = newVal === null || newVal === void 0 ? void 0 : newVal[0]) !== null && _newVal$ !== void 0 ? _newVal$ : {}))) {
+    }, function () {
+      if (!(0,lodash.isEqual)(lastPropsVal, (0,external_vue_namespaceObject.toRaw)(props))) {
         initTableColumns();
+        Object.assign(lastPropsVal, (0,external_vue_namespaceObject.toRaw)(props));
       }
     }, {
       immediate: true,
@@ -18124,7 +18125,8 @@ var CELL_EVENT_TYPES = defineProperty_defineProperty(defineProperty_defineProper
   var afterResize = _ref.afterResize;
   var getColumnAttribute = columns.getColumnAttribute,
     getColumnOrderWidth = columns.getColumnOrderWidth,
-    setColumnAttribute = columns.setColumnAttribute;
+    setColumnAttribute = columns.setColumnAttribute,
+    setNextColumnWidth = columns.setNextColumnWidth;
   var getColListener = function getColListener(col) {
     return getColumnAttribute(col, COLUMN_ATTRIBUTE.LISTENERS);
   };
@@ -18142,7 +18144,7 @@ var CELL_EVENT_TYPES = defineProperty_defineProperty(defineProperty_defineProper
   var dragColumn = null;
   var dragStartOffsetX = 0;
   var dragOffsetX = (0,external_vue_namespaceObject.ref)(-1000);
-  var ORDER_LIST = [COLUMN_ATTRIBUTE.RESIZE_WIDTH, COLUMN_ATTRIBUTE.CALC_WIDTH];
+  var ORDER_LIST = [COLUMN_ATTRIBUTE.WIDTH];
   var stopDefaultEvent = function stopDefaultEvent(e) {
     e.stopImmediatePropagation();
     e.stopPropagation();
@@ -18156,8 +18158,8 @@ var CELL_EVENT_TYPES = defineProperty_defineProperty(defineProperty_defineProper
     var resolveWidth = getColumnOrderWidth(dragColumn, ORDER_LIST) + diff;
     var minWidth = getColumnOrderWidth(dragColumn, [COLUMN_ATTRIBUTE.COL_MIN_WIDTH]);
     var calcWidth = resolveWidth > minWidth ? resolveWidth : minWidth;
-    setColumnAttribute(dragColumn, COLUMN_ATTRIBUTE.RESIZE_WIDTH, calcWidth);
-    setColumnAttribute(dragColumn, COLUMN_ATTRIBUTE.CALC_WIDTH, calcWidth);
+    setNextColumnWidth(dragColumn, calcWidth);
+    setColumnAttribute(dragColumn, COLUMN_ATTRIBUTE.WIDTH, calcWidth);
     document.removeEventListener('mouseup', handleMouseUp);
     document.removeEventListener('mousemove', handleMouseMove);
     startX = 0;
@@ -18191,7 +18193,7 @@ var CELL_EVENT_TYPES = defineProperty_defineProperty(defineProperty_defineProper
   var removeCursor = function removeCursor(target) {
     var _target$style2;
     setNodeCursor.cancel();
-    (_target$style2 = target.style) === null || _target$style2 === void 0 || _target$style2.removeProperty('cursor');
+    target === null || target === void 0 || (_target$style2 = target.style) === null || _target$style2 === void 0 || _target$style2.removeProperty('cursor');
     target === null || target === void 0 || target.classList.remove('col-resize-hover');
   };
   var handler = defineProperty_defineProperty(defineProperty_defineProperty(defineProperty_defineProperty({}, EVENTS.MOUSE_DOWN, function (e, column) {
@@ -18201,7 +18203,6 @@ var CELL_EVENT_TYPES = defineProperty_defineProperty(defineProperty_defineProper
     isMouseDown = true;
     var target = e.target.closest('th');
     setColumnAttribute(column, COLUMN_ATTRIBUTE.COL_IS_DRAG, true);
-    setColumnAttribute(column, COLUMN_ATTRIBUTE.CALC_WIDTH, target.scrollWidth);
     setNodeCursor(target);
     dragColumn = column;
     startX = e.clientX;
@@ -18210,6 +18211,7 @@ var CELL_EVENT_TYPES = defineProperty_defineProperty(defineProperty_defineProper
     updateOffsetX(e)();
     document.addEventListener('mouseup', handleMouseUp);
     document.addEventListener('mousemove', handleMouseMove);
+    target === null || target === void 0 || target.classList.remove('col-resize-hover');
   }), EVENTS.MOUSE_MOVE, function (e, _column) {
     if (isMouseDown && !isDraging) {
       isDraging = true;
@@ -18422,7 +18424,7 @@ function v4(options, buf, offset) {
     return columnCache.get(ctx);
   };
   var resolveChildNode = function resolveChildNode(node) {
-    var _node$type, _node$type2;
+    var _node$type, _node$type2, _node$component;
     if (!node || ((_node$type = node.type) === null || _node$type === void 0 ? void 0 : _node$type.name) === 'Table') {
       return;
     }
@@ -18443,35 +18445,45 @@ function v4(options, buf, offset) {
       }
       return;
     }
+    if (node !== null && node !== void 0 && (_node$component = node.component) !== null && _node$component !== void 0 && _node$component.subTree) {
+      var _node$component2;
+      resolveChildNode(node === null || node === void 0 || (_node$component2 = node.component) === null || _node$component2 === void 0 ? void 0 : _node$component2.subTree);
+      return;
+    }
+    if (typeof node === 'function') {
+      return node();
+    }
     if (Array.isArray(node)) {
       node.forEach(resolveChildNode);
+      return;
     }
     if (Array.isArray(node === null || node === void 0 ? void 0 : node.children)) {
       node.children.forEach(resolveChildNode);
+      return;
     }
     if ((0,external_vue_namespaceObject.isVNode)(node) && node !== null && node !== void 0 && node.children && typeof_typeof(node === null || node === void 0 ? void 0 : node.children) === 'object') {
       Object.keys(node.children).forEach(function (key) {
         return resolveChildNode(node.children[key]);
       });
+      return;
     }
-    if (typeof node === 'function') {
-      return node();
-    }
-    // if (Array.isArray(node?.subTree)) {
-    //   node.subTree.forEach(resolveChildNode);
-    // }
-    return;
   };
   var resolveColumns = function resolveColumns(children) {
     columns.length = 0;
     columnIndex = 0;
-    var ghostBody = children.find(function (node) {
+    var ghostBody = children === null || children === void 0 ? void 0 : children.find(function (node) {
       var _node$type3;
       return ((_node$type3 = node.type) === null || _node$type3 === void 0 ? void 0 : _node$type3.name) === 'GhostBody';
     });
     if (ghostBody) {
-      var _ghostBody$children$d, _ghostBody$children, _ghostBody$children$d2;
-      ((_ghostBody$children$d = (_ghostBody$children = ghostBody.children) === null || _ghostBody$children === void 0 || (_ghostBody$children$d2 = _ghostBody$children["default"]) === null || _ghostBody$children$d2 === void 0 ? void 0 : _ghostBody$children$d2.call(_ghostBody$children)) !== null && _ghostBody$children$d !== void 0 ? _ghostBody$children$d : []).forEach(resolveChildNode);
+      var _ghostBody$component;
+      if ((_ghostBody$component = ghostBody.component) !== null && _ghostBody$component !== void 0 && _ghostBody$component.subTree) {
+        var _ghostBody$component2;
+        resolveChildNode((_ghostBody$component2 = ghostBody.component) === null || _ghostBody$component2 === void 0 ? void 0 : _ghostBody$component2.subTree);
+      } else {
+        var _ghostBody$children$d, _ghostBody$children, _ghostBody$children$d2;
+        ((_ghostBody$children$d = (_ghostBody$children = ghostBody.children) === null || _ghostBody$children === void 0 || (_ghostBody$children$d2 = _ghostBody$children["default"]) === null || _ghostBody$children$d2 === void 0 ? void 0 : _ghostBody$children$d2.call(_ghostBody$children)) !== null && _ghostBody$children$d !== void 0 ? _ghostBody$children$d : []).forEach(resolveChildNode);
+      }
     }
     columns.sort(function (col1, col2) {
       return col1.index - col2.index;
@@ -20061,7 +20073,7 @@ var useColumns = function useColumns(props) {
     var colWidth = 0;
     if (/^\d+\.?\d*(px)?$/.test("".concat(col[attrName]))) {
       colWidth = Number("".concat(col[attrName]).replace(/px/, ''));
-      setColumnAttribute(col, COLUMN_ATTRIBUTE.CALC_WIDTH, colWidth);
+      setColumnAttribute(col, COLUMN_ATTRIBUTE.WIDTH, colWidth);
       setColumnRect(col, {
         width: colWidth,
         left: null,
@@ -20070,7 +20082,7 @@ var useColumns = function useColumns(props) {
     }
     if (/^\d+\.?\d*%$/.test("".concat(col[attrName]))) {
       colWidth = Number("".concat(col[attrName]).replace(/%/, '')) / 100 * width;
-      setColumnAttribute(col, COLUMN_ATTRIBUTE.CALC_WIDTH, colWidth);
+      setColumnAttribute(col, COLUMN_ATTRIBUTE.WIDTH, colWidth);
       setColumnRect(col, {
         width: colWidth,
         left: null,
@@ -20106,7 +20118,7 @@ var useColumns = function useColumns(props) {
     var autoWidthList = resolveColWidth(minWidthList, 'minWidth');
     autoWidthList.forEach(function (col) {
       var calcWidth = minColWidth > COL_MIN_WIDTH ? minColWidth : COL_MIN_WIDTH;
-      setColumnAttribute(col, COLUMN_ATTRIBUTE.CALC_WIDTH, calcWidth);
+      setColumnAttribute(col, COLUMN_ATTRIBUTE.WIDTH, calcWidth);
       setColumnRect(col, {
         width: calcWidth,
         left: null,
@@ -20307,6 +20319,9 @@ var useColumns = function useColumns(props) {
   var getColumnCalcWidth = function getColumnCalcWidth(column) {
     return getColumnAttribute(column, COLUMN_ATTRIBUTE.CALC_WIDTH);
   };
+  var getColumnWidth = function getColumnWidth(column) {
+    return getColumnAttribute(column, COLUMN_ATTRIBUTE.WIDTH);
+  };
   var setColumnRect = function setColumnRect(col, _ref2) {
     var left = _ref2.left,
       right = _ref2.right,
@@ -20351,7 +20366,7 @@ var useColumns = function useColumns(props) {
       Object.assign(tableColumnSchema.get(column)[COLUMN_ATTRIBUTE.COL_FILTER_OBJ], option);
     }
   };
-  var ORDER_LIST = [COLUMN_ATTRIBUTE.RESIZE_WIDTH, COLUMN_ATTRIBUTE.CALC_WIDTH, COLUMN_ATTRIBUTE.WIDTH];
+  var ORDER_LIST = [COLUMN_ATTRIBUTE.WIDTH];
   /**
    * 获取当前列实际宽度
    * width props中设置的默认宽度
@@ -20391,6 +20406,16 @@ var useColumns = function useColumns(props) {
       setFilterColumns(column, defineProperty_defineProperty({}, attrName, attrValue));
     }
   };
+  var setNextColumnWidth = function setNextColumnWidth(col, newWidth) {
+    var index = visibleColumns.findIndex(function (item) {
+      return item === col;
+    });
+    var diffWidth = getColumnOrderWidth(col) - newWidth;
+    var nextColumn = visibleColumns[index + 1];
+    if (nextColumn) {
+      setColumnAttribute(nextColumn, COLUMN_ATTRIBUTE.WIDTH, getColumnOrderWidth(nextColumn) + diffWidth);
+    }
+  };
   /**
    * 设置表格列属性
    * @param col 当前列
@@ -20508,6 +20533,7 @@ var useColumns = function useColumns(props) {
     getColumnCustomClass: getColumnCustomClass,
     getColumnRefAttribute: getColumnRefAttribute,
     getColumnCalcWidth: getColumnCalcWidth,
+    getColumnWidth: getColumnWidth,
     resolveEventListener: resolveEventListener,
     setColumnIsHidden: setColumnIsHidden,
     setColumnResizeWidth: setColumnResizeWidth,
@@ -20519,6 +20545,7 @@ var useColumns = function useColumns(props) {
     setFixedStyle: setFixedStyle,
     setColumnRect: setColumnRect,
     setVisibleColumns: setVisibleColumns,
+    setNextColumnWidth: setNextColumnWidth,
     resolveColsCalcWidth: resolveColsCalcWidth
   };
 };
@@ -20727,7 +20754,7 @@ var useColumns = function useColumns(props) {
     var length = fixedRightColumns.value.length;
     for (var i = length - 1; i >= 0; i--) {
       var col = fixedRightColumns.value[i];
-      var width = columns.getColumnCalcWidth(col);
+      var width = columns.getColumnWidth(col);
       columns.setColumnRect(col, {
         right: right,
         width: width
@@ -20739,7 +20766,7 @@ var useColumns = function useColumns(props) {
     }
     var left = 0;
     fixedLeftColumns.value.forEach(function (col) {
-      var width = columns.getColumnCalcWidth(col);
+      var width = columns.getColumnWidth(col);
       columns.setColumnRect(col, {
         left: left,
         width: width
@@ -20785,6 +20812,51 @@ const virtual_render_namespaceObject = virtual_render_x({ ["default"]: () => __W
 var virtual_render_less_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var virtual_render_less_y = x => () => x
 const virtual_render_less_namespaceObject = virtual_render_less_x({  });
+;// CONCATENATED MODULE: ../../packages/table/src/components/ghost-body.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 ghost_body = ((0,external_vue_namespaceObject.defineComponent)({
+  name: 'GhostBody',
+  setup: function setup(_, ctx) {
+    var columnGhostStyle = {
+      zIndex: -1,
+      width: 0,
+      height: 0,
+      display: 'none'
+    };
+    return function () {
+      var _ctx$slots$default, _ctx$slots;
+      return (0,external_vue_namespaceObject.createVNode)("div", {
+        "style": columnGhostStyle
+      }, [(_ctx$slots$default = (_ctx$slots = ctx.slots)["default"]) === null || _ctx$slots$default === void 0 ? void 0 : _ctx$slots$default.call(_ctx$slots)]);
+    };
+  }
+}));
 ;// CONCATENATED MODULE: external "../loading"
 var loading_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var loading_y = x => () => x
@@ -20869,51 +20941,6 @@ const loading_less_namespaceObject = loading_less_x({  });
     renderScrollLoading: renderScrollLoading
   };
 });
-;// CONCATENATED MODULE: ../../packages/table/src/components/ghost-body.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 ghost_body = ((0,external_vue_namespaceObject.defineComponent)({
-  name: 'GhostBody',
-  setup: function setup(_, ctx) {
-    var columnGhostStyle = {
-      zIndex: -1,
-      width: 0,
-      height: 0,
-      display: 'none'
-    };
-    return function () {
-      var _ctx$slots$default, _ctx$slots;
-      return (0,external_vue_namespaceObject.createVNode)("div", {
-        "style": columnGhostStyle
-      }, [(_ctx$slots$default = (_ctx$slots = ctx.slots)["default"]) === null || _ctx$slots$default === void 0 ? void 0 : _ctx$slots$default.call(_ctx$slots)]);
-    };
-  }
-}));
 ;// CONCATENATED MODULE: ../../packages/table/src/hooks/use-layout.tsx
 
 
@@ -21035,10 +21062,11 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
     var _props$thead$color, _props$thead;
     return {
       '--row-height': "".concat(headHeight.value, "px"),
-      '--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]
+      '--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],
+      paddingRight: props.scrollbar ? null : "".concat(SCROLLY_WIDTH, "px")
     };
   });
-  var bodyClass = defineProperty_defineProperty({}, resolveClassName('table-body'), true);
+  var bodyClass = defineProperty_defineProperty(defineProperty_defineProperty({}, resolveClassName('table-body'), true), 'is-bk-scrollbar', props.scrollbar);
   var footerClass = (0,external_vue_namespaceObject.computed)(function () {
     return (0,shared_namespaceObject.classes)(defineProperty_defineProperty(defineProperty_defineProperty({}, resolveClassName('table-footer'), true), 'is-hidden', footHeight.value === 0));
   });
@@ -21182,12 +21210,12 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
       "enabled": props.virtualEnabled,
       "lineHeight": lineHeight.value,
       "list": list,
+      "maxHeight": bodyMaxHeight.value,
       "rowKey": props.rowKey,
       "scrollEvent": true,
       "scrollbar": {
         enabled: props.scrollbar
       },
-      "maxHeight": bodyMaxHeight.value,
       "throttleDelay": 120,
       "onContentScroll": handleScrollChanged
     }, {
@@ -23969,8 +23997,8 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
      * 计算每一列的实际宽度
      */
     var computedColumnRect = function computedColumnRect() {
-      var _refRoot$value$offset, _refRoot$value;
-      var width = (_refRoot$value$offset = (_refRoot$value = refRoot.value) === null || _refRoot$value === void 0 ? void 0 : _refRoot$value.offsetWidth) !== null && _refRoot$value$offset !== void 0 ? _refRoot$value$offset : 0;
+      var _ref, _refRoot$value;
+      var width = (_ref = ((_refRoot$value = refRoot.value) === null || _refRoot$value === void 0 ? void 0 : _refRoot$value.offsetWidth) - (props.scrollbar ? 1 : SCROLLY_WIDTH)) !== null && _ref !== void 0 ? _ref : 0;
       columns.resolveColsCalcWidth(width);
       resolveFixedColumnStyle();
     };
@@ -24037,23 +24065,33 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
         setOffsetRight();
       });
     };
+    var observerResizing = (0,external_vue_namespaceObject.ref)(false);
+    var observerResizingTimer = null;
     use_observer_resize(refRoot, function () {
-      var _refBody$value2;
-      if ((props.height === '100%' || props.virtualEnabled) && (0,lodash.isElement)(refRoot.value)) {
-        if (isResizeBodyHeight.value) {
-          setTimeout(function () {
-            isResizeBodyHeight.value = false;
-          });
-          return;
+      if (!observerResizing.value) {
+        var _refBody$value2;
+        observerResizing.value = true;
+        if ((props.height === '100%' || props.virtualEnabled) && (0,lodash.isElement)(refRoot.value)) {
+          if (isResizeBodyHeight.value) {
+            setTimeout(function () {
+              isResizeBodyHeight.value = false;
+            });
+            return;
+          }
+          var tableHeight = refRoot.value.offsetHeight;
+          isResizeBodyHeight.value = true;
+          setBodyHeight(tableHeight);
+          setOffsetRight();
         }
-        var tableHeight = refRoot.value.offsetHeight;
-        isResizeBodyHeight.value = true;
-        setBodyHeight(tableHeight);
+        computedColumnRect();
         setOffsetRight();
+        (_refBody$value2 = refBody.value) === null || _refBody$value2 === void 0 || _refBody$value2.scrollTo(0, 0);
+        return;
       }
-      computedColumnRect();
-      (_refBody$value2 = refBody.value) === null || _refBody$value2 === void 0 || _refBody$value2.scrollTo(0, 0);
-      setOffsetRight();
+      observerResizingTimer && clearTimeout(observerResizingTimer);
+      observerResizingTimer = setTimeout(function () {
+        observerResizing.value = false;
+      });
     });
     (0,external_vue_namespaceObject.watch)(function () {
       return [dragOffsetX.value];
@@ -24090,12 +24128,9 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       return [pagination.options.count, pagination.options.limit, pagination.options.current, props.data];
     }, function () {
       setTableData();
-      (0,external_vue_namespaceObject.nextTick)(function () {
-        var _refBody$value3;
-        (_refBody$value3 = refBody.value) === null || _refBody$value3 === void 0 || _refBody$value3.scrollTo(0, 1);
-      });
     }, {
-      immediate: true
+      immediate: true,
+      deep: true
     });
     ctx.expose({
       setRowExpand: rows.setRowExpand,

package/lib/table/props.d.ts

@@ -44,12 +44,12 @@ export declare enum FixedEnum {
 }
 export declare const fixedType: import("vue-types").VueTypeValidableDef<"left" | "right">;
 export type IOverflowTooltipOption = {
-    content: ((col: Column, row: any) => string) | string;
-    disabled?: ((col: Column, row: any) => boolean) | boolean;
+    content: ((col: Column, row: Record<string, object>) => string) | string;
+    disabled?: ((col: Column, row: Record<string, object>) => boolean) | boolean;
     allowHtml?: boolean;
     watchCellResize?: boolean;
     mode?: `${OverflowModeEnum}`;
-    popoverOption?: any;
+    popoverOption?: Record<string, object>;
     resizerWay?: ResizerWay;
     showHead?: boolean;
 };
@@ -61,16 +61,19 @@ export type ISortOption = {
 };
 export declare const ISortType: import("vue-types").VueTypeDef<ISortPropShape>;
 export type ISortShape = {
-    sortFn?: Function;
+    sortFn?: (...args: any[]) => boolean;
     sortScope?: SortScope;
     value?: SORT_OPTION;
 };
 export type ISortPropShape = ISortShape | boolean | string;
 export type IFilterShape = {
-    list: any[];
-    filterFn?: Function;
+    list: {
+        label: string;
+        value: string;
+    }[];
+    filterFn?: (...args: any[]) => boolean;
     match?: FullEnum;
-    checked?: any[];
+    checked?: string[];
     filterScope?: SortScope;
     btnSave?: boolean | string;
     btnReset?: boolean | string;
@@ -119,12 +122,12 @@ export type Field = {
 export type LabelFunctionString = ((_column: any, _index: any) => JSX.Element | boolean | number | string) | boolean | number | string;
 export declare const LabelFunctionStringType: import("vue-types").VueTypeDef<LabelFunctionString>;
 export type HeadRenderArgs = {
-    cell?: any;
-    data?: any[];
-    row?: any;
+    cell?: Record<string, object>;
+    data?: Record<string, object>[];
+    row?: Record<string, object>;
     column: Column;
     index: number;
-    rows?: any[];
+    rows?: Record<string, object>[];
 };
 export type RenderFunctionString = (args: HeadRenderArgs) => JSX.Element | boolean | number | string;
 export declare const RenderFunctionStringType: import("vue-types").VueTypeDef<RenderFunctionString>;
@@ -135,11 +138,11 @@ export type SpanFunctionString = (({ column, colIndex, row, rowIndex }: {
     rowIndex: any;
 }) => number) | number;
 export declare const SpanFunctionStringType: import("vue-types").VueTypeDef<SpanFunctionString>;
-export type RowClassFunctionString = ((row: any) => string) | string;
+export type RowClassFunctionString = ((row: Record<string, object>) => string) | string;
 export declare const RowClassFunctionStringType: import("vue-types").VueTypeDef<RowClassFunctionString>;
-export type RowHeightFunctionNumber = ((_type: string, _row: any, _rowIndex: number, _size?: any) => number) | number;
+export type RowHeightFunctionNumber = ((type: string, row: Record<string, object>, rowIndex: number, size?: any) => number) | number;
 export declare const RowHeightFunctionNumberType: import("vue-types").VueTypeDef<RowHeightFunctionNumber>;
-type FunctionNumber = Function | number;
+type FunctionNumber = ((...args: any[]) => void) | number;
 export declare const FunctionNumberType: import("vue-types").VueTypeDef<FunctionNumber>;
 type StringNumber = number | string;
 export declare const StringNumberType: (val: number | string) => import("vue-types").VueTypeDef<StringNumber> & {
@@ -186,7 +189,7 @@ export declare const IColumnProp: import("vue-types").VueTypeDef<Column>;
 export type Thead = {
     height?: number;
     isShow?: boolean;
-    cellFn?: Function;
+    cellFn?: (...args: any[]) => void;
     color?: IHeadColor | string;
 };
 export type Columns = ReadonlyArray<Column>;
@@ -195,7 +198,7 @@ export type GroupColumn = {
     calcWidth?: number;
     resizeWidth?: number;
     isHidden?: boolean;
-    listeners?: Map<string, any>;
+    listeners?: Map<string, (...args: any[]) => void>;
 } & Column;
 export type IColumnActive = {
     index: number;
@@ -203,21 +206,21 @@ export type IColumnActive = {
 };
 export type IReactiveProp = {
     activeColumns: IColumnActive[];
-    rowActions: Record<string, any>;
+    rowActions: Record<string, object>;
     scrollTranslateY: number;
     scrollTranslateX: number;
-    pos: Record<string, any>;
+    pos: Record<string, object>;
     settings: Settings | boolean;
     setting: {
         size: string;
         height: number;
     };
-    defaultSort: Record<string, any>;
+    defaultSort: Record<string, object>;
 };
 export type Colgroups = Column & {
     calcWidth: number;
     resizeWidth: number;
-    listeners: Map<string, Function>;
+    listeners: Map<string, (...args: any[]) => void>;
 };
 export declare enum IColSortBehavior {
     /**