amis 2.5.4-alpha.4 → 2.6.1-alpha.0

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,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';
@@ -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,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/AnchorNav.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

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,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';
@@ -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,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Avatar.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/BarCode.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Breadcrumb.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/ButtonGroup.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

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,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';
@@ -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,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Calendar.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Card.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Card2.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Cards.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
 import { SchemaNode, ActionObject } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { IListStore } from 'amis-core';
 import { Action } from '../types';
 import Sortable from 'sortablejs';
@@ -12,7 +13,7 @@ import type { IItem } from 'amis-core/lib/store/list';
  * Cards 卡片集合渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/card
  */
-export interface CardsSchema extends BaseSchema {
+export interface CardsSchema extends BaseSchema, SpinnerExtraProps {
     /**
      * 指定为 cards 类型
      */

package/lib/renderers/Cards.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';
@@ -473,7 +473,7 @@ var Cards = /** @class */ (function (_super) {
     };
     Cards.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, columnsCount = _a.columnsCount, itemClassName = _a.itemClassName, placeholder = _a.placeholder, card = _a.card, render = _a.render, affixHeader = _a.affixHeader, masonryLayout = _a.masonryLayout, itemsClassName = _a.itemsClassName, cx = _a.classnames, __ = _a.translate, _b = _a.loading, loading = _b === void 0 ? false : _b;
+        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, columnsCount = _a.columnsCount, itemClassName = _a.itemClassName, placeholder = _a.placeholder, card = _a.card, render = _a.render, affixHeader = _a.affixHeader, masonryLayout = _a.masonryLayout, itemsClassName = _a.itemsClassName, cx = _a.classnames, __ = _a.translate, _b = _a.loading, loading = _b === void 0 ? false : _b, loadingConfig = _a.loadingConfig;
         this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了，已经渲染了就不重复渲染了。
         var itemFinalClassName = columnsCount
             ? "Grid-col--sm".concat(Math.round(12 / columnsCount))
@@ -507,7 +507,7 @@ var Cards = /** @class */ (function (_super) {
                 return _this.renderCard(index, card, item, itemFinalClassName);
             }))) : (React__default["default"].createElement("div", { className: cx('Cards-placeholder') }, render('placeholder', __(placeholder)))),
             footer,
-            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
+            React__default["default"].createElement(amisUi.Spinner, { loadingConfig: loadingConfig, overlay: true, show: loading })));
     };
     Cards.propsList = [
         'header',

package/lib/renderers/Carousel.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Chart.d.ts

@@ -127,4 +127,5 @@ export declare class ChartRenderer extends Chart {
     constructor(props: ChartProps, context: IScopedContext);
     componentWillUnmount(): void;
     setData(values: object, replace?: boolean): void;
+    getData(): any;
 }

package/lib/renderers/Chart.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';
@@ -229,9 +229,11 @@ var Chart = /** @class */ (function (_super) {
                                 _b.sent();
                                 _b.label = 6;
                             case 6:
-                                echarts.registerTransform(ecStat.transform.regression);
-                                echarts.registerTransform(ecStat.transform.histogram);
-                                echarts.registerTransform(ecStat.transform.clustering);
+                                if (ecStat.transform) {
+                                    echarts.registerTransform(ecStat.transform.regression);
+                                    echarts.registerTransform(ecStat.transform.histogram);
+                                    echarts.registerTransform(ecStat.transform.clustering);
+                                }
                                 if (!env.loadChartExtends) return [3 /*break*/, 8];
                                 return [4 /*yield*/, env.loadChartExtends()];
                             case 7:
@@ -429,6 +431,10 @@ var Chart = /** @class */ (function (_super) {
         // 重新渲染
         this.renderChart(this.props.config, values);
     };
+    ChartRenderer.prototype.getData = function () {
+        var store = this.props.store;
+        return store.data;
+    };
     ChartRenderer.contextType = amisCore.ScopedContext;
     ChartRenderer = tslib.__decorate([
         amisCore.Renderer({

package/lib/renderers/Code.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';
@@ -177,7 +177,8 @@ var Code = /** @class */ (function (_super) {
         'editorTheme',
         'tabSize',
         'wordWrap',
-        'customLang'
+        'customLang',
+        'style'
     ];
     Code.defaultProps = {
         language: 'plaintext',

package/lib/renderers/Collapse.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/CollapseGroup.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Color.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Container.d.ts

@@ -1,6 +1,49 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaClassName, SchemaCollection } from '../Schema';
+/** 容器拖拽配置 */
+export interface ContainerDraggableConfig {
+    /**
+     * 可拖拽的方向, 默认为所有方向, 支持设置为X或Y轴
+     */
+    axis?: 'both' | 'x' | 'y';
+    /**
+     * 元素的起始位置
+     */
+    defaultPosition?: {
+        x: number;
+        y: number;
+    };
+    /**
+     * 拖拽的边界, 可以设置坐标, 也可以设置父级元素的选择器
+     */
+    bounds?: {
+        left?: number;
+        right?: number;
+        top?: number;
+        bottom?: number;
+    } | string;
+    /**
+     * 以网格模式拖拽的步长
+     */
+    grid?: [number, number];
+    /**
+     * 初始化拖拽的选择器
+     */
+    handle?: string;
+    /**
+     * 禁止拖拽的选择器
+     */
+    cancel?: string;
+    /**
+     * 拖拽距离的缩放比, 默认为1
+     */
+    scale?: number;
+    /**
+     * 默认设置容器内部为'user-select:none', 可以设置true关闭
+     */
+    enableUserSelect?: boolean;
+}
 /**
  * Container 容器渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/container
@@ -32,14 +75,27 @@ export interface ContainerSchema extends BaseSchema {
      * 是否需要对body加一层div包裹，默认为 true
      */
     wrapperBody?: boolean;
+    /**
+     * 是否开启容器拖拽
+     */
+    draggable?: boolean | string;
+    /**
+     * 是否开启容器拖拽配置
+     */
+    draggableConfig: ContainerDraggableConfig | string;
 }
-export interface ContainerProps extends RendererProps, Omit<ContainerSchema, 'type' | 'className'> {
+export interface ContainerProps extends RendererProps, Omit<ContainerSchema, 'type' | 'className' | 'style'> {
     children?: (props: any) => React.ReactNode;
 }
 export default class Container<T> extends React.Component<ContainerProps & T, object> {
     static propsList: Array<string>;
     static defaultProps: {
         className: string;
+        draggableConfig: {
+            axis: "x" | "y" | "both" | undefined;
+            scale: number;
+            enableUserSelect: boolean;
+        };
     };
     renderBody(): JSX.Element | null;
     render(): JSX.Element;

package/lib/renderers/Container.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';
@@ -9,11 +9,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var merge = require('lodash/merge');
 var amisCore = require('amis-core');
+var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 
 var Container = /** @class */ (function (_super) {
     tslib.__extends(Container, _super);
@@ -38,13 +41,25 @@ var Container = /** @class */ (function (_super) {
         }
     };
     Container.prototype.render = function () {
-        var _a = this.props, className = _a.className, wrapperComponent = _a.wrapperComponent, size = _a.size, cx = _a.classnames, style = _a.style, data = _a.data;
+        var _a = this.props, className = _a.className, wrapperComponent = _a.wrapperComponent, size = _a.size, cx = _a.classnames, style = _a.style, data = _a.data, draggable = _a.draggable, draggableConfig = _a.draggableConfig;
+        var finalDraggable = amisCore.isPureVariable(draggable)
+            ? amisCore.resolveVariableAndFilter(draggable, data, '| raw')
+            : draggable;
+        var finalDraggableConfig = merge__default["default"](Container.defaultProps.draggableConfig, amisCore.isPureVariable(draggableConfig)
+            ? amisCore.resolveVariableAndFilter(draggableConfig, data, '| raw')
+            : draggableConfig);
         var Component = wrapperComponent || 'div';
-        return (React__default["default"].createElement(Component, { className: cx('Container', size && size !== 'none' ? "Container--".concat(size) : '', className), style: amisCore.buildStyle(style, data) }, this.renderBody()));
+        var contentDom = (React__default["default"].createElement(Component, { className: cx('Container', size && size !== 'none' ? "Container--".concat(size) : '', className), style: amisCore.buildStyle(style, data) }, this.renderBody()));
+        return finalDraggable ? (React__default["default"].createElement(amisUi.DndContainer, tslib.__assign({}, finalDraggableConfig, { draggable: true }), contentDom)) : (contentDom);
     };
     Container.propsList = ['body', 'className'];
     Container.defaultProps = {
-        className: ''
+        className: '',
+        draggableConfig: {
+            axis: 'both',
+            scale: 1,
+            enableUserSelect: false
+        }
     };
     return Container;
 }(React__default["default"].Component));

package/lib/renderers/Copyable.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.5.4-alpha.4
- * Copyright 2018-2022 baidu
+ * amis v2.6.1-alpha.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';