@pisell/private-materials 6.2.16 → 6.2.17

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

@@ -48,7 +48,7 @@ var import_utils3 = require("../clientVariant/utils");
 var import_useGetHolderList = __toESM(require("../hooks/useGetHolderList"));
 var isLoadClient = false;
 var Client = () => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const modalRef = (0, import_react.useRef)();
   const [loadLoading, setLoadLoading] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -298,6 +298,7 @@ var Client = () => {
     )) : null;
   }, [loadLoading, params, state.client.clients.length]);
   const customSelect = (0, import_react.useMemo)(() => {
+    console.log("render customSelect");
     return /* @__PURE__ */ import_react.default.createElement(
       import_customSelect.default,
       {
@@ -340,7 +341,7 @@ var Client = () => {
         }
       }
     );
-  }, [state, renderList, loading, franchiseeLoading, params.search, loadMore]);
+  }, [state.isTerminal, state.modalOpen, (_b = state.client) == null ? void 0 : _b.value, state.drawerMask, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -357,11 +358,11 @@ var Client = () => {
       import_antd.Avatar,
       {
         className: "pisell-lowcode__booking-client-list-item-avatar",
-        src: import_utils.image.ali((_b = state.client.value) == null ? void 0 : _b.cover, 100),
+        src: import_utils.image.ali((_c = state.client.value) == null ? void 0 : _c.cover, 100),
         icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
       }
     ),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_c = state.client.value) == null ? void 0 : _c.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_d = state.client.value) == null ? void 0 : _d.email) : null, ((_e = state.client.value) == null ? void 0 : _e.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_f = state.client.value) == null ? void 0 : _f.phone) : null, !!((_h = (_g = state.client.value) == null ? void 0 : _g.waiver_form) == null ? void 0 : _h.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils3.getWaiverTitle)((_i = state.client.value) == null ? void 0 : _i.waiver_form) }, (_l = (_k = (_j = state.client.value) == null ? void 0 : _j.waiver_form) == null ? void 0 : _k.map) == null ? void 0 : _l.call(_k, (item) => {
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_d = state.client.value) == null ? void 0 : _d.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_e = state.client.value) == null ? void 0 : _e.email) : null, ((_f = state.client.value) == null ? void 0 : _f.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_g = state.client.value) == null ? void 0 : _g.phone) : null, !!((_i = (_h = state.client.value) == null ? void 0 : _h.waiver_form) == null ? void 0 : _i.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils3.getWaiverTitle)((_j = state.client.value) == null ? void 0 : _j.waiver_form) }, (_m = (_l = (_k = state.client.value) == null ? void 0 : _k.waiver_form) == null ? void 0 : _l.map) == null ? void 0 : _m.call(_l, (item) => {
       return /* @__PURE__ */ import_react.default.createElement("span", null, item.form_title, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-waiver-colon" }, ":"), item.is_filled ? /* @__PURE__ */ import_react.default.createElement(
         "span",
         {

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

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

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

@@ -1,3 +1,4 @@
+/// <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/hooks/useInfoHolder.js

@@ -32,6 +32,7 @@ __export(useInfoHolder_exports, {
   default: () => useInfoHolder_default
 });
 module.exports = __toCommonJS(useInfoHolder_exports);
+var import_ahooks = require("ahooks");
 var import_react = require("react");
 var import_useHolderConfig = __toESM(require("./useHolderConfig"));
 var import_utils = require("../utils");
@@ -54,21 +55,21 @@ var useInfoHolder = (state, dispatch) => {
     };
   }, [(_d = (_c = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.information_tab]);
   const showAddTimeModal = (0, import_react.useMemo)(() => {
-    return (0, import_utils.isOpenAddTime)(state);
+    return (0, import_utils.isOpenAddTime)(state) && !state.isBookingTicket2;
   }, [state, appointment_card.quick_time]);
-  const handleEdit = (cacheItem, type) => {
-    setTimeout(() => {
-      var _a2, _b2;
-      (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem, false, type === "edit_product");
-    }, 100);
-  };
+  const handleEdit = (0, import_ahooks.useMemoizedFn)((cacheItem, type) => {
+    var _a2, _b2;
+    console.time("handleEdit");
+    console.log(performance.now() - window.pp1, "打开商品4");
+    (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem, false, type === "edit_product");
+  });
   const dispatchService = (type, payload) => {
     dispatch({
       type,
       payload: { ...payload }
     });
   };
-  const handleAction = (dataSource) => {
+  const handleAction = (0, import_ahooks.useMemoizedFn)((dataSource) => {
     const cacheItem = (0, import_utils2.getProductExtend)({
       cacheItem: { ...dataSource._origin, new: 0 },
       state
@@ -80,7 +81,7 @@ var useInfoHolder = (state, dispatch) => {
         cacheItem
       }
     });
-  };
+  });
   return {
     detailRef,
     handleEdit,

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

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import { InfoProps } from './main';
+declare const APP: (props: InfoProps) => JSX.Element;
+export default APP;

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

@@ -48,10 +48,12 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
   const { handleAddHolder } = (0, import_useAddHolder.default)(state, dispatch);
   const handleChange = (0, import_ahooks.useMemoizedFn)(
     (currentItem, type, other) => {
+      console.time("handleChange");
+      console.log(window.pp1 = performance.now(), "打开商品");
       if (state.disabledEdit || state.disableEventBookingEdit) {
         return;
       }
-      let products = (0, import_utils.updateServices)(state, currentItem, type, other, {
+      let products2 = (0, import_utils.updateServices)(state, currentItem, type, other, {
         handleAddHolder
       });
       if (type === "view" || type === "edit_product") {
@@ -64,11 +66,11 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
           });
         }
         onChange({ editModal: true, cacheItem });
-        return onEdit == null ? void 0 : onEdit({ ...product, new: 0 }, type);
+        return onEdit == null ? void 0 : onEdit(cacheItem, type);
       }
       const params = {
         editModal: false,
-        value: products,
+        value: products2,
         edit: true,
         cacheItem: null
       };
@@ -95,26 +97,36 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     isShowChangeHolder,
     state.isBookingCreatePage
   ]);
-  return /* @__PURE__ */ import_react.default.createElement(import_Provider.CartContext.Provider, { value: { state } }, /* @__PURE__ */ import_react.default.createElement(
-    import_shoppingCart.default,
-    {
-      isParallelResource,
-      onAction,
-      onChange: handleChange,
-      isOpenGroup: false,
-      isHideClearCart: true,
-      onAddProduct: () => onChange({ addModal: true }),
-      productParams: {
-        ...productParams,
-        products: (0, import_utils.formatProducts)(
-          ((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value) || [],
-          state,
-          false,
-          true,
-          isParallelResource
-        )
+  const products = (0, import_react.useMemo)(() => {
+    var _a2;
+    console.time("products");
+    const p = (0, import_utils.formatProducts)(
+      ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) || [],
+      state,
+      false,
+      true,
+      isParallelResource
+    );
+    console.timeEnd("products");
+    return p;
+  }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value]);
+  return (0, import_react.useMemo)(() => {
+    console.log("render List");
+    return /* @__PURE__ */ import_react.default.createElement(import_Provider.CartContext.Provider, { value: { state } }, /* @__PURE__ */ import_react.default.createElement(
+      import_shoppingCart.default,
+      {
+        isParallelResource,
+        onAction,
+        onChange: handleChange,
+        isOpenGroup: false,
+        isHideClearCart: true,
+        onAddProduct: () => onChange({ addModal: true }),
+        productParams: {
+          ...productParams,
+          products
+        }
       }
-    }
-  ));
+    ));
+  }, [products, state, productParams]);
 };
 var Lists_default = Lists;

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: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

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

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

package/lib/components/booking/info/service2/Lists.d.ts

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

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

@@ -579,25 +579,25 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       _origin: item
     };
   };
-  lists.forEach((item) => {
-    var _a;
-    if (!((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId)) {
-      normalList.push(formItem(item));
-    } else {
-      groupList.push(item);
-    }
-  });
-  let groups = groupList.reduce((prev, item) => {
-    var _a;
-    const groupId = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId;
-    if (!prev[groupId]) {
-      prev[groupId] = [];
-    }
-    prev[groupId].push(item);
-    return prev;
-  }, {});
   console.log(normalList, "normalList");
   if (isRenderGroup) {
+    lists.forEach((item) => {
+      var _a;
+      if (!((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId)) {
+        normalList.push(formItem(item));
+      } else {
+        groupList.push(item);
+      }
+    });
+    let groups = groupList.reduce((prev, item) => {
+      var _a;
+      const groupId = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId;
+      if (!prev[groupId]) {
+        prev[groupId] = [];
+      }
+      prev[groupId].push(item);
+      return prev;
+    }, {});
     return Object.values(groups).map((d) => formItem((0, import_utils3.concatBookings)(d))).concat(normalList);
   } else {
     return lists == null ? void 0 : lists.map((item) => formItem(item));

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

@@ -0,0 +1,50 @@
+export declare const getIsBundleOrCombination: (productDetail: any) => boolean;
+export declare const uniqueByField: (arr: any[], field: string) => any[];
+export declare const moveItemToFront: (arr: any[], targetId: string | number) => any[];
+/**
+ * @title:  判断两个时间是否在同一个时间段内
+ * @description:
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:37
+ */
+export declare const isInterval: (time1: number, time2: number, interval?: number) => boolean;
+/**
+ * @title: 根据时间间隔格式化服务列表
+ * @description: 防止短时间内添加多个相同服务, 如果两个服务的时间间隔小于1秒，则合并为一个服务
+ * @param {any} list 服务列表
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:36
+ */
+export declare const formatServiceListByTime: (list: any[]) => any[];
+export declare const isBooking4Shop: (shopId: number, renderType?: string, businessUtils?: any) => any;
+declare type DataEntry = {
+    total: number;
+    origin_total: number;
+    num: number;
+    quotation_id: number;
+    start_date: string;
+    end_date: string;
+};
+declare type ResultStructure = Record<string, Record<string, any>>;
+export declare const getMultiDayPrices: (data: DataEntry[]) => ResultStructure;
+/**
+ * @title: 是否是跨日预约
+ * @description:
+ * @param {number} shopId
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 11:19
+ */
+export declare const isDayBooking: (shopId: number) => boolean;
+export declare const isOpenAddTime: (state: any) => boolean;
+export declare const isShowAddTime: (state: any, currentService: any) => boolean;
+export declare const editSessionProduct: (cacheItem: any, session: any) => {
+    duration: any;
+    start_time: any;
+} | undefined;
+export {};

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

@@ -0,0 +1,12 @@
+import '../info/index.less';
+export interface InfoProps {
+    style: any;
+    globalState: any;
+    callback: any;
+    setGlobalState: any;
+    modules: any;
+    slot: any;
+    setState: any;
+}
+declare const Info: any;
+export default Info;

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

@@ -0,0 +1,11 @@
+import { PisellDrawerProps } from '../../../components/drawer';
+import '../../../info/service/addService/index.less';
+interface AddServiceProps {
+    onEdit: any;
+    dispatch?: any;
+    state?: any;
+    drawerProps?: PisellDrawerProps;
+    renderMode?: 'current' | 'drawer';
+}
+declare const Info: (props: AddServiceProps) => JSX.Element;
+export default Info;

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

@@ -0,0 +1,98 @@
+import dayjs from 'dayjs';
+export declare const getUsableTime: (cacheItem: any) => any;
+export declare const getDurationProps: ({ cacheItem, useStartTime, currentResource, slice, }: any) => {
+    startDate: dayjs.Dayjs;
+    usableTime: any;
+    duration: string | number | {
+        type: string;
+        value: number;
+    };
+    locale: string;
+    slice: any;
+    selectProps: {
+        size: string;
+    };
+};
+/**
+ * @title: 灵活时长选项
+ * @description:
+ * @param {*} useMemo
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-23 10:10
+ */
+export declare const getFlexibleOption: ({ cacheItem, useStartTime, currentResource, slice, durationProps, }: any) => {
+    label: any;
+    value: any;
+} | null;
+export declare const getTimeSlices: ({ state }: any) => {
+    timeSlices: {
+        label: string;
+        value: string;
+    }[];
+};
+/**
+ * @title: 时间切片
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-09 13:37
+ */
+export declare const getTimeObj: ({ cacheItem, useStartTime, currentResource, state, useDuration, durationProps, }: any) => {
+    timeSlices: {
+        label: string;
+        value: string;
+    }[];
+    durationSlicesBasedOnTime: {
+        label: string;
+        value: number;
+    }[];
+};
+/**
+ * @title: 获取资源列表
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-09 13:38
+ */
+export declare const formatResources: ({ cacheItem, resourcesOrigin, id }: any) => {
+    list: any;
+    maps: any;
+};
+export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
+/**
+ * @title: 设置默认容量
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-09-19 20:26
+ */
+export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any;
+/**
+ * @title: 将商品内关联的资源id还原成数据
+ * @description:
+ * @param {any} resourcesOriginMap
+ * @param {any} cacheItem
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-09-19 20:23
+ */
+export declare const getResourceByIds: (resourcesOriginMap: any, cacheItem: any, extraParams?: any) => any[];
+/**
+ * @title: 预生成服务的 extend
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-06-01 13:25
+ */
+export declare const getProductExtend: ({ cacheItem, state, isDisabledTime }: any) => any;
+/**
+ * @title: 格式化服务列表
+ * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据
+ * 使用with resourceRelation后 返回的resource_relation是实时数据
+ * 这里做一次转换
+ * @param list
+ */
+export declare const transServiceList: (list: any[]) => any[];

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

@@ -142,7 +142,8 @@ var getTimeObj = ({
     cacheItem,
     useStartTime,
     currentResource,
-    state,
+    // 没有使用该参数
+    // state,
     durationProps
   });
   let obj = (0, import_utils.sliceDayIntoFiveMinutes)(
@@ -242,7 +243,8 @@ var setDefaultResource = ({ cacheItem, resources }) => {
     }
     const defaultResource = defaultOriginalResource.map((d) => {
       return {
-        ...d,
+        // ...d,
+        children: d.children,
         relation_type: d.relation_type,
         form_id: item.form_id,
         relation_id: d.id,

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

@@ -0,0 +1,3 @@
+import '../../../info/service/addTimeModal/index.less';
+declare const AddTimeModal: () => JSX.Element;
+export default AddTimeModal;

package/lib/components/booking/info2/service/addTimeModal/index.js

@@ -65,6 +65,7 @@ var AddTimeModal = () => {
   const [number, setNumber] = (0, import_react.useState)(1);
   const originServices = (0, import_react.useRef)([]);
   const [renderList, setRenderList] = (0, import_react.useState)([]);
+  console.log(renderList, "renderListrenderList");
   const context = (0, import_useEngineContext.default)();
   const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const statusMap = {
@@ -126,6 +127,7 @@ var AddTimeModal = () => {
     }
     return arr.filter(Boolean);
   }, [(_f = (_e = (_d = state.service) == null ? void 0 : _d.cacheItem) == null ? void 0 : _e._extend) == null ? void 0 : _f.resource]);
+  console.log(currentResource, "currentResource");
   const getTimeUsableStatus = (time) => {
     var _a2, _b2;
     if (!((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend) || !currentResource.length) {
@@ -206,6 +208,7 @@ var AddTimeModal = () => {
     setLoading("list");
     const newList = await _getAddTimeProducts();
     let list = newList.map((d) => {
+      debugger;
       let isUsable = (0, import_utils2.isUsableProduct)(d.add_time, state.service.cacheItem);
       return {
         ...d,

package/lib/components/booking/info2/service/editService/Resources/index.js

@@ -168,9 +168,11 @@ var Resources = ({
   const getIsAutoAllocation = (id) => {
     return (0, import_utils2.getAutoAllocationStorage)(id);
   };
+  console.log("resourcesss");
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, data.map((item) => {
     var _a2;
     const cur = _value[item.form_id];
+    console.log(cur, "curcur");
     const errors = (cur || []).reduce((pre, d) => {
       return pre.concat((d == null ? void 0 : d.errors) || []);
     }, []);