@kq_npm/client3d_webgl_vue 3.9.3-beta → 3.9.9-beta

package/adddata/index.js

@@ -269,6 +269,7 @@ class AddDataViewModel {
     this._language = scenceView._language;
     this._geometryServerUrl = options.geometryServerUrl;
     this._geometryServerToken = options.geometryServerToken;
+    if (options.geojsonStyle) this._geojsonStyle = Object.assign({}, this._geojsonStyle, options.geojsonStyle);
   } //解析文件
 
 
@@ -299,9 +300,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -342,9 +342,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -394,21 +393,30 @@ class AddDataViewModel {
                 }
               } catch (e) {}
 
+              var style = { ...that._geojsonStyle
+              };
               var ds = new Cesium.Kq3dGeoJsonDataSource(name);
-              ds.load(ret, that._geojsonStyle).then(ds => {
+              var addType = "geojson"; // 判断是否是arcgis格式的json数据
+
+              if (ret.geometryType) {
+                ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
+                style.label.express = "NAME";
+                addType = "arcjson";
+              }
+
+              ds.load(ret, style).then(ds => {
                 ds.entities.values.forEach(entity => {
                   if (entity.polygon) {
                     entity.polyline = {
                       positions: entity.polygon.hierarchy._value.positions,
-                      width: that._geojsonStyle.polygon.outlineWidth,
-                      material: that._geojsonStyle.polygon.outlineColor
+                      width: style.polygon.outlineWidth,
+                      material: style.polygon.outlineColor
                     };
                   }
                 });
 
-                that._viewer.dataSources.add(ds);
+                that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-                ds.autoAvoid(that._viewer);
 
                 that._viewer.flyTo(ds);
 
@@ -420,7 +428,7 @@ class AddDataViewModel {
                   serverType: "datasource",
                   lsType: "ls",
                   url: ret,
-                  addType: "geojson",
+                  addType: addType,
                   shapeType: that._layerManager.getShapeType(ds)
                 };
 
@@ -871,9 +879,15 @@ class AddDataViewModel {
           }, this);
 
           if (mapInfo.rect84) {
-            this._viewer.camera.flyTo({
-              destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84.minx, mapInfo.rect84.miny, mapInfo.rect84.maxx, mapInfo.rect84.maxy)
-            });
+            if (mapInfo.rect84 instanceof Array) {
+              this._viewer.camera.flyTo({
+                destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84[0], mapInfo.rect84[1], mapInfo.rect84[2], mapInfo.rect84[3])
+              });
+            } else {
+              this._viewer.camera.flyTo({
+                destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84.minx, mapInfo.rect84.miny, mapInfo.rect84.maxx, mapInfo.rect84.maxy)
+              });
+            }
           }
 
           setChildrenAddType(mapServerInfo.layerTreeData, type);
@@ -1000,9 +1014,11 @@ class AddDataViewModel {
 
       case "wmts":
       case "kqgistileserver":
+      case "kqgisaggregationserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
           var defaultName = 'wmts';
           if (type === "kqgistileserver") defaultName = 'tile';
+          if (type === "kqgisaggregationserver") defaultName = 'aggregation';
           node = {
             guid: group.guid,
             name: name || defaultName,
@@ -1051,9 +1067,8 @@ class AddDataViewModel {
         wfsProvider.load().then(function (data) {
           var ds = new Cesium.Kq3dGeoJsonDataSource(name);
           ds.load(data, that._geojsonStyle).then(ds => {
-            that._viewer.dataSources.add(ds);
+            that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-            ds.autoAvoid(that._viewer);
 
             that._viewer.flyTo(ds);
 
@@ -1087,9 +1102,45 @@ class AddDataViewModel {
             }
           }, this);
 
-          this._viewer.dataSources.add(ds);
+          this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
+
+
+          this._viewer.flyTo(ds);
+
+          node = {
+            guid: ds.guid,
+            name: name,
+            visible: true,
+            serverType: "datasource",
+            lsType: "ls",
+            url: url,
+            addType: type,
+            shapeType: this._layerManager.getShapeType(ds)
+          };
+
+          this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
+        });
+        break;
+
+      case "arcjson":
+        var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
+        var geojsonStyle = { ...this._geojsonStyle
+        };
+        geojsonStyle.label.express = 'NAME';
+        ds.load(url, geojsonStyle).then(ds => {
+          ds.entities.values.forEach(entity => {
+            if (entity.polygon) {
+              entity.polyline = {
+                positions: entity.polygon.hierarchy._value.positions,
+                width: geojsonStyle.polygon.outlineWidth,
+                material: geojsonStyle.polygon.outlineColor
+              };
+            }
+          }, this);
 
-          ds.autoAvoid(this._viewer);
+          this._viewer.dataSources.add(ds);
 
           this._viewer.flyTo(ds);
 
@@ -1160,6 +1211,30 @@ class AddDataViewModel {
         });
         break;
 
+      case "s3m":
+        layer = this._viewer.scene.primitives.add(new Cesium.Kq3dS3MTilesLayer({
+          context: this._viewer.scene._context,
+          url: url,
+          maxVisibleDistance: 1000000,
+          minVisibleDistance: 0
+        }));
+        this.flyToLayer(layer);
+        if (!layer.guid) layer.guid = Cesium.createGuid();
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "3dtiles",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       default:
         break;
     }
@@ -1176,6 +1251,12 @@ class AddDataViewModel {
       });
     } else if (layer instanceof Cesium.Cesium3DTileset) {
       viewer.zoomTo(layer);
+    } else if (layer instanceof Cesium.Kq3dS3MTilesLayer) {
+      layer.readyPromise.then(function (tileset) {
+        viewer.camera.flyTo({
+          destination: tileset.rectangle
+        });
+      });
     } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource || layer instanceof Cesium.KmlDataSource || layer instanceof Cesium.CzmlDataSource) {
       viewer.flyTo(layer);
     } else if (layer instanceof Cesium.Kq3dKQGISServerTerrainProvider || layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
@@ -1311,6 +1392,10 @@ const __default__ = {
     isRight: {
       type: Boolean,
       default: true
+    },
+    // geojson数据加载样式
+    geojsonStyle: {
+      type: Object
     }
   },
 
@@ -1416,6 +1501,18 @@ const __default__ = {
         namePlaceholder: language.value.unnamedLayer,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
         description: language.value.imagertyTileServerdescription
+      }, {
+        type: "kqgisaggregationserver",
+        name: language.value.KQGISAggregationServer,
+        namePlaceholder: language.value.unnamedLayer,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
+        description: language.value.imagertyAggregationServerdescription
+      }, {
+        type: "s3m",
+        name: language.value.S3M,
+        namePlaceholder: language.value.unnamedLayer,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/realspace/datas/xxx/config",
+        description: language.value.imagertyS3Mdescription
       }, {
         type: "arcgismapserver",
         name: language.value.ArcGISMapServer,
@@ -1452,6 +1549,12 @@ const __default__ = {
         namePlaceholder: language.value.unnamedLayer,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
         description: language.value.imagertyGeoJsondescription
+      }, {
+        type: "arcjson",
+        name: language.value.ArcJson,
+        namePlaceholder: language.value.unnamedLayer,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.json",
+        description: language.value.imagertyArcJsondescription
       }, {
         type: "mvt",
         name: language.value.MVT,
@@ -1494,7 +1597,8 @@ const __default__ = {
         if (scenceView) {
           let options = {
             geometryServerUrl: props.geometryServerUrl,
-            geometryServerToken: props.geometryServerToken
+            geometryServerToken: props.geometryServerToken,
+            geojsonStyle: props.geojsonStyle
           };
           viewModel = new AddDataViewModel(scenceView, options);
         }

package/index.js

@@ -2171,9 +2171,36 @@ class LayerManager {
               }
             }, this);
 
+            this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
+
+
+            ds._guid = layerData.guid;
+            layerData.shapeType = this.getShapeType(ds);
+          });
+        }
+
+        break;
+
+      case "arcjson":
+        layerData.visible = isAdd;
+        layerData.serverType = "datasource";
+
+        if (isAdd) {
+          var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
+          var geojsonStyle = layerData.geojsonStyle || this._geojsonStyle;
+          promise = ds.load(url, geojsonStyle).then(ds => {
+            ds.entities.values.forEach(entity => {
+              if (entity.polygon) {
+                entity.polyline = {
+                  positions: entity.polygon.hierarchy._value.positions,
+                  width: geojsonStyle.polygon.outlineWidth,
+                  material: geojsonStyle.polygon.outlineColor
+                };
+              }
+            }, this);
+
             this._viewer.dataSources.add(ds);
 
-            ds.autoAvoid(this._viewer);
             ds._guid = layerData.guid;
             layerData.shapeType = this.getShapeType(ds);
           });
@@ -2381,9 +2408,15 @@ class LayerManager {
     });
 
     if (rect) {
-      that._viewer.camera.flyTo({
-        destination: Cesium.Rectangle.fromDegrees(rect.minx, rect.miny, rect.maxx, rect.maxy)
-      });
+      if (rect instanceof Array) {
+        that._viewer.camera.flyTo({
+          destination: Cesium.Rectangle.fromDegrees(rect[0], rect[1], rect[2], rect[3])
+        });
+      } else {
+        that._viewer.camera.flyTo({
+          destination: Cesium.Rectangle.fromDegrees(rect.minx, rect.miny, rect.maxx, rect.maxy)
+        });
+      }
     }
 
     that._scenceView.fire("resetLayerDatas");
@@ -2581,7 +2614,7 @@ class LayerManager {
     } else if (type === "3dtiles") {
       let primitives = this._viewer.scene.primitives._primitives;
       let layer = primitives.find(item => {
-        return item.guid === guid && item instanceof Cesium.Cesium3DTileset;
+        return item.guid === guid;
       });
       return layer;
     } else if (type === "datasource") {
@@ -3303,7 +3336,10 @@ class ScenceViewViewModel extends (mitt_default()) {
 
       case "tianditu":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
-          mapStyle: layerConfig.layerType + "_c"
+          mapStyle: layerConfig.layerType + "_c",
+          maximumLevel: layerConfig.maximumLevel || null,
+          useCache: layerConfig.useCache || false,
+          key: layerConfig.key || Cesium.Kq3dTiandituImageryProvider.DEFAULT_KEY
         }), index);
         break;
 
@@ -22674,6 +22710,7 @@ class AddDataViewModel {
     this._language = scenceView._language;
     this._geometryServerUrl = options.geometryServerUrl;
     this._geometryServerToken = options.geometryServerToken;
+    if (options.geojsonStyle) this._geojsonStyle = Object.assign({}, this._geojsonStyle, options.geojsonStyle);
   } //解析文件
 
 
@@ -22704,9 +22741,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -22747,9 +22783,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -22799,21 +22834,30 @@ class AddDataViewModel {
                 }
               } catch (e) {}
 
+              var style = { ...that._geojsonStyle
+              };
               var ds = new Cesium.Kq3dGeoJsonDataSource(name);
-              ds.load(ret, that._geojsonStyle).then(ds => {
+              var addType = "geojson"; // 判断是否是arcgis格式的json数据
+
+              if (ret.geometryType) {
+                ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
+                style.label.express = "NAME";
+                addType = "arcjson";
+              }
+
+              ds.load(ret, style).then(ds => {
                 ds.entities.values.forEach(entity => {
                   if (entity.polygon) {
                     entity.polyline = {
                       positions: entity.polygon.hierarchy._value.positions,
-                      width: that._geojsonStyle.polygon.outlineWidth,
-                      material: that._geojsonStyle.polygon.outlineColor
+                      width: style.polygon.outlineWidth,
+                      material: style.polygon.outlineColor
                     };
                   }
                 });
 
-                that._viewer.dataSources.add(ds);
+                that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-                ds.autoAvoid(that._viewer);
 
                 that._viewer.flyTo(ds);
 
@@ -22825,7 +22869,7 @@ class AddDataViewModel {
                   serverType: "datasource",
                   lsType: "ls",
                   url: ret,
-                  addType: "geojson",
+                  addType: addType,
                   shapeType: that._layerManager.getShapeType(ds)
                 };
 
@@ -23276,9 +23320,15 @@ class AddDataViewModel {
           }, this);
 
           if (mapInfo.rect84) {
-            this._viewer.camera.flyTo({
-              destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84.minx, mapInfo.rect84.miny, mapInfo.rect84.maxx, mapInfo.rect84.maxy)
-            });
+            if (mapInfo.rect84 instanceof Array) {
+              this._viewer.camera.flyTo({
+                destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84[0], mapInfo.rect84[1], mapInfo.rect84[2], mapInfo.rect84[3])
+              });
+            } else {
+              this._viewer.camera.flyTo({
+                destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84.minx, mapInfo.rect84.miny, mapInfo.rect84.maxx, mapInfo.rect84.maxy)
+              });
+            }
           }
 
           setChildrenAddType(mapServerInfo.layerTreeData, type);
@@ -23405,9 +23455,11 @@ class AddDataViewModel {
 
       case "wmts":
       case "kqgistileserver":
+      case "kqgisaggregationserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
           var defaultName = 'wmts';
           if (type === "kqgistileserver") defaultName = 'tile';
+          if (type === "kqgisaggregationserver") defaultName = 'aggregation';
           node = {
             guid: group.guid,
             name: name || defaultName,
@@ -23456,9 +23508,8 @@ class AddDataViewModel {
         wfsProvider.load().then(function (data) {
           var ds = new Cesium.Kq3dGeoJsonDataSource(name);
           ds.load(data, that._geojsonStyle).then(ds => {
-            that._viewer.dataSources.add(ds);
+            that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-            ds.autoAvoid(that._viewer);
 
             that._viewer.flyTo(ds);
 
@@ -23492,9 +23543,45 @@ class AddDataViewModel {
             }
           }, this);
 
-          this._viewer.dataSources.add(ds);
+          this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
+
+
+          this._viewer.flyTo(ds);
+
+          node = {
+            guid: ds.guid,
+            name: name,
+            visible: true,
+            serverType: "datasource",
+            lsType: "ls",
+            url: url,
+            addType: type,
+            shapeType: this._layerManager.getShapeType(ds)
+          };
+
+          this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
+        });
+        break;
+
+      case "arcjson":
+        var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
+        var geojsonStyle = { ...this._geojsonStyle
+        };
+        geojsonStyle.label.express = 'NAME';
+        ds.load(url, geojsonStyle).then(ds => {
+          ds.entities.values.forEach(entity => {
+            if (entity.polygon) {
+              entity.polyline = {
+                positions: entity.polygon.hierarchy._value.positions,
+                width: geojsonStyle.polygon.outlineWidth,
+                material: geojsonStyle.polygon.outlineColor
+              };
+            }
+          }, this);
 
-          ds.autoAvoid(this._viewer);
+          this._viewer.dataSources.add(ds);
 
           this._viewer.flyTo(ds);
 
@@ -23565,6 +23652,30 @@ class AddDataViewModel {
         });
         break;
 
+      case "s3m":
+        layer = this._viewer.scene.primitives.add(new Cesium.Kq3dS3MTilesLayer({
+          context: this._viewer.scene._context,
+          url: url,
+          maxVisibleDistance: 1000000,
+          minVisibleDistance: 0
+        }));
+        this.flyToLayer(layer);
+        if (!layer.guid) layer.guid = Cesium.createGuid();
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "3dtiles",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       default:
         break;
     }
@@ -23581,6 +23692,12 @@ class AddDataViewModel {
       });
     } else if (layer instanceof Cesium.Cesium3DTileset) {
       viewer.zoomTo(layer);
+    } else if (layer instanceof Cesium.Kq3dS3MTilesLayer) {
+      layer.readyPromise.then(function (tileset) {
+        viewer.camera.flyTo({
+          destination: tileset.rectangle
+        });
+      });
     } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource || layer instanceof Cesium.KmlDataSource || layer instanceof Cesium.CzmlDataSource) {
       viewer.flyTo(layer);
     } else if (layer instanceof Cesium.Kq3dKQGISServerTerrainProvider || layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
@@ -23714,6 +23831,10 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
     isRight: {
       type: Boolean,
       default: true
+    },
+    // geojson数据加载样式
+    geojsonStyle: {
+      type: Object
     }
   },
 
@@ -23819,6 +23940,18 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
         namePlaceholder: language.value.unnamedLayer,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
         description: language.value.imagertyTileServerdescription
+      }, {
+        type: "kqgisaggregationserver",
+        name: language.value.KQGISAggregationServer,
+        namePlaceholder: language.value.unnamedLayer,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
+        description: language.value.imagertyAggregationServerdescription
+      }, {
+        type: "s3m",
+        name: language.value.S3M,
+        namePlaceholder: language.value.unnamedLayer,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/realspace/datas/xxx/config",
+        description: language.value.imagertyS3Mdescription
       }, {
         type: "arcgismapserver",
         name: language.value.ArcGISMapServer,
@@ -23855,6 +23988,12 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
         namePlaceholder: language.value.unnamedLayer,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
         description: language.value.imagertyGeoJsondescription
+      }, {
+        type: "arcjson",
+        name: language.value.ArcJson,
+        namePlaceholder: language.value.unnamedLayer,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.json",
+        description: language.value.imagertyArcJsondescription
       }, {
         type: "mvt",
         name: language.value.MVT,
@@ -23897,7 +24036,8 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
         if (scenceView) {
           let options = {
             geometryServerUrl: props.geometryServerUrl,
-            geometryServerToken: props.geometryServerToken
+            geometryServerToken: props.geometryServerToken,
+            geojsonStyle: props.geojsonStyle
           };
           viewModel = new AddDataViewModel(scenceView, options);
         }

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.9.3-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.9.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"}}

package/scenceview/index.js

@@ -186,6 +186,7 @@ class AddDataViewModel {
     this._language = scenceView._language;
     this._geometryServerUrl = options.geometryServerUrl;
     this._geometryServerToken = options.geometryServerToken;
+    if (options.geojsonStyle) this._geojsonStyle = Object.assign({}, this._geojsonStyle, options.geojsonStyle);
   } //解析文件
 
 
@@ -216,9 +217,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -259,9 +259,8 @@ class AddDataViewModel {
                 }
               });
 
-              that._viewer.dataSources.add(ds);
+              that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-              ds.autoAvoid(that._viewer);
 
               that._viewer.flyTo(ds);
 
@@ -311,21 +310,30 @@ class AddDataViewModel {
                 }
               } catch (e) {}
 
+              var style = { ...that._geojsonStyle
+              };
               var ds = new Cesium.Kq3dGeoJsonDataSource(name);
-              ds.load(ret, that._geojsonStyle).then(ds => {
+              var addType = "geojson"; // 判断是否是arcgis格式的json数据
+
+              if (ret.geometryType) {
+                ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
+                style.label.express = "NAME";
+                addType = "arcjson";
+              }
+
+              ds.load(ret, style).then(ds => {
                 ds.entities.values.forEach(entity => {
                   if (entity.polygon) {
                     entity.polyline = {
                       positions: entity.polygon.hierarchy._value.positions,
-                      width: that._geojsonStyle.polygon.outlineWidth,
-                      material: that._geojsonStyle.polygon.outlineColor
+                      width: style.polygon.outlineWidth,
+                      material: style.polygon.outlineColor
                     };
                   }
                 });
 
-                that._viewer.dataSources.add(ds);
+                that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-                ds.autoAvoid(that._viewer);
 
                 that._viewer.flyTo(ds);
 
@@ -337,7 +345,7 @@ class AddDataViewModel {
                   serverType: "datasource",
                   lsType: "ls",
                   url: ret,
-                  addType: "geojson",
+                  addType: addType,
                   shapeType: that._layerManager.getShapeType(ds)
                 };
 
@@ -788,9 +796,15 @@ class AddDataViewModel {
           }, this);
 
           if (mapInfo.rect84) {
-            this._viewer.camera.flyTo({
-              destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84.minx, mapInfo.rect84.miny, mapInfo.rect84.maxx, mapInfo.rect84.maxy)
-            });
+            if (mapInfo.rect84 instanceof Array) {
+              this._viewer.camera.flyTo({
+                destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84[0], mapInfo.rect84[1], mapInfo.rect84[2], mapInfo.rect84[3])
+              });
+            } else {
+              this._viewer.camera.flyTo({
+                destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84.minx, mapInfo.rect84.miny, mapInfo.rect84.maxx, mapInfo.rect84.maxy)
+              });
+            }
           }
 
           setChildrenAddType(mapServerInfo.layerTreeData, type);
@@ -917,9 +931,11 @@ class AddDataViewModel {
 
       case "wmts":
       case "kqgistileserver":
+      case "kqgisaggregationserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
           var defaultName = 'wmts';
           if (type === "kqgistileserver") defaultName = 'tile';
+          if (type === "kqgisaggregationserver") defaultName = 'aggregation';
           node = {
             guid: group.guid,
             name: name || defaultName,
@@ -968,9 +984,8 @@ class AddDataViewModel {
         wfsProvider.load().then(function (data) {
           var ds = new Cesium.Kq3dGeoJsonDataSource(name);
           ds.load(data, that._geojsonStyle).then(ds => {
-            that._viewer.dataSources.add(ds);
+            that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
-            ds.autoAvoid(that._viewer);
 
             that._viewer.flyTo(ds);
 
@@ -1004,9 +1019,45 @@ class AddDataViewModel {
             }
           }, this);
 
-          this._viewer.dataSources.add(ds);
+          this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
+
+
+          this._viewer.flyTo(ds);
+
+          node = {
+            guid: ds.guid,
+            name: name,
+            visible: true,
+            serverType: "datasource",
+            lsType: "ls",
+            url: url,
+            addType: type,
+            shapeType: this._layerManager.getShapeType(ds)
+          };
+
+          this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
+        });
+        break;
+
+      case "arcjson":
+        var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
+        var geojsonStyle = { ...this._geojsonStyle
+        };
+        geojsonStyle.label.express = 'NAME';
+        ds.load(url, geojsonStyle).then(ds => {
+          ds.entities.values.forEach(entity => {
+            if (entity.polygon) {
+              entity.polyline = {
+                positions: entity.polygon.hierarchy._value.positions,
+                width: geojsonStyle.polygon.outlineWidth,
+                material: geojsonStyle.polygon.outlineColor
+              };
+            }
+          }, this);
 
-          ds.autoAvoid(this._viewer);
+          this._viewer.dataSources.add(ds);
 
           this._viewer.flyTo(ds);
 
@@ -1077,6 +1128,30 @@ class AddDataViewModel {
         });
         break;
 
+      case "s3m":
+        layer = this._viewer.scene.primitives.add(new Cesium.Kq3dS3MTilesLayer({
+          context: this._viewer.scene._context,
+          url: url,
+          maxVisibleDistance: 1000000,
+          minVisibleDistance: 0
+        }));
+        this.flyToLayer(layer);
+        if (!layer.guid) layer.guid = Cesium.createGuid();
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "3dtiles",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       default:
         break;
     }
@@ -1093,6 +1168,12 @@ class AddDataViewModel {
       });
     } else if (layer instanceof Cesium.Cesium3DTileset) {
       viewer.zoomTo(layer);
+    } else if (layer instanceof Cesium.Kq3dS3MTilesLayer) {
+      layer.readyPromise.then(function (tileset) {
+        viewer.camera.flyTo({
+          destination: tileset.rectangle
+        });
+      });
     } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource || layer instanceof Cesium.KmlDataSource || layer instanceof Cesium.CzmlDataSource) {
       viewer.flyTo(layer);
     } else if (layer instanceof Cesium.Kq3dKQGISServerTerrainProvider || layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
@@ -1228,6 +1309,10 @@ const __default__ = {
     isRight: {
       type: Boolean,
       default: true
+    },
+    // geojson数据加载样式
+    geojsonStyle: {
+      type: Object
     }
   },
 
@@ -1333,6 +1418,18 @@ const __default__ = {
         namePlaceholder: language.value.unnamedLayer,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
         description: language.value.imagertyTileServerdescription
+      }, {
+        type: "kqgisaggregationserver",
+        name: language.value.KQGISAggregationServer,
+        namePlaceholder: language.value.unnamedLayer,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
+        description: language.value.imagertyAggregationServerdescription
+      }, {
+        type: "s3m",
+        name: language.value.S3M,
+        namePlaceholder: language.value.unnamedLayer,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/realspace/datas/xxx/config",
+        description: language.value.imagertyS3Mdescription
       }, {
         type: "arcgismapserver",
         name: language.value.ArcGISMapServer,
@@ -1369,6 +1466,12 @@ const __default__ = {
         namePlaceholder: language.value.unnamedLayer,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
         description: language.value.imagertyGeoJsondescription
+      }, {
+        type: "arcjson",
+        name: language.value.ArcJson,
+        namePlaceholder: language.value.unnamedLayer,
+        urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.json",
+        description: language.value.imagertyArcJsondescription
       }, {
         type: "mvt",
         name: language.value.MVT,
@@ -1411,7 +1514,8 @@ const __default__ = {
         if (scenceView) {
           let options = {
             geometryServerUrl: props.geometryServerUrl,
-            geometryServerToken: props.geometryServerToken
+            geometryServerToken: props.geometryServerToken,
+            geojsonStyle: props.geojsonStyle
           };
           viewModel = new AddDataViewModel(scenceView, options);
         }
@@ -28054,9 +28158,36 @@ class LayerManager {
               }
             }, this);
 
+            this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
+
+
+            ds._guid = layerData.guid;
+            layerData.shapeType = this.getShapeType(ds);
+          });
+        }
+
+        break;
+
+      case "arcjson":
+        layerData.visible = isAdd;
+        layerData.serverType = "datasource";
+
+        if (isAdd) {
+          var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
+          var geojsonStyle = layerData.geojsonStyle || this._geojsonStyle;
+          promise = ds.load(url, geojsonStyle).then(ds => {
+            ds.entities.values.forEach(entity => {
+              if (entity.polygon) {
+                entity.polyline = {
+                  positions: entity.polygon.hierarchy._value.positions,
+                  width: geojsonStyle.polygon.outlineWidth,
+                  material: geojsonStyle.polygon.outlineColor
+                };
+              }
+            }, this);
+
             this._viewer.dataSources.add(ds);
 
-            ds.autoAvoid(this._viewer);
             ds._guid = layerData.guid;
             layerData.shapeType = this.getShapeType(ds);
           });
@@ -28264,9 +28395,15 @@ class LayerManager {
     });
 
     if (rect) {
-      that._viewer.camera.flyTo({
-        destination: Cesium.Rectangle.fromDegrees(rect.minx, rect.miny, rect.maxx, rect.maxy)
-      });
+      if (rect instanceof Array) {
+        that._viewer.camera.flyTo({
+          destination: Cesium.Rectangle.fromDegrees(rect[0], rect[1], rect[2], rect[3])
+        });
+      } else {
+        that._viewer.camera.flyTo({
+          destination: Cesium.Rectangle.fromDegrees(rect.minx, rect.miny, rect.maxx, rect.maxy)
+        });
+      }
     }
 
     that._scenceView.fire("resetLayerDatas");
@@ -28464,7 +28601,7 @@ class LayerManager {
     } else if (type === "3dtiles") {
       let primitives = this._viewer.scene.primitives._primitives;
       let layer = primitives.find(item => {
-        return item.guid === guid && item instanceof Cesium.Cesium3DTileset;
+        return item.guid === guid;
       });
       return layer;
     } else if (type === "datasource") {
@@ -29186,7 +29323,10 @@ class ScenceViewViewModel extends (mitt_default()) {
 
       case "tianditu":
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
-          mapStyle: layerConfig.layerType + "_c"
+          mapStyle: layerConfig.layerType + "_c",
+          maximumLevel: layerConfig.maximumLevel || null,
+          useCache: layerConfig.useCache || false,
+          key: layerConfig.key || Cesium.Kq3dTiandituImageryProvider.DEFAULT_KEY
         }), index);
         break;