@xtctwins/tctwins-bimx-viewer 0.1.11 → 0.1.12

package/dist/tctwins-bimx-viewer.min.es.js

@@ -13274,7 +13274,7 @@ this._ignoreNextSectionPlaneDirUpdate=false;this._createNodes();this._bindEvents
 	 */},{key:"sectionPlane",get:function get(){return this._sectionPlane;}/**
 	 * 设置剖切面位置
 	 * @param {any} value
-	 */},{key:"pos",get:function get(){return this.posRate;},set:function set(posRate){if(posRate<0||posRate>100)return;var aabb=this._scene.aabb;var center=this._scene.center;var xRange=aabb[3]-aabb[0];//前后
+	 */},{key:"pos",get:function get(){return this._pos;},set:function set(posRate){if(posRate<0||posRate>100)return;var aabb=this._scene.aabb;var center=this._scene.center;var xRange=aabb[3]-aabb[0];//前后
 var yRange=aabb[4]-aabb[1];//上下
 var zRange=aabb[5]-aabb[2];//左右
 var newSectionPos=math.vec3();newSectionPos[0]=this.pos[0];newSectionPos[1]=this.pos[1];newSectionPos[2]=this.pos[2];var dir=this._sectionPlane.dir;var rateDis;if(dir[0]!=0){rateDis=posRate/100*xRange;newSectionPos[0]=center[0]-xRange/2+rateDis;}else if(dir[1]!=0){rateDis=posRate/100*yRange;newSectionPos[1]=center[1]-yRange/2+rateDis;}else if(dir[2]!=0){rateDis=posRate/100*zRange;newSectionPos[2]=center[2]-zRange/2+rateDis;}this._sectionPlane.pos=newSectionPos;}},{key:"posRate",get:function get(){var aabb=this._scene.aabb;var center=this._scene.center;var xRange=aabb[3]-aabb[0];// 前后
@@ -13583,7 +13583,7 @@ var sectionPlane=new SectionPlane(this.viewer.scene,{id:params.id,pos:params.pos
 	 */},{key:"setControlPos",value:function setControlPos(posRate){if(this._currentControl==null)return;this._currentControl.pos=posRate;}/**
 	 * 获取剖切面位置
 	 * @returns
-	 */},{key:"getControlPos",value:function getControlPos(){if(this._currentControl==null)return-1;return this._currentControl.pos;}/**
+	 */},{key:"getControlPos",value:function getControlPos(){if(this._currentControl==null)return-1;return this._currentControl.posRate;}/**
 	 * Inverts the direction of {@link SectionPlane#dir} on every existing SectionPlane.
 	 *
 	 * Inverts all SectionPlanes, including those that were not created with SectionPlanesPlugin.
@@ -69942,9 +69942,6 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
         this._modelsExplorer.on("modelUnloaded", (modelId) => {
             this.fire("modelUnloaded", modelId);
         });
-        this._resetAction.on("reset", () => {
-            this.fire("reset", true);
-        });
         this._mutexActivation([this._hideTool, this._sectionTool, this._annotationTool]);
         // this._initConfigs();
         this._initSingleClickEvent();
@@ -70780,6 +70777,10 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
                 callback();
         });
     }
+    closeAll() {
+        this.fire("closeAll", true);
+        this.disableClickEvent = false;
+    }
     /**
      * 销毁
      */
@@ -71284,16 +71285,6 @@ class BIMXViewer extends _Controller__WEBPACK_IMPORTED_MODULE_3__["default"] {
         if (callback)
             callback();
     }
-    /**
-     * 框选开关
-     * @param active
-     * @param callback
-     */
-    SetMarqueeSelectionActive(active, callback = () => { }) {
-        // this._marqueeSelectionTool.setActive(active);
-        if (callback)
-            callback();
-    }
     /**
      * 相机视角开关
      * @param active
@@ -72059,9 +72050,6 @@ class ClassesExplorer extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"
                 this._treeView.removeModel(modelId);
             }
         });
-        this.bimViewer.on("reset", () => {
-            // this._treeView.collapse();
-        });
     }
     get rootNode() {
         return this._rootNode;
@@ -72586,7 +72574,6 @@ class ObjectsExplorer extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"
                 this._treeView.removeModel(modelId);
             }
         });
-        this.bimViewer.on("reset", () => { });
     }
     get rootNode() {
         return this._rootNode;
@@ -72713,7 +72700,6 @@ class StoreysExplorer extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"
                 this._treeView.removeModel(modelId);
             }
         });
-        this.bimViewer.on("reset", () => { });
     }
     get rootNode() {
         return this._rootNode;
@@ -73667,7 +73653,7 @@ class AnnotationTool extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"]
                 iconType: ""
             }
         });
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             this.setActive(false);
         });
         this.on("active", (active) => {
@@ -73995,7 +73981,7 @@ class CommentsTool extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"] {
                 this.endCommentsTool();
             }
         });
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             this.setActive(false);
         });
         this.initEventListeners();
@@ -75975,7 +75961,7 @@ class FirstPersonMode extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"
                 // cameraControl.pivoting = true;
             }
         });
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             this.setActive(false);
         });
         // this.smallCanvas();
@@ -76138,9 +76124,9 @@ __webpack_require__.r(__webpack_exports__);
  */
 class HideTool extends _Controller__WEBPACK_IMPORTED_MODULE_0__["default"] {
     /**
-       * @param {*} parent
-       * @param {*} cfg
-       */
+     * @param {*} parent
+     * @param {*} cfg
+     */
     constructor(parent, cfg) {
         super(parent, cfg);
         this.on("active", (active) => {
@@ -76161,7 +76147,7 @@ class HideTool extends _Controller__WEBPACK_IMPORTED_MODULE_0__["default"] {
                 }
             }
         });
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             this.setActive(false);
         });
     }
@@ -76202,7 +76188,7 @@ class MeasureTool extends _Controller__WEBPACK_IMPORTED_MODULE_0__["default"] {
                 this._measure_distance_tool.setEnabled(false);
             }
         });
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             this.setActive(false);
         });
     }
@@ -76302,7 +76288,7 @@ class MeasureAngleTool extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default
             offsetY: cfg.offsetY
         });
         this._angleMeasurementsMouseControl.snapping = true;
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             this.setActive(false);
         });
         this.on("active", (active) => {
@@ -76654,7 +76640,7 @@ class MeasureDistanceTool extends _Controller__WEBPACK_IMPORTED_MODULE_1__["defa
             offsetY: cfg.offsetY
         });
         this._distanceMeasurementsMouseControl.snapping = true;
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             this.setActive(false);
         });
         this.on("active", (active) => {
@@ -77088,13 +77074,13 @@ __webpack_require__.r(__webpack_exports__);
  */
 class OrthoMode extends _Controller__WEBPACK_IMPORTED_MODULE_0__["default"] {
     /**
-       * 创建一个正交模式对象
-       * @param {*} parent
-       * @param {*} cfg
-       */
+     * 创建一个正交模式对象
+     * @param {*} parent
+     * @param {*} cfg
+     */
     constructor(parent, cfg) {
         super(parent, cfg);
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             this.setActive(false);
         });
         this.viewer.camera.on("projection", () => {
@@ -77104,9 +77090,9 @@ class OrthoMode extends _Controller__WEBPACK_IMPORTED_MODULE_0__["default"] {
         this._active = false;
     }
     /**
-       * @param {boolean} active
-       * @param {Function} done
-       */
+     * @param {boolean} active
+     * @param {Function} done
+     */
     setActive(active, done = () => { }) {
         if (this._active === active) {
             if (done) {
@@ -77234,7 +77220,6 @@ class ResetAction extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"] {
         //   this._restoreModelMemento(modelId);
         // });
         // this.bimViewer.unShowObjectInExplorers();
-        this.fire("reset", true);
         this._resetCamera(callback);
     }
     _resetCamera(callback) {
@@ -77324,7 +77309,7 @@ class SectionTool extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"] {
                 this.clear();
             }
         });
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             this.clear();
             this.setActive(false);
         });
@@ -77588,10 +77573,6 @@ class ShowSpacesMode extends _Controller__WEBPACK_IMPORTED_MODULE_0__["default"]
      */
     constructor(parent, cfg) {
         super(parent, cfg);
-        // this.bimViewer.on("reset", () => {
-        //   // IfcSpaces hidden by default
-        //   this.setActive(false);
-        // });
         this._active = true;
         parent.eventTrigger.on("metaLoaded", (returnData) => {
             // 将空间对象设为半透明
@@ -77688,7 +77669,7 @@ class ThreeDMode extends _Controller__WEBPACK_IMPORTED_MODULE_1__["default"] {
         this._saveOrthoActive = null;
         this._cameraControlNavModeMediator = cfg.cameraControlNavModeMediator;
         this._active = false;
-        this.bimViewer.on("reset", () => {
+        this.bimViewer.on("closeAll", () => {
             // Animated
             this.setActive(true, () => { });
         });

package/dist/version.d.ts

@@ -1,2 +1,2 @@
 
-export const VERSION = "0.1.11";
+export const VERSION = "0.1.12";

package/dist/version.js

@@ -1,2 +1,2 @@
 
-export const VERSION = "0.1.11";
+export const VERSION = "0.1.12";

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@xtctwins/tctwins-bimx-viewer",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "private": false,
   "description": "BIM viewer built on xtctwins",
   "main": "./dist/tctwins-bimx-viewer.min.es.js",
   "types": "./types/index.d.ts",
   "scripts": {
     "build": "webpack --config webpack.config.js",
-    "build-dev": "webpack serve --config webpack.dev.config.js --open",
-    "build-dev-only": "webpack --config webpack.dev.config.js",
+    "dev": "webpack serve --config webpack.dev.config.js --open",
+    "build-dev": "webpack --config webpack.dev.config.js",
     "docs": "esdoc",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "publish": "npm publish --access public",
@@ -28,7 +28,7 @@
     "@types/ali-oss": "^6.16.11",
     "@typescript-eslint/eslint-plugin": "^6.14.0",
     "@typescript-eslint/parser": "^6.14.0",
-    "@xtctwins/tctwins-core": "^1.0.45",
+    "@xtctwins/tctwins-core": "^1.0.46",
     "ali-oss": "^6.18.1",
     "autoprefixer": "^9.8.6",
     "axios": "^1.6.5",

package/types/src/BIMXViewer.d.ts

@@ -282,6 +282,7 @@ export default class BIMXViewer extends Controller {
      * @param callback - 回调
      */
     updateAABB(exceptionIDs: string[], callback?: (content?: any) => void): void;
+    closeAll(): void;
     /**
      * 销毁
      */
@@ -527,12 +528,6 @@ export default class BIMXViewer extends Controller {
      * @param callback
      */
     SetHideToolActive(active: boolean, callback?: (content?: any) => void): void;
-    /**
-     * 框选开关
-     * @param active
-     * @param callback
-     */
-    SetMarqueeSelectionActive(active: boolean, callback?: (content?: any) => void): void;
     /**
      * 相机视角开关
      * @param active

package/types/src/toolbar/HideTool.d.ts

@@ -6,8 +6,8 @@ import Controller from "../Controller";
 export default class HideTool extends Controller {
     protected _onPick: any;
     /**
-       * @param {*} parent
-       * @param {*} cfg
-       */
+     * @param {*} parent
+     * @param {*} cfg
+     */
     constructor(parent: any, cfg: any);
 }

package/types/src/toolbar/OrthoMode.d.ts

@@ -6,15 +6,15 @@ import Controller from "../Controller";
 export default class OrthoMode extends Controller {
     protected _active: any;
     /**
-       * 创建一个正交模式对象
-       * @param {*} parent
-       * @param {*} cfg
-       */
+     * 创建一个正交模式对象
+     * @param {*} parent
+     * @param {*} cfg
+     */
     constructor(parent: any, cfg: any);
     /**
-       * @param {boolean} active
-       * @param {Function} done
-       */
+     * @param {boolean} active
+     * @param {Function} done
+     */
     setActive(active: boolean, done?: Function): void;
     protected _enterOrthoMode(done?: Function): void;
     protected _exitOrthoMode(done?: Function): void;

package/types/src/BusyModal.d.ts

@@ -1,28 +0,0 @@
-import Controller from './Controller';
-/**
- * 表示一个忙碌模态框
- * @class
- */
-export default class BusyModal extends Controller {
-    protected _modal: HTMLDivElement | null;
-    protected _modalVisible: boolean;
-    /**
-     * 实例化一个忙碌模态框
-     * @params {any} parent -
-     * @params {any} cfg - 配置参数
-     */
-    constructor(parent: any, cfg?: any);
-    /**
-     * 显示模态框
-     * @params {string} message - 显示内容
-     */
-    show(message: string): void;
-    /**
-     * 隐藏模态框
-     */
-    hide(): void;
-    /**
-     * 销毁模态框
-     */
-    destroy(): void;
-}