@realsee/dnalogel 3.10.3 → 3.11.0

package/libs/AreaMakerPlugin/typing.d.ts

@@ -80,6 +80,14 @@ export type AreaMakerItemEventMap = {
         target: AreaMakerItem;
         nativeEvent: MouseEvent;
     }) => void;
+    /**
+     * @description: 标注标签没有被遮挡，自动展示
+     */
+    tagShow: () => void;
+    /**
+     * @description: 标注标签被模型遮挡，自动隐藏
+     */
+    tagHide: () => void;
 };
 /** 动画相关的配置 */
 export interface AnimeOptions {

package/libs/AreaMakerPlugin/utils/Item.d.ts

@@ -44,7 +44,7 @@ export declare class AreaMakerItem {
     /** 标注标签实例 */
     tagApp: LabelItem | null;
     /** 标注标签是否可见 */
-    tagVisible: boolean;
+    tagVisible: boolean | null;
     /** 标注标签的世界坐标 */
     tagPosition: THREE.Vector3;
     /** 标注标签的 NDC 坐标 */

package/libs/AreaMakerPlugin/utils/Item.js

@@ -76,7 +76,7 @@ class it {
     /** 标注标签实例 */
     i(this, "tagApp");
     /** 标注标签是否可见 */
-    i(this, "tagVisible", !0);
+    i(this, "tagVisible", null);
     /** 标注标签的世界坐标 */
     i(this, "tagPosition", new a.Vector3());
     /** 标注标签的 NDC 坐标 */
@@ -127,14 +127,14 @@ class it {
         this.makerObject.material.opacity = o, this.outline.material.opacity = l;
         return;
       }
-      return new Promise((p) => {
+      return new Promise((m) => {
         this.opacityAnime = new T({ makerObjectOpacity: s, outlineOpacity: r }).to({
           makerObjectOpacity: o,
           outlineOpacity: l
-        }).onUpdate(({ makerObjectOpacity: m, outlineOpacity: c }) => {
-          this.makerObject.material.opacity = m, this.outline.material.opacity = c, this.plugin.five.needsRender = !0;
-        }).onComplete(() => p(!0)).onDispose(() => {
-          this.makerObject.material.opacity = o, this.outline.material.opacity = l, this.plugin.five.needsRender = !0, p(!1);
+        }).onUpdate(({ makerObjectOpacity: p, outlineOpacity: c }) => {
+          this.makerObject.material.opacity = p, this.outline.material.opacity = c, this.plugin.five.needsRender = !0;
+        }).onComplete(() => m(!0)).onDispose(() => {
+          this.makerObject.material.opacity = o, this.outline.material.opacity = l, this.plugin.five.needsRender = !0, m(!1);
         }).play();
       });
     });
@@ -182,7 +182,7 @@ class it {
     i(this, "updateTagVisible", () => {
       var s;
       const { result: e, msg: t } = this.checkTagVisible();
-      this.checkMsg.checkTagVisibleMsg = t, this.tagVisible !== e && (this.tagVisible = e, (s = this.tagApp) == null || s.$set({ visible: e }));
+      this.checkMsg.checkTagVisibleMsg = t, this.tagVisible !== e && (this.tagVisible = e, this.tagVisible ? this.hooks.emit("tagShow") : this.hooks.emit("tagHide"), (s = this.tagApp) == null || s.$set({ visible: e }));
     });
     /** 检测标注标签是否可见 */
     i(this, "checkTagVisible", () => {
@@ -210,8 +210,8 @@ class it {
       };
       this.containerResizeTimeoutID && clearTimeout(this.containerResizeTimeoutID), this.containerResizeTimeoutID = setTimeout(t, 100);
     });
-    var p, m, c, g;
-    const s = t.object_data, o = s.bottom_y, r = s.height, l = new a.Color((p = s.color) != null ? p : "#FFFFFF"), h = (m = s.opacity) != null ? m : 0.4;
+    var m, p, c, g;
+    const s = t.object_data, o = s.bottom_y, r = s.height, l = new a.Color((m = s.color) != null ? m : "#FFFFFF"), h = (p = s.opacity) != null ? p : 0.4;
     this.data = t, this.id = t.id, this.name = (c = t.name) != null ? c : "", this.plugin = e, this.height = r, this.bottomY = o, this.opacity = h, this.shape = new a.Shape().fromJSON(s.shape), this.floorIndex = t.floor_index, this.makerObject = new a.Mesh(d(this.shape, r), V(l, h)), u(this.makerObject, o), this.makerObject.material.depthTest = this.plugin.config.modelDepthTest, this.outline = new y(
       new a.EdgesGeometry(this.makerObject.geometry),
       new a.LineBasicMaterial({ color: l, transparent: !0 })
@@ -219,6 +219,8 @@ class it {
   }
   /** 挂载标注 */
   mount() {
+    if (this.mounted)
+      return;
     this.mounted = !0, this.updateVisible(), this.makerObject.material.depthTest = this.plugin.config.modelDepthTest, this.outline.material.depthTest = this.plugin.config.modelDepthTest, this.modelGroup.add(this.makerObject, this.outline);
     const e = !!this.name, t = this.plugin.tagDomContainer;
     if (e) {
@@ -237,7 +239,7 @@ class it {
   /** 卸载标注 */
   unmount() {
     var e, t;
-    this.mounted = !1, this.modelGroup.remove(...this.modelGroup.children), (e = this.tagApp) == null || e.$destroy(), this.tagApp = null, this.plugin.hooks.off("stateChange", this.onPluginStateChange), this.plugin.hooks.off("configChange", this.onPluginConfigChange), this.plugin.five.off("modeChange", this.updateVisible), this.plugin.five.off("modelShownFloorChange", this.updateVisible), this.plugin.five.off("cameraUpdate", this.onFiveCameraUpdate), (t = this.resizeObserver) == null || t.unobserve();
+    this.mounted && (this.mounted = !1, this.modelGroup.remove(...this.modelGroup.children), (e = this.tagApp) == null || e.$destroy(), this.tagApp = null, this.plugin.hooks.off("stateChange", this.onPluginStateChange), this.plugin.hooks.off("configChange", this.onPluginConfigChange), this.plugin.five.off("modeChange", this.updateVisible), this.plugin.five.off("modelShownFloorChange", this.updateVisible), this.plugin.five.off("cameraUpdate", this.onFiveCameraUpdate), (t = this.resizeObserver) == null || t.unobserve());
   }
   /** 更改标注透明度
    * @param opacity 标注透明度，范围：0-1

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.10.3");
+    i(this, "VERSION", "3.11.0");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.10.3",
+    "%c %c@realsee/dnalogel %cv3.11.0",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.10.3",
+  "version": "3.11.0",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",