@pisell/private-materials 3.2.38 → 3.3.0

package/es/components/booking/info/hooks/useHolderConfig.d.ts

@@ -0,0 +1,9 @@
+declare const useHolderConfig: (state: any) => {
+    appointment_subject: any;
+    holder: any;
+    isFormSubject: boolean;
+    isCustomerSubject: boolean;
+    isWalkInBol: boolean;
+    isShowChangeHolder: boolean;
+};
+export default useHolderConfig;

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

@@ -0,0 +1,40 @@
+import { useMemo } from 'react';
+import { isWalkIn } from "../../utils";
+var useHolderConfig = function useHolderConfig(state) {
+  var _state$bookingConfig2, _state$bookingConfig4, _state$client2;
+  // board设置, 获取预约主体
+  var appointment_subject = useMemo(function () {
+    var _state$bookingConfig;
+    return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_subject) || {};
+  }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.appointment_subject]);
+  var holder = useMemo(function () {
+    var _state$bookingConfig3;
+    return (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.holder) || {};
+  }, [state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.holder]);
+
+  // 配置主体为特定表单时
+  var isFormSubject = useMemo(function () {
+    return appointment_subject.type === 'form';
+  }, [appointment_subject.type]);
+  var isWalkInBol = useMemo(function () {
+    var _state$client;
+    return isWalkIn((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id);
+  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id]);
+
+  // 配置主体为特定表单时
+  var isCustomerSubject = useMemo(function () {
+    return appointment_subject.type === 'customer';
+  }, [appointment_subject.type]);
+  var isShowChangeHolder = useMemo(function () {
+    return isFormSubject && !isWalkInBol;
+  }, [isFormSubject, isWalkInBol]);
+  return {
+    appointment_subject: appointment_subject,
+    holder: holder,
+    isFormSubject: isFormSubject,
+    isCustomerSubject: isCustomerSubject,
+    isWalkInBol: isWalkInBol,
+    isShowChangeHolder: isShowChangeHolder
+  };
+};
+export default useHolderConfig;

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

@@ -0,0 +1,9 @@
+import { EditServiceRef } from "../service/editService";
+declare const useInfoHolder: (state: any, dispatch: any) => {
+    detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;
+    handleEdit: (cacheItem: any) => void;
+    dispatchService: (type: string, payload: any) => void;
+    handleAction: (dataSource: any) => void;
+    showAddTimeModal: boolean;
+};
+export default useInfoHolder;

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

@@ -0,0 +1,99 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+import { useMemoizedFn } from "ahooks";
+import { useEffect, useMemo, useRef } from "react";
+import useHolderConfig from "./useHolderConfig";
+import { isOpenAddTime } from "../utils";
+var useInfoHolder = function useInfoHolder(state, dispatch) {
+  var _state$client3, _state$bookingConfig2;
+  var detailRef = useRef();
+  var _useHolderConfig = useHolderConfig(state),
+    holder = _useHolderConfig.holder,
+    isFormSubject = _useHolderConfig.isFormSubject,
+    appointment_subject = _useHolderConfig.appointment_subject;
+  var getHolders = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _state$client, _state$client2;
+    var params, data;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(holder.data_range === 'customer' && !((_state$client = state.client) !== null && _state$client !== void 0 && (_state$client = _state$client.value) !== null && _state$client !== void 0 && _state$client.id))) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+        case 2:
+          params = {
+            form_id: appointment_subject.form_id,
+            source_shop_customer: holder === null || holder === void 0 ? void 0 : holder.is_franchisor,
+            customer_id: holder.data_range === 'customer' ? (_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id : undefined,
+            skip: 1,
+            num: 100
+          };
+          _context.next = 5;
+          return state.apis.getPetsData(params);
+        case 5:
+          data = _context.sent;
+          dispatch({
+            type: 'setPet',
+            payload: {
+              holders: data.list
+            }
+          });
+        case 7:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  useEffect(function () {
+    if (isFormSubject) {
+      getHolders();
+    }
+  }, [appointment_subject, holder, (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id]);
+  var appointment_card = useMemo(function () {
+    var _state$bookingConfig;
+    return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.information_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_card) || {
+      quick_time: 1
+    };
+  }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.information_tab]);
+  var showAddTimeModal = useMemo(function () {
+    return isOpenAddTime(state);
+  }, [state, appointment_card.quick_time]);
+  var handleEdit = function handleEdit(cacheItem) {
+    setTimeout(function () {
+      var _detailRef$current, _detailRef$current$in;
+      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem);
+    }, 100);
+  };
+  var dispatchService = function dispatchService(type, payload) {
+    dispatch({
+      type: type,
+      payload: _objectSpread({}, payload)
+    });
+  };
+  var handleAction = function handleAction(dataSource) {
+    dispatch({
+      type: "setService",
+      payload: {
+        addTimeModal: true,
+        cacheItem: dataSource._origin
+      }
+    });
+  };
+  return {
+    detailRef: detailRef,
+    handleEdit: handleEdit,
+    dispatchService: dispatchService,
+    handleAction: handleAction,
+    showAddTimeModal: showAddTimeModal
+  };
+};
+export default useInfoHolder;

package/es/components/booking/info/index.js

@@ -3,12 +3,19 @@ import Info2 from "../info2";
 import Info1 from "./main";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { isBooking4Shop } from "./utils";
+import { Skeleton } from "antd";
 var APP = function APP(props) {
-  var _context$appHelper$ut, _context$appHelper$ut2;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
   var context = useEngineContext();
   var globalState = props.globalState;
   var isBooking4 = isBooking4Shop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id, globalState === null || globalState === void 0 ? void 0 : globalState.renderType);
-
+  if (!((_context$appHelper$ut3 = context.appHelper.utils.store) !== null && _context$appHelper$ut3 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut3.getState) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut4.call(_context$appHelper$ut3)) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut4.global) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut4.globalConfig) !== null && _context$appHelper$ut4 !== void 0 && _context$appHelper$ut4.id)) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        padding: 16
+      }
+    }, /*#__PURE__*/React.createElement(Skeleton, null));
+  }
   // 当满足以下条件之一时使用 Info2:
   // 1. 是 Booking4 且没有 bookingId （新建）
   // 2. 是 Booking4 且有 bookingId 且是并行资源预订 （编辑）

package/es/components/booking/info/main.js

@@ -84,7 +84,7 @@ var Info = Provider(function (props) {
         isDayBooking: (globalState === null || globalState === void 0 ? void 0 : globalState.renderType) === 'dayBooking'
       })
     });
-  }, [JSON.stringify(globalState)]);
+  }, [globalState]);
   var addNote = function addNote(e) {
     modal.dispatch({
       type: 'setNotes',

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

@@ -38,7 +38,7 @@ var defaultParams = {
   keyword: ''
 };
 var Pet = function Pet(props) {
-  var _context$appHelper, _state2, _state$bookingConfig2, _state$client$value, _state$client10, _state$pet9, _state$client12;
+  var _context$appHelper, _state2, _state$bookingConfig2, _state$client$value, _state$client10, _state$pet10, _state$client12;
   var hideTitle = props.hideTitle,
     addButtonProps = props.addButtonProps,
     handleOpenModal = props.handleOpenModal,
@@ -180,7 +180,7 @@ var Pet = function Pet(props) {
     };
   }();
   var setPetOptions = function setPetOptions(options) {
-    var _state$pet, _state$client3, _state$pet2;
+    var _state$pet, _state$client3, _state$pet2, _state$pet3;
     var noClient = ((_state$pet = state.pet) === null || _state$pet === void 0 || (_state$pet = _state$pet.formData) === null || _state$pet === void 0 ? void 0 : _state$pet[0].data_range) === 'customer' && isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id);
     if (noClient) {
       return;
@@ -191,7 +191,8 @@ var Pet = function Pet(props) {
         formData: [_objectSpread(_objectSpread({}, (_state$pet2 = state.pet) === null || _state$pet2 === void 0 || (_state$pet2 = _state$pet2.formData) === null || _state$pet2 === void 0 ? void 0 : _state$pet2[0]), {}, {
           options: options
         })],
-        pets: options
+        pets: options,
+        holders: [options[0]].concat(_toConsumableArray((_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.holders))
       }
     });
   };
@@ -303,9 +304,9 @@ var Pet = function Pet(props) {
     };
   }();
   var updateResult = function updateResult(res, item) {
-    var _state$pet3;
+    var _state$pet4;
     var cur = _toConsumableArray(state.pet.value[petForm.form_id] || []);
-    var options = ((_state$pet3 = state.pet) === null || _state$pet3 === void 0 || (_state$pet3 = _state$pet3.formData) === null || _state$pet3 === void 0 || (_state$pet3 = _state$pet3[0]) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.options) || [];
+    var options = ((_state$pet4 = state.pet) === null || _state$pet4 === void 0 || (_state$pet4 = _state$pet4.formData) === null || _state$pet4 === void 0 || (_state$pet4 = _state$pet4[0]) === null || _state$pet4 === void 0 ? void 0 : _state$pet4.options) || [];
     if (res.type === 'delete') {
       var isDay = isDayBooking(state);
 
@@ -407,8 +408,8 @@ var Pet = function Pet(props) {
 
     // 如果传入options
     if (options) {
-      var _state$pet4;
-      updateObj.formData = [_objectSpread(_objectSpread({}, (_state$pet4 = state.pet) === null || _state$pet4 === void 0 || (_state$pet4 = _state$pet4.formData) === null || _state$pet4 === void 0 ? void 0 : _state$pet4[0]), {}, {
+      var _state$pet5;
+      updateObj.formData = [_objectSpread(_objectSpread({}, (_state$pet5 = state.pet) === null || _state$pet5 === void 0 || (_state$pet5 = _state$pet5.formData) === null || _state$pet5 === void 0 ? void 0 : _state$pet5[0]), {}, {
         options: options
       })];
       updateObj.pets = options;
@@ -424,12 +425,12 @@ var Pet = function Pet(props) {
 
   // 当客户id 发生改变时, 检测当前表单是否是该客户的, 如果不是则移除
   useEffect(function () {
-    var _state$pet5, _state$client9, _state$pet6;
+    var _state$pet6, _state$client9, _state$pet7;
     if (clientChangeNotSetPet) return;
     var changeFormValuesData = changeFormValues({
-      values: ((_state$pet5 = state.pet) === null || _state$pet5 === void 0 ? void 0 : _state$pet5.value) || {},
+      values: ((_state$pet6 = state.pet) === null || _state$pet6 === void 0 ? void 0 : _state$pet6.value) || {},
       clientId: (_state$client9 = state.client) === null || _state$client9 === void 0 || (_state$client9 = _state$client9.value) === null || _state$client9 === void 0 ? void 0 : _state$client9.id,
-      forms: ((_state$pet6 = state.pet) === null || _state$pet6 === void 0 ? void 0 : _state$pet6.formData) || []
+      forms: ((_state$pet7 = state.pet) === null || _state$pet7 === void 0 ? void 0 : _state$pet7.formData) || []
     });
     setTimeout(function () {
       dispatch({
@@ -459,8 +460,8 @@ var Pet = function Pet(props) {
     }, 10);
   }, [state.bookingId, state.bookingDetail, boardParams.form_id, boardParams.type, state.renderType, petForm, clientChangeNotSetPet ? (_state$client10 = state.client) === null || _state$client10 === void 0 || (_state$client10 = _state$client10.value) === null || _state$client10 === void 0 ? void 0 : _state$client10.id : undefined]);
   var _addCallback = useMemoizedFn(function (_params) {
-    var _state$pet7;
-    var _formData = (_state$pet7 = state.pet) === null || _state$pet7 === void 0 || (_state$pet7 = _state$pet7.formData) === null || _state$pet7 === void 0 ? void 0 : _state$pet7[0];
+    var _state$pet8;
+    var _formData = (_state$pet8 = state.pet) === null || _state$pet8 === void 0 || (_state$pet8 = _state$pet8.formData) === null || _state$pet8 === void 0 ? void 0 : _state$pet8[0];
     // if (_formData?.type === "multiple" || _formData?.type === "single") {
     getFormData({
       formData: _formData
@@ -475,8 +476,8 @@ var Pet = function Pet(props) {
     _addCallback(_params);
   });
   var loadMore = useMemo(function () {
-    var _state$pet8;
-    var show = ((_state$pet8 = state.pet) === null || _state$pet8 === void 0 || (_state$pet8 = _state$pet8.formData) === null || _state$pet8 === void 0 || (_state$pet8 = _state$pet8[0]) === null || _state$pet8 === void 0 || (_state$pet8 = _state$pet8.options) === null || _state$pet8 === void 0 ? void 0 : _state$pet8.length) < params.total || 0;
+    var _state$pet9;
+    var show = ((_state$pet9 = state.pet) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.formData) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9[0]) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.options) === null || _state$pet9 === void 0 ? void 0 : _state$pet9.length) < params.total || 0;
     return show ? /*#__PURE__*/React.createElement("div", {
       className: "",
       style: {
@@ -492,7 +493,7 @@ var Pet = function Pet(props) {
         _addCallback(_params);
       }
     }, locales.getText('pisell2.text.load-more'))) : null;
-  }, [loadLoading, params, (_state$pet9 = state.pet) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.formData) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9[0]) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.options) === null || _state$pet9 === void 0 ? void 0 : _state$pet9.length]);
+  }, [loadLoading, params, (_state$pet10 = state.pet) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10.formData) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10[0]) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10.options) === null || _state$pet10 === void 0 ? void 0 : _state$pet10.length]);
   var handleDayChange = function handleDayChange(e) {
     var _state$service$value;
     var id = e === null || e === void 0 ? void 0 : e.form_record_id;
@@ -542,10 +543,10 @@ var Pet = function Pet(props) {
         value: state.pet.value
       },
       addCallback: function addCallback(formDataConfig, data) {
-        var _state$pet10;
+        var _state$pet11;
         setPetOptions([_objectSpread(_objectSpread({}, data), {}, {
           form_id: formDataConfig === null || formDataConfig === void 0 ? void 0 : formDataConfig.form_id
-        })].concat(_toConsumableArray(((_state$pet10 = state.pet) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10.formData) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10[0]) === null || _state$pet10 === void 0 ? void 0 : _state$pet10.options) || [])));
+        })].concat(_toConsumableArray(((_state$pet11 = state.pet) === null || _state$pet11 === void 0 || (_state$pet11 = _state$pet11.formData) === null || _state$pet11 === void 0 || (_state$pet11 = _state$pet11[0]) === null || _state$pet11 === void 0 ? void 0 : _state$pet11.options) || [])));
       },
       loading: valueLoading,
       forms: state.pet.formData,

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

@@ -0,0 +1,2 @@
+declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
+export default Lists;

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

@@ -0,0 +1,119 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import React, { useContext, useMemo } from 'react';
+import ShoppingCart from "../../../shoppingCart";
+import { CartContext } from "../../../shoppingCart/Provider";
+import { Context } from "../model";
+import { formatProducts, isEventBooking, updateServices } from "../service2/utils";
+import useHolderConfig from "../hooks/useHolderConfig";
+import { useMemoizedFn } from "ahooks";
+import { getProductExtend } from "../../info2/service/addService/utils";
+import useAddHolder from "../hooks/useAddHolder";
+var Lists = function Lists(_ref) {
+  var _state$service;
+  var onEdit = _ref.onEdit,
+    onChange = _ref.onChange,
+    onAction = _ref.onAction,
+    isParallelResource = _ref.isParallelResource;
+  var _useContext = useContext(Context),
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
+  var _useHolderConfig = useHolderConfig(state),
+    isShowChangeHolder = _useHolderConfig.isShowChangeHolder;
+  var handleAddHolder = useAddHolder(state, dispatch);
+
+  /**
+   * @title: 更新商品数据
+   * @description:
+   * @param {any} newState
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-11-29 16:35
+   */
+  var handleChange = useMemoizedFn(function (currentItem, type, other) {
+    if (state.disabledEdit || state.disableEventBookingEdit) {
+      return;
+    }
+    var products = updateServices(state, currentItem, type, other, {
+      handleAddHolder: handleAddHolder
+    });
+
+    // 查看
+    if (type === 'view') {
+      var product = currentItem._origin;
+      var cacheItem = _objectSpread(_objectSpread({}, product), {}, {
+        new: 0
+      });
+      if (isParallelResource) {
+        cacheItem = getProductExtend({
+          cacheItem: cacheItem,
+          state: state
+        });
+      }
+      onChange({
+        editModal: true,
+        cacheItem: cacheItem
+      });
+      return onEdit === null || onEdit === void 0 ? void 0 : onEdit(_objectSpread(_objectSpread({}, product), {}, {
+        new: 0
+      }));
+    }
+    var params = {
+      editModal: false,
+      value: products,
+      edit: true,
+      cacheItem: null
+    };
+    onChange(params);
+  });
+
+  /**
+   * @title: 商品信息
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-12-09 16:07
+   */
+  var productParams = useMemo(function () {
+    return {
+      hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
+      isShowNote: isEventBooking(state),
+      isShowPackageNote: false,
+      accounts: [],
+      isEdit: !!(state !== null && state !== void 0 && state.bookingId),
+      disabledEdit: state === null || state === void 0 ? void 0 : state.disabledEdit,
+      maxLength: isEventBooking(state) ? 1 : 999,
+      isShowChangeHolder: isShowChangeHolder,
+      isShowChangeResource: true,
+      isShowAddHolderButton: true
+    };
+  }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage]);
+  return /*#__PURE__*/React.createElement(CartContext.Provider, {
+    value: {
+      state: state
+    }
+  }, /*#__PURE__*/React.createElement(ShoppingCart, {
+    isParallelResource: isParallelResource,
+    onAction: onAction,
+    onChange: handleChange,
+    isOpenGroup: false,
+    isHideClearCart: true,
+    onAddProduct: function onAddProduct() {
+      return onChange({
+        addModal: true
+      });
+    }
+    // onActiveKey={handleActiveKey}
+    // collapseParams={CollapseParams}
+    ,
+    productParams: _objectSpread(_objectSpread({}, productParams), {}, {
+      products: formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource)
+    })
+  }));
+};
+export default Lists;

package/es/components/booking/info/service/addService/index.d.ts

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

package/es/components/booking/info/service/addService/index.js

@@ -28,7 +28,7 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import TabProduct from "../../../components/TabProduct";
 import AddButton from "../../../components/addButton";
 import Drawer from "../../../components/drawer";
-import { formatProductListByCategory, request } from "../../../utils";
+import { formatProductListByCategory, isSessionProduct, request } from "../../../utils";
 import DateRange from "../../dateRange";
 import { Context } from "../../model";
 import { appointmentTypes, inputDateCol } from "../../service2/status";
@@ -254,7 +254,7 @@ var Info = function Info(props) {
             return state.apis.getServices(_objectSpread(_objectSpread({
               skip: 1,
               num: 500,
-              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket'],
+              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket'],
               with: ['category'],
               ids: state.renderType === 'eventBooking' ? (_state$eventOtherPara2 = state.eventOtherParams) === null || _state$eventOtherPara2 === void 0 ? void 0 : _state$eventOtherPara2.productIds : undefined,
               open_quotation: 1,
@@ -313,8 +313,9 @@ var Info = function Info(props) {
     }
   };
   var handleSelectProduct = useMemoizedFn(function (item, type) {
+    var isSession = isSessionProduct(item);
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0;
+    var isEject = type === 'detail' || item.bundle_group_count > 0 || isSession;
 
     // 跨日预约开启单规格 组合规格 套餐
     if (isDay) {
@@ -327,12 +328,13 @@ var Info = function Info(props) {
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: isDay ? true : false,
-          session: false,
+          session: isSession,
           variant: isDay ? true : false,
           package: true
         },
         is_eject: isEject ? 1 : 0,
-        customer_id: customerId
+        customer_id: customerId,
+        isOS: isSession
       },
       callback: function () {
         var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e, extension_type, detail) {

package/es/components/booking/info/service/addTimeModal/index.d.ts

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

package/es/components/booking/info/service/editService/index.js

@@ -36,7 +36,7 @@ import "./index.less";
 import { Page, PisellAdjustPriceInputNumber } from '@pisell/materials';
 import dayjs from 'dayjs';
 import { getNoResource } from "../../../mock";
-import { getDays, getErrorList, getProductTotalPrice } from "../../../utils";
+import { getDays, getErrorList, getProductTotalPrice, isSessionProduct } from "../../../utils";
 import { createBookingItemsByGroup, filterItemByGroupId, getGroupTotalPrice, isGroupBooking } from "../../service2/Group/utils";
 import useSelectPet from "../../service2/hooks/useSelectPet";
 import { disabledDate as _disabledDate, formatDayTime, isDayBooking, isDayBookingProduct, isEventBooking } from "../../service2/utils";
@@ -667,6 +667,7 @@ var Info = function Info(_, ref) {
       dayValue.product_variant = ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.product_variant_id) || 0;
       dayValue.product_option = option || [];
     }
+    var isSession = isSessionProduct(item);
 
     // 打开商品详情弹窗
     state.action({
@@ -676,11 +677,12 @@ var Info = function Info(_, ref) {
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: isDayBookingMode ? true : false,
-          session: false,
+          session: isSession,
           variant: isDayBookingMode ? true : false,
           package: true
         },
         value: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), dayValue),
+        isOS: isSession,
         customer_id: isDayBookingMode ? ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || 1 : undefined
       },
       callback: function () {
@@ -1064,13 +1066,13 @@ var Info = function Info(_, ref) {
       }]
     }, /*#__PURE__*/React.createElement(Duration, _extends({}, durationProps, {
       timeObj: timeObj
-    })))), isDayBookingMode && (holderLists === null || holderLists === void 0 ? void 0 : holderLists.length) > 0 ? /*#__PURE__*/React.createElement(Col, {
-      span: 12
+    })))), (holderLists === null || holderLists === void 0 ? void 0 : holderLists.length) > 0 ? /*#__PURE__*/React.createElement(Col, {
+      span: isDayBookingMode ? 12 : 24
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: locales.getText('pisell2.text.holder'),
       name: "holder_id",
       rules: [{
-        required: true
+        required: isDayBookingMode
       }]
     }, /*#__PURE__*/React.createElement(Holder, {
       size: "large"

package/es/components/booking/info/service/index.js

@@ -49,9 +49,9 @@ var Service = function Service() {
     className: "pisell-lowcode__booking-service-wrap"
   }, clearCart, /*#__PURE__*/React.createElement(ServiceList, {
     onEdit: handleEdit
-  }), /*#__PURE__*/React.createElement(AddService, {
+  }), !state.isBookingCreatePage ? /*#__PURE__*/React.createElement(AddService, {
     onEdit: handleEdit
-  })), /*#__PURE__*/React.createElement(EditService, {
+  }) : null), /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
   }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null));
 };

package/es/components/booking/info/service/serviceList/index.js

@@ -26,6 +26,7 @@ var ServiceList = function ServiceList(_ref) {
   var errorTypes = {
     product: locales.getText('pisell2.text.status.service-error-1'),
     time: locales.getText('pisell2.text.status.service-error-2'),
+    limit: locales.getText('pisell2.text.status.service-error-3'),
     maxLimit: locales.getText('pisell2.text.status.service-error-3')
   };
   var handleEditService = function handleEditService(item) {