@pisell/materials 1.0.407 → 1.0.409

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 列表数据

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

@@ -271,6 +271,10 @@ 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;
@@ -327,7 +331,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];
   });
-  setTableSettingToLocalStorage({
+  return setTableSettingToLocalStorage({
     tableId: tableId,
     tableSettingObj: obj,
     currentViewMode: currentViewMode,
@@ -340,7 +344,7 @@ export var setFormValuesToLocalStorage = function setFormValuesToLocalStorage(_r
  * @param tableId 表格ID
  * @returns 返回格式化后的表格键值
  */
-var getTableKey = function getTableKey(tableId) {
+export 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,10 +1,12 @@
 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 from "react";
-import { Form } from "antd";
+import React, { useMemo } from 'react';
+import { Form } from 'antd';
 import GridViewTable from "../Table";
 import Gallery from "../Gallery";
+import { stringify } from "../Table/utils";
+import { useDebounce, useMemoizedFn } from 'ahooks';
 var View = function View(props) {
   var dataSource = props.dataSource,
     columns = props.columns,
@@ -25,22 +27,31 @@ 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
   });
-  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
-  }));
+  var debouncedFilter = useDebounce(filter, {
+    wait: 200
+  });
+  var memoOnDataSourceChange = useMemoizedFn(function (v) {
+    return onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(v);
+  });
+  var memoContent = useMemo(function () {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, viewMode === 'grid' && /*#__PURE__*/React.createElement(GridViewTable, {
+      tableProps: other,
+      filter: filter,
+      setTableSetting: setTableSetting,
+      onDataSourceChange: memoOnDataSourceChange
+    }), viewMode === 'gallery' && /*#__PURE__*/React.createElement(Gallery, {
+      loading: other === null || other === void 0 ? void 0 : other.loading,
+      gallery: gallery,
+      pagination: other.pagination,
+      filter: filter,
+      rowKey: other.rowKey,
+      onDataSourceChange: memoOnDataSourceChange
+    }));
+  }, [viewMode, stringify(other), debouncedFilter, memoOnDataSourceChange, gallery]);
+  return memoContent;
 };
 export default View;

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

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

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

@@ -6,7 +6,10 @@ 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,
@@ -18,6 +21,10 @@ 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];
@@ -38,10 +45,10 @@ var useTableSetting = function useTableSetting(params) {
     }
     return propsColumns;
   }, [propsColumns, currentViewMode, gallery, columnsMap]);
-  var _ref = filter || {},
-    list = _ref.list,
-    quickFilterMaxLength = _ref.quickFilterMaxLength,
-    sortButtonShow = _ref.sortButtonShow;
+  var _ref2 = filter || {},
+    list = _ref2.list,
+    quickFilterMaxLength = _ref2.quickFilterMaxLength,
+    sortButtonShow = _ref2.sortButtonShow;
   var defaultGalleryCoverSetting = useMemo(function () {
     var _gallery$cover, _columns$find;
     return {
@@ -156,15 +163,30 @@ var useTableSetting = function useTableSetting(params) {
    * 更新 tableSetting
    * @param values
    */
-  var setTableSetting = function setTableSetting(values) {
-    setFormValuesToLocalStorage({
+  var setTableSetting = useMemoizedFn(function (values) {
+    var result = 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]);

package/es/components/table/hooks/useTransDataSource.d.ts

@@ -6,6 +6,7 @@ declare type UseTransDataSourceParams = {
     dataSource: Record<string, any>[];
     rowKey: string | ((params: any) => string);
     filter: FilterType;
+    currentView: 'gallery' | 'table';
 };
 declare const useTransDataSource: (params: UseTransDataSourceParams) => Record<string, any>[];
 export default useTransDataSource;

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

@@ -7,14 +7,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useMemo } from "react";
 import { isArr } from "@pisell/utils";
 import { Form } from "antd";
-import { filterDataSource, groupDataSource, sortDataSource } from "../Table/utils";
+import { filterDataSource, groupDataSource, sortDataSource, stringify } from "../Table/utils";
 var defaultObj = {};
 var useTransDataSource = function useTransDataSource(params) {
   var form = params.form,
     localPagination = params.localPagination,
     pDataSource = params.dataSource,
     rowKey = params.rowKey,
-    filter = params.filter;
+    filter = params.filter,
+    currentView = params.currentView;
   var sort = Form.useWatch("order_by", {
     form: form,
     preserve: true
@@ -68,7 +69,7 @@ var useTransDataSource = function useTransDataSource(params) {
     return filter === null || filter === void 0 ? void 0 : filter.list.filter(function (item) {
       return item.localFilter;
     });
-  }, [filter]);
+  }, [stringify(filter)]);
   var dataSource = useMemo(function () {
     // 如果不是本地分页，则直接返回默认数据
     if (!localPagination) {
@@ -81,12 +82,13 @@ var useTransDataSource = function useTransDataSource(params) {
     if (sortObj) {
       newDataSource = sortDataSource(newDataSource, sortObj);
     }
-    if (groupDetail) {
+
+    // 在table视图时进行group分组
+    if (groupDetail && currentView === 'table') {
       newDataSource = groupDataSource(newDataSource, groupDetail, rowKey);
     }
     return newDataSource;
-  }, [pDataSource, localPagination, sortObj, groupDetail, filterLocalArr, filters]);
-  console.log('dataSourcedataSource', dataSource);
+  }, [pDataSource, localPagination, sortObj, groupDetail, filterLocalArr, filters, currentView]);
   return dataSource;
 };
 export default useTransDataSource;

package/es/components/table/index.js

@@ -14,7 +14,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 { useSize } from 'ahooks';
+import { useDebounce, useSize } from 'ahooks';
 import { Form } from 'antd';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { useSharedState } from "../../hooks";
@@ -75,9 +75,11 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   var initialValuesRef = useRef({});
   var _ref = useSize(wrapRef) || {},
     width = _ref.width;
+  var debouncedWidth = useDebounce(width, {
+    wait: 100
+  });
   var utils = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils;
   var tableId = useMemo(function () {
-    console.log(props, 'wh');
     if (props.__designMode === 'design') {
       return 'designMode-mock-table-id';
     }
@@ -131,13 +133,13 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, [currentSettingHash, tableId]);
   useEffect(function () {
-    if (width) {
+    if (debouncedWidth) {
       modal.dispatch({
         type: 'setTableWidth',
-        payload: width || {}
+        payload: debouncedWidth || {}
       });
     }
-  }, [width]);
+  }, [debouncedWidth]);
   var _useTableSetting = useTableSetting({
       tableId: tableId,
       filter: filter,

package/es/components/table/index.less

@@ -9,6 +9,15 @@
   display: flex;
   flex-direction: column;
 
+  .pisell-lowcode-table-body {
+    overscroll-behavior: none;
+  }
+  .pisell-lowcode-table-placeholder {
+    .cell-provider {
+      display: block;
+    }
+  }
+
   .pisell-lowcode-table-thead {
     .pisell-lowcode-table-cell {
       padding: 0 14px;

package/es/components/table/serve.d.ts

@@ -3,9 +3,11 @@ declare type exportParams = {
     file_name?: string;
     form_id?: string | number;
     code?: string;
+    url?: string;
 };
 export declare const exportData: (params: exportParams) => Promise<any>;
 export declare const batchImport: (params: any) => Promise<any>;
 export declare const importTemplate: (params: exportParams) => Promise<any>;
-export declare const historyData: (params: any) => Promise<any>;
+export declare const getExportFile: (params: any) => Promise<any>;
+export declare const getImportLog: (params: any) => Promise<any>;
 export {};