@pisell/materials 6.3.6 → 6.3.8

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) || import_react2.default.isValidElement(filter == null ? void 0 : filter.dom)) {
+          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/components/time-picker/index.d.ts

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

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

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

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

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

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

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

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

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

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

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

package/lib/locales/en-US.d.ts

@@ -276,5 +276,15 @@ declare const _default: {
     'pisell2.text.goodpass.last-settlement': string;
     'pisell2.text.goodpass.view-more': string;
     'pisell2.text.goodpass.save': string;
+    'pisell-camera-no-camera-accessible': string;
+    'pisell-camera-permission-denied': string;
+    'pisell-camera-switch-camera': string;
+    'pisell-camera-canvas': string;
+    'pisell-camera-checking': string;
+    'pisell-camera-no-camera-desc': string;
+    'pisell-upload-camera-local-files': string;
+    'pisell-upload-camera-capture': string;
+    'pisell-upload-camera-retake': string;
+    'pisell-upload-camera-use': string;
 };
 export default _default;

package/lib/locales/en-US.js

@@ -328,5 +328,17 @@ var en_US_default = {
   "pisell2.text.goodpass.product-vouchers": "Promotions & Vouchers",
   "pisell2.text.goodpass.last-settlement": "(Last payment)",
   "pisell2.text.goodpass.view-more": "View More",
-  "pisell2.text.goodpass.save": "Save"
+  "pisell2.text.goodpass.save": "Save",
+  // 相机组件
+  "pisell-camera-no-camera-accessible": "No camera accessible",
+  "pisell-camera-permission-denied": "Permission denied",
+  "pisell-camera-switch-camera": "Switch camera",
+  "pisell-camera-canvas": "Canvas not supported",
+  "pisell-camera-checking": "Detecting camera...",
+  "pisell-camera-no-camera-desc": "Please check if your device has a camera or grant browser permission to access camera",
+  // 拍照组件
+  "pisell-upload-camera-local-files": "Local Files",
+  "pisell-upload-camera-capture": "Capture",
+  "pisell-upload-camera-retake": "Retake",
+  "pisell-upload-camera-use": "Use photo"
 };

package/lib/locales/zh-CN.d.ts

@@ -271,5 +271,15 @@ declare const _default: {
     'pisell2.text.goodpass.last-settlement': string;
     'pisell2.text.goodpass.view-more': string;
     'pisell2.text.goodpass.save': string;
+    'pisell-camera-no-camera-accessible': string;
+    'pisell-camera-permission-denied': string;
+    'pisell-camera-switch-camera': string;
+    'pisell-camera-canvas': string;
+    'pisell-camera-checking': string;
+    'pisell-camera-no-camera-desc': string;
+    'pisell-upload-camera-local-files': string;
+    'pisell-upload-camera-capture': string;
+    'pisell-upload-camera-retake': string;
+    'pisell-upload-camera-use': string;
 };
 export default _default;

package/lib/locales/zh-CN.js

@@ -319,5 +319,17 @@ var zh_CN_default = {
   "pisell2.text.goodpass.product-vouchers": "优惠促销",
   "pisell2.text.goodpass.last-settlement": "(上次结算)",
   "pisell2.text.goodpass.view-more": "查看更多",
-  "pisell2.text.goodpass.save": "节省"
+  "pisell2.text.goodpass.save": "节省",
+  // 相机组件
+  "pisell-camera-no-camera-accessible": "没有找到摄像头",
+  "pisell-camera-permission-denied": "没有权限使用摄像头",
+  "pisell-camera-switch-camera": "切换摄像头",
+  "pisell-camera-canvas": "canvas不支持",
+  "pisell-camera-checking": "正在检测摄像头...",
+  "pisell-camera-no-camera-desc": "请检查设备是否连接摄像头或授权浏览器访问摄像头",
+  // 拍照组件
+  "pisell-upload-camera-local-files": "本地文件",
+  "pisell-upload-camera-capture": "拍摄/拍照",
+  "pisell-upload-camera-retake": "重拍",
+  "pisell-upload-camera-use": "使用照片"
 };

package/lib/locales/zh-TW.d.ts

@@ -271,5 +271,15 @@ declare const _default: {
     'pisell2.text.goodpass.last-settlement': string;
     'pisell2.text.goodpass.view-more': string;
     'pisell2.text.goodpass.save': string;
+    'pisell-camera-no-camera-accessible': string;
+    'pisell-camera-permission-denied': string;
+    'pisell-camera-switch-camera': string;
+    'pisell-camera-canvas': string;
+    'pisell-camera-checking': string;
+    'pisell-camera-no-camera-desc': string;
+    'pisell-upload-camera-local-files': string;
+    'pisell-upload-camera-capture': string;
+    'pisell-upload-camera-retake': string;
+    'pisell-upload-camera-use': string;
 };
 export default _default;

package/lib/locales/zh-TW.js

@@ -320,5 +320,17 @@ var zh_TW_default = {
   "pisell2.text.goodpass.product-vouchers": "優惠促銷",
   "pisell2.text.goodpass.last-settlement": "(上次結算)",
   "pisell2.text.goodpass.view-more": "查看更多",
-  "pisell2.text.goodpass.save": "節省"
+  "pisell2.text.goodpass.save": "節省",
+  // 相机组件
+  "pisell-camera-no-camera-accessible": "沒有找到攝像頭",
+  "pisell-camera-permission-denied": "沒有權限使用攝像頭",
+  "pisell-camera-switch-camera": "切換攝像頭",
+  "pisell-camera-canvas": "canvas不支持",
+  "pisell-camera-checking": "正在檢測攝像頭...",
+  "pisell-camera-no-camera-desc": "請檢查設備是否連接攝像頭或授權瀏覽器訪問攝像頭",
+  // 拍照组件
+  "pisell-upload-camera-local-files": "本地文件",
+  "pisell-upload-camera-capture": "拍攝/拍照",
+  "pisell-upload-camera-retake": "重拍",
+  "pisell-upload-camera-use": "使用照片"
 };

package/lib/utils/platform.d.ts

@@ -1 +1 @@
-export declare const isMobile: () => any;
+export declare const isMobile: () => boolean;