@kq_npm/client3d_webgl_vue 3.0.9-beta → 3.1.0-beta

package/adddata/index.js

@@ -968,6 +968,16 @@ class AddDataViewModel {
       case "geojson":
         var ds = new Cesium.Kq3dGeoJsonDataSource(name);
         ds.load(url, this._geojsonStyle).then(ds => {
+          ds.entities.values.forEach(entity => {
+            if (entity.polygon) {
+              entity.polyline = {
+                positions: entity.polygon.hierarchy._value.positions,
+                width: this._geojsonStyle.polygon.outlineWidth,
+                material: this._geojsonStyle.polygon.outlineColor
+              };
+            }
+          }, this);
+
           this._viewer.dataSources.add(ds);
 
           ds.autoAvoid(this._viewer);

package/index.js

@@ -2186,18 +2186,19 @@ class LayerManager {
         }
       });
     }
-  } //获取基础图层Index
+  } //获取底图图层Index
 
 
   getBaseLayerIndex() {
-    // let baseIndex = 0;
-    // this._viewer.imageryLayers._layers.forEach(layer => {
-    //   if (layer._isBaseLayer) {
-    //     baseIndex++;
-    //   }
-    // });
-    // return baseIndex;
-    return 1;
+    let index = 1;
+
+    this._viewer.imageryLayers._layers.forEach(layer => {
+      if (layer.target === "online") {
+        index++;
+      }
+    });
+
+    return index;
   } //设置图层置顶或取消置顶
 
 
@@ -2782,11 +2783,30 @@ class ScenceViewViewModel extends (mitt_default()) {
         });
       }
     }
+  }
+  /**
+   * 获取在线底图index
+   */
+
+
+  _getOnlineBaseLayerIndex() {
+    let index = 1;
+
+    this._viewer.imageryLayers._layers.forEach(layer => {
+      if (layer.target === "online") {
+        index++;
+      }
+    });
+
+    return index;
   } //创建在线底图
 
 
   _createOnlineLayer(layerConfig) {
     let layer = null;
+
+    let index = this._getOnlineBaseLayerIndex();
+
     let layerType = layerConfig.renderType;
     if (layerType) layerType = layerType.toLowerCase();
 
@@ -2795,7 +2815,7 @@ class ScenceViewViewModel extends (mitt_default()) {
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISMapServerImageryProviderExt({
           url: layerConfig.url,
           ua_token: layerConfig.accessToken
-        }));
+        }), index);
         break;
 
       case "wmts":
@@ -2811,7 +2831,7 @@ class ScenceViewViewModel extends (mitt_default()) {
           subdomains: layerConfig.subdomains,
           tilingScheme: layerConfig.epsg === "4326" ? new Cesium.GeographicTilingScheme() : new Cesium.WebMercatorTilingScheme()
         };
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options));
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options), index);
         break;
 
       case "wms":
@@ -2822,31 +2842,31 @@ class ScenceViewViewModel extends (mitt_default()) {
             transparent: "true",
             format: "image/png"
           }
-        }));
+        }), index);
         break;
 
       case "tianditu":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
           mapStyle: layerConfig.layerType + "_c"
-        }));
+        }), index);
         break;
 
       case "baidu":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dBaiduMapsImageryProvider({
           mapStyle: layerConfig.layerType
-        }));
+        }), index);
         break;
 
       case "gaode":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dAMapsImageryProvider({
           mapStyle: layerConfig.layerType
-        }));
+        }), index);
         break;
 
       case "tencent":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dQQMapsImageryProvider({
           mapStyle: layerConfig.layerType
-        }));
+        }), index);
         break;
 
       case "bing":
@@ -2854,26 +2874,26 @@ class ScenceViewViewModel extends (mitt_default()) {
           url: layerConfig.url || "https://dev.virtualearth.net",
           key: layerConfig.key || "AmXdbd8UeUJtaRSn7yVwyXgQlBBUqliLbHpgn2c76DfuHwAXfRrgS5qwfHU6Rhm8",
           mapStyle: layerConfig.layerType
-        }));
+        }), index);
         break;
 
       case "arcgisonline":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
           url: layerConfig.url
-        }));
+        }), index);
         break;
 
       case "mapbox":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.MapboxImageryProvider({
           mapId: "mapbox." + layerConfig.layerType,
           accessToken: layerConfig.key || "pk.eyJ1IjoiZXhhbXBsZXMiLCJhIjoiY2p1dHRybDR5MGJuZjQzcGhrZ2doeGgwNyJ9.a-vxW4UaxOoUMWUTGnEArw"
-        }));
+        }), index);
         break;
 
       case "osm":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.createOpenStreetMapImageryProvider({
           url: layerConfig.url
-        }));
+        }), index);
         break;
     }
 
@@ -20127,6 +20147,16 @@ class AddDataViewModel {
       case "geojson":
         var ds = new Cesium.Kq3dGeoJsonDataSource(name);
         ds.load(url, this._geojsonStyle).then(ds => {
+          ds.entities.values.forEach(entity => {
+            if (entity.polygon) {
+              entity.polyline = {
+                positions: entity.polygon.hierarchy._value.positions,
+                width: this._geojsonStyle.polygon.outlineWidth,
+                material: this._geojsonStyle.polygon.outlineColor
+              };
+            }
+          }, this);
+
           this._viewer.dataSources.add(ds);
 
           ds.autoAvoid(this._viewer);

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.0.9-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.1.0-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -892,6 +892,16 @@ class AddDataViewModel {
       case "geojson":
         var ds = new Cesium.Kq3dGeoJsonDataSource(name);
         ds.load(url, this._geojsonStyle).then(ds => {
+          ds.entities.values.forEach(entity => {
+            if (entity.polygon) {
+              entity.polyline = {
+                positions: entity.polygon.hierarchy._value.positions,
+                width: this._geojsonStyle.polygon.outlineWidth,
+                material: this._geojsonStyle.polygon.outlineColor
+              };
+            }
+          }, this);
+
           this._viewer.dataSources.add(ds);
 
           ds.autoAvoid(this._viewer);
@@ -25131,18 +25141,19 @@ class LayerManager {
         }
       });
     }
-  } //获取基础图层Index
+  } //获取底图图层Index
 
 
   getBaseLayerIndex() {
-    // let baseIndex = 0;
-    // this._viewer.imageryLayers._layers.forEach(layer => {
-    //   if (layer._isBaseLayer) {
-    //     baseIndex++;
-    //   }
-    // });
-    // return baseIndex;
-    return 1;
+    let index = 1;
+
+    this._viewer.imageryLayers._layers.forEach(layer => {
+      if (layer.target === "online") {
+        index++;
+      }
+    });
+
+    return index;
   } //设置图层置顶或取消置顶
 
 
@@ -25727,11 +25738,30 @@ class ScenceViewViewModel extends (mitt_default()) {
         });
       }
     }
+  }
+  /**
+   * 获取在线底图index
+   */
+
+
+  _getOnlineBaseLayerIndex() {
+    let index = 1;
+
+    this._viewer.imageryLayers._layers.forEach(layer => {
+      if (layer.target === "online") {
+        index++;
+      }
+    });
+
+    return index;
   } //创建在线底图
 
 
   _createOnlineLayer(layerConfig) {
     let layer = null;
+
+    let index = this._getOnlineBaseLayerIndex();
+
     let layerType = layerConfig.renderType;
     if (layerType) layerType = layerType.toLowerCase();
 
@@ -25740,7 +25770,7 @@ class ScenceViewViewModel extends (mitt_default()) {
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISMapServerImageryProviderExt({
           url: layerConfig.url,
           ua_token: layerConfig.accessToken
-        }));
+        }), index);
         break;
 
       case "wmts":
@@ -25756,7 +25786,7 @@ class ScenceViewViewModel extends (mitt_default()) {
           subdomains: layerConfig.subdomains,
           tilingScheme: layerConfig.epsg === "4326" ? new Cesium.GeographicTilingScheme() : new Cesium.WebMercatorTilingScheme()
         };
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options));
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options), index);
         break;
 
       case "wms":
@@ -25767,31 +25797,31 @@ class ScenceViewViewModel extends (mitt_default()) {
             transparent: "true",
             format: "image/png"
           }
-        }));
+        }), index);
         break;
 
       case "tianditu":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
           mapStyle: layerConfig.layerType + "_c"
-        }));
+        }), index);
         break;
 
       case "baidu":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dBaiduMapsImageryProvider({
           mapStyle: layerConfig.layerType
-        }));
+        }), index);
         break;
 
       case "gaode":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dAMapsImageryProvider({
           mapStyle: layerConfig.layerType
-        }));
+        }), index);
         break;
 
       case "tencent":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dQQMapsImageryProvider({
           mapStyle: layerConfig.layerType
-        }));
+        }), index);
         break;
 
       case "bing":
@@ -25799,26 +25829,26 @@ class ScenceViewViewModel extends (mitt_default()) {
           url: layerConfig.url || "https://dev.virtualearth.net",
           key: layerConfig.key || "AmXdbd8UeUJtaRSn7yVwyXgQlBBUqliLbHpgn2c76DfuHwAXfRrgS5qwfHU6Rhm8",
           mapStyle: layerConfig.layerType
-        }));
+        }), index);
         break;
 
       case "arcgisonline":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
           url: layerConfig.url
-        }));
+        }), index);
         break;
 
       case "mapbox":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.MapboxImageryProvider({
           mapId: "mapbox." + layerConfig.layerType,
           accessToken: layerConfig.key || "pk.eyJ1IjoiZXhhbXBsZXMiLCJhIjoiY2p1dHRybDR5MGJuZjQzcGhrZ2doeGgwNyJ9.a-vxW4UaxOoUMWUTGnEArw"
-        }));
+        }), index);
         break;
 
       case "osm":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.createOpenStreetMapImageryProvider({
           url: layerConfig.url
-        }));
+        }), index);
         break;
     }