@realsee/dnalogel 3.42.0-alpha-tag.45 → 3.43.0

package/libs/PanoTagPlugin/controller/Tag/ModelTag.js

@@ -79,8 +79,7 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../CruisePlugin/utils/sleep.js";
-import "../../utils/tag/canVisibleInModel.js";
-class At extends D {
+class Et extends D {
   constructor(i, s) {
     super(i, s);
     l(this, "loading", !1);
@@ -133,5 +132,5 @@ class At extends D {
   }
 }
 export {
-  At as ModelTag
+  Et as ModelTag
 };

package/libs/PanoTagPlugin/controller/Tag/PlaneTag.js

@@ -58,9 +58,8 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../CruisePlugin/utils/sleep.js";
-import "../../utils/tag/canVisibleInModel.js";
 const P = /* @__PURE__ */ new Map(), v = /* @__PURE__ */ new Map();
-class Te extends f {
+class Re extends f {
   constructor(t, e) {
     super(t, e), this.state.unfolded = !0;
   }
@@ -117,5 +116,5 @@ class Te extends f {
   }
 }
 export {
-  Te as PlaneTag
+  Re as PlaneTag
 };

package/libs/PanoTagPlugin/controller/Tag/PointTag.d.ts

@@ -7,6 +7,10 @@ export declare class PointTag<C extends TagContentType = TagContentType> extends
     private __Object__;
     private requestIdleCallbackId?;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
+    /**
+     * @description 展开自己，收起其他标签
+     */
+    unfoldAndFoldOthers(): void;
     onClick(params: Pick<TagClickParams, 'target'>): void;
     updateVisible(): void;
     applyVisible(): void;

package/libs/PanoTagPlugin/controller/Tag/PointTag.js

@@ -51,30 +51,33 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../CruisePlugin/utils/sleep.js";
-import "../../utils/tag/canVisibleInModel.js";
 const v = new u.Vector2();
-class bt extends g {
-  constructor(t, i) {
-    super(t, i);
+class gt extends g {
+  constructor(t, e) {
+    super(t, e);
     a(this, "__Object__");
     a(this, "requestIdleCallbackId");
   }
-  onClick(t) {
-    if (t.target !== "TagPoint")
-      return;
-    const i = this.can("fold"), o = this.can("unfold");
-    i && o && (this.state.unfolded = !this.state.unfolded, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((e) => {
-      e.id !== this.id && e.fold();
+  /**
+   * @description 展开自己，收起其他标签
+   */
+  unfoldAndFoldOthers() {
+    const t = this.can("fold"), e = this.can("unfold");
+    t && e && (this.state.unfolded = !this.state.unfolded, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.state.unfolded && this.plugin.tags.forEach((o) => {
+      o.id !== this.id && o.fold();
     }));
   }
+  onClick(t) {
+    t.target === "TagPoint" && this.unfoldAndFoldOthers();
+  }
   updateVisible() {
     this.requestIdleCallbackId && b(this.requestIdleCallbackId), this.requestIdleCallbackId = y(() => {
       super.updateVisible();
     });
   }
   applyVisible() {
-    var t, i, o, e;
-    this.currentVisible && this.updateScreenPosition(), (o = (i = (t = this.tag3DContentSvelte) == null ? void 0 : t.css3DInstance) == null ? void 0 : i.css3DObject) == null || o.setVisible(this.currentVisible), (e = this.tag3DContentSvelte) == null || e.svelteApp.$set({
+    var t, e, o, i;
+    this.currentVisible && this.updateScreenPosition(), (o = (e = (t = this.tag3DContentSvelte) == null ? void 0 : t.css3DInstance) == null ? void 0 : e.css3DObject) == null || o.setVisible(this.currentVisible), (i = this.tag3DContentSvelte) == null || i.svelteApp.$set({
       state: this.plugin.state,
       temporaryState: this.temporaryState
     }), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
@@ -90,8 +93,8 @@ class bt extends g {
    * @param {boolean} unfolded
    */
   setUnfold(t) {
-    const i = this.can("fold"), o = this.can("unfold");
-    i && o && (this.state.unfolded = t, this.hooks.emit(t ? "unfolded" : "folded"), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
+    const e = this.can("fold"), o = this.can("unfold");
+    e && o && (this.state.unfolded = t, this.hooks.emit(t ? "unfolded" : "folded"), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
   }
   setPosition(t) {
     this.originPosition = t, this.position = t, this.cache.clear(), this.updateVisible(), this.updateScreenPosition(), this.updateZIndex(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] });
@@ -100,15 +103,15 @@ class bt extends g {
     var l;
     if (this.stickType !== "2DPoint" && this.stickType !== "3DPoint")
       return;
-    const { force: i = !1 } = t != null ? t : {}, o = i ? this.state.visible : this.currentVisible, e = (l = this.__Object__) != null ? l : {
+    const { force: e = !1 } = t != null ? t : {}, o = e ? this.state.visible : this.currentVisible, i = (l = this.__Object__) != null ? l : {
       timeoutId: void 0,
       inAnimation: !1
     };
-    if (this.__Object__ = e, !o && this.screenPosition ? (e.inAnimation = !0, e.timeoutId = setTimeout(() => {
+    if (this.__Object__ = i, !o && this.screenPosition ? (i.inAnimation = !0, i.timeoutId = setTimeout(() => {
       requestAnimationFrame(() => {
-        this.currentVisible || (e.inAnimation = !1, this.screenPosition = null, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
+        this.currentVisible || (i.inAnimation = !1, this.screenPosition = null, this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }));
       });
-    }, 1e3)) : e.timeoutId && (clearTimeout(e.timeoutId), e.inAnimation = !1, e.timeoutId = void 0), !o && !e.inAnimation)
+    }, 1e3)) : i.timeoutId && (clearTimeout(i.timeoutId), i.inAnimation = !1, i.timeoutId = void 0), !o && !i.inAnimation)
       return;
     const r = this.computeTagProject();
     if (r) {
@@ -130,8 +133,8 @@ class bt extends g {
   updateUnfoldedByPanoIndex() {
     const t = this.getUnfoldedByPanoIndex();
     if (this.state && (t !== void 0 && (this.state.unfolded = t), t && !this.state.visible)) {
-      const i = this.getConfig();
-      typeof i.unfoldedConfig == "object" && i.unfoldedConfig.autoFoldWhenHide !== !1 && (this.state.unfolded = !1);
+      const e = this.getConfig();
+      typeof e.unfoldedConfig == "object" && e.unfoldedConfig.autoFoldWhenHide !== !1 && (this.state.unfolded = !1);
     }
   }
   computeNormal() {
@@ -142,5 +145,5 @@ class bt extends g {
   }
 }
 export {
-  bt as PointTag
+  gt as PointTag
 };

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -159,7 +159,6 @@ import "../../shared-utils/five/getFloorIndex.js";
 import "../../shared-utils/safeObj.js";
 import "../utils/Cache.js";
 import "../../CruisePlugin/utils/sleep.js";
-import "../utils/tag/canVisibleInModel.js";
 import "../tag.config.js";
 import "../utils/normalPositionToPositions.js";
 import "../../vendor/svelte/store/index.js";
@@ -171,7 +170,7 @@ import "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
 import "../../shared-utils/three/THREERaycaster.js";
 import "../../base/BasePlugin.js";
-class Pe extends U {
+class Me extends U {
   constructor(t) {
     super(t);
     c(this, "rendererMap", /* @__PURE__ */ new Map());
@@ -322,5 +321,5 @@ class Pe extends U {
   }
 }
 export {
-  Pe as TagRender
+  Me as TagRender
 };

package/libs/PanoTagPlugin/controller/index.d.ts

@@ -119,10 +119,6 @@ declare class PanoTagPluginController extends TagRender {
     private handleHide;
     private handleEnable;
     private handleDisable;
-    /**
-     * @description 添加 cameraUpdate, panoArrived 等事件监听
-     */
-    private addEventListener;
     private addResizeListener;
     private addResizeObserver;
     private handleFiveModeChange;
@@ -136,6 +132,10 @@ declare class PanoTagPluginController extends TagRender {
     private onFiveEveryReady;
     private setUnfoldedByCamera;
     private changeTagMode;
+    /**
+     * @description 添加 cameraUpdate, panoArrived 等事件监听
+     */
+    private addEventListener;
     render: () => void;
 }
 export default PanoTagPluginController;

package/libs/PanoTagPlugin/controller/index.js

@@ -171,7 +171,6 @@ import "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/five/getFloorIndex.js";
 import "../utils/Cache.js";
 import "../../CruisePlugin/utils/sleep.js";
-import "../utils/tag/canVisibleInModel.js";
 import "./TagUtil.js";
 import "../tag.config.js";
 import "../utils/normalPositionToPositions.js";
@@ -186,8 +185,8 @@ import "../../base/BasePlugin.js";
 import "../utils/requestIdleCallback.js";
 import "../Components/TagItem.js";
 import "../Components/Common/TagPoint.js";
-const S = "Dnalogel-PanoTagPlugin", $i = (d) => `${S}--${d}`;
-class Wi extends R {
+const S = "Dnalogel-PanoTagPlugin", Qi = (d) => `${S}--${d}`;
+class $i extends R {
   constructor(e, t) {
     super(e);
     /** state */
@@ -259,7 +258,7 @@ class Wi extends R {
       this.tags.forEach((e) => e.updateVisible());
     });
     p(this, "onFiveEveryReady", () => {
-      this.setUnfoldedByCamera(), G(this.five.getCurrentState().mode) && this.filterPointTag.forEach((e) => e.updateVisible());
+      this.setUnfoldedByCamera(), G(this.five.getCurrentState().mode) && this.tags.forEach((e) => e.updateVisible());
     });
     p(this, "render", () => {
       this.renderQueue.forEach((e, t) => {
@@ -535,21 +534,6 @@ class Wi extends R {
       (s = o.tag3DContentSvelte) == null || s.dispose(), o.tag3DContentSvelte = void 0;
     }), this.five.needsRender = !0;
   }
-  /**
-   * @description 添加 cameraUpdate, panoArrived 等事件监听
-   */
-  addEventListener() {
-    const { five: e, hooks: t } = this;
-    let i = !1;
-    const o = y(() => {
-      i || (i = !0, e.ready().then(() => {
-        this.onFiveEveryReady(), i = !1;
-      }));
-    }, 150);
-    return e.on("cameraUpdate", o), this.handleFivePanoArrived(), e.on("wantsMoveToPano", this.handleFiveWantsMoveToPano), e.on("models.refined", this.onFiveEveryReady), e.on("modeChange", this.handleFiveModeChange), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", this.handleFiveCameraUpdate), e.on("cameraFovUpdate", this.handleFiveCameraFovUpdate), e.on("panoArrived", this.handleFivePanoArrived), e.on("panoArrived", this.loadVideoFirstFrame), e.on("render.prepare", this.render), t.on("click", this.clickhandler), () => {
-      e.off("wantsMoveToPano", this.handleFiveWantsMoveToPano), e.off("models.refined", this.onFiveEveryReady), e.off("modeChange", this.handleFiveModeChange), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", this.handleFiveCameraUpdate), e.off("cameraFovUpdate", this.handleFiveCameraFovUpdate), e.off("cameraUpdate", o), e.off("panoArrived", this.handleFivePanoArrived), e.off("panoArrived", this.loadVideoFirstFrame), e.off("render.prepare", this.render), t.off("click", this.clickhandler), this.store.eventListenerDisposer = void 0;
-    };
-  }
   addResizeListener() {
     if (!this.store.resizeObserverDisposer && !this.store.resizeObserverDisposerAdding) {
       const e = this.addResizeObserver();
@@ -598,9 +582,24 @@ class Wi extends R {
     var i, o, s, n, r, h;
     ((i = e.config) == null ? void 0 : i.renderType) !== "Mesh" && ((n = (s = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : s.css3DObject) == null ? void 0 : n.mode) !== t && ((r = e.config) != null && r.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (h = this.store.css3DRenderDisposer.get(e.id)) == null || h.forEach((g) => g == null ? void 0 : g()), e.tag3DContentSvelte = void 0);
   }
+  /**
+   * @description 添加 cameraUpdate, panoArrived 等事件监听
+   */
+  addEventListener() {
+    const { five: e, hooks: t } = this;
+    let i = !1;
+    const o = y(() => {
+      i || (i = !0, e.ready().then(() => {
+        this.onFiveEveryReady(), i = !1;
+      }));
+    }, 150);
+    return e.on("cameraUpdate", o), this.handleFivePanoArrived(), e.on("wantsMoveToPano", this.handleFiveWantsMoveToPano), e.on("models.refined", this.onFiveEveryReady), e.on("modeChange", this.handleFiveModeChange), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", this.handleFiveCameraUpdate), e.on("cameraFovUpdate", this.handleFiveCameraFovUpdate), e.on("panoArrived", this.handleFivePanoArrived), e.on("panoArrived", this.loadVideoFirstFrame), e.on("render.prepare", this.render), t.on("click", this.clickhandler), () => {
+      e.off("wantsMoveToPano", this.handleFiveWantsMoveToPano), e.off("models.refined", this.onFiveEveryReady), e.off("modeChange", this.handleFiveModeChange), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", this.handleFiveCameraUpdate), e.off("cameraFovUpdate", this.handleFiveCameraFovUpdate), e.off("cameraUpdate", o), e.off("panoArrived", this.handleFivePanoArrived), e.off("panoArrived", this.loadVideoFirstFrame), e.off("render.prepare", this.render), t.off("click", this.clickhandler), this.store.eventListenerDisposer = void 0;
+    };
+  }
 }
 export {
-  Wi as PanoTagPluginController,
-  Wi as default,
-  $i as pluginFlag
+  $i as PanoTagPluginController,
+  $i as default,
+  Qi as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,7 +1,7 @@
 import r from "./controller/index.js";
-import { pluginFlag as ir } from "./controller/index.js";
-import { defaultGlobalConfig as nr } from "./typings/tag/TagConfig.js";
-import { ContentType as lr, DimensionType as ar, PointType as fr } from "./Archive/deprecated.js";
+import { pluginFlag as pr } from "./controller/index.js";
+import { defaultGlobalConfig as mr } from "./typings/tag/TagConfig.js";
+import { ContentType as er, DimensionType as lr, PointType as ar } from "./Archive/deprecated.js";
 import "three";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "./utils/addDebugPoints.js";
@@ -138,7 +138,6 @@ import "../shared-utils/five/getFloorIndex.js";
 import "../shared-utils/safeObj.js";
 import "./utils/Cache.js";
 import "../CruisePlugin/utils/sleep.js";
-import "./utils/tag/canVisibleInModel.js";
 import "./controller/TagUtil.js";
 import "./tag.config.js";
 import "./utils/normalPositionToPositions.js";
@@ -160,14 +159,14 @@ import "./Components/TagContainer.js";
 import "./Components/TagItem.js";
 import "./Components/Common/TagPoint.js";
 import "../shared-utils/animationFrame/BetterTween.js";
-const tr = (o, t) => new r(o, t);
+const or = (o, t) => new r(o, t);
 export {
-  lr as ContentType,
-  ar as DimensionType,
-  tr as PanoTagPlugin,
+  er as ContentType,
+  lr as DimensionType,
+  or as PanoTagPlugin,
   r as PanoTagPluginController,
-  fr as PointType,
-  tr as default,
-  nr as defaultGlobalConfig,
-  ir as pluginFlag
+  ar as PointType,
+  or as default,
+  mr as defaultGlobalConfig,
+  pr as pluginFlag
 };

package/libs/PanoTagPlugin/typings/tag/TagConfig.d.ts

@@ -60,9 +60,10 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
          */
         visibleFiveMode?: TagVisibleMode | ((tag: TagInstance) => TagVisibleMode);
         /**
-         * @description // TODO
+         * @description 全景标签在模型中可见，点击后进入全景看向标签
+         * @default false
          */
-        visibleInModel?: boolean;
+        entryFromModel?: boolean;
         /**
          * @description 当 visibleFiveMode 包含 'Floorplan' 或者 'MapView' 时，是否仅在当前楼层模型下可见
          * @default false

package/libs/PanoTagPlugin/utils/tag/format.js

@@ -2,11 +2,11 @@ function o(e) {
   return e.stickType ? e.stickType : e.pointType === "PointTag" && e.dimensionType === "3D" ? "3DPoint" : e.pointType === "PlaneTag" ? "Plane" : "2DPoint";
 }
 function p(e) {
-  var t, i, a, r;
+  var t, i, r, a;
   if (e.stickType || (e.stickType = o(e)), e.contentType === "VRLink" || e.contentType === "PanoLink" || e.contentType === "Link") {
     const n = e;
-    !((i = (t = n.data) == null ? void 0 : t.icon) != null && i.url) && !((r = (a = n.style) == null ? void 0 : a.point) != null && r.url) && (n.data.icon = {
-      url: "//vrlab-static.ljcdn.com/release/web/test.09dee741.png",
+    !((i = (t = n.data) == null ? void 0 : t.icon) != null && i.url) && !((a = (r = n.style) == null ? void 0 : r.point) != null && a.url) && (n.data.icon = {
+      url: "//vr-static.realsee-cdn.cn/release/web/test.09dee741.png",
       steps: 28
     });
   }

package/libs/PipelinePlugin/utils/formatData.js

@@ -1,5 +1,5 @@
 import { notNil as c } from "../../shared-utils/isNil.js";
-function l(e) {
+function d(e) {
   const t = /* @__PURE__ */ new Map();
   return e.forEach((a) => a.pipes.forEach((s) => t.set(s.id, s))), Array.from(t.values());
 }
@@ -10,37 +10,37 @@ function v(e) {
     );
     return r || console.warn(`Cannot find pipeline with startLibraryID ${a} and endLibraryID ${s}`), r;
   }).filter(c);
-  return l(t);
+  return d(t);
 }
-function g(e) {
+function b(e) {
   if (e.quality === 0)
-    return "//vrlab-static.ljcdn.com/release/web/aqueous-system-demo/19/1.png";
+    return "//vr-static.realsee-cdn.cn/release/web/aqueous-system-demo/19/1.png";
   if (e.quality === 1)
-    return "//vrlab-static.ljcdn.com/release/web/aqueous-system-demo/19/2.png";
+    return "//vr-static.realsee-cdn.cn/release/web/aqueous-system-demo/19/2.png";
   if (e.quality === 2)
-    return "//vrlab-static.ljcdn.com/release/web/aqueous-system-demo/19/3.png";
+    return "//vr-static.realsee-cdn.cn/release/web/aqueous-system-demo/19/3.png";
   if (e.quality === 3)
-    return "//vrlab-static.ljcdn.com/release/web/aqueous-system-demo/19/4.png";
+    return "//vr-static.realsee-cdn.cn/release/web/aqueous-system-demo/19/4.png";
   if (e.quality === 4)
-    return "//vrlab-static.ljcdn.com/release/web/aqueous-system-demo/19/5.png";
+    return "//vr-static.realsee-cdn.cn/release/web/aqueous-system-demo/19/5.png";
   if (e.isHot)
-    return "//vrlab-static.ljcdn.com/release/web/aqueous-system-demo/19/6.png";
+    return "//vr-static.realsee-cdn.cn/release/web/aqueous-system-demo/19/6.png";
 }
 function w(e, t) {
   const a = e.ConnectsDataset.map((r) => {
-    const n = r.data, d = r.start, o = r.end, u = { isHot: r.waterType === 5, quality: r.waterType }, m = n.map((f) => {
-      const i = e.LinesDataset.find((q) => q.id === f);
+    const n = r.data, l = r.start, f = r.end, u = { isHot: r.waterType === 5, quality: r.waterType }, p = n.map((o) => {
+      const i = e.LinesDataset.find((g) => g.id === o);
       if (!i)
         return null;
-      const p = i.data, y = t != null && t.getPipeRadius ? t.getPipeRadius(i) : 1.6 / 100, b = t != null && t.getPipeUrl ? t.getPipeUrl(u) : g(u);
-      return { id: i.id, radius: y, water: u, path: p, texture: b };
+      const m = i.data, y = t != null && t.getPipeRadius ? t.getPipeRadius(i) : 1.6 / 100, q = t != null && t.getPipeUrl ? t.getPipeUrl(u) : b(u);
+      return { id: i.id, radius: y, water: u, path: m, texture: q };
     }).filter(c);
-    return { startLibraryID: d, endLibraryID: o, pipes: m };
+    return { startLibraryID: l, endLibraryID: f, pipes: p };
   });
-  return { pipes: l(a), pipelines: a };
+  return { pipes: d(a), pipelines: a };
 }
 export {
   w as format,
-  g as getDefaultPipeUrl,
+  b as getDefaultPipeUrl,
   v as getPipesFromLibrary
 };

package/libs/base/BasePlugin.js

@@ -16,7 +16,7 @@ let c = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "3.42.0-alpha-tag.45");
+    e(this, "VERSION", "3.43.0");
     e(this, "NAME");
     e(this, "five");
     e(this, "workUtil");