@pisell/private-materials 6.6.59 → 6.6.60

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

@@ -63,24 +63,6 @@ var import_ahooks2 = require("ahooks");
 var import_context = require("../../context");
 var import_IsActiveContext = require("../../context/IsActiveContext");
 var import_useShopDiscountModule = require("../../hooks/pisellos/useShopDiscountModule");
-var MEM_STATS_KEY = "__pisellTicketBookingMemStats";
-var getMemStats = () => {
-  const g = globalThis;
-  if (!g[MEM_STATS_KEY]) {
-    g[MEM_STATS_KEY] = {
-      mountedAt: Date.now(),
-      storeCreateCount: 0,
-      intervalDateSetCount: 0,
-      intervalDateTickCount: 0,
-      postCartUpdateCount: 0,
-      postCartUpdateBytes: 0,
-      lastHeartbeatHeapMB: 0,
-      crossedThresholdsMB: []
-    };
-  }
-  return g[MEM_STATS_KEY];
-};
-var HEAP_CROSS_THRESHOLDS_MB = [800, 1200, 1500, 2e3, 2500];
 var _formatBookingDetail = (data, modalState) => {
   var _a, _b, _c, _d;
   let {
@@ -281,8 +263,6 @@ var TicketBooking = (props) => {
   const Toast = (0, import_materials.useToast)();
   const _persistentRef = (0, import_react.useRef)(false);
   const _initStateRef = (0, import_react.useRef)({});
-  const _memStateRef = (0, import_react.useRef)(null);
-  _memStateRef.current = state;
   const _listTimerRef = (0, import_react.useRef)();
   const _timerRef = (0, import_react.useRef)();
   const _callbackFnRef = (0, import_react.useRef)();
@@ -464,79 +444,6 @@ var TicketBooking = (props) => {
       if (_listTimerRef.current) clearInterval(_listTimerRef.current);
     };
   }, []);
-  (0, import_react.useEffect)(() => {
-    const stats = getMemStats();
-    if (!stats.mountedAt || Date.now() - stats.mountedAt > 24 * 60 * 60 * 1e3) {
-      stats.mountedAt = Date.now();
-      stats.crossedThresholdsMB = [];
-    }
-    const buildPayload = (extra) => {
-      var _a2, _b2, _c2, _d2, _e2, _f, _g, _h, _i;
-      const s = _memStateRef.current || {};
-      const perfMem = performance.memory || {};
-      const shopId = ((_d2 = (_c2 = (_b2 = (_a2 = store == null ? void 0 : store.getState) == null ? void 0 : _a2.call(store)) == null ? void 0 : _b2.global) == null ? void 0 : _c2.globalConfig) == null ? void 0 : _d2.id) ?? "";
-      const jsHeapUsedMB = perfMem.usedJSHeapSize ? +(perfMem.usedJSHeapSize / 1024 / 1024).toFixed(2) : -1;
-      const jsHeapTotalMB = perfMem.totalJSHeapSize ? +(perfMem.totalJSHeapSize / 1024 / 1024).toFixed(2) : -1;
-      const jsHeapLimitMB = perfMem.jsHeapSizeLimit ? +(perfMem.jsHeapSizeLimit / 1024 / 1024).toFixed(2) : -1;
-      const payload = {
-        page_alive_sec: Math.round((Date.now() - stats.mountedAt) / 1e3),
-        shop_id: shopId,
-        url: typeof location !== "undefined" ? location.href.slice(0, 200) : "",
-        js_heap_used_mb: jsHeapUsedMB,
-        js_heap_total_mb: jsHeapTotalMB,
-        js_heap_limit_mb: jsHeapLimitMB,
-        dom_nodes_count: typeof document !== "undefined" ? document.getElementsByTagName("*").length : -1,
-        cart_items_count: ((_g = (_f = (_e2 = s == null ? void 0 : s.modalState) == null ? void 0 : _e2.service) == null ? void 0 : _f.value) == null ? void 0 : _g.length) ?? 0,
-        booking_list_count: ((_i = (_h = s == null ? void 0 : s.list) == null ? void 0 : _h.bookingList) == null ? void 0 : _i.length) ?? 0,
-        modal_open: !!(s == null ? void 0 : s.open),
-        booking_id: (s == null ? void 0 : s.bookingId) ?? 0,
-        board_config_loaded: !!(s == null ? void 0 : s.bookingConfig),
-        store_create_count: stats.storeCreateCount,
-        interval_date_set_count: stats.intervalDateSetCount,
-        interval_date_tick_count: stats.intervalDateTickCount,
-        post_cart_update_count: stats.postCartUpdateCount,
-        post_cart_update_mb: +(stats.postCartUpdateBytes / 1024 / 1024).toFixed(2),
-        ua: typeof navigator !== "undefined" ? navigator.userAgent.slice(0, 120) : ""
-      };
-      if (extra) Object.assign(payload, extra);
-      return payload;
-    };
-    const doSend = (title, extra) => {
-      try {
-        const payload = buildPayload(extra);
-        (0, import_utils.sendWarningLog)({
-          title,
-          content: Object.entries(payload).map(([key, value]) => ({
-            key,
-            value: String(value ?? "")
-          }))
-        });
-      } catch (e) {
-      }
-    };
-    doSend("TicketBookingMemHeartbeat", { reason: "mounted" });
-    const heartbeatTimer = setInterval(() => {
-      const perfMem = performance.memory || {};
-      const heapMB = perfMem.usedJSHeapSize ? perfMem.usedJSHeapSize / 1024 / 1024 : -1;
-      stats.lastHeartbeatHeapMB = heapMB;
-      doSend("TicketBookingMemHeartbeat", { reason: "heartbeat" });
-      if (heapMB > 0) {
-        for (const th of HEAP_CROSS_THRESHOLDS_MB) {
-          if (heapMB >= th && !stats.crossedThresholdsMB.includes(th)) {
-            stats.crossedThresholdsMB.push(th);
-            doSend("TicketBookingMemHeapCross", {
-              reason: "heap_cross",
-              threshold_mb: th,
-              current_heap_mb: +heapMB.toFixed(2)
-            });
-          }
-        }
-      }
-    }, 5 * 60 * 1e3);
-    return () => {
-      clearInterval(heartbeatTimer);
-    };
-  }, []);
   const _onDateChange = (date, dateString) => {
     _setIntervalTime(false);
     setState({
@@ -547,11 +454,6 @@ var TicketBooking = (props) => {
   const _setIntervalTime = (isInterval) => {
     clearInterval(_timerRef.current);
     if (isInterval) {
-      try {
-        const _s = getMemStats();
-        _s.intervalDateSetCount = (_s.intervalDateSetCount || 0) + 1;
-      } catch (e) {
-      }
       setState({
         isTimeChange: false,
         isDateChange: false
@@ -561,11 +463,6 @@ var TicketBooking = (props) => {
       }
       _setDataChange((0, import_dayjs.default)());
       _timerRef.current = setInterval(() => {
-        try {
-          const _s = getMemStats();
-          _s.intervalDateTickCount = (_s.intervalDateTickCount || 0) + 1;
-        } catch (e) {
-        }
         _setDataChange((0, import_dayjs.default)());
       }, 1e3 * 60);
     }
@@ -634,6 +531,7 @@ var TicketBooking = (props) => {
     } catch (error) {
       console.error(error);
     }
+    console.log("formatedProducts", total, formatedProducts);
     let fees = [];
     let products = [];
     for (const item of formatedProducts) {
@@ -687,37 +585,37 @@ var TicketBooking = (props) => {
         )
       });
     }
-    (_j = (_i = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _i.postMessageToApp) == null ? void 0 : _j.call(_i, {
+    console.log("start post message, config:", {
       module: "cds",
       key: "cartUpdate",
       data: {
         currency_symbol: getSymbolic(),
-        total: total.expectAmount,
+        total: total.productAmount,
         // 小计
         products,
         fees
       }
     });
-    try {
-      const _s = getMemStats();
-      _s.postCartUpdateCount = (_s.postCartUpdateCount || 0) + 1;
-      const _payload = {
+    (_j = (_i = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _i.postMessageToApp) == null ? void 0 : _j.call(_i, {
+      module: "cds",
+      key: "cartUpdate",
+      data: {
         currency_symbol: getSymbolic(),
         total: total.expectAmount,
+        // 小计
         products,
         fees
-      };
-      _s.postCartUpdateBytes = (_s.postCartUpdateBytes || 0) + JSON.stringify(_payload).length;
-    } catch (e) {
-    }
+      }
+    });
   }, [(_c = (_b = state == null ? void 0 : state.modalState) == null ? void 0 : _b.service) == null ? void 0 : _c.value]);
   const _setModalState = (props2) => {
-    var _a2;
+    var _a2, _b2;
     console.log("同步state到外层", props2);
     let newVal = { ...props2 };
     if (newVal.service) {
       newVal.service.value = ((_a2 = newVal == null ? void 0 : newVal.service) == null ? void 0 : _a2.value) || [];
     }
+    console.log((_b2 = newVal == null ? void 0 : newVal.service) == null ? void 0 : _b2.value, "newVal.service.value");
     setState({
       modalState: {
         ...state.modalState,
@@ -925,6 +823,7 @@ var TicketBooking = (props) => {
       if (data == null ? void 0 : data.eventBookingServiceParams) {
       }
     }
+    console.log(initState, "initState");
     setState({
       ...initState,
       [state.renderType === "eventBooking" ? "eventOpen" : "open"]: true,
@@ -958,6 +857,7 @@ var TicketBooking = (props) => {
         }
       };
     }
+    console.log("getBookingDetail", data);
     _initBookingData("edit", data);
     if (openRebook) {
       setTimeout(() => {

package/lib/components/ticketBooking/index.js

@@ -243,23 +243,13 @@ var ticketBooking_default = (props) => {
     import_utils2.request.setRequest(context.appHelper.utils.request);
   }, []);
   (0, import_react.useMemo)(() => {
-    try {
-      const g = globalThis;
-      if (g.__pisellTicketBookingMemStats) {
-        g.__pisellTicketBookingMemStats.storeCreateCount = (g.__pisellTicketBookingMemStats.storeCreateCount || 0) + 1;
-      }
-    } catch (e) {
-    }
     const store = (0, import_miniRedux.createStore)({
       ...(0, import_lodash.cloneDeep)(initialState),
       bookingConfigParams,
       productExtensionType
     });
     storeRef.current = store;
-  }, [
-    JSON.stringify(bookingConfigParams),
-    JSON.stringify(productExtensionType)
-  ]);
+  }, [bookingConfigParams, productExtensionType]);
   (0, import_react.useMemo)(() => {
     var _a2;
     if (BookingTicket) {

package/lib/pro/Login2.0/components/phoneValidation.js

@@ -68,8 +68,7 @@ var validatePhoneNumber = async (value, getText) => {
       }
       break;
     case "1":
-      const usCanadaReg = /^[2-9]\d{2}[2-9]\d{6}$/;
-      if (!usCanadaReg.test(phone)) {
+      if (!/^\d{10}$/.test(phone)) {
         throw new Error(getText("pisell-phone-validation-us-canada"));
       }
       break;
@@ -79,8 +78,7 @@ var validatePhoneNumber = async (value, getText) => {
       }
       break;
     case "61":
-      const auReg = /^0?[2-578]\d{8}$/;
-      if (!auReg.test(phone)) {
+      if (!/^(\+?0)?4\d{8}$/.test(phone)) {
         throw new Error(getText("pisell-phone-validation-australia"));
       }
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.59",
+  "version": "6.6.60",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -62,9 +62,9 @@
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.6.14",
-    "@pisell/date-picker": "3.0.7",
-    "@pisell/icon": "0.0.11"
+    "@pisell/materials": "6.6.15",
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.7"
   },
   "peerDependencies": {
     "react": "^18.0.0",