@pisell/private-materials 3.2.3 → 3.2.5

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

@@ -284,11 +284,11 @@ var RechargeableCard = (0, import_model.Provider)(
       };
       openDetail(detailWithButtons);
     };
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, isEmpty ? /* @__PURE__ */ import_react.default.createElement(import_materials.PisellEmpty, null) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, platform !== "pc" && /* @__PURE__ */ import_react.default.createElement(Title, { className: "wallet-rechargeableCard-title" }, import_utils.locales.getText("page.wallet.rechargeableCard")), /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, platform !== "pc" && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-rechargeableCard-title" }, import_utils.locales.getText("page.wallet.rechargeableCard")), isEmpty ? /* @__PURE__ */ import_react.default.createElement(import_materials.PisellEmpty, null) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
       import_materials.CardMetricItem,
       {
         title: import_utils.locales.getText("page.wallet.cardBalance"),
-        style: { margin: "8px 0 24px" },
+        style: { marginBottom: 24 },
         hint: false,
         tags: false,
         number: (state == null ? void 0 : state.total) || 0
@@ -305,7 +305,7 @@ var RechargeableCard = (0, import_model.Provider)(
         modalWrapStyle: {
           overflowY: "auto",
           top: 0,
-          height: "100vh",
+          height: "100%",
           zIndex: 998,
           position: "fixed",
           left: 0,

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

@@ -1,4 +1,4 @@
-.wallet-recharge {
+.wallet-rechargeableCard {
   // 充值选项容器
   &-options {
     // 卡片项
@@ -78,14 +78,13 @@
   // 充值卡标题
   &-title {
     color: var(--Gray-900, #101828);
-
-    /* Text xl/Semibold */
     font-family: Inter;
     font-size: 20px;
     font-style: normal;
     font-weight: 600;
-    line-height: 30px; /* 150% */
-    margin: 20px 0;
+    line-height: 30px;
+    margin-top: 20px;
+    margin-bottom: 24px;
   }
 
   // 钱包卡片样式

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

@@ -125,7 +125,7 @@ var Voucher = (0, import_model.Provider)((props) => {
       modalWrapStyle: {
         overflowY: "auto",
         top: 68,
-        height: "calc(100vh - 68px)",
+        height: "calc(100% - 68px)",
         zIndex: 998
       },
       pcDetailModalDisplay: platform === "h5" ? true : false,

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

@@ -1,11 +1,10 @@
 .wallet-voucher-title {
   color: var(--Gray-900, #101828);
-
-  /* Text xl/Semibold */
   font-family: Inter;
   font-size: 20px;
   font-style: normal;
   font-weight: 600;
-  line-height: 30px; /* 150% */
-  margin: 20px 0;
+  line-height: 30px;
+  margin-top: 20px;
+  margin-bottom: 24px;
 }

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

@@ -33,14 +33,15 @@ __export(WalletBar_exports, {
 });
 module.exports = __toCommonJS(WalletBar_exports);
 var import_react = __toESM(require("react"));
-var import_icons = require("@ant-design/icons");
+var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
 var WalletBar = ({ setup, onBack }) => {
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-bar" }, /* @__PURE__ */ import_react.default.createElement(
-    import_icons.LeftOutlined,
+    import_materials.Iconfont,
     {
       onClick: onBack,
+      type: "pisell2-chevron-left",
       className: "pisell-lowcode-wallet-header-bar-arrow"
     }
   ), /* @__PURE__ */ import_react.default.createElement("span", { className: "header-title" }, setup === "detail" ? import_utils.locales.getText("page.wallet.details") : ""));

package/lib/components/wallet/index.js

@@ -476,11 +476,12 @@ var Wallet = (0, import_model.Provider)(() => {
   const getAddModalClassName = () => {
     return addModalOpen ? "wallet-add-modal" : "pisell-lowcode__wallet__addModal";
   };
-  return /* @__PURE__ */ import_react.default.createElement(import_DetailContext.DetailProvider, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-container" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Page, null, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_DetailContext.DetailProvider, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-container", style: { height: "100%" } }, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-lowcode-wallet",
       style: {
+        height: platform === "pc" ? "auto" : "100%",
         width: platform === "pc" ? 960 : "100vw",
         padding: platform === "pc" ? 20 : 0
       }
@@ -525,7 +526,7 @@ var Wallet = (0, import_model.Provider)(() => {
         }
       }
     ), searchList.map((item) => renderSearchCard(item)))
-  ))));
+  )));
 });
 var wallet_default = Wallet;
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/wallet/index.less

@@ -34,7 +34,7 @@
 
   .pisell-lowcode-wallet-mobile {
     display: flex;
-    height: 100vh;
+    height: 100%;
     width: 100vw;
     flex-direction: column;
     background-color: #fff;
@@ -63,8 +63,8 @@
       .pisell-lowcode-wallet-header-bar-arrow {
         position: absolute;
         font-size: 24px;
-        top: 24px;
-        left: 24px;
+        top: 22px;
+        left: 22px;
       }
     }
 
@@ -88,6 +88,12 @@
         border-right: none;
       }
       .pisell-lowcode-wallet-title {
+        color: var(--Gray-900, #101828);
+        font-family: Inter;
+        font-size: 30px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 38px;
         margin: 20px 0;
       }
 

package/lib/components/walletList/index.js

@@ -42,8 +42,25 @@ var import_utils = require("@pisell/utils");
 var import_utils2 = require("./../../utils");
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
-var import_antd = require("antd");
 var import_types = require("./types");
+var STORAGE_KEY = "pisell_wallet_list_data";
+var STORAGE_KEY_BALANCE = "pisell_wallet_balance_data";
+var saveToLocalStorage = (key, data) => {
+  try {
+    localStorage.setItem(key, JSON.stringify(data));
+  } catch (error) {
+    console.error("Error saving to localStorage:", error);
+  }
+};
+var getFromLocalStorage = (key) => {
+  try {
+    const data = localStorage.getItem(key);
+    return data ? JSON.parse(data) : null;
+  } catch (error) {
+    console.error("Error reading from localStorage:", error);
+    return null;
+  }
+};
 var getLocalizedName = (name, translateLocale) => {
   if (!name) return "";
   return name[translateLocale || "en"] || name.original || "";
@@ -55,7 +72,7 @@ var DEFAULT_WALLET_CARD = {
     name: "Store name"
   },
   isLogin: false,
-  showIcon: false,
+  showIcon: true,
   icon: "",
   wallet: {
     name: {
@@ -230,14 +247,29 @@ var WalletList = (0, import_model.Provider)((props) => {
       return;
     }
     if (hasAttempted) return;
-    setState({ loading: true, error: null });
+    const cachedList = getFromLocalStorage(STORAGE_KEY);
+    const cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
+    if (cachedList && cachedBalance) {
+      setState({
+        list: cachedList,
+        balance: cachedBalance,
+        loading: false,
+        hasAttempted: false
+      });
+    }
     try {
       if (!isMountedRef.current) return;
       const [walletListData, walletBalanceData] = await Promise.all([
-        (0, import_serve.getWalletList)({}),
+        (0, import_serve.getWalletList)(),
         (0, import_serve.getWalletBalance)()
       ]);
       if (!isMountedRef.current || requestIdRef.current !== requestId) return;
+      if (walletListData && walletListData.length > 0) {
+        saveToLocalStorage(STORAGE_KEY, walletListData);
+      }
+      if (walletBalanceData) {
+        saveToLocalStorage(STORAGE_KEY_BALANCE, walletBalanceData);
+      }
       if (!walletBalanceData || Array.isArray(walletListData) && walletListData.length === 0) {
         setTimeout(async () => {
           if (!isMountedRef.current || requestIdRef.current !== requestId) return;
@@ -246,14 +278,19 @@ var WalletList = (0, import_model.Provider)((props) => {
             let retryListData = walletListData;
             if (!walletBalanceData) {
               retryBalanceData = await (0, import_serve.getWalletBalance)();
+              if (retryBalanceData) {
+                saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
+              }
             }
             if (Array.isArray(walletListData) && walletListData.length === 0) {
               retryListData = await (0, import_serve.getWalletList)({});
+              if (retryListData && retryListData.length > 0) {
+                saveToLocalStorage(STORAGE_KEY, retryListData);
+              }
             }
             setState({
               list: retryListData || [],
               balance: retryBalanceData,
-              // 使用重试后的结果
               loading: false,
               hasAttempted: true
             });
@@ -323,6 +360,7 @@ var WalletList = (0, import_model.Provider)((props) => {
       // 再应用globalState作为兜底
       ...globalState,
       // 最后应用API返回的数据，这些拥有最高优先级
+      iconImg: icon,
       symbol,
       cardNo: code,
       walletName: getLocalizedName(name, (_a2 = dvaStore == null ? void 0 : dvaStore.core) == null ? void 0 : _a2.translateLocale),
@@ -395,21 +433,6 @@ var WalletList = (0, import_model.Provider)((props) => {
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-balance-card", key: balance.id }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-title" }, balance.name), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-value" }, balance.value)), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-content" }, balance.items && balance.items.map((item) => /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item", key: item.key }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-label" }, item.label), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-value" }, item.value)))));
   }, []);
   const renderContent = () => {
-    if (loading) {
-      return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-list-container pisell-wallet-skeleton" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-card-skeleton" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { active: true, paragraph: { rows: 6 } }), /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-card-code-skeleton" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton.Button, { active: true, style: { width: "80%", height: 50 } })))), /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-navigation-skeleton" }, /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Skeleton.Button,
-        {
-          active: true,
-          style: { width: 40, height: 40, borderRadius: "50%" }
-        }
-      ), /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-dots-container-skeleton" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton.Button, { active: true, style: { width: 80, height: 20 } })), /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Skeleton.Button,
-        {
-          active: true,
-          style: { width: 40, height: 40, borderRadius: "50%" }
-        }
-      )));
-    }
     if (list.length === 0) {
       return null;
     }

package/lib/components/walletList/serve.d.ts

@@ -1,14 +1,10 @@
-import { WalletPass, WalletBalance, IWallList } from './types';
+import { WalletPass, WalletBalance } from './types';
 /**
  * 获取 wallet 列表
  * @param params
  * @returns
  */
-export declare const getWalletList: (params: IWallList) => Promise<WalletPass[]>;
-/**
- * 获取wallet pass 余额
- */
-export declare const getWalletPassBalance: (params?: Record<string, any>) => Promise<WalletBalance | null>;
+export declare const getWalletList: () => Promise<WalletPass[]>;
 /**
  * 获取钱包余额
  * @returns

package/lib/components/walletList/serve.js

@@ -20,27 +20,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   getWalletBalance: () => getWalletBalance,
-  getWalletList: () => getWalletList,
-  getWalletPassBalance: () => getWalletPassBalance
+  getWalletList: () => getWalletList
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("./../../utils");
-var getWalletList = async (params) => {
+var getWalletList = async () => {
   try {
-    const { data } = await import_utils.request.getRequest().get("/h5/wallet", params);
+    const { data } = await import_utils.request.getRequest().get("/h5/wallet", {});
     return data || [];
   } catch (error) {
     return [];
   }
 };
-var getWalletPassBalance = async (params = {}) => {
-  try {
-    const { data } = await import_utils.request.getRequest().get(`/h5/wallet/wallet-pass/balance`, params);
-    return data || null;
-  } catch (error) {
-    return null;
-  }
-};
 var getWalletBalance = async () => {
   try {
     const { data } = await import_utils.request.getRequest().get("/h5/wallet/wallet-pass/balance", {});
@@ -52,6 +43,5 @@ var getWalletBalance = async () => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getWalletBalance,
-  getWalletList,
-  getWalletPassBalance
+  getWalletList
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "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.3",
+    "@pisell/utils": "1.0.42",
+    "@pisell/materials": "3.2.5",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.100",
-    "@pisell/utils": "1.0.42"
+    "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {
     "react": "^18.0.0",