amis-ui 3.2.0 → 3.3.0

package/lib/components/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.2.0
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -26,6 +26,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var TabsTransfer = /** @class */ (function (_super) {
     tslib.__extends(TabsTransfer, _super);
     function TabsTransfer() {
@@ -105,19 +108,19 @@ var TabsTransfer = /** @class */ (function (_super) {
         var _a = this.props, searchResultMode = _a.searchResultMode, noResultsText = _a.noResultsText, searchResultColumns = _a.searchResultColumns, cx = _a.classnames, value = _a.value, disabled = _a.disabled, onChange = _a.onChange, option2value = _a.option2value, cellRender = _a.cellRender, optionItemRender = _a.optionItemRender, itemHeight = _a.itemHeight, virtualThreshold = _a.virtualThreshold, onlyChildren = _a.onlyChildren; _a.loadingConfig; var _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b, _c = _a.labelField, labelField = _c === void 0 ? 'label' : _c;
         var options = searchResult || [];
         var mode = searchResultMode;
-        return mode === 'table' ? (React__default["default"].createElement(TableSelection["default"], { placeholder: noResultsText, className: cx('Transfer-checkboxes'), columns: searchResultColumns, options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, cellRender: cellRender, itemHeight: itemHeight, virtualThreshold: virtualThreshold })) : mode === 'tree' ? (React__default["default"].createElement(Tree["default"], { placeholder: noResultsText, className: cx('Transfer-checkboxes'), options: options, value: value, disabled: disabled, onChange: onChange, joinValues: false, onlyChildren: onlyChildren, showIcon: false, multiple: true, cascade: true, itemRender: optionItemRender
+        return mode === 'table' ? (_J$X_(TableSelection["default"], { placeholder: noResultsText, className: cx('Transfer-checkboxes'), columns: searchResultColumns, options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, cellRender: cellRender, itemHeight: itemHeight, virtualThreshold: virtualThreshold })) : mode === 'tree' ? (_J$X_(Tree["default"], { placeholder: noResultsText, className: cx('Transfer-checkboxes'), options: options, value: value, disabled: disabled, onChange: onChange, joinValues: false, onlyChildren: onlyChildren, showIcon: false, multiple: true, cascade: true, itemRender: optionItemRender
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'result'
                     });
                 }
-                : undefined, valueField: valueField, labelField: labelField })) : mode === 'chained' ? (React__default["default"].createElement(ChainedSelection["default"], { placeholder: noResultsText, className: cx('Transfer-checkboxes'), options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, itemRender: optionItemRender
+                : undefined, valueField: valueField, labelField: labelField })) : mode === 'chained' ? (_J$X_(ChainedSelection["default"], { placeholder: noResultsText, className: cx('Transfer-checkboxes'), options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, itemRender: optionItemRender
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'result'
                     });
                 }
-                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : (React__default["default"].createElement(GroupedSelection["default"], { placeholder: noResultsText, className: cx('Transfer-checkboxes'), options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, itemRender: optionItemRender
+                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : (_J$X_(GroupedSelection["default"], { placeholder: noResultsText, className: cx('Transfer-checkboxes'), options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, itemRender: optionItemRender
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'result'
@@ -131,12 +134,12 @@ var TabsTransfer = /** @class */ (function (_super) {
         var showOptions = options.filter(function (item) { return item.visible !== false; });
         var mobileUI = useMobileUI && amisCore.isMobile();
         if (!Array.isArray(options) || !options.length) {
-            return (React__default["default"].createElement("div", { className: cx('TabsTransfer-placeholder') }, __(placeholder || 'placeholder.noOption')));
+            return (_J$X_("div", { className: cx('TabsTransfer-placeholder') }, __(placeholder || 'placeholder.noOption')));
         }
-        return (React__default["default"].createElement(Tabs["default"], { mode: "line", className: cx('TabsTransfer-tabs'), onSelect: this.handleTabChange, activeKey: activeKey }, showOptions.map(function (option, index) { return (React__default["default"].createElement(Tabs.Tab, { eventKey: index, key: index, title: amisCore.filter(option.label || option.title, amisCore.createObject(ctx, option)), className: "TabsTransfer-tab" },
-            option.searchable ? (React__default["default"].createElement("div", { className: cx('TabsTransfer-search', { 'is-mobile': mobileUI }) },
-                React__default["default"].createElement(InputBox["default"], { value: _this.state.inputValue, onChange: function (text) { return _this.handleSearch(text, option); }, placeholder: __('Transfer.searchKeyword'), clearable: false, onKeyDown: _this.handleSearchKeyDown }, _this.state.searchResult !== null ? (React__default["default"].createElement("a", { onClick: _this.handleSeachCancel },
-                    React__default["default"].createElement(icons.Icon, { icon: "close", className: "icon" }))) : (React__default["default"].createElement(icons.Icon, { icon: "search", className: "icon" }))))) : null,
+        return (_J$X_(Tabs["default"], { mode: "line", className: cx('TabsTransfer-tabs'), onSelect: this.handleTabChange, activeKey: activeKey }, showOptions.map(function (option, index) { return (_J$X_(Tabs.Tab, { eventKey: index, key: index, title: amisCore.filter(option.label || option.title, amisCore.createObject(ctx, option)), className: "TabsTransfer-tab" },
+            option.searchable ? (_J$X_("div", { className: cx('TabsTransfer-search', { 'is-mobile': mobileUI }) },
+                _J$X_(InputBox["default"], { value: _this.state.inputValue, onChange: function (text) { return _this.handleSearch(text, option); }, placeholder: __('Transfer.searchKeyword'), clearable: false, onKeyDown: _this.handleSearchKeyDown }, _this.state.searchResult !== null ? (_J$X_("a", { onClick: _this.handleSeachCancel },
+                    _J$X_(icons.Icon, { icon: "close", className: "icon" }))) : (_J$X_(icons.Icon, { icon: "search", className: "icon" }))))) : null,
             _this.state.searchResult !== null
                 ? _this.renderSearchResult(_this.state.searchResult)
                 : _this.renderOptions(option))); })));
@@ -144,28 +147,28 @@ var TabsTransfer = /** @class */ (function (_super) {
     TabsTransfer.prototype.renderOptions = function (option) {
         var _a;
         var _b = this.props, cx = _b.classnames, value = _b.value, disabled = _b.disabled, multiple = _b.multiple, onChange = _b.onChange, option2value = _b.option2value, onDeferLoad = _b.onDeferLoad, onLeftDeferLoad = _b.onLeftDeferLoad, cellRender = _b.cellRender; _b.translate; var optionItemRender = _b.optionItemRender, itemHeight = _b.itemHeight, virtualThreshold = _b.virtualThreshold, onlyChildren = _b.onlyChildren, loadingConfig = _b.loadingConfig, _c = _b.valueField, valueField = _c === void 0 ? 'value' : _c, _d = _b.labelField, labelField = _d === void 0 ? 'label' : _d;
-        return option.selectMode === 'table' ? (React__default["default"].createElement(TableSelection["default"], { className: cx('Transfer-checkboxes'), columns: option.columns, options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, cellRender: cellRender, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : option.selectMode === 'tree' ? (React__default["default"].createElement(Tree["default"], { loadingConfig: loadingConfig, className: cx('Transfer-checkboxes'), options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, joinValues: false, showIcon: false, onlyChildren: (_a = option.onlyChildren) !== null && _a !== void 0 ? _a : onlyChildren, cascade: true, onDeferLoad: onDeferLoad, autoCheckChildren: option.autoCheckChildren, itemRender: optionItemRender
+        return option.selectMode === 'table' ? (_J$X_(TableSelection["default"], { className: cx('Transfer-checkboxes'), columns: option.columns, options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, cellRender: cellRender, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : option.selectMode === 'tree' ? (_J$X_(Tree["default"], { loadingConfig: loadingConfig, className: cx('Transfer-checkboxes'), options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, joinValues: false, showIcon: false, onlyChildren: (_a = option.onlyChildren) !== null && _a !== void 0 ? _a : onlyChildren, cascade: true, onDeferLoad: onDeferLoad, autoCheckChildren: option.autoCheckChildren, itemRender: optionItemRender
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'tab',
                         tag: option
                     });
                 }
-                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : option.selectMode === 'chained' ? (React__default["default"].createElement(ChainedSelection["default"], { className: cx('Transfer-checkboxes'), options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, defaultSelectedIndex: option.defaultSelectedIndex, itemRender: optionItemRender
+                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : option.selectMode === 'chained' ? (_J$X_(ChainedSelection["default"], { className: cx('Transfer-checkboxes'), options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, defaultSelectedIndex: option.defaultSelectedIndex, itemRender: optionItemRender
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'tab',
                         tag: option
                     });
                 }
-                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : option.selectMode === 'associated' ? (React__default["default"].createElement(AssociatedSelection["default"], { className: cx('Transfer-checkboxes'), options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, onLeftDeferLoad: onLeftDeferLoad, leftMode: option.leftMode, leftOptions: option.leftOptions, leftDefaultValue: option.leftDefaultValue, loadingConfig: loadingConfig, itemRender: optionItemRender
+                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : option.selectMode === 'associated' ? (_J$X_(AssociatedSelection["default"], { className: cx('Transfer-checkboxes'), options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, onLeftDeferLoad: onLeftDeferLoad, leftMode: option.leftMode, leftOptions: option.leftOptions, leftDefaultValue: option.leftDefaultValue, loadingConfig: loadingConfig, itemRender: optionItemRender
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'tab',
                         tag: option
                     });
                 }
-                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : (React__default["default"].createElement(GroupedSelection["default"], { className: cx('Transfer-checkboxes'), options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, itemRender: optionItemRender
+                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField })) : (_J$X_(GroupedSelection["default"], { className: cx('Transfer-checkboxes'), options: option.children || [], value: value, multiple: multiple, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, itemRender: optionItemRender
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'tab',
@@ -176,7 +179,7 @@ var TabsTransfer = /** @class */ (function (_super) {
     };
     TabsTransfer.prototype.render = function () {
         var _a = this.props, className = _a.className, cx = _a.classnames; _a.optionItemRender; _a.onSearch; var useMobileUI = _a.useMobileUI, reset = tslib.__rest(_a, ["className", "classnames", "optionItemRender", "onSearch", "useMobileUI"]);
-        return (React__default["default"].createElement(Transfer["default"], tslib.__assign({}, reset, { useMobileUI: useMobileUI, statistics: false, classnames: cx, className: cx('TabsTransfer', className), selectRender: this.renderSelect })));
+        return (_J$X_(Transfer["default"], tslib.__assign({}, reset, { useMobileUI: useMobileUI, statistics: false, classnames: cx, className: cx('TabsTransfer', className), selectRender: this.renderSelect })));
     };
     TabsTransfer.defaultProps = {
         multiple: true,

package/lib/components/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.2.0
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -19,6 +19,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var TransferPicker = /** @class */ (function (_super) {
     tslib.__extends(TransferPicker, _super);
     function TransferPicker() {
@@ -43,9 +46,9 @@ var TransferPicker = /** @class */ (function (_super) {
         var _this = this;
         var _a = this.props, cx = _a.classnames, value = _a.value, __ = _a.translate, disabled = _a.disabled, className = _a.className, onChange = _a.onChange, size = _a.size, _b = _a.labelField, labelField = _b === void 0 ? 'label' : _b, useMobileUI = _a.useMobileUI, popOverContainer = _a.popOverContainer, rest = tslib.__rest(_a, ["classnames", "value", "translate", "disabled", "className", "onChange", "size", "labelField", "useMobileUI", "popOverContainer"]);
         var mobileUI = useMobileUI && amisCore.isMobile();
-        return (React__default["default"].createElement(PickerContainer["default"], { title: __('Select.placeholder'), useMobileUI: useMobileUI, popOverContainer: popOverContainer, onFocus: this.onFoucs, onClose: this.onBlur, bodyRender: function (_a) {
+        return (_J$X_(PickerContainer["default"], { title: __('Select.placeholder'), useMobileUI: useMobileUI, popOverContainer: popOverContainer, onFocus: this.onFoucs, onClose: this.onBlur, bodyRender: function (_a) {
                 _a.onClose; var value = _a.value, onChange = _a.onChange, setState = _a.setState, states = tslib.__rest(_a, ["onClose", "value", "onChange", "setState"]);
-                return (React__default["default"].createElement(TabsTransfer["default"], tslib.__assign({}, rest, states, { value: value, useMobileUI: useMobileUI, onChange: function (value, optionModified) {
+                return (_J$X_(TabsTransfer["default"], tslib.__assign({}, rest, states, { value: value, useMobileUI: useMobileUI, onChange: function (value, optionModified) {
                         if (optionModified) {
                             var options = amisCore.mapTree(rest.options, function (item) {
                                 return (value.find(function (a) { return a.value === item.value; }) || item);
@@ -59,8 +62,8 @@ var TransferPicker = /** @class */ (function (_super) {
                     }, labelField: labelField })));
             }, value: value, onConfirm: this.handleConfirm, size: size }, function (_a) {
             var onClick = _a.onClick, isOpened = _a.isOpened;
-            return (React__default["default"].createElement(ResultBox["default"], { className: cx('TransferPicker', className, isOpened ? 'is-active' : ''), allowInput: false, result: value, onResultChange: onChange, onResultClick: onClick, placeholder: __('Select.placeholder'), disabled: disabled, itemRender: function (option) { return (React__default["default"].createElement("span", null, (option && option[labelField]) || 'undefiend')); }, useMobileUI: useMobileUI }, !mobileUI ? (React__default["default"].createElement("span", { className: cx('TransferPicker-icon') },
-                React__default["default"].createElement(icons.Icon, { icon: "pencil", className: "icon" }))) : null));
+            return (_J$X_(ResultBox["default"], { className: cx('TransferPicker', className, isOpened ? 'is-active' : ''), allowInput: false, result: value, onResultChange: onChange, onResultClick: onClick, placeholder: __('Select.placeholder'), disabled: disabled, itemRender: function (option) { return (_J$X_("span", null, (option && option[labelField]) || 'undefiend')); }, useMobileUI: useMobileUI }, !mobileUI ? (_J$X_("span", { className: cx('TransferPicker-icon') },
+                _J$X_(icons.Icon, { icon: "pencil", className: "icon" }))) : null));
         }));
     };
     tslib.__decorate([

package/lib/components/Tag.d.ts

@@ -73,23 +73,23 @@ export declare const CheckableTag: {
 };
 declare const _default: {
     new (props: Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-        children?: React.ReactNode | React.ReactNode[];
-        label?: React.ReactNode;
-        onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
         color?: string | undefined;
+        icon?: React.ReactNode;
+        label?: React.ReactNode;
+        children?: React.ReactNode | React.ReactNode[];
         onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+        onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
         onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
         onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
         disabled?: boolean | undefined;
-        icon?: React.ReactNode;
         closable?: boolean | undefined;
         displayMode?: "normal" | "status" | "rounded" | undefined;
         closeIcon?: React.ReactNode;
     } & {
-        classPrefix?: string | undefined;
         classnames?: import("amis-core").ClassNamesFn | undefined;
-        className?: string | undefined;
+        classPrefix?: string | undefined;
         style?: React.CSSProperties | undefined;
+        className?: string | undefined;
         theme?: string | undefined;
     } & import("packages/amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
@@ -98,44 +98,44 @@ declare const _default: {
         render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-            children?: React.ReactNode | React.ReactNode[];
-            label?: React.ReactNode;
-            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             color?: string | undefined;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            children?: React.ReactNode | React.ReactNode[];
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             disabled?: boolean | undefined;
-            icon?: React.ReactNode;
             closable?: boolean | undefined;
             displayMode?: "normal" | "status" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
-            classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
+            classPrefix?: string | undefined;
             style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-            children?: React.ReactNode | React.ReactNode[];
-            label?: React.ReactNode;
-            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             color?: string | undefined;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            children?: React.ReactNode | React.ReactNode[];
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             disabled?: boolean | undefined;
-            icon?: React.ReactNode;
             closable?: boolean | undefined;
             displayMode?: "normal" | "status" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
-            classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
+            classPrefix?: string | undefined;
             style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
@@ -144,147 +144,147 @@ declare const _default: {
         };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-            children?: React.ReactNode | React.ReactNode[];
-            label?: React.ReactNode;
-            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             color?: string | undefined;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            children?: React.ReactNode | React.ReactNode[];
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             disabled?: boolean | undefined;
-            icon?: React.ReactNode;
             closable?: boolean | undefined;
             displayMode?: "normal" | "status" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
-            classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
+            classPrefix?: string | undefined;
             style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
         getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-            children?: React.ReactNode | React.ReactNode[];
-            label?: React.ReactNode;
-            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             color?: string | undefined;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            children?: React.ReactNode | React.ReactNode[];
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             disabled?: boolean | undefined;
-            icon?: React.ReactNode;
             closable?: boolean | undefined;
             displayMode?: "normal" | "status" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
-            classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
+            classPrefix?: string | undefined;
             style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
         componentDidUpdate?(prevProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-            children?: React.ReactNode | React.ReactNode[];
-            label?: React.ReactNode;
-            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             color?: string | undefined;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            children?: React.ReactNode | React.ReactNode[];
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             disabled?: boolean | undefined;
-            icon?: React.ReactNode;
             closable?: boolean | undefined;
             displayMode?: "normal" | "status" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
-            classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
+            classPrefix?: string | undefined;
             style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
         componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-            children?: React.ReactNode | React.ReactNode[];
-            label?: React.ReactNode;
-            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             color?: string | undefined;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            children?: React.ReactNode | React.ReactNode[];
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             disabled?: boolean | undefined;
-            icon?: React.ReactNode;
             closable?: boolean | undefined;
             displayMode?: "normal" | "status" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
-            classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
+            classPrefix?: string | undefined;
             style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
         UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-            children?: React.ReactNode | React.ReactNode[];
-            label?: React.ReactNode;
-            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             color?: string | undefined;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            children?: React.ReactNode | React.ReactNode[];
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             disabled?: boolean | undefined;
-            icon?: React.ReactNode;
             closable?: boolean | undefined;
             displayMode?: "normal" | "status" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
-            classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
+            classPrefix?: string | undefined;
             style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
         componentWillUpdate?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-            children?: React.ReactNode | React.ReactNode[];
-            label?: React.ReactNode;
-            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             color?: string | undefined;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            children?: React.ReactNode | React.ReactNode[];
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             disabled?: boolean | undefined;
-            icon?: React.ReactNode;
             closable?: boolean | undefined;
             displayMode?: "normal" | "status" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
-            classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
+            classPrefix?: string | undefined;
             style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & {
-            children?: React.ReactNode | React.ReactNode[];
-            label?: React.ReactNode;
-            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             color?: string | undefined;
+            icon?: React.ReactNode;
+            label?: React.ReactNode;
+            children?: React.ReactNode | React.ReactNode[];
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            onClose?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseEnter?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             onMouseLeave?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             disabled?: boolean | undefined;
-            icon?: React.ReactNode;
             closable?: boolean | undefined;
             displayMode?: "normal" | "status" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
-            classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
+            classPrefix?: string | undefined;
             style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };

package/lib/components/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.2.0
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -16,9 +16,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-/**
- * @file Tag
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var PRESET_COLOR = [
     'inactive',
     'active',
@@ -37,8 +37,8 @@ var Tag = /** @class */ (function (_super) {
         if (!closable) {
             return null;
         }
-        var icon = typeof closeIcon === 'string' ? (icons.getIcon(closeIcon) ? (React__default["default"].createElement(icons.Icon, { icon: closeIcon, className: "icon" })) : (amisCore.generateIcon(cx, closeIcon, 'Icon'))) : React__default["default"].isValidElement(closeIcon) ? (closeIcon) : (React__default["default"].createElement(icons.Icon, { icon: "close", className: "icon" }));
-        return (React__default["default"].createElement("span", { className: cx("Tag--close"), onClick: this.handleClose }, icon));
+        var icon = _J$X_(icons.Icon, { cx: cx, icon: closeIcon || 'close', className: "icon" });
+        return (_J$X_("span", { className: cx("Tag--close"), onClick: this.handleClose }, icon));
     };
     Tag.prototype.handleClose = function (e) {
         var onClose = this.props.onClose;
@@ -67,25 +67,20 @@ var Tag = /** @class */ (function (_super) {
         if (displayMode === 'status') {
             var iconItem = void 0;
             if (icon) {
-                if (typeof icon === 'string' && icons.getIcon(icon)) {
-                    iconItem = React__default["default"].createElement(icons.Icon, { icon: icon, className: "icon" });
-                }
-                else {
-                    iconItem = amisCore.generateIcon(cx, icon, 'Icon');
-                }
+                iconItem = _J$X_(icons.Icon, { icon: icon, className: "icon" });
             }
             if (!iconItem) {
-                iconItem = (React__default["default"].createElement(icons.Icon, { icon: "dot", className: cx('icon', 'Tag-default-icon') }));
+                iconItem = (_J$X_(icons.Icon, { icon: "dot", className: cx('icon', 'Tag-default-icon') }));
             }
             var prevIconStyle = customColor ? { style: { color: customColor } } : {};
-            prevIcon = (React__default["default"].createElement("span", tslib.__assign({ className: cx('Tag--prev') }, prevIconStyle), iconItem));
+            prevIcon = (_J$X_("span", tslib.__assign({ className: cx('Tag--prev') }, prevIconStyle), iconItem));
         }
-        return (React__default["default"].createElement("span", { className: cx('Tag', "Tag--".concat(displayMode), className, (_a = {},
+        return (_J$X_("span", { className: cx('Tag', "Tag--".concat(displayMode), className, (_a = {},
                 _a["Tag--".concat(displayMode, "--").concat(color)] = isPresetColor,
                 _a["Tag--".concat(displayMode, "--hasColor")] = color,
                 _a["Tag--disabled"] = disabled,
                 _a)), style: tagStyle, onClick: this.handleClick, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave },
-            React__default["default"].createElement("span", { className: cx('Tag-text') },
+            _J$X_("span", { className: cx('Tag-text') },
                 prevIcon,
                 label || children),
             this.renderCloseIcon()));
@@ -131,7 +126,7 @@ var CheckableTagComp = /** @class */ (function (_super) {
     };
     CheckableTagComp.prototype.render = function () {
         var _a = this.props, cx = _a.classnames, className = _a.className, disabled = _a.disabled, label = _a.label, children = _a.children, checked = _a.checked, _b = _a.style, style = _b === void 0 ? {} : _b;
-        return (React__default["default"].createElement("span", { className: cx(className, 'Tag', 'Tag--checkable', {
+        return (_J$X_("span", { className: cx(className, 'Tag', 'Tag--checkable', {
                 'Tag--checkable--checked': checked,
                 'Tag--checkable--disabled': disabled
             }), onClick: disabled ? amisCore.noop : this.handleClick, style: style }, label || children));