@pisell/materials 6.11.96 → 6.11.97

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

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

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

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

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

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

package/lib/components/buttonGroupPreview/index.js

@@ -71,8 +71,7 @@ var ButtonGroupPreview = (0, import_react.forwardRef)(
           } = items;
           const btnProps = { ...buttonProps, ...props.updateButtonProps };
           const { children, ...dropdownButtonProps } = btnProps;
-          const moreButtonChildren = children ?? (dropdownButtonProps.icon ? null : /* @__PURE__ */ import_react.default.createElement(import_icons.MoreOutlined, null));
-          return isMore ? /* @__PURE__ */ import_react.default.createElement(import_antd.Dropdown, { menu: { items: menuData } }, /* @__PURE__ */ import_react.default.createElement(import_button.default, { key: id, ...dropdownButtonProps }, moreButtonChildren)) : /* @__PURE__ */ import_react.default.createElement(
+          return isMore ? /* @__PURE__ */ import_react.default.createElement(import_antd.Dropdown, { menu: { items: menuData } }, /* @__PURE__ */ import_react.default.createElement(import_button.default, { key: id, ...dropdownButtonProps }, children ?? /* @__PURE__ */ import_react.default.createElement(import_icons.MoreOutlined, null))) : /* @__PURE__ */ import_react.default.createElement(
             import_button.default,
             {
               key: id,

package/lib/components/pisellFind/index.d.ts

@@ -1,37 +1,10 @@
 import React from 'react';
 import type { PisellLookupProps, PisellLookupRef } from '../pisellLookup';
-/**
- * 原生扫码事件名，对齐宿主端约定。
- */
-export declare const SCAN_RESULT_EVENT = "nativeScanResult";
-/**
- * 扫码枪回传数据（对齐宿主 ScanResultPayload）
- * - code: 条码标识（如条码格式 / 业务字段）
- * - data: 扫描得到的字符串值（写入输入框的内容）
- */
-export interface PisellFindScannerData {
-    code: string;
-    data: string;
-}
 /**
  * PisellFind Props
- * 继承 PisellLookup 的所有 Props，并扩展扫码枪监听相关字段。
+ * 继承 PisellLookup 的所有 Props
  */
-export interface PisellFindProps extends PisellLookupProps {
-    /**
-     * 是否开启扫码枪监听
-     * 通过宿主 `app.pubsub.subscribe('nativeScanResult', ...)` 订阅；
-     * 切换 false 时会 unsubscribe，停止接收事件。
-     * @default false
-     */
-    enableScanner?: boolean;
-    /**
-     * 扫码枪回调
-     * 监听到扫码枪事件时触发，参数为原始 payload 对象（含 `data` 字段）。
-     * 注意：仅在 enableScanner 为 true 时才会触发。
-     */
-    onScannerData?: (data: PisellFindScannerData) => void;
-}
+export declare type PisellFindProps = PisellLookupProps;
 /**
  * PisellFind Ref
  * 继承 PisellLookup 的所有 Ref 方法
@@ -46,17 +19,22 @@ export declare type PisellFindRef = PisellLookupRef;
  * - 默认不显示确认按钮（输入即搜索）
  * - 默认开启搜索历史
  * - 默认不展示结果区（结果在页面其他位置展示）
- * - 通过 `enableScanner` 接入扫码枪：使用宿主 `app.pubsub.subscribe(SCAN_RESULT_EVENT, ...)`，
- *   每次扫码直接覆盖输入框内容并触发 onSearch / onScannerData；切回 false 时自动 unsubscribe。
  *
  * @example
  * ```tsx
+ * // 基础用法
+ * <PisellFind
+ *   onSearch={(keyword) => {
+ *     const filtered = data.filter(item => item.name.includes(keyword));
+ *     setFilteredData(filtered);
+ *   }}
+ * />
+ *
+ * // 切换为 Input 模式
  * <PisellFind
  *   triggerType="input"
- *   enableScanner={isActive}
- *   onScannerData={(payload) => console.log('scan:', payload.data)}
  *   onSearch={(keyword) => filterData(keyword)}
  * />
  * ```
  */
-export declare const PisellFind: React.ForwardRefExoticComponent<PisellFindProps & React.RefAttributes<PisellLookupRef>>;
+export declare const PisellFind: React.ForwardRefExoticComponent<PisellLookupProps & React.RefAttributes<PisellLookupRef>>;

package/lib/components/pisellFind/index.js

@@ -29,19 +29,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pisellFind/index.tsx
 var pisellFind_exports = {};
 __export(pisellFind_exports, {
-  PisellFind: () => PisellFind,
-  SCAN_RESULT_EVENT: () => SCAN_RESULT_EVENT
+  PisellFind: () => PisellFind
 });
 module.exports = __toCommonJS(pisellFind_exports);
 var import_react = __toESM(require("react"));
 var import_utils = require("@pisell/utils");
 var import_pisellLookup = require("../pisellLookup");
-var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_locales = require("../../locales");
-var SCAN_RESULT_EVENT = "nativeScanResult";
 var PisellFind = (0, import_react.forwardRef)((props, ref) => {
-  var _a, _b;
   const {
+    // 提取需要设置默认值的 Props
     triggerType = "button",
     buttonText = (() => {
       const key = "pisell2.recordBoard.toolbar.find";
@@ -56,90 +53,19 @@ var PisellFind = (0, import_react.forwardRef)((props, ref) => {
     showConfirmButton = false,
     showHistory = true,
     historyKey = "pisell_find_history",
-    enableScanner = false,
-    onScannerData,
-    onSearch,
+    // 透传其他所有 Props
     ...restProps
   } = props;
-  const lookupRef = (0, import_react.useRef)(null);
-  const onScannerDataRef = (0, import_react.useRef)(onScannerData);
-  const onSearchRef = (0, import_react.useRef)(onSearch);
-  (0, import_react.useEffect)(() => {
-    onScannerDataRef.current = onScannerData;
-  }, [onScannerData]);
-  (0, import_react.useEffect)(() => {
-    onSearchRef.current = onSearch;
-  }, [onSearch]);
-  (0, import_react.useImperativeHandle)(
-    ref,
-    () => ({
-      open: () => {
-        var _a2;
-        return (_a2 = lookupRef.current) == null ? void 0 : _a2.open();
-      },
-      close: () => {
-        var _a2;
-        return (_a2 = lookupRef.current) == null ? void 0 : _a2.close();
-      },
-      getKeyword: () => {
-        var _a2;
-        return ((_a2 = lookupRef.current) == null ? void 0 : _a2.getKeyword()) ?? "";
-      },
-      setKeyword: (v) => {
-        var _a2;
-        return (_a2 = lookupRef.current) == null ? void 0 : _a2.setKeyword(v);
-      }
-    }),
-    []
-  );
-  const engineContext = (0, import_useEngineContext.default)();
-  const getAppRef = (0, import_react.useRef)(void 0);
-  getAppRef.current = typeof ((_b = (_a = engineContext == null ? void 0 : engineContext.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getApp) === "function" ? engineContext.appHelper.utils.getApp : void 0;
-  (0, import_react.useEffect)(() => {
-    if (!enableScanner) return void 0;
-    const getApp = getAppRef.current;
-    if (typeof getApp !== "function") return void 0;
-    const app = getApp();
-    const pubsub = app == null ? void 0 : app.pubsub;
-    if (!pubsub || typeof pubsub.subscribe !== "function") {
-      return void 0;
-    }
-    const onScan = (payload) => {
-      var _a2, _b2, _c;
-      const data = payload == null ? void 0 : payload.data;
-      if (typeof data !== "string" || data.length === 0) {
-        return;
-      }
-      (_a2 = lookupRef.current) == null ? void 0 : _a2.setKeyword(data);
-      (_b2 = onSearchRef.current) == null ? void 0 : _b2.call(onSearchRef, data);
-      (_c = onScannerDataRef.current) == null ? void 0 : _c.call(onScannerDataRef, payload);
-    };
-    try {
-      pubsub.subscribe(SCAN_RESULT_EVENT, onScan);
-    } catch (e) {
-      console.warn("[PisellFind] subscribe scanner failed:", e);
-      return void 0;
-    }
-    return () => {
-      var _a2;
-      try {
-        (_a2 = pubsub.unsubscribe) == null ? void 0 : _a2.call(pubsub, SCAN_RESULT_EVENT, onScan);
-      } catch (e) {
-        console.warn("[PisellFind] unsubscribe scanner failed:", e);
-      }
-    };
-  }, [enableScanner]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_pisellLookup.PisellLookup,
     {
-      ref: lookupRef,
+      ref,
       triggerType,
       buttonText,
       placeholder,
       showConfirmButton,
       showHistory,
       historyKey,
-      onSearch,
       ...restProps
     }
   );
@@ -147,6 +73,5 @@ var PisellFind = (0, import_react.forwardRef)((props, ref) => {
 PisellFind.displayName = "PisellFind";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  PisellFind,
-  SCAN_RESULT_EVENT
+  PisellFind
 });

package/lib/components/pisellRecordBoard/layouts/GridLayout/Grid.js

@@ -238,7 +238,7 @@ var RecordBoardGridView = (props) => {
     }) : rawScrollX;
     if ((scroll == null ? void 0 : scroll.autoCalc) && typeof ctx.scrollAreaHeight === "number") {
       const wrapHeight = ctx.scrollAreaHeight;
-      const reservedHeight = 40 + (uniformSummaryHeight > 0 ? uniformSummaryHeight + 25 : 0);
+      const reservedHeight = 40 + uniformSummaryHeight + 24;
       return {
         x: scrollX ?? sumColumnWidths,
         y: Math.max(wrapHeight - reservedHeight, 100),

package/lib/components/productCard/cartSkuCard/components/AmountFooter/index.js

@@ -42,7 +42,9 @@ var import_index = require("./index.less");
 var import_utils2 = require("@pisell/utils");
 var import__ = require("../../index");
 var Footer = ({ item, hideDivider, type, isOnlyTotal }) => {
+  var _a, _b;
   const { total, origin_total, symbol, tip, num, discount_reason } = item;
+  const weighingInfo = (_b = (_a = item == null ? void 0 : item._origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.weighing;
   const isDiscount = (0, import_react.useMemo)(() => {
     if (!origin_total) return false;
     return Number(total) != Number(origin_total);
@@ -69,12 +71,22 @@ var Footer = ({ item, hideDivider, type, isOnlyTotal }) => {
         isOnlyTotal && `${import__.PREFIX}__only-total-footer`
       )
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${import__.PREFIX}__footer-price-wrap`) }, !isOnlyTotal ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${import__.PREFIX}__footer-price`) }, /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(total, symbol)), tip ? /* @__PURE__ */ import_react.default.createElement(import_antd2.Tooltip, { title: import_utils2.locales.getText(tip), destroyTooltipOnHide: true }, /* @__PURE__ */ import_react.default.createElement(
-      import_icons.QuestionCircleOutlined,
+    /* @__PURE__ */ import_react.default.createElement(
+      "div",
       {
-        style: { fontSize: "16px", color: "#1570ef" }
-      }
-    )) : null), /* @__PURE__ */ import_react.default.createElement("span", null, `×${num}`)) : null, /* @__PURE__ */ import_react.default.createElement("span", { className: `${import__.PREFIX}__footer-total` }, isDiscount ? /* @__PURE__ */ import_react.default.createElement("span", { className: `${import__.PREFIX}__footer-origin-total` }, (0, import_utils._formatAmount)(origin_total * num, symbol, 2)) : null, /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(total * num, symbol))))
+        className: (0, import_classnames.default)(
+          `${import__.PREFIX}__footer-price-wrap`,
+          weighingInfo && `${import__.PREFIX}__footer-price-wrap--weighing`
+        )
+      },
+      !isOnlyTotal ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)(`${import__.PREFIX}__footer-price`) }, /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(total, symbol)), tip ? /* @__PURE__ */ import_react.default.createElement(import_antd2.Tooltip, { title: import_utils2.locales.getText(tip), destroyTooltipOnHide: true }, /* @__PURE__ */ import_react.default.createElement(
+        import_icons.QuestionCircleOutlined,
+        {
+          style: { fontSize: "16px", color: "#1570ef" }
+        }
+      )) : null), /* @__PURE__ */ import_react.default.createElement("span", null, `×${num}`)) : null,
+      /* @__PURE__ */ import_react.default.createElement("span", { className: `${import__.PREFIX}__footer-total` }, isDiscount ? /* @__PURE__ */ import_react.default.createElement("span", { className: `${import__.PREFIX}__footer-origin-total` }, (0, import_utils._formatAmount)(origin_total * num, symbol, 2)) : null, /* @__PURE__ */ import_react.default.createElement("span", null, (0, import_utils._formatAmount)(total * num, symbol)))
+    )
   ), renderDiscountReason());
 };
 var AmountFooter_default = Footer;

package/lib/components/productCard/cartSkuCard/components/AmountFooter/index.less

@@ -22,6 +22,11 @@
     gap: 4px;
   }
 
+  &__footer-price-wrap--weighing {
+    font-size: 28px;
+    line-height: 40px;
+  }
+
   &__footer-discount {
     font-size: 12px;
     font-weight: 400;

package/lib/components/productCard/cartSkuCard/components/resources/index.less

@@ -15,10 +15,6 @@
     overflow: hidden;
     text-overflow: ellipsis;
     margin: 0;
-
-    .resource-icon {
-      margin-right: 2px;
-    }
   }
 
   &--title {

package/lib/components/productCard/cartSkuCard/components/weighing/index.js

@@ -69,6 +69,26 @@ var Weighing = (props) => {
   const tareLabel = import_utils.locales.getText("pisell2.cart.sku-card.weighing.tare");
   const netLabel = import_utils.locales.getText("pisell2.cart.sku-card.weighing.net");
   const unitPriceText = `${symbol || ""}${unit_price ?? "0.00"}`;
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing` }, isManualWeight ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing-row` }, /* @__PURE__ */ import_react.default.createElement("span", null, manualLabel)) : null, tareValue > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing-row` }, /* @__PURE__ */ import_react.default.createElement("span", null, grossLabel, ":"), /* @__PURE__ */ import_react.default.createElement("span", null, formatWeight(weight, unit))) : null, tareValue > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing-row` }, /* @__PURE__ */ import_react.default.createElement("span", null, tareLabel, ":"), /* @__PURE__ */ import_react.default.createElement("span", null, formatWeight(tare == null ? void 0 : tare.value, (tare == null ? void 0 : tare.unit) || unit))) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing-row` }, /* @__PURE__ */ import_react.default.createElement("span", null, `${formatWeight(net_weight, unit)} ${netLabel} @ ${unitPriceText}/${unitLabel}`)));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing` }, isManualWeight ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing-row` }, /* @__PURE__ */ import_react.default.createElement("span", null, manualLabel)) : null, tareValue > 0 ? /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      className: `${import__.PREFIX}__weighing-row ${import__.PREFIX}__weighing-row--large`
+    },
+    /* @__PURE__ */ import_react.default.createElement("span", null, grossLabel, ":"),
+    /* @__PURE__ */ import_react.default.createElement("span", null, formatWeight(weight, unit))
+  ) : null, tareValue > 0 ? /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      className: `${import__.PREFIX}__weighing-row ${import__.PREFIX}__weighing-row--large`
+    },
+    /* @__PURE__ */ import_react.default.createElement("span", null, tareLabel, ":"),
+    /* @__PURE__ */ import_react.default.createElement("span", null, formatWeight(tare == null ? void 0 : tare.value, (tare == null ? void 0 : tare.unit) || unit))
+  ) : null, /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      className: `${import__.PREFIX}__weighing-row ${import__.PREFIX}__weighing-row--large`
+    },
+    /* @__PURE__ */ import_react.default.createElement("span", null, `${formatWeight(net_weight, unit)} ${netLabel} @ ${unitPriceText}/${unitLabel}`)
+  ));
 };
 var weighing_default = Weighing;

package/lib/components/productCard/cartSkuCard/components/weighing/index.less

@@ -21,5 +21,10 @@
       text-overflow: ellipsis;
       white-space: nowrap;
     }
+
+    &--large {
+      font-size: 28px;
+      line-height: 40px;
+    }
   }
 }

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { ProductCardTypes } from '../types';
-import type { LineItemHolderOption, LineItemStatusOption, LineItemType } from './types';
+import type { LineItemStatusOption, LineItemType } from './types';
 interface BookingLineItemProps extends Omit<ProductCardTypes, 'dataSource'> {
     dataSource: any;
     type: LineItemType;
@@ -12,7 +12,6 @@ interface BookingLineItemProps extends Omit<ProductCardTypes, 'dataSource'> {
     statusLoading?: boolean;
     statusDisabled?: boolean;
     isShowRelatedProduct?: boolean;
-    holderOptions?: LineItemHolderOption[];
     onBookingStatusChange?: (status: string, item: any) => void;
 }
 declare const BookingLineItem: (props: BookingLineItemProps) => React.JSX.Element | null;

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

@@ -48,7 +48,6 @@ var import_swipeAction = require("../cartSkuCard/components/swipeAction");
 var import_Action = __toESM(require("../components/Action"));
 var import_TimeRange = __toESM(require("./components/TimeRange"));
 var import_Resources = __toESM(require("./components/Resources"));
-var import_Holders = __toESM(require("./components/Holders"));
 var import_iconfont = __toESM(require("../../iconfont"));
 var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var PREFIX = "pisell-line-item";
@@ -101,7 +100,6 @@ var BookingLineItem = (props) => {
     rightActions = [],
     escapeDom,
     isShowImage,
-    isFormSubject,
     isShowDelete,
     isShowNote,
     isShowAmountFooter,
@@ -111,7 +109,6 @@ var BookingLineItem = (props) => {
     statusLoading = false,
     statusDisabled = false,
     isShowRelatedProduct = true,
-    holderOptions,
     onBookingStatusChange,
     onAction,
     onDelete,
@@ -149,9 +146,7 @@ var BookingLineItem = (props) => {
     }
   };
   const bookingRightActions = isShowDelete ? [deleteAction, ...rightActions] : rightActions;
-  const resolvedHolderOptions = holderOptions ?? (dataSource == null ? void 0 : dataSource.holderOptions) ?? (dataSource == null ? void 0 : dataSource.holders) ?? [];
-  const resolvedIsFormSubject = isFormSubject ?? (dataSource == null ? void 0 : dataSource.isFormSubject);
-  const bookingTitle = String((dataSource == null ? void 0 : dataSource.booking_id) || "");
+  const bookingTitle = String((dataSource == null ? void 0 : dataSource.booking_id) || "-");
   const bookingTime = formatBookingTime(dataSource, locale);
   const resourceName = getResourceName(dataSource, translationOriginal) || "-";
   const renderStatusButton = () => /* @__PURE__ */ import_react.default.createElement(
@@ -228,14 +223,7 @@ var BookingLineItem = (props) => {
           /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-trash-01" })
         ) : null))
       ),
-      /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__booking-detail` }, /* @__PURE__ */ import_react.default.createElement(import_Resources.default, { dataSource }), /* @__PURE__ */ import_react.default.createElement(import_TimeRange.default, { dataSource }), resolvedIsFormSubject ? /* @__PURE__ */ import_react.default.createElement(
-        import_Holders.default,
-        {
-          dataSource,
-          holderOptions: resolvedHolderOptions,
-          isFormSubject: resolvedIsFormSubject
-        }
-      ) : null),
+      /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__booking-detail` }, /* @__PURE__ */ import_react.default.createElement(import_Resources.default, { dataSource }), /* @__PURE__ */ import_react.default.createElement(import_TimeRange.default, { dataSource })),
       isShowRelatedProduct && relatedProductDataSource ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Divider, { style: { margin: 0 } }), /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__related-product` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__related-product-card` }, /* @__PURE__ */ import_react.default.createElement(
         import_basicInfo.default,
         {

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

@@ -1,9 +1,9 @@
 import React from 'react';
 import type { ProductCardTypes } from '../types';
-import type { itemType, LineItemHolderOption, LineItemStatusOption, LineItemType } from './types';
+import type { itemType, LineItemStatusOption, LineItemType } from './types';
 import './index.less';
 export declare const PREFIX = "pisell-line-item";
-export type { itemType, LineItemHolderOption, LineItemStatusOption, LineItemType, } from './types';
+export type { itemType, LineItemStatusOption, LineItemType } from './types';
 declare type LocalizedText = string | Record<string, unknown> | null | undefined;
 export interface LineItemProps extends Omit<ProductCardTypes, 'dataSource'> {
     dataSource: any;
@@ -15,7 +15,6 @@ export interface LineItemProps extends Omit<ProductCardTypes, 'dataSource'> {
     statusLoading?: boolean;
     statusDisabled?: boolean;
     isShowRelatedProduct?: boolean;
-    holderOptions?: LineItemHolderOption[];
     onBookingStatusChange?: (status: string, item: any) => void;
 }
 export declare const convertProductToLineItemProduct: (product: any, translationOriginal: (text: LocalizedText) => string, symbol: string) => {
@@ -30,10 +29,10 @@ export declare const convertProductToLineItemProduct: (product: any, translation
     image: any;
     num: any;
     quantity: any;
-    price: number;
-    total: number;
-    origin_total: number;
-    original_total: number;
+    price: any;
+    total: any;
+    origin_total: any;
+    original_total: any;
     source_product_price: any;
     selling_price: any;
     payment_price: any;
@@ -46,7 +45,6 @@ export declare const convertProductToLineItemProduct: (product: any, translation
     product_option_string: string;
     discount_list: any;
     promotions: any;
-    discount_reason: any;
     isGift: boolean;
     giftData: any;
     _origin: any;
@@ -59,8 +57,8 @@ export declare const convertProductToLineItemProduct: (product: any, translation
             quantity: any;
         };
         note: any;
-        total: number;
-        origin_total: number;
+        total: any;
+        origin_total: any;
         payment_price: any;
     };
 };

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

@@ -55,40 +55,6 @@ 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,
@@ -124,12 +90,11 @@ var convertBundle = (bundle, translationOriginal) => {
   };
 };
 var convertProductToLineItemProduct = (product, translationOriginal, symbol) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d;
   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,
@@ -142,11 +107,11 @@ var convertProductToLineItemProduct = (product, translationOriginal, symbol) =>
     image: product.cover,
     num: product.num ?? product.product_quantity ?? 1,
     quantity: product.num ?? product.product_quantity ?? 1,
-    price: unitSelling,
-    total: unitSelling,
-    origin_total: unitOriginal,
-    original_total: unitOriginal,
-    source_product_price: (_b = product.metadata) == null ? void 0 : _b.source_product_price,
+    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,
     selling_price: product.selling_price,
     payment_price: product.payment_price,
     tax_fee: product.tax_fee,
@@ -158,24 +123,20 @@ 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,
-    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
-    ),
+    isGift: Boolean(product.gift_card),
     giftData: product.giftData,
     _origin: product,
     _extend: {
       other: {
         product_id: product.product_id,
-        option: (_h = product.product_sku) == null ? void 0 : _h.option,
+        option: (_d = product.product_sku) == null ? void 0 : _d.option,
         bundle: product.product_bundle,
         product_variant_id: product.product_variant_id,
         quantity: product.num ?? product.product_quantity ?? 1
       },
       note: product.note,
-      total: unitSelling,
-      origin_total: unitOriginal,
+      total: product.payment_price,
+      origin_total: product.original_price,
       payment_price: product.payment_price
     }
   };
@@ -198,7 +159,6 @@ var LineItem = (props) => {
     statusLoading = false,
     statusDisabled = false,
     isShowRelatedProduct = true,
-    holderOptions,
     onBookingStatusChange,
     onAction,
     onDelete,
@@ -274,7 +234,6 @@ 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 var(--Gray-300, #d0d5dd);
+    border: 1px solid rgba(255, 255, 255, 0.35);
     border-radius: 8px;
-    background: var(--Gray-100, #f2f4f7);
-    color: var(--Gray-500, #667085);
+    background: rgba(255, 255, 255, 0.12);
+    color: #fff;
     cursor: pointer;
     padding: 0;
     display: inline-flex;

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

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

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

@@ -65,7 +65,6 @@ 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,20 +326,6 @@ 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,
-          },
         ],
       },
     ],
@@ -367,11 +353,6 @@ 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: {},