@pisell/materials 6.11.107 → 6.11.108

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

@@ -48,6 +48,7 @@ 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";
@@ -59,47 +60,18 @@ var getStatusOption = (status, statusOptions = []) => {
     color: DEFAULT_STATUS_COLOR
   };
 };
-var formatBookingTime = (booking, locale) => {
-  const start = (0, import_dayjs.default)(`${booking.start_date || ""} ${booking.start_time || ""}`);
-  const end = (0, import_dayjs.default)(`${booking.end_date || ""} ${booking.end_time || ""}`);
-  if (!start.isValid() || !end.isValid()) return "";
-  const isEn = locale === "en-US" || locale === "en";
-  const dateFormat = isEn ? "DD/MM/YYYY" : "YYYY-MM-DD";
-  const startTime = booking.start_time || start.format("HH:mm");
-  const endTime = booking.end_time || end.format("HH:mm");
-  if (start.isSame(end, "day")) {
-    return isEn ? `${startTime} ~ ${endTime} ${start.format(dateFormat)}` : `${start.format(dateFormat)} ${startTime} ~ ${endTime}`;
-  }
-  return isEn ? `${startTime} ${start.format(dateFormat)} ~ ${endTime} ${end.format(
-    dateFormat
-  )}` : `${start.format(dateFormat)} ${startTime} ~ ${end.format(
-    dateFormat
-  )} ${endTime}`;
-};
-var translateText = (text, translationOriginal) => {
-  if (typeof text === "string") return text;
-  if (!text) return "";
-  return translationOriginal(text);
-};
-var getResourceName = (booking, translationOriginal) => {
-  if (booking == null ? void 0 : booking.relation_form_name) return booking.relation_form_name;
-  return ((booking == null ? void 0 : booking.resources) || []).map(
-    (resource) => {
-      var _a;
-      return translateText((_a = resource == null ? void 0 : resource.metadata) == null ? void 0 : _a.resource_name, translationOriginal);
-    }
-  ).filter(Boolean).join(", ");
-};
 var BookingLineItem = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const {
     dataSource,
     type,
     cartSkuType,
+    isShowBookingHeader,
     relatedProductDataSource,
     rightActions = [],
     escapeDom,
     isShowImage,
+    isFormSubject,
     isShowDelete,
     isShowNote,
     isShowAmountFooter,
@@ -109,6 +81,7 @@ var BookingLineItem = (props) => {
     statusLoading = false,
     statusDisabled = false,
     isShowRelatedProduct = true,
+    holderOptions,
     onBookingStatusChange,
     onAction,
     onDelete,
@@ -146,9 +119,24 @@ var BookingLineItem = (props) => {
     }
   };
   const bookingRightActions = isShowDelete ? [deleteAction, ...rightActions] : rightActions;
-  const bookingTitle = String((dataSource == null ? void 0 : dataSource.booking_id) || "-");
-  const bookingTime = formatBookingTime(dataSource, locale);
-  const resourceName = getResourceName(dataSource, translationOriginal) || "-";
+  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 renderDeleteButton = (inline = false) => isShowDelete ? /* @__PURE__ */ import_react.default.createElement(
+    "button",
+    {
+      className: (0, import_classnames.default)(`${PREFIX}__delete-btn`, {
+        [`${PREFIX}__delete-btn--inline`]: inline
+      }),
+      type: "button",
+      onClick: (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        onDelete == null ? void 0 : onDelete(dataSource);
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-trash-01" })
+  ) : null;
   const renderStatusButton = () => /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
@@ -191,7 +179,7 @@ var BookingLineItem = (props) => {
           onCard == null ? void 0 : onCard(dataSource);
         }
       },
-      /* @__PURE__ */ import_react.default.createElement(
+      isShowBookingHeader ? /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
           className: `${PREFIX}__booking-header`,
@@ -209,21 +197,25 @@ var BookingLineItem = (props) => {
             trigger: ["click"]
           },
           renderStatusButton()
-        ) : renderStatusButton(), isShowDelete ? /* @__PURE__ */ import_react.default.createElement(
-          "button",
+        ) : renderStatusButton(), renderDeleteButton()))
+      ) : null,
+      /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          className: (0, import_classnames.default)(`${PREFIX}__booking-detail`, {
+            [`${PREFIX}__booking-detail--with-delete`]: !isShowBookingHeader && isShowDelete
+          })
+        },
+        /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__booking-detail-content` }, /* @__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,
           {
-            className: `${PREFIX}__delete-btn`,
-            type: "button",
-            onClick: (e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              onDelete == null ? void 0 : onDelete(dataSource);
-            }
-          },
-          /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-trash-01" })
-        ) : null))
+            dataSource,
+            holderOptions: resolvedHolderOptions,
+            isFormSubject: resolvedIsFormSubject
+          }
+        ) : null),
+        !isShowBookingHeader ? renderDeleteButton(true) : 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/components/Holders/index.js

@@ -0,0 +1,83 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/productCard/lineItem/components/Holders/index.tsx
+var Holders_exports = {};
+__export(Holders_exports, {
+  default: () => Holders_default
+});
+module.exports = __toCommonJS(Holders_exports);
+var import_react = __toESM(require("react"));
+var import_utils = require("@pisell/utils");
+var import_iconfont = __toESM(require("../../../../iconfont"));
+var import_index = require("./index.less");
+var PREFIX = "pisell-line-item";
+var holderIconMap = {
+  form: "pisell2-file-05",
+  minors: "pisell2-user-check-01",
+  waiver: "pisell2-file-lock-03"
+};
+var isEmptyHolderId = (value) => {
+  if (Array.isArray(value)) return value.length === 0;
+  return value === void 0 || value === null || value === "";
+};
+var normalizeHolderIds = (value) => {
+  if (isEmptyHolderId(value)) return [];
+  return Array.isArray(value) ? value : [value];
+};
+var pickHolderId = (dataSource) => {
+  var _a, _b, _c, _d, _e, _f, _g;
+  return (dataSource == null ? void 0 : dataSource.holder_id) ?? ((_a = dataSource == null ? void 0 : dataSource.metadata) == null ? void 0 : _a.holder_id) ?? ((_d = (_c = (_b = dataSource == null ? void 0 : dataSource._extend) == null ? void 0 : _b.product) == null ? void 0 : _c.metadata) == null ? void 0 : _d.holder_id) ?? ((_g = (_f = (_e = dataSource == null ? void 0 : dataSource._extend) == null ? void 0 : _e.product) == null ? void 0 : _f._extend) == null ? void 0 : _g.holder_id);
+};
+var pickHolderMaxCount = (dataSource, holderIds) => {
+  var _a, _b, _c, _d, _e, _f, _g;
+  const count = ((dataSource == null ? void 0 : dataSource.holderMaxCount) ?? (dataSource == null ? void 0 : dataSource.holder_max_count) ?? (dataSource == null ? void 0 : dataSource.number) ?? ((_b = (_a = dataSource == null ? void 0 : dataSource._extend) == null ? void 0 : _a.product) == null ? void 0 : _b.num) ?? ((_d = (_c = dataSource == null ? void 0 : dataSource._extend) == null ? void 0 : _c.product) == null ? void 0 : _d.product_quantity) ?? ((_g = (_f = (_e = dataSource == null ? void 0 : dataSource._extend) == null ? void 0 : _e.product) == null ? void 0 : _f._extend) == null ? void 0 : _g.quantity) ?? holderIds.length) || 1;
+  return Number(count) || 1;
+};
+var LineItemHolders = (props) => {
+  const { dataSource = {}, holderOptions = [], isFormSubject } = props;
+  const holderIds = (0, import_react.useMemo)(
+    () => normalizeHolderIds(pickHolderId(dataSource)),
+    [dataSource]
+  );
+  const holderMaxCount = pickHolderMaxCount(dataSource, holderIds);
+  const showUnassigned = Boolean(isFormSubject || (dataSource == null ? void 0 : dataSource.isFormSubject));
+  const holderType = (dataSource == null ? void 0 : dataSource.holderType) || (dataSource == null ? void 0 : dataSource.holder_type) || "minors";
+  const holderIcon = holderIconMap[holderType] || holderIconMap.minors;
+  if (!holderIds.length) {
+    if (!showUnassigned) return null;
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__holders` }, /* @__PURE__ */ import_react.default.createElement("div", { className: "holder-item unassigned" }, holderMaxCount > 1 ? /* @__PURE__ */ import_react.default.createElement("span", null, holderMaxCount, "/", holderMaxCount, " ") : null, /* @__PURE__ */ import_react.default.createElement("span", { className: "holder-label" }, import_utils.locales.getText("pisell2.cart.sku-card.unassigned"))));
+  }
+  const renderHolder = (id, index) => {
+    const holder = holderOptions.find((item) => String(item.id) === String(id));
+    const label = (holder == null ? void 0 : holder.label) ?? String(id);
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "holder-item", key: `${id}-${index}` }, /* @__PURE__ */ import_react.default.createElement("span", { className: "holder-icon" }, /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: holderIcon })), /* @__PURE__ */ import_react.default.createElement("span", { className: "holder-label" }, label));
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__holders` }, holderIds.map((id, index) => renderHolder(id, index)));
+};
+var Holders_default = LineItemHolders;

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

@@ -0,0 +1,39 @@
+.pisell-line-item__holders {
+  user-select: none;
+  display: flex;
+  gap: 16px;
+  overflow: hidden;
+
+  .holder-item {
+    min-width: 30px;
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+    white-space: nowrap;
+
+    .holder-icon {
+      margin-right: 2px;
+      color: #7f56da;
+      font-size: 16px;
+    }
+
+    .holder-label {
+      display: inline-block;
+      overflow: hidden;
+      color: #667085;
+      font-size: 14px;
+      font-weight: 500;
+      line-height: 20px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+
+  .unassigned {
+    color: red;
+
+    .holder-label {
+      color: red;
+    }
+  }
+}

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

@@ -1,19 +1,21 @@
 import type { ProductCardTypes } from '../types';
-import type { itemType, LineItemStatusOption, LineItemType } from './types';
+import type { itemType, LineItemHolderOption, LineItemStatusOption, LineItemType } from './types';
 import './index.less';
 export declare const PREFIX = "pisell-line-item";
-export type { itemType, LineItemStatusOption, LineItemType } from './types';
+export type { itemType, LineItemHolderOption, LineItemStatusOption, LineItemType, } from './types';
 declare type LocalizedText = string | Record<string, unknown> | null | undefined;
 export interface LineItemProps extends Omit<ProductCardTypes, 'dataSource'> {
     dataSource: any;
     itemType?: itemType;
     type?: LineItemType;
+    isShowBookingHeader: boolean;
     rightActions?: any[];
     escapeDom?: string;
     statusOptions?: LineItemStatusOption[];
     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,8 +32,8 @@ export declare const convertProductToLineItemProduct: (product: any, translation
     quantity: any;
     price: any;
     total: any;
-    origin_total: any;
-    original_total: any;
+    origin_total: string | number | undefined;
+    original_total: string | number | undefined;
     source_product_price: any;
     selling_price: any;
     payment_price: any;
@@ -41,23 +43,25 @@ export declare const convertProductToLineItemProduct: (product: any, translation
     product_sku: any;
     product_bundle: any;
     bundle: any;
-    product_option_string: string;
+    product_option_string: any;
+    options: any[];
     discount_list: any;
     promotions: any;
+    discount_reason: any;
     isGift: boolean;
     giftData: any;
     _origin: any;
     _extend: {
         other: {
             product_id: any;
-            option: any;
+            option: any[];
             bundle: any;
             product_variant_id: any;
             quantity: any;
         };
         note: any;
         total: any;
-        origin_total: any;
+        origin_total: string | number | undefined;
         payment_price: any;
     };
 };

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

@@ -55,10 +55,27 @@ var translateText = (text, translationOriginal) => {
   if (!text) return "";
   return translationOriginal(text);
 };
+var resolveLineOriginTotal = (product) => {
+  var _a, _b, _c, _d;
+  const candidates = [
+    product == null ? void 0 : product.original_total,
+    product == null ? void 0 : product.original_price,
+    (_a = product == null ? void 0 : product._extend) == null ? void 0 : _a.origin_total,
+    (_d = (_c = (_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.origin) == null ? void 0 : _c._extend) == null ? void 0 : _d.origin_total
+  ];
+  for (const candidate of candidates) {
+    if (candidate !== void 0 && candidate !== null && candidate !== "") {
+      return candidate;
+    }
+  }
+  return void 0;
+};
 var convertBundleOption = (option, translationOriginal) => ({
   ...option,
   id: option.option_group_item_id,
-  name: translateText(option.name, translationOriginal)
+  name: translateText(option.name, translationOriginal),
+  price: option.add_price ?? option.price,
+  num: option.num ?? option.quantity ?? 1
 });
 var convertBundle = (bundle, translationOriginal) => {
   const title = translateText(bundle.bundle_title, translationOriginal);
@@ -72,15 +89,8 @@ var convertBundle = (bundle, translationOriginal) => {
     product_id: bundle.bundle_product_id,
     _bundle_product_id: bundle.bundle_product_id,
     product_variant_id: bundle.bundle_variant_id,
-    title,
-    name: title,
-    bundle_title: title,
-    num: bundle.num,
-    quantity: bundle.num,
-    price,
-    total: bundle.bundle_payment_price,
-    origin_total: bundle.bundle_selling_price,
-    original_total: bundle.bundle_selling_price,
+    total: bundle.bundle_selling_price,
+    origin_total: bundle.original_total,
     custom_price: bundle.custom_price,
     custom_price_type: bundle.custom_price_type,
     custom_price_type_ext: bundle.price_type_ext,
@@ -89,13 +99,35 @@ var convertBundle = (bundle, translationOriginal) => {
     _origin: bundle
   };
 };
+var resolveLineItemOptions = (product) => {
+  var _a;
+  const skuOptions = (_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.option;
+  if (Array.isArray(skuOptions) && skuOptions.length > 0) {
+    return skuOptions;
+  }
+  if (Array.isArray(product == null ? void 0 : product.product_option_item)) {
+    return product.product_option_item;
+  }
+  return [];
+};
+var mapLineItemOptions = (options, translationOriginal) => options.map((option) => ({
+  ...option,
+  name: translateText(option.name ?? option.title, translationOriginal),
+  price: option.add_price ?? option.price,
+  num: option.num ?? option.quantity ?? 1
+}));
 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)
   );
-  return {
+  const lineOriginTotal = resolveLineOriginTotal(product);
+  const lineOptions = mapLineItemOptions(
+    resolveLineItemOptions(product),
+    translationOriginal
+  );
+  const mapped = {
     _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) || product.order_detail_id || product.product_id,
     id: product.product_id,
     product_id: product.product_id,
@@ -107,10 +139,10 @@ 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,
+    price: (_b = product.metadata) == null ? void 0 : _b.source_product_price,
+    total: product.selling_price,
+    origin_total: lineOriginTotal,
+    original_total: lineOriginTotal,
     source_product_price: (_c = product.metadata) == null ? void 0 : _c.source_product_price,
     selling_price: product.selling_price,
     payment_price: product.payment_price,
@@ -120,26 +152,32 @@ var convertProductToLineItemProduct = (product, translationOriginal, symbol) =>
     product_sku: product.product_sku,
     product_bundle: bundle,
     bundle,
-    product_option_string: product.product_sku ? translateText(product.product_sku.subtitle, translationOriginal) : "",
+    product_option_string: product.product_option_string,
+    options: lineOptions,
     discount_list: product.discount_list,
     promotions: product.promotions,
-    isGift: Boolean(product.gift_card),
+    discount_reason: ((_f = (_e = (_d = product.discount_list) == null ? void 0 : _d.find((d) => (d == null ? void 0 : d.type) === "product")) == null ? void 0 : _e.discount) == null ? void 0 : _f.message) ?? ((_g = product.metadata) == null ? void 0 : _g.product_discount_reason),
+    // 促销赠品走 metadata._giftInfo；礼品卡走 gift_card（对齐 legacy formatProducts isGift）
+    isGift: Boolean(
+      product.gift_card || product.isGift || product._isGiftPromotion || ((_h = product.metadata) == null ? void 0 : _h._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: lineOptions,
         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: product.selling_price,
+      origin_total: lineOriginTotal,
       payment_price: product.payment_price
     }
   };
+  return mapped;
 };
 var LineItem = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -147,6 +185,7 @@ var LineItem = (props) => {
     dataSource = import_status.defaultValue.dataSource,
     itemType,
     type = "a9",
+    isShowBookingHeader,
     rightActions = [],
     escapeDom,
     isShowImage = import_status.defaultValue.isShowImage,
@@ -159,6 +198,7 @@ var LineItem = (props) => {
     statusLoading = false,
     statusDisabled = false,
     isShowRelatedProduct = true,
+    holderOptions,
     onBookingStatusChange,
     onAction,
     onDelete,
@@ -221,6 +261,7 @@ var LineItem = (props) => {
       dataSource,
       type,
       cartSkuType: type,
+      isShowBookingHeader,
       relatedProductDataSource,
       rightActions,
       escapeDom,
@@ -234,6 +275,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;
@@ -33,6 +33,21 @@
       color: currentColor;
       font-size: 20px;
     }
+
+    &--inline {
+      width: auto;
+      height: auto;
+      border: none;
+      border-radius: 0;
+      background: transparent;
+      color: #667085;
+      padding: 10px;
+
+      > span {
+        color: currentColor;
+        font-size: 20px;
+      }
+    }
   }
 
   &__swipe-delete {
@@ -148,6 +163,28 @@
     padding: 8px;
   }
 
+  &__booking-detail--with-delete {
+    position: relative;
+
+    .pisell-line-item__booking-detail-content {
+      padding-right: 40px;
+    }
+
+    .pisell-line-item__delete-btn--inline {
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+  }
+
+  &__booking-detail-content {
+    min-width: 0;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+  }
+
   &__booking-field {
     min-width: 0;
   }

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.107",
+  "version": "6.11.108",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",

package/es/components/Pagination/index.d.ts

@@ -1,14 +0,0 @@
-/// <reference types="react" />
-import { PaginationProps } from 'antd';
-import './index.less';
-declare const Pagination: (props: PaginationProps) => JSX.Element | null;
-export declare const paginationConfig: {
-    className: string;
-    defaultCurrent: number;
-    /** 无 props 上下文时仅能根据 total + range 近似推算（见 resolveCurrentPage） */
-    showTotal: (totalRecords: number, range: [number, number]) => any;
-    responsive: boolean;
-    size: string;
-};
-export default Pagination;
-export declare const FormPagination: ({ value, onChange, page, pageSize, ...other }: any) => JSX.Element;