@pisell/private-materials 6.2.19 → 6.2.21

package/es/businessModel/SalesModel/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/appointmentBooking/components/Content/index.js

@@ -32,13 +32,14 @@ import ConfirmInformation from "../ConfirmInformation";
 // };
 import { useAppointmentBookingContext } from "../../context";
 import PolicyModal from "../../deposit/components/PolicyModal";
+import { scrollToFirstErrorCard } from "../Resource/utils";
 import { useAppointmentBookingCart, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingLogin, useAppointmentBookingAccount, useShopDiscount, contextUtils } from "../../hooks";
 import "./index.less";
 import useComponents from "../../../../hooks/useComponents";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { formatCustomer } from "../../utils";
 var Layout = function Layout() {
-  var _useEngineContext$eng2, _currentStep$step, _currentStep$step3, _currentStep$step4, _currentStep$step6, _currentStep$step8;
+  var _useEngineContext$eng2, _currentStep$step2, _currentStep$step4, _currentStep$step5, _currentStep$step7, _currentStep$step9;
   var stepRef = useRef();
   var _ref = useAppointmentBookingContext(),
     currentStep = _ref.currentStep,
@@ -172,6 +173,7 @@ var Layout = function Layout() {
     }
   }, [isFormSubject, isLogin, isRetailTemplate]);
   useEffect(function () {
+    var _currentStep$step;
     if (!(currentStep !== null && currentStep !== void 0 && currentStep.step)) return;
 
     // 清空底部按钮的loading
@@ -186,7 +188,12 @@ var Layout = function Layout() {
       top: 0,
       behavior: 'smooth'
     });
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key]);
+
+    // 在确认页，滚动到第一个错误卡片的位置
+    if ((currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key) === 'confirm-information') {
+      scrollToFirstErrorCard('.pisell-lowcode-product-card-error');
+    }
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key]);
   var components = {
     // 选择服务
     'select-service': Services,
@@ -200,8 +207,8 @@ var Layout = function Layout() {
     'confirm-information': ConfirmInformation
   };
   var Com = useMemo(function () {
-    var _currentStep$step2;
-    var key = currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key;
+    var _currentStep$step3;
+    var key = currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key;
     if (!key) return null;
     var Com;
     if (key.startsWith('select-resource')) {
@@ -231,7 +238,7 @@ var Layout = function Layout() {
         ref: stepRef
       });
     }
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key]);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.key]);
 
   /**
    * @title: 动态计算中间内容区域的高度
@@ -255,10 +262,10 @@ var Layout = function Layout() {
         content.style.overflowY = 'auto';
       }
     }
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.key]);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step5 = currentStep.step) === null || _currentStep$step5 === void 0 ? void 0 : _currentStep$step5.key]);
   var isShowCartCom = useMemo(function () {
-    var _currentStep$step5;
-    var key = currentStep === null || currentStep === void 0 || (_currentStep$step5 = currentStep.step) === null || _currentStep$step5 === void 0 ? void 0 : _currentStep$step5.key;
+    var _currentStep$step6;
+    var key = currentStep === null || currentStep === void 0 || (_currentStep$step6 = currentStep.step) === null || _currentStep$step6 === void 0 ? void 0 : _currentStep$step6.key;
     if (isMobile()) return null;
 
     // 先选择日期，并且当前步骤是选择日期，则不显示购物车
@@ -273,7 +280,7 @@ var Layout = function Layout() {
         return stepRef === null || stepRef === void 0 || (_stepRef$current = stepRef.current) === null || _stepRef$current === void 0 || (_stepRef$current$next = _stepRef$current.next) === null || _stepRef$current$next === void 0 ? void 0 : _stepRef$current$next.call(_stepRef$current);
       }
     }));
-  }, [isDateSelectedFirst, currentStep === null || currentStep === void 0 || (_currentStep$step6 = currentStep.step) === null || _currentStep$step6 === void 0 ? void 0 : _currentStep$step6.key]);
+  }, [isDateSelectedFirst, currentStep === null || currentStep === void 0 || (_currentStep$step7 = currentStep.step) === null || _currentStep$step7 === void 0 ? void 0 : _currentStep$step7.key]);
 
   /**
    * @title: 是否显示底部
@@ -284,14 +291,14 @@ var Layout = function Layout() {
    * @Date: 2025-05-10 17:42
    */
   var isFooter = useMemo(function () {
-    var _currentStep$step7;
+    var _currentStep$step8;
     if (!isMobile()) return false;
-    var key = currentStep === null || currentStep === void 0 || (_currentStep$step7 = currentStep.step) === null || _currentStep$step7 === void 0 ? void 0 : _currentStep$step7.key;
+    var key = currentStep === null || currentStep === void 0 || (_currentStep$step8 = currentStep.step) === null || _currentStep$step8 === void 0 ? void 0 : _currentStep$step8.key;
 
     // 先选日期并且当前步骤是选择日期，则不显示底部
     if (isDateSelectedFirst && key === 'select-date') return false;
     return key !== 'confirm-information';
-  }, [isDateSelectedFirst, currentStep === null || currentStep === void 0 || (_currentStep$step8 = currentStep.step) === null || _currentStep$step8 === void 0 ? void 0 : _currentStep$step8.key]);
+  }, [isDateSelectedFirst, currentStep === null || currentStep === void 0 || (_currentStep$step9 = currentStep.step) === null || _currentStep$step9 === void 0 ? void 0 : _currentStep$step9.key]);
 
   /**
    * @title: 获取协议方法需要在组件中定义才能传递给子组件，子组件无法获取到context中的方法

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

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

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

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

package/es/components/appointmentBooking/components/TimeSlicing/index.js

@@ -12,6 +12,7 @@ import React, { useEffect, useState, forwardRef, useImperativeHandle } from 'rea
 import { Iconfont, PisellEmpty } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import { useAppointmentBookingContext } from "../../context";
+import { scrollToFirstErrorCard } from "../Resource/utils";
 import { useAppointmentBookingResource, useAppointmentBookingStep } from "../../hooks";
 import { Toast } from "../../utils";
 import "./index.less";
@@ -53,11 +54,14 @@ var TimeSlicing = /*#__PURE__*/forwardRef(function (props, ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setSelectedTime(val);
-            _context.next = 3;
+
+            // 滚动到第一个错误卡片的位置
+            scrollToFirstErrorCard('.pisell-lowcode-product-card-error');
+            _context.next = 4;
             return appointmentBooking.submitTimeSlot(val);
-          case 3:
-            result = _context.sent;
           case 4:
+            result = _context.sent;
+          case 5:
           case "end":
             return _context.stop();
         }

package/es/components/booking/components/TabProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/TabProduct/tabs/index.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState, useEffect, forwardRef, useImperativeHandle } from "react";
 import classNames from "classnames";
@@ -13,10 +13,6 @@ import "./index.less";
 
 // tabs 子组件定义
 
-// 定义主键类型
-
-// Tabs 可传递的参数
-
 var Tabs = function Tabs(_ref, ref) {
   var renderTab = _ref.renderTab,
     rowKey = _ref.rowKey,

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

@@ -29,7 +29,7 @@ var BrowserSelect = function BrowserSelect(props) {
     onChange: function onChange(e) {
       var _resetProps$onChange;
       e.persist();
-      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 || _resetProps$onChange.call(resetProps, e);
+      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 ? void 0 : _resetProps$onChange.call(resetProps, e);
     }
   }), _options);
 };

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

@@ -74,7 +74,6 @@ var CustomSelect = function CustomSelect(props, ref) {
     showDropDown = _props$showDropDown === void 0 ? true : _props$showDropDown,
     propsHandleOpenModal = props.handleOpenModal,
     handleDayChange = props.handleDayChange;
-  console.log('custom select');
   var searchRef = useRef();
 
   // 当前选择的值

package/es/components/booking/components/formItemChildrenWrap/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -69,8 +69,8 @@ var EditBookingModal = function EditBookingModal(props, ref) {
   });
   var getInitData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-      var _data$toResource;
-      var mockProps, _data, _initResourceVal, toResourceFormId, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx;
+      var _data$fromResource, _data$toResource;
+      var mockProps, _data, _initResourceVal, fromResourceFormId, toResourceFormId, _form_id, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx, _sameResource;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -82,20 +82,25 @@ var EditBookingModal = function EditBookingModal(props, ref) {
             setData(_data);
 
             // 初始预期资源（日历放置点对应的资源）
-            _initResourceVal = _data.childrenBooking._extend.resource; // 目标资源所在 form_id
-            toResourceFormId = (_data$toResource = _data.toResource) === null || _data$toResource === void 0 ? void 0 : _data$toResource.form_id; // 若 1. 起止资源不同 且2. 能通过目标资源id找到所在资源组
+            _initResourceVal = _data.childrenBooking._extend.resource; // 源资源所在 from_id
+            fromResourceFormId = (_data$fromResource = _data.fromResource) === null || _data$fromResource === void 0 ? void 0 : _data$fromResource.form_id; // 目标资源所在 form_id
+            toResourceFormId = (_data$toResource = _data.toResource) === null || _data$toResource === void 0 ? void 0 : _data$toResource.form_id; // 若 1. 无资源移入具体资源
+            // 或 2. 具体资源移入无资源
+            // 则其中有一个 form_id 为 0，那么选择不为 0 的那个
+            _form_id = toResourceFormId || fromResourceFormId; // 若 1. 起止资源不同(必有一个不为 ‘no resource’)
+            // 且 2. 能通过目标资源id找到所在资源组
             // 则查找放置点所对应资源信息
-            if (params.fromResourceId !== params.toResourceId && toResourceFormId) {
+            if (params.fromResourceId !== params.toResourceId && !!_form_id) {
               _formatResources = formatResources({
                 cacheItem: _data.childrenBooking,
                 resourcesOrigin: _data.resourcesOrigin
               }), list = _formatResources.list, maps = _formatResources.maps;
-              currentForm = maps[toResourceFormId];
+              currentForm = maps[_form_id];
               relation_id = (_data$toResource2 = _data.toResource) === null || _data$toResource2 === void 0 ? void 0 : _data$toResource2.id;
-              if (currentForm && relation_id) {
+              if (currentForm && (relation_id || relation_id === 0)) {
                 _targetResource = {
                   relation_type: ((_currentForm$renderLi = currentForm.renderListMaps[relation_id]) === null || _currentForm$renderLi === void 0 || (_currentForm$renderLi = _currentForm$renderLi.usable) === null || _currentForm$renderLi === void 0 ? void 0 : _currentForm$renderLi.relation_type) || 'form',
-                  form_id: toResourceFormId,
+                  form_id: _form_id,
                   relation_id: relation_id,
                   like_status: 'common',
                   children: (_currentForm$renderLi2 = currentForm.renderListMaps) === null || _currentForm$renderLi2 === void 0 || (_currentForm$renderLi2 = _currentForm$renderLi2[relation_id]) === null || _currentForm$renderLi2 === void 0 ? void 0 : _currentForm$renderLi2.children,
@@ -104,20 +109,31 @@ var EditBookingModal = function EditBookingModal(props, ref) {
                     resource_name: (_currentForm$renderLi4 = currentForm.renderListMaps[relation_id]) === null || _currentForm$renderLi4 === void 0 ? void 0 : _currentForm$renderLi4.main_field
                   })
                 }; // 同一类型关联多个资源
-                if (Array.isArray(_initResourceVal[toResourceFormId])) {
-                  _cloned = _toConsumableArray(_initResourceVal[toResourceFormId]);
+                if (Array.isArray(_initResourceVal[_form_id])) {
+                  _cloned = _toConsumableArray(_initResourceVal[_form_id]);
                   _idx = _cloned.findIndex(function (rs) {
-                    return rs.relation_id == params.fromResourceId;
+                    var _rs$children;
+                    return rs.relation_id == params.fromResourceId || ((_rs$children = rs.children) === null || _rs$children === void 0 ? void 0 : _rs$children.find(function (child) {
+                      return child.relation_id == params.fromResourceId;
+                    }));
                   });
                   if (_idx !== -1) {
-                    _cloned[_idx] = _targetResource; // 替换现有对象
+                    // 去重: 同一资源类型下，设置了该类型的某个资源 A，以及无资源，当从无资源拖放至 A 上时需要去重
+                    _sameResource = _cloned.find(function (_clonedItem) {
+                      return _clonedItem.relation_id === (_targetResource === null || _targetResource === void 0 ? void 0 : _targetResource.relation_id);
+                    });
+                    if (_sameResource) {
+                      _cloned.splice(_idx, 1);
+                    } else {
+                      _cloned[_idx] = _targetResource; // 替换现有对象
+                    }
                   } else {
                     _cloned.push(_targetResource); // 添加新对象
                   }
-                  _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, toResourceFormId, _cloned));
+                  _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, _form_id, _cloned));
                 } else {
                   // 单选
-                  _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, toResourceFormId, [_targetResource]));
+                  _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, _form_id, [_targetResource]));
                 }
               }
             }
@@ -128,7 +144,7 @@ var EditBookingModal = function EditBookingModal(props, ref) {
                 toDate: [dayjs(mockProps.toStartDate), dayjs(mockProps.toEndDate)]
               });
             }, 100);
-          case 9:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -218,12 +234,11 @@ var EditBookingModal = function EditBookingModal(props, ref) {
   };
   var onOk = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var values, _data$childrenBooking, _extend, order_id, start_date, start_time, end_date, end_time;
+      var values, _data$childrenBooking, _extend, order_id, start_date, start_time, end_date, end_time, id, relation_id, like_status, relation_type, is_all, schedule_id, sub_type, select_date, number, metadata;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            values = form.getFieldsValue(); // console.log('values', values, data, cacheItem);
-            // return;
+            values = form.getFieldsValue();
             setUpdating(true);
             _context2.prev = 2;
             _data$childrenBooking = data.childrenBooking, _extend = _data$childrenBooking._extend, order_id = _data$childrenBooking.order_id;
@@ -231,8 +246,20 @@ var EditBookingModal = function EditBookingModal(props, ref) {
             start_time = values.toDate[0].format('HH:mm');
             end_date = values.toDate[1].format('YYYY-MM-DD');
             end_time = values.toDate[1].format('HH:mm');
-            _context2.next = 10;
-            return updateChildBooking(order_id, _objectSpread(_objectSpread({}, _extend), {}, {
+            console.log('extend data', _extend);
+            id = _extend.id, relation_id = _extend.relation_id, like_status = _extend.like_status, relation_type = _extend.relation_type, is_all = _extend.is_all, schedule_id = _extend.schedule_id, sub_type = _extend.sub_type, select_date = _extend.select_date, number = _extend.number, metadata = _extend.metadata;
+            _context2.next = 12;
+            return updateChildBooking(order_id, {
+              id: id,
+              relation_id: relation_id,
+              like_status: like_status,
+              relation_type: relation_type,
+              is_all: is_all,
+              schedule_id: schedule_id,
+              sub_type: sub_type,
+              select_date: select_date,
+              number: number,
+              metadata: metadata,
               resources: Object.values(values.resource).reduce(function (pre, cur) {
                 var newList = checkResourcesFormat(cur, cacheItem);
                 pre = pre.concat(newList);
@@ -243,23 +270,24 @@ var EditBookingModal = function EditBookingModal(props, ref) {
               end_date: end_date,
               end_time: end_time,
               duration: values.toDate[1].diff(values.toDate[0], 'minutes')
-            }));
-          case 10:
-            setOpen(false);
+            });
+          case 12:
+            // 清空，防止下次打开时看到残留数据
+            initState();
             props === null || props === void 0 || props.onOk();
-            _context2.next = 17;
+            _context2.next = 19;
             break;
-          case 14:
-            _context2.prev = 14;
+          case 16:
+            _context2.prev = 16;
             _context2.t0 = _context2["catch"](2);
             console.error(_context2.t0);
-          case 17:
+          case 19:
             setUpdating(false);
-          case 18:
+          case 20:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[2, 14]]);
+      }, _callee2, null, [[2, 16]]);
     }));
     return function onOk() {
       return _ref2.apply(this, arguments);
@@ -377,6 +405,7 @@ var EditBookingModal = function EditBookingModal(props, ref) {
     onClick: onOk,
     block: true,
     size: "large",
+    disabled: !data,
     loading: updating,
     style: {
       borderRadius: 20

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

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

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

@@ -197,7 +197,8 @@ export var updateResourceErrors = function updateResourceErrors(resourceMaps, ca
 };
 export var init = /*#__PURE__*/function () {
   var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-    var toStartDate, toEndDate, event, fromResourceId, toResourceId, bookingOrigin, booking, resources, childrenBooking, extraParams, fromResource, toResource, resourcesOrigin;
+    var _childrenBooking$_ext;
+    var toStartDate, toEndDate, event, fromResourceId, toResourceId, bookingOrigin, booking, resources, childrenBooking, fromResource, toResource, extraParams, _eventResources, resourcesOrigin;
     return _regeneratorRuntime().wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
@@ -216,19 +217,24 @@ export var init = /*#__PURE__*/function () {
           // 筛选出当前的子预约
           childrenBooking = getChildrenBookingById(booking.service.value, event.id);
           console.log('childrenBooking', childrenBooking);
-
-          // 假如移入未绑定的资源中，需要特殊处理
+          fromResource = resources.listMap[fromResourceId];
+          toResource = resources.listMap[toResourceId]; // 默认的资源渲染列表的获取，只会从 product_resource 获取后台配置的资源
+          // 对于没有配置但是有需要被展示的，则需要额外传入
           extraParams = {
             extraResources: []
-          };
-          fromResource = resources.listMap[fromResourceId];
-          toResource = resources.listMap[toResourceId];
-          if (fromResource) {
-            extraParams.extraResources.push({
-              form_id: fromResource.form_id,
-              id: fromResource.id
+          }; // 1. 当某个预约同时设置了A B C 三个资源， 但预约商品本身并未关联B C
+          _eventResources = (_childrenBooking$_ext = childrenBooking._extend) === null || _childrenBooking$_ext === void 0 ? void 0 : _childrenBooking$_ext.event_resources;
+          if (Array.isArray(_eventResources)) {
+            // 简化操作，所有资源全部加入到额外资源中，由接下来的方法内部进行去重
+            _eventResources.forEach(function (item) {
+              extraParams.extraResources.push({
+                id: item.relation_id,
+                form_id: item.form_id
+              });
             });
           }
+
+          // 2. 移入未绑定的资源中
           if (toResource) {
             extraParams.extraResources.push({
               form_id: toResource.form_id,
@@ -252,10 +258,12 @@ export var init = /*#__PURE__*/function () {
             },
             // 总资源列表
             resourcesOrigin: resourcesOrigin,
+            // 源资源
+            fromResource: fromResource,
             // 目标资源
             toResource: toResource
           });
-        case 17:
+        case 18:
         case "end":
           return _context7.stop();
       }

package/es/components/booking/forms/model.js

@@ -1,9 +1,9 @@
-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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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 _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

package/es/components/booking/forms/table/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

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

@@ -2,12 +2,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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, { useMemo } from 'react';
+import React from 'react';
 import classNames from 'classnames';
 import { Iconfont } from '@pisell/materials';
 import { locales } from "@pisell/utils";
 var useClearCart = function useClearCart(state, dispatch) {
-  var _state$service3;
+  var _state$service, _state$service2;
   var handleClear = function handleClear() {
     // 清除购物车
     dispatch({
@@ -17,14 +17,11 @@ var useClearCart = function useClearCart(state, dispatch) {
       }
     });
   };
-  return useMemo(function () {
-    var _state$service, _state$service2;
-    return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit && /*#__PURE__*/React.createElement("span", {
-      className: classNames('pisell-lowcode__booking-service-clear-btn', _defineProperty({}, 'pisell-lowcode__booking-service-clear-btn-disabled', !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length))),
-      onClick: handleClear
-    }, /*#__PURE__*/React.createElement(Iconfont, {
-      type: "pisell2-trash-01"
-    }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart')));
-  }, [(_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length, state.channelDisabledEdit]);
+  return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit && /*#__PURE__*/React.createElement("span", {
+    className: classNames('pisell-lowcode__booking-service-clear-btn', _defineProperty({}, 'pisell-lowcode__booking-service-clear-btn-disabled', !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length))),
+    onClick: handleClear
+  }, /*#__PURE__*/React.createElement(Iconfont, {
+    type: "pisell2-trash-01"
+  }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart')));
 };
 export default useClearCart;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

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

@@ -36,7 +36,7 @@ import { getWaiverTitle } from "../clientVariant/utils";
 import useGetHolderList from "../hooks/useGetHolderList";
 var isLoadClient = false;
 var Client = function Client() {
-  var _state$client$value2, _state$client4, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
+  var _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
   var modalRef = useRef();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -397,7 +397,6 @@ var Client = function Client() {
     }, locales.getText('pisell2.text.load-more'))) : null;
   }, [loadLoading, params, state.client.clients.length]);
   var customSelect = useMemo(function () {
-    console.log('render customSelect');
     return /*#__PURE__*/React.createElement(CustomSelect, {
       autoFocus: !state.isTerminal,
       modalOpen: state.modalOpen,
@@ -460,7 +459,7 @@ var Client = function Client() {
         return true;
       }
     });
-  }, [state.isTerminal, state.modalOpen, (_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : _state$client4.value, state.drawerMask, renderList, loading, franchiseeLoading, params.search, loadMore]);
+  }, [state, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-client",
     onClick: function onClick() {

package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/es/components/booking/info/dateRange/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

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

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 { useMemoizedFn } from "ahooks";
 import { useEffect, useMemo, useRef } from "react";
 import useHolderConfig from "./useHolderConfig";
 import { isOpenAddTime } from "../utils";
@@ -30,27 +29,21 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
     };
   }, [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.isBookingTicket2;
+    return isOpenAddTime(state);
   }, [state, appointment_card.quick_time]);
-  var handleEdit = useMemoizedFn(function (cacheItem, type) {
-    var _detailRef$current, _detailRef$current$in;
-    // console.timeEnd('handleChange');
-    console.time('handleEdit');
-    console.log(performance.now() - window.pp1, '打开商品4');
-    (_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, false, type === 'edit_product');
-    // setTimeout(() => {
-    //   console.log(performance.now() - window.pp1, '打开商品5');
-    //   console.timeEnd('handleEdit')
-    //   detailRef.current?.init?.(cacheItem, false, type === 'edit_product');
-    // }, );
-  });
+  var handleEdit = function handleEdit(cacheItem, type) {
+    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, false, type === 'edit_product');
+    }, 100);
+  };
   var dispatchService = function dispatchService(type, payload) {
     dispatch({
       type: type,
       payload: _objectSpread({}, payload)
     });
   };
-  var handleAction = useMemoizedFn(function (dataSource) {
+  var handleAction = function handleAction(dataSource) {
     var cacheItem = getProductExtend({
       cacheItem: _objectSpread(_objectSpread({}, dataSource._origin), {}, {
         new: 0
@@ -64,7 +57,7 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
         cacheItem: cacheItem
       }
     });
-  });
+  };
   return {
     detailRef: detailRef,
     handleEdit: handleEdit,

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;