@pisell/materials 6.4.7 → 6.4.8

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

@@ -307,7 +307,24 @@ var setFormValuesToLocalStorage = ({
     currentSettingHash
   });
 };
-var getTableKey = (tableId) => `${tableKeyPrefix}-${tableId}`;
+var getTableKey = (tableId) => {
+  if (typeof window === "undefined" || typeof window.location === "undefined") {
+    return `${tableKeyPrefix}-${tableId}`;
+  }
+  const { pathname, search } = window.location;
+  let appendPath = pathname || "/";
+  let memoryKey = "";
+  try {
+    const params = new URLSearchParams(search || "");
+    const mk = params.get("memory_key");
+    if (mk && mk.trim() !== "") {
+      memoryKey = mk.trim();
+    }
+  } catch (e) {
+  }
+  const urlPart = memoryKey ? `${appendPath}#${memoryKey}` : appendPath;
+  return `${tableKeyPrefix}-${tableId}-${urlPart}`;
+};
 var mergeFilterSetting = ({
   list,
   quickFilterMaxLength,

package/lib/components/table/hooks/useTableSetting.d.ts

@@ -1,5 +1,5 @@
 import { FilterType } from "../../filter/types";
-import { ColumnSettingType, DataSourceGroupType, GallerySettingType, GridViewType, ModeType, SortType, ExportImportModeType } from "../types";
+import { ColumnSettingType, DataSourceGroupType, GallerySettingType, GridViewType, ModeType, SortType, ExportImportModeType, LocalSettingsType } from "../types";
 declare type UseTableSettingProps = {
     tableId?: string;
     filter: FilterType;
@@ -12,11 +12,10 @@ declare type UseTableSettingProps = {
     gallery?: GallerySettingType;
     currentSettingHash: string;
     exportImport?: ExportImportModeType;
+    localSettings?: LocalSettingsType;
 };
 declare const useTableSetting: (params: UseTableSettingProps) => {
     setTableSetting: (values: Record<string, any>) => void;
-    tableSetting: {
-        [x: string]: any;
-    };
+    tableSetting: any;
 };
 export default useTableSetting;

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
@@ -25,6 +35,7 @@ module.exports = __toCommonJS(useTableSetting_exports);
 var import_react = require("react");
 var import_utils = require("../Table/utils");
 var import_ahooks = require("ahooks");
+var import_react2 = __toESM(require("react"));
 var useTableSetting = (params) => {
   const {
     tableId,
@@ -37,7 +48,8 @@ var useTableSetting = (params) => {
     columns: propsColumns,
     gallery,
     currentSettingHash,
-    exportImport
+    exportImport,
+    localSettings
   } = params;
   const columnsMap = (0, import_react.useMemo)(() => {
     return new Map(propsColumns.map((item) => [item.key, item]));
@@ -67,7 +79,8 @@ var useTableSetting = (params) => {
     };
   }, [gallery, columns]);
   const localStorageSettingKeyArr = (0, import_react.useMemo)(() => {
-    return (0, import_utils.getSettingKeyArrByMode)({
+    var _a;
+    const keys = (0, import_utils.getSettingKeyArrByMode)({
       filter,
       columnSetting,
       dataSourceGroup,
@@ -75,6 +88,12 @@ var useTableSetting = (params) => {
       mode: "localStorage",
       currentViewMode
     });
+    if ((localSettings == null ? void 0 : localSettings.enable) && ((_a = localSettings.scope) == null ? void 0 : _a.includes("filters"))) {
+      if (!keys.includes("filters")) {
+        keys.push("filters");
+      }
+    }
+    return keys;
   }, [tableId, filter, columnSetting, dataSourceGroup, sort, currentViewMode]);
   const defaultKeyArr = (0, import_react.useMemo)(() => {
     return (0, import_utils.getSettingKeyArrByMode)({
@@ -129,6 +148,8 @@ var useTableSetting = (params) => {
           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
         };
+      } else if (item === "filters") {
+        setting[item] = (mergedSetting == null ? void 0 : mergedSetting[item]) || {};
       } else {
         setting[item] = mergedSetting == null ? void 0 : mergedSetting[item];
       }
@@ -187,20 +208,109 @@ var useTableSetting = (params) => {
     sortButtonShow
   ]);
   const setTableSetting = (0, import_ahooks.useMemoizedFn)((values) => {
+    var _a;
+    let valuesForSave = values;
+    if ((localSettings == null ? void 0 : localSettings.enable) && ((_a = localSettings.scope) == null ? void 0 : _a.includes("filters"))) {
+      const excluded = new Set((localSettings == null ? void 0 : localSettings.excludedFilterFields) || []);
+      const filterValue = {};
+      ((filter == null ? void 0 : filter.list) || []).forEach((item) => {
+        const rawName = item == null ? void 0 : item.name;
+        if (!rawName) return;
+        const key = Array.isArray(rawName) ? rawName.join(",") : String(rawName);
+        if (excluded.has(key)) return;
+        if (values.hasOwnProperty(key)) {
+          filterValue[key] = values[key];
+        }
+      });
+      valuesForSave = {
+        ...values,
+        filters: filterValue
+      };
+    }
     (0, import_utils.setFormValuesToLocalStorage)({
       tableId,
-      allValues: values,
+      allValues: valuesForSave,
       keys: localStorageSettingKeyArr,
       currentViewMode,
       currentSettingHash
     });
   });
   const tableSetting = (0, import_react.useMemo)(() => {
-    return {
+    var _a;
+    const merged = {
       ...tableLocalSetting,
       ...defaultTableSetting
     };
+    if ((localSettings == null ? void 0 : localSettings.enable) && ((_a = localSettings.scope) == null ? void 0 : _a.includes("filters"))) {
+      const persistedFilter = tableLocalSetting == null ? void 0 : tableLocalSetting.filters;
+      if (persistedFilter && typeof persistedFilter === "object") {
+        return {
+          ...merged,
+          ...persistedFilter
+        };
+      }
+    }
+    return merged;
   }, [tableLocalSetting, defaultTableSetting]);
+  (0, import_react.useMemo)(() => {
+    var _a;
+    try {
+      if (!tableId) return;
+      const current = (0, import_utils.getTableSettingByCurrentViewMode)(tableId, currentViewMode) || {};
+      const persistedFilters = (current == null ? void 0 : current.filters) || {};
+      let nextFilters = { ...persistedFilters };
+      let shouldUpdate = false;
+      const enableFiltersMemory = !!((localSettings == null ? void 0 : localSettings.enable) && ((_a = localSettings.scope) == null ? void 0 : _a.includes("filters")));
+      if (!enableFiltersMemory) {
+        if (Object.keys(persistedFilters || {}).length > 0) {
+          nextFilters = {};
+          shouldUpdate = true;
+        }
+      } else {
+        let names = /* @__PURE__ */ new Set();
+        if (import_react2.default.isValidElement(filter)) {
+          names = new Set(
+            ((filter == null ? void 0 : filter.items) || []).filter((item) => !item.isHidden).map((item) => {
+              const rawName = item == null ? void 0 : item.value;
+              if (!rawName) return void 0;
+              return Array.isArray(rawName) ? rawName.join(",") : String(rawName);
+            })
+          );
+        } else {
+          names = new Set(
+            ((filter == null ? void 0 : filter.list) || []).map((item) => {
+              const rawName = item == null ? void 0 : item.name;
+              if (!rawName) return void 0;
+              return Array.isArray(rawName) ? rawName.join(",") : String(rawName);
+            }).filter(Boolean)
+          );
+        }
+        const excluded = new Set((localSettings == null ? void 0 : localSettings.excludedFilterFields) || []);
+        const allowed = new Set(Array.from(names).filter((k) => !excluded.has(k)));
+        const filtered = {};
+        Object.keys(persistedFilters || {}).forEach((k) => {
+          if (allowed.has(k)) {
+            filtered[k] = persistedFilters[k];
+          } else {
+            shouldUpdate = true;
+          }
+        });
+        if (Object.keys(filtered).length !== Object.keys(persistedFilters || {}).length) {
+          shouldUpdate = true;
+        }
+        nextFilters = filtered;
+      }
+      if (shouldUpdate) {
+        (0, import_utils.setTableSettingToLocalStorage)({
+          tableId,
+          tableSettingObj: { filters: nextFilters },
+          currentViewMode,
+          currentSettingHash
+        });
+      }
+    } catch (e) {
+    }
+  }, []);
   return {
     setTableSetting,
     tableSetting

package/lib/components/table/index.js

@@ -76,6 +76,7 @@ var GridView = (0, import_model.Provider)(
       onValuesChange,
       columnSetting,
       dataSourceGroup: propsDataSourceGroup,
+      localSettings: _localSettings,
       view = defaultView,
       gallery,
       currentSettingKey,
@@ -171,7 +172,8 @@ var GridView = (0, import_model.Provider)(
       view,
       currentViewMode,
       gallery,
-      currentSettingHash
+      currentSettingHash,
+      localSettings: _localSettings
     });
     const getIsTriggerValuesChange = (0, import_useTriggerValuesChange.default)({
       filter,
@@ -260,6 +262,15 @@ var GridView = (0, import_model.Provider)(
     (0, import_react.useImperativeHandle)(ref, () => {
       if (wrapRef.current) {
         wrapRef.current.formInstance = form;
+        wrapRef.current.getCachedFilters = () => {
+          try {
+            if (!tableId) return {};
+            const setting = (0, import_utils.getTableSettingByCurrentViewMode)(tableId, currentViewMode);
+            return (setting == null ? void 0 : setting.filters) || {};
+          } catch (e) {
+            return {};
+          }
+        };
       }
       return wrapRef.current;
     });

package/lib/components/table/types.d.ts

@@ -191,6 +191,21 @@ export declare type ExportImportType = {
     apiUrl?: ApiProps;
     otherParams?: any;
 };
+/**
+ * 设置记忆范围
+ */
+export declare type LocalSettingsScope = "filters" | "sorting" | "columns";
+/**
+ * 本地记忆设置
+ */
+export declare type LocalSettingsType = {
+    /** 启用设置记忆 */
+    enable: boolean;
+    /** 记忆范围 */
+    scope: LocalSettingsScope[];
+    /** 不需要记忆的筛选字段（当 scope 包含 filters 时生效） */
+    excludedFilterFields?: string[];
+};
 export declare type GridViewProps = {
     columns: any;
     dataSource: any[];
@@ -247,5 +262,7 @@ export declare type GridViewProps = {
             sortBy?: string;
         }[];
     };
+    /** 本地记忆设置 */
+    localSettings?: LocalSettingsType;
 };
 export {};

package/lib/utils/index.d.ts

@@ -1,4 +1,4 @@
 export declare const isBrowser: boolean;
-export declare const getCssNumber: (val: string | number) => string;
+export declare const getCssNumber: (val: string | number) => string | number;
 export declare function uuid(): string;
 export * from './mergeWith';

package/lowcode/data-source-table/meta.ts

@@ -3050,6 +3050,132 @@ const dataSourceTable = {
         },
       ],
     },
+
+    {
+      type: 'group',
+      title: {
+        type: 'i18n',
+        'en-US': 'Other',
+        'zh-CN': '其他',
+      },
+      display: 'accordion',
+      items: [
+        {
+          title: "本地记忆",
+          display: "block",
+          type: "group",
+          items: [
+            {
+              name: "localSettings.enable",
+              title: {
+                label: {
+                  type: 'i18n',
+                  'en-US': 'Enable settings memory',
+                  'zh-CN': '启用设置记忆',
+                  'zh-HK': '啟用設置記憶',
+                },
+                tip: {
+                  type: 'i18n',
+                  'en-US': 'Automatically save and restore table settings',
+                  'zh-CN': '自动保存和恢复表格设置',
+                  'zh-HK': '自動保存和恢復表格設置',
+                },
+              },
+              propType: "bool",
+              setter: "BoolSetter",
+              defaultValue: true,
+            },
+            {
+              name: "localSettings.scope",
+              title: {
+                label: {
+                  type: 'i18n',
+                  'en-US': 'Memory scope',
+                  'zh-CN': '记忆范围',
+                  'zh-HK': '記憶範圍',
+                },
+                tip: {
+                  type: 'i18n',
+                  'en-US': 'Choose which settings to remember',
+                  'zh-CN': '选择要记忆的设置项',
+                  'zh-HK': '選擇要記憶的設置項',
+                },
+              },
+              condition: {
+                type: "JSFunction",
+                value: 'target => !!target.getProps().getPropValue("localSettings.enable")',
+              },
+              setter: {
+                componentName: "SelectSetter",
+                props: {
+                  mode: "multiple",
+                  options: [
+                    { title: '筛选', value: "filters" },
+                    { title: '排序', value: "sorting" },
+                    { title: '列配置', value: "columns" },
+                  ],
+                },
+              },
+              defaultValue: ["filters", "sorting", "columns"],
+            },
+            {
+              name: "localSettings.excludedFilterFields",
+              title: {
+                label: {
+                  type: 'i18n',
+                  'en-US': 'Excluded filter fields',
+                  'zh-CN': '筛选排除字段',
+                  'zh-HK': '篩選排除字段',
+                },
+                tip: {
+                  type: 'i18n',
+                  'en-US': 'Filter fields that should not be remembered',
+                  'zh-CN': '不需要记忆的筛选字段',
+                  'zh-HK': '不需要記憶的篩選字段',
+                },
+              },
+              condition: {
+                type: "JSFunction",
+                value: 'target => { const enable = !!target.getProps().getPropValue("localSettings.enable"); const scope = target.getProps().getPropValue("localSettings.scope") || []; return enable && Array.isArray(scope) && scope.includes("filters"); }',
+              },
+              setter: {
+                componentName: "SelectSetter",
+                props: (target: any) => {
+                  const filterList = (target.parent.parent.getPropValue("filter.items") || []) as any[];
+
+
+                  const searchDetail = target.parent.parent.getPropValue("search");
+
+                  if (searchDetail && searchDetail.show) {
+                    filterList.unshift({
+                      label: "搜索",
+                      value: searchDetail.key || "_keywords",
+                      isHidden: false,
+                    });
+                  }
+
+                  return {
+                    mode: "multiple",
+                    options: filterList
+                      .map((item: any) => ({
+                        title:
+                          (item && (typeof item.label === 'string' ? item.label : item.label?.["zh-CN"] || item.label?.["zh-HK"] || item.label?.en)) ||
+                          item?.key ||
+                          item?.columnKey ||
+                          "",
+                        value: item?.value || "",
+                        isHidden: item?.isHidden,
+                      }))
+                      .filter((opt: any) => opt.value && !opt.isHidden),
+                  };
+                },
+              },
+            },
+          ],
+        },
+
+      ],
+    },
   ],
   configure: {
     props: [
@@ -4536,6 +4662,119 @@ const dataSourceTable = {
           },
         ],
       },
+      {
+        title: "本地记忆",
+        display: "block",
+        type: "group",
+        items: [
+          {
+            name: "localSettings.enable",
+            title: {
+              label: {
+                type: 'i18n',
+                'en-US': 'Enable settings memory',
+                'zh-CN': '启用设置记忆',
+                'zh-HK': '啟用設置記憶',
+              },
+              tip: {
+                type: 'i18n',
+                'en-US': 'Automatically save and restore table settings',
+                'zh-CN': '自动保存和恢复表格设置',
+                'zh-HK': '自動保存和恢復表格設置',
+              },
+            },
+            propType: "bool",
+            setter: "BoolSetter",
+            defaultValue: true,
+          },
+          {
+            name: "localSettings.scope",
+            title: {
+              label: {
+                type: 'i18n',
+                'en-US': 'Memory scope',
+                'zh-CN': '记忆范围',
+                'zh-HK': '記憶範圍',
+              },
+              tip: {
+                type: 'i18n',
+                'en-US': 'Choose which settings to remember',
+                'zh-CN': '选择要记忆的设置项',
+                'zh-HK': '選擇要記憶的設置項',
+              },
+            },
+            condition: {
+              type: "JSFunction",
+              value: 'target => !!target.getProps().getPropValue("localSettings.enable")',
+            },
+            setter: {
+              componentName: "SelectSetter",
+              props: {
+                mode: "multiple",
+                options: [
+                  { title: '筛选', value: "filters" },
+                  { title: '排序', value: "sorting" },
+                  { title: '列配置', value: "columns" },
+                ],
+              },
+            },
+            defaultValue: ["filters", "sorting", "columns"],
+          },
+          {
+            name: "localSettings.excludedFilterFields",
+            title: {
+              label: {
+                type: 'i18n',
+                'en-US': 'Excluded filter fields',
+                'zh-CN': '筛选排除字段',
+                'zh-HK': '篩選排除字段',
+              },
+              tip: {
+                type: 'i18n',
+                'en-US': 'Filter fields that should not be remembered',
+                'zh-CN': '不需要记忆的筛选字段',
+                'zh-HK': '不需要記憶的篩選字段',
+              },
+            },
+            condition: {
+              type: "JSFunction",
+              value: 'target => { const enable = !!target.getProps().getPropValue("localSettings.enable"); const scope = target.getProps().getPropValue("localSettings.scope") || []; return enable && Array.isArray(scope) && scope.includes("filters"); }',
+            },
+            setter: {
+              componentName: "SelectSetter",
+              props: (target: any) => {
+                const filterList = (target.parent.parent.getPropValue("filter.items") || []) as any[];
+
+
+                const searchDetail = target.parent.parent.getPropValue("search");
+
+                if (searchDetail && searchDetail.show) {
+                  filterList.unshift({
+                    label: "搜索",
+                    value: searchDetail.key || "_keywords",
+                    isHidden: false,
+                  });
+                }
+
+                return {
+                  mode: "multiple",
+                  options: filterList
+                    .map((item: any) => ({
+                      title:
+                        (item && (typeof item.label === 'string' ? item.label : item.label?.["zh-CN"] || item.label?.["zh-HK"] || item.label?.en)) ||
+                        item?.key ||
+                        item?.columnKey ||
+                        "",
+                      value: item?.value || "",
+                      isHidden: item?.isHidden,
+                    }))
+                    .filter((opt: any) => opt.value && !opt.isHidden),
+                };
+              },
+            },
+          },
+        ],
+      },
       {
         title: { label: '列配置', tip: '表格的列配置' },
         display: 'block',

package/lowcode/table/meta.ts

@@ -1447,6 +1447,110 @@ export default {
         },
       ],
     },
+    {
+      title: "本地记忆",
+      display: "block",
+      type: "group",
+      items: [
+        {
+          name: "localSettings.enable",
+          title: {
+            label: {
+              type: 'i18n',
+              'en-US': 'Enable settings memory',
+              'zh-CN': '启用设置记忆',
+              'zh-HK': '啟用設置記憶',
+            },
+            tip: {
+              type: 'i18n',
+              'en-US': 'Automatically save and restore table settings',
+              'zh-CN': '自动保存和恢复表格设置',
+              'zh-HK': '自動保存和恢復表格設置',
+            },
+          },
+          propType: "bool",
+          setter: "BoolSetter",
+          defaultValue: true,
+        },
+        {
+          name: "localSettings.scope",
+          title: {
+            label: {
+              type: 'i18n',
+              'en-US': 'Memory scope',
+              'zh-CN': '记忆范围',
+              'zh-HK': '記憶範圍',
+            },
+            tip: {
+              type: 'i18n',
+              'en-US': 'Choose which settings to remember',
+              'zh-CN': '选择要记忆的设置项',
+              'zh-HK': '選擇要記憶的設置項',
+            },
+          },
+          condition: {
+            type: "JSFunction",
+            value: 'target => !!target.getProps().getPropValue("localSettings.enable")',
+          },
+          setter: {
+            componentName: "SelectSetter",
+            props: {
+              mode: "multiple",
+              options: [
+                { title: '筛选', value: "filters" },
+                { title: '排序', value: "sorting" },
+                { title: '列配置', value: "columns" },
+              ],
+            },
+          },
+          defaultValue: ["filters", "sorting", "columns"],
+        },
+        {
+          name: "localSettings.excludedFilterFields",
+          title: {
+            label: {
+              type: 'i18n',
+              'en-US': 'Excluded filter fields',
+              'zh-CN': '筛选排除字段',
+              'zh-HK': '篩選排除字段',
+            },
+            tip: {
+              type: 'i18n',
+              'en-US': 'Filter fields that should not be remembered',
+              'zh-CN': '不需要记忆的筛选字段',
+              'zh-HK': '不需要記憶的篩選字段',
+            },
+          },
+          // condition: {
+          //   type: "JSFunction",
+          //   value: 'target => { const enable = !!target.getProps().getPropValue("settingsMemory.enable"); const scope = target.getProps().getPropValue("settingsMemory.scope") || []; return enable && Array.isArray(scope) && scope.includes("filters"); }',
+          // },
+          condition: {
+            type: "JSFunction",
+            value: 'target => !!target.getProps().getPropValue("localSettings.enable")',
+          },
+          setter: {
+            componentName: "SelectSetter",
+            props: (target: any) => {
+              const filterList = (target.parent.parent.getPropValue("filter.list") || []) as any[];
+              return {
+                mode: "multiple",
+                options: filterList
+                  .map((item: any) => ({
+                    title:
+                      (item && (item.label?.["zh-CN"] || item.label?.["zh-HK"] || item.label?.en)) ||
+                      item?.key ||
+                      item?.columnKey ||
+                      "",
+                    value: item?.key || item?.columnKey || "",
+                  }))
+                  .filter((opt: any) => opt.value),
+              };
+            },
+          },
+        },
+      ],
+    },
     {
       title: { label: "列配置", tip: "表格的列配置" },
       display: "block",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.4.7",
+  "version": "6.4.8",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -75,8 +75,8 @@
     "vod-js-sdk-v6": "^1.4.11",
     "antd-mobile": "^5.38.1",
     "@pisell/date-picker": "3.0.7",
-    "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.2"
+    "@pisell/utils": "3.0.2",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",