@pisell/materials 1.0.403 → 1.0.405

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

@@ -139,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.js

@@ -150,7 +150,7 @@ var AutoSizerContent = function AutoSizerContent(props) {
     isShowPagination: isShowPagination
   });
   var debouncedScroll = useDebounce(scroll, {
-    wait: 500
+    wait: 200
   });
   var basicTable = useMemo(function () {
     return /*#__PURE__*/React.createElement(BasicTable, _extends({

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

@@ -6,6 +6,7 @@ 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,
@@ -30,21 +31,27 @@ var View = function View(props) {
     form: form,
     preserve: true
   });
+  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: onDataSourceChange
+      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: onDataSourceChange
+      onDataSourceChange: memoOnDataSourceChange
     }));
-  }, [viewMode, stringify(other), filter, onDataSourceChange, gallery]);
+  }, [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/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,
@@ -69,7 +69,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

@@ -76,7 +76,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   var _ref = useSize(wrapRef) || {},
     width = _ref.width;
   var debouncedWidth = useDebounce(width, {
-    wait: 500
+    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 () {
@@ -134,7 +134,6 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   }, [currentSettingHash, tableId]);
   useEffect(function () {
     if (debouncedWidth) {
-      console.log('modal.dispatch', 'setTableWidth');
       modal.dispatch({
         type: 'setTableWidth',
         payload: debouncedWidth || {}

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

@@ -147,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.js

@@ -173,7 +173,7 @@ var AutoSizerContent = (props) => {
     columns,
     isShowPagination
   });
-  const debouncedScroll = (0, import_ahooks.useDebounce)(scroll, { wait: 500 });
+  const debouncedScroll = (0, import_ahooks.useDebounce)(scroll, { wait: 200 });
   const basicTable = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_BasicTable.default,

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

@@ -37,6 +37,7 @@ var import_antd = require("antd");
 var import_Table = __toESM(require("../Table"));
 var import_Gallery = __toESM(require("../Gallery"));
 var import_utils = require("../Table/utils");
+var import_ahooks = require("ahooks");
 var View = (props) => {
   const {
     dataSource,
@@ -63,6 +64,10 @@ var View = (props) => {
     form,
     preserve: true
   });
+  const debouncedFilter = (0, import_ahooks.useDebounce)(filter, { wait: 200 });
+  const memoOnDataSourceChange = (0, import_ahooks.useMemoizedFn)(
+    (v) => onDataSourceChange == null ? void 0 : onDataSourceChange(v)
+  );
   const memoContent = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, viewMode === "grid" && /* @__PURE__ */ import_react.default.createElement(
       import_Table.default,
@@ -70,7 +75,7 @@ var View = (props) => {
         tableProps: other,
         filter,
         setTableSetting,
-        onDataSourceChange
+        onDataSourceChange: memoOnDataSourceChange
       }
     ), viewMode === "gallery" && /* @__PURE__ */ import_react.default.createElement(
       import_Gallery.default,
@@ -80,10 +85,10 @@ var View = (props) => {
         pagination: other.pagination,
         filter,
         rowKey: other.rowKey,
-        onDataSourceChange
+        onDataSourceChange: memoOnDataSourceChange
       }
     ));
-  }, [viewMode, (0, import_utils.stringify)(other), filter, onDataSourceChange, gallery]);
+  }, [viewMode, (0, import_utils.stringify)(other), debouncedFilter, memoOnDataSourceChange, gallery]);
   return memoContent;
 };
 var View_default = View;

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

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

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

@@ -61,7 +61,7 @@ var useTransDataSource = (params) => {
       return [];
     }
     return filter == null ? void 0 : filter.list.filter((item) => item.localFilter);
-  }, [filter]);
+  }, [(0, import_utils2.stringify)(filter)]);
   const dataSource = (0, import_react.useMemo)(() => {
     if (!localPagination) {
       return pDataSource;

package/lib/components/table/index.js

@@ -89,7 +89,7 @@ var GridView = (0, import_model.Provider)(
     const filterDefaultRef = (0, import_react.useRef)({});
     const initialValuesRef = (0, import_react.useRef)({});
     const { width } = (0, import_ahooks.useSize)(wrapRef) || {};
-    const debouncedWidth = (0, import_ahooks.useDebounce)(width, { wait: 500 });
+    const debouncedWidth = (0, import_ahooks.useDebounce)(width, { wait: 100 });
     const utils = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils;
     const tableId = (0, import_react.useMemo)(() => {
       if (props.__designMode === "design") {
@@ -145,7 +145,6 @@ var GridView = (0, import_model.Provider)(
     }, [currentSettingHash, tableId]);
     (0, import_react.useEffect)(() => {
       if (debouncedWidth) {
-        console.log("modal.dispatch", "setTableWidth");
         modal.dispatch({
           type: "setTableWidth",
           payload: debouncedWidth || {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.403",
+  "version": "1.0.405",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -64,9 +64,9 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
     "@zxing/library": "0.21.2",
-    "@pisell/utils": "1.0.39",
+    "@pisell/utils": "1.0.40",
     "@pisell/icon": "0.0.10",
-    "@pisell/date-picker": "1.0.106"
+    "@pisell/date-picker": "1.0.107"
   },
   "peerDependencies": {
     "react": "^18.0.0",