amis 2.5.3-beta.0 → 2.5.3-beta.3

package/lib/renderers/List.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import Sortable from 'sortablejs';
+import { SpinnerExtraProps } from 'amis-ui';
 import { IListStore, RendererProps, SchemaNode, ActionObject } from 'amis-core';
 import { SchemaQuickEdit } from './QuickEdit';
 import { SchemaPopOver } from './PopOver';
@@ -161,7 +162,7 @@ export interface Column {
     type: string;
     [propName: string]: any;
 }
-export interface ListProps extends RendererProps, Omit<ListSchema, 'type' | 'className'> {
+export interface ListProps extends RendererProps, Omit<ListSchema, 'type' | 'className'>, SpinnerExtraProps {
     store: IListStore;
     selectable?: boolean;
     selected?: Array<any>;

package/lib/renderers/List.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -432,7 +432,7 @@ var List = /** @class */ (function (_super) {
     List.prototype.render = function () {
         var _a;
         var _this = this;
-        var _b = this.props, className = _b.className, style = _b.style, itemClassName = _b.itemClassName, store = _b.store, placeholder = _b.placeholder, render = _b.render; _b.multiple; var listItem = _b.listItem; _b.onAction; _b.hideCheckToggler; _b.checkOnItemClick; _b.itemAction; var affixHeader = _b.affixHeader, cx = _b.classnames, size = _b.size, __ = _b.translate, _c = _b.loading, loading = _c === void 0 ? false : _c;
+        var _b = this.props, className = _b.className, style = _b.style, itemClassName = _b.itemClassName, store = _b.store, placeholder = _b.placeholder, render = _b.render; _b.multiple; var listItem = _b.listItem; _b.onAction; _b.hideCheckToggler; _b.checkOnItemClick; _b.itemAction; var affixHeader = _b.affixHeader, cx = _b.classnames, size = _b.size, __ = _b.translate, _c = _b.loading, loading = _c === void 0 ? false : _c, loadingConfig = _b.loadingConfig;
         this.renderedToolbars = [];
         var heading = this.renderHeading();
         var header = this.renderHeader();
@@ -449,7 +449,7 @@ var List = /** @class */ (function (_super) {
                 return _this.renderListItem(index, listItem, item, itemClassName);
             }))) : (React__default["default"].createElement("div", { className: cx('List-placeholder') }, render('placeholder', __(placeholder)))),
             this.renderFooter(),
-            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
+            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading, loadingConfig: loadingConfig })));
     };
     List.propsList = [
         'header',

package/lib/renderers/Log.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Mapping.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Markdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/MultilineText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Nav.d.ts

@@ -2,6 +2,7 @@
 import React from 'react';
 import { RendererEnv, RendererProps } from 'amis-core';
 import { ThemeProps } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { BadgeObject } from 'amis-ui';
 import { IScopedContext } from 'amis-core';
 import type { BaseSchema, SchemaObject, SchemaApi, SchemaIcon, SchemaUrlPath, SchemaCollection, SchemaClassName } from '../Schema';
@@ -157,7 +158,7 @@ export interface NavigationState {
         opacity?: number;
     };
 }
-export interface NavigationProps extends ThemeProps, Omit<NavSchema, 'type' | 'className'> {
+export interface NavigationProps extends ThemeProps, Omit<NavSchema, 'type' | 'className'>, SpinnerExtraProps {
     onSelect?: (item: Link) => void | false;
     onToggle?: (item: Link, forceFold?: boolean) => void;
     onDragUpdate?: (dropInfo: IDropInfo) => void;
@@ -199,19 +200,21 @@ export declare class Navigation extends React.Component<NavigationProps, Navigat
     handleDragOver(e: DragEvent): void;
     handleDragEnd(e: DragEvent): void;
     renderItem(link: Link, index: number, depth?: number): JSX.Element | null;
-    renderOverflowNavs(overflowConfig: NavOverflow): JSX.Element;
+    renderOverflowNavs(overflowConfig: NavOverflow & {
+        __id?: string | number;
+    }): JSX.Element;
     render(): JSX.Element;
 }
 declare const ThemedNavigation: {
-    new (props: Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
+    new (props: Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
         context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("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<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+        readonly props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
             children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
@@ -219,19 +222,17 @@ declare const ThemedNavigation: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
-        componentWillUnmount?(): void; /**
-         * 横向导航时自动收纳配置
-         */
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "data" | "source" | "render" | "env" | "itemBadge" | "loading" | "reload" | "deferApi" | "draggable" | "onSelect" | "itemActions" | "onToggle" | "links" | "stacked" | "saveOrderApi" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "source" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "loadingConfig" | "itemBadge" | "loading" | "reload" | "deferApi" | "render" | "env" | "data" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/lib/renderers/Nav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -235,11 +235,12 @@ var Navigation = /** @class */ (function (_super) {
                                 });
                             })));
                         } }, function (_a) {
+                        var _b;
                         var onClick = _a.onClick, ref = _a.ref, isOpened = _a.isOpened;
                         return (React__default["default"].createElement("li", { ref: ref, className: cx('Nav-item', 'Nav-item-overflow', {
                                 'is-overflow-opened': isOpened
                             }, overflowClassName), onClick: onClick },
-                            React__default["default"].createElement("a", { "data-id": amisCore.guid(), "data-depth": 1 },
+                            React__default["default"].createElement("a", { "data-id": (_b = overflowConfig.__id) !== null && _b !== void 0 ? _b : amisCore.guid(), "data-depth": 1 },
                                 amisUi.getIcon(overflowIndicator) ? (React__default["default"].createElement(amisUi.Icon, { icon: overflowIndicator, className: "icon" })) : (amisCore.generateIcon(cx, overflowIndicator, 'Nav-itemIcon')),
                                 overflowLabel && amisCore.isObject(overflowLabel)
                                     ? render('nav-overflow-label', overflowLabel)
@@ -251,14 +252,14 @@ var Navigation = /** @class */ (function (_super) {
     };
     Navigation.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, style = _a.style, stacked = _a.stacked, cx = _a.classnames, links = _a.links, loading = _a.loading, overflow = _a.overflow;
+        var _a = this.props, className = _a.className, style = _a.style, stacked = _a.stacked, cx = _a.classnames, links = _a.links, loading = _a.loading, overflow = _a.overflow, loadingConfig = _a.loadingConfig;
         var dropIndicator = this.state.dropIndicator;
         return (React__default["default"].createElement("div", { className: cx('Nav'), style: style }, overflow && amisCore.isObject(overflow) && overflow.enable ? (this.renderOverflowNavs(tslib.__assign({ overflowIndicator: 'fa fa-ellipsis', wrapperComponent: 'ul', itemWidth: 160 }, overflow))) : (React__default["default"].createElement(React__default["default"].Fragment, null,
             React__default["default"].createElement("ul", { className: cx('Nav-list', className, stacked ? 'Nav-list--stacked' : 'Nav-list--tabs') },
                 Array.isArray(links)
                     ? links.map(function (item, index) { return _this.renderItem(item, index); })
                     : null,
-                React__default["default"].createElement(amisUi.Spinner, { show: !!loading, overlay: true })),
+                React__default["default"].createElement(amisUi.Spinner, { show: !!loading, overlay: true, loadingConfig: loadingConfig })),
             dropIndicator ? (React__default["default"].createElement("div", { className: cx('Nav-dropIndicator'), style: dropIndicator })) : null))));
     };
     Navigation.defaultProps = {

package/lib/renderers/Operation.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Page.d.ts

@@ -3,6 +3,7 @@ import { RendererProps } from 'amis-core';
 import { IServiceStore } from 'amis-core';
 import { ActionObject, Location } from 'amis-core';
 import { IScopedContext } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, SchemaCollection, SchemaClassName, SchemaDefaultData, SchemaApi, SchemaExpression, SchemaName, SchemaMessage } from '../Schema';
 import { SchemaRemark } from './Remark';
 /**
@@ -20,7 +21,7 @@ interface CSSRule {
 /**
  * amis Page 渲染器。详情请见：https://baidu.gitee.io/amis/docs/components/page
  */
-export interface PageSchema extends BaseSchema {
+export interface PageSchema extends BaseSchema, SpinnerExtraProps {
     /**
      * 指定为 page 渲染器。
      */
@@ -225,5 +226,6 @@ export declare class PageRenderer extends Page {
     handleDialogConfirm(values: object[], action: ActionObject, ...rest: Array<any>): void;
     handleDrawerConfirm(values: object[], action: ActionObject, ...rest: Array<any>): void;
     setData(values: object, replace?: boolean): void;
+    getData(): any;
 }
 export {};

package/lib/renderers/Page.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -414,7 +414,7 @@ var Page = /** @class */ (function (_super) {
         return header || right;
     };
     Page.prototype.render = function () {
-        var _a = this.props, className = _a.className, store = _a.store, body = _a.body, bodyClassName = _a.bodyClassName, render = _a.render, aside = _a.aside, asideClassName = _a.asideClassName, cx = _a.classnames; _a.header; var showErrorMsg = _a.showErrorMsg, initApi = _a.initApi, regions = _a.regions, style = _a.style, data = _a.data, asideResizor = _a.asideResizor, pullRefresh = _a.pullRefresh, useMobileUI = _a.useMobileUI, __ = _a.translate;
+        var _a = this.props, className = _a.className, store = _a.store, body = _a.body, bodyClassName = _a.bodyClassName, render = _a.render, aside = _a.aside, asideClassName = _a.asideClassName, cx = _a.classnames, showErrorMsg = _a.showErrorMsg, initApi = _a.initApi, regions = _a.regions, style = _a.style, data = _a.data, asideResizor = _a.asideResizor, pullRefresh = _a.pullRefresh, useMobileUI = _a.useMobileUI, __ = _a.translate, loadingConfig = _a.loadingConfig;
         var subProps = {
             onAction: this.handleAction,
             onQuery: initApi ? this.handleQuery : undefined,
@@ -429,8 +429,8 @@ var Page = /** @class */ (function (_super) {
         var pageContent = (React__default["default"].createElement("div", { className: cx('Page-content') },
             React__default["default"].createElement("div", { className: cx('Page-main') },
                 this.renderHeader(),
-                React__default["default"].createElement("div", { className: cx("Page-body", bodyClassName) },
-                    React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: store.loading }),
+                React__default["default"].createElement("div", { className: cx("Page-body", bodyClassName), role: "page-body" },
+                    React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: store.loading, loadingConfig: loadingConfig }),
                     store.error && showErrorMsg !== false ? (React__default["default"].createElement(amisUi.Alert2, { level: "danger", showCloseButton: true, onClose: store.clearMessage }, store.msg)) : null,
                     (Array.isArray(regions) ? ~regions.indexOf('body') : body)
                         ? render('body', body || '', subProps)
@@ -607,6 +607,10 @@ var Page = /** @class */ (function (_super) {
     PageRenderer.prototype.setData = function (values, replace) {
         return this.props.store.updateData(values, undefined, replace);
     };
+    PageRenderer.prototype.getData = function () {
+        var store = this.props.store;
+        return store.data;
+    };
     PageRenderer.contextType = amisCore.ScopedContext;
     PageRenderer = tslib.__decorate([
         amisCore.Renderer({

package/lib/renderers/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/PaginationWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Panel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -72,7 +72,7 @@ var Panel = /** @class */ (function (_super) {
         affixed ? affixDom.classList.add('in') : affixDom.classList.remove('in');
     };
     Panel.prototype.renderBody = function () {
-        var _a = this.props; _a.type; _a.className; var data = _a.data; _a.header; var body = _a.body, render = _a.render; _a.bodyClassName; _a.headerClassName; _a.actionsClassName; _a.footerClassName; var children = _a.children; _a.title; _a.actions; _a.footer; _a.classPrefix; var formMode = _a.formMode, formHorizontal = _a.formHorizontal, subFormMode = _a.subFormMode, subFormHorizontal = _a.subFormHorizontal; _a.id; var rest = tslib.__rest(_a, ["type", "className", "data", "header", "body", "render", "bodyClassName", "headerClassName", "actionsClassName", "footerClassName", "children", "title", "actions", "footer", "classPrefix", "formMode", "formHorizontal", "subFormMode", "subFormHorizontal", "id"]);
+        var _a = this.props; _a.type; _a.className; _a.style; var data = _a.data; _a.header; var body = _a.body, render = _a.render; _a.bodyClassName; _a.headerClassName; _a.actionsClassName; _a.footerClassName; var children = _a.children; _a.title; _a.actions; _a.footer; _a.classPrefix; var formMode = _a.formMode, formHorizontal = _a.formHorizontal, subFormMode = _a.subFormMode, subFormHorizontal = _a.subFormHorizontal; _a.id; var rest = tslib.__rest(_a, ["type", "className", "style", "data", "header", "body", "render", "bodyClassName", "headerClassName", "actionsClassName", "footerClassName", "children", "title", "actions", "footer", "classPrefix", "formMode", "formHorizontal", "subFormMode", "subFormHorizontal", "id"]);
         var subProps = tslib.__assign(tslib.__assign({ data: data }, rest), { formMode: subFormMode || formMode, formHorizontal: subFormHorizontal || formHorizontal });
         return children
             ? typeof children === 'function'

package/lib/renderers/Password.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Plain.d.ts

@@ -29,6 +29,9 @@ export interface PlainProps extends RendererProps, Omit<PlainSchema, 'type' | 'c
 }
 export declare class Plain extends React.Component<PlainProps, object> {
     static defaultProps: Partial<PlainProps>;
+    handleClick(e: React.MouseEvent<HTMLDivElement>): void;
+    handleMouseEnter(e: React.MouseEvent<any>): void;
+    handleMouseLeave(e: React.MouseEvent<any>): void;
     render(): JSX.Element;
 }
 export declare class PlainRenderer extends Plain {

package/lib/renderers/Plain.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -20,17 +20,53 @@ var Plain = /** @class */ (function (_super) {
     function Plain() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    Plain.prototype.handleClick = function (e) {
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
+        dispatchEvent('click', amisCore.createObject(data, {
+            nativeEvent: e
+        }));
+    };
+    Plain.prototype.handleMouseEnter = function (e) {
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
+        dispatchEvent(e, amisCore.createObject(data, {
+            nativeEvent: e
+        }));
+    };
+    Plain.prototype.handleMouseLeave = function (e) {
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
+        dispatchEvent(e, amisCore.createObject(data, {
+            nativeEvent: e
+        }));
+    };
     Plain.prototype.render = function () {
         var _a = this.props, className = _a.className, style = _a.style, wrapperComponent = _a.wrapperComponent, text = _a.text, data = _a.data, tpl = _a.tpl, inline = _a.inline, placeholder = _a.placeholder, cx = _a.classnames;
         var value = amisCore.getPropValue(this.props);
         var Component = wrapperComponent || (inline ? 'span' : 'div');
-        return (React__default["default"].createElement(Component, { className: cx('PlainField', className), style: style }, tpl || text ? (amisCore.filter(tpl || text, data)) : typeof value === 'undefined' || value === '' || value === null ? (React__default["default"].createElement("span", { className: "text-muted" }, placeholder)) : (String(value))));
+        return (React__default["default"].createElement(Component, { className: cx('PlainField', className), style: style, onClick: this.handleClick, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave }, tpl || text ? (amisCore.filter(tpl || text, data)) : typeof value === 'undefined' || value === '' || value === null ? (React__default["default"].createElement("span", { className: "text-muted" }, placeholder)) : (String(value))));
     };
     Plain.defaultProps = {
         wrapperComponent: '',
         inline: true,
         placeholder: '-'
     };
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Plain.prototype, "handleClick", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Plain.prototype, "handleMouseEnter", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Plain.prototype, "handleMouseLeave", null);
     return Plain;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Portlet.d.ts

@@ -99,7 +99,7 @@ export interface PortletSchema extends Omit<BaseSchema, 'type'> {
     /**
      * 自定义样式
      */
-    style?: string | {
+    style?: {
         [propName: string]: any;
     };
 }

package/lib/renderers/Portlet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Progress.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Property.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/QRCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/QuickEdit.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Remark.d.ts

@@ -59,7 +59,7 @@ declare class Remark extends React.Component<RemarkProps> {
     static propsList: Array<string>;
     static defaultProps: {
         icon: string;
-        trigger: ("focus" | "hover" | "click")[];
+        trigger: ("click" | "focus" | "hover")[];
     };
     showModalTip(tooltip?: string | TooltipObject): (e: React.MouseEvent) => void;
     renderLabel(finalIcon: any, finalLabel: string, cx: ClassNamesFn, shape?: 'circle' | 'square'): JSX.Element;

package/lib/renderers/Remark.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/SearchBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Service.d.ts

@@ -3,6 +3,7 @@ import { RendererProps } from 'amis-core';
 import { IServiceStore } from 'amis-core';
 import { Api, RendererData, ActionObject } from 'amis-core';
 import { IScopedContext } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, SchemaApi, SchemaCollection, SchemaExpression, SchemaMessage, SchemaName } from '../Schema';
 import type { ListenerAction } from 'amis-core';
 export declare const eventTypes: readonly ["inited", "onApiFetched", "onSchemaApiFetched", "onWsFetched"];
@@ -14,7 +15,7 @@ export type ComposedDataProvider = DataProvider | DataProviderCollection;
  * Service 服务类控件。
  * 文档：https://baidu.gitee.io/amis/docs/components/service
  */
-export interface ServiceSchema extends BaseSchema {
+export interface ServiceSchema extends BaseSchema, SpinnerExtraProps {
     /**
      * 指定为 Service 数据拉取控件。
      */
@@ -141,4 +142,5 @@ export declare class ServiceRenderer extends Service {
     componentWillUnmount(): void;
     reloadTarget(target: string, data?: any): void;
     setData(values: object, replace?: boolean): void;
+    getData(): any;
 }

package/lib/renderers/Service.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -483,14 +483,14 @@ var Service = /** @class */ (function (_super) {
         });
     };
     Service.prototype.render = function () {
-        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, render = _a.render, ns = _a.classPrefix, cx = _a.classnames;
+        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, render = _a.render, ns = _a.classPrefix, cx = _a.classnames, loadingConfig = _a.loadingConfig;
         return (React__default["default"].createElement("div", { className: cx("".concat(ns, "Service"), className), style: style },
             store.error ? (React__default["default"].createElement("div", { className: cx("Alert Alert--danger") },
                 React__default["default"].createElement("button", { className: cx('Alert-close'), onClick: function () { return store.updateMessage(''); }, type: "button" },
                     React__default["default"].createElement("span", null, "\u00D7")),
                 store.msg)) : null,
             this.renderBody(),
-            React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: store.loading }),
+            React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: store.loading, loadingConfig: loadingConfig }),
             render(
             // 单独给 feedback 服务的，handleAction 里面先不要处理弹窗
             'modal', tslib.__assign(tslib.__assign({}, (store.action &&
@@ -574,6 +574,10 @@ var Service = /** @class */ (function (_super) {
     ServiceRenderer.prototype.setData = function (values, replace) {
         return this.props.store.updateData(values, undefined, replace);
     };
+    ServiceRenderer.prototype.getData = function () {
+        var store = this.props.store;
+        return store.data;
+    };
     ServiceRenderer.contextType = amisCore.ScopedContext;
     ServiceRenderer = tslib.__decorate([
         amisCore.Renderer({

package/lib/renderers/SparkLine.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Spinner.d.ts

@@ -1,7 +1,8 @@
+import { SpinnerExtraProps } from 'amis-ui';
 import { RendererProps } from 'amis-core';
 import React from 'react';
 import { BaseSchema, SchemaCollection } from '../Schema';
-export interface SpinnerSchema extends BaseSchema {
+export interface SpinnerSchema extends BaseSchema, SpinnerExtraProps {
     /**
      * 组件类型
      */

package/lib/renderers/Spinner.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Status.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */