@pisell/private-materials 6.3.62 → 6.3.64

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

@@ -18,5 +18,5 @@ interface SubTotalProps extends React.HTMLAttributes<HTMLDivElement> {
     mode?: 'column1' | 'column2';
     describe?: string;
 }
-declare const SubTotal: (props: SubTotalProps) => React.JSX.Element;
+declare const SubTotal: (props: SubTotalProps) => JSX.Element;
 export default SubTotal;

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

@@ -1,5 +1,4 @@
 import { SelectProps } from "antd";
-import React from "react";
 import "./index.less";
 interface TaxSelectProps {
     selectProps?: SelectProps;
@@ -8,5 +7,5 @@ interface TaxSelectProps {
     tax_title?: string;
     onChange: (value: string) => void;
 }
-declare const TaxSelect: (props: TaxSelectProps) => React.JSX.Element;
+declare const TaxSelect: (props: TaxSelectProps) => JSX.Element;
 export default TaxSelect;

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 interface AddServiceProps {
     onEdit?: any;
@@ -6,5 +5,5 @@ interface AddServiceProps {
     state?: any;
     renderMode?: 'current' | 'drawer';
 }
-declare const AddSerivce: (props: AddServiceProps) => React.JSX.Element | null;
+declare const AddSerivce: (props: AddServiceProps) => JSX.Element | null;
 export default AddSerivce;

package/es/components/ticketBooking/components/addServiceVariant/index.d.ts

@@ -1,7 +1,7 @@
-import React from 'react';
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const AddServiceVariant: (props: AddServiceVariantProps) => React.JSX.Element;
+declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
 export default AddServiceVariant;

package/es/components/ticketBooking/components/menuBar/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const index: () => React.JSX.Element;
+declare const index: () => JSX.Element;
 export default index;

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

@@ -1,5 +1,4 @@
-import React from 'react';
 import './index.less';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;
-declare const TicketBooking: () => React.JSX.Element;
+declare const TicketBooking: () => JSX.Element;
 export default TicketBooking;

package/es/components/ticketBooking/components/timeBar/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import type { Dayjs } from 'dayjs';
 import './index.less';
 interface ITimeBarProps {
@@ -9,5 +8,5 @@ interface ITimeBarProps {
     setIntervalTime: (value: boolean) => void;
     locale: string;
 }
-declare const TimeBar: (props: ITimeBarProps) => React.JSX.Element;
+declare const TimeBar: (props: ITimeBarProps) => JSX.Element;
 export default TimeBar;

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

@@ -1,8 +1,7 @@
-import React from 'react';
 import './index.less';
 interface TicketBookingProps {
     productExtensionType: string[];
     bookingConfigParams: Record<string, any>;
 }
-declare const _default: (props: TicketBookingProps) => React.JSX.Element;
+declare const _default: (props: TicketBookingProps) => JSX.Element;
 export default _default;

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const WalletList: (props: any) => React.JSX.Element;
+declare const WalletList: (props: any) => JSX.Element;
 export default WalletList;

package/es/components/walletList/tempHolderSelector/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import './index.less';
 export declare const getAvatarText: (name: string) => string;
 interface ITempHolderSelectorProps {
@@ -10,5 +10,5 @@ interface ITempHolderSelectorProps {
     onCancel: () => void;
     confirmLoading: boolean;
 }
-export default function TempHolderSelector(props: ITempHolderSelectorProps): React.JSX.Element;
+export default function TempHolderSelector(props: ITempHolderSelectorProps): JSX.Element;
 export {};

package/es/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {
@@ -12,7 +12,7 @@ declare type ModalComponent = typeof OriginModal & {
     success: typeof AntModal.success;
     info: typeof AntModal.info;
 };
-declare const OriginModal: (props: ModalProps) => React.JSX.Element;
+declare const OriginModal: (props: ModalProps) => JSX.Element;
 declare const Modal: ModalComponent;
 export declare type ModalFuncProps = AntModalFuncProps;
 export default Modal;

package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './../../index.less';
-declare const Search: () => React.JSX.Element;
+declare const Search: () => JSX.Element;
 export default Search;

package/es/hooks/usePaymentLogger.d.ts

@@ -15,8 +15,8 @@ interface UsePaymentLoggerOptions {
  */
 declare const usePaymentLogger: (options: UsePaymentLoggerOptions) => {
     logs: import("react").MutableRefObject<LogData[]>;
-    addLog: (this: unknown, logData: LogData) => void;
-    sendLogs: (this: unknown, title?: string | undefined, err?: any) => void;
+    addLog: (logData: LogData) => void;
+    sendLogs: (title?: string, err?: any) => void;
 };
 export default usePaymentLogger;
 export type { LogData, UsePaymentLoggerOptions };

package/es/plus/contactInfoModal/ContactInfoContent.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const ContactInfoContent: (props: any) => React.JSX.Element;
+declare const ContactInfoContent: (props: any) => JSX.Element;
 export default ContactInfoContent;

package/es/plus/productSelect/ProductCard/index.d.ts

@@ -34,7 +34,7 @@ export interface ProductCardProps {
     isSelected?: boolean;
     decorateConfig?: ProductCardConfig;
 }
-export declare const ProductCard: React.MemoExoticComponent<({ item, index, context, onSelect, onSelectCover, onSelectInfo, isSelected, className, decorateConfig, }: ProductCardProps) => React.JSX.Element>;
+export declare const ProductCard: React.MemoExoticComponent<({ item, index, context, onSelect, onSelectCover, onSelectInfo, isSelected, className, decorateConfig, }: ProductCardProps) => JSX.Element>;
 export declare const DefaultItemContent: React.MemoExoticComponent<(props: {
     item: any;
     index: number;
@@ -42,6 +42,6 @@ export declare const DefaultItemContent: React.MemoExoticComponent<(props: {
         onItemIntersectionIn: (item: any) => void;
         onItemIntersectionOut: (item: any) => void;
     } | undefined;
-}) => React.JSX.Element>;
+}) => JSX.Element>;
 export default ProductCard;
 export { ProductCardSkeleton };

package/es/plus/productSelect/components/pisellPriceText/index.d.ts

@@ -8,5 +8,5 @@ interface IProps {
     prefix?: React.ReactElement;
     suffix?: React.ReactElement;
 }
-declare const index: (props: IProps) => React.JSX.Element;
+declare const index: (props: IProps) => JSX.Element;
 export default index;

package/es/plus/productSelect/index.d.ts

@@ -28,5 +28,5 @@ interface ProductSelectProps {
     hideCategoryWhenOne?: boolean;
 }
 export declare const PREFIX = "pisell-product-select";
-declare const index: ({ dataSource, emptyDescription, showSearch, scrollDom, offsetDom, style, token: customToken, onChange, value, selectedItems, productListSetting, customScrollParent, loading, layout, hideCategoryWhenOne, ...rest }: ProductSelectProps) => React.JSX.Element;
+declare const index: ({ dataSource, emptyDescription, showSearch, scrollDom, offsetDom, style, token: customToken, onChange, value, selectedItems, productListSetting, customScrollParent, loading, layout, hideCategoryWhenOne, ...rest }: ProductSelectProps) => JSX.Element;
 export default index;

package/es/plus/saasCreateOrganization/components/Header.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { SCOProps } from '../types';
 import '../index.less';
-export declare const Header: (props: SCOProps) => React.JSX.Element;
+export declare const Header: (props: SCOProps) => JSX.Element;

package/es/plus/saasCreateOrganization/index.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
 import { SCOProps } from './types';
 import './index.less';
-declare const SaasCreateOrganization: (props: SCOProps) => React.JSX.Element;
+declare const SaasCreateOrganization: (props: SCOProps) => JSX.Element;
 export default SaasCreateOrganization;

package/es/plus/saasRegister/components/EntryEmail.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';
@@ -6,5 +5,5 @@ interface EntryEmailProps extends SRProps {
     form: FormInstance;
     handleVerifyEmail: (bool: boolean) => Promise<void>;
 }
-declare const EntryEmail: (props: EntryEmailProps) => React.JSX.Element;
+declare const EntryEmail: (props: EntryEmailProps) => JSX.Element;
 export default EntryEmail;

package/es/plus/saasRegister/components/EntryInfo.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';
@@ -6,5 +5,5 @@ interface IProps extends SRProps {
     form: FormInstance;
     emailToken?: string;
 }
-declare const EntryInfo: (props: IProps) => React.JSX.Element;
+declare const EntryInfo: (props: IProps) => JSX.Element;
 export default EntryInfo;

package/es/plus/saasRegister/components/GoLogin.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
 import { SRProps } from '../types';
 import '../index.less';
-declare const GoLogin: (props: SRProps) => React.JSX.Element;
+declare const GoLogin: (props: SRProps) => JSX.Element;
 export default GoLogin;

package/es/plus/saasRegister/components/Header.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { SRProps } from '../types';
 import '../index.less';
-export declare const Header: (props: SRProps) => React.JSX.Element;
+export declare const Header: (props: SRProps) => JSX.Element;

package/es/plus/saasRegister/components/VerifyError.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 import { SRStepStatus } from '../types';
 import '../index.less';
 declare const VerifyError: (props: {
     status?: SRStepStatus;
     onBackToRegister?: () => void;
     onGoLogin?: () => void;
-}) => React.JSX.Element | null;
+}) => JSX.Element | null;
 export default VerifyError;

package/es/plus/saasRegister/components/VerifyingLink.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
 import '../index.less';
 declare const VerifyingEmailLink: (props: {
     onVerifyLink: () => Promise<void>;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default VerifyingEmailLink;

package/es/plus/saasRegister/components/VertifyEmail.d.ts

@@ -1,8 +1,7 @@
-import React from 'react';
 import '../index.less';
 declare const VertifyEmail: (props: {
     email: string;
     onSendEmail: () => Promise<void>;
     onEditEmail: () => void;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default VertifyEmail;

package/es/plus/selectHolder/components/ErrorTip/index.d.ts

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

package/es/plus/skuOptionsSelection/components/NormalCard/index.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
+/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 declare const NormalCard: (props: RenderItemProps & {
     parentDataSource: any;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default NormalCard;

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

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

package/es/plus/skuOptionsSelection/components/OptionsCard/index.d.ts

@@ -1,10 +1,10 @@
 /**
  * 单规格商品卡片，点击后需要拉起弹窗展示具体的规格信息
  */
-import React from 'react';
 import { RenderItemProps } from '../../../../pro/Selector/types';
 import './index.less';
 declare const OptionsCard: (props: RenderItemProps & {
     parentDataSource: any;
-}) => React.JSX.Element;
+    mode: 'single' | 'multiple';
+}) => JSX.Element;
 export default OptionsCard;

package/es/plus/skuOptionsSelection/components/OptionsCard/index.js

@@ -24,7 +24,7 @@ import OptionsModal from "../OptionsModal";
 import OptionItemCard from "./OptionItemCard";
 import "./index.less";
 var OptionsCard = function OptionsCard(props) {
-  var _props$dataSource, _props$parentDataSour2, _props$optionItemValu2, _props$dataSource3, _props$optionItemValu4, _props$optionItemValu6, _props$dataSource5;
+  var _props$dataSource, _props$parentDataSour2, _props$optionItemValu2, _props$dataSource3, _props$optionItemValu4;
   var _ref = (props === null || props === void 0 ? void 0 : props.dataSource) || {},
     uniqueKey = _ref._key,
     selected = _ref.selected,
@@ -57,33 +57,46 @@ var OptionsCard = function OptionsCard(props) {
     setModalValue = _useState6[1];
   // 当前编辑的key
   var currentEditIndexRef = useRef(-1);
+  var _useState7 = useState(-1),
+    _useState8 = _slicedToArray(_useState7, 2),
+    currentEditIndex = _useState8[0],
+    setCurrentEditIndex = _useState8[1];
   var _indicator = /*#__PURE__*/React.cloneElement(props === null || props === void 0 ? void 0 : props.indicator);
 
   // 根据当前Selector已选择了多少选项计算剩余可选数量
-  // 从props?.values中获取所有的选项的quantity然后相加，再用props?.parentDataSource?.max_quantity减去
-  var remainingCount = useMemo(function () {
-    var _props$parentDataSour, _props$values;
-    var _max = (props === null || props === void 0 || (_props$parentDataSour = props.parentDataSource) === null || _props$parentDataSour === void 0 || (_props$parentDataSour = _props$parentDataSour.ruleConfig) === null || _props$parentDataSour === void 0 ? void 0 : _props$parentDataSour.max) || 0;
-    if (_max <= 0) return 0;
-    return _max - ((props === null || props === void 0 || (_props$values = props.values) === null || _props$values === void 0 ? void 0 : _props$values.reduce(function (sum, i) {
+  // 全局最大值 - 所有已选项的数量总和
+  var selectorRemainingCount = useMemo(function () {
+    var _props$parentDataSour;
+    var globalMax = (props === null || props === void 0 || (_props$parentDataSour = props.parentDataSource) === null || _props$parentDataSour === void 0 || (_props$parentDataSour = _props$parentDataSour.ruleConfig) === null || _props$parentDataSour === void 0 ? void 0 : _props$parentDataSour.max) || 0;
+    if (globalMax <= 0) return Infinity; // 无限制
+
+    var values = Array.isArray(props === null || props === void 0 ? void 0 : props.values) ? props === null || props === void 0 ? void 0 : props.values : [props === null || props === void 0 ? void 0 : props.values];
+    var totalSelected = values.reduce(function (sum, i) {
       return sum + ((i === null || i === void 0 ? void 0 : i.quantity) || 0);
-    }, 0)) || 0);
+    }, 0) || 0;
+    return Math.max(0, globalMax - totalSelected);
   }, [props === null || props === void 0 || (_props$parentDataSour2 = props.parentDataSource) === null || _props$parentDataSour2 === void 0 || (_props$parentDataSour2 = _props$parentDataSour2.ruleConfig) === null || _props$parentDataSour2 === void 0 ? void 0 : _props$parentDataSour2.max, props === null || props === void 0 ? void 0 : props.values]);
 
-  // 当前选项剩余可选数量
-  var currentOptionRemainingCount = useMemo(function () {
+  // 当前选项剩余可选数量 = min(全局剩余, 选项自己的剩余)
+  var optionRemainingCount = useMemo(function () {
     var _props$optionItemValu, _props$dataSource2;
-    if (remainingCount <= 0) return 0;
-    var _quantity = (props === null || props === void 0 || (_props$optionItemValu = props.optionItemValue) === null || _props$optionItemValu === void 0 ? void 0 : _props$optionItemValu.quantity) || 0;
-    if (_quantity >= remainingCount) {
-      return 0;
-    }
-    var _max = (props === null || props === void 0 || (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 || (_props$dataSource2 = _props$dataSource2.ruleConfig) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.max) || 0;
-    if (_max > 0 && _quantity >= _max) {
-      return 0;
+    var currentQuantity = (props === null || props === void 0 || (_props$optionItemValu = props.optionItemValue) === null || _props$optionItemValu === void 0 ? void 0 : _props$optionItemValu.quantity) || 0;
+    var optionMax = (props === null || props === void 0 || (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 || (_props$dataSource2 = _props$dataSource2.ruleConfig) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.max) || 0;
+
+    // 选项自己的剩余数量（0表示无限制）
+    var optionRemaining = optionMax > 0 ? optionMax - currentQuantity : Infinity;
+
+    // 取Selector剩余和当前选项剩余的最小值
+    return Math.max(0, Math.min(selectorRemainingCount, optionRemaining));
+  }, [props === null || props === void 0 || (_props$optionItemValu2 = props.optionItemValue) === null || _props$optionItemValu2 === void 0 ? void 0 : _props$optionItemValu2.quantity, selectorRemainingCount, props === null || props === void 0 || (_props$dataSource3 = props.dataSource) === null || _props$dataSource3 === void 0 || (_props$dataSource3 = _props$dataSource3.ruleConfig) === null || _props$dataSource3 === void 0 ? void 0 : _props$dataSource3.max]);
+
+  // 弹窗剩余可选数量：如果是单选场景下，新增数据时，optionRemainingCount在小于等于0时，设置为1，用于单选能能够切换选择
+  var modalRemainingCount = useMemo(function () {
+    if ((props === null || props === void 0 ? void 0 : props.mode) === 'single' && currentEditIndex === -1) {
+      return optionRemainingCount <= 0 ? 1 : optionRemainingCount;
     }
-    return Math.min(remainingCount, _max) - _quantity;
-  }, [props === null || props === void 0 || (_props$optionItemValu2 = props.optionItemValue) === null || _props$optionItemValu2 === void 0 ? void 0 : _props$optionItemValu2.quantity, remainingCount, props === null || props === void 0 || (_props$dataSource3 = props.dataSource) === null || _props$dataSource3 === void 0 || (_props$dataSource3 = _props$dataSource3.ruleConfig) === null || _props$dataSource3 === void 0 ? void 0 : _props$dataSource3.max]);
+    return optionRemainingCount;
+  }, [props === null || props === void 0 ? void 0 : props.mode, optionRemainingCount, currentEditIndex]);
 
   // 价格文本
   var priceText = useMemo(function () {
@@ -101,25 +114,23 @@ var OptionsCard = function OptionsCard(props) {
       setModalDataSource(renderOptionGroup || []);
     }
   };
-
-  // 是否禁用
-  var isDisabled = useMemo(function () {
-    var _props$optionItemValu5, _props$dataSource4;
+  var handleClick = function handleClick() {
     if (disabled) {
-      return true;
-    }
-    var _quantity = (props === null || props === void 0 || (_props$optionItemValu5 = props.optionItemValue) === null || _props$optionItemValu5 === void 0 ? void 0 : _props$optionItemValu5.quantity) || 0;
-    if (_quantity >= remainingCount) {
-      return true;
+      console.log('handleClick_disabled>>>>>', disabled);
+      return;
     }
-    var _max = (props === null || props === void 0 || (_props$dataSource4 = props.dataSource) === null || _props$dataSource4 === void 0 || (_props$dataSource4 = _props$dataSource4.ruleConfig) === null || _props$dataSource4 === void 0 ? void 0 : _props$dataSource4.max) || 0;
-    if (_max > 0 && _quantity >= _max) {
-      return true;
+    var needShowToast = false;
+    // 如果是单选场景下，如果剩余可选量小于等于0，但是点击的不是已选中选项，则不禁止用户点击，用于单选能能够切换选择
+    if (optionRemainingCount <= 0) {
+      if ((props === null || props === void 0 ? void 0 : props.mode) === 'single' && !selected) {
+        needShowToast = false;
+      } else {
+        needShowToast = true;
+      }
+    } else {
+      needShowToast = false;
     }
-    return false;
-  }, [disabled, props === null || props === void 0 || (_props$optionItemValu6 = props.optionItemValue) === null || _props$optionItemValu6 === void 0 ? void 0 : _props$optionItemValu6.quantity, remainingCount, props === null || props === void 0 || (_props$dataSource5 = props.dataSource) === null || _props$dataSource5 === void 0 || (_props$dataSource5 = _props$dataSource5.ruleConfig) === null || _props$dataSource5 === void 0 ? void 0 : _props$dataSource5.max]);
-  var handleClick = function handleClick() {
-    if (isDisabled) {
+    if (needShowToast) {
       PisellToast({
         content: locales.getText('pisell2.skuOptionsSelection.optionItemCard.overSelected')
       });
@@ -127,14 +138,16 @@ var OptionsCard = function OptionsCard(props) {
     }
     setModalValue({});
     currentEditIndexRef.current = -1;
+    setCurrentEditIndex(-1);
     setIsOpen(true);
     transformDataSource();
   };
   var handleUpdateClick = function handleUpdateClick(index) {
-    var _props$optionItemValu7;
+    var _props$optionItemValu5;
     currentEditIndexRef.current = index;
+    setCurrentEditIndex(index);
     setIsOpen(true);
-    setModalValue((props === null || props === void 0 || (_props$optionItemValu7 = props.optionItemValue) === null || _props$optionItemValu7 === void 0 || (_props$optionItemValu7 = _props$optionItemValu7.data) === null || _props$optionItemValu7 === void 0 || (_props$optionItemValu7 = _props$optionItemValu7._data) === null || _props$optionItemValu7 === void 0 ? void 0 : _props$optionItemValu7[index]) || {});
+    setModalValue((props === null || props === void 0 || (_props$optionItemValu5 = props.optionItemValue) === null || _props$optionItemValu5 === void 0 || (_props$optionItemValu5 = _props$optionItemValu5.data) === null || _props$optionItemValu5 === void 0 || (_props$optionItemValu5 = _props$optionItemValu5._data) === null || _props$optionItemValu5 === void 0 ? void 0 : _props$optionItemValu5[index]) || {});
     transformDataSource();
   };
   var handleConfirm = function handleConfirm(v) {
@@ -159,8 +172,8 @@ var OptionsCard = function OptionsCard(props) {
     setModalValue({});
   };
   var handleQuantityChange = function handleQuantityChange(_index, _quantity) {
-    var _props$optionItemValu8, _props$actions2;
-    var currentData = (props === null || props === void 0 || (_props$optionItemValu8 = props.optionItemValue) === null || _props$optionItemValu8 === void 0 || (_props$optionItemValu8 = _props$optionItemValu8.data) === null || _props$optionItemValu8 === void 0 || (_props$optionItemValu8 = _props$optionItemValu8._data) === null || _props$optionItemValu8 === void 0 ? void 0 : _props$optionItemValu8[_index]) || {};
+    var _props$optionItemValu6, _props$actions2;
+    var currentData = (props === null || props === void 0 || (_props$optionItemValu6 = props.optionItemValue) === null || _props$optionItemValu6 === void 0 || (_props$optionItemValu6 = _props$optionItemValu6.data) === null || _props$optionItemValu6 === void 0 || (_props$optionItemValu6 = _props$optionItemValu6._data) === null || _props$optionItemValu6 === void 0 ? void 0 : _props$optionItemValu6[_index]) || {};
     var _calculateOptionItem3 = calculateOptionItem({
         editIndex: _index,
         optionItemValue: props === null || props === void 0 ? void 0 : props.optionItemValue,
@@ -212,7 +225,7 @@ var OptionsCard = function OptionsCard(props) {
     parentDataSource: props === null || props === void 0 ? void 0 : props.parentDataSource,
     dataSource: props === null || props === void 0 ? void 0 : props.dataSource,
     data: selectedOptions,
-    remainingCount: Math.min(remainingCount, currentOptionRemainingCount),
+    remainingCount: optionRemainingCount,
     onEdit: handleUpdateClick,
     onQuantityChange: handleQuantityChange
   }), isOpen && /*#__PURE__*/React.createElement(OptionsModal, {
@@ -222,7 +235,7 @@ var OptionsCard = function OptionsCard(props) {
     values: props === null || props === void 0 ? void 0 : props.values,
     optionItemValue: props === null || props === void 0 ? void 0 : props.optionItemValue,
     modalValue: modalValue,
-    remainingCount: Math.min(remainingCount, currentOptionRemainingCount),
+    remainingCount: modalRemainingCount,
     open: isOpen,
     title: title || name || '',
     onCancel: function onCancel() {

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

@@ -1,4 +1,3 @@
-import React from 'react';
 interface OptionsModalProps {
     parentDataSource: any;
     dataSource: any;
@@ -12,5 +11,5 @@ interface OptionsModalProps {
     onCancel: () => void;
     onConfirm: (v: any) => void;
 }
-declare const OptionsModal: (props: OptionsModalProps) => React.JSX.Element;
+declare const OptionsModal: (props: OptionsModalProps) => JSX.Element;
 export default OptionsModal;

package/es/plus/skuOptionsSelection/components/OptionsModal/index.js

@@ -145,7 +145,8 @@ var OptionsModal = function OptionsModal(props) {
       display: 'flex',
       flexDirection: 'column'
     },
-    width: (customConfig === null || customConfig === void 0 ? void 0 : customConfig.modalWidth) || '480px'
+    width: (customConfig === null || customConfig === void 0 ? void 0 : customConfig.modalWidth) || '480px',
+    mobileModalHeight: 'auto'
   }, /*#__PURE__*/React.createElement(SelectorGroup, {
     ref: selectorGroupRef,
     dataSource: props === null || props === void 0 ? void 0 : props.modalDataSource,

package/es/plus/skuOptionsSelection/components/TitleExtra/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const TitleExtra: (props: any) => React.JSX.Element;
+declare const TitleExtra: (props: any) => JSX.Element;
 export default TitleExtra;

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

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

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

@@ -56,8 +56,7 @@ export var transformBundleGroup = function transformBundleGroup(bundleGroup) {
       disabled: (item === null || item === void 0 ? void 0 : item.is_enabled) === 0,
       ruleConfig: {
         min: item === null || item === void 0 ? void 0 : item.min_quantity,
-        // 单选时，max为undefined防止选中一个以后把其他的置灰了
-        max: (item === null || item === void 0 ? void 0 : item.max_quantity) === 1 ? undefined : item === null || item === void 0 ? void 0 : item.max_quantity,
+        max: item === null || item === void 0 ? void 0 : item.max_quantity,
         autoValidate: true,
         required: Number(item === null || item === void 0 ? void 0 : item.min_quantity) > 0 ? true : false
       },
@@ -77,7 +76,8 @@ export var transformBundleGroup = function transformBundleGroup(bundleGroup) {
       // console.log('bundle_group_itemProps---', itemProps);
       if (!!(itemProps !== null && itemProps !== void 0 && (_itemProps$dataSource = itemProps.dataSource) !== null && _itemProps$dataSource !== void 0 && (_itemProps$dataSource = _itemProps$dataSource._original) !== null && _itemProps$dataSource !== void 0 && (_itemProps$dataSource = _itemProps$dataSource.option_group) !== null && _itemProps$dataSource !== void 0 && _itemProps$dataSource.length)) {
         return /*#__PURE__*/React.createElement(OptionsCard, _extends({}, itemProps || {}, {
-          parentDataSource: selectorDataSource
+          parentDataSource: selectorDataSource,
+          mode: selectorDataSource === null || selectorDataSource === void 0 ? void 0 : selectorDataSource.mode
         }));
       }
       return /*#__PURE__*/React.createElement(NormalCard, _extends({}, itemProps || {}, {

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

@@ -28,8 +28,8 @@ export var transformOptionGroup = function transformOptionGroup(optionGroup) {
         value: optionItem === null || optionItem === void 0 ? void 0 : optionItem.id,
         disabled: disabled,
         ruleConfig: {
-          min: (optionItem === null || optionItem === void 0 ? void 0 : optionItem.min_quantity) || undefined,
-          max: (optionItem === null || optionItem === void 0 ? void 0 : optionItem.max_quantity) || undefined,
+          min: optionItem === null || optionItem === void 0 ? void 0 : optionItem.min_quantity,
+          max: optionItem === null || optionItem === void 0 ? void 0 : optionItem.max_quantity,
           autoValidate: true
         },
         _extra: {
@@ -40,10 +40,11 @@ export var transformOptionGroup = function transformOptionGroup(optionGroup) {
     });
 
     // Selector数据源
+    var isMultiple = (item === null || item === void 0 ? void 0 : item.is_multiple) == 1;
     var selectorDataSource = {
       id: item.id,
       title: item.name || '',
-      mode: (item === null || item === void 0 ? void 0 : item.is_multiple) == 1 ? 'multiple' : 'single',
+      mode: isMultiple ? 'multiple' : 'single',
       valueType: 'object',
       fieldNames: {
         value: 'value',
@@ -52,13 +53,15 @@ export var transformOptionGroup = function transformOptionGroup(optionGroup) {
       dataSource: selectorOptionsDataSource || [],
       disabled: (item === null || item === void 0 ? void 0 : item.is_enabled) === 0,
       ruleConfig: {
-        min: (item === null || item === void 0 ? void 0 : item.min_quantity) || undefined,
-        max: (item === null || item === void 0 ? void 0 : item.max_quantity) || undefined,
+        // 多选时以设置为准；单选时不限制
+        min: isMultiple ? item === null || item === void 0 ? void 0 : item.min_quantity : undefined,
+        // 多选时，max为0时表示不限制最大选择数量；单选时不限制最大选择数量
+        max: isMultiple ? Number(item === null || item === void 0 ? void 0 : item.max_quantity) == 0 ? undefined : item === null || item === void 0 ? void 0 : item.max_quantity : undefined,
         autoValidate: true,
         // 单规格必选判定分成两种：
         // 1. 未开启多选时以：item?.required === 1 为准
         // 2. 开启多选时以：item?.min_quantity > 0 为准
-        required: (item === null || item === void 0 ? void 0 : item.is_multiple) == 1 ? Number((item === null || item === void 0 ? void 0 : item.min_quantity) || 0) > 0 : (item === null || item === void 0 ? void 0 : item.required) === 1
+        required: isMultiple ? Number((item === null || item === void 0 ? void 0 : item.min_quantity) || 0) > 0 : (item === null || item === void 0 ? void 0 : item.required) === 1
       },
       headerProps: {
         renderExtra: function renderExtra(props) {