Merge branch 'v1.8.2-dev' of http://192.168.0.115:3000/bill/fuse-code into v1.8.2-dev

src/sdk/cover/index.js

@@ -159,7 +159,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
 
     viewer.addEventListener('webglError', e => {
         console.error('viewer webglError: ' + e)
-        sceneBus.emit('webglError', { msg: e.msg })
+        let memory = '. \n jsHeapSizeLimit：'+ performance.memory.jsHeapSizeLimit/ 1e6 + ', usedJSHeapSize: '+performance.memory.usedJSHeapSize/ 1e6 + '(M)'
+        sceneBus.emit('webglError', { msg: e.msg + memory })
     })
     viewer.compass.setAutoDisplay(true)
 
@@ -795,7 +796,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
                     MergeEditor.transformControls.visible && e.selected && MergeEditor.transformControls.attach(model, e.clickPos) //: MergeEditor.transformControls.detach()
                 }) 
 
- 
+                MergeEditor.modelAdded(model)
                         
                         
                         
@@ -1497,7 +1498,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes }) => {
 
             let aspect = cesAspect || viewer.scene.getActiveCamera().aspect;
             
-            console.log('updateMap', aspect)
+            //console.log('updateMap', aspect)
             
             if (aspect < 1) {
                 let fovy = Math.PI * (viewer.scene.getActiveCamera().fov / 180);