@pisell/private-materials 3.3.55 → 3.3.56

package/lib/components/ticketBooking/locales.d.ts

@@ -47,6 +47,7 @@ declare const _default: {
         "pisell2.ticket-booking.add-to-cart": string;
         "pisell2.ticket-booking.not-available-title": string;
         "pisell2.ticket-booking.not-available-ok": string;
+        "pisell2.ticket-booking.in-cart": (number: number) => string;
     };
     "zh-CN": {
         "pisell2.ticket-booking.info": string;
@@ -96,6 +97,7 @@ declare const _default: {
         "pisell2.ticket-booking.add-to-cart": string;
         "pisell2.ticket-booking.not-available-title": string;
         "pisell2.ticket-booking.not-available-ok": string;
+        "pisell2.ticket-booking.in-cart": (number: number) => string;
     };
     "zh-HK": {
         "pisell2.ticket-booking.info": string;
@@ -145,6 +147,7 @@ declare const _default: {
         "pisell2.ticket-booking.add-to-cart": string;
         "pisell2.ticket-booking.not-available-title": string;
         "pisell2.ticket-booking.not-available-ok": string;
+        "pisell2.ticket-booking.in-cart": (number: number) => string;
     };
 };
 export default _default;

package/lib/components/ticketBooking/locales.js

@@ -70,7 +70,8 @@ var locales_default = {
     "pisell2.ticket-booking.create-new": "Create new",
     "pisell2.ticket-booking.add-to-cart": "Added to Cart",
     "pisell2.ticket-booking.not-available-title": "Sorry, Not available at current time.",
-    "pisell2.ticket-booking.not-available-ok": "OK"
+    "pisell2.ticket-booking.not-available-ok": "OK",
+    "pisell2.ticket-booking.in-cart": (number) => `${number} in cart`
   },
   "zh-CN": {
     "pisell2.ticket-booking.info": "信息",
@@ -119,7 +120,8 @@ var locales_default = {
     "pisell2.ticket-booking.create-new": "新建",
     "pisell2.ticket-booking.add-to-cart": "已加入购物车",
     "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售时间。",
-    "pisell2.ticket-booking.not-available-ok": "好的"
+    "pisell2.ticket-booking.not-available-ok": "好的",
+    "pisell2.ticket-booking.in-cart": (number) => `已有${number}件`
   },
   "zh-HK": {
     "pisell2.ticket-booking.info": "資訊",
@@ -168,6 +170,7 @@ var locales_default = {
     "pisell2.ticket-booking.create-new": "新建",
     "pisell2.ticket-booking.add-to-cart": "已加入购物车",
     "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售時間。",
-    "pisell2.ticket-booking.not-available-ok": "好的"
+    "pisell2.ticket-booking.not-available-ok": "好的",
+    "pisell2.ticket-booking.in-cart": (number) => `已有${number}件`
   }
 };

package/lib/components/ticketBooking/utils/index.d.ts

@@ -12,4 +12,8 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
-export declare const addService: (list: any[], addItem: any) => any[];
+export declare const addService: (list: any[], addItem: any) => {
+    list: any[];
+    quantity: any;
+};
+export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;

package/lib/components/ticketBooking/utils/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   addService: () => addService,
+  addServiceScroll: () => addServiceScroll,
   formatBookingList: () => formatBookingList,
   formatDateToStr: () => formatDateToStr,
   getDefaultStartParam: () => getDefaultStartParam,
@@ -128,19 +129,27 @@ var isSameProduct = (a, b) => {
 };
 var addService = (list, addItem) => {
   let value = list;
+  let count;
   if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem)) {
     value.push(addItem);
+    count = addItem._extend.quantity;
   } else {
     let isNotSame = true;
     value = list.map((item) => {
-      var _a, _b;
+      var _a, _b, _c;
       if (isSameProduct(item, addItem)) {
         isNotSame = false;
+        const quantity = (((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1);
+        count = quantity;
         return {
           ...item,
           _extend: {
             ...item._extend,
-            quantity: (((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1)
+            quantity,
+            other: {
+              ...((_c = item._extend) == null ? void 0 : _c.other) || {},
+              quantity
+            }
           }
         };
       }
@@ -148,13 +157,36 @@ var addService = (list, addItem) => {
     });
     if (isNotSame) {
       value.push(addItem);
+      count = addItem._extend.quantity;
     }
   }
-  return value;
+  return { list: value, quantity: count };
+};
+var addServiceScroll = (rowKey, cacheItem) => {
+  const list = document.querySelectorAll(`#rowKey-${rowKey}`);
+  setTimeout(() => {
+    if (list.length && (0, import_utils.isNormalProductByDurationSchedule)(cacheItem)) {
+      list[list.length - 1].scrollIntoView({
+        behavior: "smooth",
+        block: "center"
+      });
+    } else {
+      setTimeout(() => {
+        const bookingWrap = document.querySelectorAll(`.booking-info-warp`);
+        if (bookingWrap.length) {
+          bookingWrap[0].scrollTo({
+            top: 99999,
+            behavior: "smooth"
+          });
+        }
+      }, 100);
+    }
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addService,
+  addServiceScroll,
   formatBookingList,
   formatDateToStr,
   getDefaultStartParam,

package/lib/components/wallet/index.js

@@ -239,9 +239,21 @@ var Wallet = (0, import_model.Provider)(() => {
     ]
   };
   const menuItem = ({ count = 0, title = "" }) => /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-menu-item" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode-wallet-menu-title" }, title), count > 0 && /* @__PURE__ */ import_react.default.createElement(import_materials.Badge, { styleType: "default", count })), /* @__PURE__ */ import_react.default.createElement(import_icons.RightOutlined, null));
+  const mergeSearch = (currentSearch, params) => {
+    const searchParams = new URLSearchParams(currentSearch);
+    Object.entries(params).forEach(([key, value]) => {
+      searchParams.set(key, value);
+    });
+    return searchParams.toString();
+  };
   const MenuProps = {
     className: "pisell-lowcode-wallet-menu",
     onClick: (e) => {
+      var _a2, _b2;
+      (_b2 = (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history) == null ? void 0 : _b2.push({
+        hash: location.hash,
+        search: mergeSearch(location.search, { type: "list" })
+      });
       dispatch({
         type: "setState",
         payload: {
@@ -286,12 +298,22 @@ var Wallet = (0, import_model.Provider)(() => {
       }
     ]
   };
+  (0, import_react.useEffect)(() => {
+    const searchParams = new URLSearchParams(location.search);
+    const type = searchParams.get("type");
+    if (type) {
+      dispatch({ type: "setState", payload: { setup: type } });
+    } else {
+      dispatch({ type: "setState", payload: { setup: "menu" } });
+    }
+  }, [location.search]);
   const onBack = () => {
     if (setup === "menu") {
       history.back();
     } else {
       const prevSetup = setup === "detail" ? "list" : "menu";
       dispatch({ type: "setState", payload: { setup: prevSetup } });
+      history.back();
     }
   };
   const openAddModal = () => {
@@ -424,7 +446,10 @@ var Wallet = (0, import_model.Provider)(() => {
     }
     return null;
   };
-  const renderMobileLayout = () => /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-mobile" }, /* @__PURE__ */ import_react.default.createElement(import_WalletBar.default, { setup, onBack }), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-content" }, renderMobileContent()), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-footer" }, renderMobileFooter()));
+  const renderMobileLayout = () => {
+    var _a2, _b2, _c2;
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-mobile" }, !((_c2 = (_b2 = (_a2 = utils == null ? void 0 : utils.interaction) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.isAppEnv) == null ? void 0 : _c2.call(_b2)) && /* @__PURE__ */ import_react.default.createElement(import_WalletBar.default, { setup, onBack }), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-content" }, renderMobileContent()), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-footer" }, renderMobileFooter()));
+  };
   const renderSearchCard = (item) => {
     const {
       id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.55",
+  "version": "3.3.56",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,8 +59,8 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
+    "@pisell/materials": "3.3.22",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.3.18",
     "@pisell/date-picker": "3.0.2",
     "@pisell/icon": "0.0.11"
   },

package/es/components/booking/info2/service/editService/Resources/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import './index.less';
-declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export default _default;

package/lib/components/booking/info2/service/editService/Resources/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import './index.less';
-declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export default _default;