【feature/fix】增加vue图标例子 更新vue-widgets 优化测试

songyumeng · songyumeng · commit 1769835e66c9 · 2019-03-04T17:51:17.000+08:00
diff --git a/dist/mapboxgl/iclient9-mapboxgl-widgets-vue.css b/dist/mapboxgl/iclient9-mapboxgl-widgets-vue.css
diff --git a/dist/mapboxgl/iclient9-mapboxgl-widgets-vue.js b/dist/mapboxgl/iclient9-mapboxgl-widgets-vue.js
diff --git a/examples/mapboxgl/01_mapQueryByBounds.html b/examples/mapboxgl/01_mapQueryByBounds.html
@@ -12,7 +12,6 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var map;
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
     var url = host + "/iserver/services/map-world/rest/maps/World";
diff --git a/examples/mapboxgl/01_mapQueryByDistance.html b/examples/mapboxgl/01_mapQueryByDistance.html
@@ -12,7 +12,6 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var decodeMarkers = [];
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
     var url = host + "/iserver/services/map-world/rest/maps/World";
diff --git a/examples/mapboxgl/01_mapQueryByGeometry.html b/examples/mapboxgl/01_mapQueryByGeometry.html
@@ -12,7 +12,6 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
     var url = host + "/iserver/services/map-world/rest/maps/World";
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/01_mapQueryBySQL.html b/examples/mapboxgl/01_mapQueryBySQL.html
@@ -12,7 +12,6 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
     var url = host + "/iserver/services/map-world/rest/maps/World";
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/01_mapService.html b/examples/mapboxgl/01_mapService.html
@@ -12,7 +12,6 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
     var url = host + "/iserver/services/map-world/rest/maps/World";
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/01_measure_area.html b/examples/mapboxgl/01_measure_area.html
@@ -12,7 +12,6 @@
 <script type="text/javascript" include="bootstrap,jquery,widgets.alert" src="../js/include-web.js"></script>
 <script type="text/javascript" include="draw" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
     var url = host + "/iserver/services/map-world/rest/maps/World";
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/01_measure_distance.html b/examples/mapboxgl/01_measure_distance.html
@@ -12,7 +12,6 @@
 <script type="text/javascript" include="bootstrap,jquery,widgets.alert" src="../js/include-web.js"></script>
 <script type="text/javascript" include="draw" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
     var url = host + "/iserver/services/map-world/rest/maps/World";
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/03_themeDotDensity.html b/examples/mapboxgl/03_themeDotDensity.html
@@ -13,7 +13,6 @@
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <span id="show"></span>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
 
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/03_themeGraduatedSymbol.html b/examples/mapboxgl/03_themeGraduatedSymbol.html
@@ -13,7 +13,6 @@
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <span id="show"></span>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
 
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/03_themeGraph.html b/examples/mapboxgl/03_themeGraph.html
@@ -14,7 +14,6 @@
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <span id="show"></span>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
 
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/03_themeGridRange.html b/examples/mapboxgl/03_themeGridRange.html
@@ -13,7 +13,6 @@
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <span id="show"></span>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
 
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/03_themeGridUnique.html b/examples/mapboxgl/03_themeGridUnique.html
@@ -13,7 +13,6 @@
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <span id="show"></span>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
 
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/03_themeLabel.html b/examples/mapboxgl/03_themeLabel.html
@@ -14,7 +14,6 @@
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <span id="show"></span>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
 
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/03_themeRange.html b/examples/mapboxgl/03_themeRange.html
@@ -13,7 +13,6 @@
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <span id="show"></span>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
 
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/03_themeUnique.html b/examples/mapboxgl/03_themeUnique.html
@@ -13,7 +13,6 @@
 <script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <span id="show"></span>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
 
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/config.js b/examples/mapboxgl/config.js
@@ -1064,8 +1064,8 @@ var exampleConfig = {
                 ]
             },
             "widgetsAdvanced": {
-                name: "Vue",
-                name_en: "Vue",
+                name: "for Vue",
+                name_en: "for Vue",
                 content: [
                     {
                         name: "地图微件(Vue)",
@@ -1080,13 +1080,13 @@ var exampleConfig = {
                         thumbnail: "widgets_webmap_vue.png",
                         fileName: "widgets_webmap_vue"
                     } ,
-                    // {
-                    //     name: "图表微件(Vue)",
-                    //     name_en: "chart_widget_vue",
-                    //     version: "10.X.X",
-                    //     thumbnail: "widgets_chart_vue.png",
-                    //     fileName: "widgets_chart_vue"
-                    // } ,
+                    {
+                        name: "图表微件(Vue)",
+                        name_en: "chart_widget_vue",
+                        version: "10.X.X",
+                        thumbnail: "widgets_chart_vue.png",
+                        fileName: "widgets_chart_vue"
+                    } ,
                     {
                         name: "图层列表微件(Vue)",
                         name_en: "layerList_widget_vue",
diff --git a/examples/mapboxgl/dataFlowService.html b/examples/mapboxgl/dataFlowService.html
@@ -25,8 +25,6 @@
             urlQuery = host + "/iserver/services/map-china400/rest/maps/China_4326";
 
         wsHost = "ws:\//" + (window.isLocal ? document.location.hostname + ":8800" : "iclsvrws.supermap.io");
-        mapboxgl.accessToken =
-            'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
 
         var urlDataFlow = wsHost + "/iserver/services/dataflowTest/dataflow";
         var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
diff --git a/examples/mapboxgl/echartsGL_ShanghaiBuildingPrice.html b/examples/mapboxgl/echartsGL_ShanghaiBuildingPrice.html
@@ -25,7 +25,6 @@
 <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
 <script type="text/javascript" include="echarts,echarts-gl" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var data;
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
         "| Image <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a> | </span>" +
diff --git a/examples/mapboxgl/echartsGL_flightPath.html b/examples/mapboxgl/echartsGL_flightPath.html
@@ -26,7 +26,6 @@
 <script type="text/javascript" include="echarts,echarts-gl" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
     // 数据来自 https://uber.github.io/deck.gl/#/examples/core-layers/line-layer
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var data;
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
         "| Image <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a> | </span>" +
diff --git a/examples/mapboxgl/echartsGL_taxiRoutesOfCapeTown.html b/examples/mapboxgl/echartsGL_taxiRoutesOfCapeTown.html
@@ -27,7 +27,6 @@
 <script type="text/javascript" include="echarts,echarts-gl,shapefile"
         src="../../dist/mapboxgl/include-mapboxgl.js"></script>
 <script type="text/javascript">
-    mapboxgl.accessToken = 'pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4M29iazA2Z2gycXA4N2pmbDZmangifQ.-g_vE53SD2WrJ6tFX7QHmA';
     var data;
     var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
         "| Image <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a> | </span>" +
diff --git a/examples/mapboxgl/widgets_layerList_vue.html b/examples/mapboxgl/widgets_layerList_vue.html
@@ -8,6 +8,7 @@
   <meta charset="UTF-8">
   <title data-i18n='resources.title_widgetsLayerList_Vue'></title>
   <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
+  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <style>
      #main{
         margin: 0 auto;
@@ -24,7 +25,6 @@
       <sm-layer-list position="top-right"></sm-layer-list>
     </sm-web-map>
   </div>
-  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <script>
     new Vue({
       el: '#main'
diff --git a/examples/mapboxgl/widgets_map_vue.html b/examples/mapboxgl/widgets_map_vue.html
@@ -8,6 +8,7 @@
   <meta charset="UTF-8">
   <title data-i18n='resources.title_widgetsMap_Vue'></title>
   <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
+  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <style>
     #main {
       margin: 0 auto;
@@ -21,10 +22,9 @@
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
   <div id="main">
     <!-- 地图组件：sm-map  props: map-options, access-token-->
-    <sm-map :map-options="mapOptions" access-token="pk.eyJ1IjoicGhlZ21hbiIsImEiOiJjaWdzdDJsMnkwNWx5dXhtMTdpMmFyczNrIn0.bcydH5kWOsWRL_eBfR_dtw"></sm-map>
+    <sm-map :map-options="mapOptions"></sm-map>
   </div>
   
-  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <script>
     new Vue({
       el: '#main',
diff --git a/examples/mapboxgl/widgets_minimap_vue.html b/examples/mapboxgl/widgets_minimap_vue.html
@@ -8,6 +8,7 @@
   <meta charset="UTF-8">
   <title data-i18n='resources.title_widgetsMiniMap_Vue'></title>
   <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
+  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <style>
      #main{
         margin: 0 auto;
@@ -24,8 +25,7 @@
       <sm-mini-map></sm-mini-map>
     </sm-web-map>
   </div>
-  
-  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
+
   <script>
     new Vue({
       el: '#main'
diff --git a/examples/mapboxgl/widgets_pan_vue.html b/examples/mapboxgl/widgets_pan_vue.html
@@ -8,6 +8,7 @@
   <meta charset="UTF-8">
   <title data-i18n='resources.title_widgetsPan_Vue'></title>
   <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
+  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <style>
      #main{
         margin: 0 auto;
@@ -24,8 +25,7 @@
       <sm-pan></sm-pan>
     </sm-web-map>
   </div>
-  
-  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
+ 
   <script>
     new Vue({
       el: '#main'
diff --git a/examples/mapboxgl/widgets_scale_vue.html b/examples/mapboxgl/widgets_scale_vue.html
@@ -8,6 +8,7 @@
   <meta charset="UTF-8">
   <title data-i18n='resources.title_widgetsScale_Vue'></title>
   <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
+  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <style>
      #main{
         margin: 0 auto;
@@ -21,11 +22,10 @@
   <div id="main">
     <sm-web-map :web-map-options="{server: 'http://support.supermap.com.cn:8092/'}" map-id="1649097980">
       <!-- 比例尺组件：sm-scale -->
-      <sm-scale position="bottom-left"></sm-scale>
+      <sm-scale></sm-scale>
     </sm-web-map>
   </div>
   
-  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <script>
     new Vue({
       el: '#main'
diff --git a/examples/mapboxgl/widgets_webmap_vue.html b/examples/mapboxgl/widgets_webmap_vue.html
@@ -8,6 +8,7 @@
   <meta charset="UTF-8">
   <title data-i18n='resources.title_widgetsWebmap_Vue'></title>
   <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
+  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <style>
      #main{
         margin: 0 auto;
@@ -23,7 +24,6 @@
     <sm-web-map :web-map-options="{server: 'http://support.supermap.com.cn:8092/'}" map-id="1649097980"></sm-web-map>
   </div>
 
-  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <script>
     new Vue({
       el: '#main'
diff --git a/examples/mapboxgl/widgets_zoom_vue.html b/examples/mapboxgl/widgets_zoom_vue.html
@@ -8,6 +8,7 @@
   <meta charset="UTF-8">
   <title data-i18n='resources.title_widgetsZoom_Vue'></title>
   <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
+  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <style>
      #main{
         margin: 0 auto;
@@ -25,7 +26,6 @@
     </sm-web-map>
   </div>
   
-  <script include="iclient9-mapboxgl-widgets-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <script>
     new Vue({
       el: '#main'
diff --git a/src/common/widgets/chart/ChartModel.js b/src/common/widgets/chart/ChartModel.js
@@ -175,7 +175,7 @@ export class ChartModel {
                     }
                 })
                 // 如果有服务，获取数据源和数据集, 然后请求rest服务
-                me.getDatafromRest(resultData.serviceType, resultData.address, success)
+                resultData && me.getDatafromRest(resultData.serviceType, resultData.address, success)
             } else {
                 me.getDatafromContent(url, success);
                 return;
diff --git a/test/common/widgets/chart/ChartModelSpec.js b/test/common/widgets/chart/ChartModelSpec.js
