@pisell/private-materials 6.3.62 → 6.3.63

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

@@ -6,5 +6,6 @@ import { RenderItemProps } from '../../../../pro/Selector/types';
 import './index.less';
 declare const OptionsCard: (props: RenderItemProps & {
     parentDataSource: any;
+    mode: 'single' | 'multiple';
 }) => React.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.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/utils/transformBundleGroup.js

@@ -57,7 +57,8 @@ export var transformBundleGroup = function transformBundleGroup(bundleGroup) {
       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?.max_quantity === 1 ? undefined : 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 +78,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/pro/Selector/Selector.js

@@ -157,7 +157,9 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
     var _option$ruleConfig$mi, _option$ruleConfig, _ruleConfig$min, _option$ruleConfig$ma, _option$ruleConfig2;
     var optionItemValue = Array.isArray(state.values) ? state.values.find(function (item) {
       return (item === null || item === void 0 ? void 0 : item.value) === option._key;
-    }) : state.values;
+    }) : [state.values].find(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.value) === option._key;
+    });
     if ( /*#__PURE__*/React.isValidElement(renderItem)) {
       return renderItem;
     }

package/es/pro/Selector/hooks/useSelectionController.js

@@ -163,14 +163,14 @@ export default function useSelectionController(props) {
     return normalizedOptions.map(function (option) {
       var state = getOptionState(option._key);
       // 如果已达到最大值，未选的选项应该被禁用
-      var disabled = quantityInfo.maxReached && !state.selected;
+      var disabled = quantityInfo.maxReached && !(mode === 'single' && (ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.max) === 1) && !state.selected;
       return _objectSpread(_objectSpread({}, option), {}, {
         selected: state.selected,
         quantity: state.quantity,
         disabled: option.disabled || disabled
       });
     });
-  }, [normalizedOptions, getOptionState, quantityInfo.maxReached]);
+  }, [normalizedOptions, getOptionState, quantityInfo.maxReached, mode, ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.max]);
   var validate = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var errors, _ref3, required, min, max, customValidator, values, currentNormalizedValues, objValue, totalQuantity, selectedValues, selectedKeys, type, message;

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

@@ -6,5 +6,6 @@ import { RenderItemProps } from '../../../../pro/Selector/types';
 import './index.less';
 declare const OptionsCard: (props: RenderItemProps & {
     parentDataSource: any;
+    mode: 'single' | 'multiple';
 }) => React.JSX.Element;
 export default OptionsCard;

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

@@ -42,7 +42,7 @@ var import_OptionsModal = __toESM(require("../OptionsModal"));
 var import_OptionItemCard = __toESM(require("./OptionItemCard"));
 var import_index = require("./index.less");
 var OptionsCard = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const { _key: uniqueKey, selected, disabled } = (props == null ? void 0 : props.dataSource) || {};
   const {
     cover,
@@ -59,33 +59,33 @@ var OptionsCard = (props) => {
   const [modalDataSource, setModalDataSource] = (0, import_react.useState)([]);
   const [modalValue, setModalValue] = (0, import_react.useState)({});
   const currentEditIndexRef = (0, import_react.useRef)(-1);
+  const [currentEditIndex, setCurrentEditIndex] = (0, import_react.useState)(-1);
   const _indicator = import_react.default.cloneElement(props == null ? void 0 : props.indicator);
-  const remainingCount = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2;
-    const _max = ((_b2 = (_a2 = props == null ? void 0 : props.parentDataSource) == null ? void 0 : _a2.ruleConfig) == null ? void 0 : _b2.max) || 0;
-    if (_max <= 0) return 0;
-    return _max - (((_c2 = props == null ? void 0 : props.values) == null ? void 0 : _c2.reduce(
-      (sum, i) => sum + ((i == null ? void 0 : i.quantity) || 0),
-      0
-    )) || 0);
+  const selectorRemainingCount = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    const globalMax = ((_b2 = (_a2 = props == null ? void 0 : props.parentDataSource) == null ? void 0 : _a2.ruleConfig) == null ? void 0 : _b2.max) || 0;
+    if (globalMax <= 0) return Infinity;
+    const values = Array.isArray(props == null ? void 0 : props.values) ? props == null ? void 0 : props.values : [props == null ? void 0 : props.values];
+    const totalSelected = values.reduce((sum, i) => sum + ((i == null ? void 0 : i.quantity) || 0), 0) || 0;
+    return Math.max(0, globalMax - totalSelected);
   }, [(_c = (_b = props == null ? void 0 : props.parentDataSource) == null ? void 0 : _b.ruleConfig) == null ? void 0 : _c.max, props == null ? void 0 : props.values]);
-  const currentOptionRemainingCount = (0, import_react.useMemo)(() => {
+  const optionRemainingCount = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
-    if (remainingCount <= 0) return 0;
-    const _quantity = ((_a2 = props == null ? void 0 : props.optionItemValue) == null ? void 0 : _a2.quantity) || 0;
-    if (_quantity >= remainingCount) {
-      return 0;
-    }
-    const _max = ((_c2 = (_b2 = props == null ? void 0 : props.dataSource) == null ? void 0 : _b2.ruleConfig) == null ? void 0 : _c2.max) || 0;
-    if (_max > 0 && _quantity >= _max) {
-      return 0;
-    }
-    return Math.min(remainingCount, _max) - _quantity;
+    const currentQuantity = ((_a2 = props == null ? void 0 : props.optionItemValue) == null ? void 0 : _a2.quantity) || 0;
+    const optionMax = ((_c2 = (_b2 = props == null ? void 0 : props.dataSource) == null ? void 0 : _b2.ruleConfig) == null ? void 0 : _c2.max) || 0;
+    const optionRemaining = optionMax > 0 ? optionMax - currentQuantity : Infinity;
+    return Math.max(0, Math.min(selectorRemainingCount, optionRemaining));
   }, [
     (_d = props == null ? void 0 : props.optionItemValue) == null ? void 0 : _d.quantity,
-    remainingCount,
+    selectorRemainingCount,
     (_f = (_e = props == null ? void 0 : props.dataSource) == null ? void 0 : _e.ruleConfig) == null ? void 0 : _f.max
   ]);
+  const modalRemainingCount = (0, import_react.useMemo)(() => {
+    if ((props == null ? void 0 : props.mode) === "single" && currentEditIndex === -1) {
+      return optionRemainingCount <= 0 ? 1 : optionRemainingCount;
+    }
+    return optionRemainingCount;
+  }, [props == null ? void 0 : props.mode, optionRemainingCount, currentEditIndex]);
   const priceText = (0, import_react.useMemo)(() => {
     return `${price_type === "markdown" ? "-" : ""}${symbol}${Math.abs(
       Number(price || 0)
@@ -101,28 +101,22 @@ var OptionsCard = (props) => {
       setModalDataSource(renderOptionGroup || []);
     }
   };
-  const isDisabled = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2;
+  const handleClick = () => {
     if (disabled) {
-      return true;
-    }
-    const _quantity = ((_a2 = props == null ? void 0 : props.optionItemValue) == null ? void 0 : _a2.quantity) || 0;
-    if (_quantity >= remainingCount) {
-      return true;
+      console.log("handleClick_disabled>>>>>", disabled);
+      return;
     }
-    const _max = ((_c2 = (_b2 = props == null ? void 0 : props.dataSource) == null ? void 0 : _b2.ruleConfig) == null ? void 0 : _c2.max) || 0;
-    if (_max > 0 && _quantity >= _max) {
-      return true;
+    let needShowToast = false;
+    if (optionRemainingCount <= 0) {
+      if ((props == null ? void 0 : props.mode) === "single" && !selected) {
+        needShowToast = false;
+      } else {
+        needShowToast = true;
+      }
+    } else {
+      needShowToast = false;
     }
-    return false;
-  }, [
-    disabled,
-    (_i = props == null ? void 0 : props.optionItemValue) == null ? void 0 : _i.quantity,
-    remainingCount,
-    (_k = (_j = props == null ? void 0 : props.dataSource) == null ? void 0 : _j.ruleConfig) == null ? void 0 : _k.max
-  ]);
-  const handleClick = () => {
-    if (isDisabled) {
+    if (needShowToast) {
       (0, import_materials.PisellToast)({
         content: import_utils.locales.getText(
           "pisell2.skuOptionsSelection.optionItemCard.overSelected"
@@ -132,12 +126,14 @@ var OptionsCard = (props) => {
     }
     setModalValue({});
     currentEditIndexRef.current = -1;
+    setCurrentEditIndex(-1);
     setIsOpen(true);
     transformDataSource();
   };
   const handleUpdateClick = (index) => {
     var _a2, _b2, _c2;
     currentEditIndexRef.current = index;
+    setCurrentEditIndex(index);
     setIsOpen(true);
     setModalValue(((_c2 = (_b2 = (_a2 = props == null ? void 0 : props.optionItemValue) == null ? void 0 : _a2.data) == null ? void 0 : _b2._data) == null ? void 0 : _c2[index]) || {});
     transformDataSource();
@@ -209,7 +205,7 @@ var OptionsCard = (props) => {
       parentDataSource: props == null ? void 0 : props.parentDataSource,
       dataSource: props == null ? void 0 : props.dataSource,
       data: selectedOptions,
-      remainingCount: Math.min(remainingCount, currentOptionRemainingCount),
+      remainingCount: optionRemainingCount,
       onEdit: handleUpdateClick,
       onQuantityChange: handleQuantityChange
     }
@@ -222,7 +218,7 @@ var OptionsCard = (props) => {
       values: props == null ? void 0 : props.values,
       optionItemValue: props == null ? void 0 : props.optionItemValue,
       modalValue,
-      remainingCount: Math.min(remainingCount, currentOptionRemainingCount),
+      remainingCount: modalRemainingCount,
       open: isOpen,
       title: title || name || "",
       onCancel: () => setIsOpen(false),

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

@@ -120,7 +120,8 @@ var OptionsModal = (props) => {
         display: "flex",
         flexDirection: "column"
       },
-      width: (customConfig == null ? void 0 : customConfig.modalWidth) || "480px"
+      width: (customConfig == null ? void 0 : customConfig.modalWidth) || "480px",
+      mobileModalHeight: "auto"
     },
     /* @__PURE__ */ import_react.default.createElement(
       SelectorGroup,

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

@@ -73,7 +73,8 @@ var transformBundleGroup = (bundleGroup) => {
       ruleConfig: {
         min: item == null ? void 0 : item.min_quantity,
         // 单选时，max为undefined防止选中一个以后把其他的置灰了
-        max: (item == null ? void 0 : item.max_quantity) === 1 ? void 0 : item == null ? void 0 : item.max_quantity,
+        // max: item?.max_quantity === 1 ? undefined : item?.max_quantity,
+        max: item == null ? void 0 : item.max_quantity,
         autoValidate: true,
         required: Number(item == null ? void 0 : item.min_quantity) > 0 ? true : false
       },
@@ -93,7 +94,8 @@ var transformBundleGroup = (bundleGroup) => {
           import_OptionsCard.default,
           {
             ...itemProps || {},
-            parentDataSource: selectorDataSource
+            parentDataSource: selectorDataSource,
+            mode: selectorDataSource == null ? void 0 : selectorDataSource.mode
           }
         );
       }

package/lib/pro/Selector/Selector.js

@@ -159,7 +159,7 @@ var Selector = (0, import_react.forwardRef)((props, ref) => {
   };
   const renderOption = (option) => {
     var _a2, _b2;
-    const optionItemValue = Array.isArray(state.values) ? state.values.find((item) => (item == null ? void 0 : item.value) === option._key) : state.values;
+    const optionItemValue = Array.isArray(state.values) ? state.values.find((item) => (item == null ? void 0 : item.value) === option._key) : [state.values].find((item) => (item == null ? void 0 : item.value) === option._key);
     if (import_react.default.isValidElement(renderItem)) {
       return renderItem;
     }

package/lib/pro/Selector/hooks/useSelectionController.js

@@ -131,7 +131,7 @@ function useSelectionController(props) {
   const options = (0, import_react.useMemo)(() => {
     return normalizedOptions.map((option) => {
       const state = getOptionState(option._key);
-      const disabled = quantityInfo.maxReached && !state.selected;
+      const disabled = quantityInfo.maxReached && !(mode === "single" && (ruleConfig == null ? void 0 : ruleConfig.max) === 1) && !state.selected;
       return {
         ...option,
         selected: state.selected,
@@ -139,7 +139,7 @@ function useSelectionController(props) {
         disabled: option.disabled || disabled
       };
     });
-  }, [normalizedOptions, getOptionState, quantityInfo.maxReached]);
+  }, [normalizedOptions, getOptionState, quantityInfo.maxReached, mode, ruleConfig == null ? void 0 : ruleConfig.max]);
   const validate = async () => {
     const errors2 = [];
     const { required, min, max, customValidator } = ruleConfig || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.62",
+  "version": "6.3.63",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",