@pisell/materials 6.11.96 → 6.11.97

package/es/components/buttonGroupPreview/index.js

@@ -66,14 +66,13 @@ var ButtonGroupPreview = /*#__PURE__*/forwardRef(function (props, ref) {
       var btnProps = _objectSpread(_objectSpread({}, buttonProps), props.updateButtonProps);
       var children = btnProps.children,
         dropdownButtonProps = _objectWithoutProperties(btnProps, _excluded);
-      var moreButtonChildren = children !== null && children !== void 0 ? children : dropdownButtonProps.icon ? null : /*#__PURE__*/React.createElement(MoreOutlined, null);
       return isMore ? /*#__PURE__*/React.createElement(Dropdown, {
         menu: {
           items: menuData
         }
       }, /*#__PURE__*/React.createElement(Button, _extends({
         key: id
-      }, dropdownButtonProps), moreButtonChildren)) : /*#__PURE__*/React.createElement(Button, _extends({
+      }, dropdownButtonProps), children !== null && children !== void 0 ? children : /*#__PURE__*/React.createElement(MoreOutlined, null))) : /*#__PURE__*/React.createElement(Button, _extends({
         key: id
       }, btnProps));
     }));

package/es/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/es/components/pisellFind/index.js

@@ -1,27 +1,15 @@
-var _excluded = ["triggerType", "buttonText", "placeholder", "showConfirmButton", "showHistory", "historyKey", "enableScanner", "onScannerData", "onSearch"];
+var _excluded = ["triggerType", "buttonText", "placeholder", "showConfirmButton", "showHistory", "historyKey"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
+import React, { forwardRef } from 'react';
 import { locales as utilsLocales } from '@pisell/utils';
 import { PisellLookup } from "../pisellLookup";
-import useEngineContext from "../../hooks/useEngineContext";
 import { getText } from "../../locales";
 
-/**
- * 原生扫码事件名，对齐宿主端约定。
- */
-export var SCAN_RESULT_EVENT = 'nativeScanResult';
-
-/**
- * 扫码枪回传数据（对齐宿主 ScanResultPayload）
- * - code: 条码标识（如条码格式 / 业务字段）
- * - data: 扫描得到的字符串值（写入输入框的内容）
- */
-
 /**
  * PisellFind Props
- * 继承 PisellLookup 的所有 Props，并扩展扫码枪监听相关字段。
+ * 继承 PisellLookup 的所有 Props
  */
 
 /**
@@ -32,27 +20,31 @@ export var SCAN_RESULT_EVENT = 'nativeScanResult';
 /**
  * PisellFind 组件
  * 基于 PisellLookup 的组件内查找优化版本
- *
+ * 
  * 核心特点：
  * - 默认使用 button 触发器
  * - 默认不显示确认按钮（输入即搜索）
  * - 默认开启搜索历史
  * - 默认不展示结果区（结果在页面其他位置展示）
- * - 通过 `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 var PisellFind = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _engineContext$appHel;
   var _props$triggerType = props.triggerType,
     triggerType = _props$triggerType === void 0 ? 'button' : _props$triggerType,
     _props$buttonText = props.buttonText,
@@ -73,105 +65,17 @@ export var PisellFind = /*#__PURE__*/forwardRef(function (props, ref) {
     showHistory = _props$showHistory === void 0 ? true : _props$showHistory,
     _props$historyKey = props.historyKey,
     historyKey = _props$historyKey === void 0 ? 'pisell_find_history' : _props$historyKey,
-    _props$enableScanner = props.enableScanner,
-    enableScanner = _props$enableScanner === void 0 ? false : _props$enableScanner,
-    onScannerData = props.onScannerData,
-    onSearch = props.onSearch,
     restProps = _objectWithoutProperties(props, _excluded);
-  var lookupRef = useRef(null);
-
-  /** 透传给监听回调的最新引用，避免回调闭包 stale */
-  var onScannerDataRef = useRef(onScannerData);
-  var onSearchRef = useRef(onSearch);
-  useEffect(function () {
-    onScannerDataRef.current = onScannerData;
-  }, [onScannerData]);
-  useEffect(function () {
-    onSearchRef.current = onSearch;
-  }, [onSearch]);
-  useImperativeHandle(ref, function () {
-    return {
-      open: function open() {
-        var _lookupRef$current;
-        return (_lookupRef$current = lookupRef.current) === null || _lookupRef$current === void 0 ? void 0 : _lookupRef$current.open();
-      },
-      close: function close() {
-        var _lookupRef$current2;
-        return (_lookupRef$current2 = lookupRef.current) === null || _lookupRef$current2 === void 0 ? void 0 : _lookupRef$current2.close();
-      },
-      getKeyword: function getKeyword() {
-        var _lookupRef$current$ge, _lookupRef$current3;
-        return (_lookupRef$current$ge = (_lookupRef$current3 = lookupRef.current) === null || _lookupRef$current3 === void 0 ? void 0 : _lookupRef$current3.getKeyword()) !== null && _lookupRef$current$ge !== void 0 ? _lookupRef$current$ge : '';
-      },
-      setKeyword: function setKeyword(v) {
-        var _lookupRef$current4;
-        return (_lookupRef$current4 = lookupRef.current) === null || _lookupRef$current4 === void 0 ? void 0 : _lookupRef$current4.setKeyword(v);
-      }
-    };
-  }, []);
-
-  /** 通过 useEngineContext 拿到宿主 app（含 pubsub.subscribe / unsubscribe） */
-  var engineContext = useEngineContext();
-  /**
-   * 用 ref 稳定 getApp 引用：低代码环境下 engineContext 每次渲染可能返回新引用，
-   * 若把 getApp 直接放进 effect 依赖会导致频繁 unsubscribe/subscribe（甚至漏掉扫码事件）。
-   * effect 依赖只保留 enableScanner，运行时通过 ref 拿最新的 getApp。
-   */
-  var getAppRef = useRef(undefined);
-  getAppRef.current = typeof (engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 || (_engineContext$appHel = _engineContext$appHel.utils) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.getApp) === 'function' ? engineContext.appHelper.utils.getApp : undefined;
-  useEffect(function () {
-    if (!enableScanner) return undefined;
-    var getApp = getAppRef.current;
-    if (typeof getApp !== 'function') return undefined;
-    var app = getApp();
-    var pubsub = app === null || app === void 0 ? void 0 : app.pubsub;
-    if (!pubsub || typeof pubsub.subscribe !== 'function') {
-      return undefined;
-    }
-
-    /**
-     * 监听回调：每次扫码直接覆盖输入框。
-     * ScanResultPayload: { code, data }，取 code 作为输入框值与搜索关键词。
-     * setKeyword 在受控模式下会触发外部 onChange；onSearch 需要显式触发以驱动后续搜索流程
-     * （受控模式下宿主一般只通过 onSearch 拿到新关键词，不会在 onChange 里再触发一次 onSearch，
-     *  因此这里不会产生重复请求。如需自定义合流，可绑定 onScannerData 自行处理）。
-     *
-     * 非法 payload（无 code 或 code 为空串）直接忽略，避免把输入框/搜索条件意外清空。
-     */
-    var onScan = function onScan(payload) {
-      var _lookupRef$current5, _onSearchRef$current, _onScannerDataRef$cur;
-      var data = payload === null || payload === void 0 ? void 0 : payload.data;
-      if (typeof data !== 'string' || data.length === 0) {
-        return;
-      }
-      (_lookupRef$current5 = lookupRef.current) === null || _lookupRef$current5 === void 0 || _lookupRef$current5.setKeyword(data);
-      (_onSearchRef$current = onSearchRef.current) === null || _onSearchRef$current === void 0 || _onSearchRef$current.call(onSearchRef, data);
-      (_onScannerDataRef$cur = onScannerDataRef.current) === null || _onScannerDataRef$cur === void 0 || _onScannerDataRef$cur.call(onScannerDataRef, payload);
-    };
-    try {
-      pubsub.subscribe(SCAN_RESULT_EVENT, onScan);
-    } catch (e) {
-      console.warn('[PisellFind] subscribe scanner failed:', e);
-      return undefined;
-    }
-    return function () {
-      try {
-        var _pubsub$unsubscribe;
-        (_pubsub$unsubscribe = pubsub.unsubscribe) === null || _pubsub$unsubscribe === void 0 || _pubsub$unsubscribe.call(pubsub, SCAN_RESULT_EVENT, onScan);
-      } catch (e) {
-        console.warn('[PisellFind] unsubscribe scanner failed:', e);
-      }
-    };
-  }, [enableScanner]);
   return /*#__PURE__*/React.createElement(PisellLookup, _extends({
-    ref: lookupRef,
+    ref: ref,
     triggerType: triggerType,
     buttonText: buttonText,
     placeholder: placeholder,
     showConfirmButton: showConfirmButton,
     showHistory: showHistory,
-    historyKey: historyKey,
-    onSearch: onSearch
+    historyKey: historyKey
   }, restProps));
 });
+
+// 显示名称
 PisellFind.displayName = 'PisellFind';

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

@@ -217,10 +217,8 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
     }) : rawScrollX;
     if (scroll !== null && scroll !== void 0 && scroll.autoCalc && typeof ctx.scrollAreaHeight === 'number') {
       var wrapHeight = ctx.scrollAreaHeight;
-      // 40：表头固定高；uniformSummaryHeight：同值列总结区高度（ResizeObserver 量出，仅 content-box，不含 padding/border）；
-      // 25：仅在确实展示 uniformSummary 时补回 padding 12*2 + 1px border-bottom（见 Grid.less .pisell-record-board-uniform-summary）。
-      // 无总结时不应再多扣，否则 Table 不能撑满 scroll-body，会在 Table 与底部分页之间留白。
-      var reservedHeight = 40 + (uniformSummaryHeight > 0 ? uniformSummaryHeight + 25 : 0);
+      // 40：表头等固定占高；uniformSummaryHeight：同值列总结区动态高度，无总结时为 0, 24是 uniformSummary padding
+      var reservedHeight = 40 + uniformSummaryHeight + 24;
       return {
         x: scrollX !== null && scrollX !== void 0 ? scrollX : sumColumnWidths,
         y: Math.max(wrapHeight - reservedHeight, 100),

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

@@ -8,6 +8,7 @@ import "./index.less";
 import { locales } from '@pisell/utils';
 import { PREFIX } from "../../index";
 var Footer = function Footer(_ref) {
+  var _item$_origin;
   var item = _ref.item,
     hideDivider = _ref.hideDivider,
     type = _ref.type,
@@ -18,6 +19,7 @@ var Footer = function Footer(_ref) {
     tip = item.tip,
     num = item.num,
     discount_reason = item.discount_reason;
+  var weighingInfo = item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 || (_item$_origin = _item$_origin._extend) === null || _item$_origin === void 0 ? void 0 : _item$_origin.weighing;
   /**
    * @title: 折扣
    * @description:
@@ -60,7 +62,7 @@ var Footer = function Footer(_ref) {
   }) : null, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(PREFIX, "__product-footer"), hideDivider && "".concat(PREFIX, "__hide-divider-footer"), isOnlyTotal && "".concat(PREFIX, "__only-total-footer"))
   }, /*#__PURE__*/React.createElement("div", {
-    className: classNames("".concat(PREFIX, "__footer-price-wrap"))
+    className: classNames("".concat(PREFIX, "__footer-price-wrap"), weighingInfo && "".concat(PREFIX, "__footer-price-wrap--weighing"))
   }, !isOnlyTotal ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(PREFIX, "__footer-price"))
   }, /*#__PURE__*/React.createElement("span", null, _formatAmount(total, symbol)), tip ? /*#__PURE__*/React.createElement(Tooltip, {

package/es/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/es/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/es/components/productCard/cartSkuCard/components/weighing/index.js

@@ -40,11 +40,11 @@ var Weighing = function Weighing(props) {
   }, isManualWeight ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "__weighing-row")
   }, /*#__PURE__*/React.createElement("span", null, manualLabel)) : null, tareValue > 0 ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(PREFIX, "__weighing-row")
+    className: "".concat(PREFIX, "__weighing-row ").concat(PREFIX, "__weighing-row--large")
   }, /*#__PURE__*/React.createElement("span", null, grossLabel, ":"), /*#__PURE__*/React.createElement("span", null, formatWeight(weight, unit))) : null, tareValue > 0 ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(PREFIX, "__weighing-row")
+    className: "".concat(PREFIX, "__weighing-row ").concat(PREFIX, "__weighing-row--large")
   }, /*#__PURE__*/React.createElement("span", null, tareLabel, ":"), /*#__PURE__*/React.createElement("span", null, formatWeight(tare === null || tare === void 0 ? void 0 : tare.value, (tare === null || tare === void 0 ? void 0 : tare.unit) || unit))) : null, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(PREFIX, "__weighing-row")
+    className: "".concat(PREFIX, "__weighing-row ").concat(PREFIX, "__weighing-row--large")
   }, /*#__PURE__*/React.createElement("span", null, "".concat(formatWeight(net_weight, unit), " ").concat(netLabel, " @ ").concat(unitPriceText, "/").concat(unitLabel))));
 };
 export default Weighing;

package/es/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/es/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/es/components/productCard/lineItem/BookingLineItem.js

@@ -1,4 +1,4 @@
-var _excluded = ["dataSource", "type", "cartSkuType", "relatedProductDataSource", "rightActions", "escapeDom", "isShowImage", "isFormSubject", "isShowDelete", "isShowNote", "isShowAmountFooter", "disabledClick", "disabledEdit", "statusOptions", "statusLoading", "statusDisabled", "isShowRelatedProduct", "holderOptions", "onBookingStatusChange", "onAction", "onDelete", "onNote", "onCard", "onPromotion", "onGift"];
+var _excluded = ["dataSource", "type", "cartSkuType", "relatedProductDataSource", "rightActions", "escapeDom", "isShowImage", "isShowDelete", "isShowNote", "isShowAmountFooter", "disabledClick", "disabledEdit", "statusOptions", "statusLoading", "statusDisabled", "isShowRelatedProduct", "onBookingStatusChange", "onAction", "onDelete", "onNote", "onCard", "onPromotion", "onGift"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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."); }
@@ -24,7 +24,6 @@ import { SwipeAction } from "../cartSkuCard/components/swipeAction";
 import Action from "../components/Action";
 import TimeRange from "./components/TimeRange";
 import Resources from "./components/Resources";
-import Holders from "./components/Holders";
 import Iconfont from "../../iconfont";
 import useEngineContext from "../../../hooks/useEngineContext";
 var PREFIX = 'pisell-line-item';
@@ -65,7 +64,7 @@ var getResourceName = function getResourceName(booking, translationOriginal) {
   }).filter(Boolean).join(', ');
 };
 var BookingLineItem = function BookingLineItem(props) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _ref, _ref2, _dataSource$promotion;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _dataSource$promotion;
   var dataSource = props.dataSource,
     type = props.type,
     cartSkuType = props.cartSkuType,
@@ -74,7 +73,6 @@ var BookingLineItem = function BookingLineItem(props) {
     rightActions = _props$rightActions === void 0 ? [] : _props$rightActions,
     escapeDom = props.escapeDom,
     isShowImage = props.isShowImage,
-    isFormSubject = props.isFormSubject,
     isShowDelete = props.isShowDelete,
     isShowNote = props.isShowNote,
     isShowAmountFooter = props.isShowAmountFooter,
@@ -88,7 +86,6 @@ var BookingLineItem = function BookingLineItem(props) {
     statusDisabled = _props$statusDisabled === void 0 ? false : _props$statusDisabled,
     _props$isShowRelatedP = props.isShowRelatedProduct,
     isShowRelatedProduct = _props$isShowRelatedP === void 0 ? true : _props$isShowRelatedP,
-    holderOptions = props.holderOptions,
     onBookingStatusChange = props.onBookingStatusChange,
     _onAction = props.onAction,
     onDelete = props.onDelete,
@@ -134,9 +131,7 @@ var BookingLineItem = function BookingLineItem(props) {
     }
   };
   var bookingRightActions = isShowDelete ? [deleteAction].concat(_toConsumableArray(rightActions)) : rightActions;
-  var resolvedHolderOptions = (_ref = (_ref2 = holderOptions !== null && holderOptions !== void 0 ? holderOptions : dataSource === null || dataSource === void 0 ? void 0 : dataSource.holderOptions) !== null && _ref2 !== void 0 ? _ref2 : dataSource === null || dataSource === void 0 ? void 0 : dataSource.holders) !== null && _ref !== void 0 ? _ref : [];
-  var resolvedIsFormSubject = isFormSubject !== null && isFormSubject !== void 0 ? isFormSubject : dataSource === null || dataSource === void 0 ? void 0 : dataSource.isFormSubject;
-  var bookingTitle = String((dataSource === null || dataSource === void 0 ? void 0 : dataSource.booking_id) || '');
+  var bookingTitle = String((dataSource === null || dataSource === void 0 ? void 0 : dataSource.booking_id) || '-');
   var bookingTime = formatBookingTime(dataSource, locale);
   var resourceName = getResourceName(dataSource, translationOriginal) || '-';
   var renderStatusButton = function renderStatusButton() {
@@ -189,8 +184,8 @@ var BookingLineItem = function BookingLineItem(props) {
   }, canChangeStatus ? /*#__PURE__*/React.createElement(Dropdown, {
     menu: {
       items: statusMenuItems,
-      onClick: function onClick(_ref3) {
-        var key = _ref3.key;
+      onClick: function onClick(_ref) {
+        var key = _ref.key;
         return onBookingStatusChange === null || onBookingStatusChange === void 0 ? void 0 : onBookingStatusChange(String(key), dataSource);
       }
     },
@@ -211,11 +206,7 @@ var BookingLineItem = function BookingLineItem(props) {
     dataSource: dataSource
   }), /*#__PURE__*/React.createElement(TimeRange, {
     dataSource: dataSource
-  }), resolvedIsFormSubject ? /*#__PURE__*/React.createElement(Holders, {
-    dataSource: dataSource,
-    holderOptions: resolvedHolderOptions,
-    isFormSubject: resolvedIsFormSubject
-  }) : null), isShowRelatedProduct && relatedProductDataSource ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
+  })), isShowRelatedProduct && relatedProductDataSource ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
     style: {
       margin: 0
     }

package/es/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/es/components/productCard/lineItem/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["dataSource", "itemType", "type", "rightActions", "escapeDom", "isShowImage", "isShowDelete", "isShowNote", "isShowAmountFooter", "disabledClick", "disabledEdit", "statusOptions", "statusLoading", "statusDisabled", "isShowRelatedProduct", "holderOptions", "onBookingStatusChange", "onAction", "onDelete", "onNote", "onCard", "onPromotion", "onGift"];
+var _excluded = ["dataSource", "itemType", "type", "rightActions", "escapeDom", "isShowImage", "isShowDelete", "isShowNote", "isShowAmountFooter", "disabledClick", "disabledEdit", "statusOptions", "statusLoading", "statusDisabled", "isShowRelatedProduct", "onBookingStatusChange", "onAction", "onDelete", "onNote", "onCard", "onPromotion", "onGift"];
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -27,45 +27,6 @@ var translateText = function translateText(text, translationOriginal) {
   if (!text) return '';
   return translationOriginal(text);
 };
-
-/**
- * 计算购物车行「单位主商品价」（不含 bundle composite，option 从 main_* 字段扣除）。
- *
- * @example
- * resolveLineItemUnitPrices(orderProduct);
- */
-function resolveLineItemUnitPrices(product) {
-  var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
-  var promotion = metadata._promotion;
-  var optionSum = ((product === null || product === void 0 ? void 0 : product.product_option_item) || []).reduce(function (sum, option) {
-    var price = Number(option === null || option === void 0 ? void 0 : option.price) || 0;
-    var num = Number(option === null || option === void 0 ? void 0 : option.num) || 1;
-    return sum + price * num;
-  }, 0);
-  var unitOriginal = function (_ref, _product$original_pri) {
-    if (metadata.main_product_original_price != null && metadata.main_product_original_price !== '') {
-      return Number(metadata.main_product_original_price) - optionSum;
-    }
-    if ((promotion === null || promotion === void 0 ? void 0 : promotion.originalPrice) != null && promotion.originalPrice !== '') {
-      return Number(promotion.originalPrice);
-    }
-    return Number((_ref = (_product$original_pri = product === null || product === void 0 ? void 0 : product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product === null || product === void 0 ? void 0 : product.selling_price) !== null && _ref !== void 0 ? _ref : 0);
-  }();
-  var unitSelling = function (_ref2, _product$payment_pric) {
-    if (metadata.main_product_selling_price != null && metadata.main_product_selling_price !== '') {
-      return Number(metadata.main_product_selling_price) - optionSum;
-    }
-    // source_product_price 是券前 catalog 原价，不能当作折后售价
-    if (promotion !== null && promotion !== void 0 && promotion.inPromotion && promotion.finalPrice != null && promotion.finalPrice !== '') {
-      return Number(promotion.finalPrice);
-    }
-    return Number((_ref2 = (_product$payment_pric = product === null || product === void 0 ? void 0 : product.payment_price) !== null && _product$payment_pric !== void 0 ? _product$payment_pric : product === null || product === void 0 ? void 0 : product.selling_price) !== null && _ref2 !== void 0 ? _ref2 : unitOriginal);
-  }();
-  return {
-    unitSelling: Number.isFinite(unitSelling) ? unitSelling : 0,
-    unitOriginal: Number.isFinite(unitOriginal) ? unitOriginal : 0
-  };
-}
 var convertBundleOption = function convertBundleOption(option, translationOriginal) {
   return _objectSpread(_objectSpread({}, option), {}, {
     id: option.option_group_item_id,
@@ -101,14 +62,11 @@ var convertBundle = function convertBundle(bundle, translationOriginal) {
   });
 };
 export var convertProductToLineItemProduct = function convertProductToLineItemProduct(product, translationOriginal, symbol) {
-  var _product$metadata, _ref3, _product$num, _ref4, _product$num2, _product$metadata2, _product$discount_lis, _product$discount_lis2, _product$metadata3, _product$metadata4, _product$product_sku, _ref5, _product$num3;
+  var _product$metadata, _ref, _product$num, _ref2, _product$num2, _product$metadata$sou, _product$metadata2, _product$payment_pric, _product$metadata3, _product$product_sku, _ref3, _product$num3;
   var title = translateText(product.product_title || product.title, translationOriginal);
   var bundle = (product.product_bundle || []).map(function (bundleItem) {
     return convertBundle(bundleItem, translationOriginal);
   });
-  var _resolveLineItemUnitP = resolveLineItemUnitPrices(product),
-    unitSelling = _resolveLineItemUnitP.unitSelling,
-    unitOriginal = _resolveLineItemUnitP.unitOriginal;
   return {
     _id: ((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number) || product.order_detail_id || product.product_id,
     id: product.product_id,
@@ -119,13 +77,13 @@ export var convertProductToLineItemProduct = function convertProductToLineItemPr
     name: title,
     cover: product.cover,
     image: product.cover,
-    num: (_ref3 = (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : product.product_quantity) !== null && _ref3 !== void 0 ? _ref3 : 1,
-    quantity: (_ref4 = (_product$num2 = product.num) !== null && _product$num2 !== void 0 ? _product$num2 : product.product_quantity) !== null && _ref4 !== void 0 ? _ref4 : 1,
-    price: unitSelling,
-    total: unitSelling,
-    origin_total: unitOriginal,
-    original_total: unitOriginal,
-    source_product_price: (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.source_product_price,
+    num: (_ref = (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : product.product_quantity) !== null && _ref !== void 0 ? _ref : 1,
+    quantity: (_ref2 = (_product$num2 = product.num) !== null && _product$num2 !== void 0 ? _product$num2 : product.product_quantity) !== null && _ref2 !== void 0 ? _ref2 : 1,
+    price: (_product$metadata$sou = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : product.selling_price,
+    total: (_product$payment_pric = product.payment_price) !== null && _product$payment_pric !== void 0 ? _product$payment_pric : product.selling_price,
+    origin_total: product.original_price,
+    original_total: product.original_price,
+    source_product_price: (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.source_product_price,
     selling_price: product.selling_price,
     payment_price: product.payment_price,
     tax_fee: product.tax_fee,
@@ -137,11 +95,7 @@ export var convertProductToLineItemProduct = function convertProductToLineItemPr
     product_option_string: product.product_sku ? translateText(product.product_sku.subtitle, translationOriginal) : '',
     discount_list: product.discount_list,
     promotions: product.promotions,
-    discount_reason: (_product$discount_lis = (_product$discount_lis2 = product.discount_list) === null || _product$discount_lis2 === void 0 || (_product$discount_lis2 = _product$discount_lis2.find(function (d) {
-      return (d === null || d === void 0 ? void 0 : d.type) === 'product';
-    })) === null || _product$discount_lis2 === void 0 || (_product$discount_lis2 = _product$discount_lis2.discount) === null || _product$discount_lis2 === void 0 ? void 0 : _product$discount_lis2.message) !== null && _product$discount_lis !== void 0 ? _product$discount_lis : (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.product_discount_reason,
-    // 促销赠品走 metadata._giftInfo；礼品卡走 gift_card（对齐 legacy formatProducts isGift）
-    isGift: Boolean(product.gift_card || product.isGift || product._isGiftPromotion || ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4._giftInfo) || product._giftInfo),
+    isGift: Boolean(product.gift_card),
     giftData: product.giftData,
     _origin: product,
     _extend: {
@@ -150,11 +104,11 @@ export var convertProductToLineItemProduct = function convertProductToLineItemPr
         option: (_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option,
         bundle: product.product_bundle,
         product_variant_id: product.product_variant_id,
-        quantity: (_ref5 = (_product$num3 = product.num) !== null && _product$num3 !== void 0 ? _product$num3 : product.product_quantity) !== null && _ref5 !== void 0 ? _ref5 : 1
+        quantity: (_ref3 = (_product$num3 = product.num) !== null && _product$num3 !== void 0 ? _product$num3 : product.product_quantity) !== null && _ref3 !== void 0 ? _ref3 : 1
       },
       note: product.note,
-      total: unitSelling,
-      origin_total: unitOriginal,
+      total: product.payment_price,
+      origin_total: product.original_price,
       payment_price: product.payment_price
     }
   };
@@ -189,7 +143,6 @@ var LineItem = function LineItem(props) {
     statusDisabled = _props$statusDisabled === void 0 ? false : _props$statusDisabled,
     _props$isShowRelatedP = props.isShowRelatedProduct,
     isShowRelatedProduct = _props$isShowRelatedP === void 0 ? true : _props$isShowRelatedP,
-    holderOptions = props.holderOptions,
     onBookingStatusChange = props.onBookingStatusChange,
     onAction = props.onAction,
     onDelete = props.onDelete,
@@ -250,7 +203,6 @@ var LineItem = function LineItem(props) {
     statusLoading: statusLoading,
     statusDisabled: statusDisabled,
     isShowRelatedProduct: isShowRelatedProduct,
-    holderOptions: holderOptions,
     onBookingStatusChange: onBookingStatusChange,
     onAction: onAction,
     onDelete: onDelete,