amis-ui 6.13.0-beta.9 → 6.13.0

package/lib/components/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.9
+ * amis-ui v6.13.0
  * Copyright 2018-2025 fex
  */
 
@@ -10,7 +10,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var amisCore = require('amis-core');
 var React = require('react');
-var isInteger = require('lodash/isInteger');
 var omit = require('lodash/omit');
 var merge = require('lodash/merge');
 var index = require('./virtual-list/index.js');
@@ -26,11 +25,11 @@ var Spinner = require('./Spinner.js');
 var WithRemoteConfig = require('./WithRemoteConfig.js');
 var PopOverContainer = require('./PopOverContainer.js');
 var SelectMobile = require('./SelectMobile.js');
+var AutoFoldedList = require('./AutoFoldedList.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var isInteger__default = /*#__PURE__*/_interopDefaultLegacy(isInteger);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 var Downshift__default = /*#__PURE__*/_interopDefaultLegacy(Downshift);
@@ -429,57 +428,42 @@ var Select = /** @class */ (function (_super) {
         onDelete && onDelete(item);
     };
     Select.prototype.renderValue = function (_a) {
-        var _b;
         var _this = this;
         _a.inputValue; _a.isOpen;
-        var _c = this.props, cx = _c.classnames, multiple = _c.multiple, valuesNoWrap = _c.valuesNoWrap, placeholder = _c.placeholder, labelField = _c.labelField, disabled = _c.disabled, maxTagCount = _c.maxTagCount, overflowTagPopover = _c.overflowTagPopover, showInvalidMatch = _c.showInvalidMatch, renderValueLabel = _c.renderValueLabel, popOverContainer = _c.popOverContainer, __ = _c.translate;
+        var _b = this.props, cx = _b.classnames, multiple = _b.multiple, valuesNoWrap = _b.valuesNoWrap, placeholder = _b.placeholder, labelField = _b.labelField, disabled = _b.disabled, maxTagCount = _b.maxTagCount, overflowTagPopover = _b.overflowTagPopover, showInvalidMatch = _b.showInvalidMatch, renderValueLabel = _b.renderValueLabel, popOverContainer = _b.popOverContainer, __ = _b.translate;
         var selection = this.state.selection;
         var labelKey = labelField || 'label';
         if (!selection.length) {
             return (_J$X_("div", { key: "placeholder", className: cx('Select-placeholder') }, __(placeholder)));
         }
-        if (multiple &&
-            maxTagCount != null &&
-            isInteger__default["default"](Math.floor(maxTagCount)) &&
-            Math.floor(maxTagCount) >= 0 &&
-            Math.floor(maxTagCount) < selection.length) {
-            var maxVisibleCount_1 = Math.floor(maxTagCount);
-            var tooltipProps_1 = tslib.__assign({ placement: 'top', trigger: 'hover', showArrow: false, offset: [0, -10], tooltipClassName: cx('Select-overflow', overflowTagPopover === null || overflowTagPopover === void 0 ? void 0 : overflowTagPopover.tooltipClassName) }, omit__default["default"](overflowTagPopover, ['children', 'content', 'tooltipClassName']));
-            return tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(selection.slice(0, maxVisibleCount_1)), false), [
-                (_b = {}, _b[labelKey] = "+ ".concat(selection.length - maxVisibleCount_1, " ..."), _b)
-            ], false).map(function (item, index) {
+        else if (multiple && typeof maxTagCount === 'number' && maxTagCount > 0) {
+            var tooltipProps = tslib.__assign({ tooltipClassName: cx('Select-overflow', overflowTagPopover === null || overflowTagPopover === void 0 ? void 0 : overflowTagPopover.tooltipClassName) }, omit__default["default"](overflowTagPopover, ['children', 'content', 'tooltipClassName']));
+            return (_J$X_(AutoFoldedList["default"], { tooltipClassName: cx('Select-overflow-wrapper'), items: selection, popOverContainer: popOverContainer, tooltipOptions: tooltipProps, maxVisibleCount: maxTagCount, renderItem: function (item, index, folded) {
+                    var label = amisCore.labelToString(item[labelKey]);
+                    var body = (_J$X_("div", { key: index, className: cx('Select-value', {
+                            'is-disabled': disabled || item.disabled,
+                            'is-invalid': showInvalidMatch ? item.__unmatched : false
+                        }) },
+                        _J$X_("span", { className: cx('Select-valueLabel') }, renderValueLabel ? renderValueLabel(item) : label),
+                        _J$X_("span", { className: cx('Select-valueIcon', {
+                                'is-disabled': disabled || item.disabled
+                            }), onClick: _this.removeItem.bind(_this, index) },
+                            _J$X_(icons.Icon, { icon: "close", className: "icon" }))));
+                    return folded ? (body) : (_J$X_(TooltipWrapper["default"], { container: popOverContainer, placement: 'top', tooltip: label, trigger: 'hover', key: index }, body));
+                } }));
+        }
+        else {
+            return selection.map(function (item, index) {
                 var label = amisCore.labelToString(item[labelKey]);
-                if (index === maxVisibleCount_1) {
-                    return (_J$X_(TooltipWrapper["default"], { key: selection.length, container: popOverContainer, tooltip: tslib.__assign(tslib.__assign({}, tooltipProps_1), { children: function () { return (_J$X_("div", { className: cx('Select-overflow-wrapper') }, selection
-                                .slice(maxVisibleCount_1, selection.length)
-                                .map(function (item, index) {
-                                var itemIndex = index + maxVisibleCount_1;
-                                var label = amisCore.labelToString(item[labelKey]);
-                                return (_J$X_("div", { key: itemIndex, className: cx('Select-value', {
-                                        'is-disabled': disabled,
-                                        'is-invalid': showInvalidMatch
-                                            ? item.__unmatched
-                                            : false
-                                    }) },
-                                    _J$X_("span", { className: cx('Select-valueLabel') }, renderValueLabel
-                                        ? renderValueLabel(item)
-                                        : label),
-                                    _J$X_("span", { className: cx('Select-valueIcon', {
-                                            'is-disabled': disabled || item.disabled
-                                        }), onClick: _this.removeItem.bind(_this, itemIndex) },
-                                        _J$X_(icons.Icon, { icon: "close", className: "icon" }))));
-                            }))); } }) },
-                        _J$X_("div", { className: cx('Select-value', {
-                                'is-disabled': disabled,
-                                'is-invalid': showInvalidMatch ? item.__unmatched : false
-                            }), onClick: function (e) {
-                                return e.stopPropagation();
-                            } },
-                            _J$X_("span", { className: cx('Select-valueLabel') }, renderValueLabel ? renderValueLabel(item) : label))));
+                if (!multiple) {
+                    return (_J$X_("div", { className: cx('Select-value', {
+                            'is-disabled': disabled,
+                            'is-invalid': showInvalidMatch ? item.__unmatched : false
+                        }), key: index }, renderValueLabel ? renderValueLabel(item) : label));
                 }
-                return (_J$X_(TooltipWrapper["default"], { container: popOverContainer, placement: 'top', tooltip: label, trigger: 'hover', key: index },
+                return valuesNoWrap ? ("".concat(label).concat(index === selection.length - 1 ? '' : ' + ')) : (_J$X_(TooltipWrapper["default"], { container: popOverContainer, placement: 'top', tooltip: label, trigger: 'hover', key: index },
                     _J$X_("div", { className: cx('Select-value', {
-                            'is-disabled': disabled,
+                            'is-disabled': disabled || item.disabled,
                             'is-invalid': showInvalidMatch ? item.__unmatched : false
                         }) },
                         _J$X_("span", { className: cx('Select-valueLabel') }, renderValueLabel ? renderValueLabel(item) : label),
@@ -489,25 +473,6 @@ var Select = /** @class */ (function (_super) {
                             _J$X_(icons.Icon, { icon: "close", className: "icon" })))));
             });
         }
-        return selection.map(function (item, index) {
-            var label = amisCore.labelToString(item[labelKey]);
-            if (!multiple) {
-                return (_J$X_("div", { className: cx('Select-value', {
-                        'is-disabled': disabled,
-                        'is-invalid': showInvalidMatch ? item.__unmatched : false
-                    }), key: index }, renderValueLabel ? renderValueLabel(item) : label));
-            }
-            return valuesNoWrap ? ("".concat(label).concat(index === selection.length - 1 ? '' : ' + ')) : (_J$X_(TooltipWrapper["default"], { container: popOverContainer, placement: 'top', tooltip: label, trigger: 'hover', key: index },
-                _J$X_("div", { className: cx('Select-value', {
-                        'is-disabled': disabled,
-                        'is-invalid': showInvalidMatch ? item.__unmatched : false
-                    }) },
-                    _J$X_("span", { className: cx('Select-valueLabel') }, renderValueLabel ? renderValueLabel(item) : label),
-                    _J$X_("span", { className: cx('Select-valueIcon', {
-                            'is-disabled': disabled || item.disabled
-                        }), onClick: _this.removeItem.bind(_this, index) },
-                        _J$X_(icons.Icon, { icon: "close", className: "icon" })))));
-        });
     };
     Select.prototype.renderOuter = function (_a) {
         var _this = this;
@@ -581,11 +546,17 @@ var Select = /** @class */ (function (_super) {
                         item.disabled
                             ? label
                             : amisCore.highlight(label, inputValue, cx('Select-option-hl')),
-                        item.tip ? _J$X_("span", null, item.tip) : null))) : (_J$X_("span", tslib.__assign({ className: cx('Select-option-content'), title: typeof label === 'string' ? label : '' }, optTestIdBudr === null || optTestIdBudr === void 0 ? void 0 : optTestIdBudr.getChild('content').getTestId()),
+                        item.tip ? _J$X_("span", null, item.tip) : null))) : (_J$X_("span", tslib.__assign({ className: cx('Select-option-content'), title: item.disabledTip && item.disabled
+                        ? ''
+                        : typeof label === 'string'
+                            ? label
+                            : '' }, optTestIdBudr === null || optTestIdBudr === void 0 ? void 0 : optTestIdBudr.getChild('content').getTestId()),
                     item.disabled
                         ? label
                         : amisCore.highlight(label, inputValue, cx('Select-option-hl')),
-                    item.tip ? _J$X_("span", null, item.tip) : null)),
+                    item.disabledTip && item.disabled ? (_J$X_(TooltipWrapper["default"], { placement: "right", tooltip: item.disabledTip, trigger: "hover" },
+                        _J$X_("a", { className: cx('Select-option-disabledTip') },
+                            _J$X_(icons.Icon, { className: "icon", icon: "question2" })))) : item.tip ? (_J$X_("span", null, item.tip)) : null)),
                 editable ? (_J$X_("a", { "data-tooltip": __('Select.edit'), "data-position": "left" },
                     _J$X_(icons.Icon, { icon: "pencil", className: "icon", onClick: function (e) { return _this.handleEditClick(e, item); } }))) : null,
                 removable ? (_J$X_("a", { "data-tooltip": __('Select.clear'), "data-position": "left" },

package/lib/components/SelectMobile.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0-beta.9
+ * amis-ui v6.13.0
  * Copyright 2018-2025 fex
  */