fl-web-component 2.1.16 → 2.1.18

package/packages/utils/StreamLoader.js

@@ -1468,68 +1468,68 @@ export class StreamLoader {
     }
   }
 
-  async getBox({ id, projectId = this.projectId || 0, isDebug }) {
-    // 1. 尝试从 IndexedDB 读取
-    const cached = await this._getFromDB(id, projectId);
-    if (cached && !isDebug) {
-      return cached;
-    }
-
-    const getLegacyBox = async () => {
-      if (!this.modelApi || typeof this.modelApi.getBox !== 'function') {
-        throw new Error('modelApi.getBox is not available');
-      }
-      const res = await this.modelApi.getBox({ id, projectId });
-      if (!res) return null;
-      this._applyPrefixId(res, 'id', id);
-      this._saveToDB(id, res, projectId);
-      return res;
-    };
-
-    // 2. 未配置批次数接口时，兼容旧版一次性请求。
-    if (!this.modelApi || typeof this.modelApi.getMeshBatchCount !== 'function') {
-      return getLegacyBox();
-    }
-
-    // 3. 先获取批次数量，再顺序拉取每一批包围盒数据。
-    let batchResult;
-    try {
-      batchResult = await this.modelApi.getMeshBatchCount({ id, projectId });
-    } catch (error) {
-      const status = error && error.response ? error.response.status : error && error.status;
-      if (status === 404) {
-        return getLegacyBox();
-      }
-      throw error;
-    }
-    const batchCount = Number(
-      batchResult && typeof batchResult === 'object' ? batchResult.index : batchResult
-    );
-    if (!Number.isInteger(batchCount) || batchCount < 0) {
-      throw new Error('Invalid getBox batch count');
-    }
-    if (batchCount === 0) {
-      return [];
-    }
-
-    const boxList = [];
-    for (let index = 0; index < batchCount; index++) {
-      const batch = await this.modelApi.getBox({ id, projectId, index });
-      if (!batch) {
-        throw new Error(`Failed to get box batch: ${index}`);
-      }
-      if (Array.isArray(batch)) {
-        boxList.push(...batch);
-      } else {
-        boxList.push(batch);
-      }
-    }
-
-    // 4. 全部批次成功后统一处理并写入完整缓存。
-    this._applyPrefixId(boxList, 'id', id);
-    this._saveToDB(id, boxList, projectId);
-    return boxList;
-  }
+  async getBox({ id, projectId = this.projectId || 0, isDebug }) {
+    // 1. 尝试从 IndexedDB 读取
+    const cached = await this._getFromDB(id, projectId);
+    if (cached && !isDebug) {
+      return cached;
+    }
+
+    const getLegacyBox = async () => {
+      if (!this.modelApi || typeof this.modelApi.getBox !== 'function') {
+        throw new Error('modelApi.getBox is not available');
+      }
+      const res = await this.modelApi.getBox({ id, projectId });
+      if (!res) return null;
+      this._applyPrefixId(res, 'id', id);
+      this._saveToDB(id, res, projectId);
+      return res;
+    };
+
+    // 2. 未配置批次数接口时，兼容旧版一次性请求。
+    if (!this.modelApi || typeof this.modelApi.getMeshBatchCount !== 'function') {
+      return getLegacyBox();
+    }
+
+    // 3. 先获取批次数量，再顺序拉取每一批包围盒数据。
+    let batchResult;
+    try {
+      batchResult = await this.modelApi.getMeshBatchCount({ id, projectId });
+    } catch (error) {
+      const status = error && error.response ? error.response.status : error && error.status;
+      if (status === 404) {
+        return getLegacyBox();
+      }
+      throw error;
+    }
+    const batchCount = Number(
+      batchResult && typeof batchResult === 'object' ? batchResult.index : batchResult
+    );
+    if (!Number.isInteger(batchCount) || batchCount < 0) {
+      throw new Error('Invalid getBox batch count');
+    }
+    if (batchCount === 0) {
+      return [];
+    }
+
+    const boxList = [];
+    for (let index = 0; index < batchCount; index++) {
+      const batch = await this.modelApi.getBox({ id, projectId, index });
+      if (!batch) {
+        throw new Error(`Failed to get box batch: ${index}`);
+      }
+      if (Array.isArray(batch)) {
+        boxList.push(...batch);
+      } else {
+        boxList.push(batch);
+      }
+    }
+
+    // 4. 全部批次成功后统一处理并写入完整缓存。
+    this._applyPrefixId(boxList, 'id', id);
+    this._saveToDB(id, boxList, projectId);
+    return boxList;
+  }
 
   async handleCameraControlForStream(args) {
     // 性能优化注释：禁用 range 被注释字段的解构声明与初始化

package/src/utils/threejs/measure-angle.js

@@ -27,6 +27,7 @@ var MeasureAngle = function (renderer, scene, camera, width, height, options = {
   // 创建一个辅助平面来捕获鼠标事件
   this.plane = new THREE.Plane(new THREE.Vector3(0, 0, 1), 0);
   this.measureName = 'measureObj';
+  this.mousePoint = null
   // this.POINT_MATERIAL = new THREE.PointsMaterial({ color: 0xff5000, size: 1, opacity: 0.6, transparent: true, depthWrite: false, depthTest: false })
   // this.LINE_MATERIAL = new THREE.LineBasicMaterial({ color: 0xff0000, linewidth: 3, opacity: 0.8, transparent: true, side: THREE.DoubleSide, depthWrite: false, depthTest: false })
 };
@@ -235,6 +236,7 @@ MeasureAngle.prototype = {
     }
     if (_this.pointArray.length >= 3 && !_this.hasTempPoint) return;
     const positionResult = _this.getPosition(e);
+    _this.mousePoint = e;
     if (positionResult) {
       const point = positionResult.point;
       if (_this.hasTempPoint) {
@@ -364,9 +366,13 @@ MeasureAngle.prototype = {
     }
   },
   close(isClear) {
+    if (this.mousePoint) {
+      this.rightClick(this.mousePoint)
+      this.mousePoint = null
+    }
     this.renderer.domElement.removeEventListener('mouseup', this.click, false);
     this.renderer.domElement.removeEventListener('mousedown', this.mousedown, false);
-    this.renderer.domElement.removeEventListener('mousemove', this.mousemove, false);
+    // this.renderer.domElement.removeEventListener('mousemove', this.mousemove, false);
     this.renderer.domElement.removeEventListener('contextmenu', this.rightClick, false);
     if (!isClear) {
       this.remove(this.points);

package/src/utils/threejs/measure-area.js

@@ -25,6 +25,7 @@ var MeasureArea = function (renderer, scene, camera, width, height, options = {}
   this.height = height;
   this.firstTime = 0;
   this.measureName = 'measureObj';
+  this.mousePoint = null;
   // 创建一个辅助平面来捕获鼠标事件
   this.plane = new THREE.Plane(new THREE.Vector3(0, 0, 1), 0);
 };
@@ -209,6 +210,7 @@ MeasureArea.prototype = {
   mousemove(e) {
     if (_this.isCompleted || _this.pointArray.length === 0) return;
     const positionResult = _this.getPosition(e);
+    _this.mousePoint = e;
     if (positionResult) {
       const point = positionResult.point;
       if (_this.hasTempPoint) {
@@ -328,9 +330,13 @@ MeasureArea.prototype = {
     }
   },
   close(isClear) {
+    if (this.mousePoint) {
+      this.rightClick(this.mousePoint)
+      this.mousePoint = null
+    }
     this.renderer.domElement.removeEventListener('mouseup', this.click);
     this.renderer.domElement.removeEventListener('mousedown', this.mousedown);
-    this.renderer.domElement.removeEventListener('mousemove', this.mousemove);
+    // this.renderer.domElement.removeEventListener('mousemove', this.mousemove);
     this.renderer.domElement.removeEventListener('contextmenu', this.rightClick);
     if (!isClear) {
       this.remove(this.points);

package/src/utils/threejs/measure-distance.js

@@ -25,6 +25,7 @@ var MeasureDistance = function (renderer, scene, camera, width, height, options
   this.measureName = 'measureObj';
   // 创建一个辅助平面来捕获鼠标事件
   this.plane = new THREE.Plane(new THREE.Vector3(0, 0, 1), 0);
+  this.mousePoint = null
 };
 
 MeasureDistance.prototype = {
@@ -186,6 +187,7 @@ MeasureDistance.prototype = {
   },
   mousemove(e) {
     if (_this.isCompleted || _this.pointArray.length === 0) return;
+    _this.mousePoint = e;
     const positionResult = _this.getPosition(e);
     if (positionResult) {
       const point = positionResult.point;
@@ -328,9 +330,12 @@ MeasureDistance.prototype = {
     }
   },
   close(isClear) {
+    console.log(this.mousePoint)
+    if (this.mousePoint) {
+      this.rightClick(this.mousePoint)
+    }
     this.renderer.domElement.removeEventListener('mousedown', this.mousedown);
     this.renderer.domElement.removeEventListener('mouseup', this.click);
-    this.renderer.domElement.removeEventListener('mousemove', this.mousemove);
     this.renderer.domElement.removeEventListener('contextmenu', this.rightClick);
     if (!isClear) {
       this.remove(this.points);