@kq_npm/client3d_webgl_vue 3.6.0-beta → 3.6.1-beta

package/adddata/index.js

@@ -196,8 +196,6 @@ var icons_vue_ = __webpack_require__(8422);
 var client_icons_vue_ = __webpack_require__(348);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/gis-utils"
 var gis_utils_ = __webpack_require__(826);
-// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
-var const_image_ = __webpack_require__(9702);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
 var defineProperty = __webpack_require__(8270);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/webmapservice"
@@ -207,10 +205,13 @@ var webmapservice_default = /*#__PURE__*/__webpack_require__.n(webmapservice_);
 var util_ = __webpack_require__(9519);
 // EXTERNAL MODULE: ./src/common/_ui/message/index.js + 1 modules
 var message = __webpack_require__(909);
+// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
+var const_image_ = __webpack_require__(9702);
 ;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
 
 
 
+
  //添加数据逻辑类
 
 class AddDataViewModel {
@@ -237,7 +238,7 @@ class AddDataViewModel {
         disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       billboard: {
-        image: "",
+        image: const_image_.BILLBOARD_IMAGE_URL,
         width: 12,
         height: 12,
         disableDepthTestDistance: Number.POSITIVE_INFINITY
@@ -258,7 +259,6 @@ class AddDataViewModel {
 
     this._viewer = scenceView._viewer;
     this._layerManager = scenceView._layerManager;
-    this._geojsonStyle.billboard.image = options.billboardImage;
     this._language = scenceView._language;
     this._geometryServerUrl = options.geometryServerUrl;
     this._geometryServerToken = options.geometryServerToken;
@@ -924,6 +924,36 @@ class AddDataViewModel {
         cb && cb(node);
         break;
 
+      case "kqgisdataflowserver":
+        let guid = Cesium.createGuid();
+        layer = new Cesium.Kq3dDataFlowLayer(this._viewer, {
+          url: url,
+          style: {
+            image: const_image_.CAR_URL,
+            width: 30,
+            height: 30
+          }
+        });
+        layer.guid = guid;
+        layer.init();
+        layer.flyToBounds();
+        node = {
+          guid: guid,
+          name: name,
+          visible: true,
+          serverType: "dataflowlayer",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        this._layerManager._dataFlowLayerList.push(layer);
+
+        cb && cb(node);
+        break;
+
       case "wms":
         this._viewer.addWMSLayerGroup(url).then(group => {
           node = {
@@ -1211,7 +1241,6 @@ const _hoisted_12 = {
 
 
 
-
  //accept=".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt"
 
 const __default__ = {
@@ -1365,9 +1394,9 @@ const __default__ = {
             description: language.value.imagertyImageServerdescription
           }, {
             type: "kqgisdataflowserver",
-            name: language.value.KQGISDataflowServer + "（未实现）",
+            name: language.value.KQGISDataflowServer,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/dataflow",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/streaming/rest/services/<servername>/dataflow",
             description: language.value.imagertyDataflowServerdescription
           }, {
             type: "kqgistileserver",
@@ -1440,7 +1469,6 @@ const __default__ = {
           ];
           dataSourceType.value = dataSourceTypeList.value[0];
           let options = {
-            billboardImage: const_image_.BILLBOARD_IMAGE_URL,
             geometryServerUrl: props.geometryServerUrl,
             geometryServerToken: props.geometryServerToken
           };

package/index.js

@@ -1164,6 +1164,7 @@ class LayerManager {
   //图层原数据列表（包含文件夹节点，融合子图层）
   //置顶图层guid
   //记录置顶图层index
+  //数据流服务图层集合
   //地形集合
   //加载geojson数据样式
   constructor(scenceView) {
@@ -1183,6 +1184,8 @@ class LayerManager {
 
     _defineProperty(this, "_emptyTerrainProvider", new Cesium.EllipsoidTerrainProvider({}));
 
+    _defineProperty(this, "_dataFlowLayerList", []);
+
     _defineProperty(this, "_terrainProviders", []);
 
     _defineProperty(this, "_geojsonStyle", {
@@ -1282,6 +1285,10 @@ class LayerManager {
 
               this._layerListData_old.push(layer_old);
             }, this);
+          }, error => {
+            console.log(error);
+          }).catch(error => {
+            console.error(error);
           });
           sourcePromises.push(sourcePromise);
         }
@@ -1368,6 +1375,8 @@ class LayerManager {
             type = "kqgis3dserver";
           } else if (layerData.sourceType === "mvt") {
             type = "mvt";
+          } else if (layerData.sourceType === "kqdataflowserver") {
+            type = "kqgisdataflowserver";
           }
 
           layerData.addType = type;
@@ -1618,6 +1627,28 @@ class LayerManager {
 
         break;
 
+      case "kqgisdataflowserver":
+        layerData.visible = isAdd;
+        layerData.serverType = "dataflowlayer";
+
+        if (isAdd) {
+          layer = new Cesium.Kq3dDataFlowLayer(this._viewer, {
+            url: url,
+            style: {
+              image: const_image_namespaceObject.CAR_URL,
+              width: 30,
+              height: 30
+            },
+            ...params
+          });
+          layer.init();
+          layer.guid = layerData.guid;
+
+          this._dataFlowLayerList.push(layer);
+        }
+
+        break;
+
       case "wms":
         //配置id时只能是单个图层
         if (layerData.rect84) {
@@ -2158,6 +2189,12 @@ class LayerManager {
       let layer = dataSources.find(item => {
         return item.guid === guid;
       });
+      return layer;
+    } else if (type === "dataflowlayer") {
+      let layer = this._dataFlowLayerList.find(item => {
+        return item.guid === guid;
+      });
+
       return layer;
     }
   } //通过guid获取图层类型
@@ -2322,6 +2359,8 @@ class LayerManager {
           });
         }
       });
+    } else if (layer instanceof Cesium.Kq3dDataFlowLayer) {
+      layer.flyToBounds();
     }
   } //获取底图图层Index
 
@@ -2593,6 +2632,19 @@ class LayerManager {
 
           break;
 
+        case "dataflowlayer":
+          layer.destroy(); //删除_dataFlowLayerList数据
+
+          for (var i = 0; i < this._dataFlowLayerList.length; i++) {
+            if (guid === this._dataFlowLayerList[i].guid) {
+              this._dataFlowLayerList.splice(i, 1);
+
+              break;
+            }
+          }
+
+          break;
+
         default:
           break;
       }
@@ -21766,6 +21818,7 @@ PlaneClip.install = (Vue, opts) => {
 
 
 
+
  //添加数据逻辑类
 
 class AddDataViewModel {
@@ -21792,7 +21845,7 @@ class AddDataViewModel {
         disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       billboard: {
-        image: "",
+        image: const_image_namespaceObject.BILLBOARD_IMAGE_URL,
         width: 12,
         height: 12,
         disableDepthTestDistance: Number.POSITIVE_INFINITY
@@ -21813,7 +21866,6 @@ class AddDataViewModel {
 
     this._viewer = scenceView._viewer;
     this._layerManager = scenceView._layerManager;
-    this._geojsonStyle.billboard.image = options.billboardImage;
     this._language = scenceView._language;
     this._geometryServerUrl = options.geometryServerUrl;
     this._geometryServerToken = options.geometryServerToken;
@@ -22479,6 +22531,36 @@ class AddDataViewModel {
         cb && cb(node);
         break;
 
+      case "kqgisdataflowserver":
+        let guid = Cesium.createGuid();
+        layer = new Cesium.Kq3dDataFlowLayer(this._viewer, {
+          url: url,
+          style: {
+            image: const_image_namespaceObject.CAR_URL,
+            width: 30,
+            height: 30
+          }
+        });
+        layer.guid = guid;
+        layer.init();
+        layer.flyToBounds();
+        node = {
+          guid: guid,
+          name: name,
+          visible: true,
+          serverType: "dataflowlayer",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        this._layerManager._dataFlowLayerList.push(layer);
+
+        cb && cb(node);
+        break;
+
       case "wms":
         this._viewer.addWMSLayerGroup(url).then(group => {
           node = {
@@ -22766,7 +22848,6 @@ const AddDatavue_type_script_setup_true_lang_js_hoisted_12 = {
 
 
 
-
  //accept=".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt"
 
 const AddDatavue_type_script_setup_true_lang_js_default_ = {
@@ -22920,9 +23001,9 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
             description: language.value.imagertyImageServerdescription
           }, {
             type: "kqgisdataflowserver",
-            name: language.value.KQGISDataflowServer + "（未实现）",
+            name: language.value.KQGISDataflowServer,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/dataflow",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/streaming/rest/services/<servername>/dataflow",
             description: language.value.imagertyDataflowServerdescription
           }, {
             type: "kqgistileserver",
@@ -22995,7 +23076,6 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
           ];
           dataSourceType.value = dataSourceTypeList.value[0];
           let options = {
-            billboardImage: const_image_namespaceObject.BILLBOARD_IMAGE_URL,
             geometryServerUrl: props.geometryServerUrl,
             geometryServerToken: props.geometryServerToken
           };

package/package.json

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

@@ -120,8 +120,6 @@ var icons_vue_ = __webpack_require__(8422);
 var client_icons_vue_ = __webpack_require__(348);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/gis-utils"
 var gis_utils_ = __webpack_require__(826);
-// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
-var const_image_ = __webpack_require__(9702);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
 var defineProperty = __webpack_require__(8270);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/webmapservice"
@@ -131,10 +129,13 @@ var webmapservice_default = /*#__PURE__*/__webpack_require__.n(webmapservice_);
 var util_ = __webpack_require__(9519);
 // EXTERNAL MODULE: ./src/common/_ui/message/index.js + 1 modules
 var message = __webpack_require__(909);
+// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
+var const_image_ = __webpack_require__(9702);
 ;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
 
 
 
+
  //添加数据逻辑类
 
 class AddDataViewModel {
@@ -161,7 +162,7 @@ class AddDataViewModel {
         disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       billboard: {
-        image: "",
+        image: const_image_.BILLBOARD_IMAGE_URL,
         width: 12,
         height: 12,
         disableDepthTestDistance: Number.POSITIVE_INFINITY
@@ -182,7 +183,6 @@ class AddDataViewModel {
 
     this._viewer = scenceView._viewer;
     this._layerManager = scenceView._layerManager;
-    this._geojsonStyle.billboard.image = options.billboardImage;
     this._language = scenceView._language;
     this._geometryServerUrl = options.geometryServerUrl;
     this._geometryServerToken = options.geometryServerToken;
@@ -848,6 +848,36 @@ class AddDataViewModel {
         cb && cb(node);
         break;
 
+      case "kqgisdataflowserver":
+        let guid = Cesium.createGuid();
+        layer = new Cesium.Kq3dDataFlowLayer(this._viewer, {
+          url: url,
+          style: {
+            image: const_image_.CAR_URL,
+            width: 30,
+            height: 30
+          }
+        });
+        layer.guid = guid;
+        layer.init();
+        layer.flyToBounds();
+        node = {
+          guid: guid,
+          name: name,
+          visible: true,
+          serverType: "dataflowlayer",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        this._layerManager._dataFlowLayerList.push(layer);
+
+        cb && cb(node);
+        break;
+
       case "wms":
         this._viewer.addWMSLayerGroup(url).then(group => {
           node = {
@@ -1135,7 +1165,6 @@ const _hoisted_12 = {
 
 
 
-
  //accept=".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt"
 
 const __default__ = {
@@ -1289,9 +1318,9 @@ const __default__ = {
             description: language.value.imagertyImageServerdescription
           }, {
             type: "kqgisdataflowserver",
-            name: language.value.KQGISDataflowServer + "（未实现）",
+            name: language.value.KQGISDataflowServer,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/dataflow",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/streaming/rest/services/<servername>/dataflow",
             description: language.value.imagertyDataflowServerdescription
           }, {
             type: "kqgistileserver",
@@ -1364,7 +1393,6 @@ const __default__ = {
           ];
           dataSourceType.value = dataSourceTypeList.value[0];
           let options = {
-            billboardImage: const_image_.BILLBOARD_IMAGE_URL,
             geometryServerUrl: props.geometryServerUrl,
             geometryServerToken: props.geometryServerToken
           };
@@ -26438,6 +26466,7 @@ class LayerManager {
   //图层原数据列表（包含文件夹节点，融合子图层）
   //置顶图层guid
   //记录置顶图层index
+  //数据流服务图层集合
   //地形集合
   //加载geojson数据样式
   constructor(scenceView) {
@@ -26457,6 +26486,8 @@ class LayerManager {
 
     (0,defineProperty/* default */.Z)(this, "_emptyTerrainProvider", new Cesium.EllipsoidTerrainProvider({}));
 
+    (0,defineProperty/* default */.Z)(this, "_dataFlowLayerList", []);
+
     (0,defineProperty/* default */.Z)(this, "_terrainProviders", []);
 
     (0,defineProperty/* default */.Z)(this, "_geojsonStyle", {
@@ -26556,6 +26587,10 @@ class LayerManager {
 
               this._layerListData_old.push(layer_old);
             }, this);
+          }, error => {
+            console.log(error);
+          }).catch(error => {
+            console.error(error);
           });
           sourcePromises.push(sourcePromise);
         }
@@ -26642,6 +26677,8 @@ class LayerManager {
             type = "kqgis3dserver";
           } else if (layerData.sourceType === "mvt") {
             type = "mvt";
+          } else if (layerData.sourceType === "kqdataflowserver") {
+            type = "kqgisdataflowserver";
           }
 
           layerData.addType = type;
@@ -26892,6 +26929,28 @@ class LayerManager {
 
         break;
 
+      case "kqgisdataflowserver":
+        layerData.visible = isAdd;
+        layerData.serverType = "dataflowlayer";
+
+        if (isAdd) {
+          layer = new Cesium.Kq3dDataFlowLayer(this._viewer, {
+            url: url,
+            style: {
+              image: const_image_.CAR_URL,
+              width: 30,
+              height: 30
+            },
+            ...params
+          });
+          layer.init();
+          layer.guid = layerData.guid;
+
+          this._dataFlowLayerList.push(layer);
+        }
+
+        break;
+
       case "wms":
         //配置id时只能是单个图层
         if (layerData.rect84) {
@@ -27432,6 +27491,12 @@ class LayerManager {
       let layer = dataSources.find(item => {
         return item.guid === guid;
       });
+      return layer;
+    } else if (type === "dataflowlayer") {
+      let layer = this._dataFlowLayerList.find(item => {
+        return item.guid === guid;
+      });
+
       return layer;
     }
   } //通过guid获取图层类型
@@ -27596,6 +27661,8 @@ class LayerManager {
           });
         }
       });
+    } else if (layer instanceof Cesium.Kq3dDataFlowLayer) {
+      layer.flyToBounds();
     }
   } //获取底图图层Index
 
@@ -27867,6 +27934,19 @@ class LayerManager {
 
           break;
 
+        case "dataflowlayer":
+          layer.destroy(); //删除_dataFlowLayerList数据
+
+          for (var i = 0; i < this._dataFlowLayerList.length; i++) {
+            if (guid === this._dataFlowLayerList[i].guid) {
+              this._dataFlowLayerList.splice(i, 1);
+
+              break;
+            }
+          }
+
+          break;
+
         default:
           break;
       }