change the echarts import mode

docs/zh/api/global.md

@@ -15,7 +15,8 @@ DC.ready({}).then(() => {})
 ```json
 //属性参数（可选）
 {
-  "baseUrl": "<Cesium 静态资源路径，默认值为：“./libs/dc-sdk/resources/” >"
+  "baseUrl": "<Cesium 静态资源路径，默认值为：“./libs/dc-sdk/resources/” >",
+  "echarts": "<echarts库，设置后用于ChartLayer>"
 }
 ```
 

examples/echarts/airline.html

@@ -14,7 +14,6 @@
     <div id="viewer-container" class="viewer-container"></div>
 
     <script>
-      DC.registerLib('echarts', window.echarts)
       let viewer = undefined
       function initViewer() {
         viewer = new DC.Viewer('viewer-container')
@@ -405,6 +404,7 @@
 
       DC.ready({
         baseUrl: '../libs/dc-sdk/resources/',
+        echarts: window.echarts,
       }).then(initViewer)
     </script>
   </body>

examples/echarts/logistics.html

@@ -14,7 +14,6 @@
     <div id="viewer-container" class="viewer-container"></div>
 
     <script>
-      DC.registerLib('echarts', window.echarts)
       let viewer = undefined
       function initViewer() {
         viewer = new DC.Viewer('viewer-container')
@@ -416,6 +415,7 @@
 
       DC.ready({
         baseUrl: '../libs/dc-sdk/resources/',
+        echarts: window.echarts,
       }).then(initViewer)
     </script>
   </body>

examples/echarts/migrate.html

@@ -14,7 +14,6 @@
     <div id="viewer-container" class="viewer-container"></div>
 
     <script>
-      DC.registerLib('echarts', window.echarts)
       let viewer = undefined
       function initViewer() {
         viewer = new DC.Viewer('viewer-container')
@@ -327,6 +326,7 @@
 
       DC.ready({
         baseUrl: '../libs/dc-sdk/resources/',
+        echarts: window.echarts,
       }).then(initViewer)
     </script>
   </body>

examples/echarts/plane.html

@@ -14,7 +14,6 @@
     <div id="viewer-container" class="viewer-container"></div>
 
     <script>
-      DC.registerLib('echarts', window.echarts)
       let viewer = undefined
       function initViewer() {
         viewer = new DC.Viewer('viewer-container')
@@ -364,6 +363,7 @@
 
       DC.ready({
         baseUrl: '../libs/dc-sdk/resources/',
+        echarts: window.echarts,
       }).then(initViewer)
     </script>
   </body>

examples/echarts/pm.html

@@ -14,7 +14,6 @@
     <div id="viewer-container" class="viewer-container"></div>
 
     <script>
-      DC.registerLib('echarts', window.echarts)
       let viewer = undefined
       function initViewer() {
         viewer = new DC.Viewer('viewer-container')

examples/echarts/population_mobility.html

@@ -14,7 +14,6 @@
     <div id="viewer-container" class="viewer-container"></div>
 
     <script>
-      DC.registerLib('echarts', window.echarts)
       let viewer = undefined
       function initViewer() {
         viewer = new DC.Viewer('viewer-container')
@@ -3260,6 +3259,7 @@
 
       DC.ready({
         baseUrl: '../libs/dc-sdk/resources/',
+        echarts: window.echarts,
       }).then(initViewer)
     </script>
   </body>

src/global-api/lib-utils.js

@@ -11,10 +11,6 @@ const cache = {}
  */
 export function registerLib(name, lib) {
   cache[name] = lib
-  if (name === 'echarts' && this.registerEcharts) {
-    this.registerEcharts(lib)
-  }
-  return this
 }
 
 /**

src/index.js

@@ -2,7 +2,10 @@
  @Author: Caven Chen
  **/
 
-import { setParam } from './global-api'
+import { setParam, registerLib } from './global-api'
+
+import { registerEcharts } from './modules/chart'
+
 const DEF_BASE_URL = './libs/dc-sdk/resources/'
 let _baseUrl = DEF_BASE_URL
 let __isInitialized = false
@@ -15,7 +18,7 @@ export * from './modules/third-part'
 
 export { Math } from './modules/math'
 
-export { registerEcharts, ChartLayer } from './modules/chart'
+export { ChartLayer } from './modules/chart'
 
 export const config = {
   set baseUrl(baseUrl) {
@@ -31,11 +34,18 @@ export function ready(options = {}) {
     return Promise.resolve()
   }
   __cmdOut && __cmdOut()
-  if (options['baseUrl']) {
-    this.config.baseUrl = options['baseUrl']
-  }
-  __isInitialized = true
   return new Promise((resolve, reject) => {
+    //reset CESIUM_BASE_URL
+    if (options['baseUrl']) {
+      this.config.baseUrl = options['baseUrl']
+    }
+    //register echarts lib
+    if (options['echarts']) {
+      registerEcharts(options['echarts'])
+      registerLib('echarts', options['echarts'])
+    }
+    __isInitialized = true
+
     setParam('isInitialized', true)
     setParam('baseUrl', this.config.baseUrl)
     resolve()

src/modules/chart/ChartLayer.js

@@ -7,6 +7,9 @@ import State from '../state/State.js'
 
 class ChartLayer extends Layer {
   constructor(id, option) {
+    if (!getLib('echarts')) {
+      throw new Error('miss the echarts lib')
+    }
     super(id)
     this._option = option
     this._delegate = undefined
@@ -38,10 +41,7 @@ class ChartLayer extends Layer {
   }
 
   _onAdd(viewer) {
-    let echarts = getLib('echarts')
-    if (!echarts) {
-      throw new Error('')
-    }
+    const echarts = getLib('echarts')
     this._viewer = viewer
     this._viewer.canvas.setAttribute('tabIndex', '0')
     this._delegate = this._createChartElement()