Merge branch 'hotfix/map_source' into develop

Former-commit-id: 254c2ecb6e633c47428ccde2bdb016b2976c1261 [formerly 254c2ecb6e633c47428ccde2bdb016b2976c1261 [formerly 254c2ecb6e633c47428ccde2bdb016b2976c1261 [formerly 254c2ecb6e633c47428ccde2bdb016b2976c1261 [formerly 91deb97cdb7040b1cccda88b340d61b6bbe7310d [formerly 77750890ea6372bbe9a87418d53f138cc61a48c2]]]]]
Former-commit-id: 0685790a0a61e376fcb664efd0e86fa2ec6b31c8
Former-commit-id: c508f7abc2c5546b9d9ce47f258610cf6baf3910
Former-commit-id: 8b539fae35e7a8d202d3b3acb44ac32234d81f73 [formerly cf3e0bca9d2ad9fe66726ab18d4385cf982048cb]
Former-commit-id: 95f24bcef53289c1446e435ddd33df49b6b28967
Former-commit-id: 7f8a26d01c2c14da16c613782ed1c881e4eb059d
Former-commit-id: 8d2be97eb7c9c9c92a02ea5bca6c00fcaa38e62b
Former-commit-id: 6628530b288debca997e24bb41c04415a7e07408
Former-commit-id: 30a806f98b45ccc3415ed2f47e4bb6a9675fae1c

src/pages/demo/charts/list/_data/beijing.json.REMOVED.git-id

@@ -0,0 +1 @@
+8a2b03e0745b33a15d68fd8c98c73b68ba057482

src/pages/demo/charts/list/_data/china.json.REMOVED.git-id

@@ -0,0 +1 @@
+28bbf7a8cf2cd33dc30fba1bd876a43acd4743f5

src/pages/demo/charts/list/map/demo1/index.vue

@@ -1,10 +1,9 @@
 <template>
   <d2-container>
     <template slot="header">一般</template>
-    <!-- <div class="inner">
-      <ve-map :data="chartData" v-bind="pubSetting"></ve-map>
-    </div> -->
-    大概由于 mock.js 和 v-charts 的网络请求冲突，本示例暂时无法展示
+    <div class="inner">
+      <ve-map :data="chartData" v-bind="pubSetting" :settings="chartSettings"></ve-map>
+    </div>
     <template slot="footer">
       <d2-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
     </template>
@@ -13,12 +12,16 @@
 
 <script>
 import list from '@/pages/demo/charts/list/_mixin/list.js'
+import mapOrigin from '@/pages/demo/charts/list/_data/china'
 export default {
   mixins: [
     list
   ],
   data () {
     return {
+      chartSettings: {
+        mapOrigin
+      },
       chartData: {
         columns: ['位置', '税收', '人口', '面积'],
         rows: [

src/pages/demo/charts/list/map/demo2/index.vue

@@ -1,10 +1,9 @@
 <template>
   <d2-container>
     <template slot="header">设置城市</template>
-    <!-- <div class="inner">
+    <div class="inner">
       <ve-map :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-map>
-    </div> -->
-    大概由于 mock.js 和 v-charts 的网络请求冲突，本示例暂时无法展示
+    </div>
     <template slot="footer">
       <d2-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
     </template>
@@ -13,15 +12,17 @@
 
 <script>
 import list from '@/pages/demo/charts/list/_mixin/list.js'
+import mapOrigin from '@/pages/demo/charts/list/_data/beijing'
 export default {
   mixins: [
     list
   ],
   data () {
-    this.chartSettings = {
-      position: 'province/beijing'
-    }
     return {
+      chartSettings: {
+        position: 'province/beijing',
+        mapOrigin
+      },
       chartData: {
         columns: ['位置', '人口'],
         rows: [

src/pages/demo/charts/list/map/demo3/index.vue

@@ -1,10 +1,9 @@
 <template>
   <d2-container>
     <template slot="header">设置样式</template>
-    <!-- <div class="inner">
+    <div class="inner">
       <ve-map :data="chartData" :settings="chartSettings" v-bind="pubSetting"></ve-map>
-    </div> -->
-    <!-- 大概由于 mock.js 和 v-charts 的网络请求冲突，本示例暂时无法展示 -->
+    </div>
     <template slot="footer">
       <d2-link-btn title="更多示例和文档" link="https://v-charts.js.org"/>
     </template>
@@ -13,22 +12,24 @@
 
 <script>
 import list from '@/pages/demo/charts/list/_mixin/list.js'
+import mapOrigin from '@/pages/demo/charts/list/_data/china'
 export default {
   mixins: [
     list
   ],
   data () {
-    this.chartSettings = {
-      position: 'china',
-      label: false,
-      itemStyle: {
-        normal: {
-          borderColor: '#00f'
-        }
-      },
-      zoom: 1.2
-    }
     return {
+      chartSettings: {
+        position: 'china',
+        mapOrigin,
+        label: false,
+        itemStyle: {
+          normal: {
+            borderColor: '#00f'
+          }
+        },
+        zoom: 1.2
+      },
       chartData: {
         columns: ['位置', '人口'],
         rows: [