@pisell/materials 1.0.404 → 1.0.405

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

@@ -8,9 +8,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { InboxOutlined } from "@ant-design/icons";
-import { Button, message } from "antd";
-import React, { useMemo, useState } from "react";
+import { InboxOutlined } from '@ant-design/icons';
+import { Button, message } from 'antd';
+import React, { useMemo, useState } from 'react';
 import useEngineContext from "../../../../../../../hooks/useEngineContext";
 import { getText } from "../../../../../../../locales/index";
 import IconFont from "../../../../../../iconfont";
@@ -26,7 +26,8 @@ var ImportTable = function ImportTable(props) {
     errorStatus = props.errorStatus;
   var formId = exportImport.formId,
     formCode = exportImport.formCode,
-    templateFileUrl = exportImport.templateFileUrl;
+    templateFileUrl = exportImport.templateFileUrl,
+    apiUrl = exportImport.apiUrl;
 
   // 当前上传列表
   var _useState = useState(null),
@@ -52,10 +53,12 @@ var ImportTable = function ImportTable(props) {
             break;
           case 4:
             message.loading({
-              content: "Loading...",
+              content: 'Loading...',
               key: loadingKey
             });
-            params = {};
+            params = {
+              url: apiUrl
+            };
             if (formId) {
               params.form_id = formId;
             }
@@ -70,7 +73,7 @@ var ImportTable = function ImportTable(props) {
             download(data === null || data === void 0 ? void 0 : data.url);
           case 13:
             message.success({
-              content: getText("table-action-export-import-table-success-download"),
+              content: getText('table-action-export-import-table-success-download'),
               key: loadingKey
             });
           case 14:
@@ -85,62 +88,62 @@ var ImportTable = function ImportTable(props) {
   }();
   var fileType = useMemo(function () {
     if (file) {
-      return file.type.indexOf("/csv") !== -1 ? "csv" : "excel";
+      return file.type.indexOf('/csv') !== -1 ? 'csv' : 'excel';
     }
-    return "";
+    return '';
   }, [file]);
   var fileName = useMemo(function () {
     if (file) {
       return file.name;
     }
-    return "";
+    return '';
   }, [file]);
   var _handleSelectFile = function _handleSelectFile(e) {
     var _e$target;
     var _file = e !== null && e !== void 0 && (_e$target = e.target) !== null && _e$target !== void 0 && _e$target.files ? e.target.files[0] : null;
     if (_file) {
-      if (_file.name.indexOf(".csv") === -1 && _file.name.indexOf(".xls") === -1 && _file.name.indexOf(".xlsx") === -1) {
-        return message.error(getText("table-action-export-import-table-error-file"));
+      if (_file.name.indexOf('.csv') === -1 && _file.name.indexOf('.xls') === -1 && _file.name.indexOf('.xlsx') === -1) {
+        return message.error(getText('table-action-export-import-table-error-file'));
       }
       onChange(_file);
       setFile(_file);
     }
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, errorStatus ? /*#__PURE__*/React.createElement("div", {
-    className: "error-hint"
+    className: 'error-hint'
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "icontixingshixin",
-    className: "error-icon"
+    className: 'error-icon'
   }), /*#__PURE__*/React.createElement("div", {
-    className: "text"
+    className: 'text'
   }, errorStatus)) : null, /*#__PURE__*/React.createElement("div", {
-    className: "import-title"
-  }, getText("table-action-export-import-table-text-click-download"), /*#__PURE__*/React.createElement("a", {
+    className: 'import-title'
+  }, getText('table-action-export-import-table-text-click-download'), /*#__PURE__*/React.createElement("a", {
     onClick: handleDownload
-  }, getText("table-action-export-import-table-text-product-template"))), file ? /*#__PURE__*/React.createElement("div", {
-    className: "file-list"
+  }, getText('table-action-export-import-table-text-product-template'))), file ? /*#__PURE__*/React.createElement("div", {
+    className: 'file-list'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    type: fileType === "csv" ? "icon-csv" : "icon-excel",
-    className: "file-icon"
+    type: fileType === 'csv' ? 'icon-csv' : 'icon-excel',
+    className: 'file-icon'
   }), /*#__PURE__*/React.createElement("div", {
-    className: "file-name"
-  }, fileName), /*#__PURE__*/React.createElement(Button, null, getText("table-action-export-import-table-text-edit-file"), /*#__PURE__*/React.createElement("input", {
+    className: 'file-name'
+  }, fileName), /*#__PURE__*/React.createElement(Button, null, getText('table-action-export-import-table-text-edit-file'), /*#__PURE__*/React.createElement("input", {
     accept: ".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel",
-    className: "upload-input",
+    className: 'upload-input',
     type: "file",
     onChange: _handleSelectFile,
     value: ""
   }))) : /*#__PURE__*/React.createElement("div", {
-    className: "default-view"
+    className: 'default-view'
   }, /*#__PURE__*/React.createElement("div", {
-    className: "icon-wrap"
+    className: 'icon-wrap'
   }, /*#__PURE__*/React.createElement(InboxOutlined, null)), /*#__PURE__*/React.createElement("p", {
-    className: "text"
-  }, getText("table-action-export-import-table-text-input-title")), /*#__PURE__*/React.createElement("p", {
-    className: "hint"
-  }, getText("table-action-export-import-table-text-input-describe")), /*#__PURE__*/React.createElement("input", {
+    className: 'text'
+  }, getText('table-action-export-import-table-text-input-title')), /*#__PURE__*/React.createElement("p", {
+    className: 'hint'
+  }, getText('table-action-export-import-table-text-input-describe')), /*#__PURE__*/React.createElement("input", {
     accept: ".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel",
-    className: "upload-input",
+    className: 'upload-input',
     type: "file",
     onChange: _handleSelectFile,
     value: ""

package/es/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/es/components/table/Actions/component/ExportImport/index.js

@@ -8,10 +8,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import ImportExport from "@pisell/icon/es/ImportExport";
-import { useRequest } from "ahooks";
-import { Dropdown, Modal, message } from "antd";
-import React, { useMemo, useState } from "react";
+import ImportExport from '@pisell/icon/es/ImportExport';
+import { useRequest } from 'ahooks';
+import { Dropdown, Modal, message } from 'antd';
+import React, { useMemo, useState } from 'react';
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getText } from "../../../../../locales/index";
 import { batchImport } from "../../../serve";
@@ -47,7 +47,7 @@ var ExportImport = function ExportImport(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     type = _useState6[0],
     setType = _useState6[1];
-  var _useState7 = useState(""),
+  var _useState7 = useState(''),
     _useState8 = _slicedToArray(_useState7, 2),
     value = _useState8[0],
     setValue = _useState8[1];
@@ -62,22 +62,28 @@ var ExportImport = function ExportImport(_ref) {
   var context = useEngineContext();
   request.setRequest(context.appHelper.utils.request);
   var _items = useMemo(function () {
+    var _Object$entries$map;
     // 将对象转成数组
-    var result = Object.entries(exportImportOptions).map(function (_ref2) {
+    var result = (_Object$entries$map = Object.entries(exportImportOptions).map(function (_ref2) {
+      var _exportImport$hiddenK;
       var _ref3 = _slicedToArray(_ref2, 2),
         key = _ref3[0],
         value = _ref3[1];
+      // 如果开启了隐藏字段则不显示该字段
+      if (Array.isArray(exportImport === null || exportImport === void 0 ? void 0 : exportImport.hiddenKeys) && exportImport !== null && exportImport !== void 0 && (_exportImport$hiddenK = exportImport.hiddenKeys) !== null && _exportImport$hiddenK !== void 0 && _exportImport$hiddenK.includes(key)) {
+        return;
+      }
       return {
         key: key,
         label: value
       };
-    });
+    })) === null || _Object$entries$map === void 0 ? void 0 : _Object$entries$map.filter(Boolean);
     return result;
-  }, []);
+  }, [exportImport === null || exportImport === void 0 ? void 0 : exportImport.hiddenKeys]);
   var Content = useMemo(function () {
-    if (!value) return null;
-    return Com[value];
-  }, [value]);
+    var _value = value || defaultOptions.importValue;
+    return Com[_value];
+  }, [value, defaultOptions.importValue]);
   var _footer = useMemo(function () {
     var types = defaultOptions.footerHintTypes;
     if (types.includes(value)) {
@@ -92,18 +98,18 @@ var ExportImport = function ExportImport(_ref) {
     if (!value) return null;
     var types = defaultOptions.okShowButtonTypes;
     var lang = getCurrentLocale();
-    var isEn = lang === "en-US" || lang === "en";
+    var isEn = lang === 'en-US' || lang === 'en';
 
     // 导出导入标题
     if (types.includes(value) && exportImport !== null && exportImport !== void 0 && exportImport.title) {
-      return "".concat(exportImportOptions[value]).concat(isEn ? " " : "").concat(exportImport.title);
+      return "".concat(exportImportOptions[value]).concat(isEn ? ' ' : '').concat(exportImport.title);
     }
     return exportImportOptions[value];
   }, [value, exportImport === null || exportImport === void 0 ? void 0 : exportImport.title]);
   var _okText = useMemo(function () {
     var types = defaultOptions.okShowButtonTypes;
     if (types.includes(value)) {
-      return value === defaultOptions.exportValue ? getText("table-action-export-import-button") : getText("table-action-export-import-button-import");
+      return value === defaultOptions.exportValue ? getText('table-action-export-import-button') : getText('table-action-export-import-button-import');
     }
   }, [value]);
   var handleClick = function handleClick(e) {
@@ -113,7 +119,7 @@ var ExportImport = function ExportImport(_ref) {
   };
   var onCancel = function onCancel() {
     setOpen(false);
-    setValue("");
+    setValue('');
     setFile(null);
     setErrorStatus(null);
     setType(defaultOptions.exportType);
@@ -125,7 +131,7 @@ var ExportImport = function ExportImport(_ref) {
       setErrorStatus(null);
       message.destroy();
       message.success({
-        content: getText("table-action-export-import-import-success"),
+        content: getText('table-action-export-import-import-success'),
         key: value
       });
       onCancel();
@@ -137,11 +143,11 @@ var ExportImport = function ExportImport(_ref) {
   });
   var onOk = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var formId, formCode, _params, result, formData;
+      var formId, formCode, apiUrl, _params, result, formData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            formId = exportImport.formId, formCode = exportImport.formCode; // 导出
+            formId = exportImport.formId, formCode = exportImport.formCode, apiUrl = exportImport.apiUrl; // 导出
             if (!(value === defaultOptions.exportValue)) {
               _context.next = 9;
               break;
@@ -163,16 +169,17 @@ var ExportImport = function ExportImport(_ref) {
           case 9:
             if (value === defaultOptions.importValue) {
               formData = new FormData();
-              formData.append("file", file);
+              formData.append('file', file);
               if (formId) {
-                formData.append("form_id", formId);
+                formData.append('form_id', formId);
               }
               if (formCode) {
-                formData.append("code", formCode);
+                formData.append('code', formCode);
               }
+              formData.append('url', apiUrl || '');
               if (formData) {
                 message.loading({
-                  content: "Loading...",
+                  content: 'Loading...',
                   key: value
                 });
                 _batchImport.run(formData);
@@ -199,7 +206,7 @@ var ExportImport = function ExportImport(_ref) {
     isActive: false
   }, /*#__PURE__*/React.createElement(ImportExport, {
     style: {
-      cursor: "pointer",
+      cursor: 'pointer',
       fontSize: 20
     }
   }))), /*#__PURE__*/React.createElement(Modal, {
@@ -211,11 +218,11 @@ var ExportImport = function ExportImport(_ref) {
     className: "export-import-modal",
     onCancel: onCancel,
     bodyStyle: {
-      padding: "0px"
+      padding: '0px'
     },
     destroyOnClose: true,
     onOk: onOk,
-    cancelText: getText("table-action-export-import-cancel"),
+    cancelText: getText('table-action-export-import-cancel'),
     okButtonProps: {
       disabled: value === defaultOptions.importValue && (!file || !!errorStatus)
     }

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/Gallery/index.js

@@ -46,7 +46,8 @@ var Gallery = function Gallery(props) {
     form: form,
     localPagination: !!(pagination !== null && pagination !== void 0 && pagination.localPagination),
     rowKey: rowKey,
-    filter: filter
+    filter: filter,
+    currentView: 'gallery'
   });
   useEffect(function () {
     onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(dataSource);

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

@@ -1,3 +1,4 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["value", "onChange", "onPressEnter", "onBlur", "style", "bordered", "presets", "showTime", "format"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -5,10 +6,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 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); }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 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 { isArr, isBoolean, isString } from "@pisell/utils";
+import { isArr, isString } from "@pisell/utils";
 import dayjs from "dayjs";
 import React, { forwardRef, useMemo } from "react";
 import DatePicker from "../../../../../date-picker";
@@ -64,17 +64,19 @@ var Edit = function Edit(props, ref) {
     label: getText("table-action-range-picker-presets-last-90-day"),
     value: [dayjs().add(-90, "d").startOf("day"), dayjs().endOf("day")]
   }];
-  var _showTime = useMemo(function () {
-    if (isBoolean(showTime)) {
-      return showTime;
-    } else if (_typeof(showTime) === "object") {
-      return showTime;
-    }
-    return true;
-  }, [showTime]);
+
+  // const _showTime = useMemo(() => {
+  //   if (isBoolean(showTime)) {
+  //     return showTime;
+  //   } else if (typeof showTime === "object") {
+  //     return showTime;
+  //   }
+  //   return true;
+  // }, [showTime]);
+
   return /*#__PURE__*/React.createElement(RangePicker, _extends({}, others, {
     format: format,
-    showTime: _showTime,
+    showTime: showTime,
     presets: presets || rangePresets,
     ref: ref,
     value: dayjsVal,

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());
     };
   };
@@ -85,11 +82,12 @@ var GridViewTable = function GridViewTable(_ref) {
     form: form,
     localPagination: !!(tableProps !== null && tableProps !== void 0 && (_tableProps$paginatio2 = tableProps.pagination) !== null && _tableProps$paginatio2 !== void 0 && _tableProps$paginatio2.localPagination),
     rowKey: tableProps.rowKey,
-    filter: filter
+    filter: filter,
+    currentView: 'table'
   });
   useEffect(function () {
     dispatch({
-      type: "setOriginResultDataSource",
+      type: 'setOriginResultDataSource',
       payload: dataSource || []
     });
   }, [dataSource]);
@@ -99,24 +97,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 +109,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

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