fix: Merge branch 'master' of http://192.168.0.115:3000/bill/kankan-mix

public/lib/potree/potree.js

@@ -4594,10 +4594,11 @@
 	  replaceAll: function replaceAll(str, f, e) {
 	    //f全部替换成e
 
-	    if (str.replaceAll) return str.replaceAll(f, e);else {
-	      var reg = new RegExp(f, "g"); //创建正则RegExp对象  
-	      return str.replace(reg, e); //str.split(f).join(e);
-	    }
+	    /* if(str.replaceAll ) return str.replaceAll(f, e)
+	    else{ */
+	    var reg = new RegExp(f, "g"); //创建正则RegExp对象  
+	    return str.replace(reg, e); //str.split(f).join(e);
+	    //}
 	  },
 	  dealURL(url) {
 	    var urlNew = this.replaceAll(url, "\\+", "%2B"); // 浏览器似乎不支持访问带+的地址
@@ -30397,6 +30398,7 @@
 	          });
 	          this.addEventListener('flyToPanoDone', e => {
 	            //漫游到另一个模型就要选中这个模型
+	            if (!e.makeIt) return;
 	            var model = this.currentPano.pointcloud;
 	            if (model != lastModel) {
 	              this.changeModelMat(lastModel);
@@ -79923,7 +79925,7 @@
 	            fromDataset: true,
 	            quaternion: e.rotInModel,
 	            getQuaternion: true,
-	            model: e.model
+	            object: e.model
 	          });
 	          sections.push(e);
 	        }