@pisell/materials 2.2.21 → 2.2.22

package/es/components/table/BasicTable/index.js

@@ -84,7 +84,6 @@ var BasicTable = function BasicTable(props) {
       total: _total
     };
   }, [localPagination, dataSource, formPagination === null || formPagination === void 0 ? void 0 : formPagination.page, formPagination === null || formPagination === void 0 ? void 0 : formPagination.size, filter, sort, other.columns]);
-  console.log(pagination, 'wh8888');
 
   // 总数
   var total = useMemo(function () {
@@ -110,7 +109,7 @@ var BasicTable = function BasicTable(props) {
       type: 'setCurrentDataSource',
       payload: (_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list) || []
     });
-  }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
+  }, [JSON.stringify(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list)]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, _extends({
     key: defaultExpandedRowKeys.join('-')
   }, other, {
@@ -140,7 +139,10 @@ var BasicTable = function BasicTable(props) {
       defaultExpandAllRows: true
     }
   })), total > ((pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || (pagination === null || pagination === void 0 ? void 0 : (_pagination$pageSizeO = pagination.pageSizeOptions) === null || _pagination$pageSizeO === void 0 ? void 0 : _pagination$pageSizeO[0]) || 10) || pagination !== null && pagination !== void 0 && pagination.showPagination && total > 10 ? /*#__PURE__*/React.createElement(Form.Item, {
-    name: "pagination"
+    name: "pagination",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/React.createElement(FormPagination, _extends({}, pagination, {
     showTotal: _showTotal,
     total: total

package/es/components/table/Table/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const _default: React.NamedExoticComponent<any>;
 export default _default;

package/es/components/table/Table/index.js

@@ -11,10 +11,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-import React, { memo, useCallback, useEffect, useMemo, useRef } from "react";
-import { Form } from "antd";
+import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
+import { Form } from 'antd';
 // import { Access } from '@umijs/max';
-import { useMemoizedFn, useSize } from "ahooks";
+import { useDebounce, useMemoizedFn, useSize } from 'ahooks';
 import { Context } from "../model";
 // import AddFieldModal from "./AddFieldModal";
 import BasicTable from "../BasicTable";
@@ -25,26 +25,23 @@ import useTransDataSource from "../hooks/useTransDataSource";
 import useTransColumns from "../hooks/useTransColumns";
 import useGenTableComponents from "../hooks/useGenTableComponents";
 import useGenScroll from "../hooks/useGenScroll";
-import { useSharedState, useResponsive } from "../../../hooks";
+import { useSharedState } from "../../../hooks";
 import "./index.less";
 var GridViewTable = function GridViewTable(_ref) {
-  var _tableProps$paginatio, _tableProps$paginatio2, _tableProps$paginatio7, _tableProps$paginatio8, _tableProps$paginatio9, _tableProps$paginatio10;
+  var _tableProps$paginatio, _tableProps$paginatio2;
   var tableProps = _ref.tableProps,
     filter = _ref.filter,
     setTableSetting = _ref.setTableSetting,
     onDataSourceChange = _ref.onDataSourceChange;
-  var responsive = useResponsive();
   var _useSharedState = useSharedState(Context),
     state = _useSharedState.state,
     dispatch = _useSharedState.dispatch;
   var form = Form.useFormInstance();
-  var column_setting = Form.useWatch("column_setting", {
+  var column_setting = Form.useWatch('column_setting', {
     form: form,
     preserve: true
   }) || [];
   var tableWrapRef = useRef(null);
-  var _ref2 = useSize(tableWrapRef) || {},
-    height = _ref2.height;
   var defaultDataSource = state.dataSource,
     originDataSource = state.originDataSource;
   var handleSave = useMemoizedFn(function (row) {
@@ -55,18 +52,18 @@ var GridViewTable = function GridViewTable(_ref) {
     var item = newData[index];
     newData.splice(index, 1, _objectSpread(_objectSpread({}, item), row));
     dispatch({
-      type: "setDataSource",
+      type: 'setDataSource',
       payload: newData
     });
   });
   var handleResize = function handleResize(index) {
-    return function (e, _ref3) {
-      var size = _ref3.size;
+    return function (e, _ref2) {
+      var size = _ref2.size;
       var nextColumns = _toConsumableArray(columns);
       nextColumns[index] = _objectSpread(_objectSpread({}, nextColumns[index]), {}, {
         width: size.width
       });
-      form.setFieldValue("column_setting", nextColumns);
+      form.setFieldValue('column_setting', nextColumns);
       setTableSetting(form.getFieldsValue());
     };
   };
@@ -89,7 +86,7 @@ var GridViewTable = function GridViewTable(_ref) {
   });
   useEffect(function () {
     dispatch({
-      type: "setOriginResultDataSource",
+      type: 'setOriginResultDataSource',
       payload: dataSource || []
     });
   }, [dataSource]);
@@ -99,24 +96,10 @@ var GridViewTable = function GridViewTable(_ref) {
   var components = useGenTableComponents({
     form: form
   });
-  var isShowPagination = useMemo(function () {
-    var _tableProps$paginatio3, _tableProps$paginatio4, _tableProps$paginatio5, _tableProps$paginatio6;
-    var total = (tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio3 = tableProps.pagination) === null || _tableProps$paginatio3 === void 0 ? void 0 : _tableProps$paginatio3.total) || (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || 0;
-    if (tableProps !== null && tableProps !== void 0 && (_tableProps$paginatio4 = tableProps.pagination) !== null && _tableProps$paginatio4 !== void 0 && _tableProps$paginatio4.localPagination) {
-      total = (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || 0;
-    }
-    return total > ((tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio5 = tableProps.pagination) === null || _tableProps$paginatio5 === void 0 ? void 0 : (_tableProps$paginatio6 = _tableProps$paginatio5.pageSizeOptions) === null || _tableProps$paginatio6 === void 0 ? void 0 : _tableProps$paginatio6[0]) || 10);
-  }, [tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio7 = tableProps.pagination) === null || _tableProps$paginatio7 === void 0 ? void 0 : _tableProps$paginatio7.localPagination, tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio8 = tableProps.pagination) === null || _tableProps$paginatio8 === void 0 ? void 0 : _tableProps$paginatio8.total, dataSource.length, tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio9 = tableProps.pagination) === null || _tableProps$paginatio9 === void 0 ? void 0 : (_tableProps$paginatio10 = _tableProps$paginatio9.pageSizeOptions) === null || _tableProps$paginatio10 === void 0 ? void 0 : _tableProps$paginatio10[0]]);
-  var scroll = useGenScroll({
-    wrapHeight: height || 500,
-    scroll: tableProps.scroll,
-    columns: columns,
-    isShowPagination: isShowPagination
-  });
   var showTotal = useCallback(function (total, range, pageSize) {
     var start = range[0] - 1;
     var _current = start / pageSize + 1;
-    return getText("table-pagination-total")(_current, Math.ceil(total / pageSize));
+    return getText('table-pagination-total')(_current, Math.ceil(total / pageSize));
   }, []);
   var _paginationConfig = useMemo(function () {
     if (tableProps.pagination === false) {
@@ -125,22 +108,64 @@ var GridViewTable = function GridViewTable(_ref) {
     return _objectSpread(_objectSpread(_objectSpread({}, paginationConfig), tableProps.pagination), {}, {
       showTotal: showTotal
     });
-  }, [responsive, tableProps.pagination]);
+  }, [tableProps.pagination]);
   return /*#__PURE__*/React.createElement("div", {
-    className: "materials-grid-table-wrap",
+    className: 'materials-grid-table-wrap',
     ref: tableWrapRef
-  }, /*#__PURE__*/React.createElement(SortRow, {
-    rowKey: tableProps.rowKey,
-    onSortChange: tableProps.onSortChange
-  }, /*#__PURE__*/React.createElement(BasicTable, _extends({
-    key: scroll === null || scroll === void 0 ? void 0 : scroll.y,
+  }, /*#__PURE__*/React.createElement(AutoSizerContent, {
+    tableWrapRef: tableWrapRef,
     dataSource: dataSource,
+    tableProps: tableProps,
     columns: columns,
-    className: "grid-view-table",
+    paginationConfig: _paginationConfig,
     components: components
-  }, tableProps, {
-    scroll: scroll,
-    pagination: _paginationConfig
-  }))));
+  }));
+};
+var AutoSizerContent = function AutoSizerContent(props) {
+  var _tableProps$paginatio9, _tableProps$paginatio10, _tableProps$paginatio11, _tableProps$paginatio12;
+  var tableProps = props.tableProps,
+    dataSource = props.dataSource,
+    paginationConfig = props.paginationConfig,
+    columns = props.columns,
+    components = props.components,
+    tableWrapRef = props.tableWrapRef;
+  var _ref3 = useSize(tableWrapRef) || {},
+    height = _ref3.height;
+  var debouncedHeight = useDebounce(height, {
+    wait: 500
+  });
+  var isShowPagination = useMemo(function () {
+    var _tableProps$paginatio3, _tableProps$paginatio4, _tableProps$paginatio5, _tableProps$paginatio6, _tableProps$paginatio7, _tableProps$paginatio8;
+    var total = (tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio3 = tableProps.pagination) === null || _tableProps$paginatio3 === void 0 ? void 0 : _tableProps$paginatio3.total) || (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || 0;
+    if (tableProps !== null && tableProps !== void 0 && (_tableProps$paginatio4 = tableProps.pagination) !== null && _tableProps$paginatio4 !== void 0 && _tableProps$paginatio4.localPagination) {
+      total = (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || 0;
+    }
+    return total > ((tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio5 = tableProps.pagination) === null || _tableProps$paginatio5 === void 0 ? void 0 : _tableProps$paginatio5.pageSize) || (tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio6 = tableProps.pagination) === null || _tableProps$paginatio6 === void 0 ? void 0 : (_tableProps$paginatio7 = _tableProps$paginatio6.pageSizeOptions) === null || _tableProps$paginatio7 === void 0 ? void 0 : _tableProps$paginatio7[0]) || 10) || (tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio8 = tableProps.pagination) === null || _tableProps$paginatio8 === void 0 ? void 0 : _tableProps$paginatio8.showPagination) && total > 10;
+  }, [tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio9 = tableProps.pagination) === null || _tableProps$paginatio9 === void 0 ? void 0 : _tableProps$paginatio9.localPagination, tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio10 = tableProps.pagination) === null || _tableProps$paginatio10 === void 0 ? void 0 : _tableProps$paginatio10.total, dataSource.length, tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$paginatio11 = tableProps.pagination) === null || _tableProps$paginatio11 === void 0 ? void 0 : (_tableProps$paginatio12 = _tableProps$paginatio11.pageSizeOptions) === null || _tableProps$paginatio12 === void 0 ? void 0 : _tableProps$paginatio12[0]]);
+  var scroll = useGenScroll({
+    wrapHeight: debouncedHeight || 500,
+    scroll: tableProps.scroll,
+    columns: columns,
+    isShowPagination: isShowPagination
+  });
+  var debouncedScroll = useDebounce(scroll, {
+    wait: 200
+  });
+  var basicTable = useMemo(function () {
+    return /*#__PURE__*/React.createElement(BasicTable, _extends({
+      key: debouncedScroll,
+      dataSource: dataSource,
+      columns: columns,
+      className: 'grid-view-table',
+      components: components
+    }, tableProps, {
+      scroll: debouncedScroll,
+      pagination: paginationConfig
+    }));
+  }, [debouncedScroll, dataSource, columns, components, paginationConfig, tableProps]);
+  return /*#__PURE__*/React.createElement(SortRow, {
+    rowKey: tableProps.rowKey,
+    onSortChange: tableProps.onSortChange
+  }, basicTable);
 };
 export default /*#__PURE__*/memo(GridViewTable);

package/es/components/table/Table/index.less

@@ -29,4 +29,7 @@
 
 .materials-grid-table-wrap {
   flex: 1;
+  // 使用overflow hidden 计算 materials-grid-table-wrap高度时不会动态变更
+  overflow: hidden;
+  padding-bottom: 24px;
 }

package/es/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
+}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/es/components/table/View/index.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import { GridViewProps } from "../types";
+import React from 'react';
+import { GridViewProps } from '../types';
 declare const View: (props: GridViewProps & {
     setTableSetting: (values: Record<string, any>) => void;
 }) => React.JSX.Element;

package/es/components/table/View/index.js

@@ -1,10 +1,12 @@
 var _excluded = ["dataSource", "columns", "dispatch", "style", "filter", "sort", "buttons", "actionButtons", "title", "summary", "onValuesChange", "columnSetting", "dataSourceGroup", "view", "gallery", "setTableSetting", "onDataSourceChange"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React from "react";
-import { Form } from "antd";
+import React, { useMemo } from 'react';
+import { Form } from 'antd';
 import GridViewTable from "../Table";
 import Gallery from "../Gallery";
+import { stringify } from "../Table/utils";
+import { useDebounce, useMemoizedFn } from 'ahooks';
 var View = function View(props) {
   var dataSource = props.dataSource,
     columns = props.columns,
@@ -25,22 +27,31 @@ var View = function View(props) {
     onDataSourceChange = props.onDataSourceChange,
     other = _objectWithoutProperties(props, _excluded);
   var form = Form.useFormInstance();
-  var viewMode = Form.useWatch("view_mode", {
+  var viewMode = Form.useWatch('view_mode', {
     form: form,
     preserve: true
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, viewMode === "grid" && /*#__PURE__*/React.createElement(GridViewTable, {
-    tableProps: other,
-    filter: filter,
-    setTableSetting: setTableSetting,
-    onDataSourceChange: onDataSourceChange
-  }), viewMode === "gallery" && /*#__PURE__*/React.createElement(Gallery, {
-    loading: other === null || other === void 0 ? void 0 : other.loading,
-    gallery: gallery,
-    pagination: other.pagination,
-    filter: filter,
-    rowKey: other.rowKey,
-    onDataSourceChange: onDataSourceChange
-  }));
+  var debouncedFilter = useDebounce(filter, {
+    wait: 200
+  });
+  var memoOnDataSourceChange = useMemoizedFn(function (v) {
+    return onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(v);
+  });
+  var memoContent = useMemo(function () {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, viewMode === 'grid' && /*#__PURE__*/React.createElement(GridViewTable, {
+      tableProps: other,
+      filter: filter,
+      setTableSetting: setTableSetting,
+      onDataSourceChange: memoOnDataSourceChange
+    }), viewMode === 'gallery' && /*#__PURE__*/React.createElement(Gallery, {
+      loading: other === null || other === void 0 ? void 0 : other.loading,
+      gallery: gallery,
+      pagination: other.pagination,
+      filter: filter,
+      rowKey: other.rowKey,
+      onDataSourceChange: memoOnDataSourceChange
+    }));
+  }, [viewMode, stringify(other), debouncedFilter, memoOnDataSourceChange, gallery]);
+  return memoContent;
 };
 export default View;

package/es/components/table/hooks/useGenScroll.js

@@ -10,7 +10,7 @@ var useGenScroll = function useGenScroll(params) {
         x: (propsScroll === null || propsScroll === void 0 ? void 0 : propsScroll.x) || columns.reduce(function (p, c) {
           return p + (c.width || 250);
         }, 0) || 2000,
-        y: (propsScroll === null || propsScroll === void 0 ? void 0 : propsScroll.y) || Math.max(wrapHeight - 48 - (isShowPagination ? 50 + 24 : 0), 100),
+        y: (propsScroll === null || propsScroll === void 0 ? void 0 : propsScroll.y) || Math.max(wrapHeight - 48 - (isShowPagination ? 50 + 24 : 24), 100),
         scrollToFirstRowOnChange: propsScroll === null || propsScroll === void 0 ? void 0 : propsScroll.scrollToFirstRowOnChange
       };
     }

package/es/components/table/hooks/useTableSetting.js

@@ -6,6 +6,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { useMemo } from "react";
 import { getSettingKeyArrByMode, getTableSettingByCurrentViewMode, getTableSettingFromLocalStorage, mergeColumnSetting, mergeFilterSetting, setFormValuesToLocalStorage } from "../Table/utils";
+import { useMemoizedFn } from "ahooks";
 var useTableSetting = function useTableSetting(params) {
   var tableId = params.tableId,
     filter = params.filter,
@@ -156,7 +157,7 @@ var useTableSetting = function useTableSetting(params) {
    * 更新 tableSetting
    * @param values
    */
-  var setTableSetting = function setTableSetting(values) {
+  var setTableSetting = useMemoizedFn(function (values) {
     setFormValuesToLocalStorage({
       tableId: tableId,
       allValues: values,
@@ -164,7 +165,7 @@ var useTableSetting = function useTableSetting(params) {
       currentViewMode: currentViewMode,
       currentSettingHash: currentSettingHash
     });
-  };
+  });
   var tableSetting = useMemo(function () {
     return _objectSpread(_objectSpread({}, tableLocalSetting), defaultTableSetting);
   }, [tableLocalSetting, defaultTableSetting]);

package/es/components/table/hooks/useTransDataSource.js

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useMemo } from "react";
 import { isArr } from "@pisell/utils";
 import { Form } from "antd";
-import { filterDataSource, groupDataSource, sortDataSource } from "../Table/utils";
+import { filterDataSource, groupDataSource, sortDataSource, stringify } from "../Table/utils";
 var defaultObj = {};
 var useTransDataSource = function useTransDataSource(params) {
   var form = params.form,
@@ -68,7 +68,7 @@ var useTransDataSource = function useTransDataSource(params) {
     return filter === null || filter === void 0 ? void 0 : filter.list.filter(function (item) {
       return item.localFilter;
     });
-  }, [filter]);
+  }, [stringify(filter)]);
   var dataSource = useMemo(function () {
     // 如果不是本地分页，则直接返回默认数据
     if (!localPagination) {

package/es/components/table/index.js

@@ -14,7 +14,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { useSize } from 'ahooks';
+import { useDebounce, useSize } from 'ahooks';
 import { Form } from 'antd';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { useSharedState } from "../../hooks";
@@ -75,9 +75,11 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   var initialValuesRef = useRef({});
   var _ref = useSize(wrapRef) || {},
     width = _ref.width;
+  var debouncedWidth = useDebounce(width, {
+    wait: 100
+  });
   var utils = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils;
   var tableId = useMemo(function () {
-    console.log(props, 'wh');
     if (props.__designMode === 'design') {
       return 'designMode-mock-table-id';
     }
@@ -131,13 +133,13 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, [currentSettingHash, tableId]);
   useEffect(function () {
-    if (width) {
+    if (debouncedWidth) {
       modal.dispatch({
         type: 'setTableWidth',
-        payload: width || {}
+        payload: debouncedWidth || {}
       });
     }
-  }, [width]);
+  }, [debouncedWidth]);
   var _useTableSetting = useTableSetting({
       tableId: tableId,
       filter: filter,

package/es/components/table/index.less

@@ -9,6 +9,15 @@
   display: flex;
   flex-direction: column;
 
+  .pisell-lowcode-table-body {
+    overscroll-behavior: none;
+  }
+  .pisell-lowcode-table-placeholder {
+    .cell-provider {
+      display: block;
+    }
+  }
+
   .pisell-lowcode-table-thead {
     .pisell-lowcode-table-cell {
       padding: 0 14px;

package/lib/components/table/BasicTable/index.js

@@ -93,7 +93,6 @@ var BasicTable = (props) => {
     sort,
     other.columns
   ]);
-  console.log(pagination, "wh8888");
   const total = (0, import_react.useMemo)(() => {
     if (localPagination) {
       return (_dataSource == null ? void 0 : _dataSource.total) || 0;
@@ -115,7 +114,7 @@ var BasicTable = (props) => {
       type: "setCurrentDataSource",
       payload: (_dataSource == null ? void 0 : _dataSource.list) || []
     });
-  }, [_dataSource == null ? void 0 : _dataSource.list]);
+  }, [JSON.stringify(_dataSource == null ? void 0 : _dataSource.list)]);
   return /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Table,
     {
@@ -148,7 +147,7 @@ var BasicTable = (props) => {
         defaultExpandAllRows: true
       }
     }
-  ), total > ((pagination == null ? void 0 : pagination.pageSize) || ((_a = pagination == null ? void 0 : pagination.pageSizeOptions) == null ? void 0 : _a[0]) || 10) || (pagination == null ? void 0 : pagination.showPagination) && total > 10 ? /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "pagination" }, /* @__PURE__ */ import_react.default.createElement(
+  ), total > ((pagination == null ? void 0 : pagination.pageSize) || ((_a = pagination == null ? void 0 : pagination.pageSizeOptions) == null ? void 0 : _a[0]) || 10) || (pagination == null ? void 0 : pagination.showPagination) && total > 10 ? /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "pagination", style: { margin: 0 } }, /* @__PURE__ */ import_react.default.createElement(
     import_Pagination.FormPagination,
     {
       ...pagination,

package/lib/components/table/Table/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const _default: React.NamedExoticComponent<any>;
 export default _default;

package/lib/components/table/Table/index.js

@@ -52,13 +52,11 @@ var GridViewTable = ({
   setTableSetting,
   onDataSourceChange
 }) => {
-  var _a, _b, _c, _d, _e, _f;
-  const responsive = (0, import_hooks.useResponsive)();
+  var _a, _b;
   const { state, dispatch } = (0, import_hooks.useSharedState)(import_model.Context);
   const form = import_antd.Form.useFormInstance();
   const column_setting = import_antd.Form.useWatch("column_setting", { form, preserve: true }) || [];
   const tableWrapRef = (0, import_react.useRef)(null);
-  const { height } = (0, import_ahooks.useSize)(tableWrapRef) || {};
   const { dataSource: defaultDataSource, originDataSource } = state;
   const handleSave = (0, import_ahooks.useMemoizedFn)((row) => {
     const newData = [...defaultDataSource];
@@ -110,25 +108,6 @@ var GridViewTable = ({
   const components = (0, import_useGenTableComponents.default)({
     form
   });
-  const isShowPagination = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2;
-    let total = ((_a2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _a2.total) || (dataSource == null ? void 0 : dataSource.length) || 0;
-    if ((_b2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _b2.localPagination) {
-      total = (dataSource == null ? void 0 : dataSource.length) || 0;
-    }
-    return total > (((_d2 = (_c2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _c2.pageSizeOptions) == null ? void 0 : _d2[0]) || 10);
-  }, [
-    (_c = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _c.localPagination,
-    (_d = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _d.total,
-    dataSource.length,
-    (_f = (_e = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _e.pageSizeOptions) == null ? void 0 : _f[0]
-  ]);
-  const scroll = (0, import_useGenScroll.default)({
-    wrapHeight: height || 500,
-    scroll: tableProps.scroll,
-    columns,
-    isShowPagination
-  });
   const showTotal = (0, import_react.useCallback)(
     (total, range, pageSize) => {
       let start = range[0] - 1;
@@ -149,26 +128,73 @@ var GridViewTable = ({
       ...tableProps.pagination,
       showTotal
     };
-  }, [responsive, tableProps.pagination]);
+  }, [tableProps.pagination]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid-table-wrap", ref: tableWrapRef }, /* @__PURE__ */ import_react.default.createElement(
-    import_SortRow.default,
+    AutoSizerContent,
     {
-      rowKey: tableProps.rowKey,
-      onSortChange: tableProps.onSortChange
-    },
-    /* @__PURE__ */ import_react.default.createElement(
+      tableWrapRef,
+      dataSource,
+      tableProps,
+      columns,
+      paginationConfig: _paginationConfig,
+      components
+    }
+  ));
+};
+var AutoSizerContent = (props) => {
+  var _a, _b, _c, _d;
+  const {
+    tableProps,
+    dataSource,
+    paginationConfig: paginationConfig2,
+    columns,
+    components,
+    tableWrapRef
+  } = props;
+  const { height } = (0, import_ahooks.useSize)(tableWrapRef) || {};
+  const debouncedHeight = (0, import_ahooks.useDebounce)(height, { wait: 500 });
+  const isShowPagination = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2, _d2, _e, _f;
+    let total = ((_a2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _a2.total) || (dataSource == null ? void 0 : dataSource.length) || 0;
+    if ((_b2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _b2.localPagination) {
+      total = (dataSource == null ? void 0 : dataSource.length) || 0;
+    }
+    return total > (((_c2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _c2.pageSize) || ((_e = (_d2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _d2.pageSizeOptions) == null ? void 0 : _e[0]) || 10) || ((_f = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _f.showPagination) && total > 10;
+  }, [
+    (_a = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _a.localPagination,
+    (_b = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _b.total,
+    dataSource.length,
+    (_d = (_c = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _c.pageSizeOptions) == null ? void 0 : _d[0]
+  ]);
+  const scroll = (0, import_useGenScroll.default)({
+    wrapHeight: debouncedHeight || 500,
+    scroll: tableProps.scroll,
+    columns,
+    isShowPagination
+  });
+  const debouncedScroll = (0, import_ahooks.useDebounce)(scroll, { wait: 200 });
+  const basicTable = (0, import_react.useMemo)(() => {
+    return /* @__PURE__ */ import_react.default.createElement(
       import_BasicTable.default,
       {
-        key: scroll == null ? void 0 : scroll.y,
+        key: debouncedScroll,
         dataSource,
         columns,
         className: "grid-view-table",
         components,
         ...tableProps,
-        scroll,
-        pagination: _paginationConfig
+        scroll: debouncedScroll,
+        pagination: paginationConfig2
       }
-    )
-  ));
+    );
+  }, [
+    debouncedScroll,
+    dataSource,
+    columns,
+    components,
+    paginationConfig2,
+    tableProps
+  ]);
+  return /* @__PURE__ */ import_react.default.createElement(import_SortRow.default, { rowKey: tableProps.rowKey, onSortChange: tableProps.onSortChange }, basicTable);
 };
 var Table_default = (0, import_react.memo)(GridViewTable);

package/lib/components/table/Table/index.less

@@ -29,4 +29,7 @@
 
 .materials-grid-table-wrap {
   flex: 1;
+  // 使用overflow hidden 计算 materials-grid-table-wrap高度时不会动态变更
+  overflow: hidden;
+  padding-bottom: 24px;
 }

package/lib/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
+}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lib/components/table/View/index.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import { GridViewProps } from "../types";
+import React from 'react';
+import { GridViewProps } from '../types';
 declare const View: (props: GridViewProps & {
     setTableSetting: (values: Record<string, any>) => void;
 }) => React.JSX.Element;