@pisell/materials 6.11.97 → 6.11.98

package/lib/components/productCard/lineItem/index.js

@@ -55,6 +55,40 @@ var translateText = (text, translationOriginal) => {
   if (!text) return "";
   return translationOriginal(text);
 };
+function resolveLineItemUnitPrices(product) {
+  const metadata = (product == null ? void 0 : product.metadata) || {};
+  const promotion = metadata._promotion;
+  const optionSum = ((product == null ? void 0 : product.product_option_item) || []).reduce(
+    (sum, option) => {
+      const price = Number(option == null ? void 0 : option.price) || 0;
+      const num = Number(option == null ? void 0 : option.num) || 1;
+      return sum + price * num;
+    },
+    0
+  );
+  const unitOriginal = (() => {
+    if (metadata.main_product_original_price != null && metadata.main_product_original_price !== "") {
+      return Number(metadata.main_product_original_price) - optionSum;
+    }
+    if ((promotion == null ? void 0 : promotion.originalPrice) != null && promotion.originalPrice !== "") {
+      return Number(promotion.originalPrice);
+    }
+    return Number((product == null ? void 0 : product.original_price) ?? (product == null ? void 0 : product.selling_price) ?? 0);
+  })();
+  const unitSelling = (() => {
+    if (metadata.main_product_selling_price != null && metadata.main_product_selling_price !== "") {
+      return Number(metadata.main_product_selling_price) - optionSum;
+    }
+    if ((promotion == null ? void 0 : promotion.inPromotion) && promotion.finalPrice != null && promotion.finalPrice !== "") {
+      return Number(promotion.finalPrice);
+    }
+    return Number((product == null ? void 0 : product.payment_price) ?? (product == null ? void 0 : product.selling_price) ?? unitOriginal);
+  })();
+  return {
+    unitSelling: Number.isFinite(unitSelling) ? unitSelling : 0,
+    unitOriginal: Number.isFinite(unitOriginal) ? unitOriginal : 0
+  };
+}
 var convertBundleOption = (option, translationOriginal) => ({
   ...option,
   id: option.option_group_item_id,
@@ -90,11 +124,12 @@ var convertBundle = (bundle, translationOriginal) => {
   };
 };
 var convertProductToLineItemProduct = (product, translationOriginal, symbol) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const title = translateText(product.product_title || product.title, translationOriginal);
   const bundle = (product.product_bundle || []).map(
     (bundleItem) => convertBundle(bundleItem, translationOriginal)
   );
+  const { unitSelling, unitOriginal } = resolveLineItemUnitPrices(product);
   return {
     _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) || product.order_detail_id || product.product_id,
     id: product.product_id,
@@ -107,11 +142,11 @@ var convertProductToLineItemProduct = (product, translationOriginal, symbol) =>
     image: product.cover,
     num: product.num ?? product.product_quantity ?? 1,
     quantity: product.num ?? product.product_quantity ?? 1,
-    price: ((_b = product.metadata) == null ? void 0 : _b.source_product_price) ?? product.selling_price,
-    total: product.payment_price ?? product.selling_price,
-    origin_total: product.original_price,
-    original_total: product.original_price,
-    source_product_price: (_c = product.metadata) == null ? void 0 : _c.source_product_price,
+    price: unitSelling,
+    total: unitSelling,
+    origin_total: unitOriginal,
+    original_total: unitOriginal,
+    source_product_price: (_b = product.metadata) == null ? void 0 : _b.source_product_price,
     selling_price: product.selling_price,
     payment_price: product.payment_price,
     tax_fee: product.tax_fee,
@@ -123,20 +158,24 @@ var convertProductToLineItemProduct = (product, translationOriginal, symbol) =>
     product_option_string: product.product_sku ? translateText(product.product_sku.subtitle, translationOriginal) : "",
     discount_list: product.discount_list,
     promotions: product.promotions,
-    isGift: Boolean(product.gift_card),
+    discount_reason: ((_e = (_d = (_c = product.discount_list) == null ? void 0 : _c.find((d) => (d == null ? void 0 : d.type) === "product")) == null ? void 0 : _d.discount) == null ? void 0 : _e.message) ?? ((_f = product.metadata) == null ? void 0 : _f.product_discount_reason),
+    // 促销赠品走 metadata._giftInfo；礼品卡走 gift_card（对齐 legacy formatProducts isGift）
+    isGift: Boolean(
+      product.gift_card || product.isGift || product._isGiftPromotion || ((_g = product.metadata) == null ? void 0 : _g._giftInfo) || product._giftInfo
+    ),
     giftData: product.giftData,
     _origin: product,
     _extend: {
       other: {
         product_id: product.product_id,
-        option: (_d = product.product_sku) == null ? void 0 : _d.option,
+        option: (_h = product.product_sku) == null ? void 0 : _h.option,
         bundle: product.product_bundle,
         product_variant_id: product.product_variant_id,
         quantity: product.num ?? product.product_quantity ?? 1
       },
       note: product.note,
-      total: product.payment_price,
-      origin_total: product.original_price,
+      total: unitSelling,
+      origin_total: unitOriginal,
       payment_price: product.payment_price
     }
   };
@@ -159,6 +198,7 @@ var LineItem = (props) => {
     statusLoading = false,
     statusDisabled = false,
     isShowRelatedProduct = true,
+    holderOptions,
     onBookingStatusChange,
     onAction,
     onDelete,
@@ -234,6 +274,7 @@ var LineItem = (props) => {
       statusLoading,
       statusDisabled,
       isShowRelatedProduct,
+      holderOptions,
       onBookingStatusChange,
       onAction,
       onDelete,

package/lib/components/productCard/lineItem/index.less

@@ -18,10 +18,10 @@
   &__delete-btn {
     width: 34px;
     height: 34px;
-    border: 1px solid rgba(255, 255, 255, 0.35);
+    border: 1px solid var(--Gray-300, #d0d5dd);
     border-radius: 8px;
-    background: rgba(255, 255, 255, 0.12);
-    color: #fff;
+    background: var(--Gray-100, #f2f4f7);
+    color: var(--Gray-500, #667085);
     cursor: pointer;
     padding: 0;
     display: inline-flex;

package/lib/components/productCard/lineItem/types.d.ts

@@ -7,3 +7,7 @@ export interface LineItemStatusOption {
     color?: string;
     danger?: boolean;
 }
+export interface LineItemHolderOption {
+    id: string | number;
+    label: ReactNode;
+}

package/lib/components/productCard/types.d.ts

@@ -65,6 +65,7 @@ export declare type productType = {
  */
 export declare type ProductCardTypes = {
     dataSource: productType;
+    isFormSubject?: boolean;
     isShowImage?: boolean;
     isShowOriginalPrice?: boolean;
     isShowHolder?: boolean;

package/lowcode/pisell-find/meta.ts

@@ -326,6 +326,20 @@ const PisellFindMeta = {
             setter: ['BoolSetter', 'VariableSetter'],
             defaultValue: false,
           },
+          {
+            name: 'enableScanner',
+            title: {
+              label: {
+                type: 'i18n',
+                'en-US': 'Enable Scanner',
+                'zh-CN': '开启扫码枪监听',
+              },
+              tip: '为 true 时通过 app.pubsub.subscribe("nativeScanResult") 订阅硬件扫码事件；切回 false 会自动 unsubscribe 不再接收回调',
+            },
+            propType: 'bool',
+            setter: ['BoolSetter', 'VariableSetter'],
+            defaultValue: false,
+          },
         ],
       },
     ],
@@ -353,6 +367,11 @@ const PisellFindMeta = {
           template:
             'onClose(${extParams}){\n// 查找面板关闭回调\nconsole.log("onClose");}',
         },
+        {
+          name: 'onScannerData',
+          template:
+            'onScannerData(payload,${extParams}){\n// 扫码枪事件回调（nativeScanResult）\n// payload: { code: 写入输入框并触发 onSearch 的关键词, data: 原始扫描字符串 }\nconsole.log("onScannerData", payload);}',
+        },
       ],
     },
     component: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.11.97",
+  "version": "6.11.98",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -99,8 +99,8 @@
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
     "@pisell/date-picker": "3.0.8",
-    "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.2"
+    "@pisell/utils": "3.0.2",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",