amis 2.4.0 → 2.4.1-beta.0

package/lib/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.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,6 +86,7 @@ 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;
@@ -116,15 +131,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, 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 +174,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 +259,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;

package/lib/renderers/Code.js

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

package/lib/renderers/Collapse.js

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

package/lib/renderers/CollapseGroup.js

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

package/lib/renderers/Color.js

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

package/lib/renderers/Container.js

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

package/lib/renderers/Copyable.js

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

package/lib/renderers/Custom.js

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

package/lib/renderers/Date.js

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

package/lib/renderers/DateRange.js

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