@pisell/private-materials 6.8.86 → 6.8.88

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

@@ -300,7 +300,8 @@ var PaymentKeyboardBase = function PaymentKeyboardBase(props) {
         padding: 16
       },
       bottomContent: renderBottomContent(),
-      preventBlurElements: [uniqueKeyboardId]
+      preventBlurElements: [uniqueKeyboardId],
+      selected: firstInputStatus.payment && !!internalPaymentValue
     });
   };
   var renderSurchargeDisplay = function renderSurchargeDisplay() {
@@ -327,7 +328,8 @@ var PaymentKeyboardBase = function PaymentKeyboardBase(props) {
       onFocus: function onFocus() {
         return setFocusedInput(KEYS.PERCENT);
       },
-      preventBlurElements: [uniqueKeyboardId]
+      preventBlurElements: [uniqueKeyboardId],
+      selected: firstInputStatus.percent && !!(internalSurchargeValue !== null && internalSurchargeValue !== void 0 && internalSurchargeValue.percent) && focusedInput !== KEYS.FIXED
     }), /*#__PURE__*/React.createElement("div", {
       style: {
         color: '#667085',
@@ -349,7 +351,8 @@ var PaymentKeyboardBase = function PaymentKeyboardBase(props) {
       onFocus: function onFocus() {
         return setFocusedInput(KEYS.FIXED);
       },
-      preventBlurElements: [uniqueKeyboardId]
+      preventBlurElements: [uniqueKeyboardId],
+      selected: firstInputStatus.fixed && !!(internalSurchargeValue !== null && internalSurchargeValue !== void 0 && internalSurchargeValue.fixed) && focusedInput === KEYS.FIXED
     }));
   };
   var customDisplay = function customDisplay() {

package/es/pro/skuDetailModal/index.js

@@ -20,7 +20,7 @@ import { locales } from '@pisell/utils';
 import Delete_wght300_24px from '@pisell/icon/es/Delete_wght300_24px';
 import localeTexts from "./locales";
 import "./index.less";
-import PisellNumberSelector from "../pisellNumberSelector";
+import NumericStepper from "../NumericStepper";
 import NoteModal from "../../plus/noteModal";
 import useEngineContext from "../../hooks/useEngineContext";
 import { DiscountKeyboard } from "../priceKeyboard";
@@ -832,13 +832,14 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
     onCancel: handleCancel,
     closable: false,
     destroyOnClose: true,
-    width: 880,
+    width: "80%",
     className: "pisell-sku-detail-modal"
   }, /*#__PURE__*/React.createElement(PisellProcedure, {
     ref: procedureRef,
     className: "pisell-sku-procedure",
     mode: "modal",
     defaultCurrent: currentStep,
+    layoutMode: "ratio",
     onStepsChange: function onStepsChange(result) {
       // 动态 steps 情况下，保护 currentStep 不越界
       var nextStep = Math.min(Number(result.currentStep || 0), maxStepIndex);
@@ -875,15 +876,12 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
         className: "quantity-section"
       }, /*#__PURE__*/React.createElement("div", {
         className: "quantity-section-title"
-      }, locales.getText('pisell2.text.sku.detail.modal.quantity')), /*#__PURE__*/React.createElement(PisellNumberSelector, {
+      }, locales.getText('pisell2.text.sku.detail.modal.quantity')), /*#__PURE__*/React.createElement(NumericStepper, {
+        variant: "capsule",
         value: quantity,
-        width: "120px",
         onChange: handleQuantityChange,
         min: 1,
-        max: 99999,
-        step: 1,
-        size: "middle",
-        enablePriceAdjust: true
+        max: 99999
       })),
       actions: /*#__PURE__*/React.createElement("div", {
         className: "sku-detail-content-footer"

package/es/pro/skuDetailModal/index.less

@@ -3,12 +3,12 @@
    * 固定弹窗高度，确保内部滚动容器有“可计算的最大高度”
    * 否则内容会把 modal 撑开，overflow-y: auto 无法生效（看起来就“滚不动”）
    */
-  height: 684px;
+  height: 884px;
 
   // PisellModal（PC）内容容器：固定高度，内部 body 使用 flex 占满剩余空间
   .pisell-lowcode-modal-content {
-    height: 684px;
-    max-height: 684px!important;
+    height: 884px;
+    max-height: 884px!important;
   }
 
   // SkuDetailModal 内部使用自定义滚动容器（右侧内容区），避免整块 modal body 滚动
@@ -37,7 +37,7 @@
     flex: 1;
     min-height: 0;
     overflow-y: auto;
-    max-height: 530px;
+    max-height: 730px;
     /**
      * @description
      * 让滚动条不要贴着内容（尤其是 macOS overlay scrollbar 会覆盖内容）

package/lib/components/booking/components/customiseItemModal/index.js

@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
-var import_pisellNumberSelector = __toESM(require("../../../../pro/pisellNumberSelector"));
+var import_NumericStepper = __toESM(require("../../../../pro/NumericStepper"));
 var import_pisellPriceKeyboardModal = __toESM(require("../../../../pro/pisellPriceKeyboardModal"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
@@ -244,8 +244,9 @@ var CustomiseItemModal = ({
       },
       import_utils.locales.getText("pisell2.customise-item.save")
     )))), /* @__PURE__ */ import_react.default.createElement("div", { className: "customise-item-quantity-selector-fixed" }, /* @__PURE__ */ import_react.default.createElement(
-      import_pisellNumberSelector.default,
+      import_NumericStepper.default,
       {
+        variant: "capsule",
         value: quantity,
         min: 1,
         max: 999,
@@ -257,9 +258,7 @@ var CustomiseItemModal = ({
           } else {
             setQuantity(value);
           }
-        },
-        size: "middle",
-        enablePriceAdjust: true
+        }
       }
     ))),
     /* @__PURE__ */ import_react.default.createElement(

package/lib/components/booking/deposit/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/lib/components/booking/info/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/lib/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/booking/utils.d.ts

@@ -173,10 +173,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "fail" | "page" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/app.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { PosProps, RouteType } from './const';
-declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
+declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "mode" | "type" | "getApi"> & {
     action: RouteType;
     device_number: string | number;
     api: ReturnType<PosProps['getApi']>;

package/lib/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "fail" | "page" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/hooks.d.ts

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "fail" | "init" | "warn" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

package/lib/components/eftposPay/store/index.d.ts

@@ -178,7 +178,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "fail" | "warn" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -299,10 +299,10 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | "huifu" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -312,7 +312,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "fail" | "init" | "warn" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/ticketBooking/components/addServiceVariant/addService.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter';
 import './index.less';
 interface AddServiceProps {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
 import './index.less';
 interface TicketBookingProps {

package/lib/components/ticketBooking/utils/index.d.ts

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "wallet" | "walletPass" | "product" | "customer" | "local_product";
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Capacity/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Capacity: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default Capacity;

package/lib/plus/productSelect/ProductCard/SkuCard/components/CardMask/index.d.ts

@@ -3,5 +3,5 @@ import { SkuStatusOverlayConfig } from '../../type';
 import './index.less';
 declare const CardMask: ({ props }: {
     props: SkuStatusOverlayConfig;
-}) => string | number | true | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default CardMask;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Countdown/index.d.ts

@@ -3,5 +3,5 @@ import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const Countdown: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default Countdown;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Duration/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Duration: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default Duration;

package/lib/plus/productSelect/ProductCard/SkuCard/components/MemberPrice/index.d.ts

@@ -3,5 +3,5 @@ import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const MemberPrice: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default MemberPrice;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Resource/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Resource: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default Resource;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Stock/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Stock: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default Stock;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Time/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Time: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default Time;

package/lib/plus/saasLogin/utils.d.ts

@@ -5,13 +5,13 @@ export declare const mergeData: (locales: any, props: SaasLoginProps) => {
         width?: number | undefined;
         height?: number | undefined;
     };
-    logoPosition: "center" | "left" | "right";
+    logoPosition: "left" | "right" | "center";
     welcomeMessage: any;
-    welcomeMessageAlign: "center" | "left" | "right";
+    welcomeMessageAlign: "left" | "right" | "center";
     title: any;
-    titleAlign: "center" | "left" | "right";
+    titleAlign: "left" | "right" | "center";
     subtitle: any;
-    subtitleAlign: "center" | "left" | "right";
+    subtitleAlign: "left" | "right" | "center";
     emailLabel: any;
     emailPlaceholder: any;
     passwordLabel: any;
@@ -19,7 +19,7 @@ export declare const mergeData: (locales: any, props: SaasLoginProps) => {
     buttonText: any;
     registerText: any;
     registerLinkText: any;
-    registerAlign: "center" | "left" | "right";
+    registerAlign: "left" | "right" | "center";
     showLogo?: boolean | undefined;
     showWelcomeMessage?: boolean | undefined;
     showTitle?: boolean | undefined;

package/lib/plus/skuOptionsSelection/components/OptionsCard/OptionItemCard.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const OptionItemCard: (props: any) => JSX.Element;
 export default OptionItemCard;

package/lib/plus/skuOptionsSelection/components/OptionsModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface OptionsModalProps {
     parentDataSource: any;
     dataSource: any;

package/lib/plus/skuOptionsSelection/components/VariantCard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const VariantCard: (props: any) => JSX.Element;
 export default VariantCard;

package/lib/plus/skuOptionsSelection/utils/transformBundleGroup.js

@@ -76,6 +76,11 @@ var transformBundleGroup = (bundleGroup) => {
         autoValidate: true,
         required: Number(item == null ? void 0 : item.min_quantity) > 0 ? true : false
       },
+      layout: {
+        type: "antdGrid",
+        columns: 2,
+        gutter: [16, 16]
+      },
       headerProps: {
         renderExtra: (props) => {
           return /* @__PURE__ */ import_react.default.createElement(import_TitleExtra.default, { ...props || {} });
@@ -83,6 +88,11 @@ var transformBundleGroup = (bundleGroup) => {
       },
       stepperProps: {
         horizontalPadding: "8px"
+      },
+      layout: {
+        type: "antdGrid",
+        columns: 2,
+        gutter: [16, 16]
       }
     };
     selectorDataSource.renderItem = (itemProps) => {

package/lib/plus/skuOptionsSelection/utils/transformOptionGroup.js

@@ -58,6 +58,11 @@ var transformOptionGroup = (optionGroup) => {
             max: optionItem == null ? void 0 : optionItem.max_quantity,
             autoValidate: true
           },
+          layout: {
+            type: "antdGrid",
+            columns: 2,
+            gutter: [16, 16]
+          },
           _extra: {
             canSell,
             hasStock
@@ -92,6 +97,11 @@ var transformOptionGroup = (optionGroup) => {
       },
       stepperProps: {
         horizontalPadding: "8px"
+      },
+      layout: {
+        type: "antdGrid",
+        columns: 2,
+        gutter: [16, 16]
       }
     };
     selectorDataSource.renderItem = (itemProps) => {

package/lib/plus/skuOptionsSelection/utils/transformValueToSelectorValue.js

@@ -170,6 +170,7 @@ var createBundleValue = (v, dataSource) => {
       });
       _createdValue.data._data = _data;
     }
+    _createdValue.data.num = (v1 == null ? void 0 : v1.num) || 1;
     _createdValue.quantity = (_createdValue.quantity || 0) + ((v1 == null ? void 0 : v1.quantity) || 0);
     const _pricePrefix = (findedBundleItem == null ? void 0 : findedBundleItem.price_type) === "markdown" ? -1 : 1;
     _createdValue.totalPrice = new import_decimal.default(_createdValue.totalPrice || 0).plus(

package/lib/plus/skuOptionsSelection/utils/transformVariantGroup.js

@@ -61,6 +61,11 @@ var transformVariantGroup = (variantGroup) => {
           ruleConfig: {
             autoValidate: true
           },
+          layout: {
+            type: "antdGrid",
+            columns: 2,
+            gutter: [16, 16]
+          },
           _extra: {
             canSell,
             hasStock
@@ -93,6 +98,11 @@ var transformVariantGroup = (variantGroup) => {
       },
       stepperProps: {
         horizontalPadding: "8px"
+      },
+      layout: {
+        type: "antdGrid",
+        columns: 2,
+        gutter: [16, 16]
       }
     };
     selectorDataSource.renderItem = (itemProps) => {

package/lib/plus/walletEditor/components/ImageUpload/index.d.ts

@@ -3,6 +3,6 @@ export interface ImageUploadProps {
     value?: string;
     onChange?: (val: string) => void;
 }
-export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
 declare const ImageUpload: React.FC<ImageUploadProps>;
 export default ImageUpload;

package/lib/pro/NumericStepper/index.d.ts

@@ -7,6 +7,12 @@ declare global {
         }
     }
 }
+/**
+ * 样式变体类型
+ * - separated: 分离式，按钮独立显示（默认）
+ * - capsule: 胶囊式，按钮和数字在一个圆角容器内
+ */
+export declare type NumericStepperVariant = 'separated' | 'capsule';
 export interface NumericStepperProps {
     /** 当前值 */
     value?: number;
@@ -31,12 +37,26 @@ export interface NumericStepperProps {
     horizontalPadding?: number | string;
     /** 尺寸 */
     size?: 'small' | 'middle' | 'large';
-    /** 按钮形状 */
+    /** 按钮形状（仅在 variant='separated' 时生效） */
     shape?: 'round' | 'square';
     /** 减号按钮的自定义内容 */
     minusIcon?: React.ReactNode;
     /** 加号按钮的自定义内容 */
     plusIcon?: React.ReactNode;
+    /**
+     * 样式变体
+     * - separated: 分离式，按钮独立显示（默认）
+     * - capsule: 胶囊式，按钮和数字在一个圆角容器内
+     * @default 'separated'
+     */
+    variant?: NumericStepperVariant;
+    /**
+     * 是否启用输入功能（点击数字弹出键盘）
+     * - 开启时：展示区域 cursor 为 pointer，点击弹出键盘
+     * - 关闭后：展示区域无边框，点击不会弹出键盘
+     * @default true
+     */
+    enableInput?: boolean;
 }
 declare const NumericStepper: React.FC<NumericStepperProps>;
 export default NumericStepper;