@kq_npm/client3d_webgl_vue 4.5.1 → 4.5.2

package/heatmap3d/index.js

@@ -712,7 +712,7 @@ class Heatmap3dViewModel {
     this._heatmap = new Cesium.Kq3dHeatmap3D({
       xField: 'lng',
       yField: 'lat',
-      valueField: this._options.valueField || 'count',
+      valueField: this._options.valueField || this.language["noSet"],
       radius: this._options.radius,
       scene: this._viewer.scene,
       height: this._options.height,
@@ -734,7 +734,7 @@ class Heatmap3dViewModel {
     this._heatmap2d = new Cesium.Kq3dHeatmap2D({
       xField: 'lng',
       yField: 'lat',
-      valueField: this._options.valueField || 'count',
+      valueField: this._options.valueField || this.language["noSet"],
       canvasWidth: 1024,
       canvasHeight: 1024,
       radius: this._options.radius,
@@ -889,7 +889,7 @@ class Heatmap3dViewModel {
       this.initHeatmap2d(this.heatmapData);
     } else {
       (0,message/* default */.Z)({
-        message: "先输入在线json地址或上传文件！",
+        message: this.language["fileTypeMessage"] + "！",
         type: "warning",
         duration: 2000
       });
@@ -1398,6 +1398,8 @@ const __default__ = {
       currentLang.value = proxy.$i18n.locale; // 获取当前语言
       //父组 件ScenceView初始化完成后执行
 
+      weightFields.value = [language.value.noSet];
+      if (!formItem.valueField) formItem.valueField = language.value.noSet;
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           viewModel = new Heatmap3dViewModel(scenceView, formItem);
@@ -1449,7 +1451,16 @@ const __default__ = {
     function getDataByPath() {
       if (formItem && formItem.dataPath) {
         Cesium.Resource.fetchJson(formItem.dataPath).then(res => {
-          if (res && res.features && res.features.length > 0) {
+          if (res && res.features) {
+            if (res.features.length === 0) {
+              (0,message/* default */.Z)({
+                message: "features " + language.value.noDataMessage + "!",
+                type: "warning",
+                duration: 2000
+              });
+              return;
+            }
+
             let heatmapArr = [];
             let bigArray = [];
             res.features.forEach(element => {
@@ -1459,26 +1470,34 @@ const __default__ = {
               heatmapArr.push({
                 lng: element.geometry.coordinates[0],
                 lat: element.geometry.coordinates[1],
-                ...result.newObj
+                ...result.newObj,
+                ...{
+                  noSet: 0
+                }
               });
             });
             let commonArr = commonValues(bigArray);
-            weightFields.value = commonArr;
-
-            if (!formItem.valueField) {
-              formItem.valueField = commonArr[0];
-              paramsChanged("valueField");
-            }
+            weightFields.value = [language.value.noSet].concat(commonArr); // if (!formItem.valueField) {
+            //   formItem.valueField = commonArr[0];
+            //   paramsChanged("valueField");
+            // }
 
             if (viewModel) {
               viewModel.heatmapData = heatmapArr;
               viewModel.start();
             }
+          } else {
+            (0,message/* default */.Z)({
+              message: language.value.geojsonTypeMessage + "！",
+              type: "warning",
+              duration: 2000
+            });
+            return;
           }
         }).otherwise(ret => {
           console.log(ret);
           (0,message/* default */.Z)({
-            message: "数据路径有问题！",
+            message: language.value.dataParsingMessage + "！",
             type: "error",
             duration: 2000
           });
@@ -1486,7 +1505,7 @@ const __default__ = {
         });
       } else {
         (0,message/* default */.Z)({
-          message: "先输入在线json地址或上传文件！",
+          message: language.value.fileTypeMessage + "!",
           type: "warning",
           duration: 2000
         });

package/index.js

@@ -13494,7 +13494,8 @@ class SceneToHDImageViewModel {
       canvas: this._viewer.scene.canvas
     });
     this.resizeExportRegionSize();
-  }
+  } // 重置输出图片尺寸
+
 
   resizeExportRegionSize() {
     document.getElementById('exportPictureRegion').style.width = Number(this._options.imgWidth) * Number(this._options.pantographRatio) + 'px';
@@ -13532,7 +13533,8 @@ class SceneToHDImageViewModel {
 
       this._canvasToImage.saveAsimages(canvas, options);
     }
-  }
+  } // 重新设置场景尺寸
+
 
   scaleCesiumContainer() {
     // var bWidth = document.getElementById(this._viewer._container.id).parentNode.clientWidth,
@@ -13551,7 +13553,8 @@ class SceneToHDImageViewModel {
 
   changeDisplayArea() {
     document.getElementById('exportPictureRegion').style.display = this._options.displayArea ? 'block' : 'none';
-  }
+  } // 调整出图范围尺寸
+
 
   changPantographRatio() {
     this._viewer.container.style.transform = `translate(-50%,-50%) scale(${this._options.pantographRatio})`;
@@ -15872,7 +15875,7 @@ class Heatmap3dViewModel {
     this._heatmap = new Cesium.Kq3dHeatmap3D({
       xField: 'lng',
       yField: 'lat',
-      valueField: this._options.valueField || 'count',
+      valueField: this._options.valueField || this.language["noSet"],
       radius: this._options.radius,
       scene: this._viewer.scene,
       height: this._options.height,
@@ -15894,7 +15897,7 @@ class Heatmap3dViewModel {
     this._heatmap2d = new Cesium.Kq3dHeatmap2D({
       xField: 'lng',
       yField: 'lat',
-      valueField: this._options.valueField || 'count',
+      valueField: this._options.valueField || this.language["noSet"],
       canvasWidth: 1024,
       canvasHeight: 1024,
       radius: this._options.radius,
@@ -16049,7 +16052,7 @@ class Heatmap3dViewModel {
       this.initHeatmap2d(this.heatmapData);
     } else {
       message({
-        message: "先输入在线json地址或上传文件！",
+        message: this.language["fileTypeMessage"] + "！",
         type: "warning",
         duration: 2000
       });
@@ -16552,6 +16555,8 @@ const Heatmap3dvue_type_script_setup_true_lang_js_default_ = {
       currentLang.value = proxy.$i18n.locale; // 获取当前语言
       //父组 件ScenceView初始化完成后执行
 
+      weightFields.value = [language.value.noSet];
+      if (!formItem.valueField) formItem.valueField = language.value.noSet;
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           viewModel = new Heatmap3dViewModel(scenceView, formItem);
@@ -16603,7 +16608,16 @@ const Heatmap3dvue_type_script_setup_true_lang_js_default_ = {
     function getDataByPath() {
       if (formItem && formItem.dataPath) {
         Cesium.Resource.fetchJson(formItem.dataPath).then(res => {
-          if (res && res.features && res.features.length > 0) {
+          if (res && res.features) {
+            if (res.features.length === 0) {
+              message({
+                message: "features " + language.value.noDataMessage + "!",
+                type: "warning",
+                duration: 2000
+              });
+              return;
+            }
+
             let heatmapArr = [];
             let bigArray = [];
             res.features.forEach(element => {
@@ -16613,26 +16627,34 @@ const Heatmap3dvue_type_script_setup_true_lang_js_default_ = {
               heatmapArr.push({
                 lng: element.geometry.coordinates[0],
                 lat: element.geometry.coordinates[1],
-                ...result.newObj
+                ...result.newObj,
+                ...{
+                  noSet: 0
+                }
               });
             });
             let commonArr = commonValues(bigArray);
-            weightFields.value = commonArr;
-
-            if (!formItem.valueField) {
-              formItem.valueField = commonArr[0];
-              paramsChanged("valueField");
-            }
+            weightFields.value = [language.value.noSet].concat(commonArr); // if (!formItem.valueField) {
+            //   formItem.valueField = commonArr[0];
+            //   paramsChanged("valueField");
+            // }
 
             if (viewModel) {
               viewModel.heatmapData = heatmapArr;
               viewModel.start();
             }
+          } else {
+            message({
+              message: language.value.geojsonTypeMessage + "！",
+              type: "warning",
+              duration: 2000
+            });
+            return;
           }
         }).otherwise(ret => {
           console.log(ret);
           message({
-            message: "数据路径有问题！",
+            message: language.value.dataParsingMessage + "！",
             type: "error",
             duration: 2000
           });
@@ -16640,7 +16662,7 @@ const Heatmap3dvue_type_script_setup_true_lang_js_default_ = {
         });
       } else {
         message({
-          message: "先输入在线json地址或上传文件！",
+          message: language.value.fileTypeMessage + "!",
           type: "warning",
           duration: 2000
         });

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.5.1","homepage":"","keywords":["KQGIS","webGL","Vue"],"sdkNames":["@kq_npm/client_icons_vue"],"restrictedVersion":true,"validateSDK":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"@kq_npm/client_icons_vue":"0.8.4-beta","colorcolor":"1.1.1","echarts":"4.9.0","echarts-stat":"1.2.0","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":"4.5.2","homepage":"","keywords":["KQGIS","webGL","Vue"],"sdkNames":["@kq_npm/client_icons_vue"],"restrictedVersion":true,"validateSDK":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"@kq_npm/client_icons_vue":"0.8.5-beta","colorcolor":"1.1.1","echarts":"4.9.0","echarts-stat":"1.2.0","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/scenetohdimage/index.js

@@ -49,7 +49,8 @@ class SceneToHDImageViewModel {
       canvas: this._viewer.scene.canvas
     });
     this.resizeExportRegionSize();
-  }
+  } // 重置输出图片尺寸
+
 
   resizeExportRegionSize() {
     document.getElementById('exportPictureRegion').style.width = Number(this._options.imgWidth) * Number(this._options.pantographRatio) + 'px';
@@ -87,7 +88,8 @@ class SceneToHDImageViewModel {
 
       this._canvasToImage.saveAsimages(canvas, options);
     }
-  }
+  } // 重新设置场景尺寸
+
 
   scaleCesiumContainer() {
     // var bWidth = document.getElementById(this._viewer._container.id).parentNode.clientWidth,
@@ -106,7 +108,8 @@ class SceneToHDImageViewModel {
 
   changeDisplayArea() {
     document.getElementById('exportPictureRegion').style.display = this._options.displayArea ? 'block' : 'none';
-  }
+  } // 调整出图范围尺寸
+
 
   changPantographRatio() {
     this._viewer.container.style.transform = `translate(-50%,-50%) scale(${this._options.pantographRatio})`;

package/sceneview/index.js

@@ -12816,7 +12816,7 @@ class Heatmap3dViewModel {
     this._heatmap = new Cesium.Kq3dHeatmap3D({
       xField: 'lng',
       yField: 'lat',
-      valueField: this._options.valueField || 'count',
+      valueField: this._options.valueField || this.language["noSet"],
       radius: this._options.radius,
       scene: this._viewer.scene,
       height: this._options.height,
@@ -12838,7 +12838,7 @@ class Heatmap3dViewModel {
     this._heatmap2d = new Cesium.Kq3dHeatmap2D({
       xField: 'lng',
       yField: 'lat',
-      valueField: this._options.valueField || 'count',
+      valueField: this._options.valueField || this.language["noSet"],
       canvasWidth: 1024,
       canvasHeight: 1024,
       radius: this._options.radius,
@@ -12993,7 +12993,7 @@ class Heatmap3dViewModel {
       this.initHeatmap2d(this.heatmapData);
     } else {
       (0,message/* default */.Z)({
-        message: "先输入在线json地址或上传文件！",
+        message: this.language["fileTypeMessage"] + "！",
         type: "warning",
         duration: 2000
       });
@@ -13502,6 +13502,8 @@ const __default__ = {
       currentLang.value = proxy.$i18n.locale; // 获取当前语言
       //父组 件ScenceView初始化完成后执行
 
+      weightFields.value = [language.value.noSet];
+      if (!formItem.valueField) formItem.valueField = language.value.noSet;
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           viewModel = new Heatmap3dViewModel(scenceView, formItem);
@@ -13553,7 +13555,16 @@ const __default__ = {
     function getDataByPath() {
       if (formItem && formItem.dataPath) {
         Cesium.Resource.fetchJson(formItem.dataPath).then(res => {
-          if (res && res.features && res.features.length > 0) {
+          if (res && res.features) {
+            if (res.features.length === 0) {
+              (0,message/* default */.Z)({
+                message: "features " + language.value.noDataMessage + "!",
+                type: "warning",
+                duration: 2000
+              });
+              return;
+            }
+
             let heatmapArr = [];
             let bigArray = [];
             res.features.forEach(element => {
@@ -13563,26 +13574,34 @@ const __default__ = {
               heatmapArr.push({
                 lng: element.geometry.coordinates[0],
                 lat: element.geometry.coordinates[1],
-                ...result.newObj
+                ...result.newObj,
+                ...{
+                  noSet: 0
+                }
               });
             });
             let commonArr = commonValues(bigArray);
-            weightFields.value = commonArr;
-
-            if (!formItem.valueField) {
-              formItem.valueField = commonArr[0];
-              paramsChanged("valueField");
-            }
+            weightFields.value = [language.value.noSet].concat(commonArr); // if (!formItem.valueField) {
+            //   formItem.valueField = commonArr[0];
+            //   paramsChanged("valueField");
+            // }
 
             if (viewModel) {
               viewModel.heatmapData = heatmapArr;
               viewModel.start();
             }
+          } else {
+            (0,message/* default */.Z)({
+              message: language.value.geojsonTypeMessage + "！",
+              type: "warning",
+              duration: 2000
+            });
+            return;
           }
         }).otherwise(ret => {
           console.log(ret);
           (0,message/* default */.Z)({
-            message: "数据路径有问题！",
+            message: language.value.dataParsingMessage + "！",
             type: "error",
             duration: 2000
           });
@@ -13590,7 +13609,7 @@ const __default__ = {
         });
       } else {
         (0,message/* default */.Z)({
-          message: "先输入在线json地址或上传文件！",
+          message: language.value.fileTypeMessage + "!",
           type: "warning",
           duration: 2000
         });
@@ -29720,7 +29739,8 @@ class SceneToHDImageViewModel {
       canvas: this._viewer.scene.canvas
     });
     this.resizeExportRegionSize();
-  }
+  } // 重置输出图片尺寸
+
 
   resizeExportRegionSize() {
     document.getElementById('exportPictureRegion').style.width = Number(this._options.imgWidth) * Number(this._options.pantographRatio) + 'px';
@@ -29758,7 +29778,8 @@ class SceneToHDImageViewModel {
 
       this._canvasToImage.saveAsimages(canvas, options);
     }
-  }
+  } // 重新设置场景尺寸
+
 
   scaleCesiumContainer() {
     // var bWidth = document.getElementById(this._viewer._container.id).parentNode.clientWidth,
@@ -29777,7 +29798,8 @@ class SceneToHDImageViewModel {
 
   changeDisplayArea() {
     document.getElementById('exportPictureRegion').style.display = this._options.displayArea ? 'block' : 'none';
-  }
+  } // 调整出图范围尺寸
+
 
   changPantographRatio() {
     this._viewer.container.style.transform = `translate(-50%,-50%) scale(${this._options.pantographRatio})`;