This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit d312b1c724d7a6cfc102b9e2933a58b79a851454
Merge: 752f511 9be4a39
Author: 100pah <sushuang0...@gmail.com>
AuthorDate: Tue Sep 15 16:48:02 2020 +0800
Merge branch 'next' of github.com:apache/incubator-echarts into next
# Conflicts:
# src/chart/custom.ts
src/chart/custom.ts | 103 +++++++++---
test/custom-hexbin.html | 143 ++++++++++-------
test/custom-shape-morphing.html | 302 +++++++++++++++++++++++++++++++++++
test/data/usa.json | 54 +++++++
test/map-nameProperty.html | 341 +++++++++++++++++-----------------------
5 files changed, 677 insertions(+), 266 deletions(-)
diff --cc src/chart/custom.ts
index 6c9149b,038602f..7cac6ea
--- a/src/chart/custom.ts
+++ b/src/chart/custom.ts
@@@ -18,7 -18,7 +18,8 @@@
*/
import {
- hasOwn, assert, isString, retrieve2, retrieve3, defaults, each, keys,
isArrayLike, bind, eqNaN
- hasOwn, assert, isString, retrieve2, retrieve3, defaults, each, keys,
isArrayLike, bind, logError, isFunction
++ hasOwn, assert, isString, retrieve2, retrieve3, defaults, each,
++ keys, isArrayLike, bind, logError, isFunction, eqNaN
} from 'zrender/src/core/util';
import * as graphicUtil from '../util/graphic';
import { setDefaultStateProxy, enableHoverEmphasis } from '../util/states';
@@@ -80,7 -80,7 +81,8 @@@ import
import Transformable from 'zrender/src/core/Transformable';
import { ItemStyleProps } from '../model/mixin/itemStyle';
import { cloneValue } from 'zrender/src/animation/Animator';
+import { warn } from '../util/log';
+ import { morphPath } from 'zrender/src/tool/morphPath';
const inner = makeInner<{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
