amis-ui 6.2.2 → 6.4.0

package/esm/components/Select.js

@@ -1,10 +1,10 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign, __spreadArray, __read, __decorate, __metadata, __rest } from 'tslib';
-import { normalizeNodePath, isObject, findTree, getOptionValueBindField, getOptionValue, labelToString, Overlay, PopOver, noop, buildTestId, ucFirst, autobind, themeable, localeable, uncontrollable, highlight } from 'amis-core';
+import { normalizeNodePath, isObject, findTree, getOptionValueBindField, getOptionValue, labelToString, Overlay, PopOver, noop, ucFirst, autobind, themeable, localeable, uncontrollable, highlight } from 'amis-core';
 import React__default from 'react';
 import isInteger from 'lodash/isInteger';
 import omit from 'lodash/omit';
@@ -404,7 +404,7 @@ var Select = /** @class */ (function (_super) {
     };
     Select.prototype.handleAddClick = function () {
         var onAdd = this.props.onAdd;
-        onAdd && onAdd();
+        onAdd && onAdd(undefined, undefined, false, this.close);
     };
     Select.prototype.handleEditClick = function (e, item) {
         var onEdit = this.props.onEdit;
@@ -503,7 +503,7 @@ var Select = /** @class */ (function (_super) {
         var _this = this;
         var _b;
         var selectedItem = _a.selectedItem, getItemProps = _a.getItemProps, highlightedIndex = _a.highlightedIndex, inputValue = _a.inputValue, isOpen = _a.isOpen; _a.getToggleButtonProps; var getInputProps = _a.getInputProps;
-        var _c = this.props, popOverContainer = _c.popOverContainer, options = _c.options, valueField = _c.valueField, labelField = _c.labelField, noResultsText = _c.noResultsText, loadOptions = _c.loadOptions, creatable = _c.creatable, multiple = _c.multiple, valuesNoWrap = _c.valuesNoWrap, cx = _c.classnames, popoverClassName = _c.popoverClassName, popOverContainerSelector = _c.popOverContainerSelector, checkAll = _c.checkAll, checkAllLabel = _c.checkAllLabel, checkAllBySearch = _c.checkAllBySearch, searchable = _c.searchable, createBtnLabel = _c.createBtnLabel, disabled = _c.disabled, searchPromptText = _c.searchPromptText, editable = _c.editable, removable = _c.removable, overlayPlacement = _c.overlayPlacement, __ = _c.translate, hideSelected = _c.hideSelected, renderMenu = _c.renderMenu; _c.mobileClassName; var _d = _c.virtualThreshold, virtualThreshold = _d === void 0 ? 100 : _d, mobileUI = _c.mobileUI, _e = _c.filterOption, filterOption = _e === void 0 ? defaultFilterOption : _e, overlay = _c.overlay, loading = _c.loading;
+        var _c = this.props, popOverContainer = _c.popOverContainer, options = _c.options, valueField = _c.valueField, labelField = _c.labelField, noResultsText = _c.noResultsText, loadOptions = _c.loadOptions, creatable = _c.creatable, multiple = _c.multiple, valuesNoWrap = _c.valuesNoWrap, cx = _c.classnames, popoverClassName = _c.popoverClassName, popOverContainerSelector = _c.popOverContainerSelector, checkAll = _c.checkAll, checkAllLabel = _c.checkAllLabel, checkAllBySearch = _c.checkAllBySearch, searchable = _c.searchable, createBtnLabel = _c.createBtnLabel, disabled = _c.disabled, searchPromptText = _c.searchPromptText, editable = _c.editable, removable = _c.removable, overlayPlacement = _c.overlayPlacement, __ = _c.translate, hideSelected = _c.hideSelected, renderMenu = _c.renderMenu; _c.mobileClassName; var _d = _c.virtualThreshold, virtualThreshold = _d === void 0 ? 100 : _d, mobileUI = _c.mobileUI, _e = _c.filterOption, filterOption = _e === void 0 ? defaultFilterOption : _e, overlay = _c.overlay, loading = _c.loading, testIdBuilder = _c.testIdBuilder;
         var selection = this.state.selection;
         var checkedAll = false;
         var checkedPartial = false;
@@ -533,6 +533,7 @@ var Select = /** @class */ (function (_super) {
                 return null;
             }
             var label = labelToString(item[labelField]);
+            var optTestIdBudr = testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild("option-".concat(label || index));
             return (React__default.createElement("div", __assign({}, getItemProps({
                 key: typeof item.value === 'string'
                     ? "".concat(item.label, "-").concat(item.value)
@@ -544,10 +545,10 @@ var Select = /** @class */ (function (_super) {
                     'is-disabled': item.disabled,
                     'is-highlight': highlightedIndex === index,
                     'is-active': checked
-                }) }),
+                }) }, optTestIdBudr === null || optTestIdBudr === void 0 ? void 0 : optTestIdBudr.getTestId()),
                 renderMenu ? (multiple ? (React__default.createElement(Checkbox, { checked: checked, trueValue: item.value, onChange: function () {
                         _this.handleChange(item);
-                    }, disabled: item.disabled }, renderMenu(item, {
+                    }, disabled: item.disabled, testIdBuilder: optTestIdBudr === null || optTestIdBudr === void 0 ? void 0 : optTestIdBudr.getChild('chekbx') }, renderMenu(item, {
                     multiple: multiple,
                     checkAll: checkAll,
                     checked: checked,
@@ -570,11 +571,11 @@ var Select = /** @class */ (function (_super) {
                         item.disabled
                             ? label
                             : highlight(label, inputValue, cx('Select-option-hl')),
-                        item.tip))) : (React__default.createElement("span", { className: cx('Select-option-content'), title: typeof label === 'string' ? label : '' },
+                        item.tip ? React__default.createElement("span", null, item.tip) : null))) : (React__default.createElement("span", __assign({ className: cx('Select-option-content'), title: typeof label === 'string' ? label : '' }, optTestIdBudr === null || optTestIdBudr === void 0 ? void 0 : optTestIdBudr.getChild('content').getTestId()),
                     item.disabled
                         ? label
                         : highlight(label, inputValue, cx('Select-option-hl')),
-                    item.tip)),
+                    item.tip ? React__default.createElement("span", null, item.tip) : null)),
                 editable ? (React__default.createElement("a", { "data-tooltip": __('Select.edit'), "data-position": "left" },
                     React__default.createElement(Icon, { icon: "pencil", className: "icon", onClick: function (e) { return _this.handleEditClick(e, item); } }))) : null,
                 removable ? (React__default.createElement("a", { "data-tooltip": __('Select.clear'), "data-position": "left" },
@@ -631,7 +632,7 @@ var Select = /** @class */ (function (_super) {
     };
     Select.prototype.render = function () {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, multiple = _a.multiple, valuesNoWrap = _a.valuesNoWrap, searchable = _a.searchable, inline = _a.inline, block = _a.block, className = _a.className, value = _a.value, loading = _a.loading, clearable = _a.clearable, labelField = _a.labelField, disabled = _a.disabled; _a.checkAll; var borderMode = _a.borderMode, mobileUI = _a.mobileUI, hasError = _a.hasError, testid = _a.testid, loadingConfig = _a.loadingConfig;
+        var _a = this.props, cx = _a.classnames, multiple = _a.multiple, valuesNoWrap = _a.valuesNoWrap, searchable = _a.searchable, inline = _a.inline, block = _a.block, className = _a.className, value = _a.value, loading = _a.loading, clearable = _a.clearable, labelField = _a.labelField, disabled = _a.disabled; _a.checkAll; var borderMode = _a.borderMode, mobileUI = _a.mobileUI, hasError = _a.hasError, testIdBuilder = _a.testIdBuilder, loadingConfig = _a.loadingConfig;
         var selection = this.state.selection;
         var inputValue = this.state.inputValue;
         var resetValue = this.props.resetValue;
@@ -642,7 +643,7 @@ var Select = /** @class */ (function (_super) {
             } }, function (options) {
             var _a;
             var isOpen = options.isOpen;
-            return (React__default.createElement("div", __assign({ tabIndex: disabled ? -1 : 0, onKeyPress: _this.handleKeyPress, onClick: _this.toggle, onFocus: _this.onFocus, onBlur: _this.onBlur }, buildTestId(testid), { className: cx("Select", (_a = {},
+            return (React__default.createElement("div", __assign({ tabIndex: disabled ? -1 : 0, onKeyPress: _this.handleKeyPress, onClick: _this.toggle, onFocus: _this.onFocus, onBlur: _this.onBlur }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getTestId(), { className: cx("Select", (_a = {},
                     _a["Select--multi"] = multiple,
                     _a["Select--inline"] = inline,
                     _a["Select--block"] = block,
@@ -661,10 +662,10 @@ var Select = /** @class */ (function (_super) {
                     !disabled &&
                     (Array.isArray(value)
                         ? value.length
-                        : value != null && value !== resetValue) ? (React__default.createElement("a", { onClick: _this.clearValue, className: cx('Select-clear') },
+                        : value != null && value !== resetValue) ? (React__default.createElement("a", __assign({ onClick: _this.clearValue, className: cx('Select-clear') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('clear').getTestId()),
                     React__default.createElement(Icon, { icon: "input-clear", className: "icon" }))) : null,
                 loading ? (React__default.createElement(Spinner, { show: true, icon: "reload", size: "sm", spinnerClassName: cx('Select-spinner'), loadingConfig: loadingConfig })) : null,
-                React__default.createElement("span", { className: cx('Select-arrow') },
+                React__default.createElement("span", __assign({ className: cx('Select-arrow') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('arrow').getTestId()),
                     React__default.createElement(Icon, { icon: "right-arrow-bold", className: "icon" })),
                 isOpen ? _this.renderOuter(options) : null));
         }));

package/esm/components/SelectMobile.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -248,24 +248,25 @@ var SelectMobile = /** @class */ (function (_super) {
                     : highlight(item[labelField], inputValue, cx('Select-option-hl')),
                 item.tip))));
         };
+        var searchInput = (React__default.createElement("div", { className: cx("Select-input", {
+                'is-focused': this.state.isFocused
+            }) },
+            React__default.createElement(Icon, { icon: "search", className: "icon" }),
+            React__default.createElement(Input, __assign({}, getInputProps({
+                onFocus: this.onFocus,
+                onBlur: this.onBlur,
+                disabled: disabled,
+                placeholder: __(searchPromptText),
+                onChange: this.handleInputChange,
+                ref: this.inputRef
+            }))),
+            (inputValue === null || inputValue === void 0 ? void 0 : inputValue.length) ? (React__default.createElement("a", { onClick: this.clearSearchValue, className: cx('Select-clear') },
+                React__default.createElement(Icon, { icon: "close", className: "icon" }))) : null));
         var menu = (React__default.createElement("div", { className: cx('Select-menu', {
                 'Select--longlist': enableVirtualRender,
                 'is-mobile': true
             }) },
-            searchable ? (React__default.createElement("div", { className: cx("Select-input", {
-                    'is-focused': this.state.isFocused
-                }) },
-                React__default.createElement(Icon, { icon: "search", className: "icon" }),
-                React__default.createElement(Input, __assign({}, getInputProps({
-                    onFocus: this.onFocus,
-                    onBlur: this.onBlur,
-                    disabled: disabled,
-                    placeholder: __(searchPromptText),
-                    onChange: this.handleInputChange,
-                    ref: this.inputRef
-                }))),
-                (inputValue === null || inputValue === void 0 ? void 0 : inputValue.length) ? (React__default.createElement("a", { onClick: this.clearSearchValue, className: cx('Select-clear') },
-                    React__default.createElement(Icon, { icon: "close", className: "icon" }))) : null)) : null,
+            searchable ? searchInput : null,
             multiple && valuesNoWrap ? (React__default.createElement("div", { className: cx('Select-option') },
                 "\u5DF2\u9009\u62E9(",
                 selectionValues.length,
@@ -278,10 +279,12 @@ var SelectMobile = /** @class */ (function (_super) {
                     : filtedOptions.length * virtualItemHeight, itemCount: filtedOptions.length, itemSize: virtualItemHeight, renderItem: renderItem })) : (filtedOptions.map(function (item, index) {
                 return renderItem({ index: index });
             }))) : (React__default.createElement("div", { className: cx('Select-noResult') }, __(noResultsText)))));
-        return (React__default.createElement(PopUp, { className: cx("Select-popup"), container: popOverContainer, isShow: isOpen, showConfirm: true, onConfirm: this.onConfirm, onHide: onClose }, multiple ? (menu) : (React__default.createElement(Picker, { className: 'Select-picker', columns: {
-                options: filtedOptions,
-                optionRender: renderMenu
-            }, onChange: function (item) { return _this.handleChange(item); }, showToolbar: false, labelField: labelField, valueField: valueField, itemHeight: 40, visibleItemCount: visibleItemCount, value: [(_a = selection[0]) === null || _a === void 0 ? void 0 : _a[valueField]] }))));
+        return (React__default.createElement(PopUp, { className: cx("Select-popup"), container: popOverContainer, isShow: isOpen, showConfirm: true, onConfirm: this.onConfirm, onHide: onClose }, multiple ? (menu) : (React__default.createElement("div", { className: cx("Select-popup-inner") },
+            searchable ? searchInput : null,
+            React__default.createElement(Picker, { className: 'Select-picker', columns: {
+                    options: filtedOptions,
+                    optionRender: renderMenu
+                }, highlightTxt: inputValue, onChange: function (item) { return _this.handleChange(item); }, showToolbar: false, labelField: labelField, valueField: valueField, itemHeight: 40, visibleItemCount: visibleItemCount, value: [(_a = selection[0]) === null || _a === void 0 ? void 0 : _a[valueField]] })))));
     };
     __decorate([
         autobind,