@pisell/materials 1.0.402 → 1.0.404

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,28 +62,22 @@ 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$map = Object.entries(exportImportOptions).map(function (_ref2) {
-      var _exportImport$hiddenK;
+    var result = Object.entries(exportImportOptions).map(function (_ref2) {
       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 () {
-    var _value = value || defaultOptions.importValue;
-    return Com[_value];
-  }, [value, defaultOptions.importValue]);
+    if (!value) return null;
+    return Com[value];
+  }, [value]);
   var _footer = useMemo(function () {
     var types = defaultOptions.footerHintTypes;
     if (types.includes(value)) {
@@ -98,18 +92,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) {
@@ -119,7 +113,7 @@ var ExportImport = function ExportImport(_ref) {
   };
   var onCancel = function onCancel() {
     setOpen(false);
-    setValue('');
+    setValue("");
     setFile(null);
     setErrorStatus(null);
     setType(defaultOptions.exportType);
@@ -131,7 +125,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();
@@ -143,11 +137,11 @@ var ExportImport = function ExportImport(_ref) {
   });
   var onOk = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var formId, formCode, apiUrl, _params, result, formData;
+      var formId, formCode, _params, result, formData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            formId = exportImport.formId, formCode = exportImport.formCode, apiUrl = exportImport.apiUrl; // 导出
+            formId = exportImport.formId, formCode = exportImport.formCode; // 导出
             if (!(value === defaultOptions.exportValue)) {
               _context.next = 9;
               break;
@@ -169,17 +163,16 @@ 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);
@@ -206,7 +199,7 @@ var ExportImport = function ExportImport(_ref) {
     isActive: false
   }, /*#__PURE__*/React.createElement(ImportExport, {
     style: {
-      cursor: 'pointer',
+      cursor: "pointer",
       fontSize: 20
     }
   }))), /*#__PURE__*/React.createElement(Modal, {
@@ -218,11 +211,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,6 +84,7 @@ 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 () {
@@ -109,7 +110,7 @@ var BasicTable = function BasicTable(props) {
       type: 'setCurrentDataSource',
       payload: (_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list) || []
     });
-  }, [JSON.stringify(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list)]);
+  }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, _extends({
     key: defaultExpandedRowKeys.join('-')
   }, other, {

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

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

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

@@ -1,4 +1,3 @@
-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; }
@@ -6,9 +5,10 @@ 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, isString } from "@pisell/utils";
+import { isArr, isBoolean, isString } from "@pisell/utils";
 import dayjs from "dayjs";
 import React, { forwardRef, useMemo } from "react";
 import DatePicker from "../../../../../date-picker";
@@ -64,19 +64,17 @@ 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")]
   }];
-
-  // const _showTime = useMemo(() => {
-  //   if (isBoolean(showTime)) {
-  //     return showTime;
-  //   } else if (typeof showTime === "object") {
-  //     return showTime;
-  //   }
-  //   return true;
-  // }, [showTime]);
-
+  var _showTime = useMemo(function () {
+    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 { useDebounce, useMemoizedFn, useSize } from 'ahooks';
+import { useMemoizedFn, useSize } from "ahooks";
 import { Context } from "../model";
 // import AddFieldModal from "./AddFieldModal";
 import BasicTable from "../BasicTable";
@@ -25,23 +25,26 @@ import useTransDataSource from "../hooks/useTransDataSource";
 import useTransColumns from "../hooks/useTransColumns";
 import useGenTableComponents from "../hooks/useGenTableComponents";
 import useGenScroll from "../hooks/useGenScroll";
-import { useSharedState } from "../../../hooks";
+import { useSharedState, useResponsive } from "../../../hooks";
 import "./index.less";
 var GridViewTable = function GridViewTable(_ref) {
-  var _tableProps$paginatio, _tableProps$paginatio2;
+  var _tableProps$paginatio, _tableProps$paginatio2, _tableProps$paginatio7, _tableProps$paginatio8, _tableProps$paginatio9, _tableProps$paginatio10;
   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) {
@@ -52,18 +55,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, _ref2) {
-      var size = _ref2.size;
+    return function (e, _ref3) {
+      var size = _ref3.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());
     };
   };
@@ -82,12 +85,11 @@ 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,
-    currentView: 'table'
+    filter: filter
   });
   useEffect(function () {
     dispatch({
-      type: 'setOriginResultDataSource',
+      type: "setOriginResultDataSource",
       payload: dataSource || []
     });
   }, [dataSource]);
@@ -97,10 +99,24 @@ 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) {
@@ -109,64 +125,22 @@ var GridViewTable = function GridViewTable(_ref) {
     return _objectSpread(_objectSpread(_objectSpread({}, paginationConfig), tableProps.pagination), {}, {
       showTotal: showTotal
     });
-  }, [tableProps.pagination]);
+  }, [responsive, tableProps.pagination]);
   return /*#__PURE__*/React.createElement("div", {
-    className: 'materials-grid-table-wrap',
+    className: "materials-grid-table-wrap",
     ref: tableWrapRef
-  }, /*#__PURE__*/React.createElement(AutoSizerContent, {
-    tableWrapRef: 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,
     dataSource: dataSource,
-    tableProps: tableProps,
     columns: columns,
-    paginationConfig: _paginationConfig,
+    className: "grid-view-table",
     components: components
-  }));
-};
-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: 500
-  });
-  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);
+  }, tableProps, {
+    scroll: scroll,
+    pagination: _paginationConfig
+  }))));
 };
 export default /*#__PURE__*/memo(GridViewTable);

package/es/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/es/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 列表数据
@@ -167,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 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/Table/utils.js

@@ -271,10 +271,6 @@ export var setTableSettingToLocalStorage = function setTableSettingToLocalStorag
     currentSettingHash: currentSettingHash
   }, currentViewMode, _objectSpread(_objectSpread({}, newData[currentViewMode] || {}), itemSetting)));
   localStorage.setItem(getTableKey(tableId), JSON.stringify(newData));
-  return {
-    key: getTableKey(tableId),
-    value: newData
-  };
 };
 export var clearTableSettingToLocalStorage = function clearTableSettingToLocalStorage(tableId) {
   if (!tableId) return;
@@ -331,7 +327,7 @@ export var setFormValuesToLocalStorage = function setFormValuesToLocalStorage(_r
   keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
     obj[key] = allValues === null || allValues === void 0 ? void 0 : allValues[key];
   });
-  return setTableSettingToLocalStorage({
+  setTableSettingToLocalStorage({
     tableId: tableId,
     tableSettingObj: obj,
     currentViewMode: currentViewMode,
@@ -344,7 +340,7 @@ export var setFormValuesToLocalStorage = function setFormValuesToLocalStorage(_r
  * @param tableId 表格ID
  * @returns 返回格式化后的表格键值
  */
-export var getTableKey = function getTableKey(tableId) {
+var getTableKey = function getTableKey(tableId) {
   return "".concat(tableKeyPrefix, "-").concat(tableId);
 };
 

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,11 +1,10 @@
 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, { useMemo } from 'react';
-import { Form } from 'antd';
+import React from "react";
+import { Form } from "antd";
 import GridViewTable from "../Table";
 import Gallery from "../Gallery";
-import { stringify } from "../Table/utils";
 var View = function View(props) {
   var dataSource = props.dataSource,
     columns = props.columns,
@@ -26,25 +25,22 @@ 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
   });
-  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
-    }), 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
-    }));
-  }, [viewMode, stringify(other), filter, onDataSourceChange, gallery]);
-  return memoContent;
+  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
+  }));
 };
 export default View;

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

@@ -6,10 +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 useEngineContext from "../../../hooks/useEngineContext";
-import { useMemoizedFn } from "ahooks";
 var useTableSetting = function useTableSetting(params) {
-  var _context$appHelper;
   var tableId = params.tableId,
     filter = params.filter,
     columnSetting = params.columnSetting,
@@ -21,10 +18,6 @@ var useTableSetting = function useTableSetting(params) {
     gallery = params.gallery,
     currentSettingHash = params.currentSettingHash,
     exportImport = params.exportImport;
-  var context = useEngineContext();
-  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
-    isTerminal = _ref.isTerminal,
-    interaction = _ref.interaction;
   var columnsMap = useMemo(function () {
     return new Map(propsColumns.map(function (item) {
       return [item.key, item];
@@ -45,10 +38,10 @@ var useTableSetting = function useTableSetting(params) {
     }
     return propsColumns;
   }, [propsColumns, currentViewMode, gallery, columnsMap]);
-  var _ref2 = filter || {},
-    list = _ref2.list,
-    quickFilterMaxLength = _ref2.quickFilterMaxLength,
-    sortButtonShow = _ref2.sortButtonShow;
+  var _ref = filter || {},
+    list = _ref.list,
+    quickFilterMaxLength = _ref.quickFilterMaxLength,
+    sortButtonShow = _ref.sortButtonShow;
   var defaultGalleryCoverSetting = useMemo(function () {
     var _gallery$cover, _columns$find;
     return {
@@ -163,30 +156,15 @@ var useTableSetting = function useTableSetting(params) {
    * 更新 tableSetting
    * @param values
    */
-  var setTableSetting = useMemoizedFn(function (values) {
-    var result = setFormValuesToLocalStorage({
+  var setTableSetting = function setTableSetting(values) {
+    setFormValuesToLocalStorage({
       tableId: tableId,
       allValues: values,
       keys: localStorageSettingKeyArr,
       currentViewMode: currentViewMode,
       currentSettingHash: currentSettingHash
     });
-    /*
-    if (isTerminal?.() && result) {
-      interaction?.utils?.postMessageToApp?.({
-        module: "global",
-        key: "local_storage",
-        data: {
-            type: "set",
-            value: {
-              [result.key]: result.value
-            },
-        },
-      })
-    }
-    */
-  });
-
+  };
   var tableSetting = useMemo(function () {
     return _objectSpread(_objectSpread({}, tableLocalSetting), defaultTableSetting);
   }, [tableLocalSetting, defaultTableSetting]);