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

public/lib/potree/potree.js

@@ -42299,7 +42299,7 @@
 	        this.edge.addEventListener('mouseleave', mouseleave);
 	        this.edge.addEventListener('click', e => {
 	          var now = Date.now();
-	          if (now - this.lastDropTime < 100 || this.isNew) return; //防止拖拽marker时误触导致focus, 以及点到marker不focus
+	          if (now - this.lastDropTime < 100 || this.isNew || e.button !== MOUSE.LEFT) return; //防止拖拽marker时误触导致focus, 以及点到marker不focus
 
 	          if (this.addOrRemovePoint) {
 	            viewer.measuringTool.history.beforeChange(this);
@@ -43318,6 +43318,7 @@
 	        }
 	      },
 	      getData: measure => {
+	        if (measure.points.length == 0) return; //没有点的话changeByHistory报错， 得有点可以移动
 	        var data = {
 	          measure,
 	          points: measure.points.map(e => e.clone()),
@@ -86625,12 +86626,21 @@
 	      }
 	      var info = {};
 	      if (fetchMethod == 'post') info.method = 'POST';
-	      var response = await fetch(path, info);
-	      var text = await response.text();
-	      var data = params.returnText ? text : JSON.parse(text);
-	      if (data.data) data = data.data;
-	      callback && callback(data);
-	      return data;
+	      if (Potree.fileStorage) {
+	        //本地直接获取
+	        Potree.fileStorage.get(path).then(data => {
+	          if (data.data) data = data.data;
+	          if (data.data) data = data.data; //融合页面getdataset需要查找两次data
+	          callback && callback(data);
+	        }).catch(onError);
+	      } else {
+	        var response = await fetch(path, info);
+	        var text = await response.text();
+	        var data = params.returnText ? text : JSON.parse(text);
+	        if (data.data) data = data.data;
+	        callback && callback(data);
+	        return data;
+	      }
 	    } catch (e) {
 	      console.log('loadFile出错', e);
 	      onError && onError(e);
@@ -86928,7 +86938,7 @@
 
 	//目前上传平面图后如果不点击保存按钮，数据还是旧的不生效
 	async function loadMapEntity(datasetId, force) {
-	  if (!Potree.settings.floorplanEnable && !force && Potree.fileServer) return; /* 等待平面图类型定义好会加载 */
+	  if (!Potree.settings.floorplanEnable && !force && (Potree.fileServer || Potree.fileStorage)) return; /* 等待平面图类型定义好会加载 */
 
 	  var loaded = 0;
 	  var needLoads = datasetId == 'all' ? viewer.scene.pointclouds.map(e => e.dataset_id) : [datasetId];
@@ -86972,7 +86982,7 @@
 	  var path;
 	  number = number || Potree.settings.number;
 	  //let query = `?datasetId=${datasetId}`                  //`?lat=${center.lat}&lon=${center.lon}&radius=200000`
-	  if (Potree.fileServer) {
+	  if (Potree.fileServer && !Potree.settings.mergeType) {
 	    path = "/laser/filter/".concat(number, "/query");
 	  } /* else if(Potree.settings.mergeType2){ //每个场景只加载初始数据集
 	       path = `${Potree.settings.urls.prefix}/laser/filter/${number}/query` 

src/sdk/cover/index.js

@@ -43,7 +43,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
         Potree.settings.webSite = 'datav1'
     }
     if(window.offline){//离线版 
-        Potree.fileServer = {
+        Potree.fileStorage = { 
             get(url){
                 return new Promise(function(resolve,reject){
                     let data = window.offlineData[url]