@pisell/materials 6.2.38 → 6.2.40

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/components/walletCard/Guide/index.js

@@ -51,9 +51,19 @@ var Guide = (props) => {
     return (setting == null ? void 0 : setting.walletGuideConfig) || {};
   }, [setting == null ? void 0 : setting.walletGuideConfig]);
   const handleClick = (e) => {
-    var _a2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
     e.stopPropagation();
     if (!((_a2 = _setting == null ? void 0 : _setting.skipLink) == null ? void 0 : _a2.page)) return;
+    if ((_d2 = (_c2 = (_b2 = utils == null ? void 0 : utils.interaction) == null ? void 0 : _b2.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d2.call(_c2)) {
+      (_g2 = (_f2 = (_e2 = utils == null ? void 0 : utils.interaction) == null ? void 0 : _e2.utils) == null ? void 0 : _f2.postMessageToApp) == null ? void 0 : _g2.call(_f2, {
+        module: "global",
+        key: "openNative",
+        data: {
+          link: _setting == null ? void 0 : _setting.skipLink
+        }
+      });
+      return;
+    }
     utils == null ? void 0 : utils.jumpPageByLink(_setting == null ? void 0 : _setting.skipLink);
   };
   return /* @__PURE__ */ import_react.default.createElement(

package/lib/components/walletCard/index.js

@@ -36,6 +36,7 @@ var import_antd = require("antd");
 var import_classnames = __toESM(require("classnames"));
 var import_react = __toESM(require("react"));
 var import_react_barcode = __toESM(require("react-barcode"));
+var import_EyeOff = __toESM(require("@pisell/icon/es/EyeOff"));
 var import_locales = require("../../locales/index");
 var import_iconfont = __toESM(require("./../iconfont"));
 var import_pisellModal = __toESM(require("./../pisellModal"));
@@ -143,13 +144,16 @@ var CardHeader = ({
   cardStyle = "normal",
   codeType = "barCode",
   onCodeClick,
-  isLogin = false
+  isLogin = false,
+  showViewPin = false,
+  onViewPinClick
 }) => {
   const processedShowIcon = toBooleanValue(showIcon);
   const processedShowWalletName = toBooleanValue(showWalletName);
   const processedShowShopName = toBooleanValue(showShopName);
   const processedShowCardNo = toBooleanValue(showCardNo);
   const processedShowCode = toBooleanValue(showCode);
+  const processedShowViewPin = toBooleanValue(showViewPin);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header-level" }, processedShowIcon && iconImg ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header-icon" }, /* @__PURE__ */ import_react.default.createElement(
     "img",
     {
@@ -157,7 +161,15 @@ var CardHeader = ({
       alt: "wallet icon",
       style: { width: "20px", height: "20px" }
     }
-  )) : null, processedShowWalletName && walletName && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header-level-text" }, walletName)), processedShowShopName && shopName && /* @__PURE__ */ import_react.default.createElement("div", null, shopName), processedShowCardNo && cardNo && /* @__PURE__ */ import_react.default.createElement("div", null, cardNo)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header-right" }, processedShowCode && cardStyle === "normal" && /* @__PURE__ */ import_react.default.createElement(
+  )) : null, processedShowWalletName && walletName && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header-level-text" }, walletName)), processedShowShopName && shopName && /* @__PURE__ */ import_react.default.createElement("div", null, shopName), processedShowCardNo && cardNo && /* @__PURE__ */ import_react.default.createElement("div", null, cardNo), processedShowViewPin && /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      className: "pisell-wallet-card-header-view-pin",
+      onClick: onViewPinClick
+    },
+    (0, import_locales.getText)("walletCard-viewPin"),
+    /* @__PURE__ */ import_react.default.createElement(import_EyeOff.default, { className: "pisell-wallet-card-header-view-pin-icon" })
+  )), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header-right" }, processedShowCode && cardStyle === "normal" && /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-wallet-card-icon-wrapper",
@@ -287,6 +299,7 @@ var WalletCard = (props) => {
   const showCardNo = toBooleanValue(mergedProps.showCardNo);
   const showCode = toBooleanValue(mergedProps.showCode);
   const isLogin = toBooleanValue(mergedProps.isLogin);
+  const showViewPin = toBooleanValue(mergedProps == null ? void 0 : mergedProps.showViewPin);
   const context = (0, import_useEngineContext.default)();
   const { utils } = context.appHelper || {};
   const { isModalOpen, handleCodeClick, closeModal } = useCodeModal(
@@ -294,6 +307,7 @@ var WalletCard = (props) => {
     onCodeClick,
     codeType
   );
+  console.log("showViewPin", props);
   const backgroundStyle = (0, import_react.useMemo)(() => {
     var _a2;
     if (props.customBackgroundImage) {
@@ -327,6 +341,14 @@ var WalletCard = (props) => {
       }
     });
   };
+  const onViewPinClick = (e) => {
+    e.stopPropagation();
+    if (props == null ? void 0 : props.onViewPinClick) {
+      props.onViewPinClick();
+    } else {
+      console.error("onViewPinClick方法需要传入");
+    }
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -375,7 +397,9 @@ var WalletCard = (props) => {
               cardStyle,
               codeType,
               onCodeClick: handleCodeClick,
-              isLogin
+              isLogin,
+              showViewPin,
+              onViewPinClick
             }
           ),
           /* @__PURE__ */ import_react.default.createElement(

package/lib/components/walletCard/index.less

@@ -106,6 +106,33 @@
           margin-bottom: 0;
         }
       }
+
+      .pisell-wallet-card-header-view-pin {
+        position: relative;
+        color: #53b1fd;
+        cursor: pointer;
+        font-size: 12px;
+        font-weight: 400;
+        display: flex;
+        align-items: center;
+        gap: 4px;
+
+        .pisell-wallet-card-header-view-pin-icon {
+          width: 16px;
+          height: 16px;
+          color: #53b1fd;
+          font-size: 16px;
+        }
+
+        &:after {
+          content: '';
+          position: absolute;
+          top: -5px;
+          left: -5px;
+          right: -5px;
+          bottom: -5px; /* 向外扩展5px */
+        }
+      }
     }
 
     // 头部右侧

package/lib/locales/en-US.js

@@ -169,6 +169,7 @@ var en_US_default = {
   "pisell-adjust-price-discount-can-be-maximum": "Discount can be maximum",
   "pisell-discount-card-title": "Discount",
   "pisell-discount-card-unit": "off",
+  "pisell-discount-card-fixed-amount-prefix": "Save",
   // 数据源表格
   "pisell-data-source-table-add": "Add",
   "pisell-data-source-table-edit": "Edit",
@@ -196,6 +197,7 @@ var en_US_default = {
   "walletCard-done": "Done",
   "walletCard-qrcode": "QR code",
   "walletCard-barcode": "Bar code",
+  "walletCard-viewPin": "View PIN",
   // 上传组件
   "pisell-upload-button": "Upload",
   "pisell-upload-setting-size-error": (maxSize) => `Each file should not exceed ${maxSize}MB in size.`,
@@ -326,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.js

@@ -169,6 +169,7 @@ var zh_CN_default = {
   "pisell-adjust-price-discount-can-be-maximum": "折扣最高可达",
   "pisell-discount-card-title": "折扣",
   "pisell-discount-card-unit": "折扣",
+  "pisell-discount-card-fixed-amount-prefix": "立减",
   "pisell-data-source-table-add": "添加",
   "pisell-data-source-table-edit": "编辑",
   "pisell-data-source-table-detail": "详情",
@@ -195,6 +196,7 @@ var zh_CN_default = {
   "walletCard-done": "完成",
   "walletCard-qrcode": "二维码",
   "walletCard-barcode": "条形码",
+  "walletCard-viewPin": "查看PIN",
   // 上传组件
   "pisell-upload-button": "上传",
   "pisell-upload-setting-size-error": (maxSize) => `每个文件的大小不超过${maxSize}MB`,
@@ -317,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.js

@@ -169,6 +169,7 @@ var zh_TW_default = {
   "pisell-adjust-price-discount-can-be-maximum": "折扣最高可達",
   "pisell-discount-card-title": "折扣",
   "pisell-discount-card-unit": "折扣",
+  "pisell-discount-card-fixed-amount-prefix": "立減",
   // 数据源表格
   "pisell-data-source-table-add": "添加",
   "pisell-data-source-table-edit": "編輯",
@@ -195,6 +196,7 @@ var zh_TW_default = {
   "walletCard-done": "完成",
   "walletCard-qrcode": "二維碼",
   "walletCard-barcode": "條形碼",
+  "walletCard-viewPin": "查看PIN",
   // 上传组件
   "pisell-upload-button": "上傳",
   "pisell-upload-setting-size-error": (maxSize) => `每個文件的大小不超過${maxSize}MB`,
@@ -318,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/index.d.ts

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