@pisell/materials 1.0.925 → 1.0.927

package/lib/components/table/Table/fields/select/Sort/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/fields/text/Config/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/lib/components/table/Table/fields/text/Sort/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

package/lib/components/table/Table/fields/treeSelect/Config/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Config: () => JSX.Element;
 export default Config;

package/lib/components/table/Table/fields/treeSelect/Show/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
 declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/lib/components/table/Table/fields/treeSelect/Sort/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Sort: () => JSX.Element;
 export default Sort;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const SortRow: ({ children, rowKey, onSortChange }: any) => JSX.Element;
 export default SortRow;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const summary: (props: any) => JSX.Element;
 export default summary;

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

@@ -119,12 +119,6 @@ export declare const setFormValuesToLocalStorage: ({ tableId, allValues, keys, c
     key: string;
     value: Record<string, any>;
 } | undefined;
-/**
- * 获取表格键值
- * @param tableId 表格ID
- * @returns 返回格式化后的表格键值
- */
-export declare const getTableKey: (tableId: string) => string;
 /**
  * 合并筛选设置
  * @param list 列表数据
@@ -167,7 +161,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("order_by" | "group_by" | "column_setting" | "gallery_setting" | "filter_setting" | "view_mode")[];
+}) => ("view_mode" | "order_by" | "group_by" | "column_setting" | "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/lib/components/table/Table/utils.js

@@ -36,7 +36,6 @@ __export(utils_exports, {
   getHash: () => getHash,
   getIdByRowKey: () => getIdByRowKey,
   getSettingKeyArrByMode: () => getSettingKeyArrByMode,
-  getTableKey: () => getTableKey,
   getTableSettingByCurrentViewMode: () => getTableSettingByCurrentViewMode,
   getTableSettingFromLocalStorage: () => getTableSettingFromLocalStorage,
   groupDataSource: () => groupDataSource,
@@ -312,7 +311,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,
@@ -462,7 +478,6 @@ var stringify = (obj) => {
   getHash,
   getIdByRowKey,
   getSettingKeyArrByMode,
-  getTableKey,
   getTableSettingByCurrentViewMode,
   getTableSettingFromLocalStorage,
   groupDataSource,

package/lib/components/table/TableFilter/SortIcon.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface SortIconProps {
     sortOrder: null | "ascend" | "descend";
 }

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

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

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

@@ -36,6 +36,7 @@ var import_react = require("react");
 var import_utils = require("../Table/utils");
 var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_ahooks = require("ahooks");
+var import_react2 = __toESM(require("react"));
 var useTableSetting = (params) => {
   var _a;
   const {
@@ -49,7 +50,8 @@ var useTableSetting = (params) => {
     columns: propsColumns,
     gallery,
     currentSettingHash,
-    exportImport
+    exportImport,
+    localSettings
   } = params;
   const context = (0, import_useEngineContext.default)();
   const { isTerminal, interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
@@ -81,7 +83,8 @@ var useTableSetting = (params) => {
     };
   }, [gallery, columns]);
   const localStorageSettingKeyArr = (0, import_react.useMemo)(() => {
-    return (0, import_utils.getSettingKeyArrByMode)({
+    var _a2;
+    const keys = (0, import_utils.getSettingKeyArrByMode)({
       filter,
       columnSetting,
       dataSourceGroup,
@@ -89,6 +92,12 @@ var useTableSetting = (params) => {
       mode: "localStorage",
       currentViewMode
     });
+    if ((localSettings == null ? void 0 : localSettings.enable) && ((_a2 = localSettings.scope) == null ? void 0 : _a2.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)({
@@ -201,20 +210,109 @@ var useTableSetting = (params) => {
     sortButtonShow
   ]);
   const setTableSetting = (0, import_ahooks.useMemoizedFn)((values) => {
+    var _a2;
+    let valuesForSave = values;
+    if ((localSettings == null ? void 0 : localSettings.enable) && ((_a2 = localSettings.scope) == null ? void 0 : _a2.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
+      };
+    }
     const result = (0, import_utils.setFormValuesToLocalStorage)({
       tableId,
-      allValues: values,
+      allValues: valuesForSave,
       keys: localStorageSettingKeyArr,
       currentViewMode,
       currentSettingHash
     });
   });
   const tableSetting = (0, import_react.useMemo)(() => {
-    return {
+    var _a2;
+    const merged = {
       ...tableLocalSetting,
       ...defaultTableSetting
     };
-  }, [tableLocalSetting, defaultTableSetting]);
+    if ((localSettings == null ? void 0 : localSettings.enable) && ((_a2 = localSettings.scope) == null ? void 0 : _a2.includes("filters"))) {
+      const persistedFilter = tableLocalSetting == null ? void 0 : tableLocalSetting.filters;
+      if (persistedFilter && typeof persistedFilter === "object") {
+        return {
+          ...merged,
+          ...persistedFilter
+        };
+      }
+    }
+    return merged;
+  }, [tableLocalSetting, defaultTableSetting, localSettings]);
+  (0, import_react.useMemo)(() => {
+    var _a2;
+    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) && ((_a2 = localSettings.scope) == null ? void 0 : _a2.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

@@ -193,6 +193,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[];
@@ -249,5 +264,7 @@ export declare type GridViewProps = {
             sortBy?: string;
         }[];
     };
+    /** 本地记忆设置 */
+    localSettings?: LocalSettingsType;
 };
 export {};

package/lib/components/time-picker/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const TimePicker: (props: any) => JSX.Element;
 export default TimePicker;

package/lib/components/upload/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Upload: (props: any) => JSX.Element;
 export default Upload;

package/lib/components/versionSelect/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 import './index.less';
 export interface Version {

package/lib/components/virtual-keyboard/BaseNumberKeyboard/Presets.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./Presets.less";
 export declare type PresetsItem = {
     label: string;

package/lib/components/virtual-keyboard/Time/utils.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const formatStringToTime: (value: string) => {
     valueArray: string[];
     valueString: string;

package/lib/components/walletCard/Guest/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Guest: (props: any) => JSX.Element;
 export default Guest;

package/lib/components/walletCard/Guide/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Guide: (props: any) => JSX.Element;
 export default Guide;

package/lib/locales/zh-TW.js

@@ -377,6 +377,10 @@ var zh_TW_default = {
   "pisell-list-pagination-page-of": (current, total) => `第 ${current} 頁 共 ${total} 頁`,
   "pisell-list-pagination-previous": "上一頁",
   "pisell-list-pagination-next": "下一頁",
+  "pisell2.text.goodpass.product-vouchers": "優惠促銷",
+  "pisell2.text.goodpass.last-settlement": "(上次結算)",
+  "pisell2.text.goodpass.view-more": "查看更多",
+  "pisell2.text.goodpass.save": "節省",
   // 相机组件
   "pisell-camera-no-camera-accessible": "沒有找到攝像頭",
   "pisell-camera-permission-denied": "沒有權限使用攝像頭",

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

@@ -4542,6 +4542,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

@@ -1457,6 +1457,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",