@realsee/dnalogel 2.4.0 → 2.5.0

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

@@ -1,5 +1,5 @@
 import type { Five } from '@realsee/five';
-import { Tag, Tags, TagConfig, PointType, DimensionType, ContentTypeConfigKey, PlaneTag, TagElement, Tag2DElement, Tag3DElement, PlaneTagElement, PointTagElement, Tag3D, TagId } from '../typings';
+import type { Tag, Tags, TagConfig, ContentTypeConfigKey, PlaneTag, TagElement, Point2DElement, Point3DElement, PlaneTagElement, PointTagElement, Point3DTag, TagId, StickType, TagContentType } from '../typings';
 import { TagCacheController } from './TagCacheController';
 export declare abstract class TagComputer extends TagCacheController {
     tags: TagElement[];
@@ -7,17 +7,10 @@ export declare abstract class TagComputer extends TagCacheController {
         globalConfig?: Tags['globalConfig'];
         contentTypeConfig?: Tags['contentTypeConfig'];
     };
+    protected get isPanorama(): boolean;
     private raycaster;
     protected constructor(five: Five);
-    getTagById(id: TagId): TagElement<import("../typings").ContentType, PointType, DimensionType, {}>;
-    /**
-     * @description: 改变配置
-     */
-    changeConfig(config: TagComputer['config'], merge?: boolean): void;
-    /**
-     * @description: 改变全局配置
-     */
-    changeGlobalConfig(globalConfig: TagComputer['config']['globalConfig'], merge?: boolean): void;
+    getTagById(id: TagId): TagElement<TagContentType, StickType>;
     /**
      * @description: 改变类型配置
      */
@@ -25,28 +18,29 @@ export declare abstract class TagComputer extends TagCacheController {
     /**
      * @description: 获取是否可见
      */
-    getVisibleByPanoIndex(tag: Tag, panoIndex?: number): boolean;
+    getVisibleByPanoIndex(tag: Tag<any, any>, panoIndex?: number): boolean;
     /**
      * @description: 获取是否展开
      */
-    getUnfoldedByPanoIndex(tag: Tag, panoIndex?: number): boolean;
+    getUnfoldedByPanoIndex(tag: Tag<any>, panoIndex?: number): boolean;
     /**
      * @description: 获取是否展开
      */
-    getUnfoldedByCamera(tag: Tag): boolean;
+    getUnfoldedByCamera(tag: Tag<any, any>): boolean;
     /**
      * @description: 获取距离
      */
-    getDistance(tag: Tag, panoIndex?: number): number;
+    getDistance(tag: Tag<any, any>, panoIndex?: number): number;
     /**
      * @description: 获取角度
      */
-    getAngle(tag: Tag3D | PlaneTag, panoIndex?: number): number;
+    getAngle(tag: Point3DTag | PlaneTag, panoIndex?: number): number;
     /**
      * @description: 获取merge后的配置
      */
-    getTagConfig(tag: Tag): TagConfig<import("../typings").ContentType, PointType, DimensionType, {}>;
-    protected canBe(action: 'show' | 'hide' | 'fold' | 'unfold', tag: Tag): boolean;
+    getTagConfig(tag: Tag<any, any>): TagConfig<TagContentType, StickType>;
+    protected can(action: 'show' | 'hide' | 'fold' | 'unfold', tag: Tag<any, any>): boolean;
+    protected sort<T extends Tag<any, any>>(tags: T[]): T[];
     /**
      * @description: 一个点的标签
      */
@@ -56,14 +50,17 @@ export declare abstract class TagComputer extends TagCacheController {
     /**
      * @description: 一个点的标签
      */
-    protected getTagProject(tag: Tag): {
+    protected getTagProject(tag: Tag<any, any>): {
         x: number;
         y: number;
         z: number;
     };
-    protected filterPointTag(): PointTagElement[];
-    protected filterTag2D(): Tag2DElement[];
-    protected filter3DPointTag(): Tag3DElement[];
-    protected filter3DTag(): TagElement<any, PointType, DimensionType.Three>[];
+    protected filterPointTag(): PointTagElement<TagContentType>[];
+    protected filter2DPointTag(): Point2DElement<TagContentType>[];
+    protected filter3DPointTag(): Point3DElement<TagContentType>[];
+    protected filter3DTag(): TagElement<any, "3DPoint" | "Plane">[];
     protected filterPlaneTag(): PlaneTagElement[];
+    protected updateTagConfig(params?: {
+        force?: boolean;
+    }): void;
 }

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,194 +1,217 @@
-var w = Object.defineProperty;
-var j = (p, u, e) => u in p ? w(p, u, { enumerable: !0, configurable: !0, writable: !0, value: e }) : p[u] = e;
-var b = (p, u, e) => (j(p, typeof u != "symbol" ? u + "" : u, e), e);
-import T from "object-assign-deep";
+var U = Object.defineProperty, j = Object.defineProperties;
+var w = Object.getOwnPropertyDescriptors;
+var m = Object.getOwnPropertySymbols;
+var A = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
+var P = (u, c, e) => c in u ? U(u, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[c] = e, k = (u, c) => {
+  for (var e in c || (c = {}))
+    A.call(c, e) && P(u, e, c[e]);
+  if (m)
+    for (var e of m(c))
+      B.call(c, e) && P(u, e, c[e]);
+  return u;
+}, x = (u, c) => j(u, w(c));
+var b = (u, c, e) => (P(u, typeof c != "symbol" ? c + "" : c, e), e);
+import D from "object-assign-deep";
 import * as I from "three";
-import { DefaultConfig as k } from "../tag.config.js";
-import { DimensionType as y, PointType as v } from "../typings/tag.js";
-import { arrayPositionToVector3 as B, anyPositionToVector3 as U } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { planeNormal as E } from "../utils/planeNormal.js";
-import { tagPosition as C } from "../utils/tagPosition.js";
-import { checkRange as P } from "../utils/checkRange.js";
-import { TagCacheController as V } from "./TagCacheController.js";
-class O extends V {
+import { DefaultConfig as E } from "../tag.config.js";
+import { is3DTag as R, isPointTag as V } from "../utils/tag/tagCheck.js";
+import { arrayPositionToVector3 as M, anyPositionToVector3 as S } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { planeNormal as $ } from "../utils/planeNormal.js";
+import { tagPosition as T } from "../utils/tagPosition.js";
+import { checkRange as y } from "../utils/checkRange.js";
+import { TagCacheController as z } from "./TagCacheController.js";
+import "../../CSS3DRenderPlugin/utils/centerPoint.js";
+import "../../base/BasePlugin.js";
+import "../../shared-utils/Subscribe.js";
+class Y extends z {
   constructor(e) {
     super(e);
     b(this, "tags", []);
-    b(this, "config", k);
+    b(this, "config", E);
     b(this, "raycaster", new I.Raycaster());
   }
+  get isPanorama() {
+    return this.five.currentMode === "Panorama";
+  }
   getTagById(e) {
-    const n = this.tags.find((i) => i.id === e);
-    if (!n) {
-      console.error(`getTagById(): tag is ${n}, id is ${e}`);
+    const t = this.tags.find((i) => i.id === e);
+    if (!t) {
+      console.error(`getTagById(): tag is ${t}, id is ${e}`);
       return;
     }
-    return n;
-  }
-  changeConfig(e, n = !0) {
-    n ? this.config = T({}, this.config, e) : this.config = e, this.clearCache();
-  }
-  changeGlobalConfig(e, n = !0) {
-    n ? this.config.globalConfig = T({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.clearCache();
+    return t;
   }
-  changeContentTypeConfig(e, n, i = !0) {
-    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = T({}, this.config.contentTypeConfig[e], n) : this.config.contentTypeConfig[e] = n, this.clearCache();
+  changeContentTypeConfig(e, t, i = !0) {
+    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = D({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.clearCache();
   }
-  getVisibleByPanoIndex(e, n) {
-    var t;
-    const i = this.getCaches({ panoIndex: n, id: e.id }), o = (t = this.five.panoIndex) != null ? t : n;
+  getVisibleByPanoIndex(e, t) {
+    var o;
+    const i = this.getCaches({ panoIndex: t, id: e.id }), s = (o = this.five.panoIndex) != null ? o : t;
     if (i.visible !== void 0)
       return i.visible;
     {
-      const r = (() => {
-        var a, d, l, c, h;
-        const s = (a = this.getTagConfig(e).visibleConfig) != null ? a : {}, f = this.getDistance(e);
-        if (typeof s == "function")
-          return s(this.five, { tag: e, distance: f });
-        if (s.keep === "hidden")
+      const f = (() => {
+        var d, g, r;
+        const n = (d = this.getTagConfig(e).visibleConfig) != null ? d : {}, l = this.getDistance(e);
+        if (typeof n == "function")
+          return n(this.five, { tag: e, distance: l });
+        if (n.keep === "hidden")
           return !1;
-        if (s.keep === "visible")
+        if (n.keep === "visible")
           return !0;
-        if (s.visiblePanoIndex !== void 0 && (o === void 0 || !s.visiblePanoIndex.includes(o)) || s.visibleDistance !== void 0 && s.visibleDistance !== "unLimited" && P(f, s.visibleDistance) === !1)
+        if (n.visiblePanoIndex !== void 0 && n.visiblePanoIndex !== "all" && s !== void 0 && (Array.isArray(n.visiblePanoIndex) && !n.visiblePanoIndex.includes(s) || n.visiblePanoIndex === "current" && s !== ((g = e.fiveState) == null ? void 0 : g.panoIndex)) || n.visibleDistance !== void 0 && n.visibleDistance !== "unLimited" && y(l, n.visibleDistance) === !1)
           return !1;
-        if (((d = s.intersectRaycaster) == null ? void 0 : d.enabled) !== !1) {
-          if (o === void 0)
+        if (n.intersectRaycaster !== !1 && (typeof n.intersectRaycaster != "object" || n.intersectRaycaster.enabled !== !1)) {
+          if (s === void 0)
             return !1;
-          const g = (l = this.five.work.observers[o]) == null ? void 0 : l.position;
-          if (g === void 0)
-            throw new Error(`getVisible(): observerPosition is ${g}`);
-          const m = C(e.position).sub(g).normalize();
-          this.raycaster.set(g, m);
-          const [x] = this.five.model.intersectRaycaster(this.raycaster), D = (h = (c = s.intersectRaycaster) == null ? void 0 : c.distanceAccuracy) != null ? h : 0.01;
-          if (x && x.distance + D < f)
+          const a = (r = this.five.work.observers[s]) == null ? void 0 : r.position;
+          if (a === void 0)
+            throw new Error(`getVisible(): observerPosition is ${a}`);
+          const p = T(e.position).sub(a).normalize();
+          this.raycaster.set(a, p);
+          const [h] = this.five.model.intersectRaycaster(this.raycaster), v = (() => {
+            var C;
+            return typeof n.intersectRaycaster == "object" && (C = n.intersectRaycaster.distanceAccuracy) != null ? C : 0.01;
+          })();
+          if (h && h.distance + v < l)
             return !1;
         }
-        return !(s.angleRange && e.dimensionType === y.Three && P(this.getAngle(e), s.angleRange) === !1);
+        return !(n.angleRange && R(e) && y(this.getAngle(e), n.angleRange) === !1);
       })();
-      return i.visible = r, i.visible;
+      return i.visible = f, i.visible;
     }
   }
-  getUnfoldedByPanoIndex(e, n) {
+  getUnfoldedByPanoIndex(e, t) {
     if (!this.getVisibleByPanoIndex(e))
       return;
-    const o = this.getCaches({ panoIndex: n, id: e.id });
-    if (o.unfolded !== void 0)
-      return o.unfolded;
+    const s = this.getCaches({ panoIndex: t, id: e.id });
+    if (s.unfolded !== void 0)
+      return s.unfolded;
     {
-      const t = this.getTagConfig(e).unfoldedConfig;
-      if (!t)
+      const o = this.getTagConfig(e).unfoldedConfig;
+      if (!o)
         return;
-      const r = (() => {
-        const f = this.getDistance(e);
-        if (typeof t == "function")
-          return t(this.five, { tag: e, distance: f });
-        if (t.keep === "folded")
+      const f = (() => {
+        const l = this.getDistance(e);
+        if (typeof o == "function")
+          return o(this.five, { tag: e, distance: l });
+        if (o.keep === "folded")
           return !1;
-        if (t.keep === "unfolded")
+        if (o.keep === "unfolded")
           return !0;
-        if (t.disableUnfold === !0)
-          return !1;
-        if (t.disableFold === !0)
-          return !0;
-        if (t.unfoldDistance && P(f, t.unfoldDistance) === !1)
+        if (o.unfoldDistance && y(l, o.unfoldDistance) === !1)
           return !1;
       })();
-      o.unfolded = r;
-      const s = this.getUnfoldedByCamera(e);
-      return s !== void 0 ? s : o.unfolded;
+      s.unfolded = f;
+      const n = this.getUnfoldedByCamera(e);
+      return n !== void 0 ? n : s.unfolded;
     }
   }
   getUnfoldedByCamera(e) {
     return this.getVisibleByPanoIndex(e) ? (() => {
-      var r;
-      const o = this.getDistance(e), t = this.getTagConfig(e).unfoldedConfig;
-      if (!!t) {
-        if (typeof t == "function")
-          return t(this.five, { tag: e, distance: o });
-        if (t.keep === "folded")
-          return !1;
-        if (t.keep === "unfolded")
-          return !0;
-        if (t.disableUnfold === !0)
+      var f;
+      const s = this.getDistance(e), o = this.getTagConfig(e).unfoldedConfig;
+      if (!!o) {
+        if (typeof o == "function")
+          return o(this.five, { tag: e, distance: s });
+        if (o.keep === "folded")
           return !1;
-        if (t.disableFold === !0)
+        if (o.keep === "unfolded")
           return !0;
-        if (t.autoUnfold === void 0)
+        if (o.autoUnfold === void 0 || o.autoUnfold === !1 || o.autoUnfold.enable === !1)
           return;
-        if (t.autoUnfold.strategy === "ScreenPostion") {
-          const s = this.getTagProject(e);
-          if (s && P(s.x, t.autoUnfold.autoUnfoldProjectX) === !1)
+        if (o.autoUnfold.strategy === "ScreenPostion") {
+          const n = this.getTagProject(e);
+          if (n && y(n.x, o.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
-        if (t.autoUnfold.strategy === "MinimumDistance") {
-          const a = this.filterPointTag().filter((l) => this.getVisibleByPanoIndex(l)).filter((l) => {
-            const c = this.getTagProject(l);
-            if (!c)
+        if (o.autoUnfold.strategy === "MinimumDistance") {
+          const d = this.filterPointTag().filter((r) => this.getVisibleByPanoIndex(r)).filter((r) => {
+            const a = this.getTagProject(r);
+            if (!a)
               return !1;
-            const { x: h, y: g, z: m } = c;
-            return !(Math.abs(m) > 1 || Math.abs(h) > 1 || Math.abs(g) > 1);
-          }).filter((l) => {
-            var h;
-            const c = this.getTagConfig(l).unfoldedConfig;
-            return typeof c == "object" && ((h = c.autoUnfold) == null ? void 0 : h.strategy) === "MinimumDistance";
-          }).map((l) => ({ id: l.id, distance: this.getDistance(l) })).filter((l) => l.distance !== void 0).sort((l, c) => l.distance - c.distance).findIndex((l) => l.id === e.id);
-          if (a === -1 || a <= ((r = t.autoUnfold.maxNumber) != null ? r : 1) - 1 === !1)
+            const { x: p, y: h, z: v } = a;
+            return !(Math.abs(v) > 1 || Math.abs(p) > 1 || Math.abs(h) > 1);
+          }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: a }) => {
+            var p, h;
+            return !(typeof a != "object" || a.keep || a.autoUnfold === !1 || ((p = a.autoUnfold) == null ? void 0 : p.enable) === !1 || ((h = a.autoUnfold) == null ? void 0 : h.strategy) !== "MinimumDistance");
+          }).map((r) => x(k({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: a }) => {
+            var p, h;
+            return !(r === void 0 || typeof a != "object" || a.autoUnfold === !1 || ((p = a.autoUnfold) == null ? void 0 : p.enable) === !1 || ((h = a.autoUnfold) == null ? void 0 : h.strategy) !== "MinimumDistance" || a.autoUnfold.distance && y(r, a.autoUnfold.distance) === !1);
+          }).sort((r, a) => r.distance - a.distance).findIndex((r) => r.id === e.id);
+          if (d === -1 || d <= ((f = o.autoUnfold.maxNumber) != null ? f : 1) - 1 === !1)
             return !1;
         }
         return !0;
       }
     })() : void 0;
   }
-  getDistance(e, n) {
-    var t, r, s;
-    const i = (t = this.five.panoIndex) != null ? t : n;
+  getDistance(e, t) {
+    var o, f, n;
+    const i = (o = this.five.panoIndex) != null ? o : t;
     if (i === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${i}`);
-    const o = this.getCaches({ panoIndex: n, id: e.id });
-    if (o.distance !== void 0)
-      return o.distance;
+    const s = this.getCaches({ panoIndex: t, id: e.id });
+    if (s.distance !== void 0)
+      return s.distance;
     {
-      const f = (s = (r = this.five.work) == null ? void 0 : r.observers[i]) == null ? void 0 : s.position;
-      if (f === void 0)
-        throw new Error(`getDistance(): observerPosition is ${f}`);
-      const a = (() => e.pointType === v.PointTag ? B(e == null ? void 0 : e.position) : C(e.position))(), d = f.distanceTo(a);
-      return o.distance = d, d;
+      const l = (n = (f = this.five.work) == null ? void 0 : f.observers[i]) == null ? void 0 : n.position;
+      if (l === void 0)
+        throw new Error(`getDistance(): observerPosition is ${l}`);
+      const d = (() => V(e) ? M(e == null ? void 0 : e.position) : T(e.position))(), g = l.distanceTo(d);
+      return s.distance = g, g;
     }
   }
-  getAngle(e, n) {
-    var t, r, s;
-    const i = (t = this.five.panoIndex) != null ? t : n;
+  getAngle(e, t) {
+    var o, f, n;
+    const i = (o = this.five.panoIndex) != null ? o : t;
     if (i === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${i}`);
-    const o = this.getCaches({ panoIndex: n, id: e.id });
-    if (o.angle !== void 0)
-      return o.angle;
+    const s = this.getCaches({ panoIndex: t, id: e.id });
+    if (s.angle !== void 0)
+      return s.angle;
     {
-      const f = (s = (r = this.five.work) == null ? void 0 : r.observers[i]) == null ? void 0 : s.position;
-      if (f === void 0)
-        throw new Error(`getAngleRange(): observerPosition is ${f}`);
-      const a = (() => e.pointType === v.PointTag ? U(e.normal) : E(e.position))();
-      if (!a)
+      const l = (n = (f = this.five.work) == null ? void 0 : f.observers[i]) == null ? void 0 : n.position;
+      if (l === void 0)
+        throw new Error(`getAngleRange(): observerPosition is ${l}`);
+      const d = (() => e.stickType === "3DPoint" ? S(e.normal) : $(e.position))();
+      if (!d)
         return;
-      const d = new I.Vector3().copy(f).sub(C(e.position)), l = a.angleTo(d) * 180 / Math.PI;
-      return o.angle = l, o.angle;
+      const g = new I.Vector3().copy(l).sub(T(e.position)), r = d.angleTo(g) * 180 / Math.PI;
+      return s.angle = r, s.angle;
     }
   }
   getTagConfig(e) {
-    var o;
+    var s;
     if (!e)
-      return (o = this.config.globalConfig) != null ? o : {};
-    const n = {};
-    return this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((t) => {
-      const r = t;
-      if (n[r])
+      return (s = this.config.globalConfig) != null ? s : {};
+    const t = {};
+    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((o) => {
+      const f = o;
+      if (t[f])
         return;
-      const s = r.split("-"), [f = "Any", a = "Any", d = "Any"] = s || [];
-      (e.dimensionType === f || f === "Any") && (e.contentType === a || a === "Any") && (e.pointType === d || d === "Any") && (n[r] = this.config.contentTypeConfig[r]);
-    }), T({}, this.config.globalConfig, ...Object.values(n), e.config);
+      const n = f.split("-");
+      if (n.length === 1) {
+        const [l] = n;
+        e.contentType === l && (t[f] = this.config.contentTypeConfig[f]);
+      }
+      if (n.length === 2) {
+        const [l = "Any", d = "Any"] = n;
+        (e.stickType === l || l === "Any") && (e.contentType === d || d === "Any") && (t[f] = this.config.contentTypeConfig[f]);
+      }
+      if (n.length === 3) {
+        const [l = "Any", d, g] = n;
+        if (d === "Audio" && e.contentType === "Audio") {
+          const r = e;
+          (r.stickType === l || l === "Any") && r.data.appearance === g && (t[f] = this.config.contentTypeConfig[f]);
+        }
+      }
+    });
+    const i = D({}, this.config.globalConfig, ...Object.values(t), e.config);
+    return typeof i.unfoldedConfig == "object" && (i.unfoldedConfig.disableFold && (i.unfoldedConfig = { keep: "unfolded" }), i.unfoldedConfig.disableUnfold && (i.unfoldedConfig = { keep: "folded" }), i.unfoldedConfig.keep && (i.unfoldedConfig = { keep: i.unfoldedConfig.keep })), typeof i.visibleConfig == "object" && i.visibleConfig.keep && (i.visibleConfig = { keep: i.visibleConfig.keep }), i;
   }
-  canBe(e, n) {
-    const i = this.getTagConfig(n);
+  can(e, t) {
+    const i = this.getTagConfig(t);
     if (!i || typeof i != "object")
       return !0;
     if (e === "show" || e === "hide") {
@@ -200,37 +223,43 @@ class O extends V {
     if (e === "fold" || e === "unfold") {
       if (!i.unfoldedConfig || typeof i.unfoldedConfig != "object")
         return !0;
-      if (e === "fold" && (i.unfoldedConfig.disableFold || i.unfoldedConfig.keep === "unfolded") || e === "unfold" && (i.unfoldedConfig.disableUnfold || i.unfoldedConfig.keep === "folded"))
+      if (e === "fold" && i.unfoldedConfig.keep === "unfolded" || e === "unfold" && i.unfoldedConfig.keep === "folded")
         return !1;
     }
     return !0;
   }
+  sort(e) {
+    return e.sort((t, i) => {
+      const s = this.getDistance(t), o = this.getDistance(i);
+      return s === void 0 || o === void 0 ? 0 : o - s;
+    });
+  }
   setPointTagPosition() {
     const e = this.filterPointTag();
-    e.length !== 0 && e.forEach((n) => {
-      var o;
-      if (!((o = n.state) != null && o.visible)) {
-        n.pointTagStyle = void 0;
+    e.length !== 0 && e.forEach((t) => {
+      var s;
+      if (!((s = t.state) != null && s.visible)) {
+        t.pointTagStyle = void 0;
         return;
       }
-      const i = this.getTagProject(n);
+      const i = this.getTagProject(t);
       if (!i) {
-        n.pointTagStyle = void 0;
+        t.pointTagStyle = void 0;
         return;
       }
-      n.pointTagStyle = { leftPercent: (i.x + 1) / 2 * 100, topPercent: (-i.y + 1) / 2 * 100 };
+      t.pointTagStyle = { leftPercent: (i.x + 1) / 2 * 100, topPercent: (-i.y + 1) / 2 * 100 };
     });
   }
   setVisibleByPanoIndex() {
     this.tags.forEach((e) => {
-      const n = this.getVisibleByPanoIndex(e);
-      e.state && (e.state.visible = n);
+      const t = this.getVisibleByPanoIndex(e);
+      e.state && (e.state.visible = t);
     });
   }
   setUnfoldedByPanoIndex() {
     this.tags.forEach((e) => {
-      const n = this.getUnfoldedByPanoIndex(e);
-      if (!!e.state && (n !== void 0 && (e.state.unfolded = n), n && !e.state.visible)) {
+      const t = this.getUnfoldedByPanoIndex(e);
+      if (!!e.state && (t !== void 0 && (e.state.unfolded = t), t && !e.state.visible)) {
         const i = this.getTagConfig(e);
         typeof i.unfoldedConfig == "object" && i.unfoldedConfig.autoUnfoldWhenHide !== !1 && (e.state.unfolded = !1);
       }
@@ -239,26 +268,32 @@ class O extends V {
   getTagProject(e) {
     if (!this.getVisibleByPanoIndex(e))
       return;
-    const i = C(e.position), { x: o, y: t, z: r } = i.project(this.five.camera);
-    if (!(r > 1))
-      return { x: o, y: t, z: r };
+    const i = T(e.position), { x: s, y: o, z: f } = i.project(this.five.camera);
+    if (!(f > 1))
+      return { x: s, y: o, z: f };
   }
   filterPointTag() {
-    return this.tags.filter((e) => e.pointType === v.PointTag);
+    return this.tags.filter((e) => e.stickType === "2DPoint" || e.stickType === "3DPoint");
   }
-  filterTag2D() {
-    return this.tags.filter((e) => e.dimensionType === y.Two);
+  filter2DPointTag() {
+    return this.tags.filter((e) => e.stickType === "2DPoint");
   }
   filter3DPointTag() {
-    return this.tags.filter((e) => e.dimensionType === y.Three && e.pointType === v.PointTag);
+    return this.tags.filter((e) => e.stickType === "3DPoint");
   }
   filter3DTag() {
-    return this.tags.filter((e) => e.dimensionType === y.Three);
+    return this.tags.filter((e) => e.stickType === "3DPoint" || e.stickType === "Plane");
   }
   filterPlaneTag() {
-    return this.tags.filter((e) => e.dimensionType === y.Three && e.pointType === v.PlaneTag);
+    return this.tags.filter((e) => e.stickType === "Plane");
+  }
+  updateTagConfig(e) {
+    e != null && e.force && this.clearCache(), this.tags.forEach((t) => {
+      const i = this.getTagConfig(t);
+      t.mergedConfig = i;
+    });
   }
 }
 export {
-  O as TagComputer
+  Y as TagComputer
 };

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

@@ -1,7 +1,8 @@
+import type { Tag, PartialDeep, TagId, Tags, State, AddTagConfig, LoadTagConfig } from '../typings';
+import type { TagContentType } from '..';
+import type { ArrayPosition } from '../typings';
 import { Five } from '@realsee/five';
-import type { Tag, ContentType, PartialDeep, TagId, Tags, State, AddTagConfig } from '../typings';
 import { TagComputer } from './TagComputer';
-import { ArrayPosition } from '../typings';
 export declare const pluginFlag: (name: string) => string;
 declare class PanoTagPluginController extends TagComputer {
     /** 版本号 */
@@ -22,16 +23,10 @@ declare class PanoTagPluginController extends TagComputer {
     /** 临时状态 */
     private temporaryState;
     private mediaStore;
+    private isIOSWX;
     private store;
-    private staticUrl;
     constructor(five: Five, params?: {
         debug?: boolean;
-        mergePluginDefaultConfigToLoadDataConfig?: boolean;
-        staticConfig?: {
-            host?: string;
-            protocol?: string;
-            port?: number;
-        } | string;
         config?: {
             globalConfig?: Tags['globalConfig'];
             contentTypeConfig?: Tags['contentTypeConfig'];
@@ -40,11 +35,19 @@ declare class PanoTagPluginController extends TagComputer {
     /**
      * @description: 加载数据
      */
-    load(data: Tags, config?: AddTagConfig): void;
+    load(data: Tags, config?: LoadTagConfig): Promise<boolean>;
     /**
      * @description: 添加标签
      */
-    addTag(tag: Tag | Tag[], config?: AddTagConfig): void;
+    addTag(tag: Tag | Tag[], config?: AddTagConfig): Promise<boolean>;
+    /**
+     * @description: 改变配置
+     */
+    changeConfig(config: TagComputer['config'], merge?: boolean): void;
+    /**
+     * @description: 改变全局配置
+     */
+    changeGlobalConfig(globalConfig: TagComputer['config']['globalConfig'], merge?: boolean): void;
     clearTags(): void;
     show(params?: {
         userAction?: boolean;
@@ -68,6 +71,7 @@ declare class PanoTagPluginController extends TagComputer {
         userAction?: boolean;
         visibleWithAnimation?: boolean;
     }): void;
+    changeUnfoldedById(id: TagId, unfolded: boolean): void;
     /**
      * @description: 修改3D标签normal
      */
@@ -75,12 +79,18 @@ declare class PanoTagPluginController extends TagComputer {
     /**
      * @description: 改变data
      */
-    changeDataById<C extends ContentType = ContentType.Custom>(id: TagId, data: PartialDeep<Tag<C>['data']>, deepMerge?: boolean): void;
+    changeDataById<C extends TagContentType = any>(id: TagId, data: PartialDeep<Tag<C>['data']>, deepMerge?: boolean): void;
+    /**
+     * @description: 改变tag的stickType
+     */
+    changeStickTypeById<C extends TagContentType = any>(id: TagId, data: PartialDeep<{
+        [P in keyof Pick<Tag<C>, 'stickType' | 'position' | 'normal' | 'data'>]: Tag[P];
+    }>, deepMerge?: boolean): void;
     /**
      * @description: 改变tag任意属性
      */
-    changeTagById<C extends ContentType = ContentType.Custom>(id: TagId, tag: PartialDeep<{
-        [P in keyof Pick<Tag<C>, 'enabled' | 'style' | 'dimensionType' | 'contentType' | 'data' | 'normal'>]: Tag[P];
+    changeTagById<C extends TagContentType = any>(id: TagId, tag: PartialDeep<{
+        [P in keyof Pick<Tag<C>, 'enabled' | 'style' | 'stickType' | 'contentType' | 'data' | 'normal'>]: Tag[P];
     }>, deepMerge?: boolean): void;
     /**
      * @description: 销毁tag
@@ -101,6 +111,7 @@ declare class PanoTagPluginController extends TagComputer {
      * @description: 添加 cameraUpdate, panoArrived 等事件监听
      */
     private addEventListener;
+    private loadVideoFirstFrame;
     private addResizeListener;
     private addResizeObserver;
     /**