@pisell/private-materials 6.8.11 → 6.8.13

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

@@ -1,11 +1,7 @@
-var _excluded = ["value", "quantity"],
-  _excluded2 = ["value", "quantity"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -23,6 +19,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useCallback, useMemo, useState, useRef } from 'react';
 import { useControllableValue } from 'ahooks';
+// @ts-ignore
 import { locales } from '@pisell/utils';
 export default function useSelectionController(props) {
   var _ref = props || {},
@@ -54,7 +51,8 @@ export default function useSelectionController(props) {
     return dataSource.map(function (option) {
       return _objectSpread(_objectSpread({}, option), {}, {
         _key: option[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'],
-        _label: option[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label']
+        _label: option[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label'],
+        _cover: option[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.cover) || 'cover']
       });
     });
   }, [dataSource, fieldNames]);
@@ -86,16 +84,6 @@ export default function useSelectionController(props) {
     return map;
   }, [mutexGroups]);
 
-  // 是否启用数量模式（根据任意选项的 min/max 判断）
-  var showQuantity = useMemo(function () {
-    var list = Array.isArray(dataSource) ? dataSource : dataSource || [];
-    var hasItemMaxGt = list.some(function (opt) {
-      var _opt$ruleConfig;
-      return typeof (opt === null || opt === void 0 || (_opt$ruleConfig = opt.ruleConfig) === null || _opt$ruleConfig === void 0 ? void 0 : _opt$ruleConfig.max) === 'number' && opt.ruleConfig.max > 1;
-    });
-    return hasItemMaxGt;
-  }, [dataSource]);
-
   // 标准化当前值为统一格式
   var normalizedValues = useMemo(function () {
     if (!values) return [];
@@ -132,6 +120,33 @@ export default function useSelectionController(props) {
     }];
   }, [values]);
 
+  // 计算选择状态信息（maxReached、showQuantity、剩余可选数量）
+  var quantityInfo = useMemo(function () {
+    // 计算当前已选数量（将所有选项的 quantity 相加）
+    var selectedCount = normalizedValues.reduce(function (sum, item) {
+      return sum + (item.quantity || 0);
+    }, 0);
+
+    // 判断是否启用数量模式
+    var list = Array.isArray(dataSource) ? dataSource : dataSource || [];
+    var showQuantity = list.some(function (opt) {
+      var _opt$ruleConfig, _opt$ruleConfig2;
+      return typeof (opt === null || opt === void 0 || (_opt$ruleConfig = opt.ruleConfig) === null || _opt$ruleConfig === void 0 ? void 0 : _opt$ruleConfig.max) === 'number' && opt.ruleConfig.max > 1 || typeof (opt === null || opt === void 0 || (_opt$ruleConfig2 = opt.ruleConfig) === null || _opt$ruleConfig2 === void 0 ? void 0 : _opt$ruleConfig2.min) === 'number' && opt.ruleConfig.min > 1;
+    });
+
+    // 判断是否达到最大值（max为0视为无效配置）
+    var maxReached = typeof (ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.max) === 'number' && ruleConfig.max > 0 && selectedCount >= ruleConfig.max;
+
+    // 计算剩余可选数量
+    var remainingCount = typeof (ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.max) === 'number' && ruleConfig.max > 0 ? Math.max(0, ruleConfig.max - selectedCount) : Infinity;
+    return {
+      maxReached: maxReached,
+      showQuantity: showQuantity,
+      remainingCount: remainingCount,
+      selectedCount: selectedCount
+    };
+  }, [normalizedValues, dataSource, ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.max]);
+
   // 获取选项的选中状态和数量
   var getOptionState = useCallback(function (optionKey) {
     var found = normalizedValues.find(function (item) {
@@ -147,71 +162,99 @@ export default function useSelectionController(props) {
   var options = useMemo(function () {
     return normalizedOptions.map(function (option) {
       var state = getOptionState(option._key);
+      // 如果已达到最大值，未选的选项应该被禁用
+      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
+        quantity: state.quantity,
+        disabled: option.disabled || disabled
       });
     });
-  }, [normalizedOptions, getOptionState]);
+  }, [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, selectedValues, selectedKeys, type, message;
+      var errors, _ref3, required, min, max, customValidator, values, currentNormalizedValues, objValue, totalQuantity, selectedValues, selectedKeys, type, message;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             errors = [];
             _ref3 = ruleConfig || {}, required = _ref3.required, min = _ref3.min, max = _ref3.max, customValidator = _ref3.customValidator;
-            values = valuesRef.current; // 基础校验与同步规则
-            if (required) {
-              if (mode === 'single' && !values) {
-                errors.push({
-                  type: 'required',
-                  message: locales.getText('pisell2.pro.selector.validate.required-msg')
-                });
-              } else if (mode === 'multiple' && (!values || Array.isArray(values) && values.length === 0)) {
-                errors.push({
-                  type: 'required',
-                  message: locales.getText('pisell2.pro.selector.validate.required-least')
+            values = valuesRef.current; // 计算当前已选的总数量（quantity 的总和）
+            currentNormalizedValues = [];
+            if (values) {
+              if (Array.isArray(values)) {
+                currentNormalizedValues = values.map(function (item) {
+                  if (_typeof(item) === 'object' && item !== null) {
+                    return _objectSpread(_objectSpread({}, item), {}, {
+                      value: item.value,
+                      quantity: item.quantity || 1
+                    });
+                  }
+                  return {
+                    value: item,
+                    quantity: 1
+                  };
                 });
+              } else if (_typeof(values) === 'object' && values !== null) {
+                objValue = values;
+                currentNormalizedValues = [_objectSpread(_objectSpread({}, objValue), {}, {
+                  value: objValue.value,
+                  quantity: objValue.quantity || 1
+                })];
+              } else {
+                currentNormalizedValues = [{
+                  value: values,
+                  quantity: 1
+                }];
               }
             }
-            if (mode === 'multiple' && Array.isArray(values)) {
-              if (typeof min === 'number' && values.length < min) {
-                errors.push({
-                  type: 'min',
-                  message: locales.getText('pisell2.pro.selector.validate.min-selection')(min)
-                });
-              }
-              if (typeof max === 'number' && values.length > max) {
-                errors.push({
-                  type: 'max',
-                  message: locales.getText('pisell2.pro.selector.validate.max-selection')(max)
-                });
-              }
+            totalQuantity = currentNormalizedValues.reduce(function (sum, item) {
+              return sum + (item.quantity || 0);
+            }, 0); // 基础校验与同步规则
+            if (required && totalQuantity < 1) {
+              errors.push({
+                type: 'required',
+                message: locales.getText('pisell2.pro.selector.validate.required-msg')
+              });
+            }
+
+            // 根据总数量（quantity 总和）判断，而不是 values.length
+            if (typeof min === 'number' && totalQuantity < min) {
+              errors.push({
+                type: 'min',
+                message: locales.getText('pisell2.pro.selector.validate.min-selection')(min)
+              });
+            }
+            if (typeof max === 'number' && totalQuantity > max) {
+              errors.push({
+                type: 'max',
+                message: locales.getText('pisell2.pro.selector.validate.max-selection')(max)
+              });
             }
 
             // options 数量级别
             options.forEach(function (option) {
               var _option$ruleConfig, _option$ruleConfig2;
-              var selected = option.selected,
-                quantity = option.quantity;
+              var _optionVal = currentNormalizedValues.find(function (item) {
+                return item.value === option._key;
+              });
+              var quantity = (_optionVal === null || _optionVal === void 0 ? void 0 : _optionVal.quantity) || 0;
+              var _label = option._label;
               var _min = option === null || option === void 0 || (_option$ruleConfig = option.ruleConfig) === null || _option$ruleConfig === void 0 ? void 0 : _option$ruleConfig.min;
               var _max = option === null || option === void 0 || (_option$ruleConfig2 = option.ruleConfig) === null || _option$ruleConfig2 === void 0 ? void 0 : _option$ruleConfig2.max;
-              if (selected) {
-                if (typeof _min === 'number' && quantity < _min) {
-                  errors.push({
-                    type: 'min',
-                    message: locales.getText('pisell2.pro.selector.validate.min-quantity')(_min),
-                    _key: option._key
-                  });
-                }
-                if (typeof _max === 'number' && quantity > _max) {
-                  errors.push({
-                    type: 'max',
-                    message: locales.getText('pisell2.pro.selector.validate.max-quantity')(_max),
-                    _key: option._key
-                  });
-                }
+              if (typeof _min === 'number' && quantity < _min) {
+                errors.push({
+                  type: 'optionMin',
+                  message: locales.getText('pisell2.pro.selector.validate.min-selection')(_min, _label),
+                  _key: option._key
+                });
+              }
+              if (typeof _max === 'number' && quantity > _max) {
+                errors.push({
+                  type: 'optionMax',
+                  message: locales.getText('pisell2.pro.selector.validate.max-selection')(_max, _label),
+                  _key: option._key
+                });
               }
             });
 
@@ -236,33 +279,33 @@ export default function useSelectionController(props) {
 
             // 异步自定义校验（reject 视为不通过，resolve 视为通过）
             if (!(typeof customValidator === 'function')) {
-              _context.next = 18;
+              _context.next = 22;
               break;
             }
-            _context.prev = 8;
-            _context.next = 11;
+            _context.prev = 12;
+            _context.next = 15;
             return customValidator(values);
-          case 11:
-            _context.next = 18;
+          case 15:
+            _context.next = 22;
             break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](8);
-            type = (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.type) === 'requireOneOf' ? 'requireOneOf' : (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.type) || 'custom';
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](12);
+            type = (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.type) || 'custom';
             message = (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || 'Validation failed';
             errors.push({
               type: type,
               message: message
             });
-          case 18:
+          case 22:
             setErrors(errors);
             setValidated(true);
             return _context.abrupt("return", errors.length === 0 ? Promise.resolve() : Promise.reject(errors));
-          case 21:
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[8, 13]]);
+      }, _callee, null, [[12, 17]]);
     }));
     return function validate() {
       return _ref2.apply(this, arguments);
@@ -279,17 +322,7 @@ export default function useSelectionController(props) {
       if (valueType === 'primitive') {
         return item.value;
       }
-      // 保留除了 value 和 quantity 之外的其他字段
-      var _value = item.value,
-        quantity = item.quantity,
-        otherFields = _objectWithoutProperties(item, _excluded);
-      var result = _objectSpread({
-        value: _value
-      }, otherFields);
-      if (showQuantity) {
-        result.quantity = quantity;
-      }
-      return result;
+      return _objectSpread({}, item);
     }
 
     // 多选模式
@@ -299,18 +332,9 @@ export default function useSelectionController(props) {
       });
     }
     return newNormalizedValues.map(function (item) {
-      var value = item.value,
-        quantity = item.quantity,
-        otherFields = _objectWithoutProperties(item, _excluded2);
-      var result = _objectSpread({
-        value: value
-      }, otherFields);
-      if (showQuantity) {
-        result.quantity = quantity;
-      }
-      return result;
+      return _objectSpread({}, item);
     });
-  }, [mode, valueType, showQuantity]);
+  }, [mode, valueType, quantityInfo.showQuantity]);
   var _onChange = useCallback(function (optionKey, data) {
     var newNormalizedValues = _toConsumableArray(normalizedValues);
     var existingIndex = newNormalizedValues.findIndex(function (item) {
@@ -330,7 +354,7 @@ export default function useSelectionController(props) {
         // 添加新选项，包含传入的数据
         var newItem = _objectSpread({
           value: optionKey,
-          quantity: 1
+          quantity: data.quantity || 1
         }, data);
         if (mode === 'single') {
           newNormalizedValues = [newItem];
@@ -363,7 +387,9 @@ export default function useSelectionController(props) {
     setValues(outputValue);
     valuesRef.current = outputValue;
     if (ruleConfig !== null && ruleConfig !== void 0 && ruleConfig.autoValidate) {
-      validate();
+      try {
+        validate();
+      } catch (error) {}
     }
   }, [normalizedValues, mode, buildOutputValue, setValues, mutexIndex, mutexGroups, ruleConfig === null || ruleConfig === void 0 ? void 0 : ruleConfig.autoValidate]);
 
@@ -391,8 +417,8 @@ export default function useSelectionController(props) {
         quantity: currentState.selected ? 0 : 1
       });
     },
-    update: function update(optionKey, data) {
-      return _onChange(optionKey, data);
+    update: function update(optionKey, payload) {
+      return _onChange(optionKey, payload);
     },
     setValue: function setValue(value) {
       return setValues(value);
@@ -407,7 +433,7 @@ export default function useSelectionController(props) {
       validated: validated,
       values: values,
       options: options,
-      showQuantity: showQuantity
+      quantityInfo: quantityInfo
     },
     actions: actions
   };

package/es/pro/Selector/index.js

@@ -1,5 +1,8 @@
 import OriginalSelector from "./Selector";
+import Item from "./Item";
 import SelectorGroup from "./SelectorGroup";
 var Selector = OriginalSelector;
 Selector.Group = SelectorGroup;
+Selector.Item = Item;
+export * from "./types";
 export default Selector;

package/es/pro/Selector/locales.js

@@ -3,78 +3,99 @@ export default {
     'pisell2.pro.selector.mode.single': 'Single choice',
     'pisell2.pro.selector.mode.multiple': 'Multiple choice',
     'pisell2.pro.selector.validate.required-msg': 'Please select',
-    'pisell2.pro.selector.validate.required-least': 'Please select at least one option',
     'pisell2.pro.selector.validate.requireOneOf-msg': 'This group must select one of the specified collections',
     'pisell2.pro.selector.required-tag': 'Required',
-    'pisell2.pro.selector.validate.min-quantity': function pisell2ProSelectorValidateMinQuantity(min) {
-      return "Minimum quantity is ".concat(min);
+    'pisell2.pro.selector.validate.min-selection': function pisell2ProSelectorValidateMinSelection(min, label) {
+      return "Select at least ".concat(min).concat(label ? ' ' + label : '');
     },
-    'pisell2.pro.selector.validate.max-quantity': function pisell2ProSelectorValidateMaxQuantity(max) {
-      return "Maximum quantity is ".concat(max);
+    'pisell2.pro.selector.validate.max-selection': function pisell2ProSelectorValidateMaxSelection(max, label) {
+      return "Select at most ".concat(max).concat(label ? ' ' + label : '');
     },
-    'pisell2.pro.selector.validate.min-selection': function pisell2ProSelectorValidateMinSelection(min) {
-      return "Please select at least ".concat(min, " options");
-    },
-    'pisell2.pro.selector.validate.max-selection': function pisell2ProSelectorValidateMaxSelection(max) {
-      return "Please select at most ".concat(max, " options");
-    },
-    'pisell2.pro.selector.validate.min-max-selection': function pisell2ProSelectorValidateMinMaxSelection(min, max) {
-      var _minText = "At least ".concat(min);
-      var _maxText = "No more than ".concat(max);
-      var _separator = _minText && _maxText ? ',' : '';
-      return "".concat(_minText).concat(_separator).concat(_maxText ? ' ' : '').concat(_maxText);
+    'pisell2.pro.selector.tip.require-one-option': 'Choose 1',
+    'pisell2.pro.selector.tip.min-max-selection': function pisell2ProSelectorTipMinMaxSelection(min, max) {
+      // 固定数量：min=max
+      if (min === max && min > 0) {
+        return "Choose ".concat(min);
+      }
+      // 仅max：min=0或undefined
+      if ((!min || min === 0) && max > 0) {
+        return "Choose up to ".concat(max);
+      }
+      // 范围：min>0, max>min
+      if (min > 0 && max > min) {
+        return "Choose ".concat(min, "-").concat(max);
+      }
+      // 仅min：min>0, max=0或undefined
+      if (min > 0 && (!max || max === 0)) {
+        return "Choose at least ".concat(min);
+      }
+      return '';
     }
   },
   'zh-CN': {
     'pisell2.pro.selector.mode.single': '单选',
     'pisell2.pro.selector.mode.multiple': '多选',
     'pisell2.pro.selector.validate.required-msg': '请选择',
-    'pisell2.pro.selector.validate.required-least': '请选择至少一个选项',
     'pisell2.pro.selector.validate.requireOneOf-msg': '该组必须选择指定集合之一',
     'pisell2.pro.selector.required-tag': '必选',
-    'pisell2.pro.selector.validate.min-quantity': function pisell2ProSelectorValidateMinQuantity(min) {
-      return "\u6700\u5C0F\u6570\u91CF\u4E3A ".concat(min);
-    },
-    'pisell2.pro.selector.validate.max-quantity': function pisell2ProSelectorValidateMaxQuantity(max) {
-      return "\u6700\u5927\u6570\u91CF\u4E3A ".concat(max);
+    'pisell2.pro.selector.validate.min-selection': function pisell2ProSelectorValidateMinSelection(min, label) {
+      return "\u81F3\u5C11\u9009 ".concat(min, " \u4E2A").concat(label ? ' ' + label : '');
     },
-    'pisell2.pro.selector.validate.min-selection': function pisell2ProSelectorValidateMinSelection(min) {
-      return "\u81F3\u5C11\u9009\u62E9 ".concat(min, " \u4E2A\u9009\u9879");
+    'pisell2.pro.selector.validate.max-selection': function pisell2ProSelectorValidateMaxSelection(max, label) {
+      return "\u6700\u591A\u9009 ".concat(max, " \u4E2A").concat(label ? ' ' + label : '');
     },
-    'pisell2.pro.selector.validate.max-selection': function pisell2ProSelectorValidateMaxSelection(max) {
-      return "\u6700\u591A\u9009\u62E9 ".concat(max, " \u4E2A\u9009\u9879");
-    },
-    'pisell2.pro.selector.validate.min-max-selection': function pisell2ProSelectorValidateMinMaxSelection(min, max) {
-      var _minText = "\u81F3\u5C11\u9009\u62E9 ".concat(min, " \u4E2A\u9009\u9879");
-      var _maxText = "\u6700\u591A\u9009\u62E9 ".concat(max, " \u4E2A\u9009\u9879");
-      var _separator = _minText && _maxText ? ',' : '';
-      return "".concat(_minText).concat(_separator).concat(_maxText ? ' ' : '').concat(_maxText);
+    'pisell2.pro.selector.tip.require-one-option': '需选 1 项',
+    'pisell2.pro.selector.tip.min-max-selection': function pisell2ProSelectorTipMinMaxSelection(min, max) {
+      // 固定数量：min=max
+      if (min === max && min > 0) {
+        return "\u9700\u9009 ".concat(min, " \u4E2A");
+      }
+      // 仅max：min=0或undefined
+      if ((!min || min === 0) && max > 0) {
+        return "\u6700\u591A\u9009 ".concat(max, " \u4E2A");
+      }
+      // 范围：min>0, max>min
+      if (min > 0 && max > min) {
+        return "\u9009 ".concat(min, "-").concat(max, " \u4E2A");
+      }
+      // 仅min：min>0, max=0或undefined
+      if (min > 0 && (!max || max === 0)) {
+        return "\u81F3\u5C11\u9009 ".concat(min, " \u4E2A");
+      }
+      return '';
     }
   },
   'zh-HK': {
     'pisell2.pro.selector.mode.single': '單選',
     'pisell2.pro.selector.mode.multiple': '多選',
     'pisell2.pro.selector.validate.required-msg': '請選擇',
-    'pisell2.pro.selector.validate.required-least': '請選擇至少一個選項',
     'pisell2.pro.selector.validate.requireOneOf-msg': '該組必須選擇指定集合之一',
     'pisell2.pro.selector.required-tag': '必選',
-    'pisell2.pro.selector.validate.min-quantity': function pisell2ProSelectorValidateMinQuantity(min) {
-      return "\u6700\u5C0F\u6578\u91CF\u70BA ".concat(min);
-    },
-    'pisell2.pro.selector.validate.max-quantity': function pisell2ProSelectorValidateMaxQuantity(max) {
-      return "\u6700\u5927\u6578\u91CF\u70BA ".concat(max);
-    },
-    'pisell2.pro.selector.validate.min-selection': function pisell2ProSelectorValidateMinSelection(min) {
-      return "\u81F3\u5C11\u9078\u64C7 ".concat(min, " \u500B\u9078\u9805");
+    'pisell2.pro.selector.validate.min-selection': function pisell2ProSelectorValidateMinSelection(min, label) {
+      return "\u81F3\u5C11\u9078 ".concat(min, " \u500B").concat(label ? ' ' + label : '');
     },
-    'pisell2.pro.selector.validate.max-selection': function pisell2ProSelectorValidateMaxSelection(max) {
-      return "\u6700\u591A\u9078\u64C7 ".concat(max, " \u500B\u9078\u9805");
+    'pisell2.pro.selector.validate.max-selection': function pisell2ProSelectorValidateMaxSelection(max, label) {
+      return "\u6700\u591A\u9078 ".concat(max, " \u500B").concat(label ? ' ' + label : '');
     },
-    'pisell2.pro.selector.validate.min-max-selection': function pisell2ProSelectorValidateMinMaxSelection(min, max) {
-      var _minText = "\u81F3\u5C11\u9078\u64C7 ".concat(min, " \u500B\u9078\u9805");
-      var _maxText = "\u6700\u591A\u9078\u64C7 ".concat(max, " \u500B\u9078\u9805");
-      var _separator = _minText && _maxText ? ',' : '';
-      return "".concat(_minText).concat(_separator).concat(_maxText ? ' ' : '').concat(_maxText);
+    'pisell2.pro.selector.tip.require-one-option': '需選 1 項',
+    'pisell2.pro.selector.tip.min-max-selection': function pisell2ProSelectorTipMinMaxSelection(min, max) {
+      // 固定數量：min=max
+      if (min === max && min > 0) {
+        return "\u9700\u9078 ".concat(min, " \u500B");
+      }
+      // 僅max：min=0或undefined
+      if ((!min || min === 0) && max > 0) {
+        return "\u6700\u591A\u9078 ".concat(max, " \u500B");
+      }
+      // 範圍：min>0, max>min
+      if (min > 0 && max > min) {
+        return "\u9078 ".concat(min, "-").concat(max, " \u500B");
+      }
+      // 僅min：min>0, max=0或undefined
+      if (min > 0 && (!max || max === 0)) {
+        return "\u81F3\u5C11\u9078 ".concat(min, " \u500B");
+      }
+      return '';
     }
   }
 };

package/es/pro/Selector/selector.less

@@ -1,3 +1,109 @@
-.pisell-selector_radio-trigger {
-  margin: 0;
+.pisell-pro-selector {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  container-type: inline-size; // 启用容器查询
+
+  &_header {
+    display: flex;
+    gap: 8px;
+  }
+
+  &_header-content-wrapper {
+    overflow: hidden;
+  }
+
+  &_header-content {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    flex: 1;
+
+    &-title {
+      font-size: 16px;
+      font-weight: 600;
+      display: inline-block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+
+  &_tip {
+    color: #475467;
+    display: inline-block;
+    margin-top: 4px;
+  }
+
+  .pisell-lowcode-select {
+    height: 48px;
+
+    .pisell-lowcode-select-selection-item {
+      height: 36px;
+      line-height: 34px;
+    }
+  }
+
+  &_options-container {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+  }
+
+  // 自动宽度布局 - 内容自适应
+  &_layout-auto-flex {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 16px;
+  }
+
+  // 响应式布局 - 最小宽度 210px
+  &_layout-responsive-210 {
+    display: grid;
+    gap: 16px;
+    grid-template-columns: 1fr; // 默认一列
+
+    // 容器宽度 >= 420px 且 < 630px: 两列
+    @container (min-width: 420px) {
+      grid-template-columns: repeat(2, 1fr);
+    }
+
+    // 容器宽度 >= 630px 且 <= 840px: 三列
+    @container (min-width: 630px) {
+      grid-template-columns: repeat(3, 1fr);
+    }
+
+    // 容器宽度 >= 841px 且 <= 1366px: 四列
+    @container (min-width: 841px) {
+      grid-template-columns: repeat(4, 1fr);
+    }
+
+    // 容器宽度 > 1366px: 五列
+    @container (min-width: 1367px) {
+      grid-template-columns: repeat(5, 1fr);
+    }
+  }
+
+  // 响应式布局 - 最小宽度 330px
+  &_layout-responsive-330 {
+    display: grid;
+    gap: 16px;
+    grid-template-columns: 1fr; // 默认一列
+
+    // 容器宽度 >= 660px 且 < 995px: 两列
+    @container (min-width: 660px) {
+      grid-template-columns: repeat(2, 1fr);
+    }
+
+    // 容器宽度 >= 995px 且 <= 1366px: 三列
+    @container (min-width: 995px) {
+      grid-template-columns: repeat(3, 1fr);
+    }
+
+    // 容器宽度 > 1366px: 四列
+    @container (min-width: 1367px) {
+      grid-template-columns: repeat(4, 1fr);
+    }
+  }
 }