diff --git a/node_modules/tops-echarts-gl/lib/chart/bar3D.js b/node_modules/tops-echarts-gl/lib/chart/bar3D.js index 60174fc..8f475e6 100644 --- a/node_modules/tops-echarts-gl/lib/chart/bar3D.js +++ b/node_modules/tops-echarts-gl/lib/chart/bar3D.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './bar3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/bar3D/Bar3DSeries.js b/node_modules/tops-echarts-gl/lib/chart/bar3D/Bar3DSeries.js index f3c2034..e957392 100644 --- a/node_modules/tops-echarts-gl/lib/chart/bar3D/Bar3DSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/bar3D/Bar3DSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import componentShadingMixin from '../../component/common/componentShadingMixin'; import formatUtil from '../../util/format'; import formatTooltip from '../common/formatTooltip'; diff --git a/node_modules/tops-echarts-gl/lib/chart/bar3D/Bar3DView.js b/node_modules/tops-echarts-gl/lib/chart/bar3D/Bar3DView.js index 0b12df2..fba1ea9 100644 --- a/node_modules/tops-echarts-gl/lib/chart/bar3D/Bar3DView.js +++ b/node_modules/tops-echarts-gl/lib/chart/bar3D/Bar3DView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import retrieve from '../../util/retrieve'; import format from '../../util/format'; diff --git a/node_modules/tops-echarts-gl/lib/chart/bar3D/bar3DLayout.js b/node_modules/tops-echarts-gl/lib/chart/bar3D/bar3DLayout.js index 1f6fdb1..f850a94 100644 --- a/node_modules/tops-echarts-gl/lib/chart/bar3D/bar3DLayout.js +++ b/node_modules/tops-echarts-gl/lib/chart/bar3D/bar3DLayout.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import Vector3 from 'claygl/src/math/Vector3'; import glmatrix from 'claygl/src/dep/glmatrix'; import cartesian3DLayout from './cartesian3DLayout'; diff --git a/node_modules/tops-echarts-gl/lib/chart/bar3D/cartesian3DLayout.js b/node_modules/tops-echarts-gl/lib/chart/bar3D/cartesian3DLayout.js index 7fdb064..12f7e5c 100644 --- a/node_modules/tops-echarts-gl/lib/chart/bar3D/cartesian3DLayout.js +++ b/node_modules/tops-echarts-gl/lib/chart/bar3D/cartesian3DLayout.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import glmatrix from 'claygl/src/dep/glmatrix'; var vec3 = glmatrix.vec3; var isDimensionStacked = echarts.helper.dataStack.isDimensionStacked; diff --git a/node_modules/tops-echarts-gl/lib/chart/common/PointsBuilder.js b/node_modules/tops-echarts-gl/lib/chart/common/PointsBuilder.js index 84efd72..b12b18e 100644 --- a/node_modules/tops-echarts-gl/lib/chart/common/PointsBuilder.js +++ b/node_modules/tops-echarts-gl/lib/chart/common/PointsBuilder.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import spriteUtil from '../../util/sprite'; import PointsMesh from './PointsMesh'; diff --git a/node_modules/tops-echarts-gl/lib/chart/common/PointsMesh.js b/node_modules/tops-echarts-gl/lib/chart/common/PointsMesh.js index 9d70502..b227b8d 100644 --- a/node_modules/tops-echarts-gl/lib/chart/common/PointsMesh.js +++ b/node_modules/tops-echarts-gl/lib/chart/common/PointsMesh.js @@ -1,6 +1,6 @@ import graphicGL from '../../util/graphicGL'; import verticesSortMixin from '../../util/geometry/verticesSortMixin'; -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import glmatrix from 'claygl/src/dep/glmatrix'; var vec4 = glmatrix.vec4; import sdfSpriteGLSL from './sdfSprite.glsl.js'; diff --git a/node_modules/tops-echarts-gl/lib/chart/common/createList.js b/node_modules/tops-echarts-gl/lib/chart/common/createList.js index 97b93b9..79e4e10 100644 --- a/node_modules/tops-echarts-gl/lib/chart/common/createList.js +++ b/node_modules/tops-echarts-gl/lib/chart/common/createList.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; export default function (seriesModel, dims, source) { source = source || seriesModel.getSource(); var coordSysDimensions = dims || echarts.getCoordinateSystemDimensions(seriesModel.get('coordinateSystem')) || ['x', 'y', 'z']; diff --git a/node_modules/tops-echarts-gl/lib/chart/common/formatTooltip.js b/node_modules/tops-echarts-gl/lib/chart/common/formatTooltip.js index e755cfd..a4c30e8 100644 --- a/node_modules/tops-echarts-gl/lib/chart/common/formatTooltip.js +++ b/node_modules/tops-echarts-gl/lib/chart/common/formatTooltip.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import { getItemVisualColor } from '../../util/visual'; function otherDimToDataDim(data, otherDim) { diff --git a/node_modules/tops-echarts-gl/lib/chart/flowGL.js b/node_modules/tops-echarts-gl/lib/chart/flowGL.js index 90fab25..0e99acf 100644 --- a/node_modules/tops-echarts-gl/lib/chart/flowGL.js +++ b/node_modules/tops-echarts-gl/lib/chart/flowGL.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './flowGL/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/flowGL/FlowGLSeries.js b/node_modules/tops-echarts-gl/lib/chart/flowGL/FlowGLSeries.js index a9e08e0..ec22ed2 100644 --- a/node_modules/tops-echarts-gl/lib/chart/flowGL/FlowGLSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/flowGL/FlowGLSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; export default echarts.SeriesModel.extend({ type: 'series.flowGL', dependencies: ['geo', 'grid', 'bmap'], diff --git a/node_modules/tops-echarts-gl/lib/chart/flowGL/FlowGLView.js b/node_modules/tops-echarts-gl/lib/chart/flowGL/FlowGLView.js index 0934bf2..002792e 100644 --- a/node_modules/tops-echarts-gl/lib/chart/flowGL/FlowGLView.js +++ b/node_modules/tops-echarts-gl/lib/chart/flowGL/FlowGLView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import retrieve from '../../util/retrieve'; import ViewGL from '../../core/ViewGL'; diff --git a/node_modules/tops-echarts-gl/lib/chart/flowGL/Line2D.js b/node_modules/tops-echarts-gl/lib/chart/flowGL/Line2D.js index 04102e9..18f47bc 100644 --- a/node_modules/tops-echarts-gl/lib/chart/flowGL/Line2D.js +++ b/node_modules/tops-echarts-gl/lib/chart/flowGL/Line2D.js @@ -6,7 +6,7 @@ * @author Yi Shen(http://github.com/pissang) */ import Geometry from 'claygl/src/Geometry'; -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; /** * @constructor * @alias module:echarts-gl/chart/flowGL/Line2D diff --git a/node_modules/tops-echarts-gl/lib/chart/graphGL.js b/node_modules/tops-echarts-gl/lib/chart/graphGL.js index 2d1ec80..80ba610 100644 --- a/node_modules/tops-echarts-gl/lib/chart/graphGL.js +++ b/node_modules/tops-echarts-gl/lib/chart/graphGL.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './graphGL/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/graphGL/GraphGLSeries.js b/node_modules/tops-echarts-gl/lib/chart/graphGL/GraphGLSeries.js index a54d689..ff19c93 100644 --- a/node_modules/tops-echarts-gl/lib/chart/graphGL/GraphGLSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/graphGL/GraphGLSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import createGraphFromNodeEdge from './createGraphFromNodeEdge'; import formatUtil from '../../util/format'; var GraphSeries = echarts.SeriesModel.extend({ diff --git a/node_modules/tops-echarts-gl/lib/chart/graphGL/GraphGLView.js b/node_modules/tops-echarts-gl/lib/chart/graphGL/GraphGLView.js index 91b92a3..d86a049 100644 --- a/node_modules/tops-echarts-gl/lib/chart/graphGL/GraphGLView.js +++ b/node_modules/tops-echarts-gl/lib/chart/graphGL/GraphGLView.js @@ -1,5 +1,5 @@ -import * as echarts from 'echarts/lib/echarts'; -import { getLayoutRect } from 'echarts/lib/util/layout'; +import * as echarts from 'tops-echarts/lib/echarts'; +import { getLayoutRect } from 'tops-echarts/lib/util/layout'; import graphicGL from '../../util/graphicGL'; import ViewGL from '../../core/ViewGL'; import Lines2DGeometry from '../../util/geometry/Lines2D'; diff --git a/node_modules/tops-echarts-gl/lib/chart/graphGL/createGraphFromNodeEdge.js b/node_modules/tops-echarts-gl/lib/chart/graphGL/createGraphFromNodeEdge.js index ae3cc50..f827abf 100644 --- a/node_modules/tops-echarts-gl/lib/chart/graphGL/createGraphFromNodeEdge.js +++ b/node_modules/tops-echarts-gl/lib/chart/graphGL/createGraphFromNodeEdge.js @@ -1,6 +1,6 @@ -import * as echarts from 'echarts/lib/echarts'; -import Graph from 'echarts/lib/data/Graph'; -import linkList from 'echarts/lib/data/helper/linkList'; +import * as echarts from 'tops-echarts/lib/echarts'; +import Graph from 'tops-echarts/lib/data/Graph'; +import linkList from 'tops-echarts/lib/data/helper/linkList'; import retrieve from '../../util/retrieve'; export default function (nodes, edges, hostModel, directed, beforeLink) { var graph = new Graph(directed); diff --git a/node_modules/tops-echarts-gl/lib/chart/graphGL/install.js b/node_modules/tops-echarts-gl/lib/chart/graphGL/install.js index 9bdcd53..40cd892 100644 --- a/node_modules/tops-echarts-gl/lib/chart/graphGL/install.js +++ b/node_modules/tops-echarts-gl/lib/chart/graphGL/install.js @@ -1,6 +1,6 @@ // TODO ECharts GL must be imported whatever component,charts is imported. import '../../echarts-gl'; -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import GraphGLSeries from './GraphGLSeries'; import GraphGLView from './GraphGLView'; diff --git a/node_modules/tops-echarts-gl/lib/chart/line3D.js b/node_modules/tops-echarts-gl/lib/chart/line3D.js index eda53c1..753831f 100644 --- a/node_modules/tops-echarts-gl/lib/chart/line3D.js +++ b/node_modules/tops-echarts-gl/lib/chart/line3D.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './line3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/line3D/Line3DSeries.js b/node_modules/tops-echarts-gl/lib/chart/line3D/Line3DSeries.js index 46965b8..66f78c2 100644 --- a/node_modules/tops-echarts-gl/lib/chart/line3D/Line3DSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/line3D/Line3DSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import formatTooltip from '../common/formatTooltip'; import createList from '../common/createList'; var Line3DSeries = echarts.SeriesModel.extend({ diff --git a/node_modules/tops-echarts-gl/lib/chart/line3D/Line3DView.js b/node_modules/tops-echarts-gl/lib/chart/line3D/Line3DView.js index d4ffa88..44ca160 100644 --- a/node_modules/tops-echarts-gl/lib/chart/line3D/Line3DView.js +++ b/node_modules/tops-echarts-gl/lib/chart/line3D/Line3DView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import retrieve from '../../util/retrieve'; import Lines3DGeometry from '../../util/geometry/Lines3D'; diff --git a/node_modules/tops-echarts-gl/lib/chart/lines3D.js b/node_modules/tops-echarts-gl/lib/chart/lines3D.js index d4a206f..214f78d 100644 --- a/node_modules/tops-echarts-gl/lib/chart/lines3D.js +++ b/node_modules/tops-echarts-gl/lib/chart/lines3D.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './lines3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/lines3D/Lines3DSeries.js b/node_modules/tops-echarts-gl/lib/chart/lines3D/Lines3DSeries.js index dea2029..0f93394 100644 --- a/node_modules/tops-echarts-gl/lib/chart/lines3D/Lines3DSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/lines3D/Lines3DSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; export default echarts.SeriesModel.extend({ type: 'series.lines3D', dependencies: ['globe'], diff --git a/node_modules/tops-echarts-gl/lib/chart/lines3D/Lines3DView.js b/node_modules/tops-echarts-gl/lib/chart/lines3D/Lines3DView.js index 1981199..70bbf25 100644 --- a/node_modules/tops-echarts-gl/lib/chart/lines3D/Lines3DView.js +++ b/node_modules/tops-echarts-gl/lib/chart/lines3D/Lines3DView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import LinesGeometry from '../../util/geometry/Lines3D'; // import TrailMesh from './TrailMesh'; diff --git a/node_modules/tops-echarts-gl/lib/chart/lines3D/TrailMesh.js b/node_modules/tops-echarts-gl/lib/chart/lines3D/TrailMesh.js index e9c1a5e..34b1f9a 100644 --- a/node_modules/tops-echarts-gl/lib/chart/lines3D/TrailMesh.js +++ b/node_modules/tops-echarts-gl/lib/chart/lines3D/TrailMesh.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import TrailGeometry from './TrailGeometry'; import { getItemVisualColor, getItemVisualOpacity } from '../../util/visual'; diff --git a/node_modules/tops-echarts-gl/lib/chart/lines3D/TrailMesh2.js b/node_modules/tops-echarts-gl/lib/chart/lines3D/TrailMesh2.js index 926d9e0..3b55b5b 100644 --- a/node_modules/tops-echarts-gl/lib/chart/lines3D/TrailMesh2.js +++ b/node_modules/tops-echarts-gl/lib/chart/lines3D/TrailMesh2.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import glmatrix from 'claygl/src/dep/glmatrix'; import Lines3DGeometry from '../../util/geometry/Lines3D'; diff --git a/node_modules/tops-echarts-gl/lib/chart/lines3D/lines3DLayout.js b/node_modules/tops-echarts-gl/lib/chart/lines3D/lines3DLayout.js index 76ab3fc..bbd94ae 100644 --- a/node_modules/tops-echarts-gl/lib/chart/lines3D/lines3DLayout.js +++ b/node_modules/tops-echarts-gl/lib/chart/lines3D/lines3DLayout.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import glmatrix from 'claygl/src/dep/glmatrix'; var vec3 = glmatrix.vec3; var vec2 = glmatrix.vec2; diff --git a/node_modules/tops-echarts-gl/lib/chart/linesGL.js b/node_modules/tops-echarts-gl/lib/chart/linesGL.js index 6ed23a9..f9a8a88 100644 --- a/node_modules/tops-echarts-gl/lib/chart/linesGL.js +++ b/node_modules/tops-echarts-gl/lib/chart/linesGL.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './linesGL/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/linesGL/LinesGLSeries.js b/node_modules/tops-echarts-gl/lib/chart/linesGL/LinesGLSeries.js index d631600..35cad9f 100644 --- a/node_modules/tops-echarts-gl/lib/chart/linesGL/LinesGLSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/linesGL/LinesGLSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import { concatArray } from 'zrender/lib/core/util'; var LinesGLSeries = echarts.SeriesModel.extend({ type: 'series.linesGL', diff --git a/node_modules/tops-echarts-gl/lib/chart/linesGL/LinesGLView.js b/node_modules/tops-echarts-gl/lib/chart/linesGL/LinesGLView.js index 029cf97..66319b7 100644 --- a/node_modules/tops-echarts-gl/lib/chart/linesGL/LinesGLView.js +++ b/node_modules/tops-echarts-gl/lib/chart/linesGL/LinesGLView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import ViewGL from '../../core/ViewGL'; import Lines2DGeometry from '../../util/geometry/Lines2D'; diff --git a/node_modules/tops-echarts-gl/lib/chart/map3D.js b/node_modules/tops-echarts-gl/lib/chart/map3D.js index 279110e..3d53199 100644 --- a/node_modules/tops-echarts-gl/lib/chart/map3D.js +++ b/node_modules/tops-echarts-gl/lib/chart/map3D.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './map3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/map3D/Map3DSeries.js b/node_modules/tops-echarts-gl/lib/chart/map3D/Map3DSeries.js index 928dd18..28e6966 100644 --- a/node_modules/tops-echarts-gl/lib/chart/map3D/Map3DSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/map3D/Map3DSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import componentViewControlMixin from '../../component/common/componentViewControlMixin'; import componentPostEffectMixin from '../../component/common/componentPostEffectMixin'; import componentLightMixin from '../../component/common/componentLightMixin'; diff --git a/node_modules/tops-echarts-gl/lib/chart/map3D/Map3DView.js b/node_modules/tops-echarts-gl/lib/chart/map3D/Map3DView.js index 051b77e..57254d3 100644 --- a/node_modules/tops-echarts-gl/lib/chart/map3D/Map3DView.js +++ b/node_modules/tops-echarts-gl/lib/chart/map3D/Map3DView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import OrbitControl from '../../util/OrbitControl'; import SceneHelper from '../../component/common/SceneHelper'; diff --git a/node_modules/tops-echarts-gl/lib/chart/polygons3D.js b/node_modules/tops-echarts-gl/lib/chart/polygons3D.js index 0c2d571..9697874 100644 --- a/node_modules/tops-echarts-gl/lib/chart/polygons3D.js +++ b/node_modules/tops-echarts-gl/lib/chart/polygons3D.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './polygons3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/polygons3D/Polygons3DSeries.js b/node_modules/tops-echarts-gl/lib/chart/polygons3D/Polygons3DSeries.js index 1d7c35f..7e563d6 100644 --- a/node_modules/tops-echarts-gl/lib/chart/polygons3D/Polygons3DSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/polygons3D/Polygons3DSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import componentShadingMixin from '../../component/common/componentShadingMixin'; function transformPolygon(coordSys, poly) { diff --git a/node_modules/tops-echarts-gl/lib/chart/polygons3D/Polygons3DView.js b/node_modules/tops-echarts-gl/lib/chart/polygons3D/Polygons3DView.js index 7357a11..2b043a3 100644 --- a/node_modules/tops-echarts-gl/lib/chart/polygons3D/Polygons3DView.js +++ b/node_modules/tops-echarts-gl/lib/chart/polygons3D/Polygons3DView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import Geo3DBuilder from '../../component/common/Geo3DBuilder'; import graphicGL from '../../util/graphicGL'; export default echarts.ChartView.extend({ diff --git a/node_modules/tops-echarts-gl/lib/chart/scatter3D.js b/node_modules/tops-echarts-gl/lib/chart/scatter3D.js index 634d2cf..08751f8 100644 --- a/node_modules/tops-echarts-gl/lib/chart/scatter3D.js +++ b/node_modules/tops-echarts-gl/lib/chart/scatter3D.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './scatter3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/scatter3D/Scatter3DSeries.js b/node_modules/tops-echarts-gl/lib/chart/scatter3D/Scatter3DSeries.js index f78252f..859baa4 100644 --- a/node_modules/tops-echarts-gl/lib/chart/scatter3D/Scatter3DSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/scatter3D/Scatter3DSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import formatUtil from '../../util/format'; import formatTooltip from '../common/formatTooltip'; import createList from '../common/createList'; diff --git a/node_modules/tops-echarts-gl/lib/chart/scatter3D/Scatter3DView.js b/node_modules/tops-echarts-gl/lib/chart/scatter3D/Scatter3DView.js index 183bdd5..cb8ddc9 100644 --- a/node_modules/tops-echarts-gl/lib/chart/scatter3D/Scatter3DView.js +++ b/node_modules/tops-echarts-gl/lib/chart/scatter3D/Scatter3DView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import retrieve from '../../util/retrieve'; import format from '../../util/format'; diff --git a/node_modules/tops-echarts-gl/lib/chart/scatterGL.js b/node_modules/tops-echarts-gl/lib/chart/scatterGL.js index b2c5402..1a934d9 100644 --- a/node_modules/tops-echarts-gl/lib/chart/scatterGL.js +++ b/node_modules/tops-echarts-gl/lib/chart/scatterGL.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './scatterGL/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/scatterGL/ScatterGLSeries.js b/node_modules/tops-echarts-gl/lib/chart/scatterGL/ScatterGLSeries.js index 46a8bd4..0cdb710 100644 --- a/node_modules/tops-echarts-gl/lib/chart/scatterGL/ScatterGLSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/scatterGL/ScatterGLSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; export default echarts.SeriesModel.extend({ type: 'series.scatterGL', dependencies: ['grid', 'polar', 'geo', 'singleAxis'], diff --git a/node_modules/tops-echarts-gl/lib/chart/scatterGL/ScatterGLView.js b/node_modules/tops-echarts-gl/lib/chart/scatterGL/ScatterGLView.js index 5d0518c..44c23ae 100644 --- a/node_modules/tops-echarts-gl/lib/chart/scatterGL/ScatterGLView.js +++ b/node_modules/tops-echarts-gl/lib/chart/scatterGL/ScatterGLView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import ViewGL from '../../core/ViewGL'; import PointsBuilder from '../common/PointsBuilder'; diff --git a/node_modules/tops-echarts-gl/lib/chart/surface.js b/node_modules/tops-echarts-gl/lib/chart/surface.js index c5d53a6..83e8512 100644 --- a/node_modules/tops-echarts-gl/lib/chart/surface.js +++ b/node_modules/tops-echarts-gl/lib/chart/surface.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './surface/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/chart/surface/SurfaceSeries.js b/node_modules/tops-echarts-gl/lib/chart/surface/SurfaceSeries.js index 2093a3d..54412a8 100644 --- a/node_modules/tops-echarts-gl/lib/chart/surface/SurfaceSeries.js +++ b/node_modules/tops-echarts-gl/lib/chart/surface/SurfaceSeries.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import componentShadingMixin from '../../component/common/componentShadingMixin'; import formatTooltip from '../common/formatTooltip'; import createList from '../common/createList'; diff --git a/node_modules/tops-echarts-gl/lib/chart/surface/SurfaceView.js b/node_modules/tops-echarts-gl/lib/chart/surface/SurfaceView.js index 77f02ab..9eaa1e9 100644 --- a/node_modules/tops-echarts-gl/lib/chart/surface/SurfaceView.js +++ b/node_modules/tops-echarts-gl/lib/chart/surface/SurfaceView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import glmatrix from 'claygl/src/dep/glmatrix'; import trianglesSortMixin from '../../util/geometry/trianglesSortMixin'; diff --git a/node_modules/tops-echarts-gl/lib/chart/surface/surfaceLayout.js b/node_modules/tops-echarts-gl/lib/chart/surface/surfaceLayout.js index e55a02b..e9fef04 100644 --- a/node_modules/tops-echarts-gl/lib/chart/surface/surfaceLayout.js +++ b/node_modules/tops-echarts-gl/lib/chart/surface/surfaceLayout.js @@ -1,6 +1,6 @@ "use strict"; -var echarts = require("echarts/index.blank"); +var echarts = require("tops-echarts/index.blank"); echarts.registerLayout(function (ecModel, api) { ecModel.eachSeriesByType('surface', function (surfaceModel) { diff --git a/node_modules/tops-echarts-gl/lib/component/common/Geo3DBuilder.js b/node_modules/tops-echarts-gl/lib/component/common/Geo3DBuilder.js index dc19b2e..5a523d6 100644 --- a/node_modules/tops-echarts-gl/lib/component/common/Geo3DBuilder.js +++ b/node_modules/tops-echarts-gl/lib/component/common/Geo3DBuilder.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import earcut from '../../util/earcut'; import LinesGeo from '../../util/geometry/Lines3D'; diff --git a/node_modules/tops-echarts-gl/lib/component/common/LabelsBuilder.js b/node_modules/tops-echarts-gl/lib/component/common/LabelsBuilder.js index d2ba764..59454f0 100644 --- a/node_modules/tops-echarts-gl/lib/component/common/LabelsBuilder.js +++ b/node_modules/tops-echarts-gl/lib/component/common/LabelsBuilder.js @@ -1,9 +1,9 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import ZRTextureAtlasSurface from '../../util/ZRTextureAtlasSurface'; import LabelsMesh from '../../util/mesh/LabelsMesh'; import retrieve from '../../util/retrieve'; import { getItemVisualColor, getItemVisualOpacity } from '../../util/visual'; -import { createTextStyle } from 'echarts/lib/label/labelStyle'; +import { createTextStyle } from 'tops-echarts/lib/label/labelStyle'; var LABEL_NORMAL_SHOW_BIT = 1; var LABEL_EMPHASIS_SHOW_BIT = 2; diff --git a/node_modules/tops-echarts-gl/lib/component/common/SceneHelper.js b/node_modules/tops-echarts-gl/lib/component/common/SceneHelper.js index 60a2673..5df8a13 100644 --- a/node_modules/tops-echarts-gl/lib/component/common/SceneHelper.js +++ b/node_modules/tops-echarts-gl/lib/component/common/SceneHelper.js @@ -1,6 +1,6 @@ import graphicGL from '../../util/graphicGL'; import Skybox from 'claygl/src/plugin/Skybox'; -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; function SceneHelper() {} diff --git a/node_modules/tops-echarts-gl/lib/component/geo3D.js b/node_modules/tops-echarts-gl/lib/component/geo3D.js index d12d885..14f914f 100644 --- a/node_modules/tops-echarts-gl/lib/component/geo3D.js +++ b/node_modules/tops-echarts-gl/lib/component/geo3D.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './geo3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/component/geo3D/Geo3DModel.js b/node_modules/tops-echarts-gl/lib/component/geo3D/Geo3DModel.js index 64f2dc4..ff90543 100644 --- a/node_modules/tops-echarts-gl/lib/component/geo3D/Geo3DModel.js +++ b/node_modules/tops-echarts-gl/lib/component/geo3D/Geo3DModel.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import componentViewControlMixin from '../common/componentViewControlMixin'; import componentPostEffectMixin from '../common/componentPostEffectMixin'; import componentLightMixin from '../common/componentLightMixin'; diff --git a/node_modules/tops-echarts-gl/lib/component/geo3D/Geo3DView.js b/node_modules/tops-echarts-gl/lib/component/geo3D/Geo3DView.js index f0e9b9a..1e1e80d 100644 --- a/node_modules/tops-echarts-gl/lib/component/geo3D/Geo3DView.js +++ b/node_modules/tops-echarts-gl/lib/component/geo3D/Geo3DView.js @@ -1,5 +1,5 @@ import Geo3DBuilder from '../common/Geo3DBuilder'; -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import OrbitControl from '../../util/OrbitControl'; import SceneHelper from '../common/SceneHelper'; diff --git a/node_modules/tops-echarts-gl/lib/component/globe.js b/node_modules/tops-echarts-gl/lib/component/globe.js index e5518c2..81766cc 100644 --- a/node_modules/tops-echarts-gl/lib/component/globe.js +++ b/node_modules/tops-echarts-gl/lib/component/globe.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './globe/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/component/globe/GlobeModel.js b/node_modules/tops-echarts-gl/lib/component/globe/GlobeModel.js index 7b5a647..b073db8 100644 --- a/node_modules/tops-echarts-gl/lib/component/globe/GlobeModel.js +++ b/node_modules/tops-echarts-gl/lib/component/globe/GlobeModel.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import componentViewControlMixin from '../common/componentViewControlMixin'; import componentPostEffectMixin from '../common/componentPostEffectMixin'; import componentLightMixin from '../common/componentLightMixin'; diff --git a/node_modules/tops-echarts-gl/lib/component/globe/GlobeView.js b/node_modules/tops-echarts-gl/lib/component/globe/GlobeView.js index 916ffea..7f2063e 100644 --- a/node_modules/tops-echarts-gl/lib/component/globe/GlobeView.js +++ b/node_modules/tops-echarts-gl/lib/component/globe/GlobeView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import OrbitControl from '../../util/OrbitControl'; import SceneHelper from '../common/SceneHelper'; diff --git a/node_modules/tops-echarts-gl/lib/component/grid3D.js b/node_modules/tops-echarts-gl/lib/component/grid3D.js index 7ed2973..54ac4e6 100644 --- a/node_modules/tops-echarts-gl/lib/component/grid3D.js +++ b/node_modules/tops-echarts-gl/lib/component/grid3D.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './grid3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/component/grid3D/Axis3DModel.js b/node_modules/tops-echarts-gl/lib/component/grid3D/Axis3DModel.js index a8a1f0b..3ca7fc2 100644 --- a/node_modules/tops-echarts-gl/lib/component/grid3D/Axis3DModel.js +++ b/node_modules/tops-echarts-gl/lib/component/grid3D/Axis3DModel.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; var Axis3DModel = echarts.ComponentModel.extend({ type: 'cartesian3DAxis', axis: null, diff --git a/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DAxis.js b/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DAxis.js index bb894c1..b3bae34 100644 --- a/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DAxis.js +++ b/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DAxis.js @@ -1,5 +1,5 @@ -import * as echarts from 'echarts/lib/echarts'; -import { createTextStyle } from 'echarts/lib/label/labelStyle'; +import * as echarts from 'tops-echarts/lib/echarts'; +import { createTextStyle } from 'tops-echarts/lib/label/labelStyle'; import graphicGL from '../../util/graphicGL'; import Lines3DGeometry from '../../util/geometry/Lines3D'; import retrieve from '../../util/retrieve'; diff --git a/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DFace.js b/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DFace.js index f7c5f10..91cbf45 100644 --- a/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DFace.js +++ b/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DFace.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import graphicGL from '../../util/graphicGL'; import retrieve from '../../util/retrieve'; import Lines3DGeometry from '../../util/geometry/Lines3D'; diff --git a/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DModel.js b/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DModel.js index 2cb82e5..a973477 100644 --- a/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DModel.js +++ b/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DModel.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import componentViewControlMixin from '../common/componentViewControlMixin'; import componentPostEffectMixin from '../common/componentPostEffectMixin'; import componentLightMixin from '../common/componentLightMixin'; diff --git a/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DView.js b/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DView.js index c524e8a..3f73e94 100644 --- a/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DView.js +++ b/node_modules/tops-echarts-gl/lib/component/grid3D/Grid3DView.js @@ -1,6 +1,6 @@ // TODO orthographic camera -import * as echarts from 'echarts/lib/echarts'; -import { createTextStyle } from 'echarts/lib/label/labelStyle'; +import * as echarts from 'tops-echarts/lib/echarts'; +import { createTextStyle } from 'tops-echarts/lib/label/labelStyle'; import graphicGL from '../../util/graphicGL'; import OrbitControl from '../../util/OrbitControl'; import Lines3DGeometry from '../../util/geometry/Lines3D'; diff --git a/node_modules/tops-echarts-gl/lib/component/grid3D/axis3DDefault.js b/node_modules/tops-echarts-gl/lib/component/grid3D/axis3DDefault.js index 645635c..4571e11 100644 --- a/node_modules/tops-echarts-gl/lib/component/grid3D/axis3DDefault.js +++ b/node_modules/tops-echarts-gl/lib/component/grid3D/axis3DDefault.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; var defaultOption = { show: true, grid3DIndex: 0, diff --git a/node_modules/tops-echarts-gl/lib/component/grid3D/createAxis3DModel.js b/node_modules/tops-echarts-gl/lib/component/grid3D/createAxis3DModel.js index b55fb3b..3d3d89e 100644 --- a/node_modules/tops-echarts-gl/lib/component/grid3D/createAxis3DModel.js +++ b/node_modules/tops-echarts-gl/lib/component/grid3D/createAxis3DModel.js @@ -1,6 +1,6 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import axisDefault from './axis3DDefault'; -import OrdinalMeta from 'echarts/lib/data/OrdinalMeta'; +import OrdinalMeta from 'tops-echarts/lib/data/OrdinalMeta'; var AXIS_TYPES = ['value', 'category', 'time', 'log']; /** * Generate sub axis model class diff --git a/node_modules/tops-echarts-gl/lib/component/mapbox3D.js b/node_modules/tops-echarts-gl/lib/component/mapbox3D.js index 4524a51..a661cd7 100644 --- a/node_modules/tops-echarts-gl/lib/component/mapbox3D.js +++ b/node_modules/tops-echarts-gl/lib/component/mapbox3D.js @@ -1,3 +1,3 @@ -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './mapbox3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/component/mapbox3D/Mapbox3DModel.js b/node_modules/tops-echarts-gl/lib/component/mapbox3D/Mapbox3DModel.js index 9646e95..ca9bcaf 100644 --- a/node_modules/tops-echarts-gl/lib/component/mapbox3D/Mapbox3DModel.js +++ b/node_modules/tops-echarts-gl/lib/component/mapbox3D/Mapbox3DModel.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import componentPostEffectMixin from '../common/componentPostEffectMixin'; import componentLightMixin from '../common/componentLightMixin'; var MAPBOX_CAMERA_OPTION = ['zoom', 'center', 'pitch', 'bearing']; diff --git a/node_modules/tops-echarts-gl/lib/component/mapbox3D/Mapbox3DView.js b/node_modules/tops-echarts-gl/lib/component/mapbox3D/Mapbox3DView.js index 6147c94..35db7fb 100644 --- a/node_modules/tops-echarts-gl/lib/component/mapbox3D/Mapbox3DView.js +++ b/node_modules/tops-echarts-gl/lib/component/mapbox3D/Mapbox3DView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import Mapbox3DLayer from './Mapbox3DLayer'; import SceneHelper from '../common/SceneHelper'; import graphicGL from '../../util/graphicGL'; diff --git a/node_modules/tops-echarts-gl/lib/component/maptalks3D.js b/node_modules/tops-echarts-gl/lib/component/maptalks3D.js index 7c57965..711b366 100644 --- a/node_modules/tops-echarts-gl/lib/component/maptalks3D.js +++ b/node_modules/tops-echarts-gl/lib/component/maptalks3D.js @@ -1,4 +1,4 @@ // Thanks to https://gitee.com/iverson_hu/maptalks-echarts-gl -import { use } from 'echarts/lib/echarts'; +import { use } from 'tops-echarts/lib/echarts'; import { install } from './maptalks3D/install'; use(install); diff --git a/node_modules/tops-echarts-gl/lib/component/maptalks3D/Maptalks3DModel.js b/node_modules/tops-echarts-gl/lib/component/maptalks3D/Maptalks3DModel.js index 7f0e4c2..bed1f42 100644 --- a/node_modules/tops-echarts-gl/lib/component/maptalks3D/Maptalks3DModel.js +++ b/node_modules/tops-echarts-gl/lib/component/maptalks3D/Maptalks3DModel.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import componentPostEffectMixin from '../common/componentPostEffectMixin'; import componentLightMixin from '../common/componentLightMixin'; var MAPTALKS_CAMERA_OPTION = ['zoom', 'center', 'pitch', 'bearing']; diff --git a/node_modules/tops-echarts-gl/lib/component/maptalks3D/Maptalks3DView.js b/node_modules/tops-echarts-gl/lib/component/maptalks3D/Maptalks3DView.js index 0d6e9f5..a7dd961 100644 --- a/node_modules/tops-echarts-gl/lib/component/maptalks3D/Maptalks3DView.js +++ b/node_modules/tops-echarts-gl/lib/component/maptalks3D/Maptalks3DView.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import Maptalks3DLayer from './Maptalks3DLayer'; import SceneHelper from '../common/SceneHelper'; import graphicGL from '../../util/graphicGL'; diff --git a/node_modules/tops-echarts-gl/lib/coord/geo3D/Geo3D.js b/node_modules/tops-echarts-gl/lib/coord/geo3D/Geo3D.js index bdef9ec..c55fa48 100644 --- a/node_modules/tops-echarts-gl/lib/coord/geo3D/Geo3D.js +++ b/node_modules/tops-echarts-gl/lib/coord/geo3D/Geo3D.js @@ -1,9 +1,9 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import glmatrix from 'claygl/src/dep/glmatrix'; var vec3 = glmatrix.vec3; var mat4 = glmatrix.mat4; -import textCoord from 'echarts/lib/coord/geo/fix/textCoord'; -import geoCoord from 'echarts/lib/coord/geo/fix/geoCoord'; // Geo fix functions +import textCoord from 'tops-echarts/lib/coord/geo/fix/textCoord'; +import geoCoord from 'tops-echarts/lib/coord/geo/fix/geoCoord'; // Geo fix functions var geoFixFuncs = [textCoord, geoCoord]; diff --git a/node_modules/tops-echarts-gl/lib/coord/geo3D/geo3DModelMixin.js b/node_modules/tops-echarts-gl/lib/coord/geo3D/geo3DModelMixin.js index ee474f3..9ecf5a3 100644 --- a/node_modules/tops-echarts-gl/lib/coord/geo3D/geo3DModelMixin.js +++ b/node_modules/tops-echarts-gl/lib/coord/geo3D/geo3DModelMixin.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; export default { getFilledRegions: function (regions, mapData) { var regionsArr = (regions || []).slice(); diff --git a/node_modules/tops-echarts-gl/lib/coord/geo3DCreator.js b/node_modules/tops-echarts-gl/lib/coord/geo3DCreator.js index 9d6432a..43b4893 100644 --- a/node_modules/tops-echarts-gl/lib/coord/geo3DCreator.js +++ b/node_modules/tops-echarts-gl/lib/coord/geo3DCreator.js @@ -1,6 +1,6 @@ import Geo3D from './geo3D/Geo3D'; -import * as echarts from 'echarts/lib/echarts'; -import { getLayoutRect } from 'echarts/lib/util/layout'; +import * as echarts from 'tops-echarts/lib/echarts'; +import { getLayoutRect } from 'tops-echarts/lib/util/layout'; import ViewGL from '../core/ViewGL'; import retrieve from '../util/retrieve'; diff --git a/node_modules/tops-echarts-gl/lib/coord/globeCreator.js b/node_modules/tops-echarts-gl/lib/coord/globeCreator.js index d2d204e..7f40884 100644 --- a/node_modules/tops-echarts-gl/lib/coord/globeCreator.js +++ b/node_modules/tops-echarts-gl/lib/coord/globeCreator.js @@ -1,6 +1,6 @@ import Globe from './globe/Globe'; -import * as echarts from 'echarts/lib/echarts'; -import { getLayoutRect } from 'echarts/lib/util/layout'; +import * as echarts from 'tops-echarts/lib/echarts'; +import { getLayoutRect } from 'tops-echarts/lib/util/layout'; import ViewGL from '../core/ViewGL'; import retrieve from '../util/retrieve'; import graphicGL from '../util/graphicGL'; diff --git a/node_modules/tops-echarts-gl/lib/coord/grid3D/Axis3D.js b/node_modules/tops-echarts-gl/lib/coord/grid3D/Axis3D.js index 56a2c47..79b9e4d 100644 --- a/node_modules/tops-echarts-gl/lib/coord/grid3D/Axis3D.js +++ b/node_modules/tops-echarts-gl/lib/coord/grid3D/Axis3D.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; function Axis3D(dim, scale, extent) { echarts.Axis.call(this, dim, scale, extent); diff --git a/node_modules/tops-echarts-gl/lib/coord/grid3D/Cartesian3D.js b/node_modules/tops-echarts-gl/lib/coord/grid3D/Cartesian3D.js index 8d23dfe..7217357 100644 --- a/node_modules/tops-echarts-gl/lib/coord/grid3D/Cartesian3D.js +++ b/node_modules/tops-echarts-gl/lib/coord/grid3D/Cartesian3D.js @@ -1,5 +1,5 @@ -import * as echarts from 'echarts/lib/echarts'; -import Cartesian from 'echarts/lib/coord/cartesian/Cartesian'; +import * as echarts from 'tops-echarts/lib/echarts'; +import Cartesian from 'tops-echarts/lib/coord/cartesian/Cartesian'; function Cartesian3D(name) { Cartesian.call(this, name); diff --git a/node_modules/tops-echarts-gl/lib/coord/grid3DCreator.js b/node_modules/tops-echarts-gl/lib/coord/grid3DCreator.js index c4fcd69..10d4643 100644 --- a/node_modules/tops-echarts-gl/lib/coord/grid3DCreator.js +++ b/node_modules/tops-echarts-gl/lib/coord/grid3DCreator.js @@ -1,7 +1,7 @@ import Cartesian3D from './grid3D/Cartesian3D'; import Axis3D from './grid3D/Axis3D'; -import * as echarts from 'echarts/lib/echarts'; -import { getLayoutRect } from 'echarts/lib/util/layout'; +import * as echarts from 'tops-echarts/lib/echarts'; +import { getLayoutRect } from 'tops-echarts/lib/util/layout'; import ViewGL from '../core/ViewGL'; import retrieve from '../util/retrieve'; diff --git a/node_modules/tops-echarts-gl/lib/core/LayerGL.js b/node_modules/tops-echarts-gl/lib/core/LayerGL.js index f455fe1..938268a 100644 --- a/node_modules/tops-echarts-gl/lib/core/LayerGL.js +++ b/node_modules/tops-echarts-gl/lib/core/LayerGL.js @@ -10,7 +10,7 @@ * / \ * ViewGL ViewGL */ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import Renderer from 'claygl/src/Renderer'; import RayPicking from 'claygl/src/picking/RayPicking'; import Texture from 'claygl/src/Texture'; diff --git a/node_modules/tops-echarts-gl/lib/core/ViewGL.js b/node_modules/tops-echarts-gl/lib/core/ViewGL.js index e53cb76..bf59c97 100644 --- a/node_modules/tops-echarts-gl/lib/core/ViewGL.js +++ b/node_modules/tops-echarts-gl/lib/core/ViewGL.js @@ -2,7 +2,7 @@ * @module echarts-gl/core/ViewGL * @author Yi Shen(http://github.com/pissang) */ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import Scene from 'claygl/src/Scene'; import ShadowMapPass from 'claygl/src/prePass/ShadowMap'; import PerspectiveCamera from 'claygl/src/camera/Perspective'; diff --git a/node_modules/tops-echarts-gl/lib/echarts-gl.js b/node_modules/tops-echarts-gl/lib/echarts-gl.js index c602f21..61b11f0 100644 --- a/node_modules/tops-echarts-gl/lib/echarts-gl.js +++ b/node_modules/tops-echarts-gl/lib/echarts-gl.js @@ -26,7 +26,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import LayerGL from './core/LayerGL'; import backwardCompat from './preprocessor/backwardCompat'; diff --git a/node_modules/tops-echarts-gl/lib/preprocessor/backwardCompat.js b/node_modules/tops-echarts-gl/lib/preprocessor/backwardCompat.js index 7d777f2..af17362 100644 --- a/node_modules/tops-echarts-gl/lib/preprocessor/backwardCompat.js +++ b/node_modules/tops-echarts-gl/lib/preprocessor/backwardCompat.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; var GL_SERIES = ['bar3D', 'line3D', 'map3D', 'scatter3D', 'surface', 'lines3D', 'scatterGL', 'scatter3D']; function convertNormalEmphasis(option, optType) { diff --git a/node_modules/tops-echarts-gl/lib/util/ZRTextureAtlasSurface.js b/node_modules/tops-echarts-gl/lib/util/ZRTextureAtlasSurface.js index cb166ac..e9d4559 100644 --- a/node_modules/tops-echarts-gl/lib/util/ZRTextureAtlasSurface.js +++ b/node_modules/tops-echarts-gl/lib/util/ZRTextureAtlasSurface.js @@ -4,7 +4,7 @@ * @module echarts-gl/util/ZRTextureAtlasSurface */ // TODO Expand. -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import Texture2D from 'claygl/src/Texture2D'; function ZRTextureAtlasSurfaceNode(zr, offsetX, offsetY, width, height, gap, dpr) { diff --git a/node_modules/tops-echarts-gl/lib/util/format.js b/node_modules/tops-echarts-gl/lib/util/format.js index b11030e..02d87f0 100644 --- a/node_modules/tops-echarts-gl/lib/util/format.js +++ b/node_modules/tops-echarts-gl/lib/util/format.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; var formatUtil = {}; formatUtil.getFormattedLabel = function (seriesModel, dataIndex, status, dataType, dimIndex) { diff --git a/node_modules/tops-echarts-gl/lib/util/geometry/Bars3DGeometry.js b/node_modules/tops-echarts-gl/lib/util/geometry/Bars3DGeometry.js index 24874dc..806ba59 100644 --- a/node_modules/tops-echarts-gl/lib/util/geometry/Bars3DGeometry.js +++ b/node_modules/tops-echarts-gl/lib/util/geometry/Bars3DGeometry.js @@ -4,7 +4,7 @@ * @module echarts-gl/chart/bars/BarsGeometry * @author Yi Shen(http://github.com/pissang) */ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import dynamicConvertMixin from './dynamicConvertMixin'; import trianglesSortMixin from './trianglesSortMixin'; import Geometry from 'claygl/src/Geometry'; diff --git a/node_modules/tops-echarts-gl/lib/util/geometry/Lines2D.js b/node_modules/tops-echarts-gl/lib/util/geometry/Lines2D.js index 442b6df..b3a31cc 100644 --- a/node_modules/tops-echarts-gl/lib/util/geometry/Lines2D.js +++ b/node_modules/tops-echarts-gl/lib/util/geometry/Lines2D.js @@ -6,7 +6,7 @@ * @author Yi Shen(http://github.com/pissang) */ import Geometry from 'claygl/src/Geometry'; -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import dynamicConvertMixin from './dynamicConvertMixin'; import glmatrix from 'claygl/src/dep/glmatrix'; var vec2 = glmatrix.vec2; // var CURVE_RECURSION_LIMIT = 8; diff --git a/node_modules/tops-echarts-gl/lib/util/geometry/Lines3D.js b/node_modules/tops-echarts-gl/lib/util/geometry/Lines3D.js index 51dcd07..febaa96 100644 --- a/node_modules/tops-echarts-gl/lib/util/geometry/Lines3D.js +++ b/node_modules/tops-echarts-gl/lib/util/geometry/Lines3D.js @@ -6,7 +6,7 @@ * @author Yi Shen(http://github.com/pissang) */ import Geometry from 'claygl/src/Geometry'; -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import dynamicConvertMixin from './dynamicConvertMixin'; import glmatrix from 'claygl/src/dep/glmatrix'; var vec3 = glmatrix.vec3; // var CURVE_RECURSION_LIMIT = 8; diff --git a/node_modules/tops-echarts-gl/lib/util/geometry/Quads.js b/node_modules/tops-echarts-gl/lib/util/geometry/Quads.js index 48a8fa8..cddc25a 100644 --- a/node_modules/tops-echarts-gl/lib/util/geometry/Quads.js +++ b/node_modules/tops-echarts-gl/lib/util/geometry/Quads.js @@ -3,7 +3,7 @@ * @author Yi Shen(http://github.com/pissang) */ import Geometry from 'claygl/src/Geometry'; -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import dynamicConvertMixin from './dynamicConvertMixin'; import glmatrix from 'claygl/src/dep/glmatrix'; var vec3 = glmatrix.vec3; diff --git a/node_modules/tops-echarts-gl/lib/util/geometry/Sprites.js b/node_modules/tops-echarts-gl/lib/util/geometry/Sprites.js index abc5581..08130b2 100644 --- a/node_modules/tops-echarts-gl/lib/util/geometry/Sprites.js +++ b/node_modules/tops-echarts-gl/lib/util/geometry/Sprites.js @@ -4,7 +4,7 @@ * @module echarts-gl/util/geometry/Sprites * @author Yi Shen(https://github.com/pissang) */ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import Geometry from 'claygl/src/Geometry'; import dynamicConvertMixin from './dynamicConvertMixin'; var squareTriangles = [0, 1, 2, 0, 2, 3]; diff --git a/node_modules/tops-echarts-gl/lib/util/graphicGL.js b/node_modules/tops-echarts-gl/lib/util/graphicGL.js index fa219bc..659bf34 100644 --- a/node_modules/tops-echarts-gl/lib/util/graphicGL.js +++ b/node_modules/tops-echarts-gl/lib/util/graphicGL.js @@ -6,7 +6,7 @@ import Shader from 'claygl/src/Shader'; import Material from 'claygl/src/Material'; import Node3D from 'claygl/src/Node'; import Geometry from 'claygl/src/Geometry'; -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; import Scene from 'claygl/src/Scene'; import LRUCache from 'zrender/lib/core/LRU'; import textureUtil from 'claygl/src/util/texture'; diff --git a/node_modules/tops-echarts-gl/lib/util/retrieve.js b/node_modules/tops-echarts-gl/lib/util/retrieve.js index 9b93f21..c723a23 100644 --- a/node_modules/tops-echarts-gl/lib/util/retrieve.js +++ b/node_modules/tops-echarts-gl/lib/util/retrieve.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; var retrieve = { firstNotNull: function () { for (var i = 0, len = arguments.length; i < len; i++) { diff --git a/node_modules/tops-echarts-gl/lib/util/sprite.js b/node_modules/tops-echarts-gl/lib/util/sprite.js index c8de9f7..1dde13c 100644 --- a/node_modules/tops-echarts-gl/lib/util/sprite.js +++ b/node_modules/tops-echarts-gl/lib/util/sprite.js @@ -1,4 +1,4 @@ -import * as echarts from 'echarts/lib/echarts'; +import * as echarts from 'tops-echarts/lib/echarts'; function makeSprite(size, canvas, draw) { // http://simonsarris.com/blog/346-how-you-clear-your-canvas-matters