@kq_npm/client3d_webgl_vue 2.8.9-beta → 2.9.1-beta

package/adddata/index.js

@@ -1088,12 +1088,6 @@ const __default__ = {
           //     namePlaceholder: language.value.unnamedLayer,
           //     urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<servername>/info.xml',
           //     description: language.value.imagertyObTerrainTileFiledescription
-          // }, {
-          //     type: 'stkterrain',
-          //     name: language.value.StkTerrainTileFile,
-          //     namePlaceholder: language.value.unnamedLayer,
-          //     urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<foldername>/',
-          //     description: language.value.imagertyStkTerrainTileFiledescription
           // }, 
           {
             type: 'kqgis3dserver',
@@ -1149,38 +1143,43 @@ const __default__ = {
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ':http://<host>:<port>/tileset.json',
             description: language.value.imagerty3DTilesFiledescription
+          }, {
+            type: 'stkterrain',
+            name: language.value.StkTerrainTileFile,
+            namePlaceholder: language.value.unnamedLayer,
+            urlPlaceholder: language.value.format + ':http://<host>:<port>/xxx/<foldername>/',
+            description: language.value.imagertyStkTerrainTileFiledescription
+          }, {
+            type: 'geojson',
+            name: language.value.GeoJson,
+            namePlaceholder: language.value.unnamedLayer,
+            urlPlaceholder: language.value.format + ': http://<host>:<port>/xxx.geojson',
+            description: language.value.imagertyGeoJsondescription
+          }, {
+            type: 'mvt',
+            name: language.value.MVT + '（未实现）',
+            namePlaceholder: language.value.unnamedLayer,
+            urlPlaceholder: language.value.format + ':http://<host>:<port>/mvt/style.json',
+            description: language.value.imagertyMVTdescription
           }
           /*, {
-             type: 'wfs',
-             name: language.value.OGCWFS,
-             namePlaceholder: language.value.wfsLayer,
-             urlPlaceholder: language.value.format +':http://<host>:<port>/ArcGIS/rest/services/<servername>/wfs',
-             description: language.value.imagertyOGCWFSdescription
-          }, {
-             type: 'mvt',
-             name: language.value.MVT,
-             namePlaceholder: language.value.unnamedLayer,
-             urlPlaceholder: language.value.format +':http://<host>:<port>/mvt/tiles/{z}/{x}/{y}.mvt',
-             stylePlaceholder: language.value.format +':http://<host>:<port>/mvt/style.json',
-             description: language.value.imagertyMVTdescription
-          }, {
-             type: 'geojson',
-             name: language.value.GeoJson,
-             namePlaceholder: language.value.unnamedLayer,
-             urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.geojson',
-             description: language.value.imagertyGeoJsondescription
+              type: 'wfs',
+              name: language.value.OGCWFS,
+              namePlaceholder: language.value.wfsLayer,
+              urlPlaceholder: language.value.format +':http://<host>:<port>/ArcGIS/rest/services/<servername>/wfs',
+              description: language.value.imagertyOGCWFSdescription
           }, {
-             type: 'kml',
-             name: language.value.KML,
-             namePlaceholder: language.value.unnamedLayer,
-             urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.kml',
-             description: language.value.imagertyKMLdescription
+              type: 'kml',
+              name: language.value.KML,
+              namePlaceholder: language.value.unnamedLayer,
+              urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.kml',
+              description: language.value.imagertyKMLdescription
           }, {
-             type: 'czml',
-             name: language.value.CZML,
-             namePlaceholder: language.value.unnamedLayer,
-             urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.czml',
-             description: language.value.imagertyCZMLdescription
+              type: 'czml',
+              name: language.value.CZML,
+              namePlaceholder: language.value.unnamedLayer,
+              urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.czml',
+              description: language.value.imagertyCZMLdescription
           }*/
           ];
           dataSourceType.value = dataSourceTypeList.value[0];

package/adddata/style/adddata.css

@@ -1 +1 @@
-.kq3d-add-data{z-index:999;width:536px;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq3d-add-data .kq-form-item{width:100%}.kq3d-add-data .kq-tabs__item{height:28px;line-height:20px;font-weight:400;font-size:var(--kq-font-size-medium);padding:0 16px}.kq3d-add-data .kq3d-add-data-desc{margin-bottom:20px}.kq3d-add-data .kq3d-add-data-tip{color:#909399;font-size:13px}.kq3d-add-data .kq3d-add-data-upload_text{color:#606266}.kq3d-add-data .kq-select{width:100%}.kq3d-add-data .kq3d-add-data-filelist,.kq3d-add-data .kq-upload-dragger{background:#f2f6fc;border:1px dashed #409eff;border-radius:4px}.kq3d-add-data .kq3d-add-data-filelist{width:99%;min-height:101px;height:auto}.kq3d-add-data .kq3d-add-data-filelist .kq-row{margin:10px 0;display:-webkit-box;display:-ms-flexbox;display:flex;margin-left:0!important;margin-right:0!important}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file{background:#d9ecff;border-radius:4px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 8px;height:40px;overflow:hidden;white-space:nowrap;-o-text-overflow:ellipsis;text-overflow:ellipsis}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file .kq3d-add-data-doc{font-size:28px;color:#409eff;padding:4px}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file p{overflow:hidden;white-space:nowrap;-o-text-overflow:ellipsis;text-overflow:ellipsis}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file .kq3d-add-data-close{font-size:18px;color:#f56c6c;padding:4px;cursor:pointer}.kq3d-add-data .kq3d-add-data-footer{width:100%;padding-top:16px}.kq3d-add-data .kq3d-add-data-footer .btns_box{float:right;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.kq3d-add-data .kq3d-add-data-footer .kq3d-add-data-footer-upload{padding:0 12px}.kq-select-dropdown__wrap{max-height:320px!important}
+.kq3d-add-data{z-index:999;width:536px;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq3d-add-data .kq-form-item{width:100%}.kq3d-add-data .kq-tabs__item{height:28px;line-height:20px;font-weight:400;font-size:var(--kq-font-size-medium);padding:0 16px}.kq3d-add-data .kq3d-add-data-desc{margin-bottom:20px}.kq3d-add-data .kq3d-add-data-tip{color:#909399;font-size:13px}.kq3d-add-data .kq3d-add-data-upload_text{color:#606266}.kq3d-add-data .kq-select{width:100%}.kq3d-add-data .kq3d-add-data-filelist,.kq3d-add-data .kq-upload-dragger{background:#f2f6fc;border:1px dashed #409eff;border-radius:4px}.kq3d-add-data .kq3d-add-data-filelist{width:99%;min-height:101px;height:auto}.kq3d-add-data .kq3d-add-data-filelist .kq-row{margin:10px 0;display:-webkit-box;display:-ms-flexbox;display:flex;margin-left:0!important;margin-right:0!important}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file{background:#d9ecff;border-radius:4px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 8px;height:40px;overflow:hidden;white-space:nowrap;-o-text-overflow:ellipsis;text-overflow:ellipsis}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file .kq3d-add-data-doc{font-size:28px;color:#409eff;padding:4px}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file p{overflow:hidden;white-space:nowrap;-o-text-overflow:ellipsis;text-overflow:ellipsis}.kq3d-add-data .kq3d-add-data-filelist .kq3d-add-data-file .kq3d-add-data-close{font-size:18px;color:#f56c6c;padding:4px;cursor:pointer}.kq3d-add-data .kq3d-add-data-footer{width:100%;padding-top:16px}.kq3d-add-data .kq3d-add-data-footer .btns_box{float:right;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.kq3d-add-data .kq3d-add-data-footer .kq3d-add-data-footer-upload{padding:0 12px}

package/flight/index.js

@@ -336,6 +336,18 @@ const __default__ = {
     showShadow: {
       type: Boolean,
       default: false
+    },
+    // 加载外部飞行路径数据方法
+    loadFlightPath: {
+      type: Function
+    },
+    // 外部保存飞行路径方法
+    saveFlightPath: {
+      type: Function
+    },
+    // 外部删除飞行路径方法
+    deleteFlightPath: {
+      type: Function
     }
   },
 
@@ -376,7 +388,17 @@ const __default__ = {
             pathList.forEach(path => {
               path.isPlaying = false;
             });
-          });
+          }); //加载外部数据
+
+          if (props.loadFlightPath) {
+            props.loadFlightPath(dataList => {
+              dataList = JSON.parse(JSON.stringify(dataList));
+              dataList.forEach(path => {
+                path.isPlaying = false;
+                pathList.push(path);
+              });
+            });
+          }
         }
       });
     }); // 销毁
@@ -431,7 +453,11 @@ const __default__ = {
           pathPlayIndex = -1;
         }
 
-        pathList.splice(dropDownPath.index, 1);
+        pathList.splice(dropDownPath.index, 1); // 外部删除数据
+
+        if (props.deleteFlightPath) {
+          props.deleteFlightPath(dropDownPath.guid);
+        }
       }
     } //路径播放
 
@@ -579,15 +605,33 @@ const __default__ = {
           if (dropDownPath) {
             var editPath = pathList[dropDownPath.index];
             editPath.name = pathName.value;
-            editPath.xmlString = xmlString;
+            editPath.xmlString = xmlString; // 外部保存数据
+
+            if (props.saveFlightPath) {
+              props.saveFlightPath({
+                guid: editPath.guid,
+                name: editPath.name,
+                xmlString: editPath.xmlString
+              });
+            }
           }
         } else {
           //新增路径
-          pathList.push({
+          var path = {
+            guid: Cesium.createGuid(),
             name: pathName.value,
             xmlString: xmlString,
             isPlaying: false
-          });
+          };
+          pathList.push(path); // 外部保存数据
+
+          if (props.saveFlightPath) {
+            props.saveFlightPath({
+              guid: path.guid,
+              name: path.name,
+              xmlString: path.xmlString
+            });
+          }
         }
 
         cancel();
@@ -609,11 +653,21 @@ const __default__ = {
       var name = file.name.split(".")[0];
       viewModel.fromXmlFile(file.raw).then(() => {
         var xmlString = viewModel.asXmlString();
-        pathList.push({
+        var path = {
+          guid: Cesium.createGuid(),
           name: name,
           xmlString: xmlString,
           isPlaying: false
-        });
+        };
+        pathList.push(path); // 外部保存数据
+
+        if (props.saveFlightPath) {
+          props.saveFlightPath({
+            guid: path.guid,
+            name: path.name,
+            xmlString: path.xmlString
+          });
+        }
       });
     } //导出文件