amis 2.4.0 → 2.5.0-rc.0

package/lib/renderers/BarCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Breadcrumb.d.ts

@@ -4,7 +4,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaIcon, SchemaUrlPath } from '../Schema';
-export declare type BreadcrumbBaseItemSchema = {
+export type BreadcrumbBaseItemSchema = {
     /**
      * 文字
      */
@@ -18,7 +18,7 @@ export declare type BreadcrumbBaseItemSchema = {
      */
     href?: SchemaUrlPath;
 } & Omit<BaseSchema, 'type'>;
-export declare type BreadcrumbItemSchema = {
+export type BreadcrumbItemSchema = {
     /**
      * 文字
      */
@@ -36,8 +36,8 @@ export declare type BreadcrumbItemSchema = {
      */
     dropdown?: Array<BreadcrumbBaseItemSchema>;
 } & Omit<BaseSchema, 'type'>;
-export declare type TooltipPositionType = 'top' | 'bottom' | 'left' | 'right';
-export declare type ItemPlace = 'start' | 'middle' | 'end';
+export type TooltipPositionType = 'top' | 'bottom' | 'left' | 'right';
+export type ItemPlace = 'start' | 'middle' | 'end';
 /**
  * Breadcrumb 显示渲染器
  * 文档：https://baidu.gitee.io/amis/docs/components/breadcrumb

package/lib/renderers/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/ButtonGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/CRUD.d.ts

@@ -8,12 +8,12 @@ import { ActionSchema } from './Action';
 import { CardsSchema } from './Cards';
 import { ListSchema } from './List';
 import { TableSchema } from './Table';
-export declare type CRUDBultinToolbarType = 'columns-toggler' | 'drag-toggler' | 'pagination' | 'bulkActions' | 'bulk-actions' | 'statistics' | 'switch-per-page' | 'load-more' | 'filter-toggler' | 'export-csv' | 'export-excel';
+export type CRUDBultinToolbarType = 'columns-toggler' | 'drag-toggler' | 'pagination' | 'bulkActions' | 'bulk-actions' | 'statistics' | 'switch-per-page' | 'load-more' | 'filter-toggler' | 'export-csv' | 'export-excel';
 export interface CRUDBultinToolbar extends Omit<BaseSchema, 'type'> {
     type: CRUDBultinToolbarType;
 }
-export declare type CRUDToolbarChild = SchemaObject | CRUDBultinToolbar;
-export declare type CRUDToolbarObject = {
+export type CRUDToolbarChild = SchemaObject | CRUDBultinToolbar;
+export type CRUDToolbarObject = {
     /**
      * 对齐方式
      */
@@ -203,20 +203,20 @@ export interface CRUDCommonSchema extends BaseSchema {
      */
     autoFillHeight?: TableSchema['autoFillHeight'];
 }
-export declare type CRUDCardsSchema = CRUDCommonSchema & {
+export type CRUDCardsSchema = CRUDCommonSchema & {
     mode: 'cards';
 } & Omit<CardsSchema, 'type'>;
-export declare type CRUDListSchema = CRUDCommonSchema & {
+export type CRUDListSchema = CRUDCommonSchema & {
     mode: 'list';
 } & Omit<ListSchema, 'type'>;
-export declare type CRUDTableSchema = CRUDCommonSchema & {
+export type CRUDTableSchema = CRUDCommonSchema & {
     mode?: 'table';
 } & Omit<TableSchema, 'type'>;
 /**
  * CRUD 增删改查渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/crud
  */
-export declare type CRUDSchema = CRUDCardsSchema | CRUDListSchema | CRUDTableSchema;
+export type CRUDSchema = CRUDCardsSchema | CRUDListSchema | CRUDTableSchema;
 export interface CRUDProps extends RendererProps, Omit<CRUDCommonSchema, 'type' | 'className'> {
     store: ICRUDStore;
     pickerMode?: boolean;
@@ -249,6 +249,8 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: CRUDProps): void;
     componentWillUnmount(): void;
+    /** 查找CRUD最近层级的父窗口 */
+    getClosestParentContainer(): Element | null;
     controlRef(control: any): void;
     handleAction(e: React.UIEvent<any> | undefined, action: ActionObject, ctx: object, throwErrors?: boolean, delegate?: IScopedContext): any;
     handleBulkAction(selectedItems: Array<any>, unSelectedItems: Array<any>, e: React.UIEvent<any>, action: ActionObject): void;

package/lib/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -146,6 +146,12 @@ var CRUD = /** @class */ (function (_super) {
         this.mounted = false;
         clearTimeout(this.timer);
     };
+    /** 查找CRUD最近层级的父窗口 */
+    CRUD.prototype.getClosestParentContainer = function () {
+        var dom = ReactDOM.findDOMNode(this);
+        var overlay = dom === null || dom === void 0 ? void 0 : dom.closest('[role=dialog]');
+        return overlay;
+    };
     CRUD.prototype.controlRef = function (control) {
         // 因为 control 有可能被 n 层 hoc 包裹。
         while (control && control.getWrappedInstance) {
@@ -293,10 +299,12 @@ var CRUD = /** @class */ (function (_super) {
             }
         };
         // Action如果配了事件动作也会处理二次确认，这里需要处理一下忽略
-        if (!action.ignoreConfirm && action.confirmText && env.confirm) {
-            env
-                .confirm(amisCore.filter(action.confirmText, ctx))
-                .then(function (confirmed) { return confirmed && fn(); });
+        var confirmText = '';
+        if (!action.ignoreConfirm &&
+            action.confirmText &&
+            env.confirm &&
+            (confirmText = amisCore.filter(action.confirmText, ctx))) {
+            env.confirm(confirmText).then(function (confirmed) { return confirmed && fn(); });
         }
         else {
             fn();
@@ -354,9 +362,11 @@ var CRUD = /** @class */ (function (_super) {
         var _this = this;
         var action = this.props.store.selectedAction;
         var env = this.props.env;
-        if (action.confirmText) {
+        var confirmText = '';
+        if (action.confirmText &&
+            (confirmText = amisCore.filter(action.confirmText, this.props.store.mergedData))) {
             return env
-                .confirm(action.confirmText)
+                .confirm(confirmText)
                 .then(function (confirmed) {
                 return confirmed &&
                     _this.handleBulkAction(selectedItems, unSelectedItems, e, action);
@@ -881,6 +891,7 @@ var CRUD = /** @class */ (function (_super) {
             !alwaysShowPagination) {
             return null;
         }
+        var container = this.getClosestParentContainer();
         var extraProps = {};
         /** 优先级：showPageInput显性配置 > (lastPage > 9) */
         if (typeof toolbar !== 'string') {
@@ -889,13 +900,14 @@ var CRUD = /** @class */ (function (_super) {
                 showPageInput === true || (lastPage > 9 && showPageInput == null);
             extraProps.maxButtons = toolbar.maxButtons;
             extraProps.layout = toolbar.layout;
+            extraProps.popOverContainerSelector = toolbar.popOverContainerSelector;
         }
         else {
             extraProps.showPageInput = lastPage > 9;
         }
         return (React__default["default"].createElement("div", { className: cx('Crud-pager') }, render('pagination', {
             type: 'pagination'
-        }, tslib.__assign(tslib.__assign({}, extraProps), { activePage: page, lastPage: lastPage, hasNext: store.hasNext, mode: store.mode, perPage: store.perPage, onPageChange: this.handleChangePage }))));
+        }, tslib.__assign(tslib.__assign({}, extraProps), { activePage: page, lastPage: lastPage, hasNext: store.hasNext, mode: store.mode, perPage: store.perPage, popOverContainer: container, onPageChange: this.handleChangePage }))));
     };
     CRUD.prototype.renderStatistics = function () {
         var _a = this.props, store = _a.store, cx = _a.classnames, __ = _a.translate, alwaysShowPagination = _a.alwaysShowPagination;
@@ -919,9 +931,10 @@ var CRUD = /** @class */ (function (_super) {
             label: item,
             value: item + ''
         }); });
+        var container = this.getClosestParentContainer();
         return (React__default["default"].createElement("div", { className: cx('Crud-pageSwitch') },
             React__default["default"].createElement("span", null, __('CRUD.perPage')),
-            React__default["default"].createElement(amisUi.Select, { classPrefix: ns, searchable: false, placeholder: __('Select.placeholder'), options: perPages, value: store.perPage + '', onChange: function (value) { return _this.handleChangePage(1, value.value); }, clearable: false })));
+            React__default["default"].createElement(amisUi.Select, { classPrefix: ns, searchable: false, placeholder: __('Select.placeholder'), options: perPages, value: store.perPage + '', onChange: function (value) { return _this.handleChangePage(1, value.value); }, clearable: false, popOverContainer: container })));
     };
     CRUD.prototype.renderLoadMore = function () {
         var _this = this;

package/lib/renderers/CRUD2.d.ts

@@ -8,7 +8,7 @@ import { CardsSchema } from './Cards';
 import { ListSchema } from './List';
 import { TableSchema2 } from './Table2';
 import { SchemaCollection } from '../Schema';
-export declare type CRUDRendererEvent = 'search';
+export type CRUDRendererEvent = 'search';
 export interface CRUD2CommonSchema extends BaseSchema {
     /**
      *  指定为 CRUD2 渲染器。
@@ -116,16 +116,16 @@ export interface CRUD2CommonSchema extends BaseSchema {
      */
     autoFillHeight?: boolean;
 }
-export declare type CRUD2CardsSchema = CRUD2CommonSchema & {
+export type CRUD2CardsSchema = CRUD2CommonSchema & {
     mode: 'cards';
 } & Omit<CardsSchema, 'type'>;
-export declare type CRUD2ListSchema = CRUD2CommonSchema & {
+export type CRUD2ListSchema = CRUD2CommonSchema & {
     mode: 'list';
 } & Omit<ListSchema, 'type'>;
-export declare type CRUD2TableSchema = CRUD2CommonSchema & {
+export type CRUD2TableSchema = CRUD2CommonSchema & {
     mode?: 'table2';
 } & Omit<TableSchema2, 'type'>;
-export declare type CRUD2Schema = CRUD2CardsSchema | CRUD2ListSchema | CRUD2TableSchema;
+export type CRUD2Schema = CRUD2CardsSchema | CRUD2ListSchema | CRUD2TableSchema;
 export interface CRUD2Props extends RendererProps, Omit<CRUD2CommonSchema, 'type' | 'className'> {
     store: ICRUDStore;
     pickerMode?: boolean;

package/lib/renderers/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Card.d.ts

@@ -8,7 +8,7 @@ import { SchemaCopyable } from './Copyable';
 import { BaseSchema, SchemaClassName, SchemaExpression, SchemaObject, SchemaTpl, SchemaUrlPath } from '../Schema';
 import { ActionSchema } from './Action';
 import type { IItem } from 'amis-core/lib/store/list';
-export declare type CardBodyField = SchemaObject & {
+export type CardBodyField = SchemaObject & {
     /**
      * 列标题
      */

package/lib/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Cards.d.ts

@@ -97,8 +97,8 @@ export interface Column {
     type: string;
     [propName: string]: any;
 }
-export declare type CardsRendererEvent = 'change';
-export declare type CardsRendererAction = 'check-all';
+export type CardsRendererEvent = 'change';
+export type CardsRendererAction = 'check-all';
 export interface GridProps extends RendererProps, Omit<CardsSchema, 'className' | 'itemClassName'> {
     store: IListStore;
     selectable?: boolean;

package/lib/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Carousel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Chart.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { RendererProps } from 'amis-core';
+import { ActionObject, RendererProps } from 'amis-core';
 import { IServiceStore } from 'amis-core';
 import { IScopedContext } from 'amis-core';
 import { BaseSchema, SchemaApi, SchemaExpression, SchemaFunction, SchemaName, SchemaTokenizeableString } from '../Schema';
@@ -76,6 +76,18 @@ export interface ChartSchema extends BaseSchema {
      * 不可见的时候隐藏
      */
     unMountOnHidden?: boolean;
+    /**
+     * 获取 geo json 文件的地址
+     */
+    mapURL?: string;
+    /**
+     * 地图名称
+     */
+    mapName?: string;
+    /**
+     * 加载百度地图
+     */
+    loadBaiduMap?: boolean;
 }
 export interface ChartProps extends RendererProps, Omit<ChartSchema, 'type' | 'className'> {
     chartRef?: (echart: any) => void;
@@ -97,11 +109,13 @@ export declare class Chart extends React.Component<ChartProps> {
     mounted: boolean;
     reloadCancel?: Function;
     constructor(props: ChartProps);
-    componentDidMount(): void;
+    componentDidMount(): Promise<void>;
     componentDidUpdate(prevProps: ChartProps): void;
     componentWillUnmount(): void;
-    handleClick(ctx: object): void;
+    handleClick(ctx: object): Promise<void>;
+    dispatchEvent(ctx: any): void;
     refFn(ref: any): void;
+    doAction(action: ActionObject, data: object, throwErrors?: boolean): any;
     reload(subpath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
     receive(data: object, subPath?: string, replace?: boolean): void;
     renderChart(config?: object, data?: any): void;

package/lib/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -13,13 +13,27 @@ var amisCore = require('amis-core');
 var cx = require('classnames');
 var mobxStateTree = require('mobx-state-tree');
 var debouce = require('lodash/debounce');
+var pick = require('lodash/pick');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var debouce__default = /*#__PURE__*/_interopDefaultLegacy(debouce);
+var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
 
+var DEFAULT_EVENT_PARAMS = [
+    'componentType',
+    'seriesType',
+    'seriesIndex',
+    'seriesName',
+    'name',
+    'dataIndex',
+    'data',
+    'dataType',
+    'value',
+    'color'
+];
 var EVAL_CACHE = {};
 /**
  * ECharts 中有些配置项可以写函数，但 JSON 中无法支持，为了实现这个功能，需要将看起来像函数的字符串转成函数类型
@@ -72,19 +86,35 @@ var Chart = /** @class */ (function (_super) {
         _this.reload = _this.reload.bind(_this);
         _this.reloadEcharts = debouce__default["default"](_this.reloadEcharts.bind(_this), 300); //过于频繁更新 ECharts 会报错
         _this.handleClick = _this.handleClick.bind(_this);
+        _this.dispatchEvent = _this.dispatchEvent.bind(_this);
         _this.mounted = true;
         props.config && _this.renderChart(props.config);
         return _this;
     }
     Chart.prototype.componentDidMount = function () {
-        var _a = this.props, api = _a.api, data = _a.data, initFetch = _a.initFetch, source = _a.source;
-        if (source && amisCore.isPureVariable(source)) {
-            var ret = amisCore.resolveVariableAndFilter(source, data, '| raw');
-            ret && this.renderChart(ret);
-        }
-        else if (api && initFetch !== false) {
-            this.reload();
-        }
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, api, data, initFetch, source, dispatchEvent, rendererEvent, ret;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, api = _a.api, data = _a.data, initFetch = _a.initFetch, source = _a.source, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('init', data, this)];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        if (source && amisCore.isPureVariable(source)) {
+                            ret = amisCore.resolveVariableAndFilter(source, data, '| raw');
+                            ret && this.renderChart(ret);
+                        }
+                        else if (api && initFetch !== false) {
+                            this.reload();
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     Chart.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
@@ -116,15 +146,37 @@ var Chart = /** @class */ (function (_super) {
         clearTimeout(this.timer);
     };
     Chart.prototype.handleClick = function (ctx) {
-        var _a = this.props, onAction = _a.onAction, clickAction = _a.clickAction, data = _a.data;
-        clickAction &&
-            onAction &&
-            onAction(null, clickAction, amisCore.createObject(data, ctx));
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, onAction, clickAction, data, dispatchEvent, rendererEvent;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, onAction = _a.onAction, clickAction = _a.clickAction, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent(ctx.event, amisCore.createObject(data, tslib.__assign({}, pick__default["default"](ctx, DEFAULT_EVENT_PARAMS))))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        clickAction &&
+                            onAction &&
+                            onAction(null, clickAction, amisCore.createObject(data, ctx));
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Chart.prototype.dispatchEvent = function (ctx) {
+        var _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent;
+        dispatchEvent(ctx.event || ctx.type, amisCore.createObject(data, tslib.__assign({}, pick__default["default"](ctx, ctx.type === 'legendselectchanged'
+            ? ['name', 'selected']
+            : DEFAULT_EVENT_PARAMS))));
     };
     Chart.prototype.refFn = function (ref) {
         var _this = this;
         var chartRef = this.props.chartRef;
-        var _a = this.props, chartTheme = _a.chartTheme, onChartWillMount = _a.onChartWillMount, onChartUnMount = _a.onChartUnMount, env = _a.env;
+        var _a = this.props, chartTheme = _a.chartTheme, onChartWillMount = _a.onChartWillMount, onChartUnMount = _a.onChartUnMount, env = _a.env, loadBaiduMap = _a.loadBaiduMap, data = _a.data;
+        var _b = this.props, mapURL = _b.mapURL, mapName = _b.mapName;
         var onChartMount = this.props.onChartMount;
         if (ref) {
             Promise.all([
@@ -137,39 +189,63 @@ var Chart = /** @class */ (function (_super) {
             ]).then(function (_a) {
                 var echarts = _a[0], ecStat = _a[1];
                 return tslib.__awaiter(_this, void 0, void 0, function () {
-                    var theme;
+                    var mapGeoResult, theme;
                     var _this = this;
                     return tslib.__generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
                                 window.echarts = echarts;
-                                window.ecStat = ecStat;
+                                window.ecStat = (ecStat === null || ecStat === void 0 ? void 0 : ecStat.default) || ecStat;
+                                if (!(mapURL && mapName)) return [3 /*break*/, 2];
+                                if (amisCore.isPureVariable(mapURL)) {
+                                    mapURL = amisCore.resolveVariableAndFilter(mapURL, data);
+                                }
+                                if (amisCore.isPureVariable(mapName)) {
+                                    mapName = amisCore.resolveVariableAndFilter(mapName, data);
+                                }
+                                return [4 /*yield*/, env.fetcher(mapURL, data)];
+                            case 1:
+                                mapGeoResult = _b.sent();
+                                if (!mapGeoResult.ok) {
+                                    console.warn('fetch map geo error ' + mapURL);
+                                }
+                                echarts.registerMap(mapName, mapGeoResult.data);
+                                _b.label = 2;
+                            case 2:
+                                if (!loadBaiduMap) return [3 /*break*/, 4];
+                                return [4 /*yield*/, amisCore.loadScript("//api.map.baidu.com/api?v=3.0&ak=".concat(this.props.ak, "&callback={{callback}}"))];
+                            case 3:
+                                _b.sent();
+                                _b.label = 4;
+                            case 4:
                                 theme = 'default';
                                 if (chartTheme) {
                                     echarts.registerTheme('custom', chartTheme);
                                     theme = 'custom';
                                 }
-                                if (!onChartWillMount) return [3 /*break*/, 2];
+                                if (!onChartWillMount) return [3 /*break*/, 6];
                                 return [4 /*yield*/, onChartWillMount(echarts)];
-                            case 1:
+                            case 5:
                                 _b.sent();
-                                _b.label = 2;
-                            case 2:
+                                _b.label = 6;
+                            case 6:
                                 echarts.registerTransform(ecStat.transform.regression);
                                 echarts.registerTransform(ecStat.transform.histogram);
                                 echarts.registerTransform(ecStat.transform.clustering);
-                                if (!env.loadChartExtends) return [3 /*break*/, 4];
+                                if (!env.loadChartExtends) return [3 /*break*/, 8];
                                 return [4 /*yield*/, env.loadChartExtends()];
-                            case 3:
+                            case 7:
                                 _b.sent();
-                                _b.label = 4;
-                            case 4:
+                                _b.label = 8;
+                            case 8:
                                 this.echarts = echarts.init(ref, theme);
                                 if (typeof onChartMount === 'string') {
                                     onChartMount = new Function('chart', 'echarts');
                                 }
                                 onChartMount === null || onChartMount === void 0 ? void 0 : onChartMount(this.echarts, echarts);
                                 this.echarts.on('click', this.handleClick);
+                                this.echarts.on('mouseover', this.dispatchEvent);
+                                this.echarts.on('legendselectchanged', this.dispatchEvent);
                                 this.unSensor = amisCore.resizeSensor(ref, function () {
                                     var _a;
                                     var width = ref.offsetWidth;
@@ -198,6 +274,10 @@ var Chart = /** @class */ (function (_super) {
         }
         this.ref = ref;
     };
+    Chart.prototype.doAction = function (action, data, throwErrors) {
+        var _a, _b;
+        return (_b = (_a = this.echarts) === null || _a === void 0 ? void 0 : _a.dispatchAction) === null || _b === void 0 ? void 0 : _b.call(_a, tslib.__assign({ type: action.actionType }, data));
+    };
     Chart.prototype.reload = function (subpath, query, ctx, silent, replace) {
         var _this = this;
         var _a, _b;
@@ -221,10 +301,10 @@ var Chart = /** @class */ (function (_super) {
             cancelExecutor: function (executor) { return (_this.reloadCancel = executor); }
         })
             .then(function (result) {
-            var _a;
+            var _a, _b, _c;
             mobxStateTree.isAlive(store) && store.markFetching(false);
             if (!result.ok) {
-                return env.notify('error', result.msg || __('fetchFailed'), result.msgTimeout !== undefined
+                return env.notify('error', (_b = (_a = api === null || api === void 0 ? void 0 : api.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (result.msg || __('fetchFailed')), result.msgTimeout !== undefined
                     ? {
                         closeButton: true,
                         timeout: result.msgTimeout
@@ -241,7 +321,7 @@ var Chart = /** @class */ (function (_super) {
             else {
                 _this.renderChart(result.data || {});
             }
-            (_a = _this.echarts) === null || _a === void 0 ? void 0 : _a.hideLoading();
+            (_c = _this.echarts) === null || _c === void 0 ? void 0 : _c.hideLoading();
             interval &&
                 _this.mounted &&
                 (_this.timer = setTimeout(_this.reload, Math.max(interval, 1000)));

package/lib/renderers/Code.d.ts

@@ -5,9 +5,9 @@ import React from 'react';
 import { BaseSchema } from '../Schema';
 import { RendererProps } from 'amis-core';
 import type { editor as EditorNamespace } from 'monaco-editor';
-export declare type MonacoEditor = typeof EditorNamespace;
-export declare type CodeBuiltinTheme = EditorNamespace.BuiltinTheme;
-export declare type IMonaco = {
+export type MonacoEditor = typeof EditorNamespace;
+export type CodeBuiltinTheme = EditorNamespace.BuiltinTheme;
+export type IMonaco = {
     editor: MonacoEditor;
     [propName: string]: any;
 };

package/lib/renderers/Code.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Color.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Container.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Copyable.d.ts

@@ -15,7 +15,7 @@ export interface SchemaCopyableObject {
      */
     content?: SchemaTpl;
 }
-export declare type SchemaCopyable = boolean | SchemaCopyableObject;
+export type SchemaCopyable = boolean | SchemaCopyableObject;
 export interface CopyableProps extends RendererProps {
     name?: string;
     label?: string;

package/lib/renderers/Copyable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Custom.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Date.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */