@realsee/dnalogel 3.57.1 → 3.58.0

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

@@ -86,6 +86,7 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
     cache: Cache;
     entryFromModel?: boolean;
     get sharedCache(): Cache;
+    _updating: boolean;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
     /**
      * @description 使 state.visible 生效，但是只是加入渲染队列。等下次渲染时再真正生效
@@ -97,7 +98,7 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
     find(params?: {
         targetMode?: 'Panorama' | 'Mapview';
         pointConfig?: Parameters<typeof lookPoint>[2];
-    }): Promise<void>;
+    }): Promise<this>;
     /**
      * @description 闪烁
      */
@@ -226,6 +227,7 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
             reason?: any;
         };
     };
+    private ready;
     /**
      * @description 销毁并移除
      */

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

@@ -2,12 +2,12 @@ var G = Object.defineProperty, K = Object.defineProperties;
 var Q = Object.getOwnPropertyDescriptors;
 var P = Object.getOwnPropertySymbols;
 var D = Object.prototype.hasOwnProperty, j = Object.prototype.propertyIsEnumerable;
-var C = Math.pow, I = (c, i, e) => i in c ? G(c, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[i] = e, p = (c, i) => {
+var C = Math.pow, M = (c, i, e) => i in c ? G(c, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[i] = e, g = (c, i) => {
   for (var e in i || (i = {}))
-    D.call(i, e) && I(c, e, i[e]);
+    D.call(i, e) && M(c, e, i[e]);
   if (P)
     for (var e of P(i))
-      j.call(i, e) && I(c, e, i[e]);
+      j.call(i, e) && M(c, e, i[e]);
   return c;
 }, w = (c, i) => K(c, Q(i));
 var A = (c, i) => {
@@ -19,21 +19,21 @@ var A = (c, i) => {
       i.indexOf(t) < 0 && j.call(c, t) && (e[t] = c[t]);
   return e;
 };
-var f = (c, i, e) => (I(c, typeof i != "symbol" ? i + "" : i, e), e);
+var f = (c, i, e) => (M(c, typeof i != "symbol" ? i + "" : i, e), e);
 var y = (c, i, e) => new Promise((t, r) => {
-  var n = (s) => {
+  var s = (n) => {
     try {
-      o(e.next(s));
+      o(e.next(n));
     } catch (d) {
       r(d);
     }
-  }, l = (s) => {
+  }, l = (n) => {
     try {
-      o(e.throw(s));
+      o(e.throw(n));
     } catch (d) {
       r(d);
     }
-  }, o = (s) => s.done ? t(s.value) : Promise.resolve(s.value).then(n, l);
+  }, o = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(s, l);
   o((e = e.apply(c, i)).next());
 });
 import { Subscribe as Y } from "../../../shared-utils/Subscribe.js";
@@ -52,7 +52,7 @@ import "@realsee/five/line";
 import { isNil as R, notNil as E } from "../../../shared-utils/isNil.js";
 import "../../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../../shared-utils/three/core/Sphere.js";
-import { blink as ne, reblink as se } from "../../../shared-utils/three/blink.js";
+import { blink as se, reblink as ne } from "../../../shared-utils/three/blink.js";
 import { vectorToCoordinates as oe } from "../../../shared-utils/vectorToCoordinate.js";
 import { transformPosition as L } from "../../../shared-utils/five/transformPosition.js";
 import { lookPoint as re } from "../../../shared-utils/five/lookPoint.js";
@@ -68,6 +68,7 @@ import { getFloorIndex as fe } from "../../../shared-utils/five/getFloorIndex.js
 import { safeObj as J } from "../../../shared-utils/safeObj.js";
 import { Cache as de } from "../../utils/Cache.js";
 import { _raycaster as S } from "../../../shared-utils/three/temp.js";
+import { withResolvers as ce } from "../../../shared-utils/promise/withResolvers.js";
 import "../../../shared-utils/typescript/entries.js";
 import "../../utils/tag/adaptConfig.js";
 import "../../typings/tag/TagConfig.js";
@@ -112,7 +113,7 @@ import "../../../shared-utils/five/getPosition.js";
 import "../../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../../shared-utils/three/PointSelector/utils/contents.js";
 import "../../../shared-utils/formatRad.js";
-class Ai {
+class Oi {
   constructor(i, e) {
     f(this, "plugin");
     f(this, "id");
@@ -142,26 +143,41 @@ class Ai {
     f(this, "computedConfig");
     f(this, "cache");
     f(this, "entryFromModel");
-    var s, d, h, u;
+    f(this, "_updating", !1);
+    f(this, "ready", () => {
+      const { promise: i, resolve: e } = ce();
+      if (!this._updating)
+        e();
+      else {
+        const t = setInterval(() => {
+          this._updating || (clearInterval(t), e());
+        }, 17);
+        setTimeout(() => {
+          clearInterval(t), e();
+        }, 300);
+      }
+      return i;
+    });
+    var n, d, p, u;
     this.plugin = i;
     const t = ee(e);
     e.stickType = t;
-    const r = JSON.parse(JSON.stringify(e.data)), n = (s = e.initialConfig) != null ? s : e.config ? JSON.parse(JSON.stringify(e.config)) : {};
-    e.initialConfig = n;
+    const r = JSON.parse(JSON.stringify(e.data)), s = (n = e.initialConfig) != null ? n : e.config ? JSON.parse(JSON.stringify(e.config)) : {};
+    e.initialConfig = s;
     const l = U(e, i.config), o = this.getConfig(e);
-    e.config = o, this.id = (d = e.id) != null ? d : le(), this.enabled = (h = e.enabled) != null ? h : !0, this.contentType = e.contentType, this.data = (u = o.initialData) != null && u.important ? b(e.data, r, o.initialData) : b(e.data, o.initialData, r), this.state = p({
+    e.config = o, this.id = (d = e.id) != null ? d : le(), this.enabled = (p = e.enabled) != null ? p : !0, this.contentType = e.contentType, this.data = (u = o.initialData) != null && u.important ? b(e.data, r, o.initialData) : b(e.data, o.initialData, r), this.state = g({
       visible: void 0,
       unfolded: !this.can("fold")
     }, o.initialState), this.originPosition = e.position, e.originPosition = this.originPosition, this.position = (() => {
       const a = e.originPosition;
       if (!a)
         return;
-      const g = i.workUtil.transform;
-      return Array.isArray(a) && a.length === 4 ? a.map(O).map((m) => L(m, g).toArray()) : L(O(a), g).toArray();
+      const m = i.workUtil.transform;
+      return Array.isArray(a) && a.length === 4 ? a.map(O).map((h) => L(h, m).toArray()) : L(O(a), m).toArray();
     })(), this.matrix = e.matrix ? (() => {
       const a = new B.Matrix4().fromArray(e.matrix);
       return a.premultiply(i.workUtil.transform), a.elements;
-    })() : e.matrix, this.initialConfig = n, this.computedConfig = l, this.stickType = t, this.config = e.config, this.fiveState = e.fiveState, this.normal = e.normal, this.cache = new de(), this.hooks = new Y(), Object.keys(e).forEach((a) => {
+    })() : e.matrix, this.initialConfig = s, this.computedConfig = l, this.stickType = t, this.config = e.config, this.fiveState = e.fiveState, this.normal = e.normal, this.cache = new de(), this.hooks = new Y(), Object.keys(e).forEach((a) => {
       this[a] === void 0 && e[a] !== void 0 && (this[a] = e[a]);
     });
   }
@@ -179,9 +195,9 @@ class Ai {
     return ie(...Array.isArray(i) ? i : [i]);
   }
   get currentConfig() {
-    var r, n;
+    var r, s;
     const i = U(this, this.plugin.config, { useCache: !0 }), e = this.five.getCurrentState().mode, t = (r = i.configWithFiveMode) == null ? void 0 : r[e];
-    return (n = t != null ? t : i) != null ? n : {};
+    return (s = t != null ? t : i) != null ? s : {};
   }
   get currentVisible() {
     return !(!this.plugin.state.enabled || !this.plugin.state.visible || !this.enabled || !this.state.visible);
@@ -203,20 +219,21 @@ class Ai {
       var r;
       const e = this.fiveState;
       if (!this.fiveState)
-        return;
+        return this;
       const t = (r = i == null ? void 0 : i.targetMode) != null ? r : this.five.state.mode;
       if (t === "Panorama") {
-        const n = e == null ? void 0 : e.panoIndex;
-        if (R(n))
-          return;
-        const l = this.workUtil.getObserverPosition(n), o = this.centerPosition.clone().sub(l).normalize();
-        this.five.setState(p({
+        const s = e == null ? void 0 : e.panoIndex;
+        if (R(s))
+          return this;
+        const l = this.workUtil.getObserverPosition(s), o = this.centerPosition.clone().sub(l).normalize();
+        this.five.setState(g({
           mode: "Panorama",
           workCode: this.workUtil.workCode,
-          panoIndex: n
+          panoIndex: s
         }, oe(o))), yield this.five.ready();
       } else
         t === "Mapview" && (yield re(this.five, this.centerPosition, i == null ? void 0 : i.pointConfig));
+      return this;
     });
   }
   /**
@@ -224,8 +241,9 @@ class Ai {
    */
   blink(i) {
     return y(this, null, function* () {
-      var o, s, d, h;
-      const e = (o = this.enabled) != null ? o : !0, t = (s = this.state) == null ? void 0 : s.visible, r = e && t;
+      var o, n, d, p;
+      yield this.ready();
+      const e = (o = this.enabled) != null ? o : !0, t = (n = this.state) == null ? void 0 : n.visible, r = e && t;
       r === !1 && (this.state.visible = !0, this.enabled = !0, this.applyVisible(), this.plugin.render(), this.computeRenderType() !== "Mesh" ? yield new Promise((u) => y(this, null, function* () {
         if (this.dom || this.contentDom) {
           u();
@@ -234,7 +252,7 @@ class Ai {
         const a = setInterval(() => {
           (this.dom || this.contentDom) && (u(), clearInterval(a));
         }, 16.7);
-      })) : this.stickType === "Model" && !((d = this.model) != null && d.object) ? yield (h = this.model) == null ? void 0 : h.promise : this.stickType === "Plane" && (yield new Promise((u) => y(this, null, function* () {
+      })) : this.stickType === "Model" && !((d = this.model) != null && d.object) ? yield (p = this.model) == null ? void 0 : p.promise : this.stickType === "Plane" && (yield new Promise((u) => y(this, null, function* () {
         if (this.mediaPlane) {
           u();
           return;
@@ -243,16 +261,16 @@ class Ai {
           this.mediaPlane && (u(), clearInterval(a));
         }, 16.7);
       }))), this.dom && (this.dom.style.visibility = "hidden"), this.contentDom && (this.contentDom.style.visibility = "hidden"));
-      const n = (() => {
-        var a;
+      const s = (() => {
+        var a, m, h, v;
         const u = [];
-        return u.push(this.dom), this.stickType !== "2DPoint" && u.push(this.contentDom), u.push((a = this.model) == null ? void 0 : a.object), u.push(this.mediaPlane), u.filter(Boolean);
+        return u.push(this.dom), u.push((h = (m = (a = this.tag3DContentSvelte) == null ? void 0 : a.css3DInstance) == null ? void 0 : m.css3DObject) == null ? void 0 : h.opacityMesh), u.push((v = this.model) == null ? void 0 : v.object), u.push(this.mediaPlane), u.filter(Boolean);
       })();
-      if (!n.length) {
+      if (!s.length) {
         console.warn("tagDom is empty");
         return;
       }
-      yield (r ? ne : se)(n, p({
+      yield (r ? se : ne)(s, g({
         begin: () => {
           r === !1 && (this.dom && (this.dom.style.visibility = ""), this.contentDom && (this.contentDom.style.visibility = ""));
         },
@@ -306,7 +324,7 @@ class Ai {
    * @param deepMerge 是否深度合并 data，默认为 true
    */
   setData(i, e = !0) {
-    e ? this.data = b(this.data, i) : this.data = p(p({}, this.data), i), this.hooks.emit("dataChanged", this.data);
+    e ? this.data = b(this.data, i) : this.data = g(g({}, this.data), i), this.hooks.emit("dataChanged", this.data);
   }
   /**
    * @description 修改标签位置
@@ -333,19 +351,19 @@ class Ai {
     this.cache.clear();
   }
   updateVisible() {
-    this.state.visible = this.getVisible(), this.applyVisible();
+    this.state.visible = this.getVisible(), this.applyVisible(), this._updating = !1;
   }
   updateZIndex() {
     const i = this.getSquaredDistance();
     this.zIndex = Math.round((1e4 - (i != null ? i : 0)) * 100);
   }
   getConfig(i, e) {
-    var l, o, s;
-    const t = U(i != null ? i : this, this.plugin.config, { useCache: e == null ? void 0 : e.useCache }), r = (l = e == null ? void 0 : e.fiveMode) != null ? l : this.five.getCurrentState().mode, n = (o = t.configWithFiveMode) == null ? void 0 : o[r];
-    return (s = n != null ? n : t) != null ? s : {};
+    var l, o, n;
+    const t = U(i != null ? i : this, this.plugin.config, { useCache: e == null ? void 0 : e.useCache }), r = (l = e == null ? void 0 : e.fiveMode) != null ? l : this.five.getCurrentState().mode, s = (o = t.configWithFiveMode) == null ? void 0 : o[r];
+    return (n = s != null ? s : t) != null ? n : {};
   }
   getDistance(i, e = 3) {
-    const t = p(p({}, this.five.getCurrentState()), i), { panoIndex: r, mode: n } = t, l = n === "Panorama" ? this.workUtil.getObserverPosition(r) : this.five.camera.position, o = this.centerPosition;
+    const t = g(g({}, this.five.getCurrentState()), i), { panoIndex: r, mode: s } = t, l = s === "Panorama" ? this.workUtil.getObserverPosition(r) : this.five.camera.position, o = this.centerPosition;
     return !l || !o ? -1 : l.distanceTo(o);
   }
   /**
@@ -359,7 +377,7 @@ class Ai {
   getVisible(i) {
     if (!this.enabled || !this.plugin.state.enabled || !this.fiveUtil.model)
       return !1;
-    const e = p(p({}, this.five.getCurrentState()), i);
+    const e = g(g({}, this.five.getCurrentState()), i);
     let t = this.cache.getVisible(this, e);
     return R(t) && (t = this.computeVisible(e).value, this.cache.setVisible(this, e, t)), t;
   }
@@ -379,7 +397,7 @@ class Ai {
     if (i === "show" || i === "hide") {
       if (!e.visibleConfig || typeof e.visibleConfig != "object")
         return !0;
-      if (i === "show" && e.visibleConfig.keep === "hidden" || i === "hide" && (e.visibleConfig.keep === "visible" || e.visibleConfig.alwaysShowWhenMovePano))
+      if (i === "show" && e.visibleConfig.keep === "hidden" || i === "hide" && e.visibleConfig.keep === "visible")
         return !1;
     }
     if (i === "fold" || i === "unfold") {
@@ -415,68 +433,68 @@ class Ai {
     return i != null ? i : "Dom";
   }
   computeVisible(i) {
-    const e = p(p({}, this.five.getCurrentState()), i), { panoIndex: t, mode: r } = e, n = [];
+    const e = g(g({}, this.five.getCurrentState()), i), { panoIndex: t, mode: r } = e, s = [];
     return (() => {
       var d, u, a;
-      const s = (d = this.getConfig().visibleConfig) != null ? d : {};
-      if (typeof s == "function")
+      const n = (d = this.getConfig().visibleConfig) != null ? d : {};
+      if (typeof n == "function")
         return {
-          value: s(this.five, { tag: this, distance: this.getDistance(e, void 0) }),
-          checkedList: n,
+          value: n(this.five, { tag: this, distance: this.getDistance(e, void 0) }),
+          checkedList: s,
           reason: "config function result"
         };
       {
-        if (s.keep === "hidden")
-          return { value: !1, checkedList: n, reason: "config.keep is hidden" };
-        if (s.keep === "visible")
-          return { value: !0, checkedList: n, reason: "config.keep is visible" };
-        const g = this.computeVisibleByFiveMode(s, r);
-        if ((g == null ? void 0 : g.value) === !1)
-          return g;
-        if (s.followModelVisibility === !0 && ["poincare", "aerophoto", "sand"].includes(this.workUtil.fromType) && (r === "Floorplan" || r === "Mapview")) {
-          const h = this.computeVisibleByFloorIndex(), { value: m } = h, v = A(h, ["value"]);
-          if (m === !1)
-            return p({ value: !1, checkedList: n, reason: "followModelVisibility check failed" }, v);
+        if (n.keep === "hidden")
+          return { value: !1, checkedList: s, reason: "config.keep is hidden" };
+        if (n.keep === "visible")
+          return { value: !0, checkedList: s, reason: "config.keep is visible" };
+        const m = this.computeVisibleByFiveMode(n, r);
+        if ((m == null ? void 0 : m.value) === !1)
+          return m;
+        if (n.followModelVisibility === !0 && ["poincare", "aerophoto", "sand"].includes(this.workUtil.fromType) && (r === "Floorplan" || r === "Mapview")) {
+          const p = this.computeVisibleByFloorIndex(), { value: h } = p, v = A(p, ["value"]);
+          if (h === !1)
+            return g({ value: !1, checkedList: s, reason: "followModelVisibility check failed" }, v);
         }
-        if (T(r) && s.visiblePanoIndex !== void 0 && s.visiblePanoIndex !== "all" && t !== void 0) {
-          if (n.push("visiblePanoIndex"), Array.isArray(s.visiblePanoIndex) && !s.visiblePanoIndex.includes(t))
+        if (T(r) && n.visiblePanoIndex !== void 0 && n.visiblePanoIndex !== "all" && t !== void 0) {
+          if (s.push("visiblePanoIndex"), Array.isArray(n.visiblePanoIndex) && !n.visiblePanoIndex.includes(t))
             return {
               value: !1,
-              checkedList: n,
-              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${t}, visiblePanoIndex: ${s.visiblePanoIndex}`
+              checkedList: s,
+              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${t}, visiblePanoIndex: ${n.visiblePanoIndex}`
             };
-          if (s.visiblePanoIndex === "current" && t !== ((u = this.fiveState) == null ? void 0 : u.panoIndex))
+          if (n.visiblePanoIndex === "current" && t !== ((u = this.fiveState) == null ? void 0 : u.panoIndex))
             return {
               value: !1,
-              checkedList: n,
+              checkedList: s,
               reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${t}, tag.panoIndex: ${(a = this.fiveState) == null ? void 0 : a.panoIndex}`
             };
         }
-        if (s.visibleDistance !== void 0 && (n.push("visibleDistance"), s.visibleDistance !== "unLimited")) {
-          const m = this.getDistance(e, 1);
-          if (x(m, s.visibleDistance) === !1)
+        if (n.visibleDistance !== void 0 && (s.push("visibleDistance"), n.visibleDistance !== "unLimited")) {
+          const h = this.getDistance(e, 1);
+          if (x(h, n.visibleDistance) === !1)
             return {
               value: !1,
-              checkedList: n,
+              checkedList: s,
               panoIndex: t,
-              visibleDistance: s.visibleDistance,
-              reason: `distance is not in visibleDistance. distance: ${m}, visibleDistance: ${s.visibleDistance.min} - ${s.visibleDistance.max}`
+              visibleDistance: n.visibleDistance,
+              reason: `distance is not in visibleDistance. distance: ${h}, visibleDistance: ${n.visibleDistance.min} - ${n.visibleDistance.max}`
             };
         }
-        if (s.intersectRaycaster !== !1 && (typeof s.intersectRaycaster != "object" || s.intersectRaycaster.enabled !== !1)) {
-          if (n.push("intersectRaycaster"), t === void 0)
+        if (n.intersectRaycaster !== !1 && (typeof n.intersectRaycaster != "object" || n.intersectRaycaster.enabled !== !1)) {
+          if (s.push("intersectRaycaster"), t === void 0)
             return {
               value: !1,
-              checkedList: n,
+              checkedList: s,
               reason: `intersectRaycaster check failed: panoIndex is ${t}`
             };
-          const m = this.computeVisibleByIntersect(t);
-          if (m.value === !1)
-            return Object.assign(m, { checkedList: n });
+          const h = this.computeVisibleByIntersect(t);
+          if (h.value === !1)
+            return Object.assign(h, { checkedList: s });
         }
         return {
           value: !0,
-          checkedList: n,
+          checkedList: s,
           reason: "all check passed"
         };
       }
@@ -488,27 +506,27 @@ class Ai {
   computeVisibleByFiveMode(i, e) {
     const t = () => {
       var l, o;
-      let n = typeof i.visibleFiveMode == "function" ? i.visibleFiveMode(this) : i.visibleFiveMode;
-      if (n || (n = (o = (l = this.fiveState) == null ? void 0 : l.mode) != null ? o : this.workUtil.observers.length ? "Panorama" : "ModelLike"), Array.isArray(n))
-        return n.includes(e);
-      if (n === "ModelLike")
+      let s = typeof i.visibleFiveMode == "function" ? i.visibleFiveMode(this) : i.visibleFiveMode;
+      if (s || (s = (o = (l = this.fiveState) == null ? void 0 : l.mode) != null ? o : this.workUtil.observers.length ? "Panorama" : "ModelLike"), Array.isArray(s))
+        return s.includes(e);
+      if (s === "ModelLike")
         return k(e);
-      if (n === "PanoramaLike")
+      if (s === "PanoramaLike")
         return !T(e);
-      if (n === "all")
+      if (s === "all")
         return !0;
-      if (typeof n == "string")
-        return n === e;
+      if (typeof s == "string")
+        return s === e;
     };
     if ((() => {
       var l;
-      const n = t();
+      const s = t();
       if (E((l = this.fiveState) == null ? void 0 : l.panoIndex) && i.entryFromModel) {
-        if (k(e) && n ? this.entryFromModel = !1 : this.entryFromModel = !0, k(e))
+        if (k(e) && s ? this.entryFromModel = !1 : this.entryFromModel = !0, k(e))
           return !0;
       } else
         this.entryFromModel = !1;
-      return n;
+      return s;
     })() === !1)
       return {
         value: !1,
@@ -519,36 +537,36 @@ class Ai {
   }
   /** 通过射线检测标签可用性 */
   computeVisibleByIntersect(i) {
-    var s, d, h, u;
-    const e = J(J((s = this.getConfig().visibleConfig) != null ? s : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, r = T(this.five.getCurrentState().mode) ? this.workUtil.getObserverPosition(t) : this.five.camera.position;
+    var n, d, p, u;
+    const e = J(J((n = this.getConfig().visibleConfig) != null ? n : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, r = T(this.five.getCurrentState().mode) ? this.workUtil.getObserverPosition(t) : this.five.camera.position;
     if (r === void 0)
       return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
-    const n = te(
+    const s = te(
       (() => {
-        var g;
-        const a = (g = e.checkPoints) != null ? g : "center";
+        var m;
+        const a = (m = e.checkPoints) != null ? m : "center";
         return a === "center" ? z(this) : a === "corner" ? $(this) : Array.isArray(a) ? a : [];
       })()
     );
     let l = 0, o = 0;
-    for (const a of n) {
-      const g = new B.Vector3().subVectors(a, r).normalize();
-      let m;
-      S.set(r, g);
+    for (const a of s) {
+      const m = new B.Vector3().subVectors(a, r).normalize();
+      let h;
+      S.set(r, m);
       const [v] = this.fiveUtil.model.intersectRaycaster(S);
-      m = v == null ? void 0 : v.distance;
-      const M = (() => {
+      h = v == null ? void 0 : v.distance;
+      const I = (() => {
         if (!V(this))
           return;
-        const _ = this.plugin.tags.filter(V).map((Z) => {
+        const H = this.plugin.tags.filter(V).map((Z) => {
           var F;
           return (F = Z.model) == null ? void 0 : F.object;
-        }).filter(E), [X] = S.intersectObjects(_, !0);
+        }).filter(E), [X] = S.intersectObjects(H, !0);
         return X;
-      })(), W = r.distanceTo(a), q = (d = e.distanceAccuracy) != null ? d : 0.01;
-      m = Math.min(m != null ? m : 1 / 0, (h = M == null ? void 0 : M.distance) != null ? h : 1 / 0), m + q >= W ? l++ : o++;
-      const H = (u = e.needPassed) != null ? u : 1;
-      if (l >= H)
+      })(), _ = r.distanceTo(a), W = (d = e.distanceAccuracy) != null ? d : 0.01;
+      h = Math.min(h != null ? h : 1 / 0, (p = I == null ? void 0 : I.distance) != null ? p : 1 / 0), h + W >= _ ? l++ : o++;
+      const q = (u = e.needPassed) != null ? u : 1;
+      if (l >= q)
         return { value: !0 };
     }
     return o === 0 ? { value: !0 } : {
@@ -562,12 +580,12 @@ class Ai {
     };
   }
   computeVisibleByFloorIndex() {
-    var r, n, l, o, s, d, h;
+    var r, s, l, o, n, d, p;
     let i = 0;
     const e = (r = this.fiveState) == null ? void 0 : r.panoIndex;
-    e !== void 0 ? i = (n = this.workUtil.getObserver(e)) == null ? void 0 : n.floorIndex : i = fe(
+    e !== void 0 ? i = (s = this.workUtil.getObserver(e)) == null ? void 0 : s.floorIndex : i = fe(
       this.workUtil.work,
-      (h = (d = (o = (l = this.model) == null ? void 0 : l.object) == null ? void 0 : o.position) != null ? d : (s = this.mediaPlane) == null ? void 0 : s.position) != null ? h : z(this)
+      (p = (d = (o = (l = this.model) == null ? void 0 : l.object) == null ? void 0 : o.position) != null ? d : (n = this.mediaPlane) == null ? void 0 : n.position) != null ? p : z(this)
     );
     const t = this.fiveUtil.model.shownFloor;
     return {
@@ -612,20 +630,20 @@ class Ai {
           return !1;
       }
       if (i.autoUnfold.strategy === "MinimumDistance") {
-        const n = this.plugin.filterPointTag.filter((o) => o.currentVisible).filter((o) => {
-          const s = this.computeTagProject();
-          if (!s)
+        const s = this.plugin.filterPointTag.filter((o) => o.currentVisible).filter((o) => {
+          const n = this.computeTagProject();
+          if (!n)
             return !1;
-          const { x: d, y: h, z: u } = s;
-          return !(Math.abs(u) > 1 || Math.abs(d) > 1 || Math.abs(h) > 1);
+          const { x: d, y: p, z: u } = n;
+          return !(Math.abs(u) > 1 || Math.abs(d) > 1 || Math.abs(p) > 1);
         }).map((o) => ({ tag: o, id: o.id, tagConfig: o.getConfig().unfoldedConfig })).filter(({ tagConfig: o }) => {
-          var s, d;
-          return !(typeof o == "function" || o.keep || o.autoUnfold === !1 || ((s = o.autoUnfold) == null ? void 0 : s.enable) === !1 || ((d = o.autoUnfold) == null ? void 0 : d.strategy) !== "MinimumDistance");
-        }).map((o) => w(p({}, o), { distance: o.tag.getDistance() })).filter(({ distance: o, tagConfig: s }) => {
-          const d = s.autoUnfold.distance;
+          var n, d;
+          return !(typeof o == "function" || o.keep || o.autoUnfold === !1 || ((n = o.autoUnfold) == null ? void 0 : n.enable) === !1 || ((d = o.autoUnfold) == null ? void 0 : d.strategy) !== "MinimumDistance");
+        }).map((o) => w(g({}, o), { distance: o.tag.getDistance() })).filter(({ distance: o, tagConfig: n }) => {
+          const d = n.autoUnfold.distance;
           return !(d && x(o, d) === !1);
-        }).sort((o, s) => o.distance - s.distance).findIndex((o) => o.id === this.id);
-        if (n === -1 || n <= ((e = i.autoUnfold.maxNumber) != null ? e : 1) - 1 === !1)
+        }).sort((o, n) => o.distance - n.distance).findIndex((o) => o.id === this.id);
+        if (s === -1 || s <= ((e = i.autoUnfold.maxNumber) != null ? e : 1) - 1 === !1)
           return !1;
       }
       return i.autoUnfold.strategy !== "FoldWhenMove";
@@ -643,14 +661,14 @@ class Ai {
     if (!e || !this.plugin.domEvents)
       return () => {
       };
-    const r = () => !(!i.currentVisible || i.loading), n = (l) => {
+    const r = () => !(!i.currentVisible || i.loading), s = (l) => {
       if (!r())
         return !1;
       t(l.origDomEvent);
     };
-    return this.plugin.domEvents.addEventListener(e, "click", n), () => {
+    return this.plugin.domEvents.addEventListener(e, "click", s), () => {
       var l;
-      (l = this.plugin.domEvents) == null || l.removeEventListener(e, "click", n);
+      (l = this.plugin.domEvents) == null || l.removeEventListener(e, "click", s);
     };
   }
   whyHide() {
@@ -661,7 +679,7 @@ class Ai {
       return { reason: `plugin.state.visible is ${this.plugin.state.visible}` };
     if (!this.enabled)
       return { reason: `tag ${this.id} enabled is: ${this.enabled}` };
-    const i = w(p({}, this.computeVisible()), {
+    const i = w(g({}, this.computeVisible()), {
       tagInstance: this
     });
     return i.value !== this.state.visible ? { reason: "插件故障，请联系维护人员, err: 0", info: i } : this.state.visible ? { reason: "应该是能看见才对", info: i } : i.value === !0 ? { reason: "插件故障，请联系维护人员, err: 1", info: i } : { reason: (e = i.reason.type) != null ? e : i.reason, info: i };
@@ -679,5 +697,5 @@ class Ai {
   }
 }
 export {
-  Ai as BaseTag
+  Oi as BaseTag
 };

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

@@ -107,7 +107,8 @@ import "../../../shared-utils/url/getUrl.js";
 import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
-class mi extends D {
+import "../../../shared-utils/promise/withResolvers.js";
+class pi extends D {
   constructor(i, m) {
     super(i, m);
     l(this, "loading", !1);
@@ -160,5 +161,5 @@ class mi extends D {
   }
 }
 export {
-  mi as ModelTag
+  pi as ModelTag
 };

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

@@ -86,14 +86,15 @@ import "../../../shared-utils/url/getUrl.js";
 import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
+import "../../../shared-utils/promise/withResolvers.js";
 const P = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map();
-class _t extends f {
+class te extends f {
   constructor(e, t) {
     super(e, t), this.state.unfolded = !0;
   }
   applyVisible() {
-    var t, r, o, n, a, i;
-    this.computeRenderType() === "Mesh" ? ((r = (t = this.data.mediaData) == null ? void 0 : t[0]) == null ? void 0 : r.type) === "Video" ? this.renderVideoPlane() : ((n = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : n.type) === "Image" && this.renderImagePlane() : (this.tag3DContentSvelte || this.plugin.updateRender3DDomTag(), (a = this.tag3DContentSvelte) == null || a.svelteApp.$set({ tag: this, state: this.plugin.state }), (i = this.tag3DContentSvelte) == null || i.css3DInstance.setVisible(this.currentVisible));
+    var t, r, o, m, a, i;
+    this.computeRenderType() === "Mesh" ? ((r = (t = this.data.mediaData) == null ? void 0 : t[0]) == null ? void 0 : r.type) === "Video" ? this.renderVideoPlane() : ((m = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : m.type) === "Image" && this.renderImagePlane() : (this.tag3DContentSvelte || this.plugin.updateRender3DDomTag(), (a = this.tag3DContentSvelte) == null || a.svelteApp.$set({ tag: this, state: this.plugin.state }), (i = this.tag3DContentSvelte) == null || i.css3DInstance.setVisible(this.currentVisible));
   }
   renderVideoPlane() {
     var i;
@@ -103,9 +104,9 @@ class _t extends f {
     const { url: t } = e;
     if (!t)
       return;
-    const r = this.currentVisible, o = (() => !!(this.mediaPlane && !r))(), n = (() => !!(!this.mediaPlane && r))(), a = (() => !!(this.mediaPlane && this.mediaPlane.src !== t))();
-    if ((o || a) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), n || a) {
-      const p = this.position.map(d), m = new u(t, p, {
+    const r = this.currentVisible, o = (() => !!(this.mediaPlane && !r))(), m = (() => !!(!this.mediaPlane && r))(), a = (() => !!(this.mediaPlane && this.mediaPlane.src !== t))();
+    if ((o || a) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), m || a) {
+      const p = this.position.map(d), n = new u(t, p, {
         videoCoverSrc: e.videoCoverUrl,
         playButton: this.data.playIcon,
         paused: !((i = this.data.autoplayConfig) != null && i.autoplayVideo),
@@ -114,11 +115,11 @@ class _t extends f {
         ImageTextureMap: g,
         domEvents: this.plugin.domEvents
       });
-      m.onVideoReady = (s) => {
-        s.addEventListener("play", () => this.plugin.mediaStore.set({ currentMediaElement: m.videoInstance }));
+      n.onVideoReady = (s) => {
+        s.addEventListener("play", () => this.plugin.mediaStore.set({ currentMediaElement: n.videoInstance }));
       };
       const l = (s) => (this.five.on("renderFrame", s), () => this.five.off("renderFrame", s));
-      m.initialRenderHooks(l), this.mediaPlane = m, this.play = () => m.play(), this.pause = () => m.pause(), this.plugin.imagePlaneGroup.add(this.mediaPlane);
+      n.initialRenderHooks(l), this.mediaPlane = n, this.play = () => n.play(), this.pause = () => n.pause(), this.plugin.imagePlaneGroup.add(this.mediaPlane);
     }
     this.five.needsRender = !0;
   }
@@ -129,8 +130,8 @@ class _t extends f {
     const { url: t } = e;
     if (!t)
       return;
-    const r = this.position.map(d), o = this.currentVisible, n = (() => !!(this.mediaPlane && !o))(), a = (() => !!(!this.mediaPlane && o))(), i = (() => !!(this.mediaPlane && this.mediaPlane.src !== t))();
-    (n || i) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (a || i) && (this.mediaPlane = new c(t, r, { objectFit: this.data.objectFit }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
+    const r = this.position.map(d), o = this.currentVisible, m = (() => !!(this.mediaPlane && !o))(), a = (() => !!(!this.mediaPlane && o))(), i = (() => !!(this.mediaPlane && this.mediaPlane.src !== t))();
+    (m || i) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (a || i) && (this.mediaPlane = new c(t, r, { objectFit: this.data.objectFit }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
       this.mediaPlane,
       "click",
       (p) => {
@@ -144,5 +145,5 @@ class _t extends f {
   }
 }
 export {
-  _t as PlaneTag
+  te as PlaneTag
 };