@pisell/private-materials 3.4.7 → 3.4.9

package/lib/components/appointmentBooking/components/Cart/utils.d.ts

@@ -0,0 +1,56 @@
+interface CheckLoginParams {
+    isLogin: boolean;
+    openLoginModal: (params: {
+        callback: (status: string) => void;
+    }) => void;
+    isFormSubject: boolean;
+    utils: any;
+    accountLists: any[];
+    appointmentBooking: any;
+    getHolders: () => void;
+}
+export declare const checkLogin: ({ isLogin, openLoginModal, isFormSubject, utils, accountLists, appointmentBooking, getHolders, }: CheckLoginParams) => Promise<boolean>;
+interface CheckHolderParams {
+    isFormSubject: boolean;
+    checkAccount: (type: string) => boolean;
+    carts: any[];
+}
+export declare const checkHolder: ({ isFormSubject, checkAccount, carts }: CheckHolderParams) => false | any[];
+interface CheckResourceParams {
+    carts: any[];
+    resources: any[];
+}
+/**
+ * @title: 检测资源数据
+ * @description:
+ * @param {CheckResourceParams} param1
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-29 18:02
+ */
+export declare const checkResource: ({ carts, resources }: CheckResourceParams) => false | any[];
+interface CheckResourceParams {
+    carts: any[];
+}
+export declare type StepKey = 'select-resource' | 'fill-form' | 'select-time' | 'confirm-information' | 'select-service' | 'select-date' | 'select-guest';
+interface AddHolderParams {
+    res: any;
+    bookingSubject: any;
+    accountLists: any[];
+    cartItem: any;
+    getHolders: () => void;
+    appointmentBooking: any;
+}
+/**
+ * @title: 添加holder
+ * @description:
+ * @param {any} res
+ * @param {any} bookingSubject
+ * @param {any} accountLists
+ * @param {any} e
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-05-10 18:25
+ */
+export declare const handleAddHolder: ({ res, bookingSubject, accountLists, cartItem, getHolders, appointmentBooking }: AddHolderParams) => Promise<any>;
+export {};

package/lib/components/appointmentBooking/components/Footer/index.d.ts

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

package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

package/lib/components/booking/components/customSelect/index.js

@@ -78,6 +78,7 @@ var CustomSelect = (props, ref) => {
     handleOpenModal: propsHandleOpenModal,
     handleDayChange
   } = props;
+  console.log("custom select");
   const searchRef = (0, import_react.useRef)();
   const [_value, set_value] = (0, import_react.useState)([]);
   const [search, setSearch] = (0, import_react.useState)("");

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

@@ -0,0 +1,4 @@
+import React from "react";
+import "./index.less";
+declare const TabPane: React.FC<any>;
+export default TabPane;

package/lib/components/booking/editBookingModal/index.js

@@ -66,50 +66,62 @@ var EditBookingModal = (props, ref) => {
     };
   });
   const getInitData = async (params2) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     let mockProps = params2;
     const _data = await (0, import_serve2.init)(mockProps);
     setData(_data);
     let _initResourceVal = _data.childrenBooking._extend.resource;
-    const toResourceFormId = (_a = _data.toResource) == null ? void 0 : _a.form_id;
-    if (params2.fromResourceId !== params2.toResourceId && toResourceFormId) {
+    const fromResourceFormId = (_a = _data.fromResource) == null ? void 0 : _a.form_id;
+    const toResourceFormId = (_b = _data.toResource) == null ? void 0 : _b.form_id;
+    const _form_id = toResourceFormId || fromResourceFormId;
+    if (params2.fromResourceId !== params2.toResourceId && !!_form_id) {
       const { list, maps } = (0, import_utils3.formatResources)({
         cacheItem: _data.childrenBooking,
         resourcesOrigin: _data.resourcesOrigin
       });
-      const currentForm = maps[toResourceFormId];
-      const relation_id = (_b = _data.toResource) == null ? void 0 : _b.id;
-      if (currentForm && relation_id) {
+      const currentForm = maps[_form_id];
+      const relation_id = (_c = _data.toResource) == null ? void 0 : _c.id;
+      if (currentForm && (relation_id || relation_id === 0)) {
         let _targetResource = {
-          relation_type: ((_d = (_c = currentForm.renderListMaps[relation_id]) == null ? void 0 : _c.usable) == null ? void 0 : _d.relation_type) || "form",
-          form_id: toResourceFormId,
+          relation_type: ((_e = (_d = currentForm.renderListMaps[relation_id]) == null ? void 0 : _d.usable) == null ? void 0 : _e.relation_type) || "form",
+          form_id: _form_id,
           relation_id,
           like_status: "common",
-          children: (_f = (_e = currentForm.renderListMaps) == null ? void 0 : _e[relation_id]) == null ? void 0 : _f.children,
+          children: (_g = (_f = currentForm.renderListMaps) == null ? void 0 : _f[relation_id]) == null ? void 0 : _g.children,
           metadata: {
-            ...(_h = (_g = currentForm.renderListMaps) == null ? void 0 : _g[relation_id]) == null ? void 0 : _h.metadata,
+            ...(_i = (_h = currentForm.renderListMaps) == null ? void 0 : _h[relation_id]) == null ? void 0 : _i.metadata,
             form_name: currentForm.title,
-            resource_name: (_i = currentForm.renderListMaps[relation_id]) == null ? void 0 : _i.main_field
+            resource_name: (_j = currentForm.renderListMaps[relation_id]) == null ? void 0 : _j.main_field
           }
         };
-        if (Array.isArray(_initResourceVal[toResourceFormId])) {
-          const _cloned = [..._initResourceVal[toResourceFormId]];
-          const _idx = _cloned.findIndex(
-            (rs) => rs.relation_id == params2.fromResourceId
-          );
+        if (Array.isArray(_initResourceVal[_form_id])) {
+          const _cloned = [..._initResourceVal[_form_id]];
+          const _idx = _cloned.findIndex((rs) => {
+            var _a2;
+            return rs.relation_id == params2.fromResourceId || ((_a2 = rs.children) == null ? void 0 : _a2.find(
+              (child) => child.relation_id == params2.fromResourceId
+            ));
+          });
           if (_idx !== -1) {
-            _cloned[_idx] = _targetResource;
+            const _sameResource = _cloned.find(
+              (_clonedItem) => _clonedItem.relation_id === (_targetResource == null ? void 0 : _targetResource.relation_id)
+            );
+            if (_sameResource) {
+              _cloned.splice(_idx, 1);
+            } else {
+              _cloned[_idx] = _targetResource;
+            }
           } else {
             _cloned.push(_targetResource);
           }
           _initResourceVal = {
             ..._initResourceVal,
-            [toResourceFormId]: _cloned
+            [_form_id]: _cloned
           };
         } else {
           _initResourceVal = {
             ..._initResourceVal,
-            [toResourceFormId]: [_targetResource]
+            [_form_id]: [_targetResource]
           };
         }
       }
@@ -216,8 +228,30 @@ var EditBookingModal = (props, ref) => {
       const start_time = values.toDate[0].format("HH:mm");
       const end_date = values.toDate[1].format("YYYY-MM-DD");
       const end_time = values.toDate[1].format("HH:mm");
+      console.log("extend data", _extend);
+      const {
+        id,
+        relation_id,
+        like_status,
+        relation_type,
+        is_all,
+        schedule_id,
+        sub_type,
+        select_date,
+        number,
+        metadata
+      } = _extend;
       await (0, import_serve.updateChildBooking)(order_id, {
-        ..._extend,
+        id,
+        relation_id,
+        like_status,
+        relation_type,
+        is_all,
+        schedule_id,
+        sub_type,
+        select_date,
+        number,
+        metadata,
         resources: Object.values(values.resource).reduce(
           (pre, cur) => {
             const newList = (0, import_utils4.checkResourcesFormat)(cur, cacheItem);
@@ -232,7 +266,7 @@ var EditBookingModal = (props, ref) => {
         end_time,
         duration: values.toDate[1].diff(values.toDate[0], "minutes")
       });
-      setOpen(false);
+      initState();
       props == null ? void 0 : props.onOk();
     } catch (error) {
       console.error(error);
@@ -352,6 +386,7 @@ var EditBookingModal = (props, ref) => {
           onClick: onOk,
           block: true,
           size: "large",
+          disabled: !data,
           loading: updating,
           style: { borderRadius: 20 }
         },

package/lib/components/booking/editBookingModal/serve.d.ts

@@ -46,6 +46,7 @@ export declare const init: (params: EditBookingModalParams) => Promise<{
         start_date: any;
     };
     resourcesOrigin: any[];
+    fromResource: any;
     toResource: any;
 }>;
 export declare const createCacheItem: (cacheItem: any, values?: any) => any;

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

@@ -94,6 +94,7 @@ var updateResourceErrors = (resourceMaps, cacheItem) => {
   }
 };
 var init = async (params) => {
+  var _a;
   const { toStartDate, toEndDate, event, fromResourceId, toResourceId } = params;
   let bookingOrigin = await _getBookingDetail(event.order.id);
   let booking = (0, import_ticketBooking._formatBookingDetail)(bookingOrigin, {});
@@ -102,15 +103,18 @@ var init = async (params) => {
   });
   let childrenBooking = getChildrenBookingById(booking.service.value, event.id);
   console.log("childrenBooking", childrenBooking);
+  const fromResource = resources.listMap[fromResourceId];
+  const toResource = resources.listMap[toResourceId];
   const extraParams = {
     extraResources: []
   };
-  const fromResource = resources.listMap[fromResourceId];
-  const toResource = resources.listMap[toResourceId];
-  if (fromResource) {
-    extraParams.extraResources.push({
-      form_id: fromResource.form_id,
-      id: fromResource.id
+  const _eventResources = (_a = childrenBooking._extend) == null ? void 0 : _a.event_resources;
+  if (Array.isArray(_eventResources)) {
+    _eventResources.forEach((item) => {
+      extraParams.extraResources.push({
+        id: item.relation_id,
+        form_id: item.form_id
+      });
     });
   }
   if (toResource) {
@@ -138,6 +142,8 @@ var init = async (params) => {
     },
     // 总资源列表
     resourcesOrigin,
+    // 源资源
+    fromResource,
     // 目标资源
     toResource
   };

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

package/lib/components/booking/hooks/useClearCart.js

@@ -37,7 +37,7 @@ var import_classnames = __toESM(require("classnames"));
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var useClearCart = (state, dispatch) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const handleClear = () => {
     dispatch({
       type: "setService",
@@ -46,17 +46,20 @@ var useClearCart = (state, dispatch) => {
       }
     });
   };
-  return !!((_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
-    "span",
-    {
-      className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
-        ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
-      }),
-      onClick: handleClear
-    },
-    /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
-    " ",
-    /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
-  );
+  return (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c, _d;
+    return !!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
+      "span",
+      {
+        className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
+          ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
+        }),
+        onClick: handleClear
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
+      " ",
+      /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
+    );
+  }, [(_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length, state.channelDisabledEdit]);
 };
 var useClearCart_default = useClearCart;

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

@@ -0,0 +1 @@
+export declare const useIsBooking4Shop: (state: any) => any;

package/lib/components/booking/hooks/useQuotation.js

@@ -35,7 +35,7 @@ __export(useQuotation_exports, {
 module.exports = __toCommonJS(useQuotation_exports);
 var import_react = __toESM(require("react"));
 var import_utils = require("../utils");
-var import_useEngineContext = __toESM(require("../../../../es/hooks/useEngineContext"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_serve = require("../info/service/serve");

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

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+interface AddServiceVariantProps {
+    globalState: any;
+    setGlobalState: any;
+}
+declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
+export default AddServiceVariant;

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/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/model.d.ts

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

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, state]);
+  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/service2/Lists.d.ts

@@ -1,3 +1,2 @@
-/// <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/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,
@@ -302,7 +304,7 @@ var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
       extraResourceIds = (resourcesOrigin || []).filter((d) => d.form_code === item.code).map((d) => d.id);
     } else {
       extraResourceIds = extraResources.filter((_extraItem) => {
-        return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
+        return _extraItem.form_id === form_id && !!_extraItem.id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
       }).map((_extraItem) => _extraItem.id);
     }
     extraResourceIds = Array.from(new Set(extraResourceIds));