Merge branch 'next' into fix/contain-label-name
# Conflicts: # src/component/axis/CartesianAxisView.ts # src/component/axis/axisBreakHelper.ts # src/coord/cartesian/Grid.ts # src/coord/cartesian/GridModel.ts # src/echarts.all.ts # src/export/features.ts # src/label/labelStyle.ts # src/util/graphic.ts # src/util/types.ts # test/build/mktest-tpl.html # test/lib/testHelper.js # test/tmp-base.html
1
100pah committed
8fbe6bd5bb7a434c97da7c0edd590b2aebe8f53d