amis-ui 2.9.0 → 3.1.0

package/lib/components/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -102,7 +102,7 @@ var TabsTransfer = /** @class */ (function (_super) {
         this.handleSeachCancel();
     };
     TabsTransfer.prototype.renderSearchResult = function (searchResult) {
-        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 _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
@@ -111,28 +111,28 @@ var TabsTransfer = /** @class */ (function (_super) {
                         panel: 'result'
                     });
                 }
-                : undefined })) : 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' ? (React__default["default"].createElement(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 })) : (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 })) : (React__default["default"].createElement(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'
                     });
                 }
-                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold }));
+                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField }));
     };
     TabsTransfer.prototype.renderSelect = function () {
         var _this = this;
-        var _a = this.props, options = _a.options, placeholder = _a.placeholder, activeKey = _a.activeKey, cx = _a.classnames, __ = _a.translate;
+        var _a = this.props, options = _a.options, placeholder = _a.placeholder, activeKey = _a.activeKey, cx = _a.classnames, __ = _a.translate, ctx = _a.ctx;
         var showOptions = options.filter(function (item) { return item.visible !== false; });
         if (!Array.isArray(options) || !options.length) {
             return (React__default["default"].createElement("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: option.label || option.title, className: "TabsTransfer-tab" },
+        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') },
                 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,
@@ -142,36 +142,36 @@ 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;
-        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 })) : 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
+        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
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'tab',
                         tag: option
                     });
                 }
-                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold })) : 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' ? (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
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'tab',
                         tag: option
                     });
                 }
-                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold })) : 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' ? (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
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'tab',
                         tag: option
                     });
                 }
-                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold })) : (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 })) : (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
                 ? function (item, states) {
                     return optionItemRender(item, states, {
                         panel: 'tab',
                         tag: option
                     });
                 }
-                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold }));
+                : undefined, itemHeight: itemHeight, virtualThreshold: virtualThreshold, valueField: valueField, labelField: labelField }));
     };
     TabsTransfer.prototype.render = function () {
         var _a = this.props, className = _a.className, cx = _a.classnames; _a.optionItemRender; _a.onSearch; var reset = tslib.__rest(_a, ["className", "classnames", "optionItemRender", "onSearch"]);

package/lib/components/TabsTransferPicker.d.ts

@@ -11,7 +11,7 @@ export declare class TransferPicker extends React.Component<TabsTransferPickerPr
     handleConfirm(value: any): void;
     onFoucs(): void;
     onBlur(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 declare const _default: {
     new (props: Omit<Omit<TabsTransferPickerProps, keyof import("amis-core").LocaleProps> & {
@@ -21,7 +21,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<TabsTransferPickerProps, keyof import("amis-core").LocaleProps> & {
             locale?: string | undefined;
@@ -80,7 +80,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<TabsTransferPickerProps, keyof import("amis-core").LocaleProps> & {
                 locale?: string | undefined;
@@ -143,7 +143,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<TabsTransferPickerProps, keyof import("amis-core").LocaleProps> & {
             locale?: string | undefined;
@@ -206,7 +206,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<TabsTransferPickerProps, keyof import("amis-core").LocaleProps> & {
                 locale?: string | undefined;

package/lib/components/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -41,7 +41,7 @@ var TransferPicker = /** @class */ (function (_super) {
     };
     TransferPicker.prototype.render = function () {
         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, rest = tslib.__rest(_a, ["classnames", "value", "translate", "disabled", "className", "onChange", "size"]);
+        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, rest = tslib.__rest(_a, ["classnames", "value", "translate", "disabled", "className", "onChange", "size", "labelField"]);
         return (React__default["default"].createElement(PickerContainer["default"], { title: __('Select.placeholder'), 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, onChange: function (value, optionModified) {
@@ -55,10 +55,10 @@ var TransferPicker = /** @class */ (function (_super) {
                         else {
                             onChange(value);
                         }
-                    } })));
+                    }, 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 },
+            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')); } },
                 React__default["default"].createElement("span", { className: cx('TransferPicker-icon') },
                     React__default["default"].createElement(icons.Icon, { icon: "pencil", className: "icon" }))));
         }));

package/lib/components/Tag.d.ts

@@ -27,23 +27,23 @@ export interface CheckableTagProps extends TagProps {
 export type TagLevel = 'inactive' | 'active' | 'success' | 'processing' | 'error' | 'warning';
 export declare class Tag extends React.Component<TagProps> {
     static defaultProps: Partial<TagProps>;
-    renderCloseIcon(): JSX.Element | null;
+    renderCloseIcon(): React.JSX.Element | null;
     handleClose(e: React.MouseEvent<HTMLElement>): void;
     handleClick(e: React.MouseEvent<HTMLElement>): void;
     handleMouseEnter(e: React.MouseEvent<any>): void;
     handleMouseLeave(e: React.MouseEvent<any>): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 declare class CheckableTagComp extends React.Component<CheckableTagProps> {
     handleClick(e: React.MouseEvent): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export declare const CheckableTag: {
     new (props: Omit<CheckableTagProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<CheckableTagProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
@@ -73,69 +73,69 @@ 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;
+        children?: React.ReactNode | React.ReactNode[];
         color?: string | undefined;
+        disabled?: boolean | undefined;
         onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+        icon?: React.ReactNode;
+        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;
+        displayMode?: "status" | "normal" | "rounded" | undefined;
         closeIcon?: React.ReactNode;
     } & {
+        style?: React.CSSProperties | undefined;
+        className?: string | undefined;
         classPrefix?: string | undefined;
         classnames?: import("amis-core").ClassNamesFn | undefined;
-        className?: string | undefined;
-        style?: React.CSSProperties | undefined;
         theme?: string | undefined;
     } & import("packages/amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        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;
+            children?: React.ReactNode | React.ReactNode[];
             color?: string | undefined;
+            disabled?: boolean | undefined;
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            icon?: React.ReactNode;
+            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;
+            displayMode?: "status" | "normal" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
+            style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
-            style?: React.CSSProperties | 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;
+            children?: React.ReactNode | React.ReactNode[];
             color?: string | undefined;
+            disabled?: boolean | undefined;
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            icon?: React.ReactNode;
+            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;
+            displayMode?: "status" | "normal" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
+            style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
-            style?: React.CSSProperties | 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;
+            children?: React.ReactNode | React.ReactNode[];
             color?: string | undefined;
+            disabled?: boolean | undefined;
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            icon?: React.ReactNode;
+            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;
+            displayMode?: "status" | "normal" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
+            style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
-            style?: React.CSSProperties | 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;
+            children?: React.ReactNode | React.ReactNode[];
             color?: string | undefined;
+            disabled?: boolean | undefined;
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            icon?: React.ReactNode;
+            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;
+            displayMode?: "status" | "normal" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
+            style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
-            style?: React.CSSProperties | 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;
+            children?: React.ReactNode | React.ReactNode[];
             color?: string | undefined;
+            disabled?: boolean | undefined;
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            icon?: React.ReactNode;
+            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;
+            displayMode?: "status" | "normal" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
+            style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
-            style?: React.CSSProperties | 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;
+            children?: React.ReactNode | React.ReactNode[];
             color?: string | undefined;
+            disabled?: boolean | undefined;
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            icon?: React.ReactNode;
+            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;
+            displayMode?: "status" | "normal" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
+            style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
-            style?: React.CSSProperties | 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;
+            children?: React.ReactNode | React.ReactNode[];
             color?: string | undefined;
+            disabled?: boolean | undefined;
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            icon?: React.ReactNode;
+            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;
+            displayMode?: "status" | "normal" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
+            style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
-            style?: React.CSSProperties | 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;
+            children?: React.ReactNode | React.ReactNode[];
             color?: string | undefined;
+            disabled?: boolean | undefined;
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            icon?: React.ReactNode;
+            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;
+            displayMode?: "status" | "normal" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
+            style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
-            style?: React.CSSProperties | 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;
+            children?: React.ReactNode | React.ReactNode[];
             color?: string | undefined;
+            disabled?: boolean | undefined;
             onClick?: ((e: React.MouseEvent<Element, MouseEvent>) => void) | undefined;
+            icon?: React.ReactNode;
+            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;
+            displayMode?: "status" | "normal" | "rounded" | undefined;
             closeIcon?: React.ReactNode;
         } & {
+            style?: React.CSSProperties | undefined;
+            className?: string | undefined;
             classPrefix?: string | undefined;
             classnames?: import("amis-core").ClassNamesFn | undefined;
-            className?: string | undefined;
-            style?: React.CSSProperties | 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 v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -59,16 +59,32 @@ var Tag = /** @class */ (function (_super) {
     };
     Tag.prototype.render = function () {
         var _a;
-        var _b = this.props, children = _b.children, cx = _b.classnames, className = _b.className, displayMode = _b.displayMode, disabled = _b.disabled, color = _b.color, icon = _b.icon, style = _b.style, label = _b.label; _b.closable;
+        var _b = this.props, children = _b.children, cx = _b.classnames, className = _b.className, displayMode = _b.displayMode, disabled = _b.disabled, color = _b.color, icon = _b.icon, style = _b.style, label = _b.label;
         var isPresetColor = color && PRESET_COLOR.indexOf(color) !== -1;
         var customColor = color && !isPresetColor ? color : undefined;
         var tagStyle = tslib.__assign({ backgroundColor: displayMode === 'normal' ? customColor : undefined, borderColor: displayMode === 'rounded' ? customColor : undefined, color: displayMode === 'rounded' ? customColor : undefined }, style);
-        var prevIcon = displayMode === 'status' && (React__default["default"].createElement("span", { className: cx('Tag--prev') }, typeof icon === 'string' ? (icons.getIcon(icon) ? (React__default["default"].createElement(icons.Icon, { icon: icon, className: "icon" })) : (amisCore.generateIcon(cx, icon, 'Icon'))) : React__default["default"].isValidElement(icon) ? (icon) : (React__default["default"].createElement(icons.Icon, { icon: "dot", className: "icon" }))));
+        var prevIcon;
+        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');
+                }
+            }
+            if (!iconItem) {
+                iconItem = (React__default["default"].createElement(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));
+        }
         return (React__default["default"].createElement("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 },
+                _a)), style: tagStyle, onClick: this.handleClick, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave },
             React__default["default"].createElement("span", { className: cx('Tag-text') },
                 prevIcon,
                 label || children),