@pisell/private-materials 3.3.16 → 3.3.17

package/lib/components/booking/info/hooks/useAddHolder.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,21 +16,33 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/booking/info/hooks/useAddHolder.ts
 var useAddHolder_exports = {};
 __export(useAddHolder_exports, {
-  default: () => useAddHolder_default
+  default: () => useAddHolder_default,
+  useFormDataConfig: () => useFormDataConfig
 });
 module.exports = __toCommonJS(useAddHolder_exports);
 var import_utils = require("../../utils");
 var import_react = require("react");
-var useAddHolder = (state, dispatch) => {
+var import_serve = require("../pet/serve");
+var import_useGetHolderList = __toESM(require("./useGetHolderList"));
+var import_utils2 = require("../service2/utils");
+var useFormDataConfig = (state) => {
   var _a;
   const formDataConfig = (0, import_react.useMemo)(() => {
     var _a2, _b, _c;
-    let _holder = (_a2 = state.bookingConfig) == null ? void 0 : _a2.holder;
+    let _holder = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.holder;
     if (!_holder) {
       return null;
     }
@@ -41,33 +55,91 @@ var useAddHolder = (state, dispatch) => {
       relation_type: "appointment_booking",
       form_record: []
     };
-  }, [(_a = state.bookingConfig) == null ? void 0 : _a.holder]);
-  const handleAddHolder = () => {
-    var _a2, _b, _c;
+  }, [(_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.holder]);
+  const isMinorAndWaiver = (0, import_react.useMemo)(() => {
+    var _a2;
+    if ((formDataConfig == null ? void 0 : formDataConfig.form_type) === "minors") {
+      const detail = formDataConfig == null ? void 0 : formDataConfig.form_field.find((item) => item.filed_type === "form_to_form" && item.status === "hide");
+      if (detail) {
+        return (_a2 = detail == null ? void 0 : detail.setting) == null ? void 0 : _a2.linkedTable;
+      }
+      return false;
+    }
+    return false;
+  }, [formDataConfig]);
+  return {
+    formDataConfig,
+    isMinorAndWaiver
+  };
+};
+var useAddHolder = (state, dispatch) => {
+  const [waiverForm, setWaiverForm] = (0, import_react.useState)(null);
+  const getHolders = (0, import_useGetHolderList.default)(state, dispatch);
+  const { formDataConfig, isMinorAndWaiver } = useFormDataConfig(state);
+  (0, import_react.useEffect)(() => {
+    if (isMinorAndWaiver) {
+      (0, import_serve.getFormDetail)(isMinorAndWaiver).then((res) => {
+        setWaiverForm(res);
+        dispatch({
+          type: "setPet",
+          payload: {
+            waiverForm: res
+          }
+        });
+      });
+    }
+  }, [isMinorAndWaiver]);
+  const handleAddHolder = (products, currentItem) => {
+    var _a, _b, _c, _d, _e;
     let _data = {
-      formDataConfig: { ...formDataConfig }
+      formDataConfig: isMinorAndWaiver ? { ...waiverForm, customer_id: (_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id } : { ...formDataConfig }
     };
-    const isWalkInBol = (0, import_utils.isWalkIn)((_b = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b.id);
+    const isWalkInBol = (0, import_utils.isWalkIn)((_d = (_c = state.client) == null ? void 0 : _c.value) == null ? void 0 : _d.id);
     if (formDataConfig.data_range === "customer" && !isWalkInBol) {
-      _data.customerId = (_c = state.client) == null ? void 0 : _c.value.id;
+      _data.customerId = (_e = state.client) == null ? void 0 : _e.value.id;
     }
     state.action({
       type: "pisell1.goCustomFormAddData",
       data: _data,
-      callback: (res) => {
+      callback: async (res) => {
+        var _a2, _b2;
         let obj = {};
         for (let item of res) {
           obj[item.key] = item.value;
         }
-        dispatch({
-          type: "setPet",
-          payload: {
-            holders: !isWalkInBol ? [obj, ...state.pet.holders] : state.pet.holders
+        if (isMinorAndWaiver) {
+          const oldList = ((_a2 = state == null ? void 0 : state.pet) == null ? void 0 : _a2.holders) || [];
+          const formValue = ((_b2 = (obj["form_to_form_value"] || []).find((item) => item.form_id === formDataConfig.form_id)) == null ? void 0 : _b2.form_data_value) || [];
+          const selectId = Math.max(...formValue);
+          const oldDetail = oldList.find((item) => item.form_record_id === selectId);
+          await getHolders();
+          if (formValue.length && !oldDetail) {
+            const value = (0, import_utils2.handleChangeHolder)(products, currentItem, { id: selectId });
+            dispatch({
+              type: "setService",
+              payload: {
+                value
+              }
+            });
           }
-        });
+        } else {
+          dispatch({
+            type: "setPet",
+            payload: {
+              holders: !isWalkInBol ? [obj, ...state.pet.holders] : state.pet.holders
+            }
+          });
+        }
       }
     });
   };
-  return handleAddHolder;
+  return {
+    handleAddHolder,
+    waiverForm
+  };
 };
 var useAddHolder_default = useAddHolder;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useFormDataConfig
+});

package/lib/components/booking/info/hooks/useGetHolderList.d.ts

@@ -0,0 +1,2 @@
+declare const useGetHolderList: (state: any, dispatch: any) => () => Promise<void>;
+export default useGetHolderList;

package/lib/components/booking/info/hooks/useGetHolderList.js

@@ -0,0 +1,61 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info/hooks/useGetHolderList.ts
+var useGetHolderList_exports = {};
+__export(useGetHolderList_exports, {
+  default: () => useGetHolderList_default
+});
+module.exports = __toCommonJS(useGetHolderList_exports);
+var import_ahooks = require("ahooks");
+var import_useHolderConfig = __toESM(require("./useHolderConfig"));
+var useGetHolderList = (state, dispatch) => {
+  const { holder, appointment_subject } = (0, import_useHolderConfig.default)(state);
+  const getHolders = (0, import_ahooks.useMemoizedFn)(async () => {
+    var _a, _b, _c, _d;
+    if (holder.data_range === "customer" && !((_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id)) {
+      return;
+    }
+    const params = {
+      form_id: appointment_subject.form_id,
+      source_shop_customer: holder == null ? void 0 : holder.is_franchisor,
+      customer_id: holder.data_range === "customer" ? (_d = (_c = state.client) == null ? void 0 : _c.value) == null ? void 0 : _d.id : void 0,
+      skip: 1,
+      num: 100
+    };
+    const data = await state.apis.getPetsData(params);
+    dispatch({
+      type: "setPet",
+      payload: {
+        holders: data.list
+      }
+    });
+  });
+  return getHolders;
+};
+var useGetHolderList_default = useGetHolderList;

package/lib/components/booking/info/hooks/useHolderConfig.js

@@ -39,8 +39,8 @@ var useHolderConfig = (state) => {
   }, [appointment_subject.type]);
   const isWalkInBol = (0, import_react.useMemo)(() => {
     var _a2, _b2;
-    return (0, import_utils.isWalkIn)((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id);
-  }, [(_f = (_e = state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.id]);
+    return (0, import_utils.isWalkIn)((_b2 = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id);
+  }, [(_f = (_e = state == null ? void 0 : state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.id]);
   const isCustomerSubject = (0, import_react.useMemo)(() => {
     return appointment_subject.type === "customer";
   }, [appointment_subject.type]);

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

package/lib/components/booking/info/hooks/useInfoHolder.js

@@ -32,34 +32,15 @@ __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");
+var import_useGetHolderList = __toESM(require("./useGetHolderList"));
 var useInfoHolder = (state, dispatch) => {
   var _a, _b, _c, _d;
   const detailRef = (0, import_react.useRef)();
   const { holder, isFormSubject, appointment_subject } = (0, import_useHolderConfig.default)(state);
-  const getHolders = (0, import_ahooks.useMemoizedFn)(async () => {
-    var _a2, _b2, _c2, _d2;
-    if (holder.data_range === "customer" && !((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id)) {
-      return;
-    }
-    const params = {
-      form_id: appointment_subject.form_id,
-      source_shop_customer: holder == null ? void 0 : holder.is_franchisor,
-      customer_id: holder.data_range === "customer" ? (_d2 = (_c2 = state.client) == null ? void 0 : _c2.value) == null ? void 0 : _d2.id : void 0,
-      skip: 1,
-      num: 100
-    };
-    const data = await state.apis.getPetsData(params);
-    dispatch({
-      type: "setPet",
-      payload: {
-        holders: data.list
-      }
-    });
-  });
+  const getHolders = (0, import_useGetHolderList.default)(state, dispatch);
   (0, import_react.useEffect)(() => {
     if (isFormSubject) {
       getHolders();

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

@@ -45,6 +45,9 @@ var import_utils3 = require("../../utils");
 var import_model = require("../model");
 var import_ChangePetModal = __toESM(require("./ChangePetModal"));
 var import_index = require("./index.less");
+var import_useAddHolder = __toESM(require("../hooks/useAddHolder"));
+var import_useGetHolderList = __toESM(require("../hooks/useGetHolderList"));
+var import_dayjs = __toESM(require("dayjs"));
 var defaultParams = {
   skip: 1,
   num: 20,
@@ -70,6 +73,10 @@ var Pet = (props) => {
   const changePetRef = (0, import_react.useRef)(null);
   state = state || (props == null ? void 0 : props.state);
   dispatch = dispatch || (props == null ? void 0 : props.dispatch);
+  const { waiverForm } = (0, import_useAddHolder.default)(state, dispatch);
+  const { isMinorAndWaiver } = (0, import_useAddHolder.useFormDataConfig)(state);
+  const getHolders = (0, import_useGetHolderList.default)(state, dispatch);
+  console.log("waiver", props, state);
   const boardParams = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
@@ -109,7 +116,14 @@ var Pet = (props) => {
       if (_params.skip === 1) {
         _list = (data == null ? void 0 : data.list) || [];
       } else {
-        _list = _list.concat((data == null ? void 0 : data.list) || []);
+        ((data == null ? void 0 : data.list) || []).forEach((item) => {
+          const index = _list.findIndex((old) => old.id === item.id);
+          if (index > -1) {
+            _list[index] = item;
+          } else {
+            _list.push(item);
+          }
+        });
       }
       setParams({
         ...params,
@@ -354,7 +368,7 @@ var Pet = (props) => {
   const addCallback = (0, import_ahooks.useMemoizedFn)((_params) => {
     var _a2, _b2;
     let _formData = (_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0];
-    getFormData({ formData: _formData }, _params);
+    getFormData({ formData: _formData }, _params || params);
   });
   const searchChange = (0, import_ahooks.useMemoizedFn)((keyword) => {
     let _params = {
@@ -405,27 +419,56 @@ var Pet = (props) => {
     }
     return {};
   }, [state.renderType, state.service.value]);
-  return (0, import_react.useMemo)(() => {
+  const ignoreValidity = (0, import_react.useMemo)(() => {
     var _a2;
+    return !((_a2 = petForm == null ? void 0 : petForm.setting) == null ? void 0 : _a2.validity) || petForm.setting.validity.type === "no_expiry";
+  }, [petForm]);
+  const getExpireStatus = (expiredAt) => {
+    if (ignoreValidity || !expiredAt) return null;
+    const now = (0, import_dayjs.default)();
+    const expireDate = (0, import_dayjs.default)(expiredAt).endOf("day");
+    const diffDays = expireDate.diff(now, "day");
+    const formattedDate = expireDate.format("YYYY-MM-DD");
+    if (now.isAfter(expireDate)) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#999999", fontSize: "14px", lineHeight: "20px" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Tag, { color: "red", style: { borderRadius: 16, marginRight: 8 } }, import_utils.locales.getText("pisell2.text.status.expired")), import_utils.locales.getText("pisell2.text.validity.expired")(formattedDate));
+    }
+    if (diffDays <= 7) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#FFA940", fontSize: "14px", lineHeight: "20px" } }, import_utils.locales.getText("pisell2.text.validity.expiring_soon")(
+        formattedDate
+      ));
+    }
+    return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#999999", fontSize: "14px", lineHeight: "20px" } }, import_utils.locales.getText("pisell2.text.validity.valid_through")(formattedDate));
+  };
+  return (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    let canEdit = true;
+    if ((_a2 = petForm == null ? void 0 : petForm.setting) == null ? void 0 : _a2.permissions) {
+      const { staff = [] } = ((_b2 = petForm == null ? void 0 : petForm.setting) == null ? void 0 : _b2.permissions) || {};
+      canEdit = staff.includes("edit");
+    }
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-wraps" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: valueLoading, active: true, round: true }, /* @__PURE__ */ import_react.default.createElement(
       import_forms.default,
       {
+        isMinorAndWaiver,
+        waiverForm,
         hideTitle,
         watch: { value: state.pet.value },
         addCallback: (formDataConfig, data) => {
-          var _a3, _b2, _c2;
+          var _a3, _b3, _c3;
           setPetOptions([
             { ...data, form_id: formDataConfig == null ? void 0 : formDataConfig.form_id },
-            ...((_c2 = (_b2 = (_a3 = state.pet) == null ? void 0 : _a3.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.options) || []
+            ...((_c3 = (_b3 = (_a3 = state.pet) == null ? void 0 : _a3.formData) == null ? void 0 : _b3[0]) == null ? void 0 : _c3.options) || []
           ]);
         },
+        getHolders,
+        addCallbackService: addCallback,
         loading: valueLoading,
         forms: state.pet.formData,
         action: state.action,
         modalOpen: state.modalOpen,
         value: state.pet.value,
         onChange: onValueChange,
-        client: (_a2 = state.client) == null ? void 0 : _a2.value,
+        client: (_c2 = state.client) == null ? void 0 : _c2.value,
         customSelectProps: {
           loading,
           handleViewItem,
@@ -447,6 +490,7 @@ var Pet = (props) => {
           ...dayCustomSelect
         },
         optionRender: (item) => {
+          console.log("waiver", petForm, item);
           return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
             import_antd.Avatar,
             {
@@ -454,7 +498,7 @@ var Pet = (props) => {
               src: item.cover,
               icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-pet-list-item-avatar-icon" })
             }
-          ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-list-item-info-name" }, item.main_field), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-list-item-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.key_age))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-list-item-actions" }, /* @__PURE__ */ import_react.default.createElement(
+          ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-list-item-info-name" }, item.main_field), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-list-item-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.key_age)), /* @__PURE__ */ import_react.default.createElement("div", null, getExpireStatus(item.expired_at))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-list-item-actions" }, /* @__PURE__ */ import_react.default.createElement(
             "div",
             {
               className: "pisell-lowcode__booking-pet-list-item-actions-view",
@@ -465,7 +509,7 @@ var Pet = (props) => {
               }
             },
             import_utils.locales.getText("pisell2.text.view")
-          ), /* @__PURE__ */ import_react.default.createElement(
+          ), canEdit ? /* @__PURE__ */ import_react.default.createElement(
             "div",
             {
               className: "pisell-lowcode__booking-pet-list-item-actions-edit",
@@ -476,7 +520,7 @@ var Pet = (props) => {
               }
             },
             import_utils.locales.getText("pisell2.text.edit")
-          )));
+          ) : null));
         },
         addButtonProps: {
           style: { margin: 0 },
@@ -505,7 +549,10 @@ var Pet = (props) => {
     params.search,
     loadMore,
     addButtonProps,
-    state.isBookingCreatePage
+    state.isBookingCreatePage,
+    isMinorAndWaiver,
+    waiverForm,
+    petForm
   ]);
 };
 var pet_default = Pet;

package/lib/components/booking/info/pet/serve.d.ts

@@ -0,0 +1 @@
+export declare const getFormDetail: (id: number) => Promise<any>;

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

@@ -0,0 +1,33 @@
+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/info/pet/serve.ts
+var serve_exports = {};
+__export(serve_exports, {
+  getFormDetail: () => getFormDetail
+});
+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}`);
+  return data;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getFormDetail
+});

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

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

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

@@ -45,7 +45,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
   var _a;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const { isShowChangeHolder } = (0, import_useHolderConfig.default)(state);
-  const handleAddHolder = (0, import_useAddHolder.default)(state, dispatch);
+  const { handleAddHolder } = (0, import_useAddHolder.default)(state, dispatch);
   const handleChange = (0, import_ahooks.useMemoizedFn)((currentItem, type, other) => {
     if (state.disabledEdit || state.disableEventBookingEdit) {
       return;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -39,6 +39,7 @@ export declare const isBookingProduct: (extension_type: any, bol?: boolean) => b
  * @Date: 2024-12-06 11:24
  */
 export declare const isDayBookingProduct: (item: any, state: any) => boolean | undefined;
+export declare const handleChangeHolder: (products: any[], currentItem: any, other: any) => any[];
 /**
  * @title: 更新商品数据
  * @description:
@@ -53,6 +54,7 @@ export declare const isDayBookingProduct: (item: any, state: any) => boolean | u
  */
 export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any, actions?: any) => any;
 export declare const formItems: (items: any[]) => any[];
+export declare const getIsSubjectRequire: (state: any) => boolean;
 /**
  * @title: 格式化商品数据
  * @description:

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

@@ -40,8 +40,10 @@ __export(utils_exports, {
   getAppointmentService: () => getAppointmentService,
   getDayProducts: () => getDayProducts,
   getErrorMessage: () => getErrorMessage,
+  getIsSubjectRequire: () => getIsSubjectRequire,
   getPets: () => getPets,
   getResourceItem: () => getResourceItem,
+  handleChangeHolder: () => handleChangeHolder,
   holderId: () => holderId,
   initDate: () => initDate,
   isAppointmentProduct: () => isAppointmentProduct,
@@ -274,7 +276,7 @@ var handleChangeResource = (products, currentItem, other, state) => {
   });
 };
 var updateServices = (state, currentItem, type, other, actions) => {
-  var _a, _b;
+  var _a, _b, _c;
   if (!((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value)) return [];
   let products = ((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) || [];
   const isGroup = (0, import_utils3.isGroupBooking)(currentItem._id);
@@ -299,7 +301,7 @@ var updateServices = (state, currentItem, type, other, actions) => {
     products = handleChangeHolder(products, currentItem, other);
   }
   if (type === "add_holder") {
-    actions == null ? void 0 : actions.handleAddHolder();
+    (_c = actions == null ? void 0 : actions.handleAddHolder) == null ? void 0 : _c.call(actions, products, currentItem);
     return products;
   }
   if (type === "like") {
@@ -432,10 +434,14 @@ var mapListItems = (items) => items.map((item) => ({
   label: item.labelText,
   isError: !item.usable
 }));
+var getIsSubjectRequire = (state) => {
+  var _a, _b, _c, _d, _e, _f, _g;
+  return ((_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.type) === "form" && ((_g = (_f = (_e = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic) == null ? void 0 : _g.subject_require) === "require";
+};
 var getGeneralParams = (item, state, isParallelResource) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g;
   const { pet, service } = state;
-  const { holders = [] } = pet || {};
+  const { holders = [], formData } = pet || {};
   const parallelResourceOtherParams = {};
   let multiResources;
   if (isParallelResource) {
@@ -491,9 +497,11 @@ var getGeneralParams = (item, state, isParallelResource) => {
     actionText: import_utils2.locales.getText("page.booking.text.add-time"),
     isMultipleResource: true,
     multiResources,
-    holder_id: (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.holder_id,
-    start_date: (_c = item == null ? void 0 : item._extend) == null ? void 0 : _c.startDate,
-    end_date: ((_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.endDate) || ((_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.end_date),
+    isErrorHolder: getIsSubjectRequire(state),
+    addHolderButtonText: ((_c = (_b = formData == null ? void 0 : formData[0]) == null ? void 0 : _b.form) == null ? void 0 : _c.title) || "",
+    holder_id: (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.holder_id,
+    start_date: (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.startDate,
+    end_date: ((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.endDate) || ((_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.end_date),
     ...parallelResourceOtherParams
   };
 };
@@ -941,8 +949,10 @@ var updateServicePrice = (state) => {
   getAppointmentService,
   getDayProducts,
   getErrorMessage,
+  getIsSubjectRequire,
   getPets,
   getResourceItem,
+  handleChangeHolder,
   holderId,
   initDate,
   isAppointmentProduct,

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -22,6 +22,7 @@ export declare const getErrorList: (resource: any, cacheItem: any) => {
  * @Date: 2024-01-09 13:40
  */
 export declare const formatResource: (resourceItem: any, cacheItem?: any, formatLabel?: any) => any;
+export declare const getAppointmentTimingPreference: (state: any) => any;
 /**
  * @title: 创建服务的开始时间和结束时间
  * @description:

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

@@ -31,6 +31,7 @@ var utilsByBooking_exports = {};
 __export(utilsByBooking_exports, {
   formatResource: () => formatResource,
   formatTimes: () => formatTimes,
+  getAppointmentTimingPreference: () => getAppointmentTimingPreference,
   getErrorList: () => getErrorList,
   getResourceTimeIsUsable: () => getResourceTimeIsUsable,
   getServiceStartTimeAndEndTime: () => getServiceStartTimeAndEndTime,
@@ -198,8 +199,13 @@ var formatResource = (resourceItem, cacheItem, formatLabel) => {
   }
   return _resourceItem;
 };
+var getAppointmentTimingPreference = (state) => {
+  var _a, _b, _c;
+  return ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.information_tab) == null ? void 0 : _c.appointment_timing_preference) || "sequential";
+};
 var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   var _a, _b, _c;
+  const appointmentTimingPreference = getAppointmentTimingPreference(state);
   let lastServer = (0, import_utils2.getLastServer)(state.service.value);
   let _extend = {
     // 时长: 当前商品时长 > 第一个时长
@@ -215,7 +221,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
     if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
       _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
     } else {
-      _extend.start_time = lastServerEndDate.format("HH:mm");
+      _extend.start_time = appointmentTimingPreference === "sequential" ? lastServerEndDate.format("HH:mm") : lastServerStartDate.format("HH:mm");
     }
   } else {
     let findNextSliceProps = {
@@ -260,6 +266,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
 0 && (module.exports = {
   formatResource,
   formatTimes,
+  getAppointmentTimingPreference,
   getErrorList,
   getResourceTimeIsUsable,
   getServiceStartTimeAndEndTime,