@pisell/private-materials 6.4.82 → 6.4.84

package/lib/components/booking/forms/single/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/lib/components/booking/forms/table/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/lib/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

package/lib/components/booking/info/client/serve.js

@@ -25,11 +25,22 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var getFranchiseeCustomerInfo = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params);
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 var getFranchiseeCustomerList = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/select-list`, params, { abort: true });
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/select-list`, params, {
+    abort: true,
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/components/booking/info/date/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/lib/components/booking/info/dateRange/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/lib/components/booking/info/notes/index.d.ts

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

package/lib/components/booking/info/pet/serve.js

@@ -24,7 +24,12 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var getFormDetail = async (id) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/form/${id}`);
+  let { data } = await import_utils.request.getRequest().get(`/shop/form/${id}`, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/info/service/Lists.js

@@ -60,7 +60,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
       if (type === "view" || type === "edit_product") {
         let product = currentItem._origin;
         let cacheItem = { ...product, new: 0 };
-        if (isParallelResource) {
+        if (isParallelResource && !(0, import_utils.isNormalProductByDurationSchedule)(product)) {
           cacheItem = (0, import_utils2.getProductExtend)({
             cacheItem,
             state

package/lib/components/booking/info/service/actions/index.d.ts

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

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info/service/addTimeModal/serve.js

@@ -25,7 +25,13 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getAddTimeProducts = async (params, config) => {
-  let { data } = await import_utils.request.getRequest().post(`/shop/product/query`, params, config);
+  let { data } = await import_utils.request.getRequest().post(`/shop/product/query`, params, {
+    ...config,
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 var saveAddTimeProduct = async ({ orderId, params }) => {

package/lib/components/booking/info/service/like/index.d.ts

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

package/lib/components/booking/info/service/serve.js

@@ -25,11 +25,25 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
-var getProductDetail = async (id, params) => import_utils.request.getRequest().get(`/shop/product/query/${id}`, params);
+var getProductDetail = async (id, params) => import_utils.request.getRequest().get(`/shop/product/query/${id}`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
 var postMultiDay = async (id, params) => import_utils.request.getRequest().post(`/shop/product/multi-day/detail/${id}`, params, {
-  useCache: true
+  useCache: true,
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
+var getProductPrice = async (params) => import_utils.request.getRequest().post(`/shop/product/query/price`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
 });
-var getProductPrice = async (params) => import_utils.request.getRequest().post(`/shop/product/query/price`, params);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getProductDetail,

package/lib/components/booking/info/service2/utils.js

@@ -476,10 +476,13 @@ var getGeneralParams = (item, state, isParallelResource) => {
   const parallelResourceOtherParams = {};
   let multiResources;
   if (isParallelResource) {
-    const hasDataItem = (0, import_utils6.getProductExtend)({
-      cacheItem: { ...item, new: 0 },
-      state
-    });
+    let hasDataItem = item;
+    if (!isNormalProductByDurationSchedule(hasDataItem) && !hasDataItem._data) {
+      hasDataItem = (0, import_utils6.getProductExtend)({
+        cacheItem: { ...item, new: 0 },
+        state
+      });
+    }
     const { resourceMaps, resources } = hasDataItem._data || {};
     parallelResourceOtherParams.errorMessage = getErrorMessageInfo2(getAllErrorList(hasDataItem));
     multiResources = resources.map((resource) => {
@@ -556,13 +559,17 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
     const options = formatOptions((_c = (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.option);
     const bundle = formatBundle((_e = (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle);
     const isNormalProduct = !import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type) || (state == null ? void 0 : state.renderType) === "eventBooking";
+    const isNormalProductByDurationScheduleVal = isNormalProductByDurationSchedule(item);
     let resourceItem = {};
     let errorMessage = "";
-    if (_isDayBookingProduct || isGeneral) {
+    if ((_isDayBookingProduct || isGeneral) && !isNormalProductByDurationScheduleVal) {
       resourceItem = getResourceItem((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
-    const generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
+    let generalParams = {};
+    if (isGeneral && !isNormalProductByDurationScheduleVal) {
+      generalParams = getGeneralParams(item, state, !!isParallelResource);
+    }
     return {
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,

package/lib/components/booking/info2/serve.js

@@ -27,7 +27,12 @@ module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
 var import_utils2 = require("./utils");
 var getResourceList = async (params, bookingId = []) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params);
+  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return (0, import_utils2.getFormatResourceListAndMap)(data, bookingId);
 };
 var createBookings = async (params) => {

package/lib/components/booking/info2/service/actions/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info2/service/addService/utils.js

@@ -397,6 +397,7 @@ var getIsAutoClose = (cacheItem) => {
 };
 var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
   var _a, _b, _c, _d, _e, _f, _g;
+  console.time("console.time getProductExtend");
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
@@ -498,7 +499,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
       state
     });
   }
-  console.log("_cacheItem_cacheItem", _cacheItem);
+  console.timeEnd("console.time getProductExtend");
   return _cacheItem;
 };
 var transServiceList = (list) => {

package/lib/components/booking/info2/utilsByBooking.js

@@ -42,7 +42,8 @@ module.exports = __toCommonJS(utilsByBooking_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../utils");
-var import_utils3 = require("../../ticketBooking/components/addServiceVariant/utils");
+var import_utils3 = require("../info/service2/utils");
+var import_utils4 = require("../../ticketBooking/components/addServiceVariant/utils");
 var getUseableEventCount = (eventList, current) => {
   return (eventList || []).reduce((pre, event) => {
     return pre - event.pax;
@@ -218,7 +219,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
     };
   }
   const appointmentTimingPreference = getAppointmentTimingPreference(state);
-  let lastServer = (0, import_utils2.getLastServer)((_a = state.service.value) == null ? void 0 : _a.filter((item) => !item.isCustomItem));
+  let lastServer = (0, import_utils2.getLastServer)((_a = state.service.value) == null ? void 0 : _a.filter((item) => !item.isCustomItem && !(0, import_utils3.isNormalProductByDurationSchedule)(item)));
   let _extend = {
     // 时长: 当前商品时长 > 第一个时长
     duration: (0, import_utils2.findNextDuration)(
@@ -269,11 +270,14 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   _extend.endDate = endDate;
   const session = (_e = (_d = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.session;
   if ((0, import_utils2.isSessionProduct)(cacheItem) && session) {
-    _extend.start_date = session.start_at;
-    _extend.startDate = session.start_at;
+    const startAt = (0, import_dayjs.default)(`${state.date.value.format("YYYY-MM-DD")} ${session.start_at.format("HH:mm:ss")}`);
+    const endAt = (0, import_dayjs.default)(`${state.date.value.format("YYYY-MM-DD")} ${session.end_at.format("HH:mm:ss")}`);
+    _extend.start_date = startAt;
+    _extend.startDate = startAt;
     _extend.start_time = session.start_time;
-    _extend.end_date = session.end_at;
-    _extend.endDate = session.end_at;
+    _extend.end_date = endAt;
+    _extend.endDate = endAt;
+    _extend.end_time = session.end_time;
     _extend.duration = (0, import_utils2.getDays)({ _extend }, "minutes");
   }
   return _extend;
@@ -286,7 +290,7 @@ var getIsNoSpecAndPackage = (product) => {
   if (product == null ? void 0 : product.isEditBooking) {
     return ((_a = product == null ? void 0 : product.product_bundle) == null ? void 0 : _a.length) === 0 && (product == null ? void 0 : product.product_variant_id) === 0 && (((_c = (_b = product == null ? void 0 : product.product_sku) == null ? void 0 : _b.option) == null ? void 0 : _c.length) || 0) === 0;
   }
-  return (product == null ? void 0 : product.is_bundle) === 0 && (((_d = product == null ? void 0 : product.variant) == null ? void 0 : _d.length) || 0) === 0 && !(0, import_utils3.isOption)(product);
+  return (product == null ? void 0 : product.is_bundle) === 0 && (((_d = product == null ? void 0 : product.variant) == null ? void 0 : _d.length) || 0) === 0 && !(0, import_utils4.isOption)(product);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts

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

package/lib/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/utils.d.ts

@@ -1,4 +1,8 @@
 import dayjs from 'dayjs';
+/**
+ * @title: 高阶函数结果缓存（Memoization）
+ */
+export declare function memoize<T extends (...args: any[]) => any>(fn: T): T;
 declare type RType = (url: string, data?: {} | undefined, config?: {} | undefined) => Promise<any>;
 declare class Request {
     private request;
@@ -23,13 +27,8 @@ export declare const request: Request;
  */
 export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
 /**
- * @title: 时间切片
- * @description:
- * @param {any} config
- * @param {string} locale
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-04-26 13:59
+ * @title: 时间切片（带缓存版本）
+ * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
  */
 export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
     timeSlices: {

package/lib/components/booking/utils.js

@@ -58,6 +58,7 @@ __export(utils_exports, {
   isNowTime: () => isNowTime,
   isSessionProduct: () => isSessionProduct,
   isWalkIn: () => isWalkIn,
+  memoize: () => memoize,
   request: () => request,
   sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
 });
@@ -68,6 +69,18 @@ var import_utils2 = require("./info/service2/utils");
 var import_lodash = require("lodash");
 var import_utilsByBooking = require("./info2/utilsByBooking");
 var import_decimal = __toESM(require("decimal.js"));
+function memoize(fn) {
+  const cache = /* @__PURE__ */ new Map();
+  return function(...args) {
+    const key = JSON.stringify(args);
+    if (cache.has(key)) {
+      return cache.get(key);
+    }
+    const result = fn.apply(this, args);
+    cache.set(key, result);
+    return result;
+  };
+}
 var Request = class {
   request = {};
   constructor() {
@@ -100,7 +113,7 @@ var getDiscountTime = (service_times, isDay) => {
     return str;
   }
 };
-var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
+var _sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   let _locale = locale;
   let dayjsLocale = _locale === "en-US" || _locale === "en" ? "en" : "zh-cn";
   import_dayjs.default.locale(dayjsLocale);
@@ -149,6 +162,7 @@ var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   }
   return { timeSlices, durationSlicesBasedOnTime };
 };
+var sliceDayIntoFiveMinutes = memoize(_sliceDayIntoFiveMinutes);
 var getNowTime = () => {
   return (0, import_dayjs.default)().format("HH:mm");
 };
@@ -186,12 +200,15 @@ var findNextSlice = ({
   return timeSlices[index].value;
 };
 var findNextDuration = (current, array, defaultValue) => {
+  if (defaultValue) {
+    return defaultValue;
+  }
   for (let i = 0; i < array.length; i++) {
     if (array[i].value == (current == null ? void 0 : current.value)) {
       return array[i].value;
     }
   }
-  return defaultValue || array[0].value;
+  return array[0].value;
 };
 var formatProductListByCategory = (list, filterItem) => {
   let _list = list || [];
@@ -504,7 +521,7 @@ var formatResource = (resourceItem, cacheItem, formatLabel) => {
   return _resourceItem;
 };
 var getLastServer = (list) => {
-  return list[list.length - 1];
+  return list == null ? void 0 : list[0];
 };
 var getCacheParams = () => {
   const sessionData = sessionStorage.getItem("pisell2.booking.serviceParams");
@@ -725,6 +742,7 @@ var getIsEdit = (state) => {
   isNowTime,
   isSessionProduct,
   isWalkIn,
+  memoize,
   request,
   sliceDayIntoFiveMinutes
 });

package/lib/components/checkout/PaymentModal.d.ts

@@ -15,16 +15,24 @@ interface PaymentModalProps {
     data?: PaymentModalData;
     callback?: (result: any) => void;
     onClose?: (reset?: boolean) => void;
-    dispatch?: (action: {
-        type: string;
-        payload?: any;
-    }) => void;
-    state?: any;
+    paymentResultDisplayMode?: string;
+    shopDiscount?: number;
+    client?: any;
+    currentTotalPrice?: number;
+    config?: any;
+    onChangeShopDiscount?: (discount: string) => void;
+    onChangeOrderNote?: (note: string) => void;
+    onDeleteOrderNote?: () => void;
 }
 interface PaymentModalMainProps extends PaymentModalProps {
     onClose?: (reset?: boolean) => void;
     setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
     editOrderId?: number;
+    config?: {
+        showHeaderCenter?: boolean;
+        showHeaderRightButton?: boolean;
+        disabledSwitchClient?: boolean;
+    };
 }
 declare const PaymentModal: React.FC<PaymentModalMainProps>;
 export type { PaymentModalData, PaymentModalProps };