@kq_npm/client3d_webgl_vue 4.2.9-beta → 4.3.0

package/comparemap/index.js

@@ -24,13 +24,21 @@ return /******/ (function() { // webpackBootstrap
 class CompareMapViewModel {
   // 三维视图对象
   //三维viewer对象
-  constructor(scenceView) {
+  constructor(scenceView, options = {}) {
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_scenceView", null);
 
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
 
     this._scenceView = scenceView;
     this._viewer = scenceView._viewer;
+
+    if (options.splitLineColor) {
+      this._viewer.scene.splitLineColor = Cesium.Color.fromCssColorString(options.splitLineColor);
+    }
+
+    if (options.splitLineWidth) {
+      this._viewer.scene.splitLineWidth = options.splitLineWidth;
+    }
   } //切换窗口模式
 
 
@@ -452,6 +460,13 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
     defaultSelectAll: {
       type: Boolean,
       default: true
+    },
+    splitLineColor: {
+      type: String
+    },
+    splitLineWidth: {
+      type: Number,
+      default: 2
     }
   },
   emits: ["back"],
@@ -490,7 +505,11 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
       offsetTop.value = props.offsetTop;
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
-          viewModel = new CompareMapViewModel/* default */.Z(scenceView);
+          let options = {
+            splitLineColor: props.splitLineColor,
+            splitLineWidth: props.splitLineWidth
+          };
+          viewModel = new CompareMapViewModel/* default */.Z(scenceView, options);
         }
       });
     }); //切换窗口模式

package/hawkeye/index.js

@@ -32,17 +32,16 @@ class HawkeyeViewModel {
   }
 
   init(options) {
-    if (!options.layers) {
-      // let layers = [];
-      // options.viewer.imageryLayers._layers.forEach(function (layer) {
-      //   layers.push(layer._imageryProvider);
-      // });
-      // options.layers = layers;
-      options.layers = new Cesium.Kq3dArcGISMapServerImageryProvider({
-        url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
-      });
-    }
-
+    // if(!options.layers) {
+    // let layers = [];
+    // options.viewer.imageryLayers._layers.forEach(function (layer) {
+    //   layers.push(layer);
+    // });
+    // options.layers = layers;
+    // options.layers = new Cesium.Kq3dArcGISMapServerImageryProvider({
+    //   url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
+    // });
+    // }
     this._overviewMap = new Cesium.Kq3dOverviewMap(options);
   } //显示
 
@@ -54,6 +53,17 @@ class HawkeyeViewModel {
 
   hide() {
     this._overviewMap.show = false;
+  } // 设置图层
+
+
+  setLayers(layers) {
+    if (Array.isArray(layers)) {
+      this._overviewMap._viewer.imageryLayers.removeAll();
+
+      layers.forEach(layer => {
+        this._overviewMap._viewer.imageryLayers.add(layer);
+      });
+    }
   } //销毁
 
 
@@ -273,6 +283,10 @@ const __default__ = {
 
     function hide() {
       viewModel && viewModel.hide();
+    }
+
+    function setLayers(layers) {
+      viewModel && viewModel.setLayers(layers);
     } // 销毁
 
 
@@ -281,7 +295,8 @@ const __default__ = {
     });
     expose({
       show,
-      hide
+      hide,
+      setLayers
     });
     return (_ctx, _cache) => {
       return null;

package/index.js

@@ -1144,17 +1144,21 @@ class DrawManager {
         color: "#ff0000",
         opacity: 1.0,
         width: 2,
-        dash: false
+        dash: false,
+        clampToGround: true //是否贴地
+
       },
       polygon: {
         color: "#0000ff",
         opacity: 0.3,
         outline: true,
         outlineColor: "#ff0000",
-        outlineWidth: 1,
+        outlineWidth: 2,
         outlineDash: false,
         fill: true,
-        fillStyle: null
+        fillStyle: null,
+        clampToGround: true //是否贴地
+
       }
     });
 
@@ -1538,6 +1542,7 @@ class DrawManager {
             entity.polyline = {
               positions: entity.polygon.hierarchy._value.positions,
               width: style.polygon.outlineWidth,
+              clampToGround: true,
               material: style.polygon.outlineDash ? new Cesium.PolylineDashMaterialProperty({
                 color: style.polygon.outlineColor
               }) : style.polygon.outlineColor
@@ -1559,7 +1564,7 @@ class DrawManager {
         });
       }
 
-      callFun && callFun(that._viewer);
+      callFun && callFun(that._viewer, geojsonData);
     });
   } //删除指定绘图分组的所有图形
 
@@ -1581,6 +1586,8 @@ class DrawManager {
     if (index > -1) {
       this._layerGroup.splice(index, 1);
     }
+
+    if (idCustom === 'draw') this.clear();
   }
 
   getGeometry(idCustom) {
@@ -23910,7 +23917,7 @@ class IsolineAnalysisViewModel {
       });
     } else {
       message({
-        message: "请添加模型后分析!",
+        message: "请添加地形后分析!",
         type: "warning"
       });
     }
@@ -32398,13 +32405,21 @@ WeatherEffect.install = (Vue, opts) => {
 class CompareMapViewModel {
   // 三维视图对象
   //三维viewer对象
-  constructor(scenceView) {
+  constructor(scenceView, options = {}) {
     _defineProperty(this, "_scenceView", null);
 
     _defineProperty(this, "_viewer", null);
 
     this._scenceView = scenceView;
     this._viewer = scenceView._viewer;
+
+    if (options.splitLineColor) {
+      this._viewer.scene.splitLineColor = Cesium.Color.fromCssColorString(options.splitLineColor);
+    }
+
+    if (options.splitLineWidth) {
+      this._viewer.scene.splitLineWidth = options.splitLineWidth;
+    }
   } //切换窗口模式
 
 
@@ -32666,6 +32681,13 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
     defaultSelectAll: {
       type: Boolean,
       default: true
+    },
+    splitLineColor: {
+      type: String
+    },
+    splitLineWidth: {
+      type: Number,
+      default: 2
     }
   },
   emits: ["back"],
@@ -32704,7 +32726,11 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
       offsetTop.value = props.offsetTop;
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
-          viewModel = new CompareMapViewModel(scenceView);
+          let options = {
+            splitLineColor: props.splitLineColor,
+            splitLineWidth: props.splitLineWidth
+          };
+          viewModel = new CompareMapViewModel(scenceView, options);
         }
       });
     }); //切换窗口模式
@@ -33420,17 +33446,16 @@ class HawkeyeViewModel {
   }
 
   init(options) {
-    if (!options.layers) {
-      // let layers = [];
-      // options.viewer.imageryLayers._layers.forEach(function (layer) {
-      //   layers.push(layer._imageryProvider);
-      // });
-      // options.layers = layers;
-      options.layers = new Cesium.Kq3dArcGISMapServerImageryProvider({
-        url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
-      });
-    }
-
+    // if(!options.layers) {
+    // let layers = [];
+    // options.viewer.imageryLayers._layers.forEach(function (layer) {
+    //   layers.push(layer);
+    // });
+    // options.layers = layers;
+    // options.layers = new Cesium.Kq3dArcGISMapServerImageryProvider({
+    //   url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
+    // });
+    // }
     this._overviewMap = new Cesium.Kq3dOverviewMap(options);
   } //显示
 
@@ -33442,6 +33467,17 @@ class HawkeyeViewModel {
 
   hide() {
     this._overviewMap.show = false;
+  } // 设置图层
+
+
+  setLayers(layers) {
+    if (Array.isArray(layers)) {
+      this._overviewMap._viewer.imageryLayers.removeAll();
+
+      layers.forEach(layer => {
+        this._overviewMap._viewer.imageryLayers.add(layer);
+      });
+    }
   } //销毁
 
 
@@ -33528,6 +33564,10 @@ const Hawkeyevue_type_script_setup_true_lang_js_default_ = {
 
     function hide() {
       viewModel && viewModel.hide();
+    }
+
+    function setLayers(layers) {
+      viewModel && viewModel.setLayers(layers);
     } // 销毁
 
 
@@ -33536,7 +33576,8 @@ const Hawkeyevue_type_script_setup_true_lang_js_default_ = {
     });
     expose({
       show,
-      hide
+      hide,
+      setLayers
     });
     return (_ctx, _cache) => {
       return null;

package/isolineanalysis/index.js

@@ -423,7 +423,7 @@ class IsolineAnalysisViewModel {
       });
     } else {
       (0,message/* default */.Z)({
-        message: "请添加模型后分析!",
+        message: "请添加地形后分析!",
         type: "warning"
       });
     }

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.2.9-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"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.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.3.0","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"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.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/sceneview/index.js

@@ -6854,13 +6854,21 @@ ClientPrint.install = (Vue, opts) => {
 class CompareMapViewModel {
   // 三维视图对象
   //三维viewer对象
-  constructor(scenceView) {
+  constructor(scenceView, options = {}) {
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_scenceView", null);
 
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
 
     this._scenceView = scenceView;
     this._viewer = scenceView._viewer;
+
+    if (options.splitLineColor) {
+      this._viewer.scene.splitLineColor = Cesium.Color.fromCssColorString(options.splitLineColor);
+    }
+
+    if (options.splitLineWidth) {
+      this._viewer.scene.splitLineWidth = options.splitLineWidth;
+    }
   } //切换窗口模式
 
 
@@ -7149,6 +7157,13 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
     defaultSelectAll: {
       type: Boolean,
       default: true
+    },
+    splitLineColor: {
+      type: String
+    },
+    splitLineWidth: {
+      type: Number,
+      default: 2
     }
   },
   emits: ["back"],
@@ -7187,7 +7202,11 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
       offsetTop.value = props.offsetTop;
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
-          viewModel = new CompareMapViewModel/* default */.Z(scenceView);
+          let options = {
+            splitLineColor: props.splitLineColor,
+            splitLineWidth: props.splitLineWidth
+          };
+          viewModel = new CompareMapViewModel/* default */.Z(scenceView, options);
         }
       });
     }); //切换窗口模式
@@ -12468,17 +12487,16 @@ class HawkeyeViewModel {
   }
 
   init(options) {
-    if (!options.layers) {
-      // let layers = [];
-      // options.viewer.imageryLayers._layers.forEach(function (layer) {
-      //   layers.push(layer._imageryProvider);
-      // });
-      // options.layers = layers;
-      options.layers = new Cesium.Kq3dArcGISMapServerImageryProvider({
-        url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
-      });
-    }
-
+    // if(!options.layers) {
+    // let layers = [];
+    // options.viewer.imageryLayers._layers.forEach(function (layer) {
+    //   layers.push(layer);
+    // });
+    // options.layers = layers;
+    // options.layers = new Cesium.Kq3dArcGISMapServerImageryProvider({
+    //   url: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'
+    // });
+    // }
     this._overviewMap = new Cesium.Kq3dOverviewMap(options);
   } //显示
 
@@ -12490,6 +12508,17 @@ class HawkeyeViewModel {
 
   hide() {
     this._overviewMap.show = false;
+  } // 设置图层
+
+
+  setLayers(layers) {
+    if (Array.isArray(layers)) {
+      this._overviewMap._viewer.imageryLayers.removeAll();
+
+      layers.forEach(layer => {
+        this._overviewMap._viewer.imageryLayers.add(layer);
+      });
+    }
   } //销毁
 
 
@@ -12597,6 +12626,10 @@ const __default__ = {
 
     function hide() {
       viewModel && viewModel.hide();
+    }
+
+    function setLayers(layers) {
+      viewModel && viewModel.setLayers(layers);
     } // 销毁
 
 
@@ -12605,7 +12638,8 @@ const __default__ = {
     });
     expose({
       show,
-      hide
+      hide,
+      setLayers
     });
     return (_ctx, _cache) => {
       return null;
@@ -12883,7 +12917,7 @@ class IsolineAnalysisViewModel {
       });
     } else {
       (0,message/* default */.Z)({
-        message: "请添加模型后分析!",
+        message: "请添加地形后分析!",
         type: "warning"
       });
     }
@@ -39000,17 +39034,21 @@ class DrawManager {
         color: "#ff0000",
         opacity: 1.0,
         width: 2,
-        dash: false
+        dash: false,
+        clampToGround: true //是否贴地
+
       },
       polygon: {
         color: "#0000ff",
         opacity: 0.3,
         outline: true,
         outlineColor: "#ff0000",
-        outlineWidth: 1,
+        outlineWidth: 2,
         outlineDash: false,
         fill: true,
-        fillStyle: null
+        fillStyle: null,
+        clampToGround: true //是否贴地
+
       }
     });
 
@@ -39394,6 +39432,7 @@ class DrawManager {
             entity.polyline = {
               positions: entity.polygon.hierarchy._value.positions,
               width: style.polygon.outlineWidth,
+              clampToGround: true,
               material: style.polygon.outlineDash ? new Cesium.PolylineDashMaterialProperty({
                 color: style.polygon.outlineColor
               }) : style.polygon.outlineColor
@@ -39415,7 +39454,7 @@ class DrawManager {
         });
       }
 
-      callFun && callFun(that._viewer);
+      callFun && callFun(that._viewer, geojsonData);
     });
   } //删除指定绘图分组的所有图形
 
@@ -39437,6 +39476,8 @@ class DrawManager {
     if (index > -1) {
       this._layerGroup.splice(index, 1);
     }
+
+    if (idCustom === 'draw') this.clear();
   }
 
   getGeometry(idCustom) {