@pisell/private-materials 6.6.101 → 6.6.103

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

@@ -92,6 +92,9 @@ var Info = (_, ref) => {
   const resourcesRef = (0, import_react.useRef)(null);
   const isChangeTotal = (0, import_react.useRef)(false);
   const shouldReallocateBundlePriceRef = (0, import_react.useRef)(false);
+  const isEntitlementPrice = (0, import_utils8.hasEntitlementDiscount)(
+    state.service.cacheItem
+  );
   const [noteModalOpen, setNoteModalOpen] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [currentTab, setCurrentTab] = (0, import_react.useState)("batch_edit");
@@ -247,7 +250,7 @@ var Info = (_, ref) => {
     }
   };
   const onFinish = (values, cacheItem) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2, _r2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -281,7 +284,8 @@ var Info = (_, ref) => {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
-    const shouldReallocatePrice = isChangeTotal.current || shouldReallocateBundlePriceRef.current;
+    const isManualPriceChange = isChangeTotal.current && !(0, import_utils8.hasEntitlementDiscount)(_item);
+    const shouldReallocatePrice = isManualPriceChange || shouldReallocateBundlePriceRef.current;
     if (shouldReallocatePrice) {
       const discountRatio = new import_decimal.default(values.total).div(_item._extend.origin_total);
       const bundles2 = ((_c2 = _extend == null ? void 0 : _extend.other) == null ? void 0 : _c2.bundle) || [];
@@ -306,7 +310,9 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils3.genServiceKey)(_item);
     _item._holderKey = (0, import_utils3.genHolderKey)(_item);
-    if (((_f2 = (_e2 = _item._extend) == null ? void 0 : _e2.holder_id) == null ? void 0 : _f2.length) > 1 || ((_g2 = _item._extend) == null ? void 0 : _g2.quantity) > 1 && ((_i2 = (_h2 = _item._extend) == null ? void 0 : _h2.holder_id) == null ? void 0 : _i2.length) >= 1) {
+    const previousItem = _list.find((item) => item._id === _item._id) ?? _list.find((item) => isSameBookingServiceItem(item, _item));
+    const isEntitlementQuantityChange = (0, import_utils8.hasEntitlementDiscount)(previousItem) && Number(_item._extend.quantity || 1) !== Number(((_e2 = previousItem == null ? void 0 : previousItem._extend) == null ? void 0 : _e2.quantity) || 1);
+    if (!isEntitlementQuantityChange && (((_g2 = (_f2 = _item._extend) == null ? void 0 : _f2.holder_id) == null ? void 0 : _g2.length) > 1 || ((_h2 = _item._extend) == null ? void 0 : _h2.quantity) > 1 && ((_j2 = (_i2 = _item._extend) == null ? void 0 : _i2.holder_id) == null ? void 0 : _j2.length) >= 1)) {
       let holder_ids = _item._extend.holder_id;
       _item._extend.holder_id = holder_ids[0];
       holder_ids = holder_ids.slice(1);
@@ -325,8 +331,8 @@ var Info = (_, ref) => {
       }
     }
     let _id = _item == null ? void 0 : _item._id;
-    let groupId = (_j2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _j2.groupId;
-    const origin_total = (_n2 = (_m2 = (_l2 = (_k2 = _item._extend) == null ? void 0 : _k2.items) == null ? void 0 : _l2[0]) == null ? void 0 : _m2._extend) == null ? void 0 : _n2.origin_total;
+    let groupId = (_k2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _k2.groupId;
+    const origin_total = (_o2 = (_n2 = (_m2 = (_l2 = _item._extend) == null ? void 0 : _l2.items) == null ? void 0 : _m2[0]) == null ? void 0 : _n2._extend) == null ? void 0 : _o2.origin_total;
     if (groupId) {
       if (shouldReallocatePrice) {
         _item = deleteDiscountList(_item, true);
@@ -339,7 +345,7 @@ var Info = (_, ref) => {
     } else {
       _item = (0, import_utils8.setProductPrice)(_item, {
         newTotal: values.total,
-        origin_total: origin_total ?? ((_o2 = _item._extend) == null ? void 0 : _o2.origin_total)
+        origin_total: origin_total ?? ((_p2 = _item._extend) == null ? void 0 : _p2.origin_total)
       });
       const matchById = _list.some((d) => d._id === _id);
       const matchByBooking = !matchById && _list.some((d) => isSameBookingServiceItem(d, _item));
@@ -348,13 +354,32 @@ var Info = (_, ref) => {
           _item = deleteDiscountList(_item, true);
         }
         if (matchById) {
-          _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
+          _list = _list.flatMap((d) => {
+            if (d._id !== _id) return [d];
+            return (0, import_utils8.updateEntitlementQuantity)(
+              d,
+              { ..._item, new: 0 }
+            ).map((item) => ({
+              ...item,
+              _serviceKey: (0, import_utils3.genServiceKey)(item),
+              _holderKey: (0, import_utils3.genHolderKey)(item)
+            }));
+          });
         } else {
           let replaced = false;
           _list = _list.reduce((acc, d) => {
             if (isSameBookingServiceItem(d, _item)) {
               if (!replaced) {
-                acc.push({ ..._item, new: 0, _id: d._id });
+                acc.push(
+                  ...(0, import_utils8.updateEntitlementQuantity)(
+                    d,
+                    { ..._item, new: 0, _id: d._id }
+                  ).map((item) => ({
+                    ...item,
+                    _serviceKey: (0, import_utils3.genServiceKey)(item),
+                    _holderKey: (0, import_utils3.genHolderKey)(item)
+                  }))
+                );
                 replaced = true;
               }
             } else {
@@ -371,7 +396,7 @@ var Info = (_, ref) => {
     (0, import_utils6.deleteCacheParams)();
     console.log("_onFinish", _list);
     form.resetFields();
-    if (!!((_p2 = state.service.cacheItem) == null ? void 0 : _p2.new)) {
+    if (!!((_q2 = state.service.cacheItem) == null ? void 0 : _q2.new)) {
       window.dispatchEvent(
         new CustomEvent("onAddNewService", {
           detail: {
@@ -380,7 +405,7 @@ var Info = (_, ref) => {
         })
       );
     }
-    (_q2 = window.closeBookingEditModal) == null ? void 0 : _q2.call(window);
+    (_r2 = window.closeBookingEditModal) == null ? void 0 : _r2.call(window);
     _list.sort((a, b) => {
       var _a3, _b3;
       const aHasHolderId = ((_a3 = a._extend) == null ? void 0 : _a3.holder_id) && (Array.isArray(a._extend.holder_id) ? a._extend.holder_id.length > 0 : true);
@@ -750,7 +775,7 @@ var Info = (_, ref) => {
           precision: 2,
           prefix: state.amountSymbol,
           onChange: handleTotalChange,
-          disabled: state.channelDisabledEdit,
+          disabled: state.channelDisabledEdit || isEntitlementPrice,
           originalValue: ((_f2 = (_e2 = state.service.cacheItem) == null ? void 0 : _e2._extend) == null ? void 0 : _f2.origin_total) || 0,
           placeholder: ((_h2 = (_g2 = state.service.cacheItem) == null ? void 0 : _g2._extend) == null ? void 0 : _h2.origin_total) || "0",
           size: "large",
@@ -767,7 +792,8 @@ var Info = (_, ref) => {
     useTotal,
     (_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total,
     state.amountSymbol,
-    state.channelDisabledEdit
+    state.channelDisabledEdit,
+    isEntitlementPrice
   ]);
   const reason = (0, import_react.useMemo)(() => {
     return isReason ? /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(

package/lib/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/lib/components/booking/info2/service/editService/utils.js

@@ -31,20 +31,100 @@ var utils_exports = {};
 __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
+  hasEntitlementDiscount: () => hasEntitlementDiscount,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
-  setProductPrice: () => setProductPrice
+  setProductPrice: () => setProductPrice,
+  updateEntitlementQuantity: () => updateEntitlementQuantity
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
-var import_utils2 = require("@pisell/utils");
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils3 = require("../../../components/footer/utils");
+var import_lodash = require("lodash");
+var import_utils2 = require("../../../components/footer/utils");
+var import_utils3 = require("../../../utils");
+var isEntitlementDiscount = (discount) => ((discount == null ? void 0 : discount.tag) || (discount == null ? void 0 : discount.type)) === "entitlement_pass";
+var getServiceDiscounts = (item) => {
+  var _a, _b;
+  return [
+    ...(item == null ? void 0 : item.discount_list) || [],
+    ...(((_b = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).flatMap((bundle) => bundle.discount_list || [])
+  ];
+};
+var hasEntitlementDiscount = (item) => getServiceDiscounts(item).some(isEntitlementDiscount);
+var updateEntitlementQuantity = (previous, next) => {
+  var _a, _b, _c, _d;
+  const discounts = getServiceDiscounts(previous);
+  const persisted = [previous == null ? void 0 : previous.booking_id, previous == null ? void 0 : previous.order_detail_id, (_a = previous == null ? void 0 : previous._extend) == null ? void 0 : _a.order_detail_id].some((value) => Number(value) > 0) || discounts.some((discount) => isEntitlementDiscount(discount) && discount.id);
+  const previousQuantity = Number(((_b = previous == null ? void 0 : previous._extend) == null ? void 0 : _b.quantity) || 1);
+  const nextQuantity = Number(next._extend.quantity || 1);
+  if (!persisted || !hasEntitlementDiscount(previous) || nextQuantity === previousQuantity) {
+    return [next];
+  }
+  if (nextQuantity < previousQuantity) {
+    return [{
+      ...previous,
+      _extend: {
+        ...previous._extend,
+        quantity: nextQuantity,
+        ...Array.isArray(next._extend.holder_id) ? { holder_id: next._extend.holder_id.slice(0, nextQuantity) } : {},
+        other: { ...previous._extend.other, quantity: nextQuantity }
+      },
+      discount_list: (previous.discount_list || []).map((discount) => {
+        var _a2, _b2;
+        if (!isEntitlementDiscount(discount) || ((_a2 = discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id)) return discount;
+        const num = Math.min(Number(((_b2 = discount.metadata) == null ? void 0 : _b2.num) ?? previousQuantity), nextQuantity);
+        return { ...discount, _num: num, metadata: { ...discount.metadata, num } };
+      })
+    }];
+  }
+  const appended = (0, import_lodash.cloneDeep)(next);
+  const uid = (0, import_utils.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 = { ...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;
+  const extend = appended._extend;
+  extend.order_detail_id = 0;
+  extend.unique_identification_number = uid;
+  extend.quantity = nextQuantity - previousQuantity;
+  if (Array.isArray(extend.holder_id)) {
+    const holders = extend.holder_id.slice(previousQuantity, nextQuantity);
+    extend.holder_id = holders.length ? holders : void 0;
+  }
+  extend.other = { ...extend.other, quantity: extend.quantity };
+  extend.other.bundle = (extend.other.bundle || []).map((bundle) => {
+    var _a2, _b2, _c2;
+    const price = bundle.original_price ?? ((_c2 = (_b2 = (_a2 = bundle.discount_list) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.discount) == null ? void 0 : _c2.original_amount) ?? bundle.product_price ?? bundle.price;
+    const bundleUid = (0, import_utils.getUniqueId)();
+    const metadata = { ...bundle.metadata, custom_product_bundle_map_id: bundleUid, unique_identification_number: bundleUid };
+    delete metadata.entitlement_source_identity;
+    return { ...bundle, _id: bundleUid, price, bundle_selling_price: price, discount_list: [], metadata };
+  });
+  const mainDiscount = (next.discount_list || []).find((discount) => {
+    var _a2, _b2;
+    return !((_a2 = discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id) && ((_b2 = discount.discount) == null ? void 0 : _b2.original_amount) != null;
+  });
+  if (mainDiscount && ((_d = (_c = previous == null ? void 0 : previous._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.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 = (0, import_utils3.getMainPrice)(appended);
+  extend.total = (0, import_utils3.getProductTotalPrice)(appended);
+  extend.origin_total = extend.total;
+  return [previous, appended];
+};
 var getAutoAllocationStorage = (id) => {
   const value = localStorage.getItem("resource-auto-allocation");
   if (value) {
     const valueObj = JSON.parse(value);
-    return (0, import_utils2.isBoolean)(valueObj[id]) ? valueObj[id] : true;
+    return (0, import_utils.isBoolean)(valueObj[id]) ? valueObj[id] : true;
   }
   return true;
 };
@@ -58,8 +138,8 @@ var setAutoAllocationStorage = (data) => {
   }
 };
 var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  if (((_a = cacheItem == null ? void 0 : cacheItem.discount_list) == null ? void 0 : _a.length) && ((cacheItem == null ? void 0 : cacheItem.discount_list) || []).some((item) => ["good_pass", "discount_card", "product_discount_card"].includes(
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  if (hasEntitlementDiscount(cacheItem) || ((cacheItem == null ? void 0 : cacheItem.discount_list) || []).some((item) => ["good_pass", "discount_card", "product_discount_card"].includes(
     item.type
   ))) {
     return cacheItem;
@@ -69,16 +149,16 @@ var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
   }
   const discountRatio = new import_decimal.default(newTotal).div(new import_decimal.default(origin_total));
   let subTotal = new import_decimal.default(0);
-  if (((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle) && (0, import_utils.isArr)((_c = cacheItem._extend.other) == null ? void 0 : _c.bundle)) {
-    (_e = (_d = cacheItem._extend.other) == null ? void 0 : _d.bundle) == null ? void 0 : _e.forEach((bundle) => {
+  if (((_a = cacheItem._extend.other) == null ? void 0 : _a.bundle) && (0, import_utils.isArr)((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle)) {
+    (_d = (_c = cacheItem._extend.other) == null ? void 0 : _c.bundle) == null ? void 0 : _d.forEach((bundle) => {
       const newPrice = new import_decimal.default(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
       const quantity = bundle.num ?? bundle.quantity ?? 1;
       subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
       bundle.price = newPrice;
     });
   }
-  if (((_f = cacheItem._extend.other) == null ? void 0 : _f.option) && (0, import_utils.isArr)((_g = cacheItem._extend.other) == null ? void 0 : _g.option)) {
-    (_i = (_h = cacheItem._extend.other) == null ? void 0 : _h.option) == null ? void 0 : _i.forEach((option) => {
+  if (((_e = cacheItem._extend.other) == null ? void 0 : _e.option) && (0, import_utils.isArr)((_f = cacheItem._extend.other) == null ? void 0 : _f.option)) {
+    (_h = (_g = cacheItem._extend.other) == null ? void 0 : _g.option) == null ? void 0 : _h.forEach((option) => {
       const newPrice = new import_decimal.default(option.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
       const quantity = option.num ?? option.quantity ?? 1;
       subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
@@ -91,7 +171,7 @@ var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
 var getProductAllDiscountList = (cacheItem) => {
   var _a, _b;
   const discountList = [...cacheItem.discount_list || []];
-  const bundleDiscountList = (0, import_utils3.getBundleDiscountList)(((_b = (_a = cacheItem._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []) || [];
+  const bundleDiscountList = (0, import_utils2.getBundleDiscountList)(((_b = (_a = cacheItem._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []) || [];
   discountList.push(...bundleDiscountList);
   return discountList;
 };
@@ -113,7 +193,9 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
 0 && (module.exports = {
   getAutoAllocationStorage,
   getProductAllDiscountList,
+  hasEntitlementDiscount,
   mergeBundleWithOriginalPrice,
   setAutoAllocationStorage,
-  setProductPrice
+  setProductPrice,
+  updateEntitlementQuantity
 });

package/lib/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/lib/components/eftpos/const.js

@@ -23,7 +23,8 @@ __export(const_exports, {
   Eftpos: () => Eftpos,
   TYPES_WITH_MERCHANT_SETTINGS: () => TYPES_WITH_MERCHANT_SETTINGS,
   getCommByFields: () => getCommByFields,
-  getDefaultValue: () => getDefaultValue
+  getDefaultValue: () => getDefaultValue,
+  preserveSurchargeValues: () => preserveSurchargeValues
 });
 module.exports = __toCommonJS(const_exports);
 var import_form = require("./form");
@@ -71,6 +72,20 @@ var getDefaultValue = (list) => {
     };
   }, {});
 };
+var preserveSurchargeValues = (values, list) => {
+  const result = { ...values };
+  for (const item of list) {
+    if (Array.isArray(item.children) && item.children.length) {
+      result[item.__sourceName] = preserveSurchargeValues(
+        values == null ? void 0 : values[item.__sourceName],
+        item.children
+      );
+    } else if (item.Component === "Surcharge") {
+      Object.assign(result, import_form.helpMapping.Surcharge.getCommDefaultVal(item));
+    }
+  }
+  return result;
+};
 async function getCommByFields({
   field,
   value,
@@ -129,5 +144,6 @@ async function getCommByFields({
   Eftpos,
   TYPES_WITH_MERCHANT_SETTINGS,
   getCommByFields,
-  getDefaultValue
+  getDefaultValue,
+  preserveSurchargeValues
 });

package/lib/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/lib/components/eftpos/device.js

@@ -38,7 +38,7 @@ var import_utils = require("@pisell/utils");
 var import_const = require("./const");
 var import_form = __toESM(require("./form"));
 var Device = (props) => {
-  const { onSave, children, formItemList } = props;
+  const { onSave, children, formItemList, surchargeReadOnly = false } = props;
   const initialValues = (0, import_const.getDefaultValue)(formItemList);
   const simpleCloudIntegrationSteps = import_utils.locales.getText(
     "page.eftpos.text.simple.cloud.integration.steps"
@@ -54,11 +54,19 @@ var Device = (props) => {
     import_antd.Form,
     {
       layout: "vertical",
-      onFinish: onSave,
+      onFinish: (values) => onSave(
+        surchargeReadOnly ? (0, import_const.preserveSurchargeValues)(values, formItemList) : values
+      ),
       initialValues,
       className: "pisell-lowcode__pos-device"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "auto", padding: "0 0 60px 0" } }, /* @__PURE__ */ import_react.default.createElement(import_form.default, { formItemList }), children),
+    /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "auto", padding: "0 0 60px 0" } }, /* @__PURE__ */ import_react.default.createElement(
+      import_form.default,
+      {
+        formItemList,
+        surchargeReadOnly
+      }
+    ), children),
     /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { className: "pisell-lowcode__pos-device-btn" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { htmlType: "submit", block: true, style: { height: "48px" } }, (props == null ? void 0 : props.status) === "edit" ? import_utils.locales.getText("page.eftpos.text.save") : import_utils.locales.getText("page.eftpos.text.pair")))
   ));
 };

package/lib/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 = {

package/lib/components/eftpos/form/index.js

@@ -65,7 +65,8 @@ var CustomMapping = {
 var CustomFormItem = ({
   formItemList,
   level = 0,
-  onChange
+  onChange,
+  surchargeReadOnly = false
 }) => {
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, formItemList.map(({ __sourceName, Component, ...item }, index) => {
     if (Array.isArray(item.children)) {
@@ -74,6 +75,7 @@ var CustomFormItem = ({
         {
           formItemList: item.children,
           onChange,
+          surchargeReadOnly,
           key: item.name ? `${item.name}${level}` : `${Component}${index}${level}`,
           level: level + 1
         }
@@ -94,7 +96,14 @@ var CustomFormItem = ({
     }
     if (CustomMapping[Component]) {
       const Comm = CustomMapping[Component];
-      return /* @__PURE__ */ import_react.default.createElement(Comm, { ...item, key: `${item.name}${level}` });
+      return /* @__PURE__ */ import_react.default.createElement(
+        Comm,
+        {
+          ...item,
+          ...Component === "Surcharge" ? { surchargeReadOnly } : {},
+          key: `${item.name}${level}`
+        }
+      );
     }
     throw TypeError(
       `pos物料库 输入组件类型 ${Component} 无法映射,请正确传入组件类型`

package/lib/components/eftpos/index.js

@@ -51,6 +51,7 @@ var import_const = require("./const");
 var import_materials = require("@pisell/materials");
 var import_mx51SCI = __toESM(require("./assets/mx51SCI.svg"));
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
+var import_useCardSurchargeReadOnly = __toESM(require("../../hooks/useCardSurchargeReadOnly"));
 var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
@@ -150,6 +151,7 @@ var eftpos_default = (props) => {
     tyroVersion,
     useTyroLog
   } = props;
+  const surchargeReadOnly = (0, import_useCardSurchargeReadOnly.default)(type);
   const context = (0, import_useEngineContext.default)();
   const utils = context.appHelper.utils || {};
   import_utils2.request.setRequest(utils == null ? void 0 : utils.request);
@@ -431,6 +433,7 @@ var eftpos_default = (props) => {
             import_pos.default,
             {
               eftposName: name,
+              surchargeReadOnly,
               onSave: onSavePos,
               formItemList: posItemList
             }
@@ -460,6 +463,7 @@ var eftpos_default = (props) => {
           import_device.default,
           {
             formItemList: deviceItemList,
+            surchargeReadOnly,
             onSave,
             key: `posdevice${type}`
           },
@@ -539,6 +543,7 @@ var eftpos_default = (props) => {
         import_device.default,
         {
           formItemList: deviceItemList,
+          surchargeReadOnly,
           onSave: onSavePair,
           key: `device${type}`,
           type,

package/lib/components/eftpos/pos.d.ts

@@ -2,7 +2,8 @@ import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;
     formItemList: any[];
+    surchargeReadOnly?: boolean;
     onSave: (device: DeviceProp) => void;
 }
-declare const PosForm: ({ onSave, formItemList }: PosProps) => JSX.Element;
+declare const PosForm: ({ onSave, formItemList, surchargeReadOnly, }: PosProps) => JSX.Element;
 export default PosForm;

package/lib/components/eftpos/pos.js

@@ -38,18 +38,30 @@ var import_const = require("./const");
 var import_utils = require("@pisell/utils");
 var import_form = __toESM(require("./form"));
 var { Title } = import_antd.Typography;
-var PosForm = ({ onSave, formItemList }) => {
+var PosForm = ({
+  onSave,
+  formItemList,
+  surchargeReadOnly = false
+}) => {
   const initialValues = (0, import_const.getDefaultValue)(formItemList);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos-form-box" }, /* @__PURE__ */ import_react.default.createElement(Title, { level: 4, className: "pisell-lowcode__pos-title" }, import_utils.locales.getText("page.eftpos.text.setting")), /* @__PURE__ */ import_react.default.createElement(
     import_antd.Form,
     {
       layout: "vertical",
-      onFinish: onSave,
+      onFinish: (values) => onSave(
+        surchargeReadOnly ? (0, import_const.preserveSurchargeValues)(values, formItemList) : values
+      ),
       initialValues,
       className: "pisell-lowcode__pos-form",
       key: formItemList
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos-form-content" }, /* @__PURE__ */ import_react.default.createElement(import_form.default, { formItemList })),
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos-form-content" }, /* @__PURE__ */ import_react.default.createElement(
+      import_form.default,
+      {
+        formItemList,
+        surchargeReadOnly
+      }
+    )),
     /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos-form-btn" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { htmlType: "submit", block: true, style: { height: "48px" } }, import_utils.locales.getText("page.eftpos.text.save"))))
   ));
 };

package/lib/components/eftpos/surcharge/index.js

@@ -61,7 +61,7 @@ var getCommDefaultVal = (commConfig) => {
 };
 var surcharge_default = (props) => {
   var _a, _b, _c, _d;
-  const { origin, top, left, right } = props;
+  const { origin, top, left, right, surchargeReadOnly = false } = props;
   const leftRef = (0, import_react.useRef)(left.input.default || 0);
   const rightRef = (0, import_react.useRef)(right.input.default || 0);
   const [statusOrigin, setStatusOrigin] = (0, import_react.useState)(origin.input.defaultValue);
@@ -70,12 +70,15 @@ var surcharge_default = (props) => {
   const { store } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const symbol = ((_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.symbol) || "$";
   const onValueChange = (e) => {
+    if (surchargeReadOnly) return;
     setStatus(e.target.value);
   };
   const onChangeRate = (val) => {
+    if (surchargeReadOnly) return;
     leftRef.current = val;
   };
   const onChangeMoney = (val) => {
+    if (surchargeReadOnly) return;
     rightRef.current = val;
   };
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos_sur_box" }, /* @__PURE__ */ import_react.default.createElement(
@@ -89,24 +92,52 @@ var surcharge_default = (props) => {
     /* @__PURE__ */ import_react.default.createElement(
       import_antd.Radio.Group,
       {
+        disabled: surchargeReadOnly,
         value: origin.input.defaultValue,
         onChange: (e) => {
+          if (surchargeReadOnly) return;
           setStatusOrigin(e.target.value);
         }
       },
       /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction: "vertical" }, origin.input.options.map((item) => {
         if (typeof item === "object") {
           const { label, value, ...other } = item;
-          return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { ...other, value, key: `${item.value}` }, label);
+          return /* @__PURE__ */ import_react.default.createElement(
+            import_antd.Radio,
+            {
+              ...other,
+              disabled: surchargeReadOnly || other.disabled,
+              value,
+              key: `${item.value}`
+            },
+            label
+          );
         }
       }))
     )
-  ), /* @__PURE__ */ import_react.default.createElement("div", { style: { display: statusOrigin ? "none" : "contents" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { label: top.label, name: top.name, rules: top.rules || [], style: top.style || {} }, /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Group, { value: top.input.defaultValue, onChange: onValueChange }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction: "vertical" }, top.input.options.map((item) => {
-    if (typeof item === "object") {
-      const { label, value, ...other } = item;
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { ...other, value, key: `${item.value}` }, label);
-    }
-  })))), status ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos_row" }, /* @__PURE__ */ import_react.default.createElement(
+  ), /* @__PURE__ */ import_react.default.createElement("div", { style: { display: statusOrigin ? "none" : "contents" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { label: top.label, name: top.name, rules: top.rules || [], style: top.style || {} }, /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Radio.Group,
+    {
+      disabled: surchargeReadOnly,
+      value: top.input.defaultValue,
+      onChange: onValueChange
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction: "vertical" }, top.input.options.map((item) => {
+      if (typeof item === "object") {
+        const { label, value, ...other } = item;
+        return /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Radio,
+          {
+            ...other,
+            disabled: surchargeReadOnly || other.disabled,
+            value,
+            key: `${item.value}`
+          },
+          label
+        );
+      }
+    }))
+  )), status ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos_row" }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Form.Item,
     {
       label: left.label,
@@ -117,6 +148,7 @@ var surcharge_default = (props) => {
     /* @__PURE__ */ import_react.default.createElement(
       import_antd.InputNumber,
       {
+        disabled: surchargeReadOnly,
         min: 0,
         max: 100,
         precision: 2,
@@ -137,6 +169,7 @@ var surcharge_default = (props) => {
     /* @__PURE__ */ import_react.default.createElement(
       import_antd.InputNumber,
       {
+        disabled: surchargeReadOnly,
         min: 0,
         max: 1e5,
         precision: 2,