@pisell/private-materials 6.6.101 → 6.6.103

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

@@ -513,6 +513,19 @@ var formatProducts = function formatProducts(item, quantity) {
   // 非手动折扣
   var notManualDiscount = discount_list.filter(function (item) {
     return item.type !== 'product';
+  }).map(function (discount) {
+    var _discount$metadata, _discount$metadata$nu, _discount$metadata2;
+    // 预约按份拆成 num=1 提交时，主商品扣次也要按当前提交数量拆分。
+    if (quantity === undefined || (discount.tag || discount.type) !== 'entitlement_pass' || (_discount$metadata = discount.metadata) !== null && _discount$metadata !== void 0 && _discount$metadata.custom_product_bundle_map_id) {
+      return discount;
+    }
+    var num = Math.min(Number((_discount$metadata$nu = (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.num) !== null && _discount$metadata$nu !== void 0 ? _discount$metadata$nu : item._extend.quantity), quantity);
+    return _objectSpread(_objectSpread({}, discount), {}, {
+      _num: num,
+      metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
+        num: num
+      })
+    });
   });
   if (item.isCustomItem) {
     item.product_id = 0;

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

@@ -107,6 +107,14 @@ var VoucherCard = function VoucherCard(props) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+  useEffect(function () {
+    var _shopDiscount$setEnti;
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setEnti = shopDiscount.setEntitlementPassEnabled) === null || _shopDiscount$setEnti === void 0 || _shopDiscount$setEnti.call(shopDiscount, isBooking4Shop);
+    return function () {
+      var _shopDiscount$setEnti2;
+      return shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setEnti2 = shopDiscount.setEntitlementPassEnabled) === null || _shopDiscount$setEnti2 === void 0 ? void 0 : _shopDiscount$setEnti2.call(shopDiscount, false);
+    };
+  }, [shopDiscount, isBooking4Shop]);
 
   // 设置client
   useDebounceEffect(function () {
@@ -354,11 +362,42 @@ var VoucherCard = function VoucherCard(props) {
     if (!isBooking4Shop) return [];
     return discountList.filter(function (item) {
       return !!item.isAvailable;
-    }).map(function (discount) {
-      return _objectSpread(_objectSpread({}, discount), {}, {
-        isDisabled: discount.isDisabled || discount.isDisabledForProductUsed || disabled,
+    }).flatMap(function (discount) {
+      var _discount$appliedProd, _discount$committedAp, _discount$applicableP;
+      var currentRow = _objectSpread(_objectSpread({}, discount), {}, {
+        // 原卡片仍读取 isSelected，历史扣次不代表本次勾选。
+        isSelected: discount.tag === 'entitlement_pass' && !discount.isDisabled ? !!discount.isSelected && (((_discount$appliedProd = discount.appliedProductDetails) === null || _discount$appliedProd === void 0 ? void 0 : _discount$appliedProd.length) || 0) > (((_discount$committedAp = discount.committedAppliedProductDetails) === null || _discount$committedAp === void 0 ? void 0 : _discount$committedAp.length) || 0) : discount.isSelected,
+        isDisabled: discount.isDisabled || (discount.tag === 'entitlement_pass' ? !discount.isAvailable : discount.isDisabledForProductUsed) || disabled,
         savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       });
+      var committedDetails = discount.tag === 'entitlement_pass' ? discount.committedAppliedProductDetails || [] : [];
+      if (!committedDetails.length) return [currentRow];
+
+      // 历史抵扣独立展示；卡的次数配置只影响本次使用，不影响上次结算记录。
+      var historyRow = _objectSpread(_objectSpread({}, discount), {}, {
+        displayKey: "".concat(discount.id, "-last-settlement"),
+        isEditMode: true,
+        isSelected: true,
+        isDisabled: true,
+        appliedProductDetails: committedDetails,
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(_objectSpread(_objectSpread({}, discount), {}, {
+          savedAmount: 0,
+          appliedProductDetails: committedDetails
+        }))
+      });
+      // Rules 返回的 appliedProductDetails 按“历史抵扣 + 本次抵扣”排列。
+      var currentDetails = (discount.appliedProductDetails || []).slice(committedDetails.length);
+      var canApplyToNewProducts = !discount.isDisabled && (((_discount$applicableP = discount.applicableProductDetails) === null || _discount$applicableP === void 0 ? void 0 : _discount$applicableP.length) || 0) > 0;
+      if (!currentDetails.length && !canApplyToNewProducts) return [historyRow];
+      return [historyRow, _objectSpread(_objectSpread({}, currentRow), {}, {
+        displayKey: "".concat(discount.id, "-current"),
+        isEditMode: false,
+        appliedProductDetails: currentDetails,
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(_objectSpread(_objectSpread({}, discount), {}, {
+          savedAmount: 0,
+          appliedProductDetails: currentDetails
+        }))
+      })];
     });
   }, [discountList, isBooking4Shop, disabled]);
   if (!isBooking4Shop) return null;

package/es/components/booking/info/clientVariant/hooks/useClientFn.js

@@ -52,7 +52,7 @@ var useClientFn = function useClientFn(_params) {
       num: 5,
       total: 0,
       search: '',
-      with: ['formRecord', 'contactsInfo'],
+      with: ['contactsInfo'],
       relation_form_id: state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.appointment_subject) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.form_id
     }),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -76,6 +76,7 @@ var useClientFn = function useClientFn(_params) {
   }, [(_state$client$value2 = state.client.value) === null || _state$client$value2 === void 0 ? void 0 : _state$client$value2.id]);
   var getClients = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref, returnResult) {
+      var _state$bookingConfig4;
       var customer_id, customer_ids, resetParams, _setLoading, _state$client, api, withKey, data, list, _payload, customerItem, totalList;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -109,17 +110,19 @@ var useClientFn = function useClientFn(_params) {
                 abort: true
               }
             } : {}), {}, {
-              with: withKey
+              with: withKey,
+              with_form_records: 1,
+              relation_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
             }));
           case 8:
             data = _context.sent;
             list = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (d) {
-              var _d$form_record;
+              var _d$form_record_list;
               return _objectSpread(_objectSpread({}, d), {}, {
                 name: getNickname(d),
                 id: d.franchisee_customer_id || d.id,
-                form_record: ((_d$form_record = d.form_record) === null || _d$form_record === void 0 ? void 0 : _d$form_record.map(function (item) {
-                  return _objectSpread(_objectSpread(_objectSpread({}, item), item.data), {}, {
+                form_record: ((_d$form_record_list = d.form_record_list) === null || _d$form_record_list === void 0 ? void 0 : _d$form_record_list.map(function (item) {
+                  return _objectSpread(_objectSpread(_objectSpread({}, item.data), item), {}, {
                     form_record_id: item.id
                   });
                 })) || []

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

@@ -262,7 +262,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
               case 7:
                 _context.next = 9;
                 return getClients({
-                  with: ['formRecord', 'contactsInfo'],
+                  with: ['contactsInfo'],
                   relation_form_id: boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id,
                   skip: 1,
                   num: 20,

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

@@ -41,7 +41,7 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getDays, getProductOriginTotalPrice, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { getProductAllDiscountList, mergeBundleWithOriginalPrice, setProductPrice } from "./utils";
+import { getProductAllDiscountList, hasEntitlementDiscount, mergeBundleWithOriginalPrice, setProductPrice, updateEntitlementQuantity } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 import EditTabs from "../../../info/service/editService/EditTabs";
@@ -91,6 +91,7 @@ var Info = function Info(_, ref) {
   var resourcesRef = useRef(null);
   var isChangeTotal = useRef(false);
   var shouldReallocateBundlePriceRef = useRef(false);
+  var isEntitlementPrice = hasEntitlementDiscount(state.service.cacheItem);
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     noteModalOpen = _useState4[0],
@@ -322,7 +323,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values, cacheItem) {
-    var _resourcesRef$current, _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item2, _item3, _item$_extend5, _state$service$cacheI3, _window$closeBookingE2, _window2;
+    var _resourcesRef$current, _item$_extend, _list$find, _previousItem$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item2, _item3, _item$_extend5, _state$service$cacheI3, _window$closeBookingE2, _window2;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -362,7 +363,8 @@ var Info = function Info(_, ref) {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
-    var shouldReallocatePrice = isChangeTotal.current || shouldReallocateBundlePriceRef.current;
+    var isManualPriceChange = isChangeTotal.current && !hasEntitlementDiscount(_item);
+    var shouldReallocatePrice = isManualPriceChange || shouldReallocateBundlePriceRef.current;
     if (shouldReallocatePrice) {
       var _extend$other, _extend$other2;
       // 计算折扣比例
@@ -394,9 +396,16 @@ var Info = function Info(_, ref) {
     _item._time = new Date().getTime();
     _item._serviceKey = genServiceKey(_item);
     _item._holderKey = genHolderKey(_item);
+    var previousItem = (_list$find = _list.find(function (item) {
+      return item._id === _item._id;
+    })) !== null && _list$find !== void 0 ? _list$find : _list.find(function (item) {
+      return isSameBookingServiceItem(item, _item);
+    });
+    var isEntitlementQuantityChange = hasEntitlementDiscount(previousItem) && Number(_item._extend.quantity || 1) !== Number((previousItem === null || previousItem === void 0 || (_previousItem$_extend = previousItem._extend) === null || _previousItem$_extend === void 0 ? void 0 : _previousItem$_extend.quantity) || 1);
     // 如果holder 有多个，则需要拆分多个商品
     // 另外一个情况 如果商品数量有多个，holder 数量小于商品数量也需要拆分
-    if (((_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.holder_id) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.length) > 1 || ((_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.quantity) > 1 && ((_item$_extend4 = _item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.holder_id) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.length) >= 1) {
+    // 多次卡改量由 updateEntitlementQuantity 拆分，避免复制历史扣次。
+    if (!isEntitlementQuantityChange && (((_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.holder_id) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.length) > 1 || ((_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.quantity) > 1 && ((_item$_extend4 = _item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.holder_id) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.length) >= 1)) {
       var holder_ids = _item._extend.holder_id;
       _item._extend.holder_id = holder_ids[0];
       holder_ids = holder_ids.slice(1);
@@ -465,10 +474,16 @@ var Info = function Info(_, ref) {
           _item = deleteDiscountList(_item, true);
         }
         if (matchById) {
-          _list = _list.map(function (d) {
-            return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
+          _list = _list.flatMap(function (d) {
+            if (d._id !== _id) return [d];
+            return updateEntitlementQuantity(d, _objectSpread(_objectSpread({}, _item), {}, {
               new: 0
-            }) : d;
+            })).map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                _serviceKey: genServiceKey(item),
+                _holderKey: genHolderKey(item)
+              });
+            });
           });
         } else {
           // fallback：合并同预约重复项，沿用 list 内 _id 避免再次失配
@@ -476,10 +491,15 @@ var Info = function Info(_, ref) {
           _list = _list.reduce(function (acc, d) {
             if (isSameBookingServiceItem(d, _item)) {
               if (!replaced) {
-                acc.push(_objectSpread(_objectSpread({}, _item), {}, {
+                acc.push.apply(acc, _toConsumableArray(updateEntitlementQuantity(d, _objectSpread(_objectSpread({}, _item), {}, {
                   new: 0,
                   _id: d._id
-                }));
+                })).map(function (item) {
+                  return _objectSpread(_objectSpread({}, item), {}, {
+                    _serviceKey: genServiceKey(item),
+                    _holderKey: genHolderKey(item)
+                  });
+                })));
                 replaced = true;
               }
             } else {
@@ -952,7 +972,7 @@ var Info = function Info(_, ref) {
       precision: 2,
       prefix: state.amountSymbol,
       onChange: handleTotalChange,
-      disabled: state.channelDisabledEdit,
+      disabled: state.channelDisabledEdit || isEntitlementPrice,
       originalValue: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || 0,
       placeholder: ((_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total) || '0',
       size: "large",
@@ -963,7 +983,7 @@ var Info = function Info(_, ref) {
         selectType: 'dark'
       }
     })));
-  }, [useTotal, (_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 || (_state$service$cacheI12 = _state$service$cacheI12._extend) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.origin_total, state.amountSymbol, state.channelDisabledEdit]);
+  }, [useTotal, (_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 || (_state$service$cacheI12 = _state$service$cacheI12._extend) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.origin_total, state.amountSymbol, state.channelDisabledEdit, isEntitlementPrice]);
   var reason = useMemo(function () {
     return isReason ? /*#__PURE__*/React.createElement(Col, {
       span: 24

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

@@ -7,6 +7,9 @@
 
 判断是否需要进入编辑服务页
  */
+export declare const hasEntitlementDiscount: (item: any) => boolean;
+/** 已提交部分保留原扣次；增加的数量作为新商品交给 OS 重新计算。 */
+export declare const updateEntitlementQuantity: (previous: any, next: any) => any[];
 export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;

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

@@ -1,15 +1,15 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /**
 1. 在进入编辑服务前
 
@@ -20,16 +20,125 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 判断是否需要进入编辑服务页
  */
 
-import { isArr } from "@pisell/utils";
-import { isBoolean } from "@pisell/utils";
+import { getUniqueId, isArr, isBoolean } from "@pisell/utils";
 import Decimal from "decimal.js";
+import { cloneDeep } from 'lodash';
 import { getBundleDiscountList } from "../../../components/footer/utils";
+import { getMainPrice, getProductTotalPrice } from "../../../utils";
+var isEntitlementDiscount = function isEntitlementDiscount(discount) {
+  return ((discount === null || discount === void 0 ? void 0 : discount.tag) || (discount === null || discount === void 0 ? void 0 : discount.type)) === 'entitlement_pass';
+};
+var getServiceDiscounts = function getServiceDiscounts(item) {
+  var _item$_extend;
+  return [].concat(_toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []), _toConsumableArray(((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).flatMap(function (bundle) {
+    return bundle.discount_list || [];
+  })));
+};
+export var hasEntitlementDiscount = function hasEntitlementDiscount(item) {
+  return getServiceDiscounts(item).some(isEntitlementDiscount);
+};
+
+/** 已提交部分保留原扣次；增加的数量作为新商品交给 OS 重新计算。 */
+export var updateEntitlementQuantity = function updateEntitlementQuantity(previous, next) {
+  var _previous$_extend, _previous$_extend2, _previous$_extend3;
+  var discounts = getServiceDiscounts(previous);
+  var persisted = [previous === null || previous === void 0 ? void 0 : previous.booking_id, previous === null || previous === void 0 ? void 0 : previous.order_detail_id, previous === null || previous === void 0 || (_previous$_extend = previous._extend) === null || _previous$_extend === void 0 ? void 0 : _previous$_extend.order_detail_id].some(function (value) {
+    return Number(value) > 0;
+  }) || discounts.some(function (discount) {
+    return isEntitlementDiscount(discount) && discount.id;
+  });
+  var previousQuantity = Number((previous === null || previous === void 0 || (_previous$_extend2 = previous._extend) === null || _previous$_extend2 === void 0 ? void 0 : _previous$_extend2.quantity) || 1);
+  var nextQuantity = Number(next._extend.quantity || 1);
+  if (!persisted || !hasEntitlementDiscount(previous) || nextQuantity === previousQuantity) {
+    return [next];
+  }
+  if (nextQuantity < previousQuantity) {
+    // 商品弹窗会重算原价；历史行减量只调整数量，沿用已提交的价格和商品配置。
+    return [_objectSpread(_objectSpread({}, previous), {}, {
+      _extend: _objectSpread(_objectSpread(_objectSpread({}, previous._extend), {}, {
+        quantity: nextQuantity
+      }, Array.isArray(next._extend.holder_id) ? {
+        holder_id: next._extend.holder_id.slice(0, nextQuantity)
+      } : {}), {}, {
+        other: _objectSpread(_objectSpread({}, previous._extend.other), {}, {
+          quantity: nextQuantity
+        })
+      }),
+      discount_list: (previous.discount_list || []).map(function (discount) {
+        var _discount$metadata, _discount$metadata$nu, _discount$metadata2;
+        // 套餐扣次是每份主商品中的子商品次数，不能按主商品数量裁剪。
+        if (!isEntitlementDiscount(discount) || (_discount$metadata = discount.metadata) !== null && _discount$metadata !== void 0 && _discount$metadata.custom_product_bundle_map_id) return discount;
+        var num = Math.min(Number((_discount$metadata$nu = (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.num) !== null && _discount$metadata$nu !== void 0 ? _discount$metadata$nu : previousQuantity), nextQuantity);
+        return _objectSpread(_objectSpread({}, discount), {}, {
+          _num: num,
+          metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
+            num: num
+          })
+        });
+      })
+    })];
+  }
+  var appended = cloneDeep(next);
+  var uid = getUniqueId();
+  appended._id = uid;
+  appended.booking_id = 0;
+  appended.order_detail_id = 0;
+  appended.new = 0;
+  appended.discount_list = [];
+  appended.discount_amount = 0;
+  appended.metadata = _objectSpread(_objectSpread({}, appended.metadata), {}, {
+    unique_identification_number: uid
+  });
+  delete appended.metadata.entitlement_source_identity;
+  delete appended.metadata.entitlement_source_product_uid;
+  if (appended._origin) delete appended._origin.booking_id;
+  var extend = appended._extend;
+  extend.order_detail_id = 0;
+  extend.unique_identification_number = uid;
+  extend.quantity = nextQuantity - previousQuantity;
+  if (Array.isArray(extend.holder_id)) {
+    var holders = extend.holder_id.slice(previousQuantity, nextQuantity);
+    extend.holder_id = holders.length ? holders : undefined;
+  }
+  extend.other = _objectSpread(_objectSpread({}, extend.other), {}, {
+    quantity: extend.quantity
+  });
+  extend.other.bundle = (extend.other.bundle || []).map(function (bundle) {
+    var _ref, _ref2, _bundle$original_pric, _bundle$discount_list;
+    var price = (_ref = (_ref2 = (_bundle$original_pric = bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : (_bundle$discount_list = bundle.discount_list) === null || _bundle$discount_list === void 0 || (_bundle$discount_list = _bundle$discount_list[0]) === null || _bundle$discount_list === void 0 || (_bundle$discount_list = _bundle$discount_list.discount) === null || _bundle$discount_list === void 0 ? void 0 : _bundle$discount_list.original_amount) !== null && _ref2 !== void 0 ? _ref2 : bundle.product_price) !== null && _ref !== void 0 ? _ref : bundle.price;
+    var bundleUid = getUniqueId();
+    var metadata = _objectSpread(_objectSpread({}, bundle.metadata), {}, {
+      custom_product_bundle_map_id: bundleUid,
+      unique_identification_number: bundleUid
+    });
+    delete metadata.entitlement_source_identity;
+    return _objectSpread(_objectSpread({}, bundle), {}, {
+      _id: bundleUid,
+      price: price,
+      bundle_selling_price: price,
+      discount_list: [],
+      metadata: metadata
+    });
+  });
+  var mainDiscount = (next.discount_list || []).find(function (discount) {
+    var _discount$metadata3, _discount$discount;
+    return !((_discount$metadata3 = discount.metadata) !== null && _discount$metadata3 !== void 0 && _discount$metadata3.custom_product_bundle_map_id) && ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.original_amount) != null;
+  });
+  if (mainDiscount && (previous === null || previous === void 0 || (_previous$_extend3 = previous._extend) === null || _previous$_extend3 === void 0 || (_previous$_extend3 = _previous$_extend3.other) === null || _previous$_extend3 === void 0 ? void 0 : _previous$_extend3.product_variant_id) === extend.other.product_variant_id) {
+    extend.price = Number(mainDiscount.discount.original_amount);
+    if (extend.other.product_variant_id) extend.other.price = extend.price;
+  }
+  extend.main_product_selling_price = getMainPrice(appended);
+  extend.total = getProductTotalPrice(appended);
+  extend.origin_total = extend.total;
+  return [previous, appended];
+};
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
-var init = function init(_ref) {
-  var cacheItem = _ref.cacheItem,
-    state = _ref.state;
+var init = function init(_ref3) {
+  var cacheItem = _ref3.cacheItem,
+    state = _ref3.state;
   var _cacheItem = _objectSpread({}, cacheItem);
   var renderData = {};
   var _extend = {};
@@ -74,11 +183,11 @@ export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
  * @param newTotal - 折扣后的新总价
  * @param origin_total - 原始总价
  */
-export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
-  var _cacheItem$discount_l, _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5;
-  var newTotal = _ref2.newTotal,
-    origin_total = _ref2.origin_total;
-  if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$discount_l = cacheItem.discount_list) !== null && _cacheItem$discount_l !== void 0 && _cacheItem$discount_l.length && ((cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list) || []).some(function (item) {
+export var setProductPrice = function setProductPrice(cacheItem, _ref4) {
+  var _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5;
+  var newTotal = _ref4.newTotal,
+    origin_total = _ref4.origin_total;
+  if (hasEntitlementDiscount(cacheItem) || ((cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list) || []).some(function (item) {
     return ['good_pass', 'discount_card', 'product_discount_card'].includes(item.type);
   })) {
     return cacheItem;
@@ -97,12 +206,12 @@ export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
   if ((_cacheItem$_extend$ot = cacheItem._extend.other) !== null && _cacheItem$_extend$ot !== void 0 && _cacheItem$_extend$ot.bundle && isArr((_cacheItem$_extend$ot2 = cacheItem._extend.other) === null || _cacheItem$_extend$ot2 === void 0 ? void 0 : _cacheItem$_extend$ot2.bundle)) {
     var _cacheItem$_extend$ot3;
     (_cacheItem$_extend$ot3 = cacheItem._extend.other) === null || _cacheItem$_extend$ot3 === void 0 || (_cacheItem$_extend$ot3 = _cacheItem$_extend$ot3.bundle) === null || _cacheItem$_extend$ot3 === void 0 || _cacheItem$_extend$ot3.forEach(function (bundle) {
-      var _ref3, _bundle$num;
+      var _ref5, _bundle$num;
       // 计算新价格，直接截取两位小数（不四舍五入）
       var newPrice = new Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
 
       // 获取数量，优先取 num，再取 quantity，默认为 1
-      var quantity = (_ref3 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref3 !== void 0 ? _ref3 : 1;
+      var quantity = (_ref5 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref5 !== void 0 ? _ref5 : 1;
 
       // 累加到子商品总价
       subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
@@ -116,12 +225,12 @@ export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
   if ((_cacheItem$_extend$ot4 = cacheItem._extend.other) !== null && _cacheItem$_extend$ot4 !== void 0 && _cacheItem$_extend$ot4.option && isArr((_cacheItem$_extend$ot5 = cacheItem._extend.other) === null || _cacheItem$_extend$ot5 === void 0 ? void 0 : _cacheItem$_extend$ot5.option)) {
     var _cacheItem$_extend$ot6;
     (_cacheItem$_extend$ot6 = cacheItem._extend.other) === null || _cacheItem$_extend$ot6 === void 0 || (_cacheItem$_extend$ot6 = _cacheItem$_extend$ot6.option) === null || _cacheItem$_extend$ot6 === void 0 || _cacheItem$_extend$ot6.forEach(function (option) {
-      var _ref4, _option$num;
+      var _ref6, _option$num;
       // 计算新价格，直接截取两位小数（不四舍五入）
       var newPrice = new Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
 
       // 获取数量，优先取 num，再取 quantity，默认为 1
-      var quantity = (_ref4 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1;
+      var quantity = (_ref6 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref6 !== void 0 ? _ref6 : 1;
 
       // 累加到子商品总价
       subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));

package/es/components/eftpos/const.d.ts

@@ -50,6 +50,8 @@ export interface DeviceProp {
  * @Date: 2024-08-19 11:10
  */
 export declare const getDefaultValue: (list: any) => any;
+/** Preserve fee fields when saving unrelated device or merchant settings. */
+export declare const preserveSurchargeValues: (values: any, list: any[]) => any;
 /**
  * @title: 构建通用表单配置信息,构建动态表单
  * @description:

package/es/components/eftpos/const.js

@@ -1,13 +1,14 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-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 _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 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); }); }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -63,6 +64,28 @@ export var getDefaultValue = function getDefaultValue(list) {
   }, {});
 };
 
+/** Preserve fee fields when saving unrelated device or merchant settings. */
+export var preserveSurchargeValues = function preserveSurchargeValues(values, list) {
+  var result = _objectSpread({}, values);
+  var _iterator = _createForOfIteratorHelper(list),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      if (Array.isArray(item.children) && item.children.length) {
+        result[item.__sourceName] = preserveSurchargeValues(values === null || values === void 0 ? void 0 : values[item.__sourceName], item.children);
+      } else if (item.Component === 'Surcharge') {
+        Object.assign(result, helpMapping.Surcharge.getCommDefaultVal(item));
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return result;
+};
+
 /**
  * @title: 构建通用表单配置信息,构建动态表单
  * @description: 

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

@@ -5,6 +5,7 @@ interface DeviceProps {
     onSave: (device: DeviceProp) => void;
     children?: React.ReactNode;
     type?: Eftpos;
+    surchargeReadOnly?: boolean;
     status?: 'add' | 'edit' | 'repair';
 }
 declare const Device: (props: DeviceProps) => JSX.Element;

package/es/components/eftpos/device.js

@@ -1,12 +1,14 @@
 import React from 'react';
 import { Form, Button } from 'antd';
 import { locales } from '@pisell/utils';
-import { Eftpos, getDefaultValue } from "./const";
+import { Eftpos, getDefaultValue, preserveSurchargeValues } from "./const";
 import FormItem from "./form";
 var Device = function Device(props) {
   var onSave = props.onSave,
     children = props.children,
-    formItemList = props.formItemList;
+    formItemList = props.formItemList,
+    _props$surchargeReadO = props.surchargeReadOnly,
+    surchargeReadOnly = _props$surchargeReadO === void 0 ? false : _props$surchargeReadO;
   var initialValues = getDefaultValue(formItemList);
   var simpleCloudIntegrationSteps = locales.getText('page.eftpos.text.simple.cloud.integration.steps');
   return /*#__PURE__*/React.createElement(React.Fragment, null, (props === null || props === void 0 ? void 0 : props.type) === Eftpos.MX51 && /*#__PURE__*/React.createElement("div", {
@@ -21,7 +23,9 @@ var Device = function Device(props) {
     }, step);
   })), /*#__PURE__*/React.createElement(Form, {
     layout: "vertical",
-    onFinish: onSave,
+    onFinish: function onFinish(values) {
+      return onSave(surchargeReadOnly ? preserveSurchargeValues(values, formItemList) : values);
+    },
     initialValues: initialValues,
     className: "pisell-lowcode__pos-device"
   }, /*#__PURE__*/React.createElement("div", {
@@ -31,7 +35,8 @@ var Device = function Device(props) {
       padding: '0 0 60px 0'
     }
   }, /*#__PURE__*/React.createElement(FormItem, {
-    formItemList: formItemList
+    formItemList: formItemList,
+    surchargeReadOnly: surchargeReadOnly
   }), children), /*#__PURE__*/React.createElement(Form.Item, {
     className: "pisell-lowcode__pos-device-btn"
   }, /*#__PURE__*/React.createElement(Button, {

package/es/components/eftpos/form/index.d.ts

@@ -3,10 +3,11 @@
  * @Author: hongbing.wang
  * @Date: 2024-08-20 13:21
  */
-declare const CustomFormItem: ({ formItemList, level, onChange, }: {
+declare const CustomFormItem: ({ formItemList, level, onChange, surchargeReadOnly, }: {
     formItemList: any[];
     level?: number | undefined;
     onChange?: ((...agrn: unknown[]) => unknown) | undefined;
+    surchargeReadOnly?: boolean | undefined;
 }) => JSX.Element;
 export default CustomFormItem;
 declare type helpMappingType = {