@pisell/private-materials 6.1.7 → 6.1.9

package/lib/components/booking/info2/cartClientCard/locales.js

@@ -0,0 +1,50 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info2/cartClientCard/locales.ts
+var locales_exports = {};
+__export(locales_exports, {
+  default: () => locales_default
+});
+module.exports = __toCommonJS(locales_exports);
+var locales_default = {
+  en: {
+    "pisell2.text.switch-account": "Switch Account",
+    "pisell2.text.cancel": "Cancel",
+    "pisell2.text.cart-client-card": (name) => {
+      return name ? `Switching to ${name}'s Account?` : "Switching Account?";
+    },
+    "pisell2.text.add-client-success": "Add Client Success"
+  },
+  "zh-CN": {
+    "pisell2.text.switch-account": "切换账户",
+    "pisell2.text.cancel": "取消",
+    "pisell2.text.cart-client-card": (name) => {
+      return name ? `切换至${name}的账户？` : "切换账户？";
+    },
+    "pisell2.text.add-client-success": "添加客户成功"
+  },
+  "zh-HK": {
+    "pisell2.text.switch-account": "切換賬戶",
+    "pisell2.text.cancel": "取消",
+    "pisell2.text.cart-client-card": (name) => {
+      return name ? `切換至${name}的賬戶？` : "切換賬戶？";
+    },
+    "pisell2.text.add-client-success": "添加客戶成功"
+  }
+};

package/lib/components/booking/info2/cartClientCard/types.d.ts

@@ -0,0 +1,13 @@
+import type { ClientData as ClientCardData } from '../../../../plus/clientCard/types';
+import type { ClientData as ClientSearchData } from '../../../../plus/clinetSearch/types';
+export interface ClientData extends ClientCardData {
+    latest_wallet_detail?: any;
+}
+export interface CartClientCardState {
+    clientData?: ClientData;
+    searchModalVisible: boolean;
+}
+export declare type ClientDataConverter = (searchData: ClientSearchData) => ClientData;
+export declare type ClientCardRef = {
+    handleSetClient: (record: ClientData) => void;
+};

package/lib/components/booking/info2/cartClientCard/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info2/cartClientCard/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

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

@@ -0,0 +1,3 @@
+import { ClientData } from "./types";
+export declare const setHandleSetClient: (fn: ((customer: ClientData | null) => void) | null) => void;
+export declare const getHandleSetClient: () => ((customer: ClientData | null) => void) | null;

package/lib/components/booking/info2/cartClientCard/utils.js

@@ -0,0 +1,37 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info2/cartClientCard/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  getHandleSetClient: () => getHandleSetClient,
+  setHandleSetClient: () => setHandleSetClient
+});
+module.exports = __toCommonJS(utils_exports);
+var handleSetClient = null;
+var setHandleSetClient = (fn) => {
+  handleSetClient = fn;
+};
+var getHandleSetClient = () => {
+  return handleSetClient;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getHandleSetClient,
+  setHandleSetClient
+});

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

@@ -40,11 +40,12 @@ var import_pet = __toESM(require("../info/pet"));
 var import_date = __toESM(require("../info/date"));
 var import_footer = __toESM(require("../components/footer"));
 var import_tabPane = __toESM(require("../components/tabPane"));
-var import_addNote = __toESM(require("../notes/addNote"));
 var import_header = __toESM(require("../info/header"));
 var import_locales = __toESM(require("../locales"));
 var import_utils = require("@pisell/utils");
-var import_utils2 = require("../utils");
+var import_reloadResourceModal = __toESM(require("../components/reloadResourceModal"));
+var import_utils2 = require("@pisell/utils");
+var import_utils3 = require("../utils");
 var import_utilsByBooking = require("./utilsByBooking");
 var import_utilsByBooking2 = require("./utilsByBooking");
 var import_serve = require("./serve");
@@ -57,6 +58,8 @@ var import_classnames = __toESM(require("classnames"));
 var import_useCreateBookingPageHeader = __toESM(require("../hooks/useCreateBookingPageHeader"));
 var import_locales2 = require("../../../utils/locales");
 var import_ahooks = require("ahooks");
+var import_cartClientCard = __toESM(require("./cartClientCard"));
+var import_materials = require("@pisell/materials");
 var defaultModules = {
   client: 1,
   date: 1,
@@ -70,7 +73,7 @@ var Info = (0, import_model.Provider)((props) => {
   const { style, globalState, modules = defaultModules, slot } = props;
   const modal = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
-  import_utils2.request.setRequest(context.appHelper.utils.request);
+  import_utils3.request.setRequest(context.appHelper.utils.request);
   const params = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = modal.state) == null ? void 0 : _a2.bookingConfig) == null ? void 0 : _b2.config) == null ? void 0 : _c2.basic) == null ? void 0 : _d2.appointment_subject) || {};
@@ -85,9 +88,9 @@ var Info = (0, import_model.Provider)((props) => {
         bookingFunctions: {
           formatResource: import_utilsByBooking.formatResource,
           getErrorList: import_utilsByBooking2.getErrorList,
-          sliceDayIntoFiveMinutes: import_utils2.sliceDayIntoFiveMinutes,
-          findNextDuration: import_utils2.findNextDuration,
-          flexibleObj: import_utils2.flexibleObj,
+          sliceDayIntoFiveMinutes: import_utils3.sliceDayIntoFiveMinutes,
+          findNextDuration: import_utils3.findNextDuration,
+          flexibleObj: import_utils3.flexibleObj,
           updateServiceDate: import_date2.updateServiceDate
         }
       });
@@ -128,11 +131,13 @@ var Info = (0, import_model.Provider)((props) => {
     globalState == null ? void 0 : globalState.renderType
   ]);
   const notes = (0, import_react.useMemo)(() => {
-    var _a2, _b2;
     if (!modules.note) {
       return null;
     }
-    return (globalState == null ? void 0 : globalState.bookingId) ? globalState.renderType === "eventBooking" ? /* @__PURE__ */ import_react.default.createElement(import_notes.default, null) : null : /* @__PURE__ */ import_react.default.createElement(import_addNote.default, { value: (_b2 = (_a2 = modal.state) == null ? void 0 : _a2.notes) == null ? void 0 : _b2.orderNote, onChange: addNote });
+    return (globalState == null ? void 0 : globalState.bookingId) ? globalState.renderType === "eventBooking" ? /* @__PURE__ */ import_react.default.createElement(import_notes.default, null) : null : (
+      // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
+      null
+    );
   }, [
     modules.note,
     globalState == null ? void 0 : globalState.bookingId,
@@ -163,38 +168,102 @@ var Info = (0, import_model.Provider)((props) => {
         });
       }
     }
-    try {
+    return new Promise((resolve, reject) => {
       setTimeout(async () => {
         var _a2, _b2, _c2, _d2;
-        let data = await (0, import_serve.getResourceList)({
-          date: currentDate
-        }, (_d2 = (_c2 = (_b2 = (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.map) == null ? void 0 : _d2.call(_c2, (item) => item == null ? void 0 : item.booking_id));
-        data.date = currentDate;
-        localStorage.setItem("bookingResourceList", JSON.stringify(data));
+        try {
+          let data = await (0, import_serve.getResourceList)(
+            {
+              date: currentDate
+            },
+            (_d2 = (_c2 = (_b2 = (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.map) == null ? void 0 : _d2.call(_c2, (item) => item == null ? void 0 : item.booking_id)
+          );
+          try {
+            data.date = currentDate;
+            localStorage.setItem("bookingResourceList", JSON.stringify(data));
+          } catch (error) {
+            (0, import_utils2.sendWarningLog)({
+              title: `设置资源失败`,
+              content: [
+                {
+                  key: "error",
+                  value: JSON.stringify({
+                    message: error == null ? void 0 : error.message,
+                    stack: error == null ? void 0 : error.stack,
+                    name: error == null ? void 0 : error.name
+                  })
+                }
+              ]
+            });
+          }
+          modal.dispatch({
+            type: "setService",
+            payload: {
+              ...stateRef.current.service,
+              resourcesOrigin: data.list || [],
+              resourcesOriginMap: data.listMap,
+              reloadResourceModal: false
+            }
+          });
+          resolve(data);
+        } catch (error) {
+          (0, import_utils2.sendWarningLog)({
+            title: `获取资源失败`,
+            content: [
+              {
+                key: "error",
+                value: JSON.stringify({
+                  message: error == null ? void 0 : error.message,
+                  stack: error == null ? void 0 : error.stack,
+                  name: error == null ? void 0 : error.name
+                })
+              }
+            ]
+          });
+          modal.dispatch({
+            type: "setService",
+            payload: {
+              ...stateRef.current.service,
+              reloadResourceModal: true
+            }
+          });
+          reject(error);
+        }
+      }, timeoutNumber);
+    });
+  };
+  (0, import_ahooks.useDebounceEffect)(
+    () => {
+      if (currentDate) {
+        getResourcesData();
+      }
+    },
+    [currentDate],
+    {
+      wait: 300
+    }
+  );
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+    import_reloadResourceModal.default,
+    {
+      modal,
+      onReload: getResourcesData,
+      onCancel: () => {
         modal.dispatch({
           type: "setService",
           payload: {
             ...stateRef.current.service,
-            resourcesOrigin: data.list || [],
-            resourcesOriginMap: data.listMap
+            reloadResourceModal: false
           }
         });
-      }, timeoutNumber);
-    } catch (err) {
-      console.log(err, "err");
-    }
-  };
-  (0, import_ahooks.useDebounceEffect)(() => {
-    if (currentDate) {
-      getResourcesData();
+      }
     }
-  }, [currentDate], {
-    wait: 300
-  });
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !!modal.state.setGlobalState ? /* @__PURE__ */ import_react.default.createElement(
+  ), !!modal.state.setGlobalState ? /* @__PURE__ */ import_react.default.createElement(
     import_tabPane.default,
     {
-      style,
+      style: {
+        height: ((_k = (_j = context == null ? void 0 : context.appHelper) == null ? void 0 : _j.utils) == null ? void 0 : _k.isMobile) ? "100%" : "100vh"
+      },
       header,
       footer: /* @__PURE__ */ import_react.default.createElement(
         import_footer.default,
@@ -204,15 +273,31 @@ var Info = (0, import_model.Provider)((props) => {
           source: "info"
         }
       ),
-      style: {
-        height: ((_k = (_j = context == null ? void 0 : context.appHelper) == null ? void 0 : _j.utils) == null ? void 0 : _k.isMobile) ? "100%" : "100vh"
-      },
       bodyClassName: (0, import_classnames.default)("booking-info-warp", {
         ["create-booking-page-info-wrap"]: isBookingCreatePage,
         ["create-booking-page-info-wrap-create"]: isBookingCreatePageCreateMode
-      })
+      }),
+      state: modal.state,
+      dispatch: modal.dispatch,
+      source: "info"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_l = modal.state) == null ? void 0 : _l.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info-client-line" }, modules.client ? (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "hidden" } }, /* @__PURE__ */ import_react.default.createElement(import_cartClientCard.default, null)) : /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: "booking-info-client-line-code",
+        onClick: () => {
+          var _a2;
+          (_a2 = globalState == null ? void 0 : globalState.onQrCodeClick) == null ? void 0 : _a2.call(globalState);
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement(
+        import_materials.Iconfont,
+        {
+          type: "pisell2-a-qr-code-02",
+          style: { color: "#fff", fontSize: 42 }
+        }
+      )
+    ) : null), modules.holder && !((_l = modal.state) == null ? void 0 : _l.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Skeleton,
       {
         loading: globalState.loading,

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

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

@@ -47,7 +47,8 @@ var import_utils2 = require("./utils");
 var import_utils3 = require("../../../utils");
 var import_utils4 = require("@pisell/utils");
 var import_ahooks = require("ahooks");
-var import_utils5 = require("../../../../ticketBooking/utils");
+var import_utils5 = require("../../../info/service2/utils");
+var import_utils6 = require("../../../../ticketBooking/utils");
 var shopList = [
   2886,
   4422,
@@ -187,7 +188,19 @@ var Info = (props) => {
     }
   };
   const handleSelectProduct = (item, type) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2;
+    if (!(0, import_utils5.isNormalProductByDurationSchedule)(item)) {
+      if (!Array.isArray((_a2 = state.service) == null ? void 0 : _a2.resourcesOrigin) || !state.service.resourcesOrigin.length) {
+        dispatch({
+          type: "setService",
+          payload: {
+            ...state.service,
+            reloadResourceModal: true
+          }
+        });
+        return;
+      }
+    }
     const isSession = (0, import_utils3.isSessionProduct)(item);
     const isEject = (0, import_utils3.getIsEject)(item, type);
     const isOnlySession = (0, import_utils3.getIsOnlySession)(item);
@@ -202,12 +215,12 @@ var Info = (props) => {
           session: isSession,
           variant: true,
           package: true,
-          number: (0, import_utils5.getIsShowNumber)(item, state)
+          number: (0, import_utils6.getIsShowNumber)(item, state)
         },
         is_eject: isEject ? 1 : 0,
         isOnlySession,
         isOS: isSession,
-        customer_id: (_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id
+        customer_id: (_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id
       },
       callback: (e, extension_type, detail) => {
         var _a3;

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

@@ -288,15 +288,25 @@ var setDefaultCapacitys = ({ capacitys, cacheItem }) => {
   return [{ id: 0, value: 1, name: "" }];
 };
 var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
-  var _a;
+  var _a, _b;
   let _resources = [...((_a = cacheItem == null ? void 0 : cacheItem.product_resource) == null ? void 0 : _a.resources) || []];
-  const { extraResources = [] } = extraParams || {};
+  const {
+    extraResources = [],
+    resourcesOrigin = [],
+    resourceTab = {}
+  } = extraParams || {};
   _resources = _resources.filter((d) => d.status == 1);
   for (let item of _resources) {
     const form_id = item.id;
-    let extraResourceIds = extraResources.filter((_extraItem) => {
-      return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
-    }).map((_extraItem) => _extraItem.id);
+    const isAllResource = ((_b = resourceTab == null ? void 0 : resourceTab[item.code]) == null ? void 0 : _b.resource_display_scope) === "all";
+    let extraResourceIds = [];
+    if (isAllResource) {
+      extraResourceIds = (resourcesOrigin || []).filter((d) => d.form_code === item.code).map((d) => d.id);
+    } else {
+      extraResourceIds = extraResources.filter((_extraItem) => {
+        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));
     item.optional_resource = (item.optional_resource || []).filter(
       (d) => item.default_resource.indexOf(d) == -1
@@ -306,11 +316,11 @@ var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
       if (resourcesOriginMap[d].combined_resource && resourcesOriginMap[d].combined_resource.status === 1) {
         resourcesOriginMap[d].combined_resource.resource_ids.forEach(
           (id) => {
-            var _a2, _b;
+            var _a2, _b2;
             if (resourcesOriginMap[id]) {
               combiningResources.push({
                 ...resourcesOriginMap[id],
-                relation_id: ((_a2 = resourcesOriginMap[id]) == null ? void 0 : _a2.relation_id) || ((_b = resourcesOriginMap[id]) == null ? void 0 : _b.id)
+                relation_id: ((_a2 = resourcesOriginMap[id]) == null ? void 0 : _a2.relation_id) || ((_b2 = resourcesOriginMap[id]) == null ? void 0 : _b2.id)
               });
             }
           }
@@ -324,7 +334,9 @@ var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
         }
       };
     };
-    let optional_resource = [...item.optional_resource, ...extraResourceIds].map((d) => {
+    let optional_resource = Array.from(
+      /* @__PURE__ */ new Set([...item.optional_resource, ...extraResourceIds])
+    ).map((d) => {
       if (!resourcesOriginMap[d]) {
         return null;
       }
@@ -372,6 +384,7 @@ var getIsAutoClose = (cacheItem) => {
   );
 };
 var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
+  var _a, _b, _c, _d;
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
@@ -390,7 +403,12 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
     _cacheItem._data.capacitys = cacheItem.capacity;
     _cacheItem._data.resourcesOrigin = getResourceByIds(
       resourcesOriginMap,
-      cacheItem
+      cacheItem,
+      {
+        //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+        resourceTab: (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.resource_tab,
+        resourcesOrigin: state.service.resourcesOrigin
+      }
     );
     _cacheItem._extend.capacity = setDefaultCapacitys({
       capacitys: _cacheItem._data.capacitys,
@@ -446,7 +464,10 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         resourcesOriginMap,
         cacheItem,
         {
-          extraResources
+          extraResources,
+          //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+          resourceTab: (_d = (_c = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.resource_tab,
+          resourcesOrigin: state.service.resourcesOrigin
         }
       );
     }

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

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