@pisell/private-materials 3.2.6 → 3.2.7

package/lib/components/eftposPay/store/index.d.ts

@@ -297,8 +297,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "tyro" | "payo" | "windcave" | "stripe" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface LoginProps {
     title: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import { CustomerCardProps } from './CustomerCard';
 import './index.less';

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

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

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

package/lib/components/wallet/Detail/index.d.ts

@@ -1,5 +1,19 @@
 import React from 'react';
 import './index.less';
+declare global {
+    interface Window {
+        PKPass?: any;
+        GoogleWalletPass?: any;
+    }
+    interface Navigator {
+        pkpass?: {
+            addPass(pass: any): Promise<string>;
+        };
+        googlewallet?: {
+            addPass(pass: any): Promise<string>;
+        };
+    }
+}
 interface DetailProps {
     detail: {
         id?: string;

package/lib/components/wallet/Detail/index.js

@@ -246,24 +246,79 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
       getTimeTreeList();
     }
   }, [code]);
-  const onAppleClick = () => {
+  const addWalletPass = async (url, type) => {
+    if (!url) return;
     if (isWechat()) {
       setWechatModalOpen(true);
-      setCopyUrl(apple_wallet_url);
+      setCopyUrl(url);
       return;
     }
-    window.open(apple_wallet_url, "_blank");
-  };
-  const onGoogleClick = () => {
-    if (isWechat()) {
-      setWechatModalOpen(true);
-      setCopyUrl(google_wallet_url);
-      return;
-    }
-    if (google_wallet_url) {
-      window.open(google_wallet_url);
+    console.log(
+      "%c [ window.PKPass ]-395",
+      "font-size:13px; color:#bf2c9f;",
+      window.PKPass
+    );
+    console.log(
+      "%c [ navigator.pkpass ]-396",
+      "font-size:13px; color:#bf2c9f;",
+      navigator.pkpass
+    );
+    if (type === "apple") {
+      try {
+        const response = await fetch("/generate-pass");
+        alert(response);
+        console.log(
+          "%c [ response ]-400",
+          "font-size:13px; color:#bf2c9f;",
+          response
+        );
+        const passData = await response.arrayBuffer();
+        console.log(
+          "%c [ passData ]-402",
+          "font-size:13px; color:#bf2c9f;",
+          passData
+        );
+        console.log(
+          "%c [ window.PKPass ]-404",
+          "font-size:13px; color:#bf2c9f;",
+          window.PKPass
+        );
+        alert(window.PKPass + "window.PKPass");
+        alert(navigator.pkpass + "navigator.pkpass");
+        if (window.PKPass && navigator.pkpass) {
+          const pass = new window.PKPass(passData);
+          const result = await navigator.pkpass.addPass(pass);
+          if (result === "added") {
+            console.log("Pass 添加成功！");
+            window.dispatchEvent(new CustomEvent("passAdded"));
+          } else {
+            console.log("用户取消了操作");
+          }
+        } else {
+          alert("浏览器不支持 Web PKI");
+          const blob = new Blob([passData], {
+            type: "application/vnd.apple.pkpass"
+          });
+          const url2 = URL.createObjectURL(blob);
+          const a = document.createElement("a");
+          alert(url2 + "url");
+          a.href = url2;
+          a.download = "pass.pkpass";
+          a.click();
+          URL.revokeObjectURL(url2);
+        }
+      } catch (error) {
+        console.error("添加失败:", error);
+      }
+    } else {
     }
   };
+  const onAppleClick = async () => {
+    await addWalletPass(apple_wallet_url, "apple");
+  };
+  const onGoogleClick = async () => {
+    await addWalletPass(google_wallet_url, "google");
+  };
   const isWechat = () => {
     return /MicroMessenger/i.test(window.navigator.userAgent);
   };

package/lib/components/wallet/components/FooterButtons/index.less

@@ -11,7 +11,9 @@
     display: flex;
     gap: 12px;
     width: 100%;
-    
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
     // 按钮数量样式
     // 单个按钮占满宽度
     &-count-1 {

package/lib/components/walletList/index.js

@@ -45,16 +45,35 @@ var import_classnames = __toESM(require("classnames"));
 var import_types = require("./types");
 var STORAGE_KEY = "pisell_wallet_list_data";
 var STORAGE_KEY_BALANCE = "pisell_wallet_balance_data";
+var safeLocalStorage = {
+  getItem: (key) => {
+    try {
+      return typeof localStorage !== "undefined" ? localStorage.getItem(key) : null;
+    } catch (error) {
+      console.error("Error accessing localStorage:", error);
+      return null;
+    }
+  },
+  setItem: (key, value) => {
+    try {
+      if (typeof localStorage !== "undefined") {
+        localStorage.setItem(key, value);
+      }
+    } catch (error) {
+      console.error("Error writing to localStorage:", error);
+    }
+  }
+};
 var saveToLocalStorage = (key, data) => {
   try {
-    localStorage.setItem(key, JSON.stringify(data));
+    safeLocalStorage.setItem(key, JSON.stringify(data));
   } catch (error) {
     console.error("Error saving to localStorage:", error);
   }
 };
 var getFromLocalStorage = (key) => {
   try {
-    const data = localStorage.getItem(key);
+    const data = safeLocalStorage.getItem(key);
     return data ? JSON.parse(data) : null;
   } catch (error) {
     console.error("Error reading from localStorage:", error);
@@ -117,7 +136,6 @@ var WalletList = (0, import_model.Provider)((props) => {
   }, [store]);
   const {
     list = [],
-    loading,
     error,
     authError,
     hasAttempted,
@@ -129,6 +147,7 @@ var WalletList = (0, import_model.Provider)((props) => {
     }
   }, [utils == null ? void 0 : utils.request]);
   (0, import_react.useEffect)(() => {
+    console.log("%c [  ]-221", "font-size:13px; color:#bf2c9f;", 22121212);
     return () => {
       isMountedRef.current = false;
       requestIdRef.current = "";
@@ -141,7 +160,6 @@ var WalletList = (0, import_model.Provider)((props) => {
         setState({
           list: [DEFAULT_WALLET_CARD],
           balance: DEFAULT_BALANCE,
-          loading: false,
           hasAttempted: true,
           isLoggedIn: false
         });
@@ -240,20 +258,24 @@ var WalletList = (0, import_model.Provider)((props) => {
       setState({
         list: [DEFAULT_WALLET_CARD],
         balance: DEFAULT_BALANCE,
-        loading: false,
         hasAttempted: true,
         isLoggedIn: false
       });
       return;
     }
     if (hasAttempted) return;
-    const cachedList = getFromLocalStorage(STORAGE_KEY);
-    const cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
+    let cachedList = null;
+    let cachedBalance = null;
+    try {
+      cachedList = getFromLocalStorage(STORAGE_KEY);
+      cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
+    } catch (e) {
+      console.error("Error fetching from localStorage:", e);
+    }
     if (cachedList && cachedBalance) {
       setState({
         list: cachedList,
         balance: cachedBalance,
-        loading: false,
         hasAttempted: false
       });
     }
@@ -265,10 +287,18 @@ var WalletList = (0, import_model.Provider)((props) => {
       ]);
       if (!isMountedRef.current || requestIdRef.current !== requestId) return;
       if (walletListData && walletListData.length > 0) {
-        saveToLocalStorage(STORAGE_KEY, walletListData);
+        try {
+          saveToLocalStorage(STORAGE_KEY, walletListData);
+        } catch (e) {
+          console.error("Error saving wallet list to localStorage:", e);
+        }
       }
       if (walletBalanceData) {
-        saveToLocalStorage(STORAGE_KEY_BALANCE, walletBalanceData);
+        try {
+          saveToLocalStorage(STORAGE_KEY_BALANCE, walletBalanceData);
+        } catch (e) {
+          console.error("Error saving wallet balance to localStorage:", e);
+        }
       }
       if (!walletBalanceData || Array.isArray(walletListData) && walletListData.length === 0) {
         setTimeout(async () => {
@@ -279,26 +309,32 @@ var WalletList = (0, import_model.Provider)((props) => {
             if (!walletBalanceData) {
               retryBalanceData = await (0, import_serve.getWalletBalance)();
               if (retryBalanceData) {
-                saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
+                try {
+                  saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
+                } catch (e) {
+                  console.error("Error saving retry balance to localStorage:", e);
+                }
               }
             }
             if (Array.isArray(walletListData) && walletListData.length === 0) {
               retryListData = await (0, import_serve.getWalletList)({});
               if (retryListData && retryListData.length > 0) {
-                saveToLocalStorage(STORAGE_KEY, retryListData);
+                try {
+                  saveToLocalStorage(STORAGE_KEY, retryListData);
+                } catch (e) {
+                  console.error("Error saving retry list to localStorage:", e);
+                }
               }
             }
             setState({
               list: retryListData || [],
               balance: retryBalanceData,
-              loading: false,
               hasAttempted: true
             });
           } catch (retryErr) {
             setState({
               list: walletListData || [],
               balance: walletBalanceData,
-              loading: false,
               hasAttempted: true
             });
           }
@@ -307,7 +343,6 @@ var WalletList = (0, import_model.Provider)((props) => {
         setState({
           list: walletListData || [],
           balance: walletBalanceData,
-          loading: false,
           hasAttempted: true
         });
       }
@@ -315,7 +350,6 @@ var WalletList = (0, import_model.Provider)((props) => {
       if (!isMountedRef.current || requestIdRef.current !== requestId) return;
       const isAuthError = (err == null ? void 0 : err.code) === 4001 || ((_a2 = err == null ? void 0 : err.message) == null ? void 0 : _a2.includes("login time out")) || ((_b2 = err == null ? void 0 : err.data) == null ? void 0 : _b2.code) === 4001;
       setState({
-        loading: false,
         error: err instanceof Error ? err : new Error("加载失败"),
         authError: isAuthError,
         hasAttempted: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/materials": "3.2.6",
+    "@pisell/utils": "1.0.42",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "1.0.100",
-    "@pisell/utils": "1.0.42"
+    "@pisell/materials": "3.2.7"
   },
   "peerDependencies": {
     "react": "^18.0.0",