amis-ui 3.1.1 → 3.3.0

package/lib/components/AssociatedSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,7 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var React = require('react');
+require('react');
 var Selection = require('./Selection.js');
 var amisCore = require('amis-core');
 var GroupedSelection = require('./GroupedSelection.js');
@@ -17,15 +17,9 @@ var ChainedSelection = require('./ChainedSelection.js');
 var icons = require('./icons.js');
 var Tree = require('./Tree.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-
-/**
- * 关联多选框，仅支持两层关联选择。
- * 左边先点选，然后右边再次点选。
- * 可以满足，先从 tree 中选中一个元素，然后查出来一个列表再次勾选。
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var AssociatedSelection = /** @class */ (function (_super) {
     tslib.__extends(AssociatedSelection, _super);
     function AssociatedSelection() {
@@ -75,14 +69,14 @@ var AssociatedSelection = /** @class */ (function (_super) {
         var _a = this.props, cx = _a.classnames, className = _a.className, leftOptions = _a.leftOptions, options = _a.options, option2value = _a.option2value, rightMode = _a.rightMode, onChange = _a.onChange, columns = _a.columns, value = _a.value, disabled = _a.disabled, leftMode = _a.leftMode, cellRender = _a.cellRender, multiple = _a.multiple, itemRender = _a.itemRender, labelField = _a.labelField, virtualThreshold = _a.virtualThreshold, itemHeight = _a.itemHeight, loadingConfig = _a.loadingConfig, checkAll = _a.checkAll, checkAllLabel = _a.checkAllLabel;
         var selectdOption = Selection.BaseSelection.resolveSelected(this.state.leftValue, options, function (option) { return option.ref; });
         var __ = this.props.translate;
-        return (React__default["default"].createElement("div", { className: cx('AssociatedSelection', className) },
-            React__default["default"].createElement("div", { className: cx('AssociatedSelection-left') }, leftMode === 'tree' ? (React__default["default"].createElement(Tree["default"], { multiple: false, disabled: disabled, value: this.state.leftValue, options: leftOptions, onChange: this.handleLeftSelect, onDeferLoad: this.handleLeftDeferLoad, virtualThreshold: virtualThreshold, itemHeight: itemHeight, loadingConfig: loadingConfig })) : (React__default["default"].createElement(GroupedSelection["default"], { option2value: this.leftOption2Value, options: leftOptions, value: this.state.leftValue, disabled: disabled, onChange: this.handleLeftSelect, multiple: false, clearable: false, virtualThreshold: virtualThreshold, itemHeight: itemHeight }))),
-            React__default["default"].createElement("div", { className: cx('AssociatedSelection-right') }, this.state.leftValue ? (selectdOption ? (selectdOption.defer && !selectdOption.loaded ? (React__default["default"].createElement("div", { className: cx('AssociatedSelection-box') },
-                React__default["default"].createElement("div", { className: cx('AssociatedSelection-reload', selectdOption.loading ? 'is-spin' : 'is-clickable'), onClick: selectdOption.loading
+        return (_J$X_("div", { className: cx('AssociatedSelection', className) },
+            _J$X_("div", { className: cx('AssociatedSelection-left') }, leftMode === 'tree' ? (_J$X_(Tree["default"], { multiple: false, disabled: disabled, value: this.state.leftValue, options: leftOptions, onChange: this.handleLeftSelect, onDeferLoad: this.handleLeftDeferLoad, virtualThreshold: virtualThreshold, itemHeight: itemHeight, loadingConfig: loadingConfig })) : (_J$X_(GroupedSelection["default"], { option2value: this.leftOption2Value, options: leftOptions, value: this.state.leftValue, disabled: disabled, onChange: this.handleLeftSelect, multiple: false, clearable: false, virtualThreshold: virtualThreshold, itemHeight: itemHeight }))),
+            _J$X_("div", { className: cx('AssociatedSelection-right') }, this.state.leftValue ? (selectdOption ? (selectdOption.defer && !selectdOption.loaded ? (_J$X_("div", { className: cx('AssociatedSelection-box') },
+                _J$X_("div", { className: cx('AssociatedSelection-reload', selectdOption.loading ? 'is-spin' : 'is-clickable'), onClick: selectdOption.loading
                         ? undefined
                         : this.handleRetry.bind(this, selectdOption) },
-                    React__default["default"].createElement(icons.Icon, { icon: "reload", className: "icon" })),
-                selectdOption.loading ? (React__default["default"].createElement("p", null, __('loading'))) : (React__default["default"].createElement("p", null, __('Transfer.refreshIcon'))))) : rightMode === 'table' ? (React__default["default"].createElement(TableSelection["default"], { columns: columns, value: value, disabled: disabled, options: selectdOption.children || [], onChange: onChange, option2value: option2value, cellRender: cellRender, multiple: multiple, virtualThreshold: virtualThreshold, itemHeight: itemHeight })) : rightMode === 'tree' ? (React__default["default"].createElement(Tree["default"], { value: value, disabled: disabled, options: selectdOption.children || [], onChange: onChange, multiple: multiple, labelField: labelField, virtualThreshold: virtualThreshold, itemHeight: itemHeight, loadingConfig: loadingConfig, checkAllLabel: checkAllLabel, checkAll: checkAll })) : rightMode === 'chained' ? (React__default["default"].createElement(ChainedSelection["default"], { value: value, disabled: disabled, options: selectdOption.children || [], onChange: onChange, option2value: option2value, multiple: multiple, itemRender: itemRender, labelField: labelField, virtualThreshold: virtualThreshold, itemHeight: itemHeight, loadingConfig: loadingConfig, checkAllLabel: checkAllLabel, checkAll: checkAll })) : (React__default["default"].createElement(GroupedSelection["default"], { value: value, disabled: disabled, options: selectdOption.children || [], onChange: onChange, option2value: option2value, multiple: multiple, itemRender: itemRender, labelField: labelField, virtualThreshold: virtualThreshold, itemHeight: itemHeight, checkAllLabel: checkAllLabel, checkAll: checkAll }))) : (React__default["default"].createElement("div", { className: cx('AssociatedSelection-box') }, __('Transfer.configError')))) : (React__default["default"].createElement("div", { className: cx('AssociatedSelection-box') }, __('Transfer.selectFromLeft'))))));
+                    _J$X_(icons.Icon, { icon: "reload", className: "icon" })),
+                selectdOption.loading ? (_J$X_("p", null, __('loading'))) : (_J$X_("p", null, __('Transfer.refreshIcon'))))) : rightMode === 'table' ? (_J$X_(TableSelection["default"], { columns: columns, value: value, disabled: disabled, options: selectdOption.children || [], onChange: onChange, option2value: option2value, cellRender: cellRender, multiple: multiple, virtualThreshold: virtualThreshold, itemHeight: itemHeight })) : rightMode === 'tree' ? (_J$X_(Tree["default"], { value: value, disabled: disabled, options: selectdOption.children || [], onChange: onChange, multiple: multiple, labelField: labelField, virtualThreshold: virtualThreshold, itemHeight: itemHeight, loadingConfig: loadingConfig, checkAllLabel: checkAllLabel, checkAll: checkAll })) : rightMode === 'chained' ? (_J$X_(ChainedSelection["default"], { value: value, disabled: disabled, options: selectdOption.children || [], onChange: onChange, option2value: option2value, multiple: multiple, itemRender: itemRender, labelField: labelField, virtualThreshold: virtualThreshold, itemHeight: itemHeight, loadingConfig: loadingConfig, checkAllLabel: checkAllLabel, checkAll: checkAll })) : (_J$X_(GroupedSelection["default"], { value: value, disabled: disabled, options: selectdOption.children || [], onChange: onChange, option2value: option2value, multiple: multiple, itemRender: itemRender, labelField: labelField, virtualThreshold: virtualThreshold, itemHeight: itemHeight, checkAllLabel: checkAllLabel, checkAll: checkAll }))) : (_J$X_("div", { className: cx('AssociatedSelection-box') }, __('Transfer.configError')))) : (_J$X_("div", { className: cx('AssociatedSelection-box') }, __('Transfer.selectFromLeft'))))));
     };
     tslib.__decorate([
         amisCore.autobind,

package/lib/components/Avatar.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="hoist-non-react-statics" />
 import * as React from 'react';
-import { ClassNamesFn, ThemeProps, IconCheckedSchema } from 'amis-core';
+import { ClassNamesFn, ThemeProps } from 'amis-core';
+import { IconCheckedSchema } from './icons';
 /**
  * Avatar 属性
  */
@@ -77,26 +78,26 @@ export declare class Avatar extends React.Component<AvatarCmptProps, AvatarState
 }
 declare const _default: {
     new (props: Pick<Omit<AvatarCmptProps, keyof ThemeProps>, never> & {
+        icon?: React.ReactNode | IconCheckedSchema;
         text?: string | undefined;
         children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-        alt?: string | undefined;
-        crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-        size?: number | "small" | "default" | "large" | undefined;
-        src?: React.ReactNode;
         draggable?: boolean | undefined;
         onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-        icon?: React.ReactNode | IconCheckedSchema;
-        fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+        size?: number | "small" | "default" | "large" | undefined;
+        alt?: string | undefined;
+        crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
         shape?: "circle" | "square" | "rounded" | undefined;
+        src?: React.ReactNode;
+        fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
         gap?: number | undefined;
     } & {
-        className?: string | undefined;
-        theme?: string | undefined;
+        classnames?: ClassNamesFn | undefined;
+        classPrefix?: string | undefined;
         style?: {
             [prop: string]: any;
         } | undefined;
-        classPrefix?: string | undefined;
-        classnames?: ClassNamesFn | undefined;
+        className?: string | undefined;
+        theme?: string | undefined;
     } & import("packages/amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
@@ -104,49 +105,49 @@ declare const _default: {
         render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<AvatarCmptProps, keyof ThemeProps>, never> & {
+            icon?: React.ReactNode | IconCheckedSchema;
             text?: string | undefined;
             children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-            alt?: string | undefined;
-            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-            size?: number | "small" | "default" | "large" | undefined;
-            src?: React.ReactNode;
             draggable?: boolean | undefined;
             onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-            icon?: React.ReactNode | IconCheckedSchema;
-            fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+            size?: number | "small" | "default" | "large" | undefined;
+            alt?: string | undefined;
+            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
             shape?: "circle" | "square" | "rounded" | undefined;
+            src?: React.ReactNode;
+            fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
             gap?: number | undefined;
         } & {
-            className?: string | undefined;
-            theme?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
+            classPrefix?: string | undefined;
             style?: {
                 [prop: string]: any;
             } | undefined;
-            classPrefix?: string | undefined;
-            classnames?: ClassNamesFn | 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<AvatarCmptProps, keyof ThemeProps>, never> & {
+            icon?: React.ReactNode | IconCheckedSchema;
             text?: string | undefined;
             children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-            alt?: string | undefined;
-            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-            size?: number | "small" | "default" | "large" | undefined;
-            src?: React.ReactNode;
             draggable?: boolean | undefined;
             onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-            icon?: React.ReactNode | IconCheckedSchema;
-            fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+            size?: number | "small" | "default" | "large" | undefined;
+            alt?: string | undefined;
+            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
             shape?: "circle" | "square" | "rounded" | undefined;
+            src?: React.ReactNode;
+            fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
             gap?: number | undefined;
         } & {
-            className?: string | undefined;
-            theme?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
+            classPrefix?: string | undefined;
             style?: {
                 [prop: string]: any;
             } | undefined;
-            classPrefix?: string | undefined;
-            classnames?: ClassNamesFn | undefined;
+            className?: string | undefined;
+            theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
@@ -154,162 +155,162 @@ declare const _default: {
         };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<AvatarCmptProps, keyof ThemeProps>, never> & {
+            icon?: React.ReactNode | IconCheckedSchema;
             text?: string | undefined;
             children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-            alt?: string | undefined;
-            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-            size?: number | "small" | "default" | "large" | undefined;
-            src?: React.ReactNode;
             draggable?: boolean | undefined;
             onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-            icon?: React.ReactNode | IconCheckedSchema;
-            fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+            size?: number | "small" | "default" | "large" | undefined;
+            alt?: string | undefined;
+            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
             shape?: "circle" | "square" | "rounded" | undefined;
+            src?: React.ReactNode;
+            fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
             gap?: number | undefined;
         } & {
-            className?: string | undefined;
-            theme?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
+            classPrefix?: string | undefined;
             style?: {
                 [prop: string]: any;
             } | undefined;
-            classPrefix?: string | undefined;
-            classnames?: ClassNamesFn | 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<AvatarCmptProps, keyof ThemeProps>, never> & {
+            icon?: React.ReactNode | IconCheckedSchema;
             text?: string | undefined;
             children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-            alt?: string | undefined;
-            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-            size?: number | "small" | "default" | "large" | undefined;
-            src?: React.ReactNode;
             draggable?: boolean | undefined;
             onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-            icon?: React.ReactNode | IconCheckedSchema;
-            fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+            size?: number | "small" | "default" | "large" | undefined;
+            alt?: string | undefined;
+            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
             shape?: "circle" | "square" | "rounded" | undefined;
+            src?: React.ReactNode;
+            fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
             gap?: number | undefined;
         } & {
-            className?: string | undefined;
-            theme?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
+            classPrefix?: string | undefined;
             style?: {
                 [prop: string]: any;
             } | undefined;
-            classPrefix?: string | undefined;
-            classnames?: ClassNamesFn | undefined;
+            className?: string | undefined;
+            theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
         componentDidUpdate?(prevProps: Readonly<Pick<Omit<AvatarCmptProps, keyof ThemeProps>, never> & {
+            icon?: React.ReactNode | IconCheckedSchema;
             text?: string | undefined;
             children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-            alt?: string | undefined;
-            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-            size?: number | "small" | "default" | "large" | undefined;
-            src?: React.ReactNode;
             draggable?: boolean | undefined;
             onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-            icon?: React.ReactNode | IconCheckedSchema;
-            fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+            size?: number | "small" | "default" | "large" | undefined;
+            alt?: string | undefined;
+            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
             shape?: "circle" | "square" | "rounded" | undefined;
+            src?: React.ReactNode;
+            fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
             gap?: number | undefined;
         } & {
-            className?: string | undefined;
-            theme?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
+            classPrefix?: string | undefined;
             style?: {
                 [prop: string]: any;
             } | undefined;
-            classPrefix?: string | undefined;
-            classnames?: ClassNamesFn | 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<AvatarCmptProps, keyof ThemeProps>, never> & {
+            icon?: React.ReactNode | IconCheckedSchema;
             text?: string | undefined;
             children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-            alt?: string | undefined;
-            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-            size?: number | "small" | "default" | "large" | undefined;
-            src?: React.ReactNode;
             draggable?: boolean | undefined;
             onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-            icon?: React.ReactNode | IconCheckedSchema;
-            fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+            size?: number | "small" | "default" | "large" | undefined;
+            alt?: string | undefined;
+            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
             shape?: "circle" | "square" | "rounded" | undefined;
+            src?: React.ReactNode;
+            fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
             gap?: number | undefined;
         } & {
-            className?: string | undefined;
-            theme?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
+            classPrefix?: string | undefined;
             style?: {
                 [prop: string]: any;
             } | undefined;
-            classPrefix?: string | undefined;
-            classnames?: ClassNamesFn | undefined;
+            className?: string | undefined;
+            theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
         UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<AvatarCmptProps, keyof ThemeProps>, never> & {
+            icon?: React.ReactNode | IconCheckedSchema;
             text?: string | undefined;
             children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-            alt?: string | undefined;
-            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-            size?: number | "small" | "default" | "large" | undefined;
-            src?: React.ReactNode;
             draggable?: boolean | undefined;
             onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-            icon?: React.ReactNode | IconCheckedSchema;
-            fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+            size?: number | "small" | "default" | "large" | undefined;
+            alt?: string | undefined;
+            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
             shape?: "circle" | "square" | "rounded" | undefined;
+            src?: React.ReactNode;
+            fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
             gap?: number | undefined;
         } & {
-            className?: string | undefined;
-            theme?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
+            classPrefix?: string | undefined;
             style?: {
                 [prop: string]: any;
             } | undefined;
-            classPrefix?: string | undefined;
-            classnames?: ClassNamesFn | undefined;
+            className?: string | undefined;
+            theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
         componentWillUpdate?(nextProps: Readonly<Pick<Omit<AvatarCmptProps, keyof ThemeProps>, never> & {
+            icon?: React.ReactNode | IconCheckedSchema;
             text?: string | undefined;
             children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-            alt?: string | undefined;
-            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-            size?: number | "small" | "default" | "large" | undefined;
-            src?: React.ReactNode;
             draggable?: boolean | undefined;
             onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-            icon?: React.ReactNode | IconCheckedSchema;
-            fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+            size?: number | "small" | "default" | "large" | undefined;
+            alt?: string | undefined;
+            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
             shape?: "circle" | "square" | "rounded" | undefined;
+            src?: React.ReactNode;
+            fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
             gap?: number | undefined;
         } & {
-            className?: string | undefined;
-            theme?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
+            classPrefix?: string | undefined;
             style?: {
                 [prop: string]: any;
             } | undefined;
-            classPrefix?: string | undefined;
-            classnames?: ClassNamesFn | 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<AvatarCmptProps, keyof ThemeProps>, never> & {
+            icon?: React.ReactNode | IconCheckedSchema;
             text?: string | undefined;
             children?: React.ReactNode | React.ReactNode[] | ((props?: any) => React.ReactNode | React.ReactNode[]);
-            alt?: string | undefined;
-            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
-            size?: number | "small" | "default" | "large" | undefined;
-            src?: React.ReactNode;
             draggable?: boolean | undefined;
             onError?: ((event: React.SyntheticEvent<HTMLImageElement, Event>) => boolean) | undefined;
-            icon?: React.ReactNode | IconCheckedSchema;
-            fit?: "none" | "fill" | "contain" | "cover" | "scale-down" | undefined;
+            size?: number | "small" | "default" | "large" | undefined;
+            alt?: string | undefined;
+            crossOrigin?: "" | "anonymous" | "use-credentials" | undefined;
             shape?: "circle" | "square" | "rounded" | undefined;
+            src?: React.ReactNode;
+            fit?: "none" | "contain" | "cover" | "fill" | "scale-down" | undefined;
             gap?: number | undefined;
         } & {
-            className?: string | undefined;
-            theme?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
+            classPrefix?: string | undefined;
             style?: {
                 [prop: string]: any;
             } | undefined;
-            classPrefix?: string | undefined;
-            classnames?: ClassNamesFn | undefined;
+            className?: string | undefined;
+            theme?: string | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;

package/lib/components/Avatar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -10,6 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
+var icons = require('./icons.js');
 
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
@@ -31,6 +32,9 @@ function _interopNamespace(e) {
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var prefix = 'Avatar--';
 var childPrefix = prefix + 'text';
 var Avatar = /** @class */ (function (_super) {
@@ -117,24 +121,24 @@ var Avatar = /** @class */ (function (_super) {
         };
         if (typeof src === 'string' && hasImg) {
             var imgStyle = fit ? { objectFit: fit } : {};
-            childrenRender = (React__namespace.createElement("img", { style: imgStyle, src: src, alt: alt, draggable: draggable, onError: this.handleImageLoadError, crossOrigin: crossOrigin }));
+            childrenRender = (_J$X_("img", { style: imgStyle, src: src, alt: alt, draggable: draggable, onError: this.handleImageLoadError, crossOrigin: crossOrigin }));
         }
         else if (isImgRender) {
             childrenRender = src;
         }
         else if (typeof text === 'string' || typeof text === 'number') {
-            childrenRender = (React__namespace.createElement("span", { className: cx(childPrefix), ref: this.avatarChildrenRef, style: scaleStyle }, text));
+            childrenRender = (_J$X_("span", { className: cx(childPrefix), ref: this.avatarChildrenRef, style: scaleStyle }, text));
         }
         else if (['string', 'object'].includes(typeof icon)) {
-            childrenRender = amisCore.generateIcon(cx, icon);
+            childrenRender = _J$X_(icons.Icon, { cx: cx, icon: icon });
         }
         else if (isIconRender) {
             childrenRender = icon;
         }
         else {
-            childrenRender = (React__namespace.createElement("span", { className: cx(childPrefix), ref: this.avatarChildrenRef, style: scaleStyle }, typeof children === 'function' ? children() : children));
+            childrenRender = (_J$X_("span", { className: cx(childPrefix), ref: this.avatarChildrenRef, style: scaleStyle }, typeof children === 'function' ? children() : children));
         }
-        return (React__namespace.createElement("span", { className: cx("Avatar", className, prefix + shape, sizeClass), style: tslib.__assign(tslib.__assign({}, sizeStyle), style), ref: this.avatarRef }, childrenRender));
+        return (_J$X_("span", { className: cx("Avatar", className, prefix + shape, sizeClass), style: tslib.__assign(tslib.__assign({}, sizeStyle), style), ref: this.avatarRef }, childrenRender));
     };
     Avatar.defaultProps = {
         shape: 'circle',

package/lib/components/Badge.d.ts

@@ -63,7 +63,7 @@ export declare class Badge extends React.Component<BadgeProps, object> {
     static propsList: Array<string>;
     constructor(props: BadgeProps);
     renderBadge(text: any, size: number, position: any, offsetStyle: any, sizeStyle: any, animationElement: any): React.JSX.Element | null;
-    render(): string | number | boolean | React.ReactFragment | React.JSX.Element | null | undefined;
+    render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
 }
 export declare function withBadge<P extends object>(Component: React.ComponentType<P>): {
     new (props: (P & BadgeProps) | Readonly<P & BadgeProps>): {

package/lib/components/Badge.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -17,9 +17,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 
-/**
- * @file 角标组件
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var Badge = /** @class */ (function (_super) {
     tslib.__extends(Badge, _super);
     function Badge(props) {
@@ -34,15 +34,15 @@ var Badge = /** @class */ (function (_super) {
         }
         switch (mode) {
             case 'dot':
-                return (React__default["default"].createElement("span", { className: cx('Badge-dot', "Badge--".concat(position), "Badge--".concat(level)), style: tslib.__assign(tslib.__assign(tslib.__assign({}, offsetStyle), sizeStyle), customStyle) }, animationElement));
+                return (_J$X_("span", { className: cx('Badge-dot', "Badge--".concat(position), "Badge--".concat(level)), style: tslib.__assign(tslib.__assign(tslib.__assign({}, offsetStyle), sizeStyle), customStyle) }, animationElement));
             case 'text':
-                return (React__default["default"].createElement("span", { className: cx('Badge-text', "Badge--".concat(position), "Badge--".concat(level)), style: tslib.__assign(tslib.__assign(tslib.__assign({}, offsetStyle), sizeStyle), customStyle) },
+                return (_J$X_("span", { className: cx('Badge-text', "Badge--".concat(position), "Badge--".concat(level)), style: tslib.__assign(tslib.__assign(tslib.__assign({}, offsetStyle), sizeStyle), customStyle) },
                     text,
                     animationElement));
             case 'ribbon':
                 var outSize = size * Math.sqrt(2) + 5;
-                return (React__default["default"].createElement("div", { className: cx('Badge-ribbon-out', "Badge-ribbon-out--".concat(position)), style: { width: outSize, height: outSize } },
-                    React__default["default"].createElement("span", { className: cx('Badge-ribbon', "Badge-ribbon--".concat(position), "Badge--".concat(level)), style: tslib.__assign(tslib.__assign({}, sizeStyle), customStyle) },
+                return (_J$X_("div", { className: cx('Badge-ribbon-out', "Badge-ribbon-out--".concat(position)), style: { width: outSize, height: outSize } },
+                    _J$X_("span", { className: cx('Badge-ribbon', "Badge-ribbon--".concat(position), "Badge--".concat(level)), style: tslib.__assign(tslib.__assign({}, sizeStyle), customStyle) },
                         text,
                         animationElement)));
             default:
@@ -120,7 +120,7 @@ var Badge = /** @class */ (function (_super) {
         if (style && style.background) {
             animationBackground = style.background;
         }
-        var animationElement = animation ? (React__default["default"].createElement("div", { style: {
+        var animationElement = animation ? (_J$X_("div", { style: {
                 position: 'absolute',
                 top: 0,
                 left: 0,
@@ -130,7 +130,7 @@ var Badge = /** @class */ (function (_super) {
                 borderRadius: '50%',
                 animation: 'badgeDotAnimation 1.2s infinite ease-in-out'
             } })) : null;
-        return (React__default["default"].createElement("div", { className: cx('Badge', className) },
+        return (_J$X_("div", { className: cx('Badge', className) },
             children,
             isDisplay
                 ? this.renderBadge(text, size, position, offsetStyle, sizeStyle, animationElement)
@@ -149,10 +149,10 @@ function withBadge(Component) {
             WithBadge.prototype.render = function () {
                 var badge = this.props.badge;
                 if (!badge) {
-                    return React__default["default"].createElement(Component, tslib.__assign({}, this.props));
+                    return _J$X_(Component, tslib.__assign({}, this.props));
                 }
-                return (React__default["default"].createElement(Badge, tslib.__assign({}, this.props),
-                    React__default["default"].createElement(Component, tslib.__assign({}, this.props))));
+                return (_J$X_(Badge, tslib.__assign({}, this.props),
+                    _J$X_(Component, tslib.__assign({}, this.props))));
             };
             return WithBadge;
         }(React__default["default"].Component)),