@pisell/private-materials 3.2.1 → 3.2.2

package/lib/components/eftpos/form/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/lib/components/eftpos/group/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

package/lib/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/lib/components/eftpos/icon/apiKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/icon/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/receipt/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

package/lib/components/eftpos/surcharge/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 /**
  * @title: 自定义组件设置

package/lib/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/component/alert/warn.d.ts

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

package/lib/components/eftposPay/component/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string | undefined;

package/lib/components/eftposPay/device.d.ts

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "stripe" | "payo" | "windcave">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "loading" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -297,18 +297,18 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | undefined;
+        eftpos?: "tyro" | "stripe" | "payo" | "windcave" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "step" | "unset" | undefined;
+        type?: "unset" | "step" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/eftposPay/tyro/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

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/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

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

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/SDK.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

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

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.d.ts

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

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const SetupForm: ({ onReady, amount, order_id, payment_method, scene, }: any) => JSX.Element;
 export default SetupForm;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

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

package/lib/components/pisellSelectCustomerModal/RightPanel/Add/PhoneField/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const Actor: ({ name }: {
     name: string;
 }) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface InfoProps {
     relation_id: any;
     action: any;

package/lib/components/schedules/calendar/calendarItem.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem } from "../type";
 declare type CalendarItemProps = {
     month: string;

package/lib/components/schedules/components/CurrentDay/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type CurrentDayProps = {
     onClose: () => void;

package/lib/components/schedules/components/ScheduleList/RenderScheduleItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ScheduleItem } from '../../../type';
 declare type Item = any;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const ProductDetail: ({ form, currentProduct, }: {
     form: any;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts

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

package/lib/components/schedules/products/index.d.ts

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

package/lib/components/schedules/resources/relationProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const RelationProduct: ({ value, onChange, }: {
     value?: any;

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

@@ -82,6 +82,7 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
   const [timeLineDetail, setTimeLineDetail] = (0, import_react.useState)({});
   const [wechatModalOpen, setWechatModalOpen] = (0, import_react.useState)(false);
   const [copyUrl, setCopyUrl] = (0, import_react.useState)("");
+  const [isLoading, setIsLoading] = (0, import_react.useState)(false);
   const [apple_wallet_url, setAppleWalletUrl] = (0, import_react.useState)("");
   const [google_wallet_url, setGoogleWalletUrl] = (0, import_react.useState)("");
   const stateTimeUnix = 1723255863;
@@ -142,6 +143,11 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
         label: import_utils.locales.getText("page.wallet.discount"),
         value: balance ? `${Number(balance)}%` : ""
       });
+    } else if (tag === "point_card") {
+      data.splice(2, 0, {
+        label: import_utils.locales.getText("page.wallet.points"),
+        value: balance ? `${balance}` : ""
+      });
     } else {
       data.splice(2, 0, {
         label: import_utils.locales.getText("page.wallet.balance"),
@@ -212,26 +218,33 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
   };
   const getTimeTreeList = async () => {
     var _a2, _b2, _c2, _d2;
-    const { list = [] } = await (0, import_serve.getAssetList)({
-      num: "99",
-      skip: "1",
-      card_id: code,
-      sourceType: tag,
-      tag,
-      business_object: "customer"
-    });
-    let filterList = list.filter(
-      (item) => !!assetActionEnum[item.action || ""]
-    );
-    for (let i = filterList.length - 1; i >= 0; i--) {
-      if (((_a2 = filterList[i]) == null ? void 0 : _a2.action) === "order_expend" && import_dayjs.default.tz((_b2 = filterList[i]) == null ? void 0 : _b2.created_at, timezone2).unix() < stateTimeUnix) {
-        filterList.splice(i, 1);
-      }
-      if (((_c2 = filterList[i]) == null ? void 0 : _c2.tag) === "point_card" && import_dayjs.default.tz((_d2 = filterList[i]) == null ? void 0 : _d2.created_at, timezone2).unix() < stateTimeUnix) {
-        filterList.splice(i, 1);
+    setIsLoading(true);
+    try {
+      const { list = [] } = await (0, import_serve.getAssetList)({
+        num: "99",
+        skip: "1",
+        card_id: code,
+        sourceType: tag,
+        tag,
+        business_object: "customer"
+      });
+      let filterList = list.filter(
+        (item) => !!assetActionEnum[item.action || ""]
+      );
+      for (let i = filterList.length - 1; i >= 0; i--) {
+        if (((_a2 = filterList[i]) == null ? void 0 : _a2.action) === "order_expend" && import_dayjs.default.tz((_b2 = filterList[i]) == null ? void 0 : _b2.created_at, timezone2).unix() < stateTimeUnix) {
+          filterList.splice(i, 1);
+        }
+        if (((_c2 = filterList[i]) == null ? void 0 : _c2.tag) === "point_card" && import_dayjs.default.tz((_d2 = filterList[i]) == null ? void 0 : _d2.created_at, timezone2).unix() < stateTimeUnix) {
+          filterList.splice(i, 1);
+        }
       }
+      setTimeLineData(formatTimeLineDta(filterList));
+    } catch (error) {
+      console.error("Failed to fetch asset list:", error);
+    } finally {
+      setIsLoading(false);
     }
-    setTimeLineData(formatTimeLineDta(filterList));
   };
   (0, import_react.useEffect)(() => {
     if (code) {
@@ -490,8 +503,8 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
   const assetActionEnum = {
     recharge: tag === "point_card" ? import_utils.locales.getText("page.wallet.pointsEarned") : import_utils.locales.getText("page.wallet.recharge"),
     order_expend: tag === "point_card" ? import_utils.locales.getText("page.wallet.pointsRedeemed") : import_utils.locales.getText("page.wallet.spending"),
-    order_refund: "退款",
-    expire: "过期"
+    order_refund: import_utils.locales.getText("page.wallet.refund"),
+    expire: import_utils.locales.getText("page.wallet.expire")
   };
   const handleRecharge = () => {
     if (props.buttonGroupList && props.buttonGroupList[0] && props.buttonGroupList[0][0]) {
@@ -577,7 +590,7 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
               className: "wallet-detail-card-content-section wallet-detail-card-content-section-timeline",
               "data-section": "activityLog"
             },
-            tag !== "product_discount_card" && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-card-content-section-subtitle" }, import_utils.locales.getText("page.wallet.activelog")), TimeLineData.length > 0 ? /* @__PURE__ */ import_react.default.createElement(
+            tag !== "product_discount_card" && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-card-content-section-subtitle" }, import_utils.locales.getText("page.wallet.activelog")), isLoading ? /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-timeline-loading" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Skeleton, { active: true, paragraph: { rows: 6 }, round: true })) : TimeLineData.length > 0 ? /* @__PURE__ */ import_react.default.createElement(
               import_materials.Timeline,
               {
                 items: TimeLineData,

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

@@ -13,6 +13,8 @@ declare const _default: {
         'page.wallet.recharge': string;
         'page.wallet.pointsEarned': string;
         'page.wallet.pointsRedeemed': string;
+        'page.wallet.refund': string;
+        'page.wallet.expire': string;
         'page.wallet.viewOrder': string;
         'page.wallet.done': string;
         'page.wallet.addIos': string;
@@ -34,6 +36,8 @@ declare const _default: {
         'page.wallet.recharge': string;
         'page.wallet.pointsEarned': string;
         'page.wallet.pointsRedeemed': string;
+        'page.wallet.refund': string;
+        'page.wallet.expire': string;
         'page.wallet.viewOrder': string;
         'page.wallet.done': string;
         'page.wallet.addIos': string;
@@ -55,6 +59,8 @@ declare const _default: {
         'page.wallet.recharge': string;
         'page.wallet.pointsEarned': string;
         'page.wallet.pointsRedeemed': string;
+        'page.wallet.refund': string;
+        'page.wallet.expire': string;
         'page.wallet.viewOrder': string;
         'page.wallet.done': string;
         'page.wallet.addIos': string;

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

@@ -40,6 +40,8 @@ var locales_default = {
     "page.wallet.recharge": "Recharge",
     "page.wallet.pointsEarned": "Points Earned",
     "page.wallet.pointsRedeemed": "Points Redeemed",
+    "page.wallet.refund": "Refund",
+    "page.wallet.expire": "Expire",
     "page.wallet.viewOrder": "View order",
     "page.wallet.done": "Done",
     "page.wallet.addIos": "Add to Apple Wallet",
@@ -64,6 +66,8 @@ var locales_default = {
     "page.wallet.recharge": "充值",
     "page.wallet.pointsEarned": "获得积分",
     "page.wallet.pointsRedeemed": "使用积分",
+    "page.wallet.refund": "退款",
+    "page.wallet.expire": "过期",
     "page.wallet.viewOrder": "浏览订单",
     "page.wallet.done": "完成",
     "page.wallet.addIos": "添加到苹果钱包",
@@ -88,6 +92,8 @@ var locales_default = {
     "page.wallet.recharge": "充值",
     "page.wallet.pointsEarned": "獲得積分",
     "page.wallet.pointsRedeemed": "使用積分",
+    "page.wallet.refund": "退款",
+    "page.wallet.expire": "過期",
     "page.wallet.viewOrder": "瀏覽訂單",
     "page.wallet.done": "完成",
     "page.wallet.addIos": "添加到蘋果錢包",

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

@@ -25,7 +25,7 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("./../../../utils");
 var getAssetList = async (params) => {
-  const { data } = await import_utils.request.getRequest().get(`/h5/pay/asset/lowcode/list`, params);
+  const { data } = await import_utils.request.getRequest().get(`/h5/pay/asset/lowcode/list`, params, { abort: true });
   return data;
 };
 var getDetailApi = async (params) => {

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

@@ -59,7 +59,8 @@ var FooterButtons = ({
             disabled,
             size: "large",
             className: "wallet-footer-buttons-item wallet-footer-buttons-item-primary"
-          }
+          },
+          import_utils.locales.getText("page.wallet.button.add")
         ));
       case "detail":
         const buttons = [];

package/lib/components/wallet/index.js

@@ -451,6 +451,7 @@ var Wallet = (0, import_model.Provider)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellWalletPassCard,
       {
+        balanceTitle: global_wallet.currentTag === "point_card" ? import_utils.locales.getText("page.wallet.points") : void 0,
         showDetail: false,
         showRedeem: false,
         showQrCode: false,
@@ -459,7 +460,7 @@ var Wallet = (0, import_model.Provider)(() => {
         showDisabledReason: !isEnabled,
         disabledReason: title,
         propStyle: { marginBottom: 10 },
-        showBalanceSymbol: true,
+        showBalanceSymbol: global_wallet.currentTag !== "point_card",
         showBalance: global_wallet.currentTag !== "product_discount_card",
         active: isActive,
         name: product_name,

package/lib/components/wallet/locales.js

@@ -27,7 +27,7 @@ var locales_default = {
     // English translations
     "page.wallet.rechargeableCard": "Rechargeable card",
     "page.wallet.voucher": "Voucher",
-    "page.wallet.pointCard": "Points card",
+    "page.wallet.pointCard": "Points",
     "page.wallet.discountCard": "Discount card",
     "page.wallet.unavailable": "Unavailable",
     "page.wallet.available": "Available",

package/lib/components/walletList/index.less

@@ -281,7 +281,6 @@
       border-radius: 50%;
       background-color: #F2F4F7;
       margin: 0 8px;
-      cursor: pointer;
       transition: all 0.3s ease;
 
       &.active {

package/lib/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.2.1",
     "@pisell/icon": "0.0.11",
+    "@pisell/materials": "3.2.2",
     "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {