amis 2.5.4-alpha.4 → 2.6.0

package/esm/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -1412,7 +1412,7 @@ var Table = /** @class */ (function (_super) {
             : footerNode || toolbarNode || null;
     };
     Table.prototype.renderTableContent = function () {
-        var _a = this.props, cx = _a.classnames, tableClassName = _a.tableClassName, store = _a.store, placeholder = _a.placeholder, render = _a.render, checkOnItemClick = _a.checkOnItemClick, buildItemProps = _a.buildItemProps, rowClassNameExpr = _a.rowClassNameExpr, rowClassName = _a.rowClassName, prefixRow = _a.prefixRow, locale = _a.locale, affixRow = _a.affixRow, tableContentClassName = _a.tableContentClassName, translate = _a.translate, itemAction = _a.itemAction; _a.affixRowClassNameExpr; var affixRowClassName = _a.affixRowClassName; _a.prefixRowClassNameExpr; var prefixRowClassName = _a.prefixRowClassName; _a.autoFillHeight; var itemActions = _a.itemActions, dispatchEvent = _a.dispatchEvent, onEvent = _a.onEvent, _b = _a.loading, loading = _b === void 0 ? false : _b;
+        var _a = this.props, cx = _a.classnames, tableClassName = _a.tableClassName, store = _a.store, placeholder = _a.placeholder, render = _a.render, checkOnItemClick = _a.checkOnItemClick, buildItemProps = _a.buildItemProps, rowClassNameExpr = _a.rowClassNameExpr, rowClassName = _a.rowClassName, prefixRow = _a.prefixRow, locale = _a.locale, affixRow = _a.affixRow, tableContentClassName = _a.tableContentClassName, translate = _a.translate, itemAction = _a.itemAction; _a.affixRowClassNameExpr; var affixRowClassName = _a.affixRowClassName; _a.prefixRowClassNameExpr; var prefixRowClassName = _a.prefixRowClassName; _a.autoFillHeight; var itemActions = _a.itemActions, dispatchEvent = _a.dispatchEvent, onEvent = _a.onEvent, _b = _a.loading, loading = _b === void 0 ? false : _b, loadingConfig = _a.loadingConfig;
         // 理论上来说 store.rows 应该也行啊
         // 不过目前看来只有这样写它才会重新更新视图
         store.rows.length;
@@ -1427,7 +1427,7 @@ var Table = /** @class */ (function (_super) {
                     'Table-table--checkOnItemClick': checkOnItemClick,
                     'Table-table--withCombine': store.combineNum > 0
                 }, tableClassName), className: tableContentClassName, itemActions: itemActions, itemAction: itemAction, store: store, classnames: cx, columns: store.filteredColumns, columnsGroup: store.columnGroup, rows: store.rows, placeholder: placeholder, render: render, onMouseMove: this.handleMouseMove, onScroll: this.handleOutterScroll, tableRef: this.tableRef, renderHeadCell: this.renderHeadCell, renderCell: this.renderCell, onCheck: this.handleCheck, onQuickChange: store.dragging ? undefined : this.handleQuickChange, footable: store.footable, footableColumns: store.footableColumns, checkOnItemClick: checkOnItemClick, buildItemProps: buildItemProps, onAction: this.handleAction, rowClassNameExpr: rowClassNameExpr, rowClassName: rowClassName, data: store.data, prefixRow: prefixRow, affixRow: affixRow, prefixRowClassName: prefixRowClassName, affixRowClassName: affixRowClassName, locale: locale, translate: translate, dispatchEvent: dispatchEvent, onEvent: onEvent, loading: loading }),
-            React.createElement(Spinner, { overlay: true, show: loading })));
+            React.createElement(Spinner, { loadingConfig: loadingConfig, overlay: true, show: loading })));
     };
     Table.prototype.doAction = function (action, args, throwErrors) {
         var _a = this.props, store = _a.store, valueField = _a.valueField, data = _a.data;
@@ -1537,7 +1537,8 @@ var Table = /** @class */ (function (_super) {
         'autoFillHeight',
         'onSelect',
         'keepItemSelectionOnPageChange',
-        'maxKeepItemSelectionLength'
+        'maxKeepItemSelectionLength',
+        'autoGenerateFilter'
     ];
     Table.defaultProps = {
         className: '',

package/esm/renderers/Table2/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Table2/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Table2/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Table2/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { IScopedContext, RendererProps, ActionObject, ITableStore2, IRow2, ClassNamesFn } from 'amis-core';
-import { BadgeObject } from 'amis-ui';
+import { BadgeObject, SpinnerExtraProps } from 'amis-ui';
 import type { SortProps, ColumnProps, OnRowProps, SummaryProps } from 'amis-ui/lib/components/table';
 import { BaseSchema, SchemaObject, SchemaTokenizeableString, SchemaApi, SchemaMessage } from '../../Schema';
 import { ActionSchema } from '../Action';
@@ -269,7 +269,7 @@ export interface TableSchema2 extends BaseSchema {
 }
 export type Table2RendererEvent = 'selected' | 'columnSort' | 'columnFilter' | 'columnSearch' | 'columnToggled' | 'dragOver';
 export type Table2RendererAction = 'selectAll' | 'clearAll' | 'select' | 'expand';
-export interface Table2Props extends RendererProps {
+export interface Table2Props extends RendererProps, SpinnerExtraProps {
     title?: string;
     columns: Array<ColumnSchema | ColumnProps>;
     onSelect?: Function;

package/esm/renderers/Table2/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -765,14 +765,14 @@ var Table2 = /** @class */ (function (_super) {
         return null;
     };
     Table2.prototype.render = function () {
-        var _a = this.props, cx = _a.classnames, style = _a.style, _b = _a.loading, loading = _b === void 0 ? false : _b;
+        var _a = this.props, cx = _a.classnames, style = _a.style, _b = _a.loading, loading = _b === void 0 ? false : _b, loadingConfig = _a.loadingConfig;
         this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了
         var heading = this.renderHeading();
         return (React.createElement("div", { className: cx('Table-render-wrapper'), style: style },
             this.renderActions('header'),
             heading,
             this.renderTable(),
-            React.createElement(Spinner, { overlay: true, show: loading })));
+            React.createElement(Spinner, { overlay: true, show: loading, loadingConfig: loadingConfig })));
     };
     Table2.contextType = ScopedContext;
     __decorate([

package/esm/renderers/TableView.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Tabs.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Tasks.d.ts

@@ -2,12 +2,13 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { Payload } from 'amis-core';
 import { IScopedContext } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, SchemaApi, SchemaClassName, SchemaName } from '../Schema';
 /**
  * Tasks 渲染器，格式说明
  * 文档：https://baidu.gitee.io/amis/docs/components/tasks
  */
-export interface TasksSchema extends BaseSchema {
+export interface TasksSchema extends BaseSchema, SpinnerExtraProps {
     /** 指定为任务类型 */
     type: 'tasks';
     btnClassName?: SchemaClassName;

package/esm/renderers/Tasks.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -131,7 +131,7 @@ var Task = /** @class */ (function (_super) {
     };
     Task.prototype.render = function () {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, className = _a.className, style = _a.style, tableClassName = _a.tableClassName, taskNameLabel = _a.taskNameLabel, operationLabel = _a.operationLabel, statusLabel = _a.statusLabel, remarkLabel = _a.remarkLabel, btnText = _a.btnText, retryBtnText = _a.retryBtnText, btnClassName = _a.btnClassName, retryBtnClassName = _a.retryBtnClassName, statusLabelMap = _a.statusLabelMap, statusTextMap = _a.statusTextMap, readyStatusCode = _a.readyStatusCode, loadingStatusCode = _a.loadingStatusCode, canRetryStatusCode = _a.canRetryStatusCode, __ = _a.translate, render = _a.render;
+        var _a = this.props, cx = _a.classnames, className = _a.className, style = _a.style, tableClassName = _a.tableClassName, taskNameLabel = _a.taskNameLabel, operationLabel = _a.operationLabel, statusLabel = _a.statusLabel, remarkLabel = _a.remarkLabel, btnText = _a.btnText, retryBtnText = _a.retryBtnText, btnClassName = _a.btnClassName, retryBtnClassName = _a.retryBtnClassName, statusLabelMap = _a.statusLabelMap, statusTextMap = _a.statusTextMap, readyStatusCode = _a.readyStatusCode, loadingStatusCode = _a.loadingStatusCode, canRetryStatusCode = _a.canRetryStatusCode, __ = _a.translate, render = _a.render, loadingConfig = _a.loadingConfig;
         var items = this.state.items;
         var error = this.state.error;
         return (React.createElement("div", { className: cx('Table-content', className), style: style },
@@ -146,7 +146,7 @@ var Task = /** @class */ (function (_super) {
                     React.createElement("td", { colSpan: 4 },
                         React.createElement("div", { className: "text-danger" }, error)))) : (items.map(function (item, key) { return (React.createElement("tr", { key: key },
                     React.createElement("td", null, item.label),
-                    React.createElement("td", null, item.status == loadingStatusCode ? (React.createElement(Spinner, { show: true, icon: "reload", spinnerClassName: cx('Task-spinner') })) : item.status == canRetryStatusCode ? (React.createElement("a", { onClick: function () { return _this.submitTask(item, key, true); }, className: cx('Button', 'Button--danger', 'Button--size-md', retryBtnClassName || btnClassName) }, retryBtnText || btnText)) : (React.createElement("a", { onClick: function () { return _this.submitTask(item, key); }, className: cx('Button', 'Button--default', 'Button--size-md', btnClassName, {
+                    React.createElement("td", null, item.status == loadingStatusCode ? (React.createElement(Spinner, { loadingConfig: loadingConfig, show: true, icon: "reload", spinnerClassName: cx('Task-spinner') })) : item.status == canRetryStatusCode ? (React.createElement("a", { onClick: function () { return _this.submitTask(item, key, true); }, className: cx('Button', 'Button--danger', 'Button--size-md', retryBtnClassName || btnClassName) }, retryBtnText || btnText)) : (React.createElement("a", { onClick: function () { return _this.submitTask(item, key); }, className: cx('Button', 'Button--default', 'Button--size-md', btnClassName, {
                             disabled: item.status !== readyStatusCode
                         }) }, btnText))),
                     React.createElement("td", null,

package/esm/renderers/Timeline.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/TooltipWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/VBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Video.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/WebComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Wizard.d.ts

@@ -3,6 +3,7 @@ import { IScopedContext } from 'amis-core';
 import { RendererProps } from 'amis-core';
 import { IServiceStore } from 'amis-core';
 import { ActionObject } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, FormSchema, SchemaApi, SchemaClassName, SchemaExpression, SchemaName, SchemaReload } from '../Schema';
 import { ActionSchema } from './Action';
 export type WizardStepSchema = Omit<FormSchema, 'type'> & {
@@ -46,7 +47,7 @@ export type WizardStepSchema = Omit<FormSchema, 'type'> & {
  * 表单向导
  * 文档：https://baidu.gitee.io/amis/docs/components/wizard
  */
-export interface WizardSchema extends BaseSchema {
+export interface WizardSchema extends BaseSchema, SpinnerExtraProps {
     /**
      * 指定为表单向导
      */
@@ -176,4 +177,5 @@ export declare class WizardRenderer extends Wizard {
     reloadTarget(target: string, data: any): void;
     handleDialogConfirm(values: object[], action: ActionObject, targets: Array<any>): void;
     setData(values: object, replace?: boolean): void;
+    getData(): any;
 }

package/esm/renderers/Wizard.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -716,7 +716,7 @@ var Wizard = /** @class */ (function (_super) {
                 React.createElement("div", { className: cx('Panel-footer') }, actions))) : null));
     };
     Wizard.prototype.renderWizard = function () {
-        var _a = this.props, className = _a.className, style = _a.style, steps = _a.steps, render = _a.render, store = _a.store, ns = _a.classPrefix, cx = _a.classnames, popOverContainer = _a.popOverContainer, mode = _a.mode, __ = _a.translate;
+        var _a = this.props, className = _a.className, style = _a.style, steps = _a.steps, render = _a.render, store = _a.store, ns = _a.classPrefix, cx = _a.classnames, popOverContainer = _a.popOverContainer, mode = _a.mode, __ = _a.translate, loadingConfig = _a.loadingConfig;
         var currentStep = this.state.currentStep;
         var step = Array.isArray(steps) ? steps[currentStep - 1] : null;
         return (React.createElement("div", { ref: this.domRef, className: cx("".concat(ns, "Panel ").concat(ns, "Panel--default ").concat(ns, "Wizard ").concat(ns, "Wizard--").concat(mode), className), style: style },
@@ -746,7 +746,7 @@ var Wizard = /** @class */ (function (_super) {
                 onClose: this.handleDialogClose,
                 show: store.dialogOpen
             }),
-            React.createElement(Spinner, { size: "lg", overlay: true, key: "info", show: store.loading })));
+            React.createElement(Spinner, { loadingConfig: loadingConfig, size: "lg", overlay: true, key: "info", show: store.loading })));
     };
     Wizard.prototype.render = function () {
         return this.renderWizard();
@@ -902,6 +902,10 @@ function isJumpable(step, index, currentStep, data) {
     WizardRenderer.prototype.setData = function (values, replace) {
         return this.props.store.updateData(values, undefined, replace);
     };
+    WizardRenderer.prototype.getData = function () {
+        var store = this.props.store;
+        return store.data;
+    };
     WizardRenderer.contextType = ScopedContext;
     __decorate([
         autobind,

package/esm/renderers/Words.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Wrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/schemaExtend.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/compat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/preset.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Action.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="hoist-non-react-statics" />
 import React from 'react';
 import { ActionObject, IScopedContext, RendererProps } from 'amis-core';
-import { BadgeObject } from 'amis-ui';
+import { BadgeObject, SpinnerExtraProps } from 'amis-ui';
 export interface ButtonSchema extends BaseSchema {
     /**
      * 主要用于用户行为跟踪里区分是哪个按钮
@@ -277,7 +277,7 @@ import { DialogSchemaBase } from './Dialog';
 import { DrawerSchemaBase } from './Drawer';
 import { ToastSchemaBase } from '../Schema';
 export declare const createSyntheticEvent: <T extends Element, E extends Event>(event: E) => React.SyntheticEvent<T, E>;
-export interface ActionProps extends Omit<ButtonSchema, 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, ThemeProps, Omit<AjaxActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<UrlActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<LinkActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<DialogActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<DrawerActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<ToastSchemaBase, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<CopyActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<ReloadActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<EmailActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName' | 'body'>, Omit<OtherActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'> {
+export interface ActionProps extends Omit<ButtonSchema, 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, ThemeProps, Omit<AjaxActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<UrlActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<LinkActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<DialogActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<DrawerActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<ToastSchemaBase, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<CopyActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<ReloadActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<EmailActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName' | 'body'>, Omit<OtherActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, SpinnerExtraProps {
     actionType: any;
     onAction?: (e: React.MouseEvent<any> | void | null, action: ActionSchema) => void;
     onActionSensor?: (promise?: Promise<any>) => void;
@@ -330,14 +330,15 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean; /**
-         * 打开的目标地址
-         */
+        shouldComponentUpdate?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
         getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
         componentDidUpdate?(prevProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
-        componentWillMount?(): void;
+        componentWillMount?(): void; /**
+         * 抽出式弹框详情
+         * 文档：https://baidu.gitee.io/amis/docs/components/drawer
+         */
         UNSAFE_componentWillMount?(): void;
         componentWillReceiveProps?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
         UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;

package/lib/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -238,7 +238,7 @@ var Action = /** @class */ (function (_super) {
     };
     Action.prototype.render = function () {
         var _a;
-        var _b = this.props, type = _b.type, icon = _b.icon, iconClassName = _b.iconClassName, rightIcon = _b.rightIcon, rightIconClassName = _b.rightIconClassName, loadingClassName = _b.loadingClassName, primary = _b.primary, size = _b.size, level = _b.level, countDownTpl = _b.countDownTpl, block = _b.block, className = _b.className, style = _b.style, componentClass = _b.componentClass, tooltip = _b.tooltip, disabledTip = _b.disabledTip, tooltipPlacement = _b.tooltipPlacement, actionType = _b.actionType, link = _b.link, data = _b.data, __ = _b.translate, activeClassName = _b.activeClassName, isCurrentUrl = _b.isCurrentUrl, isMenuItem = _b.isMenuItem, active = _b.active, activeLevel = _b.activeLevel, tooltipTrigger = _b.tooltipTrigger, tooltipContainer = _b.tooltipContainer, tooltipRootClose = _b.tooltipRootClose, loading = _b.loading, body = _b.body, render = _b.render, onMouseEnter = _b.onMouseEnter, onMouseLeave = _b.onMouseLeave, cx = _b.classnames, ns = _b.classPrefix;
+        var _b = this.props, type = _b.type, icon = _b.icon, iconClassName = _b.iconClassName, rightIcon = _b.rightIcon, rightIconClassName = _b.rightIconClassName, loadingClassName = _b.loadingClassName, primary = _b.primary, size = _b.size, level = _b.level, countDownTpl = _b.countDownTpl, block = _b.block, className = _b.className, style = _b.style, componentClass = _b.componentClass, tooltip = _b.tooltip, disabledTip = _b.disabledTip, tooltipPlacement = _b.tooltipPlacement, actionType = _b.actionType, link = _b.link, data = _b.data, __ = _b.translate, activeClassName = _b.activeClassName, isCurrentUrl = _b.isCurrentUrl, isMenuItem = _b.isMenuItem, active = _b.active, activeLevel = _b.activeLevel, tooltipTrigger = _b.tooltipTrigger, tooltipContainer = _b.tooltipContainer, tooltipRootClose = _b.tooltipRootClose, loading = _b.loading, body = _b.body, render = _b.render, onMouseEnter = _b.onMouseEnter, onMouseLeave = _b.onMouseLeave, cx = _b.classnames, ns = _b.classPrefix, loadingConfig = _b.loadingConfig;
         if (actionType !== 'email' && body) {
             return (React__default["default"].createElement(amisUi.TooltipWrapper, { classPrefix: ns, classnames: cx, placement: tooltipPlacement, tooltip: tooltip, container: tooltipContainer, trigger: tooltipTrigger, rootClose: tooltipRootClose },
                 React__default["default"].createElement("div", { className: cx('Action', className), style: style, onClick: this.handleAction, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave }, render('body', body))));
@@ -256,7 +256,7 @@ var Action = /** @class */ (function (_super) {
         }
         var iconElement = amisCore.generateIcon(cx, icon, 'Button-icon', iconClassName);
         var rightIconElement = amisCore.generateIcon(cx, rightIcon, 'Button-icon', rightIconClassName);
-        return (React__default["default"].createElement(amisUi.Button, { className: cx(className, (_a = {},
+        return (React__default["default"].createElement(amisUi.Button, { loadingConfig: loadingConfig, className: cx(className, (_a = {},
                 _a[activeClassName || 'is-active'] = isActive,
                 _a)), style: style, size: size, level: activeLevel && isActive
                 ? activeLevel

package/lib/renderers/Alert.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/App.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
+import { SpinnerExtraProps } from 'amis-ui';
 import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaApi, SchemaClassName, SchemaCollection } from '../Schema';
 import { IScopedContext } from 'amis-core';
 import { IAppStore } from 'amis-core';
-export interface AppPage {
+export interface AppPage extends SpinnerExtraProps {
     /**
      * 菜单文字
      */
@@ -54,7 +55,7 @@ export interface AppPage {
  * App 渲染器，适合 JSSDK 用来做多页渲染。
  * 文档：https://baidu.gitee.io/amis/docs/components/app
  */
-export interface AppSchema extends BaseSchema {
+export interface AppSchema extends BaseSchema, SpinnerExtraProps {
     /**
      * 指定为 app 类型。
      */
@@ -130,4 +131,5 @@ export declare class AppRenderer extends App {
     constructor(props: AppProps, context: IScopedContext);
     componentWillUnmount(): void;
     setData(values: object, replace?: boolean): void;
+    getData(): any;
 }

package/lib/renderers/App.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -172,7 +172,7 @@ var App = /** @class */ (function (_super) {
     App.prototype.render = function () {
         var _this = this;
         var _a;
-        var _b = this.props; _b.className; _b.size; var cx = _b.classnames, store = _b.store, render = _b.render, _c = _b.showBreadcrumb, showBreadcrumb = _c === void 0 ? true : _c;
+        var _b = this.props, cx = _b.classnames, store = _b.store, render = _b.render, _c = _b.showBreadcrumb, showBreadcrumb = _c === void 0 ? true : _c, loadingConfig = _b.loadingConfig;
         return (React__default["default"].createElement(amisUi.Layout, { header: this.renderHeader(), aside: this.renderAside(), footer: this.renderFooter(), folded: store.folded, offScreen: store.offScreen },
             store.activePage && store.schema ? (React__default["default"].createElement(React__default["default"].Fragment, null,
                 showBreadcrumb && store.bcn.length ? (React__default["default"].createElement("ul", { className: cx('AppBcn') }, store.bcn.map(function (item, index) {
@@ -183,7 +183,7 @@ var App = /** @class */ (function (_super) {
                     data: store.pageData
                 }))) : store.pages && !store.activePage ? (React__default["default"].createElement(amisUi.NotFound, null,
                 React__default["default"].createElement("div", { className: "text-center" }, "\u9875\u9762\u4E0D\u5B58\u5728"))) : null,
-            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: store.loading || !store.pages, size: "lg" })));
+            React__default["default"].createElement(amisUi.Spinner, { loadingConfig: loadingConfig, overlay: true, show: store.loading || !store.pages, size: "lg" })));
     };
     App.propsList = [
         'brandName',
@@ -219,6 +219,10 @@ var App = /** @class */ (function (_super) {
     AppRenderer.prototype.setData = function (values, replace) {
         return this.props.store.updateData(values, undefined, replace);
     };
+    AppRenderer.prototype.getData = function () {
+        var store = this.props.store;
+        return store.data;
+    };
     AppRenderer.contextType = amisCore.ScopedContext;
     AppRenderer = tslib.__decorate([
         amisCore.Renderer({

package/lib/renderers/Audio.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Avatar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/BarCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/ButtonGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/CRUD.d.ts

@@ -3,6 +3,7 @@ import { RendererProps } from 'amis-core';
 import { SchemaNode, Schema, ActionObject, PlainObject } from 'amis-core';
 import { ICRUDStore } from 'amis-core';
 import { IScopedContext } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, SchemaApi, SchemaClassName, SchemaExpression, SchemaMessage, SchemaName, SchemaObject, SchemaTokenizeableString, SchemaTpl } from '../Schema';
 import { ActionSchema } from './Action';
 import { CardsSchema } from './Cards';
@@ -19,7 +20,7 @@ export type CRUDToolbarObject = {
      */
     align?: 'left' | 'right';
 };
-export interface CRUDCommonSchema extends BaseSchema {
+export interface CRUDCommonSchema extends BaseSchema, SpinnerExtraProps {
     /**
      *  指定为 CRUD 渲染器。
      */
@@ -217,7 +218,7 @@ export type CRUDTableSchema = CRUDCommonSchema & {
  * 文档：https://baidu.gitee.io/amis/docs/components/crud
  */
 export type CRUDSchema = CRUDCardsSchema | CRUDListSchema | CRUDTableSchema;
-export interface CRUDProps extends RendererProps, Omit<CRUDCommonSchema, 'type' | 'className'> {
+export interface CRUDProps extends RendererProps, Omit<CRUDCommonSchema, 'type' | 'className'>, SpinnerExtraProps {
     store: ICRUDStore;
     pickerMode?: boolean;
 }
@@ -259,7 +260,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     handleItemAction(action: ActionObject, ctx: any): void;
     handleFilterInit(values: object): void;
     handleFilterReset(values: object, action: any): void;
-    handleFilterSubmit(values: object, jumpToFirstPage?: boolean, replaceLocation?: boolean, search?: boolean): void;
+    handleFilterSubmit(values: Record<string, any>, jumpToFirstPage?: boolean, replaceLocation?: boolean, search?: boolean): void;
     handleBulkGo(selectedItems: Array<any>, unSelectedItems: Array<any>, e: React.MouseEvent<any>): void | Promise<false | void>;
     handleDialogConfirm(values: object[], action: ActionObject, ctx: any, components: Array<any>): any;
     handleDialogClose(confirmed?: boolean): void;

package/lib/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -10,6 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var isEqual = require('lodash/isEqual');
+var pickBy = require('lodash/pickBy');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var pick = require('lodash/pick');
@@ -22,6 +23,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
+var pickBy__default = /*#__PURE__*/_interopDefaultLegacy(pickBy);
 var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
@@ -345,10 +347,13 @@ var CRUD = /** @class */ (function (_super) {
     };
     CRUD.prototype.handleFilterSubmit = function (values, jumpToFirstPage, replaceLocation, search) {
         var _a;
+        var _b, _c;
         if (jumpToFirstPage === void 0) { jumpToFirstPage = true; }
         if (replaceLocation === void 0) { replaceLocation = false; }
         if (search === void 0) { search = true; }
-        var _b = this.props, store = _b.store, syncLocation = _b.syncLocation, env = _b.env, pageField = _b.pageField, perPageField = _b.perPageField, loadDataOnceFetchOnFilter = _b.loadDataOnceFetchOnFilter;
+        var _d = this.props, store = _d.store, syncLocation = _d.syncLocation, env = _d.env, pageField = _d.pageField, perPageField = _d.perPageField, loadDataOnceFetchOnFilter = _d.loadDataOnceFetchOnFilter;
+        /** 找出clearValueOnHidden的字段, 保证updateQuery时不会使用上次的保留值 */
+        values = tslib.__assign(tslib.__assign({}, values), pickBy__default["default"]((_c = (_b = values === null || values === void 0 ? void 0 : values.__super) === null || _b === void 0 ? void 0 : _b.diff) !== null && _c !== void 0 ? _c : {}, function (value) { return value === undefined; }));
         values = syncLocation
             ? amisCore.qsparse(amisCore.qsstringify(values, undefined, true))
             : values;

package/lib/renderers/CRUD2.d.ts

@@ -3,13 +3,14 @@ import { RendererProps } from 'amis-core';
 import { Action } from '../types';
 import { ICRUDStore } from 'amis-core';
 import { IScopedContext } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, SchemaApi, SchemaExpression, SchemaName, SchemaObject, SchemaTokenizeableString } from '../Schema';
 import { CardsSchema } from './Cards';
 import { ListSchema } from './List';
 import { TableSchema2 } from './Table2';
 import { SchemaCollection } from '../Schema';
 export type CRUDRendererEvent = 'search';
-export interface CRUD2CommonSchema extends BaseSchema {
+export interface CRUD2CommonSchema extends BaseSchema, SpinnerExtraProps {
     /**
      *  指定为 CRUD2 渲染器。
      */
@@ -126,7 +127,7 @@ export type CRUD2TableSchema = CRUD2CommonSchema & {
     mode?: 'table2';
 } & Omit<TableSchema2, 'type'>;
 export type CRUD2Schema = CRUD2CardsSchema | CRUD2ListSchema | CRUD2TableSchema;
-export interface CRUD2Props extends RendererProps, Omit<CRUD2CommonSchema, 'type' | 'className'> {
+export interface CRUD2Props extends RendererProps, Omit<CRUD2CommonSchema, 'type' | 'className'>, SpinnerExtraProps {
     store: ICRUDStore;
     pickerMode?: boolean;
 }

package/lib/renderers/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */