@pisell/materials 1.0.407 → 1.0.409

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

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

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

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

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

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

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

@@ -0,0 +1,9 @@
+/**
+ * @title: 格式化导出导入接口地址
+ * @description:
+ * @param {string} url
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-09-05 11:39
+ */
+export declare const formatApiUrl: (url: string) => string;

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

@@ -0,0 +1,31 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/table/Actions/component/ExportImport/utils/index.ts
+var utils_exports = {};
+__export(utils_exports, {
+  formatApiUrl: () => formatApiUrl
+});
+module.exports = __toCommonJS(utils_exports);
+var formatApiUrl = (url) => {
+  return url || "/shop/form/data";
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatApiUrl
+});

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

@@ -93,7 +93,6 @@ var BasicTable = (props) => {
     sort,
     other.columns
   ]);
-  console.log(pagination, "wh8888");
   const total = (0, import_react.useMemo)(() => {
     if (localPagination) {
       return (_dataSource == null ? void 0 : _dataSource.total) || 0;
@@ -115,7 +114,7 @@ var BasicTable = (props) => {
       type: "setCurrentDataSource",
       payload: (_dataSource == null ? void 0 : _dataSource.list) || []
     });
-  }, [_dataSource == null ? void 0 : _dataSource.list]);
+  }, [JSON.stringify(_dataSource == null ? void 0 : _dataSource.list)]);
   return /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Table,
     {
@@ -148,7 +147,7 @@ var BasicTable = (props) => {
         defaultExpandAllRows: true
       }
     }
-  ), total > ((pagination == null ? void 0 : pagination.pageSize) || ((_a = pagination == null ? void 0 : pagination.pageSizeOptions) == null ? void 0 : _a[0]) || 10) || (pagination == null ? void 0 : pagination.showPagination) && total > 10 ? /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "pagination" }, /* @__PURE__ */ import_react.default.createElement(
+  ), total > ((pagination == null ? void 0 : pagination.pageSize) || ((_a = pagination == null ? void 0 : pagination.pageSizeOptions) == null ? void 0 : _a[0]) || 10) || (pagination == null ? void 0 : pagination.showPagination) && total > 10 ? /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "pagination", style: { margin: 0 } }, /* @__PURE__ */ import_react.default.createElement(
     import_Pagination.FormPagination,
     {
       ...pagination,

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

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

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

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

package/lib/components/table/Table/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const _default: React.NamedExoticComponent<any>;
 export default _default;

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

@@ -52,13 +52,11 @@ var GridViewTable = ({
   setTableSetting,
   onDataSourceChange
 }) => {
-  var _a, _b, _c, _d, _e, _f;
-  const responsive = (0, import_hooks.useResponsive)();
+  var _a, _b;
   const { state, dispatch } = (0, import_hooks.useSharedState)(import_model.Context);
   const form = import_antd.Form.useFormInstance();
   const column_setting = import_antd.Form.useWatch("column_setting", { form, preserve: true }) || [];
   const tableWrapRef = (0, import_react.useRef)(null);
-  const { height } = (0, import_ahooks.useSize)(tableWrapRef) || {};
   const { dataSource: defaultDataSource, originDataSource } = state;
   const handleSave = (0, import_ahooks.useMemoizedFn)((row) => {
     const newData = [...defaultDataSource];
@@ -96,7 +94,8 @@ var GridViewTable = ({
     form,
     localPagination: !!((_b = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _b.localPagination),
     rowKey: tableProps.rowKey,
-    filter
+    filter,
+    currentView: "table"
   });
   (0, import_react.useEffect)(() => {
     dispatch({
@@ -110,25 +109,6 @@ var GridViewTable = ({
   const components = (0, import_useGenTableComponents.default)({
     form
   });
-  const isShowPagination = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2;
-    let total = ((_a2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _a2.total) || (dataSource == null ? void 0 : dataSource.length) || 0;
-    if ((_b2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _b2.localPagination) {
-      total = (dataSource == null ? void 0 : dataSource.length) || 0;
-    }
-    return total > (((_d2 = (_c2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _c2.pageSizeOptions) == null ? void 0 : _d2[0]) || 10);
-  }, [
-    (_c = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _c.localPagination,
-    (_d = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _d.total,
-    dataSource.length,
-    (_f = (_e = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _e.pageSizeOptions) == null ? void 0 : _f[0]
-  ]);
-  const scroll = (0, import_useGenScroll.default)({
-    wrapHeight: height || 500,
-    scroll: tableProps.scroll,
-    columns,
-    isShowPagination
-  });
   const showTotal = (0, import_react.useCallback)(
     (total, range, pageSize) => {
       let start = range[0] - 1;
@@ -149,26 +129,73 @@ var GridViewTable = ({
       ...tableProps.pagination,
       showTotal
     };
-  }, [responsive, tableProps.pagination]);
+  }, [tableProps.pagination]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid-table-wrap", ref: tableWrapRef }, /* @__PURE__ */ import_react.default.createElement(
-    import_SortRow.default,
+    AutoSizerContent,
     {
-      rowKey: tableProps.rowKey,
-      onSortChange: tableProps.onSortChange
-    },
-    /* @__PURE__ */ import_react.default.createElement(
+      tableWrapRef,
+      dataSource,
+      tableProps,
+      columns,
+      paginationConfig: _paginationConfig,
+      components
+    }
+  ));
+};
+var AutoSizerContent = (props) => {
+  var _a, _b, _c, _d;
+  const {
+    tableProps,
+    dataSource,
+    paginationConfig: paginationConfig2,
+    columns,
+    components,
+    tableWrapRef
+  } = props;
+  const { height } = (0, import_ahooks.useSize)(tableWrapRef) || {};
+  const debouncedHeight = (0, import_ahooks.useDebounce)(height, { wait: 500 });
+  const isShowPagination = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2, _d2, _e, _f;
+    let total = ((_a2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _a2.total) || (dataSource == null ? void 0 : dataSource.length) || 0;
+    if ((_b2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _b2.localPagination) {
+      total = (dataSource == null ? void 0 : dataSource.length) || 0;
+    }
+    return total > (((_c2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _c2.pageSize) || ((_e = (_d2 = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _d2.pageSizeOptions) == null ? void 0 : _e[0]) || 10) || ((_f = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _f.showPagination) && total > 10;
+  }, [
+    (_a = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _a.localPagination,
+    (_b = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _b.total,
+    dataSource.length,
+    (_d = (_c = tableProps == null ? void 0 : tableProps.pagination) == null ? void 0 : _c.pageSizeOptions) == null ? void 0 : _d[0]
+  ]);
+  const scroll = (0, import_useGenScroll.default)({
+    wrapHeight: debouncedHeight || 500,
+    scroll: tableProps.scroll,
+    columns,
+    isShowPagination
+  });
+  const debouncedScroll = (0, import_ahooks.useDebounce)(scroll, { wait: 200 });
+  const basicTable = (0, import_react.useMemo)(() => {
+    return /* @__PURE__ */ import_react.default.createElement(
       import_BasicTable.default,
       {
-        key: scroll == null ? void 0 : scroll.y,
+        key: debouncedScroll,
         dataSource,
         columns,
         className: "grid-view-table",
         components,
         ...tableProps,
-        scroll,
-        pagination: _paginationConfig
+        scroll: debouncedScroll,
+        pagination: paginationConfig2
       }
-    )
-  ));
+    );
+  }, [
+    debouncedScroll,
+    dataSource,
+    columns,
+    components,
+    paginationConfig2,
+    tableProps
+  ]);
+  return /* @__PURE__ */ import_react.default.createElement(import_SortRow.default, { rowKey: tableProps.rowKey, onSortChange: tableProps.onSortChange }, basicTable);
 };
 var Table_default = (0, import_react.memo)(GridViewTable);

package/lib/components/table/Table/index.less

@@ -29,4 +29,7 @@
 
 .materials-grid-table-wrap {
   flex: 1;
+  // 使用overflow hidden 计算 materials-grid-table-wrap高度时不会动态变更
+  overflow: hidden;
+  padding-bottom: 24px;
 }

package/lib/components/table/Table/utils.d.ts

@@ -81,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/lib/components/table/Table/utils.js

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

package/lib/components/table/View/index.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import { GridViewProps } from "../types";
+import React from 'react';
+import { GridViewProps } from '../types';
 declare const View: (props: GridViewProps & {
     setTableSetting: (values: Record<string, any>) => void;
 }) => React.JSX.Element;

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

@@ -36,6 +36,8 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_Table = __toESM(require("../Table"));
 var import_Gallery = __toESM(require("../Gallery"));
+var import_utils = require("../Table/utils");
+var import_ahooks = require("ahooks");
 var View = (props) => {
   const {
     dataSource,
@@ -62,24 +64,31 @@ var View = (props) => {
     form,
     preserve: true
   });
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, viewMode === "grid" && /* @__PURE__ */ import_react.default.createElement(
-    import_Table.default,
-    {
-      tableProps: other,
-      filter,
-      setTableSetting,
-      onDataSourceChange
-    }
-  ), viewMode === "gallery" && /* @__PURE__ */ import_react.default.createElement(
-    import_Gallery.default,
-    {
-      loading: other == null ? void 0 : other.loading,
-      gallery,
-      pagination: other.pagination,
-      filter,
-      rowKey: other.rowKey,
-      onDataSourceChange
-    }
-  ));
+  const debouncedFilter = (0, import_ahooks.useDebounce)(filter, { wait: 200 });
+  const memoOnDataSourceChange = (0, import_ahooks.useMemoizedFn)(
+    (v) => onDataSourceChange == null ? void 0 : onDataSourceChange(v)
+  );
+  const memoContent = (0, import_react.useMemo)(() => {
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, viewMode === "grid" && /* @__PURE__ */ import_react.default.createElement(
+      import_Table.default,
+      {
+        tableProps: other,
+        filter,
+        setTableSetting,
+        onDataSourceChange: memoOnDataSourceChange
+      }
+    ), viewMode === "gallery" && /* @__PURE__ */ import_react.default.createElement(
+      import_Gallery.default,
+      {
+        loading: other == null ? void 0 : other.loading,
+        gallery,
+        pagination: other.pagination,
+        filter,
+        rowKey: other.rowKey,
+        onDataSourceChange: memoOnDataSourceChange
+      }
+    ));
+  }, [viewMode, (0, import_utils.stringify)(other), debouncedFilter, memoOnDataSourceChange, gallery]);
+  return memoContent;
 };
 var View_default = View;

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

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

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/table/hooks/useTableSetting.ts
@@ -24,7 +34,10 @@ __export(useTableSetting_exports, {
 module.exports = __toCommonJS(useTableSetting_exports);
 var import_react = require("react");
 var import_utils = require("../Table/utils");
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
+var import_ahooks = require("ahooks");
 var useTableSetting = (params) => {
+  var _a;
   const {
     tableId,
     filter,
@@ -38,27 +51,29 @@ var useTableSetting = (params) => {
     currentSettingHash,
     exportImport
   } = params;
+  const context = (0, import_useEngineContext.default)();
+  const { isTerminal, interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const columnsMap = (0, import_react.useMemo)(() => {
     return new Map(propsColumns.map((item) => [item.key, item]));
   }, [propsColumns]);
   const columns = (0, import_react.useMemo)(() => {
-    var _a;
+    var _a2;
     if (currentViewMode === "grid") {
       return propsColumns;
     } else if (currentViewMode === "gallery") {
-      return (((_a = gallery == null ? void 0 : gallery.content) == null ? void 0 : _a.fields) || []).filter((item) => item.show).map((item) => columnsMap.get(item.columnKey)).filter(Boolean);
+      return (((_a2 = gallery == null ? void 0 : gallery.content) == null ? void 0 : _a2.fields) || []).filter((item) => item.show).map((item) => columnsMap.get(item.columnKey)).filter(Boolean);
     }
     return propsColumns;
   }, [propsColumns, currentViewMode, gallery, columnsMap]);
   const { list, quickFilterMaxLength, sortButtonShow } = filter || {};
   const defaultGalleryCoverSetting = (0, import_react.useMemo)(() => {
-    var _a, _b;
+    var _a2, _b;
     return {
-      coverObjectFit: (_a = gallery == null ? void 0 : gallery.cover) == null ? void 0 : _a.objectFit,
+      coverObjectFit: (_a2 = gallery == null ? void 0 : gallery.cover) == null ? void 0 : _a2.objectFit,
       coverField: (_b = columns.find(
         (column) => {
-          var _a2, _b2;
-          return column.key === ((_b2 = (_a2 = gallery == null ? void 0 : gallery.cover) == null ? void 0 : _a2.fields) == null ? void 0 : _b2[0]);
+          var _a3, _b2;
+          return column.key === ((_b2 = (_a3 = gallery == null ? void 0 : gallery.cover) == null ? void 0 : _a3.fields) == null ? void 0 : _b2[0]);
         }
       )) == null ? void 0 : _b.dataIndex,
       compactMode: "default",
@@ -102,7 +117,7 @@ var useTableSetting = (params) => {
     );
     const mergedSetting = { ...allSetting, ...currentViewModeSetting };
     localStorageSettingKeyArr.forEach((item) => {
-      var _a, _b, _c, _d;
+      var _a2, _b, _c, _d;
       if (item === "view_mode") {
         setting[item] = view.multiple ? (mergedSetting == null ? void 0 : mergedSetting[item]) || view.defaultViewMode : view.defaultViewMode;
       } else if (item === "filter_setting") {
@@ -123,7 +138,7 @@ var useTableSetting = (params) => {
         setting[item] = {
           ...mergedSetting == null ? void 0 : mergedSetting[item],
           // 本地没有默认封面效果时取配置中的
-          coverObjectFit: ((_a = mergedSetting == null ? void 0 : mergedSetting[item]) == null ? void 0 : _a.coverObjectFit) || defaultGalleryCoverSetting.coverObjectFit,
+          coverObjectFit: ((_a2 = mergedSetting == null ? void 0 : mergedSetting[item]) == null ? void 0 : _a2.coverObjectFit) || defaultGalleryCoverSetting.coverObjectFit,
           coverField: ((_b = mergedSetting == null ? void 0 : mergedSetting[item]) == null ? void 0 : _b.coverField) || defaultGalleryCoverSetting.coverField,
           compactMode: ((_c = mergedSetting == null ? void 0 : mergedSetting[item]) == null ? void 0 : _c.compactMode) || defaultGalleryCoverSetting.compactMode,
           isShowLabel: ((_d = mergedSetting == null ? void 0 : mergedSetting[item]) == null ? void 0 : _d.isShowLabel) ?? defaultGalleryCoverSetting.isShowLabel
@@ -185,15 +200,15 @@ var useTableSetting = (params) => {
     quickFilterMaxLength,
     sortButtonShow
   ]);
-  const setTableSetting = (values) => {
-    (0, import_utils.setFormValuesToLocalStorage)({
+  const setTableSetting = (0, import_ahooks.useMemoizedFn)((values) => {
+    const result = (0, import_utils.setFormValuesToLocalStorage)({
       tableId,
       allValues: values,
       keys: localStorageSettingKeyArr,
       currentViewMode,
       currentSettingHash
     });
-  };
+  });
   const tableSetting = (0, import_react.useMemo)(() => {
     return {
       ...tableLocalSetting,

package/lib/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/lib/components/table/hooks/useTransDataSource.js

@@ -33,7 +33,8 @@ var useTransDataSource = (params) => {
     localPagination,
     dataSource: pDataSource,
     rowKey,
-    filter
+    filter,
+    currentView
   } = params;
   const sort = import_antd.Form.useWatch("order_by", { form, preserve: true });
   const group = import_antd.Form.useWatch("group_by", { form, preserve: true });
@@ -60,7 +61,7 @@ var useTransDataSource = (params) => {
       return [];
     }
     return filter == null ? void 0 : filter.list.filter((item) => item.localFilter);
-  }, [filter]);
+  }, [(0, import_utils2.stringify)(filter)]);
   const dataSource = (0, import_react.useMemo)(() => {
     if (!localPagination) {
       return pDataSource;
@@ -72,7 +73,7 @@ var useTransDataSource = (params) => {
     if (sortObj) {
       newDataSource = (0, import_utils2.sortDataSource)(newDataSource, sortObj);
     }
-    if (groupDetail) {
+    if (groupDetail && currentView === "table") {
       newDataSource = (0, import_utils2.groupDataSource)(newDataSource, groupDetail, rowKey);
     }
     return newDataSource;
@@ -82,9 +83,9 @@ var useTransDataSource = (params) => {
     sortObj,
     groupDetail,
     filterLocalArr,
-    filters
+    filters,
+    currentView
   ]);
-  console.log("dataSourcedataSource", dataSource);
   return dataSource;
 };
 var useTransDataSource_default = useTransDataSource;