@kq_npm/client3d_webgl_vue 2.3.4-beta → 2.3.5-beta

package/adddata/index.js

@@ -125,16 +125,13 @@ class AddDataViewModel {
         style: Cesium.LabelStyle.FILL_AND_OUTLINE,
         eyeOffset: Cesium.Cartesian3.ZERO,
         pixelOffset: new Cesium.Cartesian2(0, -8),
-        disableDepthTestDistance: 35000000,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000)
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       billboard: {
         image: "",
         width: 12,
         height: 12,
-        disableDepthTestDistance: 35000000,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000),
-        scaleByDistance: new Cesium.NearFarScalar(200000, 1.2, 100000000000, 0.5)
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       polyline: {
         width: 2.0,
@@ -156,7 +153,7 @@ class AddDataViewModel {
   } //解析文件
 
 
-  parseFile(file, removeFile) {
+  parseFile(file, removeFile, cb) {
     var reader = new FileReader();
     reader.readAsText(file); //文本
     //readAsDataURL(file);  //base64 图片
@@ -204,6 +201,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(layer);
+
+            cb && cb(layer);
           });
           break;
 
@@ -232,6 +231,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(layer);
+
+            cb && cb(layer);
           });
           break;
 
@@ -256,6 +257,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(layer);
+
+            cb && cb(layer);
           });
           break;
 
@@ -284,6 +287,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(layer);
+
+            cb && cb(layer);
           });
 
           break;
@@ -315,7 +320,7 @@ class AddDataViewModel {
   } //解析数据源
 
 
-  parseDataSource(options) {
+  parseDataSource(options, cb) {
     options = options || {};
 
     if (options.url && options.url !== "") {
@@ -340,7 +345,7 @@ class AddDataViewModel {
       }
 
       if (options.type === "kml") {
-        this.parseService(options);
+        this.parseService(options, cb);
         return;
       }
 
@@ -354,7 +359,7 @@ class AddDataViewModel {
           });
         } else {
           try {
-            this.parseService(options);
+            this.parseService(options, cb);
           } catch {}
         }
       }).catch(() => {
@@ -372,7 +377,7 @@ class AddDataViewModel {
   } //解析服务
 
 
-  parseService(options) {
+  parseService(options, cb) {
     let url = options.url;
     let type = options.type || "";
     type = type.toLowerCase();
@@ -416,6 +421,7 @@ class AddDataViewModel {
 
         this._layerManager.addTempLayerNode(node);
 
+        cb && cb(node);
         break;
 
       case "obterrain":
@@ -441,6 +447,7 @@ class AddDataViewModel {
 
         this._layerManager._terrainProviders.push(layer);
 
+        cb && cb(node);
         break;
 
       case "stkterrain":
@@ -468,6 +475,7 @@ class AddDataViewModel {
 
         this._layerManager._terrainProviders.push(layer);
 
+        cb && cb(node);
         break;
 
       case "3dtiles":
@@ -487,6 +495,7 @@ class AddDataViewModel {
 
         this._layerManager.addTempLayerNode(node);
 
+        cb && cb(node);
         break;
 
       case "kqgis3dserver":
@@ -544,6 +553,8 @@ class AddDataViewModel {
             }
 
             this._layerManager.addTempLayerNode(node);
+
+            cb && cb(node);
           }
         });
 
@@ -566,6 +577,7 @@ class AddDataViewModel {
 
         this._layerManager.addTempLayerNode(node);
 
+        cb && cb(node);
         break;
 
       case "kqgismapserver":
@@ -626,6 +638,8 @@ class AddDataViewModel {
             node.serverType = "imagerylayer";
 
             this._layerManager.addTempLayerNode(node, 1);
+
+            cb && cb(node);
           }, this);
         });
         break;
@@ -646,6 +660,7 @@ class AddDataViewModel {
 
         this._layerManager.addTempLayerNode(node);
 
+        cb && cb(node);
         break;
 
       case "wms":
@@ -674,6 +689,8 @@ class AddDataViewModel {
           }
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
 
         break;
@@ -704,6 +721,8 @@ class AddDataViewModel {
           }
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
 
         break;
@@ -732,6 +751,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(node);
+
+            cb && cb(node);
           });
         });
         break;
@@ -754,6 +775,8 @@ class AddDataViewModel {
           };
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
         break;
 
@@ -777,6 +800,8 @@ class AddDataViewModel {
           };
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
         break;
 
@@ -796,6 +821,8 @@ class AddDataViewModel {
           };
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
         break;
 
@@ -887,6 +914,11 @@ const __default__ = {
     activeName: {
       type: String,
       default: "upload"
+    },
+    // 加载回调函数
+    loadCallback: {
+      type: Function,
+      default: null
     }
   },
 
@@ -1082,7 +1114,7 @@ const __default__ = {
 
     function loadFiles() {
       fileList.value.forEach(file => {
-        viewModel.parseFile(file.raw, removeFile);
+        viewModel.parseFile(file.raw, removeFile, props.loadCallback);
       });
     } //加载URL
 
@@ -1092,7 +1124,7 @@ const __default__ = {
         type: dataSourceType.value.type,
         url: dataSource.url,
         name: dataSource.name
-      });
+      }, props.loadCallback);
     } // 重置
 
 

package/index.js

@@ -1075,16 +1075,13 @@ class LayerManager {
         style: Cesium.LabelStyle.FILL_AND_OUTLINE,
         eyeOffset: Cesium.Cartesian3.ZERO,
         pixelOffset: new Cesium.Cartesian2(0, -8),
-        disableDepthTestDistance: 35000000,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000)
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       billboard: {
         image: const_image_namespaceObject.BILLBOARD_IMAGE_URL,
         width: 12,
         height: 12,
-        disableDepthTestDistance: 35000000,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000),
-        scaleByDistance: new Cesium.NearFarScalar(200000, 1.2, 100000000000, 0.5)
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       polyline: {
         width: 2.0,
@@ -17542,16 +17539,13 @@ class AddDataViewModel {
         style: Cesium.LabelStyle.FILL_AND_OUTLINE,
         eyeOffset: Cesium.Cartesian3.ZERO,
         pixelOffset: new Cesium.Cartesian2(0, -8),
-        disableDepthTestDistance: 35000000,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000)
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       billboard: {
         image: "",
         width: 12,
         height: 12,
-        disableDepthTestDistance: 35000000,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000),
-        scaleByDistance: new Cesium.NearFarScalar(200000, 1.2, 100000000000, 0.5)
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       polyline: {
         width: 2.0,
@@ -17573,7 +17567,7 @@ class AddDataViewModel {
   } //解析文件
 
 
-  parseFile(file, removeFile) {
+  parseFile(file, removeFile, cb) {
     var reader = new FileReader();
     reader.readAsText(file); //文本
     //readAsDataURL(file);  //base64 图片
@@ -17621,6 +17615,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(layer);
+
+            cb && cb(layer);
           });
           break;
 
@@ -17649,6 +17645,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(layer);
+
+            cb && cb(layer);
           });
           break;
 
@@ -17673,6 +17671,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(layer);
+
+            cb && cb(layer);
           });
           break;
 
@@ -17701,6 +17701,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(layer);
+
+            cb && cb(layer);
           });
 
           break;
@@ -17732,7 +17734,7 @@ class AddDataViewModel {
   } //解析数据源
 
 
-  parseDataSource(options) {
+  parseDataSource(options, cb) {
     options = options || {};
 
     if (options.url && options.url !== "") {
@@ -17757,7 +17759,7 @@ class AddDataViewModel {
       }
 
       if (options.type === "kml") {
-        this.parseService(options);
+        this.parseService(options, cb);
         return;
       }
 
@@ -17771,7 +17773,7 @@ class AddDataViewModel {
           });
         } else {
           try {
-            this.parseService(options);
+            this.parseService(options, cb);
           } catch {}
         }
       }).catch(() => {
@@ -17789,7 +17791,7 @@ class AddDataViewModel {
   } //解析服务
 
 
-  parseService(options) {
+  parseService(options, cb) {
     let url = options.url;
     let type = options.type || "";
     type = type.toLowerCase();
@@ -17833,6 +17835,7 @@ class AddDataViewModel {
 
         this._layerManager.addTempLayerNode(node);
 
+        cb && cb(node);
         break;
 
       case "obterrain":
@@ -17858,6 +17861,7 @@ class AddDataViewModel {
 
         this._layerManager._terrainProviders.push(layer);
 
+        cb && cb(node);
         break;
 
       case "stkterrain":
@@ -17885,6 +17889,7 @@ class AddDataViewModel {
 
         this._layerManager._terrainProviders.push(layer);
 
+        cb && cb(node);
         break;
 
       case "3dtiles":
@@ -17904,6 +17909,7 @@ class AddDataViewModel {
 
         this._layerManager.addTempLayerNode(node);
 
+        cb && cb(node);
         break;
 
       case "kqgis3dserver":
@@ -17961,6 +17967,8 @@ class AddDataViewModel {
             }
 
             this._layerManager.addTempLayerNode(node);
+
+            cb && cb(node);
           }
         });
 
@@ -17983,6 +17991,7 @@ class AddDataViewModel {
 
         this._layerManager.addTempLayerNode(node);
 
+        cb && cb(node);
         break;
 
       case "kqgismapserver":
@@ -18043,6 +18052,8 @@ class AddDataViewModel {
             node.serverType = "imagerylayer";
 
             this._layerManager.addTempLayerNode(node, 1);
+
+            cb && cb(node);
           }, this);
         });
         break;
@@ -18063,6 +18074,7 @@ class AddDataViewModel {
 
         this._layerManager.addTempLayerNode(node);
 
+        cb && cb(node);
         break;
 
       case "wms":
@@ -18091,6 +18103,8 @@ class AddDataViewModel {
           }
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
 
         break;
@@ -18121,6 +18135,8 @@ class AddDataViewModel {
           }
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
 
         break;
@@ -18149,6 +18165,8 @@ class AddDataViewModel {
             };
 
             that._layerManager.addTempLayerNode(node);
+
+            cb && cb(node);
           });
         });
         break;
@@ -18171,6 +18189,8 @@ class AddDataViewModel {
           };
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
         break;
 
@@ -18194,6 +18214,8 @@ class AddDataViewModel {
           };
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
         break;
 
@@ -18213,6 +18235,8 @@ class AddDataViewModel {
           };
 
           this._layerManager.addTempLayerNode(node);
+
+          cb && cb(node);
         });
         break;
 
@@ -18304,6 +18328,11 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
     activeName: {
       type: String,
       default: "upload"
+    },
+    // 加载回调函数
+    loadCallback: {
+      type: Function,
+      default: null
     }
   },
 
@@ -18499,7 +18528,7 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
 
     function loadFiles() {
       fileList.value.forEach(file => {
-        viewModel.parseFile(file.raw, removeFile);
+        viewModel.parseFile(file.raw, removeFile, props.loadCallback);
       });
     } //加载URL
 
@@ -18509,7 +18538,7 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
         type: dataSourceType.value.type,
         url: dataSource.url,
         name: dataSource.name
-      });
+      }, props.loadCallback);
     } // 重置
 
 

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"2.3.4-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","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"2.3.5-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","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -600,16 +600,13 @@ class LayerManager {
         style: Cesium.LabelStyle.FILL_AND_OUTLINE,
         eyeOffset: Cesium.Cartesian3.ZERO,
         pixelOffset: new Cesium.Cartesian2(0, -8),
-        disableDepthTestDistance: 35000000,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000)
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       billboard: {
         image: const_image_namespaceObject.BILLBOARD_IMAGE_URL,
         width: 12,
         height: 12,
-        disableDepthTestDistance: 35000000,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 1000000000000),
-        scaleByDistance: new Cesium.NearFarScalar(200000, 1.2, 100000000000, 0.5)
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       polyline: {
         width: 2.0,