Merge pull request #166 from 2ming/master

设置百度地图版本
ElemeFE · Jan 23, 2018 · 9891cb6 · 9891cb6
2 parents f92c2ae + 6b4bf01
commit 9891cb6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/examples/pages/bmap.vue b/examples/pages/bmap.vue
@@ -17,6 +17,7 @@ export default {
     return {
       chartSettings: {
         key: 'oBvDtR6nzWtVchkY4cLHtnah1VVZQKRK',
+        v: '3.0',
         bmap: {
           center: [120, 30],
           zoom: 14,

diff --git a/src/packages/bmap/main.js b/src/packages/bmap/main.js
@@ -3,11 +3,12 @@ import { getBmap } from '../../utils'
 export const bmap = (_, __, settings) => {
   const {
     key,
+    v = '2.0',
     bmap
   } = settings
   if (!key) console.warn('settings.key must be a string.')
 
-  return getBmap(key).then(_ => {
+  return getBmap(key, v).then(_ => {
     return { bmap }
   })
 }
diff --git a/src/packages/heatmap/main.js b/src/packages/heatmap/main.js
@@ -114,6 +114,7 @@ export const heatmap = (columns, rows, settings, status) => {
     bmap,
     geo,
     key,
+    v = '2.0',
     position,
     positionJsonLink,
     beforeRegisterMap,
@@ -182,7 +183,7 @@ export const heatmap = (columns, rows, settings, status) => {
   if (type === 'bmap') {
     Object.assign(options.series[0], { coordinateSystem: 'bmap', pointSize, blurSize })
 
-    return getBmap(key).then(_ => {
+    return getBmap(key, v).then(_ => {
       return Object.assign({ bmap }, options)
     })
   } else if (type === 'map') {

diff --git a/src/utils.js b/src/utils.js
@@ -75,14 +75,14 @@ export const getMapJSON = (position, positionJsonLink) => {
 
 let mapPromise = null
 
-export const getBmap = (key) => {
+export const getBmap = (key, v) => {
   if (!mapPromise) {
     mapPromise = new Promise((resolve, reject) => {
       const callbackName = `bmap${Date.now()}`
       window[callbackName] = resolve
       const script = document.createElement('script')
       script.src = [
-        'https://api.map.baidu.com/api?v=2.0',
+        `https://api.map.baidu.com/api?v=${v}`,
         `ak=${key}`,
         `callback=${callbackName}`
       ].join('&')