@mapgis/webclient-vue-cesium 16.2.0 → 16.2.1

package/src/components/Overlay/mapv/MapvLayer.js

@@ -1,4 +1,4 @@
-import {MapvBaseLayer} from "./MapvBaseLayer";
+import { MapvBaseLayer } from "./MapvBaseLayer";
 
 let idIndex = 0;
 
@@ -89,7 +89,7 @@ export class MapvLayer {
   }
 
   initDevicePixelRatio() {
-    this.devicePixelRatio = window.devicePixelRatio || 1;
+    this.devicePixelRatio = 1;
   }
 
   addInnerContainer() {
@@ -296,94 +296,100 @@ export class MapvLayer {
     return this;
   }
 
-    _createCanvas() {
-        var canvas = document.createElement("canvas");
-        canvas.id = this.mapVOptions.layerid || "mapv" + idIndex++;
-        canvas.style.position = "absolute";
-        canvas.style.top = "0px";
-        canvas.style.left = "0px";
-
-        canvas.style.pointerEvents = "none";
-        canvas.style.zIndex = this.mapVOptions.zIndex || 100;
-
-        if (window.Cesium.VERSION > 1.59) {
-            if (this.mapVOptions.draw === "cluster" || this.mapVOptions.draw === "heatmap") {
-                canvas.width =
-                    parseInt(this.map.canvas.width) * this.devicePixelRatio ||
-                    parseInt(this.map.container.offsetWidth);
-                canvas.height =
-                    parseInt(this.map.canvas.height) * this.devicePixelRatio ||
-                    parseInt(this.map.container.offsetHeight);
-            } else {
-                canvas.width =
-                    parseInt(this.map.canvas.width) ||
-                    parseInt(this.map.container.offsetWidth);
-                canvas.height =
-                    parseInt(this.map.canvas.height) ||
-                    parseInt(this.map.container.offsetHeight);
-            }
-        } else {
-            canvas.width =
-                parseInt(this.map.canvas.width) ||
-                parseInt(this.map.container.offsetWidth) * this.devicePixelRatio;
-            canvas.height =
-                parseInt(this.map.canvas.height) ||
-                parseInt(this.map.container.offsetHeight) * this.devicePixelRatio;
-            var devicePixelRatio = this.devicePixelRatio;
-            if (this.mapVOptions.context == "2d") {
-                canvas.getContext("2d").scale(devicePixelRatio, devicePixelRatio);
-            }
-        }
-        return canvas;
+  _createCanvas() {
+    var canvas = document.createElement("canvas");
+    canvas.id = this.mapVOptions.layerid || "mapv" + idIndex++;
+    canvas.style.position = "absolute";
+    canvas.style.top = "0px";
+    canvas.style.left = "0px";
+
+    canvas.style.pointerEvents = "none";
+    canvas.style.zIndex = this.mapVOptions.zIndex || 100;
+
+    if (window.Cesium.VERSION > 1.59) {
+      if (
+        this.mapVOptions.draw === "cluster" ||
+        this.mapVOptions.draw === "heatmap"
+      ) {
+        canvas.width =
+          parseInt(this.map.canvas.width) * this.devicePixelRatio ||
+          parseInt(this.map.container.offsetWidth);
+        canvas.height =
+          parseInt(this.map.canvas.height) * this.devicePixelRatio ||
+          parseInt(this.map.container.offsetHeight);
+      } else {
+        canvas.width =
+          parseInt(this.map.canvas.width) ||
+          parseInt(this.map.container.offsetWidth);
+        canvas.height =
+          parseInt(this.map.canvas.height) ||
+          parseInt(this.map.container.offsetHeight);
+      }
+    } else {
+      canvas.width =
+        parseInt(this.map.canvas.width) ||
+        parseInt(this.map.container.offsetWidth) * this.devicePixelRatio;
+      canvas.height =
+        parseInt(this.map.canvas.height) ||
+        parseInt(this.map.container.offsetHeight) * this.devicePixelRatio;
+      var devicePixelRatio = this.devicePixelRatio;
+      if (this.mapVOptions.context == "2d") {
+        canvas.getContext("2d").scale(devicePixelRatio, devicePixelRatio);
+      }
     }
+    return canvas;
+  }
 
-    _creteWidgetCanvas() {
-        var canvas = document.createElement("canvas");
-
-        canvas.id = this.mapVOptions.layerid || "mapv" + idIndex++;
-        canvas.style.position = "absolute";
-        canvas.style.top = "0px";
-        canvas.style.left = "0px";
-
-        canvas.style.pointerEvents = "none";
-        canvas.style.zIndex = this.mapVOptions.zIndex || 100;
-        if (window.Cesium.VERSION > 1.59) {
-            if (this.mapVOptions.draw === "cluster" || this.mapVOptions.draw === "heatmap") {
-                canvas.width =
-                    parseInt(this.map.canvas.width) * this.devicePixelRatio ||
-                    parseInt(this.map.container.offsetWidth);
-                canvas.height =
-                    parseInt(this.map.canvas.height) * this.devicePixelRatio ||
-                    parseInt(this.map.container.offsetHeight);
-            } else {
-                canvas.width =
-                    parseInt(this.map.canvas.width) ||
-                    parseInt(this.map.container.offsetWidth);
-                canvas.height =
-                    parseInt(this.map.canvas.height) ||
-                    parseInt(this.map.container.offsetHeight);
-            }
-        } else {
-            canvas.width =
-                parseInt(this.map.canvas.width) ||
-                parseInt(this.map.container.offsetWidth) * this.devicePixelRatio;
-            canvas.height =
-                parseInt(this.map.canvas.height) ||
-                parseInt(this.map.container.offsetHeight) * this.devicePixelRatio;
-            var devicePixelRatio = this.devicePixelRatio;
-            if (this.mapVOptions.context == "2d") {
-                canvas.getContext("2d").scale(devicePixelRatio, devicePixelRatio);
-            }
-        }
-        return canvas;
+  _creteWidgetCanvas() {
+    var canvas = document.createElement("canvas");
+
+    canvas.id = this.mapVOptions.layerid || "mapv" + idIndex++;
+    canvas.style.position = "absolute";
+    canvas.style.top = "0px";
+    canvas.style.left = "0px";
+
+    canvas.style.pointerEvents = "none";
+    canvas.style.zIndex = this.mapVOptions.zIndex || 100;
+    if (window.Cesium.VERSION > 1.59) {
+      if (
+        this.mapVOptions.draw === "cluster" ||
+        this.mapVOptions.draw === "heatmap"
+      ) {
+        canvas.width =
+          parseInt(this.map.canvas.width) * this.devicePixelRatio ||
+          parseInt(this.map.container.offsetWidth);
+        canvas.height =
+          parseInt(this.map.canvas.height) * this.devicePixelRatio ||
+          parseInt(this.map.container.offsetHeight);
+      } else {
+        canvas.width =
+          parseInt(this.map.canvas.width) ||
+          parseInt(this.map.container.offsetWidth);
+        canvas.height =
+          parseInt(this.map.canvas.height) ||
+          parseInt(this.map.container.offsetHeight);
+      }
+    } else {
+      canvas.width =
+        parseInt(this.map.canvas.width) ||
+        parseInt(this.map.container.offsetWidth) * this.devicePixelRatio;
+      canvas.height =
+        parseInt(this.map.canvas.height) ||
+        parseInt(this.map.container.offsetHeight) * this.devicePixelRatio;
+      var devicePixelRatio = this.devicePixelRatio;
+      if (this.mapVOptions.context == "2d") {
+        canvas.getContext("2d").scale(devicePixelRatio, devicePixelRatio);
+      }
     }
+    return canvas;
+  }
 
-    _reset() {
-        this.resizeCanvas();
-        this.fixPosition();
-        this.onResize();
-        this.render();
-    }
+  _reset() {
+    this.resizeCanvas();
+    this.fixPosition();
+    this.onResize();
+    this.render();
+  }
 
   /**
    * 强制重回图层
@@ -441,44 +447,47 @@ export class MapvLayer {
     this.updateData(opt.data, opt.options);
   }
 
-    resizeCanvas() {
-        //this.mapContainer.style.perspective = this.map.transform.cameraToCenterDistance + 'px';
-        if (this.canvas == undefined || this.canvas == null) return;
-        var canvas = this.canvas;
-        canvas.style.position = "absolute";
-        canvas.style.top = "0px";
-        canvas.style.left = "0px";
-        canvas.style.width = parseInt(this.map.container.offsetWidth) + "px";
-        canvas.style.height = parseInt(this.map.container.offsetHeight) + "px";
-        if (window.Cesium.VERSION > 1.59) {
-            if (this.mapVOptions.draw === "cluster" || this.mapVOptions.draw === "heatmap") {
-                canvas.width =
-                    parseInt(this.map.canvas.width) * this.devicePixelRatio ||
-                    parseInt(this.map.container.offsetWidth);
-                canvas.height =
-                    parseInt(this.map.canvas.height) * this.devicePixelRatio ||
-                    parseInt(this.map.container.offsetHeight);
-            } else {
-                canvas.width =
-                    parseInt(this.map.canvas.width) ||
-                    parseInt(this.map.container.offsetWidth);
-                canvas.height =
-                    parseInt(this.map.canvas.height) ||
-                    parseInt(this.map.container.offsetHeight);
-            }
-        } else {
-            canvas.width =
-                parseInt(this.map.canvas.width) ||
-                parseInt(this.map.container.offsetWidth) * this.devicePixelRatio;
-            canvas.height =
-                parseInt(this.map.canvas.height) ||
-                parseInt(this.map.container.offsetHeight) * this.devicePixelRatio;
-            var devicePixelRatio = this.devicePixelRatio;
-            if (this.mapVOptions.context == "2d") {
-                canvas.getContext("2d").scale(devicePixelRatio, devicePixelRatio);
-            }
-        }
+  resizeCanvas() {
+    //this.mapContainer.style.perspective = this.map.transform.cameraToCenterDistance + 'px';
+    if (this.canvas == undefined || this.canvas == null) return;
+    var canvas = this.canvas;
+    canvas.style.position = "absolute";
+    canvas.style.top = "0px";
+    canvas.style.left = "0px";
+    canvas.style.width = parseInt(this.map.container.offsetWidth) + "px";
+    canvas.style.height = parseInt(this.map.container.offsetHeight) + "px";
+    if (window.Cesium.VERSION > 1.59) {
+      if (
+        this.mapVOptions.draw === "cluster" ||
+        this.mapVOptions.draw === "heatmap"
+      ) {
+        canvas.width =
+          parseInt(this.map.canvas.width) * this.devicePixelRatio ||
+          parseInt(this.map.container.offsetWidth);
+        canvas.height =
+          parseInt(this.map.canvas.height) * this.devicePixelRatio ||
+          parseInt(this.map.container.offsetHeight);
+      } else {
+        canvas.width =
+          parseInt(this.map.canvas.width) ||
+          parseInt(this.map.container.offsetWidth);
+        canvas.height =
+          parseInt(this.map.canvas.height) ||
+          parseInt(this.map.container.offsetHeight);
+      }
+    } else {
+      canvas.width =
+        parseInt(this.map.canvas.width) ||
+        parseInt(this.map.container.offsetWidth) * this.devicePixelRatio;
+      canvas.height =
+        parseInt(this.map.canvas.height) ||
+        parseInt(this.map.container.offsetHeight) * this.devicePixelRatio;
+      var devicePixelRatio = this.devicePixelRatio;
+      if (this.mapVOptions.context == "2d") {
+        canvas.getContext("2d").scale(devicePixelRatio, devicePixelRatio);
+      }
     }
+  }
 
   fixPosition() {}
 

package/src/components/Overlay/particle/ParticleEffects.vue

@@ -149,6 +149,7 @@
               class="mapgis-ui-number-style"
               size="large"
               label="发射速率(个/秒)"
+              :range="[2, 60]"
               v-model="emissionRateCopy"
               @change="val => onChangeEffect(val, 'emissionRate')"
             />

package/src/components/Overlay/themeLayer/M3DSubSectionLayer.vue

@@ -1,3 +1,7 @@
+<template>
+  <div></div>
+</template>
+
 <script>
 import VueOptions from "../../Base/Vue/VueOptions";
 export default {

package/src/components/SceneEffect/components/BasicSetting.vue

@@ -456,9 +456,17 @@ export default {
 
     handleChangeStatebar(next) {
       // console.log(next);
+      const { viewer } = this;
       this.basicSetting.statebar = next;
       const vm = this;
-
+      viewer.statebar = this.basicSetting.statebar;
+      let statebars = document.getElementsByClassName("mapgis-3d-statebar")
+      if(viewer.statebar){
+        statebars[0].style.display="block"
+      }else{
+        statebars[0].style.display="none"
+      }
+      
       // 改变状态栏的上下位置
       if (vm.basicSetting.timeline) {
         vm.$nextTick(function() {

package/src/components/SceneEffect/components/LightSetting.vue

@@ -8,7 +8,7 @@
     >
       <mapgis-ui-form layout="vertical">
         <mapgis-ui-form-item label="光照类型">
-          <mapgis-ui-select v-model="lightingMode">
+          <mapgis-ui-select v-model="lightingModes[0].key">
             <mapgis-ui-select-option :value="'DAYNIGHT_SHADING'">
               太阳光照
             </mapgis-ui-select-option>

package/src/components/UI/Popup/components/PopupFeatureDetail.vue

@@ -264,7 +264,7 @@ export default {
     getFileTypeByName(name) {
       const typeArr = name.split(".");
       if (typeArr && typeArr.length > 1) {
-        return typeArr[1];
+        return typeArr[typeArr.length-1];
       }
       return "";
     }

package/src/components/WebGlobe/ViewpointManager.vue

@@ -622,9 +622,9 @@ export default {
   ::v-deep .mapgis-ui-collapse-content-box {
     padding: 0;
   }
-  ::v-deep .mapgis-ui-collapse .mapgis-ui-collapse-item {
-    border-bottom: 0;
-  }
+  // ::v-deep .mapgis-ui-collapse .mapgis-ui-collapse-item {
+  //   border-bottom: 0;
+  // }
   ::v-deep
     .mapgis-ui-collapse
     > .mapgis-ui-collapse-item-active
@@ -676,14 +676,16 @@ export default {
         height: 25px;
         line-height: 25px;
         border: 1px solid var(--border-color-base);
-        background-color: var(--border-color-base);
+        // background-color: var(--border-color-base);
         border-top: 0;
-        color: #6296ff;
+        // color: #6296ff;
         cursor: pointer;
+        background-color: var(--primary-6);
+        color: var(--btn-primary-color);
       }
-      span:hover {
-        color: #3b7cff;
-      }
+      // span:hover {
+      //   color: #3b7cff;
+      // }
     }
   }
   ::v-deep .mapgis-ui-collapse-header {

package/src/components/WebGlobe/manager.js

@@ -145,7 +145,7 @@ export function initVueCesium() {
     window.vueCesium.CompareManager || new CompareManager();
 
   //在window.vueCesium下添加取得WebGlobe对象的方法
-  window.vueCesium.getViewer = function(vueKey) {
+  window.vueCesium.getViewer = function (vueKey) {
     if (!vueKey) {
       vueKey = "default";
     }
@@ -160,13 +160,13 @@ export function initVueCesium() {
    * @param callback 回调函数
    * @param vueKey vueKey，唯一标识webscene组件
    * */
-  window.vueCesium.getViewerByInterval = function(callback, vueKey) {
+  window.vueCesium.getViewerByInterval = function (callback, vueKey) {
     if (!vueKey) {
       vueKey = "default";
     }
     let ViewerManager = window.vueCesium.ViewerManager,
       viewer;
-    let interval = setInterval(function() {
+    let interval = setInterval(function () {
       if (
         ViewerManager.hasOwnProperty(vueKey) &&
         ViewerManager[vueKey].length > 0
@@ -196,7 +196,7 @@ export class BaseManager {
       parent: vueKey,
       key: vueIndex,
       source: source,
-      options: options
+      options: options,
     });
   }
 
@@ -283,7 +283,7 @@ export class BaseManager {
     if (find) {
       findSource = {
         ...find,
-        index: index
+        index: index,
       };
     }
     return findSource;
@@ -296,7 +296,7 @@ export class BaseManager {
 
   flatAllSource() {
     let flat = [];
-    Object.keys(this).forEach(k => {
+    Object.keys(this).forEach((k) => {
       if (k !== "vueKey") {
         flat = flat.concat(this[k]);
       }