Fix zr import.

src/CoordinateSystem.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 var coordinateSystemCreators = {};
 

src/ExtensionAPI.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 var echartsAPIList = [
     'getDom', 'getZr', 'getWidth', 'getHeight', 'getDevicePixelRatio', 'dispatchAction', 'isDisposed',

src/action/createDataSelectAction.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 export default function (seriesType, actionInfos) {
     zrUtil.each(actionInfos, function (actionInfo) {

src/action/geoRoam.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {updateCenterAndZoom} from './roamHelper';
 
 /**

src/chart/bar.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import barLayoutGrid from '../layout/barGrid';
 
 import '../coord/cartesian/Grid';

src/chart/bar/BarView.js

 import * as echarts from '../../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import {setLabel} from './helper';
 import Model from '../../model/Model';

src/chart/bar/PictorialBarView.js

 import * as echarts from '../../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import {createSymbol} from '../../util/symbol';
 import {parsePercent, isNumeric} from '../../util/number';

src/chart/boxplot/BoxplotSeries.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import SeriesModel from '../../model/Series';
 import {seriesModelMixin} from '../helper/whiskerBoxCommon';
 

src/chart/boxplot/BoxplotView.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import ChartView from '../../view/Chart';
 import * as graphic from '../../util/graphic';
 import {viewMixin} from '../helper/whiskerBoxCommon';

src/chart/boxplot/boxplotLayout.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {parsePercent} from '../../util/number';
 
 var each = zrUtil.each;

src/chart/candlestick/CandlestickSeries.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import SeriesModel from '../../model/Series';
 import {seriesModelMixin} from '../helper/whiskerBoxCommon';
 

src/chart/candlestick/CandlestickView.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import ChartView from '../../view/Chart';
 import * as graphic from '../../util/graphic';
 import {viewMixin} from '../helper/whiskerBoxCommon';

src/chart/candlestick/candlestickLayout.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {parsePercent} from '../../util/number';
 import {subPixelOptimize} from '../../util/graphic';
 

src/chart/candlestick/preprocessor.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 export default function (option) {
     if (!option || !zrUtil.isArray(option.series)) {

src/chart/chord.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import './chord/ChordSeries';
 import './chord/ChordView';

src/chart/chord/chordCircularLayout.js

@@ -3,7 +3,7 @@
  * @module echarts/chart/chord/chordCircularLayout
  * @author pissang(http://github.com/pissang)
  */
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {parsePercent} from '../../util/number';
 
 /**

src/chart/custom.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphicUtil from '../util/graphic';
 import {findLabelValueDim} from './helper/labelHelper';
 import createListFromArray from './helper/createListFromArray';

src/chart/effectScatter.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import './effectScatter/EffectScatterSeries';
 import './effectScatter/EffectScatterView';

src/chart/funnel.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import './funnel/FunnelSeries';
 import './funnel/FunnelView';

src/chart/funnel/FunnelView.js

 import * as graphic from '../../util/graphic';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import ChartView from '../../view/Chart';
 
 /**

src/chart/gauge/GaugeSeries.js

 import List from '../../data/List';
 import SeriesModel from '../../model/Series';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 var GaugeSeries = SeriesModel.extend({
 

src/chart/gauge/PointerPath.js

-import {Path} from 'zrender';
+import Path from 'zrender/graphic/Path';
 
 export default Path.extend({
 

src/chart/graph.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import './graph/GraphSeries';
 import './graph/GraphView';

src/chart/graph/GraphSeries.js

 import * as echarts from '../../echarts';
 import List from '../../data/List';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {defaultEmphasis} from '../../util/model';
 import Model from '../../model/Model';
 import {encodeHTML} from '../../util/format';

src/chart/graph/GraphView.js

 import * as echarts from '../../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import SymbolDraw from '../helper/SymbolDraw';
 import LineDraw from '../helper/LineDraw';
 import RoamController from '../../component/helper/RoamController';

src/chart/graph/adjustEdge.js

-import {curve as curveTool} from 'zrender';
-import {vector as vec2} from 'zrender';
+import * as curveTool from 'zrender/core/curve';
+import * as vec2 from 'zrender/core/vector';
 
 var v1 = [];
 var v2 = [];

src/chart/graph/createView.js

 // FIXME Where to create the simple view coordinate system
 import View from '../../coord/View';
 import {getLayoutRect} from '../../util/layout';
-import {bbox} from 'zrender';
+import * as bbox from 'zrender/core/bbox';
 
 function getViewRect(seriesModel, api, aspect) {
     var option = seriesModel.getBoxLayoutParams();

src/chart/graph/forceHelper.js

-import {vector as vec2} from 'zrender';
+import * as vec2 from 'zrender/core/vector';
 
 var scaleAndAdd = vec2.scaleAndAdd;
 

src/chart/graph/forceLayout.js

@@ -2,8 +2,8 @@ import {forceLayout} from './forceHelper';
 import {simpleLayout} from './simpleLayoutHelper';
 import {circularLayout} from './circularLayoutHelper';
 import {linearMap} from '../../util/number';
-import {vector as vec2} from 'zrender';
-import {util as zrUtil} from 'zrender';
+import * as vec2 from 'zrender/core/vector';
+import * as zrUtil from 'zrender/core/util';
 
 export default function (ecModel) {
     ecModel.eachSeriesByType('graph', function (graphSeries) {

src/chart/graph/simpleLayoutHelper.js

-import {vector as vec2} from 'zrender';
+import * as vec2 from 'zrender/core/vector';
 
 export function simpleLayout(seriesModel) {
     var coordSys = seriesModel.coordinateSystem;

src/chart/heatmap/HeatmapLayer.js

@@ -6,7 +6,7 @@
  * @module
  */
 
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 var GRADIENT_LEVELS = 256;
 

src/chart/heatmap/HeatmapView.js

 import * as echarts from '../../echarts';
 import * as graphic from '../../util/graphic';
 import HeatmapLayer from './HeatmapLayer';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 function getIsInPiecewiseRange(dataExtent, pieceList, selected) {
     var dataSpan = dataExtent[1] - dataExtent[0];

src/chart/helper/EffectLine.js

@@ -5,10 +5,10 @@
 
 import * as graphic from '../../util/graphic';
 import Line from './Line';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {createSymbol} from '../../util/symbol';
-import {vector as vec2} from 'zrender';
-import {curve as curveUtil} from 'zrender';
+import * as vec2 from 'zrender/core/vector';
+import * as curveUtil from 'zrender/core/curve';
 
 /**
  * @constructor

src/chart/helper/EffectPolyline.js

@@ -4,9 +4,9 @@
  */
 
 import Polyline from './Polyline';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import EffectLine from './EffectLine';
-import {vector as vec2} from 'zrender';
+import * as vec2 from 'zrender/core/vector';
 
 /**
  * @constructor

src/chart/helper/EffectSymbol.js

@@ -3,7 +3,7 @@
  * @module echarts/chart/helper/EffectSymbol
  */
 
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {createSymbol} from '../../util/symbol';
 import {Group} from '../../util/graphic';
 import {parsePercent} from '../../util/number';

src/chart/helper/LargeLineDraw.js

 // TODO Batch by color
 
 import * as graphic from '../../util/graphic';
-import {contain} from 'zrender';
+import * as lineContain from 'zrender/contain/line';
+import * as quadraticContain from 'zrender/contain/quadratic';
 
 var LargeLineShape = graphic.extendShape({
     shape: {
@@ -45,7 +46,7 @@ var LargeLineShape = graphic.extendShape({
             var seg = segs[i];
             if (isPolyline) {
                 for (var j = 1; j < seg.length; j++) {
-                    if (contain.line.containStroke(
+                    if (lineContain.containStroke(
                         seg[j - 1][0], seg[j - 1][1], seg[j][0], seg[j][1], lineWidth, x, y
                     )) {
                         return i;
@@ -54,14 +55,14 @@ var LargeLineShape = graphic.extendShape({
             }
             else {
                 if (seg.length > 2) {
-                    if (contain.quadratic.containStroke(
+                    if (quadraticContain.containStroke(
                         seg[0][0], seg[0][1], seg[2][0], seg[2][1], seg[1][0], seg[1][1], lineWidth, x, y
                     )) {
                         return i;
                     }
                 }
                 else {
-                    if (contain.line.containStroke(
+                    if (lineContain.containStroke(
                         seg[0][0], seg[0][1], seg[1][0], seg[1][1], lineWidth, x, y
                     )) {
                         return i;

src/chart/helper/Line.js

@@ -2,7 +2,8 @@
  * @module echarts/chart/helper/Line
  */
 
-import {util as zrUtil, vector} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
+import * as vector from 'zrender/core/vector';
 import * as symbolUtil from '../../util/symbol';
 import LinePath from './LinePath';
 import * as graphic from '../../util/graphic';

src/chart/helper/LinePath.js

@@ -3,7 +3,7 @@
  */
 
 import * as graphic from '../../util/graphic';
-import {vector as vec2} from 'zrender';
+import * as vec2 from 'zrender/core/vector';
 
 var straightLineProto = graphic.Line.prototype;
 var bezierCurveProto = graphic.BezierCurve.prototype;

src/chart/helper/Polyline.js

@@ -3,7 +3,7 @@
  */
 
 import * as graphic from '../../util/graphic';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 /**
  * @constructor

src/chart/helper/Symbol.js

@@ -2,7 +2,7 @@
  * @module echarts/chart/helper/Symbol
  */
 
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {createSymbol} from '../../util/symbol';
 import * as graphic from '../../util/graphic';
 import {parsePercent} from '../../util/number';

src/chart/helper/WhiskerBoxDraw.js

@@ -2,7 +2,7 @@
  * @module echarts/chart/helper/Symbol
  */
 
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import Path from 'zrender/graphic/Path';
 

src/chart/helper/createGraphFromNodeEdge.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import List from '../../data/List';
 import Graph from '../../data/Graph';
 import linkList from '../../data/helper/linkList';

src/chart/helper/createGraphFromNodeMatrix.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import List from '../../data/List';
 import Graph from '../../data/Graph';
 import linkList from '../../data/helper/linkList';

src/chart/helper/createListFromArray.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import List from '../../data/List';
 import completeDimensions from '../../data/helper/completeDimensions';
 import {getDataItemValue, converDataValue, isDataItemOption} from '../../util/model';

src/chart/helper/whiskerBoxCommon.js

@@ -2,7 +2,7 @@
 import List from '../../data/List';
 import completeDimensions from '../../data/helper/completeDimensions';
 import WhiskerBoxDraw from '../helper/WhiskerBoxDraw';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 export var seriesModelMixin = {
 

src/chart/line.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import './line/LineSeries';
 import './line/LineView';

src/chart/line/LineView.js

 // FIXME step not support polar
 
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import SymbolDraw from '../helper/SymbolDraw';
 import SymbolClz from '../helper/Symbol';
 import lineAnimationDiff from './lineAnimationDiff';

src/chart/line/poly.js

 // Poly path support NaN point
 
 import Path from 'zrender/graphic/Path';
-import {vector as vec2, zrHelper} from 'zrender';
+import * as vec2 from 'zrender/core/vector';
+import fixClipWithShadow from 'zrender/graphic/helper/fixClipWithShadow';
 
 var vec2Min = vec2.min;
 var vec2Max = vec2.max;
@@ -151,7 +152,7 @@ export var Polyline = Path.extend({
         stroke: '#000'
     },
 
-    brush: zrHelper.fixClipWithShadow(Path.prototype.brush),
+    brush: fixClipWithShadow(Path.prototype.brush),
 
     buildPath: function (ctx, shape) {
         var points = shape.points;
@@ -205,7 +206,7 @@ export var Polygon = Path.extend({
         connectNulls: false
     },
 
-    brush: zrHelper.fixClipWithShadow(Path.prototype.brush),
+    brush: fixClipWithShadow(Path.prototype.brush),
 
     buildPath: function (ctx, shape) {
         var points = shape.points;

src/chart/lines/LinesSeries.js

 import SeriesModel from '../../model/Series';
 import List from '../../data/List';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {encodeHTML} from '../../util/format';
 import CoordinateSystem from '../../CoordinateSystem';
 

src/chart/map/MapSeries.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import List from '../../data/List';
 import SeriesModel from '../../model/Series';
 import completeDimensions from '../../data/helper/completeDimensions';

src/chart/map/MapView.js

 import * as echarts from '../../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import MapDraw from '../../component/helper/MapDraw';
 

src/chart/map/backwardCompat.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 export default function (option) {
     // Save geoCoord

src/chart/map/mapDataStatistic.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 // FIXME 公用？
 /**

src/chart/map/mapSymbolLayout.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 export default function (ecModel) {
 

src/chart/parallel/ParallelSeries.js

 import List from '../../data/List';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import SeriesModel from '../../model/Series';
 import completeDimensions from '../../data/helper/completeDimensions';
 

src/chart/parallel/ParallelView.js

 import * as graphic from '../../util/graphic';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import ChartView from '../../view/Chart';
 
 var SMOOTH = 0.3;

src/chart/pictorialBar.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import '../coord/cartesian/Grid';
 import './bar/PictorialBarSeries';

src/chart/pie.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import './pie/PieSeries';
 import './pie/PieView';

src/chart/pie/PieSeries.js

 import * as echarts from '../../echarts';
 import List from '../../data/List';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as modelUtil from '../../util/model';
 import {getPercentWithPrecision} from '../../util/number';
 import completeDimensions from '../../data/helper/completeDimensions';

src/chart/pie/PieView.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import ChartView from '../../view/Chart';
 

src/chart/pie/labelLayout.js

 // FIXME emphasis label position is not same with normal label position
 
-import {contain} from 'zrender';
+import * as textContain from 'zrender/contain/text';
 
 function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
     list.sort(function (a, b) {
@@ -194,7 +194,7 @@ export default function (seriesModel, r, viewWidth, viewHeight) {
             ? (dx < 0 ? -midAngle + Math.PI : -midAngle) : 0;
         var text = seriesModel.getFormattedLabel(idx, 'normal')
                     || data.getName(idx);
-        var textRect = contain.text.getBoundingRect(
+        var textRect = textContain.getBoundingRect(
             text, font, textAlign, 'top'
         );
         hasLabelRotate = !!labelRotate;

src/chart/pie/pieLayout.js

 
 import {parsePercent, linearMap} from '../../util/number';
 import labelLayout from './labelLayout';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 var PI2 = Math.PI * 2;
 var RADIAN = Math.PI / 180;

src/chart/radar.js

 
 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 // Must use radar component
 import '../component/radar';

src/chart/radar/RadarSeries.js

 import SeriesModel from '../../model/Series';
 import List from '../../data/List';
 import completeDimensions from '../../data/helper/completeDimensions';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {encodeHTML} from '../../util/format';
 
 var RadarSeries = SeriesModel.extend({

src/chart/radar/RadarView.js

 import * as echarts from '../../echarts';
 import * as graphic from '../../util/graphic';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as symbolUtil from '../../util/symbol';
 
 function normalizeSymbolSize(symbolSize) {

src/chart/radar/backwardCompat.js

 // Backward compat for radar chart in 2
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 export default function (option) {
     var polarOptArr = option.polar;

src/chart/sankey/sankeyLayout.js

@@ -5,7 +5,7 @@
 
 import * as layout from '../../util/layout';
 import nest from '../../util/array/nest';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 export default function (ecModel, api, payload) {
 

src/chart/sankey/sankeyVisual.js

@@ -4,7 +4,7 @@
  */
 
 import VisualMapping from '../../visual/VisualMapping';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 export default function (ecModel, payload) {
     ecModel.eachSeriesByType('sankey', function (seriesModel) {

src/chart/scatter.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import './scatter/ScatterSeries';
 import './scatter/ScatterView';

src/chart/themeRiver.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import '../component/singleAxis';
 import './themeRiver/ThemeRiverSeries';

src/chart/themeRiver/ThemeRiverSeries.js

@@ -6,7 +6,7 @@
 import completeDimensions from '../../data/helper/completeDimensions';
 import SeriesModel from '../../model/Series';
 import List from '../../data/List';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {encodeHTML} from '../../util/format';
 import nest from '../../util/array/nest';
 

src/chart/themeRiver/ThemeRiverView.js

@@ -6,7 +6,7 @@
 import * as echarts from '../../echarts';
 import {Polygon} from '../line/poly';
 import * as graphic from '../../util/graphic';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import DataDiffer from '../../data/DataDiffer';
 
 export default echarts.extendChartView({

src/chart/themeRiver/themeRiverLayout.js

@@ -3,7 +3,7 @@
  * @author Deqing Li(annong035@gmail.com)
  */
 
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as numberUtil from '../../util/number';
 
 export default function (ecModel, api) {

src/chart/tree.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 import './tree/TreeSeries';
 import './tree/TreeView';

src/chart/tree/TreeView.js

@@ -2,7 +2,7 @@
  * @file  This file used to draw tree view
  */
 
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import SymbolClz from '../helper/Symbol';
 import {radialCoordinate} from './layoutHelper';

src/chart/treemap/Breadcrumb.js

 import * as graphic from '../../util/graphic';
 import * as layout from '../../util/layout';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import {wrapTreePathInfo} from './helper';
 
 var TEXT_PADDING = 8;

src/chart/treemap/TreemapSeries.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import SeriesModel from '../../model/Series';
 import Tree from '../../data/Tree';
 import Model from '../../model/Model';

src/chart/treemap/TreemapView.js

 import * as echarts from '../../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import DataDiffer from '../../data/DataDiffer';
 import * as helper from './helper';
 import Breadcrumb from './Breadcrumb';
 import RoamController from '../../component/helper/RoamController';
-import {BoundingRect} from 'zrender';
-import {matrix} from 'zrender';
+import BoundingRect from 'zrender/core/BoundingRect';
+import * as matrix from 'zrender/core/matrix';
 import * as animationUtil from '../../util/animation';
 import makeStyleMapper from '../../model/mixin/makeStyleMapper';
 

src/chart/treemap/helper.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 export function retrieveTargetInfo(payload, seriesModel) {
     if (payload

src/chart/treemap/treemapLayout.js

-import {util as zrUtil, BoundingRect} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
+import BoundingRect from 'zrender/core/BoundingRect';
 import {parsePercent, MAX_SAFE_INTEGER} from '../../util/number';
 import * as layout from '../../util/layout';
 import * as helper from './helper';

src/chart/treemap/treemapVisual.js

 import VisualMapping from '../../visual/VisualMapping';
-import {
-    color as zrColor,
-    util as zrUtil
-} from 'zrender';
+import * as zrColor from 'zrender/tool/color';
+import * as zrUtil from 'zrender/core/util';
 
 var isArray = zrUtil.isArray;
 

src/component/axis/AngleAxisView.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import Model from '../../model/Model';
 import AxisView from './AxisView';

src/component/axis/AxisBuilder.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as formatUtil from '../../util/format';
 import * as graphic from '../../util/graphic';
 import Model from '../../model/Model';
 import {isRadianAroundZero, remRadian} from '../../util/number';
-import {matrix as matrixUtil} from 'zrender';
-import {vector as vec2} from 'zrender';
+import * as matrixUtil from 'zrender/core/matrix';
+import * as vec2 from 'zrender/core/vector';
 
 var v2ApplyTransform = vec2.applyTransform;
 var retrieve = zrUtil.retrieve;

src/component/axis/CartesianAxisView.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import AxisBuilder from './AxisBuilder';
 import AxisView from './AxisView';

src/component/axis/ParallelAxisView.js

 import * as echarts from '../../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import AxisBuilder from './AxisBuilder';
 import BrushController from '../helper/BrushController';
 import * as brushHelper from '../helper/brushHelper';

src/component/axis/RadiusAxisView.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
 import AxisBuilder from './AxisBuilder';
 import AxisView from './AxisView';

src/component/axis/SingleAxisView.js

 
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import AxisBuilder from './AxisBuilder';
 import * as graphic from '../../util/graphic';
 import * as singleAxisHelper from './singleAxisHelper';

src/component/axis/cartesianAxisHelper.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 /**
  * @param {Object} opt {labelInside}

src/component/axis/singleAxisHelper.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 /**
  * @param {Object} opt {labelInside}

src/component/axisPointer.js

 import * as echarts from '../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as axisPointerModelHelper from './axisPointer/modelHelper';
 import axisTrigger from './axisPointer/axisTrigger';
 

src/component/axisPointer/BaseAxisPointer.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as clazzUtil from '../../util/clazz';
 import * as graphic from '../../util/graphic';
 import * as axisPointerModelHelper from './modelHelper';
-import {event as eventTool} from 'zrender';
+import * as eventTool from 'zrender/core/event';
 import * as throttleUtil from '../../util/throttle';
 import * as modelUtil from '../../util/model';
 

src/component/axisPointer/PolarAxisPointer.js

@@ -2,7 +2,7 @@ import * as formatUtil from '../../util/format';
 import BaseAxisPointer from './BaseAxisPointer';
 import * as graphic from '../../util/graphic';
 import * as viewHelper from './viewHelper';
-import {matrix} from 'zrender';
+import * as matrix from 'zrender/core/matrix';
 import AxisBuilder from '../axis/AxisBuilder';
 import AxisView from '../axis/AxisView';
 

src/component/axisPointer/axisTrigger.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as modelUtil from '../../util/model';
 import * as modelHelper from './modelHelper';
 import findPointFromSeries from './findPointFromSeries';

src/component/axisPointer/findPointFromSeries.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as modelUtil from '../../util/model';
 
 /**

src/component/axisPointer/globalListener.js

-import {util as zrUtil} from 'zrender';
-import {env} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
+import env from 'zrender/core/env';
 import * as modelUtil from '../../util/model';
 
 var get = modelUtil.makeGetter();

src/component/axisPointer/modelHelper.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import Model from '../../model/Model';
 
 var each = zrUtil.each;

src/component/axisPointer/viewHelper.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as graphic from '../../util/graphic';
-import {contain} from 'zrender';
+import * as textContain from 'zrender/contain/text';
 import * as formatUtil from '../../util/format';
-import {matrix} from 'zrender';
+import * as matrix from 'zrender/core/matrix';
 import * as axisHelper from '../../coord/axisHelper';
 import AxisBuilder from '../axis/AxisBuilder';
 
@@ -43,7 +43,7 @@ export function buildLabelElOption(
     var paddings = formatUtil.normalizeCssArray(labelModel.get('padding') || 0);
 
     var font = labelModel.getFont();
-    var textRect = contain.text.getBoundingRect(text, font);
+    var textRect = textContain.getBoundingRect(text, font);
 
     var position = labelPos.position;
     var width = textRect.width + paddings[1] + paddings[3];

src/component/brush/BrushModel.js

 import * as echarts from '../../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import * as visualSolution from '../../visual/visualSolution';
 import Model from '../../model/Model';
 

src/component/brush/BrushView.js

 import * as echarts from '../../echarts';
-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 import BrushController from '../helper/BrushController';
 
 export default echarts.extendComponentView({

src/component/brush/preprocessor.js

-import {util as zrUtil} from 'zrender';
+import * as zrUtil from 'zrender/core/util';
 
 var DEFAULT_TOOLBOX_BTNS = ['rect', 'polygon', 'keep', 'clear'];