@realsee/dnalogel 3.57.1 → 3.58.0

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

@@ -78,8 +78,9 @@ 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 v = new l.Vector2();
-class wt extends g {
+class zt extends g {
   constructor(t, i) {
     super(t, i);
     p(this, "__Object__");
@@ -164,5 +165,5 @@ class wt extends g {
   }
 }
 export {
-  wt as PointTag
+  zt as PointTag
 };

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -171,6 +171,7 @@ 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";
 import "../tag.config.js";
 import "../utils/normalPositionToPositions.js";
 import "../../vendor/svelte/store/index.js";
@@ -186,7 +187,7 @@ import "../../shared-utils/url/absoluteUrl.js";
 import "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
 import "../../base/BasePlugin.js";
-class _r extends N {
+class ti extends N {
   constructor(t) {
     super(t);
     c(this, "rendererMap", /* @__PURE__ */ new Map());
@@ -323,5 +324,5 @@ class _r extends N {
   }
 }
 export {
-  _r as TagRender
+  ti as TagRender
 };

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

@@ -72,7 +72,7 @@ export declare abstract class TagUtil extends BasePlugin.Controller<State, Plugi
     protected loadVideoFirstFrame: () => void;
     protected getPositions(tag: BaseTag): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [ArrayPosition, ArrayPosition, ArrayPosition, ArrayPosition];
     protected addObjectClickHandler(tag: BaseTag, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
-    protected tagsDo: (tags: TagInstance[], func: (tag: TagInstance) => any) => void;
+    protected tagsDo: (tags: TagInstance[], func: (tag: TagInstance) => any, isUpdateing?: boolean) => void;
     /**
      * @description 检查是否已经销毁
      * @returns isDisposed; 已经销毁返回 true，否则返回 false

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,18 +1,18 @@
 var h = Object.defineProperty;
-var f = (a, m, t) => m in a ? h(a, m, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[m] = t;
-var r = (a, m, t) => (f(a, typeof m != "symbol" ? m + "" : m, t), t);
-import { DefaultConfig as g } from "../tag.config.js";
+var g = (c, a, t) => a in c ? h(c, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[a] = t;
+var o = (c, a, t) => (g(c, typeof a != "symbol" ? a + "" : a, t), t);
+import { DefaultConfig as T } from "../tag.config.js";
 import "three";
-import { anyPositionToVector3 as l } from "../../shared-utils/positionToVector3.js";
-import { isPlaneTag as T, isMediaModelTag as D, isPoint3DTag as P } from "../utils/tag/tagCheck.js";
-import { normalPositionToPositions as _ } from "../utils/normalPositionToPositions.js";
-import { writable as y } from "../../vendor/svelte/store/index.js";
-import { isIOSWX as v } from "../../shared-utils/device.js";
-import { CSS3DRenderPlugin as E } from "../../CSS3DRenderPlugin/index.js";
-import { VideoPlane as S } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as k } from "../../shared-utils/five/FiveDomEvents.js";
-import { Cache as I } from "../utils/Cache.js";
-import { Controller as C } from "../../base/BasePlugin.js";
+import { anyPositionToVector3 as u } from "../../shared-utils/positionToVector3.js";
+import { isPlaneTag as D, isMediaModelTag as P, isPoint3DTag as _ } from "../utils/tag/tagCheck.js";
+import { normalPositionToPositions as y } from "../utils/normalPositionToPositions.js";
+import { writable as v } from "../../vendor/svelte/store/index.js";
+import { isIOSWX as E } from "../../shared-utils/device.js";
+import { CSS3DRenderPlugin as S } from "../../CSS3DRenderPlugin/index.js";
+import { VideoPlane as k } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as I } from "../../shared-utils/five/FiveDomEvents.js";
+import { Cache as C } from "../utils/Cache.js";
+import { Controller as M } from "../../base/BasePlugin.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
@@ -86,57 +86,67 @@ import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
-class ne extends C {
+class me extends M {
   constructor(t) {
     super(t);
-    r(this, "tags", []);
-    r(this, "cache", new I());
-    r(this, "config", g);
-    r(this, "renderQueue", /* @__PURE__ */ new Map());
+    o(this, "tags", []);
+    o(this, "cache", new C());
+    o(this, "config", T);
+    o(this, "renderQueue", /* @__PURE__ */ new Map());
     /** 插件参数 */
-    r(this, "params");
-    r(this, "mediaStore", y({
+    o(this, "params");
+    o(this, "mediaStore", v({
       currentMediaElement: null
     }));
-    r(this, "store", {
+    o(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    r(this, "domEvents", new k(this.five));
-    r(this, "_cache_pointTag");
-    r(this, "_cache_2DPointTag");
-    r(this, "_cache_css3DTag");
-    r(this, "_container", null);
-    r(this, "_css3DRenderPlugin");
-    r(this, "timeoutIds", []);
-    r(this, "whyHide", (t) => {
+    o(this, "domEvents", new I(this.five));
+    o(this, "_cache_pointTag");
+    o(this, "_cache_2DPointTag");
+    o(this, "_cache_css3DTag");
+    o(this, "_container", null);
+    o(this, "_css3DRenderPlugin");
+    o(this, "timeoutIds", []);
+    o(this, "whyHide", (t) => {
       const e = this.getTagById(t);
       return e ? e.whyHide() : { reason: `tag ${t} not found` };
     });
-    r(this, "loadVideoFirstFrame", () => {
-      v && this.hooks.emit("loadVideoFirstFrame");
+    o(this, "loadVideoFirstFrame", () => {
+      E && this.hooks.emit("loadVideoFirstFrame");
     });
-    r(this, "tagsDo", (t, e) => {
-      const i = [...t != null ? t : this.tags].sort((n, d) => n.getSquaredDistance() - d.getSquaredDistance());
-      this.timeoutIds.forEach((n) => clearTimeout(n)), this.timeoutIds.length = 0;
-      const o = i.length > 1e3, p = o ? 30 : 17, s = o ? 1 : 3;
-      for (let n = 0; n < i.length; n += s) {
-        const d = [];
-        for (let c = 0; c < s; c++)
-          i[n + c] && d.push(i[n + c]);
-        const u = setTimeout(() => {
-          d.forEach(e);
-        }, n * p);
-        this.timeoutIds.push(u);
+    o(this, "tagsDo", (t, e, i = !0) => {
+      let r = [...t != null ? t : this.tags].sort((s, m) => s.getSquaredDistance() - m.getSquaredDistance());
+      this.timeoutIds.forEach((s) => clearTimeout(s)), this.timeoutIds.length = 0;
+      for (let s = 0; s < 20; s++) {
+        const m = r[s];
+        m && (e(m), i && (m._updating = !1));
+      }
+      r = r.slice(20);
+      const d = r.length > 1e3, n = d ? 30 : 17, l = d ? 1 : 3;
+      for (let s = 0; s < r.length; s += l) {
+        const m = [];
+        for (let p = 0; p < l; p++)
+          r[s + p] && m.push(r[s + p]);
+        m.forEach((p) => {
+          i && (p._updating = !0);
+        });
+        const f = setTimeout(() => {
+          m.forEach((p) => {
+            e(p), i && (p._updating = !1);
+          });
+        }, s * n);
+        this.timeoutIds.push(f);
       }
     });
     this.mediaStore.subscribe(({ currentMediaElement: e }) => {
       this.tags.forEach((i) => {
-        var o;
-        if (i.mediaPlane instanceof S && e !== i.mediaPlane.videoInstance) {
-          if (!((o = i.mediaPlane.videoInstance) != null && o.src) || e === i.mediaPlane.videoInstance)
+        var r;
+        if (i.mediaPlane instanceof k && e !== i.mediaPlane.videoInstance) {
+          if (!((r = i.mediaPlane.videoInstance) != null && r.src) || e === i.mediaPlane.videoInstance)
             return;
           i.mediaPlane.pause();
         }
@@ -163,8 +173,8 @@ class ne extends C {
   get css3DRenderPlugin() {
     var t, e, i;
     if (!this._css3DRenderPlugin) {
-      const o = E(this.five);
-      this._css3DRenderPlugin = o, (t = o.frontModeCSS3DRenderer) != null && t.domElementWrapper && (o.frontModeCSS3DRenderer.domElementWrapper.style.zIndex = (i = (e = this.params.containerZIndex) == null ? void 0 : e.toString()) != null ? i : "");
+      const r = S(this.five);
+      this._css3DRenderPlugin = r, (t = r.frontModeCSS3DRenderer) != null && t.domElementWrapper && (r.frontModeCSS3DRenderer.domElementWrapper.style.zIndex = (i = (e = this.params.containerZIndex) == null ? void 0 : e.toString()) != null ? i : "");
     }
     return this._css3DRenderPlugin;
   }
@@ -181,12 +191,12 @@ class ne extends C {
     return (t = this._cache_css3DTag) != null ? t : [];
   }
   addRenderQueue(t) {
-    var p, s;
-    const { type: e, keys: i = [], tags: o = [] } = t;
+    var d, n;
+    const { type: e, keys: i = [], tags: r = [] } = t;
     this.renderQueue.has(e) ? this.renderQueue.set(e, {
-      keys: Array.from(/* @__PURE__ */ new Set([...(p = this.renderQueue.get(e).keys) != null ? p : [], ...i])),
-      tags: Array.from(/* @__PURE__ */ new Set([...(s = this.renderQueue.get(e).tags) != null ? s : [], ...o]))
-    }) : this.renderQueue.set(e, { keys: i, tags: o });
+      keys: Array.from(/* @__PURE__ */ new Set([...(d = this.renderQueue.get(e).keys) != null ? d : [], ...i])),
+      tags: Array.from(/* @__PURE__ */ new Set([...(n = this.renderQueue.get(e).tags) != null ? n : [], ...r]))
+    }) : this.renderQueue.set(e, { keys: i, tags: r });
   }
   getTagById(t) {
     const e = this.tags.find((i) => i.id === t);
@@ -201,25 +211,25 @@ class ne extends C {
     this.mediaStore.set({ currentMediaElement: null });
   }
   getPositions(t) {
-    if (T(t))
-      return t.position;
     if (D(t))
-      return t.data.mediaPosition;
+      return t.position;
     if (P(t))
-      return _(this.five.camera.position, l(t.position), l(t.normal));
+      return t.data.mediaPosition;
+    if (_(t))
+      return y(this.five.camera.position, u(t.position), u(t.normal));
   }
   addObjectClickHandler(t, e, i) {
     if (!e || !this.domEvents)
       return () => {
       };
-    const o = () => !(!t.currentVisible || t.loading), p = (s) => {
-      if (!o())
+    const r = () => !(!t.currentVisible || t.loading), d = (n) => {
+      if (!r())
         return !1;
-      i(s.origDomEvent);
+      i(n.origDomEvent);
     };
-    return this.domEvents.addEventListener(e, "click", p), () => {
-      var s;
-      (s = this.domEvents) == null || s.removeEventListener(e, "click", p);
+    return this.domEvents.addEventListener(e, "click", d), () => {
+      var n;
+      (n = this.domEvents) == null || n.removeEventListener(e, "click", d);
     };
   }
   /**
@@ -231,5 +241,5 @@ class ne extends C {
   }
 }
 export {
-  ne as TagUtil
+  me as TagUtil
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -1,41 +1,41 @@
-var S = Object.defineProperty, D = Object.defineProperties;
+var D = Object.defineProperty, S = Object.defineProperties;
 var P = Object.getOwnPropertyDescriptors;
 var y = Object.getOwnPropertySymbols;
 var U = Object.prototype.hasOwnProperty, A = Object.prototype.propertyIsEnumerable;
-var u = (d, a, e) => a in d ? S(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, m = (d, a) => {
+var c = (d, a, e) => a in d ? D(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, g = (d, a) => {
   for (var e in a || (a = {}))
-    U.call(a, e) && u(d, e, a[e]);
+    U.call(a, e) && c(d, e, a[e]);
   if (y)
     for (var e of y(a))
-      A.call(a, e) && u(d, e, a[e]);
+      A.call(a, e) && c(d, e, a[e]);
   return d;
-}, c = (d, a) => D(d, P(a));
-var p = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
+}, u = (d, a) => S(d, P(a));
+var p = (d, a, e) => (c(d, typeof a != "symbol" ? a + "" : a, e), e);
 var l = (d, a, e) => new Promise((t, i) => {
-  var o = (s) => {
+  var o = (r) => {
     try {
-      n(e.next(s));
+      n(e.next(r));
     } catch (h) {
       i(h);
     }
-  }, r = (s) => {
+  }, s = (r) => {
     try {
-      n(e.throw(s));
+      n(e.throw(r));
     } catch (h) {
       i(h);
     }
-  }, n = (s) => s.done ? t(s.value) : Promise.resolve(s.value).then(o, r);
+  }, n = (r) => r.done ? t(r.value) : Promise.resolve(r.value).then(o, s);
   n((e = e.apply(d, a)).next());
 });
 import * as v from "three";
-import { objectAssignDeepExports as f } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as m } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { arrayPositionToVector3 as E } from "../../shared-utils/positionToVector3.js";
 import { isModelTag as k, isMediaModelTag as F } from "../utils/tag/tagCheck.js";
 import { debounce as w } from "../utils/debounce.js";
-import { throttle as M } from "../utils/throttle.js";
-import _, { getTagStickType as L } from "../utils/tag/format.js";
+import { throttle as _ } from "../utils/throttle.js";
+import M, { getTagStickType as L } from "../utils/tag/format.js";
 import { generateBlankAudio as I, AudioNamespace as R } from "../../shared-utils/audio.js";
-import { resizeObserver as b } from "../../shared-utils/dom/resizeObserver.js";
+import { resizeObserver as T } from "../../shared-utils/dom/resizeObserver.js";
 import { TagRender as B } from "./TagRender.js";
 import "../../shared-utils/tag.js";
 import { isModelLike as O } from "../../shared-utils/five/mode.js";
@@ -50,7 +50,7 @@ import { waitFiveModelLoaded as G } from "../../shared-utils/five/fiveModelLoad.
 import { nextFrame as N } from "../../shared-utils/animationFrame/index.js";
 import "../../shared-utils/five/FivePuppet.js";
 import { DebugUtil as V } from "../utils/DebugUtil.js";
-import { safeObj as T } from "../../shared-utils/safeObj.js";
+import { safeObj as b } from "../../shared-utils/safeObj.js";
 import { PointTag as z } from "./Tag/PointTag.js";
 import { ModelTag as Q } from "./Tag/ModelTag.js";
 import { PlaneTag as $ } from "./Tag/PlaneTag.js";
@@ -197,6 +197,7 @@ import "../utils/checkRange.js";
 import "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/five/getFloorIndex.js";
 import "../utils/Cache.js";
+import "../../shared-utils/promise/withResolvers.js";
 import "./TagUtil.js";
 import "../tag.config.js";
 import "../utils/normalPositionToPositions.js";
@@ -215,8 +216,8 @@ import "../../base/BasePlugin.js";
 import "../utils/addDebugPoints.js";
 import "../Components/TagItem.js";
 import "../Components/Common/TagPoint.js";
-const C = "Dnalogel-PanoTagPlugin", To = (d) => `${C}--${d}`;
-class Co extends B {
+const C = "Dnalogel-PanoTagPlugin", Co = (d) => `${C}--${d}`;
+class Do extends B {
   constructor(e, t) {
     super(e);
     /** state */
@@ -227,11 +228,11 @@ class Co extends B {
     /** 更改 tag 模型 */
     p(this, "changeTagModel", (e, t) => l(this, null, function* () {
       var i;
-      e.data = f({}, e.data, t), yield (i = e.loadModel) == null ? void 0 : i.call(e);
+      e.data = m({}, e.data, t), yield (i = e.loadModel) == null ? void 0 : i.call(e);
     }));
     p(this, "handleFiveModeChange", (e) => {
       const t = () => {
-        this.tags.forEach((i) => {
+        this.filter2DPointTag.forEach((i) => {
           i.state.visible = !1, i.applyVisible();
         }), this.five.ready().then(() => {
           this.tagsDo(this.tags, (i) => {
@@ -246,10 +247,8 @@ class Co extends B {
         this.temporaryState.visible = !1, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] });
         return;
       } else
-        this.tags.forEach((t) => {
-          t.getVisible({ panoIndex: e }) && (t.state.visible = !0);
-          const o = t.getConfig();
-          typeof o.visibleConfig == "object" && t.temporaryState && (o.visibleConfig.keep ? t.temporaryState.visible = o.visibleConfig.keep === "visible" : t.temporaryState.visible = !!o.visibleConfig.alwaysShowWhenMovePano);
+        this.temporaryState.visible = !0, this.tags.forEach((t) => {
+          t.temporaryState.visible = !0;
         }), this.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.tags.forEach((t) => t.applyVisible());
     });
     p(this, "clickhandler", (e) => {
@@ -264,8 +263,8 @@ class Co extends B {
       }, 1e3);
     });
     p(this, "handleFivePanoArrived", () => l(this, null, function* () {
-      this.tags.forEach((e) => {
-        e.state.visible = !1, e.temporaryState = c(m({}, e.temporaryState), { visible: !0 }), e.applyVisible();
+      this.filter2DPointTag.forEach((e) => {
+        e.state.visible = !1, e.applyVisible();
       }), this.tagsDo(this.tags, (e) => {
         e.updateVisible();
       }), this.temporaryState.visible = !0, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }), yield this.setUnfolded(), this.updateRender3DDomTag(), this.tags.filter(k).filter((e) => {
@@ -279,10 +278,10 @@ class Co extends B {
         t.position.copy(i.position), t.quaternion.copy(i.quaternion);
         const o = this.five.camera.position;
         t.lookAt(o.clone().setY(t.position.y));
-        const r = i.quaternion.clone(), n = t.quaternion.clone(), s = W();
-        s.onUpdate(({ progress: g }) => {
-          i.quaternion.copy(r.clone().slerp(n, g));
-        }), s.play();
+        const s = i.quaternion.clone(), n = t.quaternion.clone(), r = W();
+        r.onUpdate(({ progress: f }) => {
+          i.quaternion.copy(s.clone().slerp(n, f));
+        }), r.play();
       });
     }));
     /** 楼层切换时，需要更新标签可见性 */
@@ -296,9 +295,9 @@ class Co extends B {
       this.renderQueue.forEach((e, t) => {
         const { keys: i } = e;
         if (t === "TagContainerSvelte") {
-          const r = this.filterPointTag.filter((s) => s.screenPosition), n = {
+          const s = this.filterPointTag.filter((r) => r.screenPosition), n = {
             hooks: this.hooks,
-            tags: r,
+            tags: s,
             state: this.state,
             temporaryState: this.temporaryState,
             mediaStore: this.mediaStore,
@@ -307,28 +306,28 @@ class Co extends B {
             zIndex: this.params.containerZIndex
           };
           if (this.TagContainerSvelte) {
-            let s = {};
+            let r = {};
             if (i.length === 0)
-              s = n;
+              r = n;
             else
               for (const h of i)
-                s[h] = n[h];
-            this.TagContainerSvelte.$set(s);
+                r[h] = n[h];
+            this.TagContainerSvelte.$set(r);
           } else {
             if (!this.container)
               return console.error("updateRenderPlaneTag: tag2DContainer not found");
             this.TagContainerSvelte = new x({
               target: this.container,
-              props: c(m({}, n), { state: c(m({}, this.state), { enabled: !1 }) })
+              props: u(g({}, n), { state: u(g({}, this.state), { enabled: !1 }) })
             }), N(() => {
-              var s;
-              (s = this.TagContainerSvelte) == null || s.$set({ state: this.state });
+              var r;
+              (r = this.TagContainerSvelte) == null || r.$set({ state: this.state });
             });
           }
         }
       }), this.renderQueue.clear();
     });
-    this.params = f({}, { debug: !1, config: this.config }, m({}, t)), this.debug = this.params.debug, this.config = this.params.config, this.debug && this.debugUtil.bindLog(), I(1, { namespace: R.PlayAudio });
+    this.params = m({}, { debug: !1, config: this.config }, g({}, t)), this.debug = this.params.debug, this.config = this.params.config, this.debug && this.debugUtil.bindLog(), I(1, { namespace: R.PlayAudio });
     try {
       Array.isArray(window.__PANOTAGPLUGIN_DEBUG_LIST__) || (window.__PANOTAGPLUGIN_DEBUG_LIST__ = []), this.NAME = C + "-" + window.__PANOTAGPLUGIN_DEBUG_LIST__.length, window.__PANOTAGPLUGIN_DEBUG_LIST__.push(this), window.__PANOTAGPLUGIN_DEBUG__ || Object.defineProperty(window, "__PANOTAGPLUGIN_DEBUG__", {
         get: function() {
@@ -339,9 +338,9 @@ class Co extends B {
     }
   }
   appendTo(e) {
-    var i, o, r, n;
+    var i, o, s, n;
     this.debugUtil.addLog("appendTo"), this.container = e, (i = this.css3DRenderPlugin) == null || i.appendToFrontFiveContainer(this.container);
-    const t = (r = (o = this.TagContainerSvelte) == null ? void 0 : o.$$) == null ? void 0 : r.root;
+    const t = (s = (o = this.TagContainerSvelte) == null ? void 0 : o.$$) == null ? void 0 : s.root;
     t && t !== this.container && ((n = this.TagContainerSvelte) == null || n.$destroy(), this.TagContainerSvelte = void 0);
   }
   /**
@@ -353,9 +352,9 @@ class Co extends B {
       this.clearTags();
       try {
         console.debug(this.NAME, " load:", { data: JSON.parse(JSON.stringify(e)) });
-      } catch (r) {
+      } catch (s) {
       }
-      this.config = f({}, this.config, {
+      this.config = m({}, this.config, {
         globalConfig: (i = e.globalConfig) != null ? i : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       });
@@ -369,17 +368,17 @@ class Co extends B {
   addTag(e) {
     return l(this, null, function* () {
       const i = (Array.isArray(e) ? e : [e]).filter((o) => o.position).map((o) => {
-        const r = L(o);
-        if (r === "2DPoint" || r === "3DPoint")
+        const s = L(o);
+        if (s === "2DPoint" || s === "3DPoint")
           return new z(this, o);
-        if (r === "Model")
+        if (s === "Model")
           return new Q(this, o);
-        if (r === "Plane")
+        if (s === "Plane")
           return new $(this, o);
       });
-      return i.forEach(_), this.tags.push(...i), this.tagsLengthWillUpdate = !0, G(this.five).then(() => l(this, null, function* () {
-        var o, r;
-        this.store.eventListenerDisposer && ((r = (o = this.store).eventListenerDisposer) == null || r.call(o)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.tagsDo(i, (n) => {
+      return i.forEach(M), this.tags.push(...i), this.tagsLengthWillUpdate = !0, G(this.five).then(() => l(this, null, function* () {
+        var o, s;
+        this.store.eventListenerDisposer && ((s = (o = this.store).eventListenerDisposer) == null || s.call(o)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.tagsDo(i, (n) => {
           this.tags.includes(n) && (n.stickType === "Model" && n.loadModel().then(() => {
             this.tags.includes(n) && n.updateVisible();
           }), n.updateVisible(), n.updateZIndex());
@@ -391,17 +390,15 @@ class Co extends B {
    * @description 改变配置
    */
   changeConfig(e, t = !0) {
-    t ? this.config = f({}, this.config, e) : this.config = e, this.tags.forEach((i) => {
+    t ? this.config = m({}, this.config, e) : this.config = e, this.tags.forEach((i) => {
       i.updateConfig();
-    }), this.tagsDo(this.tags, (i) => {
-      i.updateVisible();
-    });
+    }), this.tagsDo(this.tags, (i) => i.updateVisible());
   }
   /**
    * @description 改变全局配置
    */
   changeGlobalConfig(e, t = !0) {
-    t ? this.config.globalConfig = f({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.tags.forEach((i) => {
+    t ? this.config.globalConfig = m({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.tags.forEach((i) => {
       i.updateConfig();
     }), this.tagsDo(this.tags, (i) => {
       i.updateVisible();
@@ -411,7 +408,7 @@ class Co extends B {
    * @description 改变类型配置
    */
   changeContentTypeConfig(e, t, i = !0) {
-    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = f({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.tags.forEach((o) => {
+    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = m({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.tags.forEach((o) => {
       o.updateConfig();
     }), this.tagsDo(this.tags, (o) => {
       o.updateVisible();
@@ -448,18 +445,18 @@ class Co extends B {
   setState(e, t) {
     if (this.checkDisposed())
       return;
-    const { userAction: i = !0 } = t != null ? t : {}, o = m({}, this.state);
+    const { userAction: i = !0 } = t != null ? t : {}, o = g({}, this.state);
     this.state = Object.assign(this.state, e), o.visible !== this.state.visible && (e.visible ? this.handleShow() : this.handleHide()), o.enabled !== this.state.enabled && (e.enabled ? this.handleEnable() : this.handleDisable()), this.hooks.emit("stateChange", { state: this.state, prevState: o, userAction: i });
   }
   /**
    * @description 销毁
    */
   dispose() {
-    var e, t, i, o, r, n;
-    this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filterCSS3DTag.forEach((s) => {
+    var e, t, i, o, s, n;
+    this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filterCSS3DTag.forEach((r) => {
       var h;
-      return (h = s.tag3DContentSvelte) == null ? void 0 : h.svelteApp.$destroy();
-    }), this.tags.forEach((s) => s.cache.clear()), this.tags = [], this.tagsLengthWillUpdate = !0, this.hooks.emit("tagsLengthChange"), (t = this.store.disposers) == null || t.forEach((s) => s == null ? void 0 : s()), this.store.disposers = [], (o = (i = this.store).eventListenerDisposer) == null || o.call(i), this.store.eventListenerDisposer = void 0, (n = (r = this.store).resizeObserverDisposer) == null || n.call(r), this.store.resizeObserverDisposer = void 0, this.store.resizeObserverDisposerAdding = !1, this.five.scene.remove(this.group), this.group.remove(...this.group.children), this.gltfObjectGroup.remove(...this.gltfObjectGroup.children), this.imagePlaneGroup.remove(...this.imagePlaneGroup.children), this.five.needsRender = !0, this.store.disposed = !0, this.hooks.emit("dispose");
+      return (h = r.tag3DContentSvelte) == null ? void 0 : h.svelteApp.$destroy();
+    }), this.tags.forEach((r) => r.cache.clear()), this.tags = [], this.tagsLengthWillUpdate = !0, this.hooks.emit("tagsLengthChange"), (t = this.store.disposers) == null || t.forEach((r) => r == null ? void 0 : r()), this.store.disposers = [], (o = (i = this.store).eventListenerDisposer) == null || o.call(i), this.store.eventListenerDisposer = void 0, (n = (s = this.store).resizeObserverDisposer) == null || n.call(s), this.store.resizeObserverDisposer = void 0, this.store.resizeObserverDisposerAdding = !1, this.five.scene.remove(this.group), this.group.remove(...this.group.children), this.gltfObjectGroup.remove(...this.gltfObjectGroup.children), this.imagePlaneGroup.remove(...this.imagePlaneGroup.children), this.five.needsRender = !0, this.store.disposed = !0, this.hooks.emit("dispose");
   }
   /**
    * @description 闪烁标签
@@ -548,8 +545,8 @@ class Co extends B {
   clearTags() {
     var e;
     this.tags.length && (this.tags.forEach((t) => {
-      var i, o, r, n, s;
-      (o = (i = t.mediaPlane) == null ? void 0 : i.parent) == null || o.remove(t.mediaPlane), (s = (n = (r = t.model) == null ? void 0 : r.object) == null ? void 0 : n.parent) == null || s.remove(t.model.object);
+      var i, o, s, n, r;
+      (o = (i = t.mediaPlane) == null ? void 0 : i.parent) == null || o.remove(t.mediaPlane), (r = (n = (s = t.model) == null ? void 0 : s.object) == null ? void 0 : n.parent) == null || r.remove(t.model.object);
     }), this.tags = [], this.tagsLengthWillUpdate = !0, this.hooks.emit("tagsLengthChange"), (e = this.TagContainerSvelte) == null || e.$destroy(), this.TagContainerSvelte = void 0, this.disposeAllCSS3DContainer()), this.enabledModelTagSet.clear(), this.cache.clear();
   }
   /**
@@ -579,8 +576,8 @@ class Co extends B {
   handleDisable() {
     var e, t, i;
     this.pauseCurrentMedia(), this.state.enabled = !1, (t = (e = this.store).eventListenerDisposer) == null || t.call(e), this.five.scene.remove(this.group), (i = this.TagContainerSvelte) == null || i.$set({ tags: [] }), this.filterCSS3DTag.forEach((o) => {
-      var r;
-      (r = o.tag3DContentSvelte) == null || r.dispose(), o.tag3DContentSvelte = void 0;
+      var s;
+      (s = o.tag3DContentSvelte) == null || s.dispose(), o.tag3DContentSvelte = void 0;
     }), this.five.needsRender = !0;
   }
   addResizeListener() {
@@ -598,17 +595,17 @@ class Co extends B {
       this.state.enabled && (this.filterPointTag.forEach((h) => h.updateScreenPosition({ force: !0 })), this.temporaryState.visible = !0, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }));
     }, i = () => {
       this.state.enabled && (this.temporaryState.visible = !1, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }));
-    }, { observe: o, unobserve: r } = b(
-      M(() => {
+    }, { observe: o, unobserve: s } = T(
+      _(() => {
         this.store.resizeObserverDisposer && i();
       }, 500),
       e
-    ), { observe: n, unobserve: s } = b(
+    ), { observe: n, unobserve: r } = T(
       w(() => t(), 400),
       e
     );
     return o(), n(), () => {
-      r(), s();
+      s(), r();
     };
   }
   setUnfoldedByCamera() {
@@ -618,18 +615,18 @@ class Co extends B {
       if (t.state && i !== void 0) {
         if (i === !0 && t.screenPosition) {
           const o = t.getConfig().unfoldedConfig;
-          T(o).keep !== "unfolded" && (e = !0);
+          b(o).keep !== "unfolded" && (e = !0);
         }
         t.state.unfolded = i;
       }
     }), e && this.filterPointTag.forEach((t) => {
       const i = t.getConfig().unfoldedConfig;
-      typeof i == "object" && (i.autoUnfold || i.autoUnfold === !1 || T(i.autoUnfold).enable === !1 || i.keep) || t.state && (t.state.unfolded = !1);
+      typeof i == "object" && (i.autoUnfold || i.autoUnfold === !1 || b(i.autoUnfold).enable === !1 || i.keep) || t.state && (t.state.unfolded = !1);
     });
   }
   changeTagMode(e, t) {
-    var i, o, r, n, s, h;
-    ((i = e.config) == null ? void 0 : i.renderType) !== "Mesh" && ((n = (r = (o = e.tag3DContentSvelte) == null ? void 0 : o.css3DInstance) == null ? void 0 : r.css3DObject) == null ? void 0 : n.mode) !== t && ((s = e.config) != null && s.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);
+    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((f) => f == null ? void 0 : f()), e.tag3DContentSvelte = void 0);
   }
   /**
    * @description 添加 cameraUpdate, panoArrived 等事件监听
@@ -642,7 +639,7 @@ class Co extends B {
   }
 }
 export {
-  Co as PanoTagPluginController,
-  Co as default,
-  To as pluginFlag
+  Do as PanoTagPluginController,
+  Do as default,
+  Co as pluginFlag
 };