amis 2.4.0 → 2.5.0-rc.0

package/esm/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/esm/renderers/Chart.js

@@ -1,15 +1,28 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { isPureVariable, resolveVariableAndFilter, isApiOutdated, filter, createObject, resizeSensor, isEffectiveApi, normalizeApiResponseData, dataMapping, LazyComponent, ScopedContext, Renderer, ServiceStore, findObjectsWithKey } from 'amis-core';
+import { isApiOutdated, isPureVariable, resolveVariableAndFilter, filter, createObject, resizeSensor, loadScript, isEffectiveApi, normalizeApiResponseData, dataMapping, LazyComponent, ScopedContext, Renderer, ServiceStore, findObjectsWithKey } from 'amis-core';
 import cx from 'classnames';
 import { isAlive } from 'mobx-state-tree';
 import debouce from 'lodash/debounce';
+import pick from 'lodash/pick';
 
+var DEFAULT_EVENT_PARAMS = [
+    'componentType',
+    'seriesType',
+    'seriesIndex',
+    'seriesName',
+    'name',
+    'dataIndex',
+    'data',
+    'dataType',
+    'value',
+    'color'
+];
 var EVAL_CACHE = {};
 /**
  * ECharts 中有些配置项可以写函数，但 JSON 中无法支持，为了实现这个功能，需要将看起来像函数的字符串转成函数类型
@@ -62,19 +75,35 @@ var Chart = /** @class */ (function (_super) {
         _this.reload = _this.reload.bind(_this);
         _this.reloadEcharts = debouce(_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 && isPureVariable(source)) {
-            var ret = resolveVariableAndFilter(source, data, '| raw');
-            ret && this.renderChart(ret);
-        }
-        else if (api && initFetch !== false) {
-            this.reload();
-        }
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, api, data, initFetch, source, dispatchEvent, rendererEvent, ret;
+            return __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 && isPureVariable(source)) {
+                            ret = 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;
@@ -106,15 +135,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, createObject(data, ctx));
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, onAction, clickAction, data, dispatchEvent, rendererEvent;
+            return __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, createObject(data, __assign({}, pick(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, 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, createObject(data, __assign({}, pick(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([
@@ -127,39 +178,63 @@ var Chart = /** @class */ (function (_super) {
             ]).then(function (_a) {
                 var echarts = _a[0], ecStat = _a[1];
                 return __awaiter(_this, void 0, void 0, function () {
-                    var theme;
+                    var mapGeoResult, theme;
                     var _this = this;
                     return __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 (isPureVariable(mapURL)) {
+                                    mapURL = resolveVariableAndFilter(mapURL, data);
+                                }
+                                if (isPureVariable(mapName)) {
+                                    mapName = 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*/, 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 = resizeSensor(ref, function () {
                                     var _a;
                                     var width = ref.offsetWidth;
@@ -188,6 +263,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, __assign({ type: action.actionType }, data));
+    };
     Chart.prototype.reload = function (subpath, query, ctx, silent, replace) {
         var _this = this;
         var _a, _b;
@@ -211,10 +290,10 @@ var Chart = /** @class */ (function (_super) {
             cancelExecutor: function (executor) { return (_this.reloadCancel = executor); }
         })
             .then(function (result) {
-            var _a;
+            var _a, _b, _c;
             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
@@ -231,7 +310,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/esm/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/esm/renderers/Code.js

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

package/esm/renderers/Collapse.js

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

package/esm/renderers/CollapseGroup.js

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

package/esm/renderers/Color.js

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

package/esm/renderers/Container.js

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

package/esm/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/esm/renderers/Copyable.js

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

package/esm/renderers/Custom.js

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

package/esm/renderers/Date.js

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

package/esm/renderers/DateRange.js

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