@pisell/private-materials 3.3.16 → 3.3.17

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

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import User01 from '@pisell/icon/es/User01';
 import { locales } from '@pisell/utils';
 import { useMemoizedFn } from 'ahooks';
-import { Avatar, Button, Skeleton } from 'antd';
+import { Avatar, Button, Skeleton, Tag } from 'antd';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { changeFormValues, sortFormValues } from "../../forms/format";
@@ -31,6 +31,9 @@ import { isWalkIn } from "../../utils";
 import { Context } from "../model";
 import ChangePetModal from "./ChangePetModal";
 import "./index.less";
+import useAddHolder, { useFormDataConfig } from "../hooks/useAddHolder";
+import useGetHolderList from "../hooks/useGetHolderList";
+import dayjs from 'dayjs';
 var defaultParams = {
   skip: 1,
   num: 20,
@@ -69,6 +72,12 @@ var Pet = function Pet(props) {
   var changePetRef = useRef(null);
   state = state || (props === null || props === void 0 ? void 0 : props.state);
   dispatch = dispatch || (props === null || props === void 0 ? void 0 : props.dispatch);
+  var _useAddHolder = useAddHolder(state, dispatch),
+    waiverForm = _useAddHolder.waiverForm;
+  var _useFormDataConfig = useFormDataConfig(state),
+    isMinorAndWaiver = _useFormDataConfig.isMinorAndWaiver;
+  var getHolders = useGetHolderList(state, dispatch);
+  console.log('waiver', props, state);
   // board设置, 获取预约主体
   var boardParams = useMemo(function () {
     var _state;
@@ -145,7 +154,16 @@ var Pet = function Pet(props) {
             if (_params.skip === 1) {
               _list = (data === null || data === void 0 ? void 0 : data.list) || [];
             } else {
-              _list = _list.concat((data === null || data === void 0 ? void 0 : data.list) || []);
+              ((data === null || data === void 0 ? void 0 : data.list) || []).forEach(function (item) {
+                var index = _list.findIndex(function (old) {
+                  return old.id === item.id;
+                });
+                if (index > -1) {
+                  _list[index] = item;
+                } else {
+                  _list.push(item);
+                }
+              });
             }
             setParams(_objectSpread(_objectSpread(_objectSpread({}, params), _params), {}, {
               total: (data === null || data === void 0 ? void 0 : data.count) || 0
@@ -465,7 +483,7 @@ var Pet = function Pet(props) {
     // if (_formData?.type === "multiple" || _formData?.type === "single") {
     getFormData({
       formData: _formData
-    }, _params);
+    }, _params || params);
     // }
   });
   var searchChange = useMemoizedFn(function (keyword) {
@@ -529,8 +547,60 @@ var Pet = function Pet(props) {
     }
     return {};
   }, [state.renderType, state.service.value]);
+  var ignoreValidity = useMemo(function () {
+    var _petForm$setting;
+    return !(petForm !== null && petForm !== void 0 && (_petForm$setting = petForm.setting) !== null && _petForm$setting !== void 0 && _petForm$setting.validity) || petForm.setting.validity.type === 'no_expiry';
+  }, [petForm]);
+  var getExpireStatus = function getExpireStatus(expiredAt) {
+    if (ignoreValidity || !expiredAt) return null;
+    var now = dayjs();
+    // 将过期时间设置为当天的最后一秒
+    var expireDate = dayjs(expiredAt).endOf('day');
+    var diffDays = expireDate.diff(now, 'day');
+    // 格式化显示日期（不显示时间）
+    var formattedDate = expireDate.format('YYYY-MM-DD');
+    if (now.isAfter(expireDate)) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#999999',
+          fontSize: '14px',
+          lineHeight: '20px'
+        }
+      }, /*#__PURE__*/React.createElement(Tag, {
+        color: "red",
+        style: {
+          borderRadius: 16,
+          marginRight: 8
+        }
+      }, locales.getText('pisell2.text.status.expired')), locales.getText('pisell2.text.validity.expired')(formattedDate));
+    }
+    if (diffDays <= 7) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#FFA940',
+          fontSize: '14px',
+          lineHeight: '20px'
+        }
+      }, locales.getText('pisell2.text.validity.expiring_soon')(formattedDate));
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: '#999999',
+        fontSize: '14px',
+        lineHeight: '20px'
+      }
+    }, locales.getText('pisell2.text.validity.valid_through')(formattedDate));
+  };
   return useMemo(function () {
-    var _state$client11;
+    var _petForm$setting2, _state$client11;
+    var canEdit = true;
+    if (petForm !== null && petForm !== void 0 && (_petForm$setting2 = petForm.setting) !== null && _petForm$setting2 !== void 0 && _petForm$setting2.permissions) {
+      var _petForm$setting3;
+      var _ref6 = (petForm === null || petForm === void 0 || (_petForm$setting3 = petForm.setting) === null || _petForm$setting3 === void 0 ? void 0 : _petForm$setting3.permissions) || {},
+        _ref6$staff = _ref6.staff,
+        staff = _ref6$staff === void 0 ? [] : _ref6$staff;
+      canEdit = staff.includes('edit');
+    }
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-pet-wraps"
     }, /*#__PURE__*/React.createElement(Skeleton, {
@@ -538,6 +608,8 @@ var Pet = function Pet(props) {
       active: true,
       round: true
     }, /*#__PURE__*/React.createElement(FormsCom, {
+      isMinorAndWaiver: isMinorAndWaiver,
+      waiverForm: waiverForm,
       hideTitle: hideTitle,
       watch: {
         value: state.pet.value
@@ -548,6 +620,8 @@ var Pet = function Pet(props) {
           form_id: formDataConfig === null || formDataConfig === void 0 ? void 0 : formDataConfig.form_id
         })].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) || [])));
       },
+      getHolders: getHolders,
+      addCallbackService: _addCallback,
       loading: valueLoading,
       forms: state.pet.formData,
       action: state.action,
@@ -575,6 +649,7 @@ var Pet = function Pet(props) {
         previewItemTitleRender: previewItemTitleRender
       }, dayCustomSelect),
       optionRender: function optionRender(item) {
+        console.log('waiver', petForm, item);
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Avatar, {
           className: "pisell-lowcode__booking-pet-list-item-avatar",
           src: item.cover,
@@ -589,7 +664,7 @@ var Pet = function Pet(props) {
           className: "pisell-lowcode__booking-pet-list-item-info-desc"
         }, /*#__PURE__*/React.createElement("div", {
           className: ""
-        }, item.key_age))), /*#__PURE__*/React.createElement("div", {
+        }, item.key_age)), /*#__PURE__*/React.createElement("div", null, getExpireStatus(item.expired_at))), /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__booking-pet-list-item-actions"
         }, /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__booking-pet-list-item-actions-view",
@@ -598,14 +673,14 @@ var Pet = function Pet(props) {
             e.stopPropagation();
             handleViewItem(item);
           }
-        }, locales.getText('pisell2.text.view')), /*#__PURE__*/React.createElement("div", {
+        }, locales.getText('pisell2.text.view')), canEdit ? /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__booking-pet-list-item-actions-edit",
           onClick: function onClick(e) {
             e.preventDefault();
             e.stopPropagation();
             handleEditItem(item);
           }
-        }, locales.getText('pisell2.text.edit'))));
+        }, locales.getText('pisell2.text.edit')) : null));
       },
       addButtonProps: _objectSpread({
         style: {
@@ -634,6 +709,6 @@ var Pet = function Pet(props) {
     })), /*#__PURE__*/React.createElement(ChangePetModal, {
       ref: changePetRef
     }));
-  }, [valueLoading, hideTitle, state.pet.value, state.pet.formData, state.action, state.modalOpen, state.pet.value, (_state$client12 = state.client) === null || _state$client12 === void 0 ? void 0 : _state$client12.value, loading, state.disabledEdit, state.isTerminal, state.disableEventBookingEdit, params.search, loadMore, addButtonProps, state.isBookingCreatePage]);
+  }, [valueLoading, hideTitle, state.pet.value, state.pet.formData, state.action, state.modalOpen, state.pet.value, (_state$client12 = state.client) === null || _state$client12 === void 0 ? void 0 : _state$client12.value, loading, state.disabledEdit, state.isTerminal, state.disableEventBookingEdit, params.search, loadMore, addButtonProps, state.isBookingCreatePage, isMinorAndWaiver, waiverForm, petForm]);
 };
 export default Pet;

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

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

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

@@ -0,0 +1,27 @@
+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 _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 { request } from "../../utils";
+export var getFormDetail = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
+    var _yield$request$getReq, data;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return request.getRequest().get("/shop/form/".concat(id));
+        case 2:
+          _yield$request$getReq = _context.sent;
+          data = _yield$request$getReq.data;
+          return _context.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getFormDetail(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/es/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/es/components/booking/info/service/Lists.js

@@ -24,7 +24,8 @@ var Lists = function Lists(_ref) {
     dispatch = _useContext.dispatch;
   var _useHolderConfig = useHolderConfig(state),
     isShowChangeHolder = _useHolderConfig.isShowChangeHolder;
-  var handleAddHolder = useAddHolder(state, dispatch);
+  var _useAddHolder = useAddHolder(state, dispatch),
+    handleAddHolder = _useAddHolder.handleAddHolder;
 
   /**
    * @title: 更新商品数据

package/es/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/es/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/es/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/es/components/booking/info/service2/utils.js

@@ -193,7 +193,7 @@ var currentResource = function currentResource(state, useResource, cacheItem) {
 };
 
 // 更新holder
-var handleChangeHolder = function handleChangeHolder(products, currentItem, other) {
+export var handleChangeHolder = function handleChangeHolder(products, currentItem, other) {
   return products.map(function (item) {
     if (item._id === currentItem._id) {
       return _objectSpread(_objectSpread({}, item), {}, {
@@ -350,7 +350,8 @@ export var updateServices = function updateServices(state, currentItem, type, ot
     products = handleChangeHolder(products, currentItem, other);
   }
   if (type === 'add_holder') {
-    actions === null || actions === void 0 || actions.handleAddHolder();
+    var _actions$handleAddHol;
+    actions === null || actions === void 0 || (_actions$handleAddHol = actions.handleAddHolder) === null || _actions$handleAddHol === void 0 || _actions$handleAddHol.call(actions, products, currentItem);
     return products;
   }
   if (type === 'like') {
@@ -514,13 +515,20 @@ var mapListItems = function mapListItems(items) {
     };
   });
 };
+
+// 获取主体表单是否必填
+export var getIsSubjectRequire = function getIsSubjectRequire(state) {
+  var _state$bookingConfig2, _state$bookingConfig3;
+  return (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 || (_state$bookingConfig2 = _state$bookingConfig2.appointment_subject) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.type) === 'form' && (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.subject_require) === 'require';
+};
 var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
-  var _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8;
+  var _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8;
   var pet = state.pet,
     service = state.service;
   var _ref8 = pet || {},
     _ref8$holders = _ref8.holders,
-    holders = _ref8$holders === void 0 ? [] : _ref8$holders;
+    holders = _ref8$holders === void 0 ? [] : _ref8$holders,
+    formData = _ref8.formData;
   var parallelResourceOtherParams = {};
   var multiResources;
   if (isParallelResource) {
@@ -582,6 +590,8 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     actionText: locales.getText('page.booking.text.add-time'),
     isMultipleResource: true,
     multiResources: multiResources,
+    isErrorHolder: getIsSubjectRequire(state),
+    addHolderButtonText: (formData === null || formData === void 0 || (_formData$ = formData[0]) === null || _formData$ === void 0 || (_formData$ = _formData$.form) === null || _formData$ === void 0 ? void 0 : _formData$.title) || "",
     holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,
     start_date: item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate,
     end_date: (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date)
@@ -808,8 +818,8 @@ export var initDate = function initDate() {
  * @Date: 2024-12-12 15:47
  */
 export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(state) {
-  var _state$bookingConfig2, _state$service3, _state$pet2;
-  var form_id = (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 || (_state$bookingConfig2 = _state$bookingConfig2.appointment_subject) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.form_id) || 0;
+  var _state$bookingConfig4, _state$service3, _state$pet2;
+  var form_id = (state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.appointment_subject) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.form_id) || 0;
   var services = ((_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.value) || [];
   var pets = ((_state$pet2 = state.pet) === null || _state$pet2 === void 0 || (_state$pet2 = _state$pet2.value) === null || _state$pet2 === void 0 ? void 0 : _state$pet2[form_id]) || [];
 
@@ -880,8 +890,8 @@ export var getDayProducts = function getDayProducts(holderId, lists, isTerminal)
  * @Date: 2024-12-30 22:19
  */
 export var getPets = function getPets(state) {
-  var _state$bookingConfig3, _state$pet3;
-  var form_id = (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.appointment_subject) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.form_id) || 0;
+  var _state$bookingConfig5, _state$pet3;
+  var form_id = (state === null || state === void 0 || (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.basic) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.appointment_subject) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.form_id) || 0;
   var pets = (state === null || state === void 0 || (_state$pet3 = state.pet) === null || _state$pet3 === void 0 || (_state$pet3 = _state$pet3.value) === null || _state$pet3 === void 0 ? void 0 : _state$pet3[form_id]) || [];
   return pets;
 };
@@ -913,8 +923,8 @@ export var getAppointmentService = function getAppointmentService(state) {
  * @Date: 2024-12-16 16:12
  */
 export var isOpenDeletePet = function isOpenDeletePet(state, newVal) {
-  var _state$bookingConfig4, _state$pet4;
-  var form_id = (state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.appointment_subject) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.form_id) || 0;
+  var _state$bookingConfig6, _state$pet4;
+  var form_id = (state === null || state === void 0 || (_state$bookingConfig6 = state.bookingConfig) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.config) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.basic) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.appointment_subject) === null || _state$bookingConfig6 === void 0 ? void 0 : _state$bookingConfig6.form_id) || 0;
   var oldPets = (state === null || state === void 0 || (_state$pet4 = state.pet) === null || _state$pet4 === void 0 || (_state$pet4 = _state$pet4.value) === null || _state$pet4 === void 0 ? void 0 : _state$pet4[form_id]) || [];
   var newPets = (newVal === null || newVal === void 0 ? void 0 : newVal[form_id]) || [];
 

package/es/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/es/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/es/components/booking/info2/utilsByBooking.js

@@ -285,6 +285,12 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
   return _resourceItem;
 };
 
+// 获取预约时间偏好设置
+export var getAppointmentTimingPreference = function getAppointmentTimingPreference(state) {
+  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_timing_preference) || "sequential";
+};
+
 /**
  * @title: 创建服务的开始时间和结束时间
  * @description: 
@@ -296,6 +302,8 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
   var _cacheItem$duration, _cacheItem$_extend;
+  var appointmentTimingPreference = getAppointmentTimingPreference(state);
+
   // 获取上一个服务商品
   var lastServer = getLastServer(state.service.value);
 
@@ -313,7 +321,7 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     if (dayjs(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 {
     // 没有上一个商品  资源为 0

package/es/components/booking/locales.d.ts

@@ -22,6 +22,8 @@ declare const _default: {
         'pisell2.text.leave-empty-for-walk-in': string;
         'pisell2.text.select-customer': string;
         'pisell2.text.create-new-customer': string;
+        'pisell2.text.filled': string;
+        'pisell2.text.not-filled': string;
         'pisell2.text.create-new': string;
         'pisell2.text.add-a-service': string;
         'pisell2.text.add-another-service': string;
@@ -259,6 +261,11 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.status.valid': string;
+        'pisell2.text.status.expired': string;
+        'pisell2.text.validity.expired': (str: string) => string;
+        'pisell2.text.validity.expiring_soon': (str: string) => string;
+        'pisell2.text.validity.valid_through': (str: string) => string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -288,6 +295,8 @@ declare const _default: {
         'pisell2.text.leave-empty-for-walk-in': string;
         'pisell2.text.select-customer': string;
         'pisell2.text.create-new-customer': string;
+        'pisell2.text.filled': string;
+        'pisell2.text.not-filled': string;
         'pisell2.text.create-new': string;
         'pisell2.text.add-a-service': string;
         'pisell2.text.add-another-service': string;
@@ -520,6 +529,11 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.status.valid': string;
+        'pisell2.text.status.expired': string;
+        'pisell2.text.validity.expired': (str: string) => string;
+        'pisell2.text.validity.expiring_soon': (str: string) => string;
+        'pisell2.text.validity.valid_through': (str: string) => string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -549,6 +563,8 @@ declare const _default: {
         'pisell2.text.leave-empty-for-walk-in': string;
         'pisell2.text.select-customer': string;
         'pisell2.text.create-new-customer': string;
+        'pisell2.text.filled': string;
+        'pisell2.text.not-filled': string;
         'pisell2.text.create-new': string;
         'pisell2.text.add-a-service': string;
         'pisell2.text.add-another-service': string;
@@ -781,6 +797,11 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.status.valid': string;
+        'pisell2.text.status.expired': string;
+        'pisell2.text.validity.expired': (str: string) => string;
+        'pisell2.text.validity.expiring_soon': (str: string) => string;
+        'pisell2.text.validity.valid_through': (str: string) => string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -23,6 +23,8 @@ export default {
     'pisell2.text.leave-empty-for-walk-in': 'Leave empty for walk-in',
     'pisell2.text.select-customer': 'Select customer',
     'pisell2.text.create-new-customer': 'Create new customer',
+    'pisell2.text.filled': 'Filled',
+    'pisell2.text.not-filled': 'Not filled',
     'pisell2.text.create-new': 'Create new',
     'pisell2.text.add-a-service': 'Add a service',
     'pisell2.text.add-another-service': 'Add another service',
@@ -295,7 +297,18 @@ export default {
     'pisell2.text.goodpass.view-more': "View More",
     'pisell2.text.goodpass.code': "Code",
     'pisell2.text.goodpass.enter-code': "Enter Code",
-    'pisell2.text.goodpass.code-invalid': "Current code is invalid"
+    'pisell2.text.goodpass.code-invalid': "Current code is invalid",
+    'pisell2.text.status.valid': 'Valid',
+    'pisell2.text.status.expired': 'Expired',
+    'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
+      return "Expired on ".concat(str);
+    },
+    'pisell2.text.validity.expiring_soon': function pisell2TextValidityExpiring_soon(str) {
+      return "Expiring soon: valid through ".concat(str);
+    },
+    'pisell2.text.validity.valid_through': function pisell2TextValidityValid_through(str) {
+      return "Valid through ".concat(str);
+    }
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -325,6 +338,8 @@ export default {
     'pisell2.text.leave-empty-for-walk-in': '未选择表示 Walk-In',
     'pisell2.text.select-customer': '选择客户',
     'pisell2.text.create-new-customer': '创建新客户',
+    'pisell2.text.filled': '已填写',
+    'pisell2.text.not-filled': '未填写',
     'pisell2.text.create-new': '创建新的',
     'pisell2.text.add-a-service': '添加服务',
     'pisell2.text.add-another-service': '添加其他服务',
@@ -597,7 +612,18 @@ export default {
     'pisell2.text.goodpass.view-more': "查看更多",
     'pisell2.text.goodpass.code': "券码",
     'pisell2.text.goodpass.enter-code': "请输入券码",
-    'pisell2.text.goodpass.code-invalid': "当前券码不可用"
+    'pisell2.text.goodpass.code-invalid': "当前券码不可用",
+    'pisell2.text.status.valid': '有效',
+    'pisell2.text.status.expired': '已过期',
+    'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
+      return "\u5DF2\u4E8E ".concat(str, " \u8FC7\u671F");
+    },
+    'pisell2.text.validity.expiring_soon': function pisell2TextValidityExpiring_soon(str) {
+      return "\u5373\u5C06\u8FC7\u671F\uFF1A\u6709\u6548\u671F\u81F3 ".concat(str, " \uFF08\u542B\u5F53\u65E5\uFF09");
+    },
+    'pisell2.text.validity.valid_through': function pisell2TextValidityValid_through(str) {
+      return "\u6709\u6548\u671F\u81F3 ".concat(str, " \uFF08\u542B\u5F53\u65E5\uFF09");
+    }
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -627,6 +653,8 @@ export default {
     'pisell2.text.leave-empty-for-walk-in': '未選擇表示 Walk-In',
     'pisell2.text.select-customer': '選擇客戶',
     'pisell2.text.create-new-customer': '創建新客戶',
+    'pisell2.text.filled': '已填寫',
+    'pisell2.text.not-filled': '未填寫',
     'pisell2.text.create-new': '創建新的',
     'pisell2.text.add-a-service': '添加服務',
     'pisell2.text.add-another-service': '添加其他服務',
@@ -899,6 +927,17 @@ export default {
     'pisell2.text.goodpass.view-more': "查看更多",
     'pisell2.text.goodpass.code': "券碼",
     'pisell2.text.goodpass.enter-code': "請輸入券碼",
-    'pisell2.text.goodpass.code-invalid': "當前券碼不可用"
+    'pisell2.text.goodpass.code-invalid': "當前券碼不可用",
+    'pisell2.text.status.valid': '有效',
+    'pisell2.text.status.expired': '已過期',
+    'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
+      return "\u5DF2\u65BC ".concat(str, " \u904E\u671F");
+    },
+    'pisell2.text.validity.expiring_soon': function pisell2TextValidityExpiring_soon(str) {
+      return "\u5373\u5C07\u904E\u671F\uFF1A\u6709\u6548\u671F\u81F3 ".concat(str, " \uFF08\u542B\u7576\u65E5\uFF09");
+    },
+    'pisell2.text.validity.valid_through': function pisell2TextValidityValid_through(str) {
+      return "\u6709\u6548\u671F\u81F3 ".concat(str, " \uFF08\u542B\u7576\u65E5\uFF09");
+    }
   }
 };

package/es/components/booking/utils.js

@@ -17,6 +17,7 @@ import dayjs from 'dayjs';
 import { locales } from '@pisell/utils';
 import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
+import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -633,6 +634,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
   if (!cacheItem.new && cacheItem._extend.endDate) {
     return cacheItem._extend;
   }
+  var appointmentTimingPreference = getAppointmentTimingPreference(state);
   var isSession = isSessionProduct(cacheItem);
   var isDay = isDayBooking(state);
   var setDuration = function setDuration() {
@@ -664,7 +666,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     if (dayjs(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 {
     // 没有上一个商品  资源为 0

package/es/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;