@pisell/private-materials 6.9.1 → 6.9.3

package/lib/pro/keyboards/numberKeyboard/index.less

@@ -0,0 +1,59 @@
+.pisell-number-keyboard-modal {
+  .ant-moda-content,
+  .pisell-lowcode-modal-content {
+    background-color: transparent;
+  }
+}
+
+.pisell-number-keyboard-popover {
+  .ant-popover-inner,
+  .pisell-lowcode-popover-inner {
+    background-color: transparent;
+  }
+}
+
+.pisell-number-keyboard {
+  padding: 10px;
+  border-radius: 10px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  background-color: rgba(0, 0, 0, 0.7);
+  width: 344px;
+
+  &--disabled {
+    pointer-events: none;
+    opacity: 0.6;
+  }
+
+  &-label {
+    font-size: 20px;
+    font-weight: 600;
+    color: #fff;
+  }
+
+  &-error-message {
+    user-select: none;
+    font-size: 12px;
+    color: #d92d20;
+    line-height: 18px;
+    padding: 0 4px;
+  }
+}
+
+.pisell-number-keyboard-input-wrapper {
+  position: relative;
+
+  .pisell-number-keyboard-error-message {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    font-size: 12px;
+    color: #f04438;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 4px;
+  }
+}

package/lib/pro/keyboards/numberKeyboard/types.d.ts

@@ -0,0 +1,63 @@
+/// <reference types="react" />
+export declare type NumberKeyboardMode = 'integer' | 'decimal';
+export interface NumberKeyboardBaseProps {
+    /** 模式：整数 or 小数 */
+    mode?: NumberKeyboardMode;
+    /** 当前值（受控） */
+    value?: string;
+    /** 默认值（非受控） */
+    defaultValue?: string;
+    /** 原始值，用于重置 */
+    originalValue?: string;
+    /** 占位符 */
+    placeholder?: string;
+    /** 最大值 */
+    max?: number;
+    /** 最小值 */
+    min?: number;
+    /** 最大长度 */
+    maxLength?: number;
+    /** 小数位数，默认 2 */
+    precision?: number;
+    /** 是否禁用 */
+    disabled?: boolean;
+    /** 确认按钮文本 */
+    doneText?: string;
+    /** 重置按钮文本 */
+    resetText?: string;
+    /** 清空按钮文本 */
+    clearText?: string;
+    /** 标签文本（显示在输入框上方） */
+    label?: string;
+    /** 超出范围时的提示文本 */
+    errorText?: string;
+    /** 值变化回调 */
+    onChange?: (value: string) => void;
+    /** 确认按钮点击回调 */
+    onEnter?: (value: string) => void;
+    /** 重置按钮点击回调 */
+    onReset?: () => void;
+    /** 外层样式 */
+    style?: React.CSSProperties;
+    /** 自定义类名 */
+    className?: string;
+    /** 键盘是否监听物理键盘 */
+    keydown?: boolean;
+    /** 输入框样式 */
+    inputStyle?: React.CSSProperties;
+    /** 输入框包裹样式 */
+    inputWrapperStyle?: React.CSSProperties;
+}
+export interface NumberKeyboardProps extends NumberKeyboardBaseProps {
+    /** 容器配置，用于控制键盘以 popover 或 modal 形态展示 */
+    containerProps?: {
+        /** 渲染类型：popover 或 modal */
+        renderType: 'modal' | 'popover';
+        /** 是否打开（受控模式） */
+        open?: boolean;
+        /** 其他传递给 Popover 或 Modal 的属性 */
+        [key: string]: any;
+    };
+    /** 子元素，用于 popover 模式的触发器 */
+    children?: React.ReactNode;
+}

package/lib/pro/keyboards/numberKeyboard/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/pro/keyboards/numberKeyboard/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/lib/pro/pisellPaymentList/example.d.ts

@@ -4,6 +4,7 @@
  * 这个文件演示了如何使用 PisellPaymentList 和 PisellPaymentListItem 组件
  * 包括如何通过 Context 访问父组件配置
  */
+/// <reference types="react" />
 export declare const BasicExample: () => JSX.Element;
 export declare const ChildrenExample: () => JSX.Element;
 export declare const CustomItemExample: () => JSX.Element;

package/lib/pro/priceKeyboard/components/cashKeyboard/CashKeyboardSimple.js

@@ -238,7 +238,8 @@ var CashKeyboardBase = (props) => {
           background: "transparent",
           width: "100%"
         },
-        preventBlurElements: [`#${uniqueKeyboardId}`, shortcutsRef]
+        preventBlurElements: [`#${uniqueKeyboardId}`, shortcutsRef],
+        selected: isFirstInput && !!internalValue
       }
     ), /* @__PURE__ */ import_react.default.createElement(
       "div",

package/lib/pro/priceKeyboard/components/discountKeyboard/index.js

@@ -261,7 +261,8 @@ var DiscountKeyboardBase = (props) => {
             color: _color
           },
           placeholder,
-          bottomContent: renderBottomContent()
+          bottomContent: renderBottomContent(),
+          selected: isFirstInput && updateMode === "priceOverride" && !!internalValue
         }
       ),
       /* @__PURE__ */ import_react.default.createElement(

package/lib/pro/priceKeyboard/components/paymentKeyboard/index.js

@@ -324,7 +324,8 @@ var PaymentKeyboardBase = (props) => {
           padding: 16
         },
         bottomContent: renderBottomContent(),
-        preventBlurElements: [uniqueKeyboardId]
+        preventBlurElements: [uniqueKeyboardId],
+        selected: firstInputStatus.payment && !!internalPaymentValue
       }
     );
   };
@@ -354,7 +355,8 @@ var PaymentKeyboardBase = (props) => {
             justifyContent: "center"
           },
           onFocus: () => setFocusedInput(KEYS.PERCENT),
-          preventBlurElements: [uniqueKeyboardId]
+          preventBlurElements: [uniqueKeyboardId],
+          selected: firstInputStatus.percent && !!(internalSurchargeValue == null ? void 0 : internalSurchargeValue.percent) && focusedInput !== KEYS.FIXED
         }
       ),
       /* @__PURE__ */ import_react.default.createElement(
@@ -383,7 +385,8 @@ var PaymentKeyboardBase = (props) => {
             justifyContent: "center"
           },
           onFocus: () => setFocusedInput(KEYS.FIXED),
-          preventBlurElements: [uniqueKeyboardId]
+          preventBlurElements: [uniqueKeyboardId],
+          selected: firstInputStatus.fixed && !!(internalSurchargeValue == null ? void 0 : internalSurchargeValue.fixed) && focusedInput === KEYS.FIXED
         }
       )
     );

package/lib/pro/skuDetailModal/index.js

@@ -39,7 +39,7 @@ var import_utils = require("@pisell/utils");
 var import_Delete_wght300_24px = __toESM(require("@pisell/icon/es/Delete_wght300_24px"));
 var import_locales = __toESM(require("./locales"));
 var import_index = require("./index.less");
-var import_pisellNumberSelector = __toESM(require("../pisellNumberSelector"));
+var import_NumericStepper = __toESM(require("../NumericStepper"));
 var import_noteModal = __toESM(require("../../plus/noteModal"));
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_priceKeyboard = require("../priceKeyboard");
@@ -116,7 +116,9 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
     ];
     if (hasSkuOptions) {
       items.push({
-        title: import_utils.locales.getText("pisell2.text.sku.detail.modal.step.select.bundle"),
+        title: import_utils.locales.getText(
+          "pisell2.text.sku.detail.modal.step.select.bundle"
+        ),
         description: ""
       });
     }
@@ -128,7 +130,7 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
   );
   (0, import_react.useImperativeHandle)(ref, () => ({
     open: async (data) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+      var _a2, _b2, _c2, _d2, _e2, _f2;
       setCurrentStep(0);
       setNoteModalOpen(false);
       logger == null ? void 0 : logger.addLog({
@@ -212,26 +214,19 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
       setNote(((_b2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _b2.note) || "");
       setQuantity(((_c2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _c2.quantity) || 1);
       setDiscounts((_data == null ? void 0 : _data.discount_list) || []);
-      console.log({
+      const recordSkuValue = ((_d2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _d2._skuValue) || ((_e2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _e2.other) || {
         product_id: _data == null ? void 0 : _data.product_id,
-        product_variant_id: ((_e2 = (_d2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _d2.other) == null ? void 0 : _e2.product_variant_id) || 0,
-        bundle: ((_g2 = (_f2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _f2.other) == null ? void 0 : _g2.bundle) || [],
-        option: ((_i2 = (_h2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _h2.other) == null ? void 0 : _i2.option) || []
-      }, "skuValue");
-      setSkuValue({
-        product_id: _data == null ? void 0 : _data.product_id,
-        product_variant_id: ((_k = (_j2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _j2.other) == null ? void 0 : _k.product_variant_id) || 0,
-        bundle: ((_m = (_l = _data == null ? void 0 : _data._extend) == null ? void 0 : _l.other) == null ? void 0 : _m.bundle) || [],
-        option: ((_o = (_n = _data == null ? void 0 : _data._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.option) || []
-      });
-      setSkuDefaultValue({
-        product_id: _data == null ? void 0 : _data.product_id,
-        product_variant_id: ((_q = (_p = _data == null ? void 0 : _data._extend) == null ? void 0 : _p.other) == null ? void 0 : _q.product_variant_id) || 0,
-        price: ((_r = _data == null ? void 0 : _data._extend) == null ? void 0 : _r.price) || 0,
-        bundle: ((_t = (_s = _data == null ? void 0 : _data._extend) == null ? void 0 : _s.other) == null ? void 0 : _t.bundle) || [],
-        option: ((_v = (_u = _data == null ? void 0 : _data._extend) == null ? void 0 : _u.other) == null ? void 0 : _v.option) || []
-      });
-      setPriceOverride(((_w = _data == null ? void 0 : _data._extend) == null ? void 0 : _w.priceOverride) || void 0);
+        product_variant_id: 0,
+        bundle: [],
+        option: []
+      };
+      console.log(
+        recordSkuValue,
+        "skuValue"
+      );
+      setSkuValue(recordSkuValue);
+      setSkuDefaultValue(recordSkuValue);
+      setPriceOverride(((_f2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _f2.priceOverride) || null);
       setShowPriceAdjustModal(false);
       const dataAny = _data;
       const initialHasSkuOptions = Array.isArray(dataAny == null ? void 0 : dataAny.variant_group) && dataAny.variant_group.length > 0 || Array.isArray(dataAny == null ? void 0 : dataAny.option_group) && dataAny.option_group.length > 0 || Array.isArray(dataAny == null ? void 0 : dataAny.bundle_group) && dataAny.bundle_group.length > 0;
@@ -257,7 +252,8 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
     return getSelectedUnitPrice({ productData, skuValue: activeSkuValue });
   }, [productData, skuValue, skuDefaultValue]);
   const displayUnitPrice = (0, import_react.useMemo)(() => {
-    if (priceOverride === null || typeof priceOverride === "undefined") return unitPrice;
+    if (priceOverride === null || typeof priceOverride === "undefined")
+      return unitPrice;
     return priceOverride;
   }, [priceOverride, unitPrice]);
   const subtotal = (0, import_react.useMemo)(() => {
@@ -290,15 +286,19 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
     return `${priceSign}${symbol}${finalTotal.abs().toNumber().toFixed(2)}`;
   }, [finalTotal, symbol]);
   const priceOverrideText = (0, import_react.useMemo)(() => {
-    if (priceOverride === null || typeof priceOverride === "undefined") return "";
-    const prefix = `(${import_utils.locales.getText("pisell2.text.sku.detail.modal.price.override")} `;
+    if (priceOverride === null || typeof priceOverride === "undefined")
+      return "";
+    const prefix = `(${import_utils.locales.getText(
+      "pisell2.text.sku.detail.modal.price.override"
+    )} `;
     const overrideNumber = new import_decimal.default(priceOverride || 0);
     const sign = overrideNumber.toNumber() < 0 ? "-" : "";
     const absValue = overrideNumber.abs().toNumber().toFixed(2);
     return `${prefix}${sign}${symbol}${absValue})`;
   }, [priceOverride, symbol]);
   const priceChangeText = (0, import_react.useMemo)(() => {
-    if (priceOverride === null || typeof priceOverride === "undefined") return "";
+    if (priceOverride === null || typeof priceOverride === "undefined")
+      return "";
     const diff = new import_decimal.default(priceOverride || 0).minus(new import_decimal.default(unitPrice || 0)).mul(new import_decimal.default(quantity || 1));
     const diffNumber = diff.toNumber();
     const diffSign = diffNumber > 0 ? "+" : diffNumber < 0 ? "-" : "";
@@ -351,7 +351,7 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
     return true;
   };
   const handleConfirm = async () => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k, _l, _m, _n, _o, _p, _q, _r;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k, _l, _m, _n, _o, _p, _q, _r, _s;
     if (currentStep === 0 && hasSkuOptions) {
       (_b2 = (_a2 = procedureRef.current) == null ? void 0 : _a2.goToStep) == null ? void 0 : _b2.call(_a2, 1);
       setCurrentStep(1);
@@ -370,6 +370,7 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
     }
     if (productData && onConfirm) {
       const latestSkuValue = ((_i2 = (_h2 = skuOptionsSelectionRef.current) == null ? void 0 : _h2.getTransformValues) == null ? void 0 : _i2.call(_h2)) || skuValue || skuDefaultValue;
+      const originTotal = new import_decimal.default(unitPrice ?? 0).toNumber();
       const updatedData = {
         ...productData,
         discount_list: discounts || [],
@@ -386,17 +387,19 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
             productData,
             skuValue: latestSkuValue
           }),
+          origin_total: originTotal,
           ...priceOverride !== null && typeof priceOverride !== "undefined" ? { priceOverride } : {}
         }
       };
+      console.log("updatedData>>>>>>", updatedData, (_j2 = updatedData == null ? void 0 : updatedData._extend) == null ? void 0 : _j2.origin_total);
       const stockValidation = Number(
-        ((_l = (_k = (_j2 = bookingState == null ? void 0 : bookingState.bookingConfig) == null ? void 0 : _j2.config) == null ? void 0 : _k.stock_setting) == null ? void 0 : _l.stock_validation) ?? 0
+        ((_m = (_l = (_k = bookingState == null ? void 0 : bookingState.bookingConfig) == null ? void 0 : _k.config) == null ? void 0 : _l.stock_setting) == null ? void 0 : _m.stock_validation) ?? 0
       );
       const allowAddToCartWhenOutStock = Number(
-        ((_o = (_n = (_m = bookingState == null ? void 0 : bookingState.bookingConfig) == null ? void 0 : _m.config) == null ? void 0 : _n.stock_setting) == null ? void 0 : _o.allow_add_to_cart_when_out_stock) ?? 0
+        ((_p = (_o = (_n = bookingState == null ? void 0 : bookingState.bookingConfig) == null ? void 0 : _n.config) == null ? void 0 : _o.stock_setting) == null ? void 0 : _p.allow_add_to_cart_when_out_stock) ?? 0
       );
       const enableDontShowAgainToday = Number(
-        ((_r = (_q = (_p = bookingState == null ? void 0 : bookingState.bookingConfig) == null ? void 0 : _p.config) == null ? void 0 : _q.stock_setting) == null ? void 0 : _r.do_not_show_again_today) ?? 0
+        ((_s = (_r = (_q = bookingState == null ? void 0 : bookingState.bookingConfig) == null ? void 0 : _q.config) == null ? void 0 : _r.stock_setting) == null ? void 0 : _s.do_not_show_again_today) ?? 0
       );
       if (stockValidation === 1) {
         const hasStock = handleCheckStock({
@@ -405,7 +408,11 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
         });
         if (!hasStock) {
           if (allowAddToCartWhenOutStock !== 1) {
-            Toast == null ? void 0 : Toast.fail(import_utils.locales.getText("pisell2.skuOptionsSelection.variantItemCard.soldOut"));
+            Toast == null ? void 0 : Toast.fail(
+              import_utils.locales.getText(
+                "pisell2.skuOptionsSelection.variantItemCard.soldOut"
+              )
+            );
             return;
           }
           const productId = Number((productData == null ? void 0 : productData.product_id) || 0);
@@ -495,12 +502,14 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
           onClick: () => setNoteModalOpen(true)
         },
         import_utils.locales.getText("pisell2.text.sku.detail.modal.btn.add.note")
-      )), note && /* @__PURE__ */ import_react.default.createElement("div", { className: "note-section" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.sku.detail.modal.note")), /* @__PURE__ */ import_react.default.createElement("div", { className: "note-text", onClick: () => setNoteModalOpen(true) }, note))), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-summary-section" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.sku.detail.modal.subtotal")), /* @__PURE__ */ import_react.default.createElement("div", null, subtotalText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.sku.detail.modal.discount"), discountsCount > 0 && /* @__PURE__ */ import_react.default.createElement("span", { className: "price-item-danger" }, " (", discountsCount, ")")), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item-danger" }, discountsCount > 0 ? "-" : "", symbol, totalDiscounts)), priceOverride !== null && typeof priceOverride !== "undefined" && /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item" }, /* @__PURE__ */ import_react.default.createElement("div", { onClick: handleManualPriceChange }, import_utils.locales.getText("pisell2.text.sku.detail.modal.manual.price.change"), /* @__PURE__ */ import_react.default.createElement("span", { className: "price-item-override" }, priceOverrideText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item-danger" }, priceChangeText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item-total" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.sku.detail.modal.total"), /* @__PURE__ */ import_react.default.createElement("span", { className: "price-item-total-gst" }, "（", (productData == null ? void 0 : productData.is_charge_tax) ? import_utils.locales.getText("pisell2.text.sku.detail.modal.gst.incl") : import_utils.locales.getText("pisell2.text.sku.detail.modal.gst.excl"), "）")), /* @__PURE__ */ import_react.default.createElement("div", null, totalText))))
+      )), note && /* @__PURE__ */ import_react.default.createElement("div", { className: "note-section" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.sku.detail.modal.note")), /* @__PURE__ */ import_react.default.createElement("div", { className: "note-text", onClick: () => setNoteModalOpen(true) }, note))), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-summary-section" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.sku.detail.modal.subtotal")), /* @__PURE__ */ import_react.default.createElement("div", null, subtotalText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.sku.detail.modal.discount"), discountsCount > 0 && /* @__PURE__ */ import_react.default.createElement("span", { className: "price-item-danger" }, " (", discountsCount, ")")), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item-danger" }, discountsCount > 0 ? "-" : "", symbol, totalDiscounts)), priceOverride !== null && typeof priceOverride !== "undefined" && /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item" }, /* @__PURE__ */ import_react.default.createElement("div", { onClick: handleManualPriceChange }, import_utils.locales.getText(
+        "pisell2.text.sku.detail.modal.manual.price.change"
+      ), /* @__PURE__ */ import_react.default.createElement("span", { className: "price-item-override" }, priceOverrideText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item-danger" }, priceChangeText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "price-item-total" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.text.sku.detail.modal.total"), /* @__PURE__ */ import_react.default.createElement("span", { className: "price-item-total-gst" }, "（", (productData == null ? void 0 : productData.is_charge_tax) ? import_utils.locales.getText("pisell2.text.sku.detail.modal.gst.incl") : import_utils.locales.getText("pisell2.text.sku.detail.modal.gst.excl"), "）")), /* @__PURE__ */ import_react.default.createElement("div", null, totalText))))
     );
   };
   if (!productData) return null;
   const rightContent = () => {
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content" }, currentStep === 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content-detail" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content-detail-title" }, (productData == null ? void 0 : productData.title) || ""), /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content-detail-description" }, (productData == null ? void 0 : productData.subtitle) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content-detail-subtitle" }, productData.subtitle) : null, (productData == null ? void 0 : productData.description) ? /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content" }, currentStep === 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content-detail" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content-detail-description" }, (productData == null ? void 0 : productData.subtitle) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content-detail-subtitle" }, productData.subtitle) : null, (productData == null ? void 0 : productData.description) ? /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "sku-detail-right-content-detail-description-html",
@@ -508,7 +517,7 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
           __html: productData.description
         }
       }
-    ) : null)), currentStep === 1 && hasSkuOptions && /* @__PURE__ */ import_react.default.createElement(
+    ) : null, (productData == null ? void 0 : productData.description) === "" && !hasSkuOptions && /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-right-content-detail-placeholder" }, /* @__PURE__ */ import_react.default.createElement("img", { width: 300, height: 300, src: "https://static.pisellcdn.com/sku_empty.png", alt: "placeholder" }), /* @__PURE__ */ import_react.default.createElement("p", null, "No additional options for this item")))), currentStep === 1 && hasSkuOptions && /* @__PURE__ */ import_react.default.createElement(
       import_skuOptionsSelection.default,
       {
         ref: skuOptionsSelectionRef,
@@ -522,6 +531,9 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
             lineClamp: 1
           }
         },
+        customConfig: {
+          modalWidth: "680px"
+        },
         onChange: (v) => {
           console.log("SKUOptionsSelectionOnChange", v);
           setSkuValue(v);
@@ -562,7 +574,7 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
       onCancel: handleCancel,
       closable: false,
       destroyOnClose: true,
-      width: 880,
+      width: "80%",
       className: "pisell-sku-detail-modal"
     },
     /* @__PURE__ */ import_react.default.createElement(
@@ -572,8 +584,12 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
         className: "pisell-sku-procedure",
         mode: "modal",
         defaultCurrent: currentStep,
+        layoutMode: "ratio",
         onStepsChange: (result) => {
-          const nextStep = Math.min(Number(result.currentStep || 0), maxStepIndex);
+          const nextStep = Math.min(
+            Number(result.currentStep || 0),
+            maxStepIndex
+          );
           setCurrentStep(nextStep);
         },
         headerProps: {
@@ -602,16 +618,13 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
           position: "fixed-bottom",
           style: { height: "72px !important" },
           leftSlot: /* @__PURE__ */ import_react.default.createElement("div", { className: "quantity-section" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "quantity-section-title" }, import_utils.locales.getText("pisell2.text.sku.detail.modal.quantity")), /* @__PURE__ */ import_react.default.createElement(
-            import_pisellNumberSelector.default,
+            import_NumericStepper.default,
             {
+              variant: "capsule",
               value: quantity,
-              width: "120px",
               onChange: handleQuantityChange,
               min: 1,
-              max: 99999,
-              step: 1,
-              size: "middle",
-              enablePriceAdjust: true
+              max: 99999
             }
           )),
           actions: /* @__PURE__ */ import_react.default.createElement("div", { className: "sku-detail-content-footer" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "modal-actions" }, isCreateMode ? /* @__PURE__ */ import_react.default.createElement(
@@ -633,7 +646,9 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
               className: "sku-detail-content-footer-remove-btn",
               onClick: handleRemove
             },
-            import_utils.locales.getText("pisell2.text.sku.detail.modal.btn.remove")
+            import_utils.locales.getText(
+              "pisell2.text.sku.detail.modal.btn.remove"
+            )
           ), /* @__PURE__ */ import_react.default.createElement(
             import_materials.Button,
             {
@@ -653,7 +668,11 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
               onClick: handleConfirm,
               className: "sku-detail-content-footer-confirm-btn"
             },
-            currentStep === 0 && hasSkuOptions ? /* @__PURE__ */ import_react.default.createElement("span", { className: "sku-detail-content-footer-confirm-btn-text" }, import_utils.locales.getText("pisell2.text.sku.detail.modal.btn.next")) : /* @__PURE__ */ import_react.default.createElement("span", { className: "sku-detail-content-footer-confirm-btn-text" }, import_utils.locales.getText("pisell2.text.sku.detail.modal.btn.confirm"))
+            currentStep === 0 && hasSkuOptions ? /* @__PURE__ */ import_react.default.createElement("span", { className: "sku-detail-content-footer-confirm-btn-text" }, import_utils.locales.getText(
+              "pisell2.text.sku.detail.modal.btn.next"
+            )) : /* @__PURE__ */ import_react.default.createElement("span", { className: "sku-detail-content-footer-confirm-btn-text" }, import_utils.locales.getText(
+              "pisell2.text.sku.detail.modal.btn.confirm"
+            ))
           )))
         }
       }
@@ -677,10 +696,10 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
           onCancel: () => setShowPriceAdjustModal(false)
         },
         enableExceedMaxAmount: true,
-        originalValue: displayUnitPrice || 0,
+        originalValue: subtotal.toNumber() || 0,
         defaultValue: displayUnitPrice || 0,
         onEnter: (discountAmount) => {
-          const nextUnitPrice = new import_decimal.default(displayUnitPrice || 0).minus(discountAmount).toNumber();
+          const nextUnitPrice = subtotal.minus(discountAmount).toNumber();
           handlePriceAdjustConfirm(nextUnitPrice);
         },
         selectType: "dark"
@@ -691,13 +710,35 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
     {
       platform: "pc",
       open: stockAlertOpen,
-      title: import_utils.locales.getText("pisell2.text.sku.detail.modal.stock.alert.title"),
+      title: import_utils.locales.getText(
+        "pisell2.text.sku.detail.modal.stock.alert.title"
+      ),
       headerDivider: false,
-      footer: /* @__PURE__ */ import_react.default.createElement("div", { style: { width: "100%", display: "flex", justifyContent: "flex-end", gap: 12 } }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", onClick: handleStockAlertCancel }, import_utils.locales.getText(
-        "pisell2.text.sku.detail.modal.stock.alert.btn.cancel"
-      )), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { type: "primary", size: "large", onClick: handleStockAlertContinue }, import_utils.locales.getText(
-        "pisell2.text.sku.detail.modal.stock.alert.btn.continue"
-      ))),
+      footer: /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          style: {
+            width: "100%",
+            display: "flex",
+            justifyContent: "flex-end",
+            gap: 12
+          }
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", onClick: handleStockAlertCancel }, import_utils.locales.getText(
+          "pisell2.text.sku.detail.modal.stock.alert.btn.cancel"
+        )),
+        /* @__PURE__ */ import_react.default.createElement(
+          import_materials.Button,
+          {
+            type: "primary",
+            size: "large",
+            onClick: handleStockAlertContinue
+          },
+          import_utils.locales.getText(
+            "pisell2.text.sku.detail.modal.stock.alert.btn.continue"
+          )
+        )
+      ),
       width: 520,
       centered: true,
       destroyOnClose: true,
@@ -764,28 +805,36 @@ function getSelectedUnitPrice(params) {
   var _a, _b;
   const { productData, skuValue } = params;
   if (!productData) return 0;
-  let price = new import_decimal.default((productData == null ? void 0 : productData.base_price) ?? ((_a = productData == null ? void 0 : productData._extend) == null ? void 0 : _a.price) ?? 0);
+  let price = new import_decimal.default(
+    (productData == null ? void 0 : productData.base_price) ?? ((_a = productData == null ? void 0 : productData._extend) == null ? void 0 : _a.price) ?? 0
+  );
   if (skuValue == null ? void 0 : skuValue.product_variant_id) {
     const variantItem = (_b = productData == null ? void 0 : productData.variant) == null ? void 0 : _b.find(
       (item) => Number(item == null ? void 0 : item.id) === Number(skuValue.product_variant_id)
     );
     if (variantItem) {
-      price = new import_decimal.default((variantItem == null ? void 0 : variantItem.price) ?? (variantItem == null ? void 0 : variantItem.base_price) ?? 0);
+      price = new import_decimal.default((variantItem == null ? void 0 : variantItem.base_price) ?? (variantItem == null ? void 0 : variantItem.original_price) ?? 0);
     }
   }
   if (Array.isArray(skuValue == null ? void 0 : skuValue.bundle) && skuValue.bundle.length > 0) {
-    price = skuValue.bundle.reduce((accumulator, currentValue) => {
-      const currentPrice = new import_decimal.default((currentValue == null ? void 0 : currentValue.price) || 0);
-      const currentNum = new import_decimal.default((currentValue == null ? void 0 : currentValue.num) || 0);
-      return accumulator.add(currentPrice.mul(currentNum));
-    }, price);
+    price = skuValue.bundle.reduce(
+      (accumulator, currentValue) => {
+        const currentPrice = new import_decimal.default((currentValue == null ? void 0 : currentValue.original_price) ?? (currentValue == null ? void 0 : currentValue.price) ?? 0);
+        const currentNum = new import_decimal.default((currentValue == null ? void 0 : currentValue.num) || 0);
+        return accumulator.add(currentPrice.mul(currentNum));
+      },
+      price
+    );
   }
   if (Array.isArray(skuValue == null ? void 0 : skuValue.option) && skuValue.option.length > 0) {
-    price = skuValue.option.reduce((accumulator, currentValue) => {
-      const currentPrice = new import_decimal.default((currentValue == null ? void 0 : currentValue.price) || 0);
-      const currentNum = new import_decimal.default((currentValue == null ? void 0 : currentValue.num) || 0);
-      return accumulator.add(currentPrice.mul(currentNum));
-    }, price);
+    price = skuValue.option.reduce(
+      (accumulator, currentValue) => {
+        const currentPrice = new import_decimal.default((currentValue == null ? void 0 : currentValue.original_price) ?? (currentValue == null ? void 0 : currentValue.price) ?? 0);
+        const currentNum = new import_decimal.default((currentValue == null ? void 0 : currentValue.num) || 0);
+        return accumulator.add(currentPrice.mul(currentNum));
+      },
+      price
+    );
   }
   return price.toNumber();
 }
@@ -793,6 +842,7 @@ function getOtherFromSkuValue(params) {
   var _a;
   const { productData, skuValue } = params;
   const other = {
+    ...skuValue || {},
     product_variant_id: (skuValue == null ? void 0 : skuValue.product_variant_id) || 0,
     bundle: (skuValue == null ? void 0 : skuValue.bundle) || [],
     option: (skuValue == null ? void 0 : skuValue.option) || []

package/lib/pro/skuDetailModal/index.less

@@ -3,16 +3,43 @@
    * 固定弹窗高度，确保内部滚动容器有“可计算的最大高度”
    * 否则内容会把 modal 撑开，overflow-y: auto 无法生效（看起来就“滚不动”）
    */
-  height: 684px;
+  height: 884px;
+  width: 80%!important;
 
   // PisellModal（PC）内容容器：固定高度，内部 body 使用 flex 占满剩余空间
   .pisell-lowcode-modal-content {
-    height: 684px;
-    max-height: 684px!important;
+    width: 100% !important;
+    height: 884px;
+    max-height: 884px!important;
+  }
+
+  /**
+   * @description 矮屏设备适配（例如 1366×763）
+   * - 当屏幕高度本身低于 884px 时，整体弹窗高度下调，避免弹窗显示不全
+   * - 同步调整右侧滚动容器最大高度，确保滚动区域可用
+   */
+  @media screen and (max-height: 883px) {
+    height: 720px;
+
+    .pisell-lowcode-modal-content {
+      height: 720px;
+      max-height: 720px !important;
+    }
+
+    .sku-detail-right-content {
+      /**
+       * @description
+       * 同文件下方存在 `.sku-detail-right-content { max-height: 730px; }`
+       * 且位置更靠后（同等优先级会覆盖本规则）。
+       * 这里加 `!important` 确保矮屏媒体查询命中时右侧滚动容器高度能够正确收缩。
+       */
+      max-height: 566px !important;
+    }
   }
 
   // SkuDetailModal 内部使用自定义滚动容器（右侧内容区），避免整块 modal body 滚动
   .pisell-lowcode-modal-body {
+    width: 100% !important;
     overflow: hidden !important;
     min-height: 0;
   }
@@ -37,7 +64,7 @@
     flex: 1;
     min-height: 0;
     overflow-y: auto;
-    max-height: 530px;
+    max-height: 730px;
     /**
      * @description
      * 让滚动条不要贴着内容（尤其是 macOS overlay scrollbar 会覆盖内容）
@@ -427,3 +454,18 @@
   position: relative;
   z-index: 10000; // 确保键盘在遮罩之上
 }
+
+.sku-detail-right-content-detail-placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  color: #667085;
+
+  p {
+    margin: 0;
+    text-align: center;
+    font-size: 16px;
+  }
+}