@pisell/materials 1.0.406 → 1.0.408

package/lib/components/pisellModal/index.d.ts

@@ -32,27 +32,12 @@ export interface PisellModalProps extends ModalProps {
 }
 declare const PisellModal: {
     (props: PisellModalProps): React.JSX.Element;
-    confirm: (props: import("./components/functions").PisellModalFuncProps) => {
-        destroy: () => void;
-        update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
-    };
-    info: (props: import("./components/functions").PisellModalFuncProps) => {
-        destroy: () => void;
-        update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
-    };
-    error: (props: import("./components/functions").PisellModalFuncProps) => {
-        destroy: () => void;
-        update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
-    };
+    confirm: (props: import("./components/functions").PisellModalFuncProps) => any;
+    info: (props: import("./components/functions").PisellModalFuncProps) => any;
+    error: (props: import("./components/functions").PisellModalFuncProps) => any;
     warn: (props: import("./components/functions").PisellModalFuncProps) => any;
-    warning: (props: import("./components/functions").PisellModalFuncProps) => {
-        destroy: () => void;
-        update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
-    };
-    success: (props: import("./components/functions").PisellModalFuncProps) => {
-        destroy: () => void;
-        update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
-    };
+    warning: (props: import("./components/functions").PisellModalFuncProps) => any;
+    success: (props: import("./components/functions").PisellModalFuncProps) => any;
     Information: (props: import("./components/Information").InformationProps) => React.JSX.Element;
 };
 export default PisellModal;

package/lib/components/table/Actions/component/ExportImport/components/ExportFile/index.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
-import { ExportImportType } from '../../../../../types';
-import './index.less';
+import React from "react";
+import { ExportImportType } from "../../../../../types";
+import "./index.less";
 declare const ExportFile: (props: {
     exportImport: ExportImportType;
 }) => React.JSX.Element;

package/lib/components/table/Actions/component/ExportImport/components/ExportFile/index.js

@@ -56,7 +56,7 @@ var exportStatusOptions = {
 };
 var ExportFile = (props) => {
   const { exportImport } = props;
-  const { formId, formCode, apiUrl } = exportImport;
+  const { formId, formCode } = exportImport;
   const [list, setList] = (0, import_react.useState)([]);
   const [defaultParams, setDefaultParams] = (0, import_react.useState)(defaultData);
   const context = (0, import_useEngineContext.default)();
@@ -85,11 +85,7 @@ var ExportFile = (props) => {
   });
   const init = () => {
     if ((defaultParams == null ? void 0 : defaultParams.form_id) || (defaultParams == null ? void 0 : defaultParams.code)) {
-      const _defaultParams = {
-        ...defaultParams,
-        url: apiUrl
-      };
-      _historyList.run(_defaultParams);
+      _historyList.run(defaultParams);
     }
   };
   (0, import_react.useEffect)(() => {

package/lib/components/table/Actions/component/ExportImport/components/ExportTable/function.js

@@ -40,7 +40,7 @@ var _batchExport = async (params) => {
   }
 };
 var batchExport = (exportParams, exportImport) => {
-  const { selectLists, formId, formCode, apiUrl } = exportImport;
+  const { selectLists, formId, formCode } = exportImport;
   let _name = (0, import_file.getFileDateName)();
   let params = {};
   if (formId) {
@@ -49,7 +49,6 @@ var batchExport = (exportParams, exportImport) => {
   if (formCode) {
     params.code = formCode;
   }
-  params.url = apiUrl;
   console.log("exportParams", exportParams);
   const type = (exportParams == null ? void 0 : exportParams.type) || import_status.defaultOptions.exportType;
   if (type === import_status.defaultOptions.exportType) {

package/lib/components/table/Actions/component/ExportImport/components/ImportLog/index.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
-import { ExportImportType } from '../../../../../types';
-import './index.less';
+import React from "react";
+import { ExportImportType } from "../../../../../types";
+import "./index.less";
 declare const ImportLog: (props: {
     exportImport: ExportImportType;
 }) => React.JSX.Element;

package/lib/components/table/Actions/component/ExportImport/components/ImportLog/index.js

@@ -50,7 +50,7 @@ var defaultData = {
 };
 var ImportLog = (props) => {
   const { exportImport } = props;
-  const { formId, formCode, apiUrl } = exportImport;
+  const { formId, formCode } = exportImport;
   const detailRef = (0, import_react.useRef)(null);
   const [list, setList] = (0, import_react.useState)([]);
   const [defaultParams, setDefaultParams] = (0, import_react.useState)(defaultData);
@@ -80,11 +80,7 @@ var ImportLog = (props) => {
   });
   const init = () => {
     if ((defaultParams == null ? void 0 : defaultParams.form_id) || (defaultParams == null ? void 0 : defaultParams.code)) {
-      const _defaultParams = {
-        ...defaultParams,
-        url: apiUrl
-      };
-      _historyList.run(_defaultParams);
+      _historyList.run(defaultParams);
     }
   };
   (0, import_react.useEffect)(() => {

package/lib/components/table/Actions/component/ExportImport/components/ImportTable/index.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
-import { ExportImportType } from '../../../../../types';
-import './index.less';
+import React from "react";
+import { ExportImportType } from "../../../../../types";
+import "./index.less";
 declare type ImportTableProps = {
     onChange: any;
     exportImport: ExportImportType;

package/lib/components/table/Actions/component/ExportImport/components/ImportTable/index.js

@@ -46,7 +46,7 @@ var import_index = require("./index.less");
 var loadingKey = import_status.defaultOptions.importValue;
 var ImportTable = (props) => {
   const { onChange, exportImport, errorStatus } = props;
-  const { formId, formCode, templateFileUrl, apiUrl } = exportImport;
+  const { formId, formCode, templateFileUrl } = exportImport;
   const [file, setFile] = (0, import_react.useState)(null);
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest(context.appHelper.utils.request);
@@ -55,9 +55,7 @@ var ImportTable = (props) => {
       (0, import_download.default)(templateFileUrl);
     } else {
       import_antd.message.loading({ content: "Loading...", key: loadingKey });
-      const params = {
-        url: apiUrl
-      };
+      const params = {};
       if (formId) {
         params.form_id = formId;
       }

package/lib/components/table/Actions/component/ExportImport/index.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
-import { ExportImportType } from '../../../types';
-import './index.less';
+import React from "react";
+import { ExportImportType } from "../../../types";
+import "./index.less";
 declare type ExportImportProps = {
     exportImport: ExportImportType;
 };

package/lib/components/table/Actions/component/ExportImport/index.js

@@ -68,23 +68,19 @@ var ExportImport = ({ exportImport }) => {
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest(context.appHelper.utils.request);
   const _items = (0, import_react.useMemo)(() => {
-    var _a;
-    const result = (_a = Object.entries(import_status.exportImportOptions).map(([key, value2]) => {
-      var _a2;
-      if (Array.isArray(exportImport == null ? void 0 : exportImport.hiddenKeys) && ((_a2 = exportImport == null ? void 0 : exportImport.hiddenKeys) == null ? void 0 : _a2.includes(key))) {
-        return;
-      }
+    const result = Object.entries(import_status.exportImportOptions).map(([key, value2]) => {
       return {
         key,
         label: value2
       };
-    })) == null ? void 0 : _a.filter(Boolean);
+    });
     return result;
-  }, [exportImport == null ? void 0 : exportImport.hiddenKeys]);
+  }, []);
   const Content = (0, import_react.useMemo)(() => {
-    const _value = value || import_status.defaultOptions.importValue;
-    return Com[_value];
-  }, [value, import_status.defaultOptions.importValue]);
+    if (!value)
+      return null;
+    return Com[value];
+  }, [value]);
   const _footer = (0, import_react.useMemo)(() => {
     const types = import_status.defaultOptions.footerHintTypes;
     if (types.includes(value)) {
@@ -142,7 +138,7 @@ var ExportImport = ({ exportImport }) => {
     }
   });
   const onOk = async () => {
-    const { formId, formCode, apiUrl } = exportImport;
+    const { formId, formCode } = exportImport;
     if (value === import_status.defaultOptions.exportValue) {
       const _params = {
         type,
@@ -162,7 +158,6 @@ var ExportImport = ({ exportImport }) => {
       if (formCode) {
         formData.append("code", formCode);
       }
-      formData.append("url", apiUrl || "");
       if (formData) {
         import_antd.message.loading({ content: "Loading...", key: value });
         _batchImport.run(formData);

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

@@ -93,6 +93,7 @@ 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;
@@ -114,7 +115,7 @@ var BasicTable = (props) => {
       type: "setCurrentDataSource",
       payload: (_dataSource == null ? void 0 : _dataSource.list) || []
     });
-  }, [JSON.stringify(_dataSource == null ? void 0 : _dataSource.list)]);
+  }, [_dataSource == null ? void 0 : _dataSource.list]);
   return /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Table,
     {
@@ -147,7 +148,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", style: { margin: 0 } }, /* @__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" }, /* @__PURE__ */ import_react.default.createElement(
     import_Pagination.FormPagination,
     {
       ...pagination,

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

@@ -71,8 +71,7 @@ var Gallery = (props) => {
     form,
     localPagination: !!(pagination == null ? void 0 : pagination.localPagination),
     rowKey,
-    filter,
-    currentView: "gallery"
+    filter
   });
   (0, import_react.useEffect)(() => {
     onDataSourceChange == null ? void 0 : onDataSourceChange(dataSource);

package/lib/components/table/Table/fields/rangePicker/Edit/index.js

@@ -94,12 +94,20 @@ var Edit = (props, ref) => {
       value: [(0, import_dayjs.default)().add(-90, "d").startOf("day"), (0, import_dayjs.default)().endOf("day")]
     }
   ];
+  const _showTime = (0, import_react.useMemo)(() => {
+    if ((0, import_utils.isBoolean)(showTime)) {
+      return showTime;
+    } else if (typeof showTime === "object") {
+      return showTime;
+    }
+    return true;
+  }, [showTime]);
   return /* @__PURE__ */ import_react.default.createElement(
     RangePicker,
     {
       ...others,
       format,
-      showTime,
+      showTime: _showTime,
       presets: presets || rangePresets,
       ref,
       value: dayjsVal,

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,11 +52,13 @@ var GridViewTable = ({
   setTableSetting,
   onDataSourceChange
 }) => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f;
+  const responsive = (0, import_hooks.useResponsive)();
   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];
@@ -94,8 +96,7 @@ var GridViewTable = ({
     form,
     localPagination: !!((_b = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _b.localPagination),
     rowKey: tableProps.rowKey,
-    filter,
-    currentView: "table"
+    filter
   });
   (0, import_react.useEffect)(() => {
     dispatch({
@@ -109,6 +110,25 @@ 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;
@@ -129,73 +149,26 @@ var GridViewTable = ({
       ...tableProps.pagination,
       showTotal
     };
-  }, [tableProps.pagination]);
+  }, [responsive, tableProps.pagination]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid-table-wrap", ref: tableWrapRef }, /* @__PURE__ */ import_react.default.createElement(
-    AutoSizerContent,
+    import_SortRow.default,
     {
-      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(
+      rowKey: tableProps.rowKey,
+      onSortChange: tableProps.onSortChange
+    },
+    /* @__PURE__ */ import_react.default.createElement(
       import_BasicTable.default,
       {
-        key: debouncedScroll,
+        key: scroll == null ? void 0 : scroll.y,
         dataSource,
         columns,
         className: "grid-view-table",
         components,
         ...tableProps,
-        scroll: debouncedScroll,
-        pagination: paginationConfig2
+        scroll,
+        pagination: _paginationConfig
       }
-    );
-  }, [
-    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,7 +29,4 @@
 
 .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

@@ -81,10 +81,7 @@ export declare const setTableSettingToLocalStorage: ({ tableId, tableSettingObj,
     }>;
     currentViewMode: ModeType;
     currentSettingHash: string;
-}) => {
-    key: string;
-    value: Record<string, any>;
-} | undefined;
+}) => void;
 export declare const clearTableSettingToLocalStorage: (tableId?: string) => void;
 /**
  * 从本地存储中获取表格设置, 全部配置
@@ -115,16 +112,7 @@ export declare const setFormValuesToLocalStorage: ({ tableId, allValues, keys, c
     keys?: string[] | undefined;
     currentViewMode: ModeType;
     currentSettingHash: string;
-}) => {
-    key: string;
-    value: Record<string, any>;
-} | undefined;
-/**
- * 获取表格键值
- * @param tableId 表格ID
- * @returns 返回格式化后的表格键值
- */
-export declare const getTableKey: (tableId: string) => string;
+}) => void;
 /**
  * 合并筛选设置
  * @param list 列表数据

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

@@ -36,7 +36,6 @@ __export(utils_exports, {
   getHash: () => getHash,
   getIdByRowKey: () => getIdByRowKey,
   getSettingKeyArrByMode: () => getSettingKeyArrByMode,
-  getTableKey: () => getTableKey,
   getTableSettingByCurrentViewMode: () => getTableSettingByCurrentViewMode,
   getTableSettingFromLocalStorage: () => getTableSettingFromLocalStorage,
   groupDataSource: () => groupDataSource,
@@ -271,10 +270,6 @@ var setTableSettingToLocalStorage = ({
     }
   };
   localStorage.setItem(getTableKey(tableId), JSON.stringify(newData));
-  return {
-    key: getTableKey(tableId),
-    value: newData
-  };
 };
 var clearTableSettingToLocalStorage = (tableId) => {
   if (!tableId)
@@ -311,7 +306,7 @@ var setFormValuesToLocalStorage = ({
   keys == null ? void 0 : keys.forEach((key) => {
     obj[key] = allValues == null ? void 0 : allValues[key];
   });
-  return setTableSettingToLocalStorage({
+  setTableSettingToLocalStorage({
     tableId,
     tableSettingObj: obj,
     currentViewMode,
@@ -465,7 +460,6 @@ var stringify = (obj) => {
   getHash,
   getIdByRowKey,
   getSettingKeyArrByMode,
-  getTableKey,
   getTableSettingByCurrentViewMode,
   getTableSettingFromLocalStorage,
   groupDataSource,

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,8 +36,6 @@ 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,
@@ -64,31 +62,24 @@ 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,
-      {
-        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;
+  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
+    }
+  ));
 };
 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 : 24), 100),
+        y: (propsScroll == null ? void 0 : propsScroll.y) || Math.max(wrapHeight - 48 - (isShowPagination ? 50 + 24 : 0), 100),
         scrollToFirstRowOnChange: propsScroll == null ? void 0 : propsScroll.scrollToFirstRowOnChange
       };
     }