@kq_npm/client3d_webgl_vue 4.0.9-beta → 4.1.1-beta

package/adddata/index.js

@@ -865,6 +865,7 @@ class AddDataViewModel {
         break;
 
       case "kqgis3dserver":
+        // KQGIS 三维服务
         var geojsonStyle0 = { ...this._geojsonStyle
         };
 
@@ -988,7 +989,7 @@ class AddDataViewModel {
           children: [],
           lsType: "ls"
         };
-        const service = new KqGIS.Map.GetMapImageInfoService(url);
+        const service = new window.KqGIS.Map.GetMapImageInfoService(url);
         service.init(result => {
           if (result.resultcode === "success") {
             let list = service.collectionInfoList;
@@ -1022,31 +1023,16 @@ class AddDataViewModel {
           } else {
             console.log("解析服务原始信息失败.");
           }
-        }); // layer = this._viewer.imageryLayers.addImageryProvider(
-        //   new Cesium.Kq3dKQGISServerImageryProviderExt({
-        //     name: name,
-        //     url: url,
-        //     layerName: name
-        //   })
-        // );
-        // this.flyToLayer(layer);
-        // node = {
-        //   guid: layer.guid,
-        //   name: name,
-        //   visible: true,
-        //   serverType: "imagerylayer",
-        //   lsType: "ls",
-        //   url: url,
-        //   addType: type,
-        //   layerName: name,
-        //   type: "Image" // 图层树显示图标使用
-        // };
-        // this._layerManager.addTempLayerNode(node);
-        // cb && cb(node);
+        });
+        break;
 
+      case "kqgisdataserver":
+        // KQGIS 数据服务
+        // addDataServer(url, name);
         break;
 
       case "kqgismapserver":
+        // KQGIS 地图服务
         if (loadCustom) {
           loadCustom({
             name,
@@ -1131,6 +1117,7 @@ class AddDataViewModel {
         break;
 
       case "arcgismapserver":
+        // ARCGIS 地图服务
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
           name: name,
           url: url,
@@ -1154,6 +1141,7 @@ class AddDataViewModel {
         break;
 
       case "mvt":
+        // 矢量瓦片
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
           name: name,
           style: url
@@ -1177,6 +1165,7 @@ class AddDataViewModel {
         break;
 
       case "kqgisdataflowserver":
+        // KQGIS 数据流服务
         let guid = Cesium.createGuid();
         layer = new Cesium.Kq3dDataFlowLayer(this._viewer, {
           url: url,
@@ -1244,8 +1233,10 @@ class AddDataViewModel {
         break;
 
       case "wmts":
-      case "kqgistileserver":
+      case "kqgistileserver": // KQGIS 瓦片服务
+
       case "kqgisaggregationserver":
+        // KQGIS 聚合服务
         if (type === "kqgistileserver") {
           if (url.indexOf("?") > 0) {
             url = url.replace("?", "/wmts?");
@@ -1472,6 +1463,68 @@ class AddDataViewModel {
       default:
         break;
     }
+  } // 添加数据服务
+
+
+  addDataServer(url, name) {
+    window.KqGIS.datasourceService(url).getDatasources(async e => {
+      if (e.result.resultcode === 'success') {
+        let datasourceList = e.result.result.datasources;
+
+        if (datasourceList) {
+          for (let i = 0; i < datasourceList.length; i++) {
+            await _getDatasetList(url, datasourceList[i].datasourceName);
+          }
+        }
+      } else {
+        console.error(e);
+      }
+    }, err => {
+      console.error(err);
+    });
+  }
+
+  _getDatasetList(url, dataSourceName) {
+    let params = new window.KqGIS.Data.GetDatasetsInfoParams({
+      datasourceName: dataSourceName
+    });
+    return new Promise((resolve, reject) => {
+      window.KqGIS.datasetService(url).getDatasets(params, e => {
+        if (e.result.resultcode === 'success') {
+          resolve(e.result.result.datasets);
+        } else {
+          console.error(e);
+          reject([]);
+        }
+      }, err => {
+        console.error(err);
+        reject([]);
+      });
+    });
+  }
+
+  _getFeatureList(url, datasourceName, datasetName) {
+    let params = new window.KqGIS.Data.GetFeaturesParamsBase({
+      datasourceName: datasourceName,
+      datasetName: datasetName,
+      hasGeometry: true,
+      returnContent: true,
+      outSRS: 'EPSG:4326'
+    });
+    return new Promise((resolve, reject) => {
+      window.KqGIS.dataFeatureService(url).getFeatureList(params, e => {
+        if (e.result.resultcode === 'success') {
+          e.result.result['datasetName'] = datasetName;
+          resolve(e.result.result);
+        } else {
+          console.error(e);
+          reject(null);
+        }
+      }, err => {
+        console.error(err);
+        resolve(null);
+      });
+    });
   }
 
   flyToLayer(layer) {
@@ -1727,7 +1780,14 @@ const __default__ = {
         namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map",
         description: language.value.imagertyMapServerdescription
-      }, {
+      }, // {
+      //   type: "kqgisdataserver",
+      //   name: language.value.KQGISDataServer,
+      //   namePlaceholder: language.value.optional,
+      //   urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/data",
+      //   description: language.value.imagertyDataServerdescription
+      // },
+      {
         type: "kqgisimageserver",
         name: language.value.KQGISImageServer,
         namePlaceholder: language.value.optional,