@pisell/materials 2.2.21 → 2.2.23

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;

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

@@ -36,6 +36,8 @@ var import_react = __toESM(require("react"));
 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,
@@ -62,24 +64,31 @@ var View = (props) => {
     form,
     preserve: true
   });
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, viewMode === "grid" && /* @__PURE__ */ import_react.default.createElement(
-    import_Table.default,
-    {
-      tableProps: other,
-      filter,
-      setTableSetting,
-      onDataSourceChange
-    }
-  ), viewMode === "gallery" && /* @__PURE__ */ import_react.default.createElement(
-    import_Gallery.default,
-    {
-      loading: other == null ? void 0 : other.loading,
-      gallery,
-      pagination: other.pagination,
-      filter,
-      rowKey: other.rowKey,
-      onDataSourceChange
-    }
-  ));
+  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,
+      {
+        tableProps: other,
+        filter,
+        setTableSetting,
+        onDataSourceChange: memoOnDataSourceChange
+      }
+    ), viewMode === "gallery" && /* @__PURE__ */ import_react.default.createElement(
+      import_Gallery.default,
+      {
+        loading: other == null ? void 0 : other.loading,
+        gallery,
+        pagination: other.pagination,
+        filter,
+        rowKey: other.rowKey,
+        onDataSourceChange: memoOnDataSourceChange
+      }
+    ));
+  }, [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/useTableSetting.js

@@ -24,6 +24,7 @@ __export(useTableSetting_exports, {
 module.exports = __toCommonJS(useTableSetting_exports);
 var import_react = require("react");
 var import_utils = require("../Table/utils");
+var import_ahooks = require("ahooks");
 var useTableSetting = (params) => {
   const {
     tableId,
@@ -185,7 +186,7 @@ var useTableSetting = (params) => {
     quickFilterMaxLength,
     sortButtonShow
   ]);
-  const setTableSetting = (values) => {
+  const setTableSetting = (0, import_ahooks.useMemoizedFn)((values) => {
     (0, import_utils.setFormValuesToLocalStorage)({
       tableId,
       allValues: values,
@@ -193,7 +194,7 @@ var useTableSetting = (params) => {
       currentViewMode,
       currentSettingHash
     });
-  };
+  });
   const tableSetting = (0, import_react.useMemo)(() => {
     return {
       ...tableLocalSetting,

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

@@ -60,7 +60,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,9 +89,9 @@ 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: 100 });
     const utils = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils;
     const tableId = (0, import_react.useMemo)(() => {
-      console.log(props, "wh");
       if (props.__designMode === "design") {
         return "designMode-mock-table-id";
       }
@@ -144,13 +144,13 @@ var GridView = (0, import_model.Provider)(
       }
     }, [currentSettingHash, tableId]);
     (0, import_react.useEffect)(() => {
-      if (width) {
+      if (debouncedWidth) {
         modal.dispatch({
           type: "setTableWidth",
-          payload: width || {}
+          payload: debouncedWidth || {}
         });
       }
-    }, [width]);
+    }, [debouncedWidth]);
     const { setTableSetting, tableSetting } = (0, import_useTableSetting.default)({
       tableId,
       filter,

package/lib/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "2.2.21",
+  "version": "2.2.23",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -64,8 +64,8 @@
     "crypto-js": "^4.2.0",
     "@zxing/library": "0.21.2",
     "@pisell/utils": "2.0.1",
-    "@pisell/date-picker": "1.0.100",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {
     "react": "^18.0.0",