@pisell/private-materials 3.4.3 → 3.4.5

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

@@ -47,7 +47,7 @@ import dayjs from 'dayjs';
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _businessUtils$getApp2, _state$addons4, _state$bookingDetail12, _state$bookingDetail13;
+  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _businessUtils$getApp2, _state$bookingDetail8, _state$addons4, _state$bookingDetail16, _state$bookingDetail17;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -628,6 +628,10 @@ var Footer = function Footer(props) {
       }
     });
   };
+  var paymentRefundedStatus = useMemo(function () {
+    var _state$bookingDetail;
+    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status);
+  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
 
   /**
    * @title: checkout按钮
@@ -668,7 +672,7 @@ var Footer = function Footer(props) {
   }, [isEdit, checkoutLoading, isDisabled, state, source]);
   var handleMenuClick = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(e) {
-      var id, customer, res, _state$bookingDetail, _state$bookingDetail2;
+      var id, customer, res, _state$bookingDetail2, _state$bookingDetail3;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -696,10 +700,10 @@ var Footer = function Footer(props) {
                 type: 'pisell1.sendPayLinkEmail',
                 data: {
                   id: id,
-                  is_deposit: state.bookingDetail.is_deposit || Number((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.deposit_amount),
+                  is_deposit: state.bookingDetail.is_deposit || Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.deposit_amount),
                   deposit_payment_time: state.bookingDetail.deposit_payment_time,
                   customer: customer,
-                  contacts: (_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.contacts
+                  contacts: (_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.contacts
                 },
                 callback: function callback() {}
               });
@@ -925,10 +929,10 @@ var Footer = function Footer(props) {
    * @Date: 2024-01-30 16:58
    */
   var isCheckout = useMemo(function () {
-    var _state$bookingDetail3, _state$bookingDetail4;
+    var _state$bookingDetail4, _state$bookingDetail5;
     var list = ['unfulfilled', 'partially_paid', 'unpaid', 'payment_processing'];
     // (支付状态 = 已支付 || 部分付款 || 未付款 || 支付处理中) && 预约状态 !== 已取消
-    if (!state.bookingId || ((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 || (_state$bookingDetail3 = _state$bookingDetail3.bookings) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.appointment_status) !== 'cancelled' && list.includes(state === null || state === void 0 || (_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 ? void 0 : _state$bookingDetail4.payment_status) && !state.disabledEdit) {
+    if (!state.bookingId || ((_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 || (_state$bookingDetail4 = _state$bookingDetail4.bookings) === null || _state$bookingDetail4 === void 0 ? void 0 : _state$bookingDetail4.appointment_status) !== 'cancelled' && list.includes(state === null || state === void 0 || (_state$bookingDetail5 = state.bookingDetail) === null || _state$bookingDetail5 === void 0 ? void 0 : _state$bookingDetail5.payment_status) && !state.disabledEdit) {
       return true;
     } else {
       if (total.notPaidAmount > 0) {
@@ -939,7 +943,8 @@ var Footer = function Footer(props) {
   }, [state.bookingDetail, total.notPaidAmount]);
   var _buttons = useMemo(function () {
     // 如果预约是取消状态,则不展示任何按钮
-    if (state.appointment_status === 'cancelled') {
+    // 如果订单已退款 | 部分退款，则展示再次预约按钮
+    if (state.appointment_status === 'cancelled' || paymentRefundedStatus) {
       return [buttonMap.rebook];
     }
 
@@ -1018,6 +1023,7 @@ var Footer = function Footer(props) {
     return [];
   }, [buttons, total, isEdit, checkoutLoading, isDisabled, source, buttonMap, loading, isCheckout, state, isTeam, isShowClearAll]);
   var moreButton = useMemo(function () {
+    var _state$bookingDetail6;
     var arr = [];
     if (!state.bookingId) {
       return [];
@@ -1029,10 +1035,16 @@ var Footer = function Footer(props) {
       return [];
     }
 
+    // 如果订单已退款, 则不展示任何按钮
+    if ((state === null || state === void 0 || (_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.payment_status) === 'refunded') {
+      return [];
+    }
+
     // 如果外部没有按钮, 则rebook按钮放在外面
     if (_buttons.length !== 0) {
-      // 支付链接
-      if (state.bookingId && isShowPaymentLink) {
+      var _state$bookingDetail7;
+      // 支付链接, 部分退款时, 不展示支付链接
+      if (state.bookingId && isShowPaymentLink && (state === null || state === void 0 || (_state$bookingDetail7 = state.bookingDetail) === null || _state$bookingDetail7 === void 0 ? void 0 : _state$bookingDetail7.payment_status) !== 'partially_refunded') {
         arr.push(actionMap.paymentLink);
       }
     }
@@ -1066,14 +1078,14 @@ var Footer = function Footer(props) {
     // 取消订单
     // arr.push(actionMap.cancelOrder);
     return arr;
-  }, [state, total, isShowPaymentLink, source, _buttons.length]);
+  }, [state, total, isShowPaymentLink, source, _buttons.length, state === null || state === void 0 || (_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.payment_status]);
 
   /**
    * 是否只有定金支付
    */
   var isOnlyDeposit = useMemo(function () {
-    var _state$bookingDetail5, _state$bookingDetail6, _state$bookingDetail7;
-    if (state !== null && state !== void 0 && (_state$bookingDetail5 = state.bookingDetail) !== null && _state$bookingDetail5 !== void 0 && _state$bookingDetail5.deposit_payment_time && state !== null && state !== void 0 && (_state$bookingDetail6 = state.bookingDetail) !== null && _state$bookingDetail6 !== void 0 && (_state$bookingDetail6 = _state$bookingDetail6.payment_types) !== null && _state$bookingDetail6 !== void 0 && (_state$bookingDetail7 = _state$bookingDetail6.every) !== null && _state$bookingDetail7 !== void 0 && _state$bookingDetail7.call(_state$bookingDetail6, function (item) {
+    var _state$bookingDetail9, _state$bookingDetail10, _state$bookingDetail11;
+    if (state !== null && state !== void 0 && (_state$bookingDetail9 = state.bookingDetail) !== null && _state$bookingDetail9 !== void 0 && _state$bookingDetail9.deposit_payment_time && state !== null && state !== void 0 && (_state$bookingDetail10 = state.bookingDetail) !== null && _state$bookingDetail10 !== void 0 && (_state$bookingDetail10 = _state$bookingDetail10.payment_types) !== null && _state$bookingDetail10 !== void 0 && (_state$bookingDetail11 = _state$bookingDetail10.every) !== null && _state$bookingDetail11 !== void 0 && _state$bookingDetail11.call(_state$bookingDetail10, function (item) {
       return item === 'deposit';
     })) {
       return true;
@@ -1094,8 +1106,8 @@ var Footer = function Footer(props) {
 
     // 只有定金支付时，直接展示
     if (isOnlyDeposit) {
-      var _state$bookingDetail8;
-      return "".concat(locales.getText('pisell2.text.deposit-paid'), " ").concat(formatAmount(state === null || state === void 0 || (_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.deposit_paid_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'), " ").concat(total.duration ? "(".concat(total.duration, ")") : '');
+      var _state$bookingDetail12;
+      return "".concat(locales.getText('pisell2.text.deposit-paid'), " ").concat(formatAmount(state === null || state === void 0 || (_state$bookingDetail12 = state.bookingDetail) === null || _state$bookingDetail12 === void 0 ? void 0 : _state$bookingDetail12.deposit_paid_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'), " ").concat(total.duration ? "(".concat(total.duration, ")") : '');
     }
 
     // 有退款金额时, 直接展示 退款:$8.00
@@ -1217,8 +1229,8 @@ var Footer = function Footer(props) {
     }
   };
   var subTotalList = useMemo(function () {
-    var _state$bookingDetail9, _state$bookingDetail10, _state$bookingDetail11;
-    var surcharge = (((_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.surcharge) || []).map(function (d, index) {
+    var _state$bookingDetail13, _state$bookingDetail14, _state$bookingDetail15;
+    var surcharge = (((_state$bookingDetail13 = state.bookingDetail) === null || _state$bookingDetail13 === void 0 ? void 0 : _state$bookingDetail13.surcharge) || []).map(function (d, index) {
       return {
         key: "custom_surcharge_".concat(index),
         label: d.name[state.locale],
@@ -1237,9 +1249,9 @@ var Footer = function Footer(props) {
       key: 'tax',
       value: total.tax,
       tax: {
-        rate: state === null || state === void 0 || (_state$bookingDetail10 = state.bookingDetail) === null || _state$bookingDetail10 === void 0 ? void 0 : _state$bookingDetail10.tax_rate,
+        rate: state === null || state === void 0 || (_state$bookingDetail14 = state.bookingDetail) === null || _state$bookingDetail14 === void 0 ? void 0 : _state$bookingDetail14.tax_rate,
         is_price_include_tax: is_price_include_tax(state),
-        title: state === null || state === void 0 || (_state$bookingDetail11 = state.bookingDetail) === null || _state$bookingDetail11 === void 0 ? void 0 : _state$bookingDetail11.tax_title
+        title: state === null || state === void 0 || (_state$bookingDetail15 = state.bookingDetail) === null || _state$bookingDetail15 === void 0 ? void 0 : _state$bookingDetail15.tax_title
       }
     },
     // 订单折扣
@@ -1260,7 +1272,7 @@ var Footer = function Footer(props) {
       value: total.roundingAmount,
       label: locales.getText('pisell1.text.rounding')
     }]);
-  }, [total, (_state$bookingDetail12 = state.bookingDetail) === null || _state$bookingDetail12 === void 0 ? void 0 : _state$bookingDetail12.surcharge, state, state.bookingId]);
+  }, [total, (_state$bookingDetail16 = state.bookingDetail) === null || _state$bookingDetail16 === void 0 ? void 0 : _state$bookingDetail16.surcharge, state, state.bookingId]);
   var orderTotalList = useMemo(function () {
     return [
     // 订单已付金额
@@ -1291,11 +1303,7 @@ var Footer = function Footer(props) {
       value: total.totalRefundAmount,
       label: locales.getText('pisell2.text.refunded-amount')
     }];
-  }, [total, (_state$bookingDetail13 = state.bookingDetail) === null || _state$bookingDetail13 === void 0 ? void 0 : _state$bookingDetail13.surcharge, state, state.bookingId]);
-  var paymentRefundedStatus = useMemo(function () {
-    var _state$bookingDetail14;
-    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail14 = state.bookingDetail) === null || _state$bookingDetail14 === void 0 ? void 0 : _state$bookingDetail14.payment_status);
-  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
+  }, [total, (_state$bookingDetail17 = state.bookingDetail) === null || _state$bookingDetail17 === void 0 ? void 0 : _state$bookingDetail17.surcharge, state, state.bookingId]);
   return /*#__PURE__*/React.createElement(Skeleton, {
     title: false,
     round: true,

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

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

package/es/components/booking/forms/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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,3 +1,4 @@
+/// <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/useIsBooking4Shop.d.ts

@@ -1 +1 @@
-export declare const useIsBooking4Shop: (state: any) => boolean;
+export declare const useIsBooking4Shop: (state: any) => any;

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

@@ -2,9 +2,10 @@ import { useMemo } from 'react';
 import useEngineContext from "../../../hooks/useEngineContext";
 import { isBooking4Shop } from "../info/utils";
 export var useIsBooking4Shop = function useIsBooking4Shop(state) {
+  var _context$appHelper$ut4;
   var context = useEngineContext();
   return useMemo(function () {
-    var _context$appHelper$ut, _context$appHelper$ut2;
-    return 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, state.renderType);
-  }, [state.renderType]);
+    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3;
+    return 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, state.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
+  }, [state.renderType, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils]);
 };

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

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

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

@@ -10,7 +10,7 @@ import AddService2 from "../../info2/service/addService";
 import { isBooking4Shop } from "../utils";
 import useEngineContext from "../../../../hooks/useEngineContext";
 var AddServiceVariant = function AddServiceVariant(props) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _props$globalState;
+  var _context$appHelper$ut, _context$appHelper$ut2, _props$globalState, _context$appHelper$ut3;
   var globalState = props.globalState,
     setGlobalState = props.setGlobalState;
   var context = useEngineContext();
@@ -33,7 +33,7 @@ var AddServiceVariant = function AddServiceVariant(props) {
     }
   };
   var Cpt = AddService;
-  if (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, props === null || props === void 0 || (_props$globalState = props.globalState) === null || _props$globalState === void 0 ? void 0 : _props$globalState.renderType)) {
+  if (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, props === null || props === void 0 || (_props$globalState = props.globalState) === null || _props$globalState === void 0 ? void 0 : _props$globalState.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils)) {
     Cpt = AddService2;
   }
   return /*#__PURE__*/React.createElement(Cpt, {

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

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

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

@@ -1,3 +1,4 @@
+/// <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/index.d.ts

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

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

@@ -3,13 +3,13 @@ import Info2 from "../info2";
 import Info1 from "./main";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { isBooking4Shop } from "./utils";
-import { Skeleton } from "antd";
+import { Skeleton } from 'antd';
 var APP = function APP(props) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5;
   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)) {
+  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, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
+  if (!((_context$appHelper$ut4 = context.appHelper.utils.store) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut5 = _context$appHelper$ut4.getState) !== null && _context$appHelper$ut5 !== void 0 && (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) !== null && _context$appHelper$ut5 !== void 0 && (_context$appHelper$ut5 = _context$appHelper$ut5.global) !== null && _context$appHelper$ut5 !== void 0 && (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) !== null && _context$appHelper$ut5 !== void 0 && _context$appHelper$ut5.id)) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         padding: 16

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

@@ -1,5 +1,14 @@
+/// <reference types="react" />
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

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

@@ -19,7 +19,7 @@ var Like = function Like(_ref) {
       }
       e.preventDefault();
       e.stopPropagation();
-      onChange === null || onChange === void 0 || onChange(status === "like" ? "common" : "like");
+      onChange === null || onChange === void 0 ? void 0 : onChange(status === "like" ? "common" : "like");
     }
   });
 };

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

@@ -21,7 +21,7 @@ export declare const isInterval: (time1: number, time2: number, interval?: numbe
  * @Date: 2024-08-13 19:36
  */
 export declare const formatServiceListByTime: (list: any[]) => any[];
-export declare const isBooking4Shop: (shopId: number, renderType?: string) => boolean;
+export declare const isBooking4Shop: (shopId: number, renderType?: string, businessUtils?: any) => any;
 declare type DataEntry = {
     total: number;
     origin_total: number;

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

@@ -91,12 +91,14 @@ export var formatServiceListByTime = function formatServiceListByTime(list) {
     return list;
   }
 };
-export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
+export var isBooking4Shop = function isBooking4Shop(shopId, renderType, businessUtils) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913];
-  return booking4Shops.includes(shopId);
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913, 8918, 6413];
+
+  // 固定的shopId 或者安装 Resource Kit 应用，则认为是booking4Shop
+  return booking4Shops.includes(shopId) || (businessUtils === null || businessUtils === void 0 ? void 0 : businessUtils.getAppByModal('resourcekit'));
 };
 function generateDateRange(start, end) {
   var dateRange = [];

package/es/components/booking/info2/service/addService/utils.js

@@ -370,7 +370,11 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
   var _resources = _toConsumableArray((cacheItem === null || cacheItem === void 0 || (_cacheItem$product_re = cacheItem.product_resource) === null || _cacheItem$product_re === void 0 ? void 0 : _cacheItem$product_re.resources) || []);
   var _ref8 = extraParams || {},
     _ref8$extraResources = _ref8.extraResources,
-    extraResources = _ref8$extraResources === void 0 ? [] : _ref8$extraResources;
+    extraResources = _ref8$extraResources === void 0 ? [] : _ref8$extraResources,
+    _ref8$resourcesOrigin = _ref8.resourcesOrigin,
+    resourcesOrigin = _ref8$resourcesOrigin === void 0 ? [] : _ref8$resourcesOrigin,
+    _ref8$resourceTab = _ref8.resourceTab,
+    resourceTab = _ref8$resourceTab === void 0 ? {} : _ref8$resourceTab;
   // 过滤出开启的资源
   _resources = _resources.filter(function (d) {
     return d.status == 1;
@@ -379,15 +383,29 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
     _step2;
   try {
     var _loop3 = function _loop3() {
+      var _resourceTab$item$cod;
       var item = _step2.value;
       var form_id = item.id;
+      // resource_tab -> 每个资源类型 -> resource_display_scope  { only_linked: '仅显示已关联资源' ｜ all: '全部' } 默认值 ‘only_linked’
+      var isAllResource = (resourceTab === null || resourceTab === void 0 || (_resourceTab$item$cod = resourceTab[item.code]) === null || _resourceTab$item$cod === void 0 ? void 0 : _resourceTab$item$cod.resource_display_scope) === 'all';
 
       // 将未绑定的资源，也放入 SelectOption 列表，避免出现仅展示id的情况
-      var extraResourceIds = extraResources.filter(function (_extraItem) {
-        return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
-      }).map(function (_extraItem) {
-        return _extraItem.id;
-      });
+      var extraResourceIds = [];
+
+      // 如果设置了全部资源 需要把未关联的资源进行补全
+      if (isAllResource) {
+        extraResourceIds = (resourcesOrigin || []).filter(function (d) {
+          return d.form_code === item.code;
+        }).map(function (d) {
+          return d.id;
+        });
+      } else {
+        extraResourceIds = extraResources.filter(function (_extraItem) {
+          return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
+        }).map(function (_extraItem) {
+          return _extraItem.id;
+        });
+      }
       extraResourceIds = Array.from(new Set(extraResourceIds));
 
       // 去重
@@ -415,7 +433,7 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
       };
 
       // 可选项
-      var optional_resource = [].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)).map(function (d) {
+      var optional_resource = Array.from(new Set([].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)))).map(function (d) {
         if (!resourcesOriginMap[d]) {
           return null;
         }
@@ -502,10 +520,13 @@ export var getProductExtend = function getProductExtend(_ref11) {
 
   // 资源总列表
   var resourcesOriginMap = state.service.resourcesOriginMap || {};
+  // const resourcesOrigin = state.s;
+
   _cacheItem._data = {};
 
   // 新商品
   if (isNew) {
+    var _state$bookingConfig3;
     // 时间切片
     _cacheItem._data.timeObj = getTimeObj({
       cacheItem: cacheItem,
@@ -520,7 +541,11 @@ export var getProductExtend = function getProductExtend(_ref11) {
     _cacheItem._data.capacitys = cacheItem.capacity;
 
     // 将商品关联的资源id还原资源列表
-    _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem);
+    _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem, {
+      //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+      resourceTab: state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.resource_tab,
+      resourcesOrigin: state.service.resourcesOrigin
+    });
 
     // 默认容量
     _cacheItem._extend.capacity = setDefaultCapacitys({
@@ -592,6 +617,7 @@ export var getProductExtend = function getProductExtend(_ref11) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
+      var _state$bookingConfig4;
       var extraResources = [];
       // 日历中可以将预约拖入未绑定的资源中，需要兼容未绑定资源的 selectOption展示
       if (Array.isArray(_cacheItem._extend.event_resources)) {
@@ -603,7 +629,10 @@ export var getProductExtend = function getProductExtend(_ref11) {
         });
       }
       _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem, {
-        extraResources: extraResources
+        extraResources: extraResources,
+        //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+        resourceTab: state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.resource_tab,
+        resourcesOrigin: state.service.resourcesOrigin
       });
     }
     if (!_cacheItem._data.resources) {

package/es/components/booking/info2/service/addTimeModal/index.js

@@ -498,7 +498,7 @@ var AddTimeModal = function AddTimeModal() {
   }();
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _context$appHelper$ut2, _context$appHelper$ut3;
+      var _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
       var loadingType,
         api,
         _args5 = arguments;
@@ -520,7 +520,7 @@ var AddTimeModal = function AddTimeModal() {
           case 5:
             loadingRef.current = true;
             setLoading(loadingType);
-            api = isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id, state.renderType) ? saveAddTimeProduct2 : saveAddTimeProduct;
+            api = isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id, state.renderType, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils) ? saveAddTimeProduct2 : saveAddTimeProduct;
             _context5.prev = 8;
             _context5.next = 11;
             return api({

package/es/components/booking/info2/service/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import '../../info/service/index.less';
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+export default _default;

package/es/components/booking/info2/utils.d.ts

@@ -0,0 +1,4 @@
+export declare const getFormatResourceListAndMap: (data: any[], bookingId?: number[]) => {
+    list: any[];
+    listMap: any;
+};

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

@@ -69,9 +69,15 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   });
 
   // 已预约的列表
-  var eventList = (time.event_list || []).filter(function (event) {
-    return event.id !== (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.booking_id);
-  });
+  var eventList = time.event_list || [];
+
+  // todo: event_list数据会进行合并 id不准确
+  // 编辑时过滤当前预约
+  if (cacheItem !== null && cacheItem !== void 0 && cacheItem.booking_id) {
+    eventList = eventList.filter(function (event) {
+      return event.id !== (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.booking_id);
+    });
+  }
   var endDate = null;
   // 是否去计算数量
   var isCalcCount = true;

package/es/components/booking/materiels/startTime/index.js

@@ -25,7 +25,7 @@ var StartTime = function StartTime(props) {
     return sliceDayIntoFiveMinutes(slice, locale);
   }, [slice, locale]);
   useEffect(function () {
-    timeObjChange === null || timeObjChange === void 0 || timeObjChange(timeObj);
+    timeObjChange === null || timeObjChange === void 0 ? void 0 : timeObjChange(timeObj);
   }, [timeObj]);
   var renderOptions = useCallback(function (array) {
     var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "value";

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -104,4 +105,11 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/notes/NoteBlock/NoteItem/index.js

@@ -18,7 +18,7 @@ var NoteItem = function NoteItem(props) {
     _props$menus = props.menus,
     menus = _props$menus === void 0 ? defaultMenus : _props$menus;
   var menuChange = function menuChange(e) {
-    onChange === null || onChange === void 0 || onChange(item, e.key);
+    onChange === null || onChange === void 0 ? void 0 : onChange(item, e.key);
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-notes-item"