@realsee/dnalogel 3.26.0 → 3.27.0

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,30 +1,30 @@
-var $ = Object.defineProperty, A = Object.defineProperties;
-var E = Object.getOwnPropertyDescriptors;
-var T = Object.getOwnPropertySymbols;
-var L = Object.prototype.hasOwnProperty, _ = Object.prototype.propertyIsEnumerable;
-var D = (b, e, i) => e in b ? $(b, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : b[e] = i, x = (b, e) => {
+var A = Object.defineProperty, E = Object.defineProperties;
+var L = Object.getOwnPropertyDescriptors;
+var U = Object.getOwnPropertySymbols;
+var O = Object.prototype.hasOwnProperty, z = Object.prototype.propertyIsEnumerable;
+var S = (m, e, i) => e in m ? A(m, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : m[e] = i, k = (m, e) => {
   for (var i in e || (e = {}))
-    L.call(e, i) && D(b, i, e[i]);
-  if (T)
-    for (var i of T(e))
-      _.call(e, i) && D(b, i, e[i]);
-  return b;
-}, M = (b, e) => A(b, E(e));
-import * as F from "three";
-import { is3DTag as O, isMediaModelTag as U } from "../utils/tag/tagCheck.js";
-import { getTagCenterPosition as C, getTagPosition as z } from "../utils/tagPosition.js";
-import { checkRange as h } from "../utils/checkRange.js";
-import { isPanoramaLike as y, isModelLike as Z } from "../../shared-utils/five/mode.js";
+    O.call(e, i) && S(m, i, e[i]);
+  if (U)
+    for (var i of U(e))
+      z.call(e, i) && S(m, i, e[i]);
+  return m;
+}, R = (m, e) => E(m, L(e));
+import * as V from "three";
+import { is3DTag as Z, isMediaModelTag as F } from "../utils/tag/tagCheck.js";
+import { getTagCenterPosition as M, getTagPosition as q } from "../utils/tagPosition.js";
+import { checkRange as P } from "../utils/checkRange.js";
+import { isPanoramaLike as x, isModelLike as H } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "@realsee/five";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { notNil as q } from "../../shared-utils/isNil.js";
-import { TagUtil as H } from "./TagUtil.js";
-import { getFloorIndex as N } from "../../shared-utils/five/getFloorIndex.js";
-import { safeObj as R } from "../../shared-utils/safeObj.js";
-import { toArray as W } from "../../shared-utils/util.js";
+import { notNil as N } from "../../shared-utils/isNil.js";
+import { TagUtil as W } from "./TagUtil.js";
+import { getFloorIndex as X } from "../../shared-utils/five/getFloorIndex.js";
+import { safeObj as j } from "../../shared-utils/safeObj.js";
+import { toArray as G } from "../../shared-utils/util.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/positionToVector3.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
@@ -66,9 +66,9 @@ import "../../shared-utils/url/getUrl.js";
 import "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/Utils/WorkUtil.js";
 import "../../shared-utils/Utils/BaseUtil.js";
-const I = new F.Raycaster();
-I.params.Points.threshold = 0.1;
-class Qe extends H {
+const T = new V.Raycaster();
+T.params.Points.threshold = 0.1;
+class Qe extends W {
   constructor(e) {
     super(e);
   }
@@ -76,85 +76,96 @@ class Qe extends H {
    * @description: 获取是否可见
    */
   getVisible(e, i) {
-    const f = x(x({}, this.five.getCurrentState()), i), { panoIndex: t, mode: o } = f, d = y(o) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
-    if ((d == null ? void 0 : d.visible) !== void 0)
-      return d.visible;
+    const l = k(k({}, this.five.getCurrentState()), i), { panoIndex: n, mode: o } = l, f = x(o) ? this.getPanoIndexCache({ panoIndex: n, id: e.id }) : void 0;
+    if ((f == null ? void 0 : f.visible) !== void 0)
+      return f.visible;
     {
       const s = [], c = (() => {
-        var r, a, u, p, v, g, P;
-        const n = (r = this.getTagConfig(e).visibleConfig) != null ? r : {};
-        if (typeof n == "function")
+        var v, u, g, I, h, y, C;
+        const p = this.getTagConfig(e);
+        console.log("getVisible", l.mode, p.initialState);
+        const r = p.initialState, a = e.__lastInitialState;
+        if (r.visible !== void 0 && r.visible !== (a == null ? void 0 : a.visible))
           return {
-            value: n(this.five, { tag: e, distance: this.getDistance(e, f) }),
+            value: r.visible,
+            checkedList: s,
+            reason: "initialState changed",
+            do_not_cache: !0
+          };
+        e.__lastInitialState = r;
+        const t = (v = p.visibleConfig) != null ? v : {};
+        if (typeof t == "function")
+          return {
+            value: t(this.five, { tag: e, distance: this.getDistance(e, l) }),
             checkedList: s,
             reason: "config function result"
           };
-        if (n.keep === "hidden")
+        if (t.keep === "hidden")
           return { value: !1, checkedList: s, reason: "config.keep is hidden" };
-        if (n.keep === "visible")
+        if (t.keep === "visible")
           return { value: !0, checkedList: s, reason: "config.keep is visible" };
-        if (n.visibleFiveMode !== void 0) {
-          const l = typeof n.visibleFiveMode == "function" ? n.visibleFiveMode(e) : n.visibleFiveMode;
-          let m = !1;
-          if (Array.isArray(l) ? m = l.includes(o) : l === "ModelLike" ? m = Z(o) : l === "PanoramaLike" ? m = !y(o) : l === "all" ? m = !0 : typeof l == "string" && (m = l === o), m === !1)
+        if (t.visibleFiveMode !== void 0) {
+          const d = typeof t.visibleFiveMode == "function" ? t.visibleFiveMode(e) : t.visibleFiveMode;
+          let b = !1;
+          if (Array.isArray(d) ? b = d.includes(o) : d === "ModelLike" ? b = H(o) : d === "PanoramaLike" ? b = !x(o) : d === "all" ? b = !0 : typeof d == "string" && (b = d === o), b === !1)
             return {
               value: !1,
               checkedList: s,
               reason: "current mode is not included in visibleFiveMode",
-              visibleFiveMode: n.visibleFiveMode,
+              visibleFiveMode: t.visibleFiveMode,
               mode: o
             };
-        } else if (n.visibleFiveMode === void 0 && ((a = this.five.getCurrentState()) == null ? void 0 : a.mode) !== ((p = (u = e.fiveState) == null ? void 0 : u.mode) != null ? p : "Panorama"))
+        } else if (t.visibleFiveMode === void 0 && ((u = this.five.getCurrentState()) == null ? void 0 : u.mode) !== ((I = (g = e.fiveState) == null ? void 0 : g.mode) != null ? I : "Panorama"))
           return {
             value: !1,
             checkedList: s,
             reason: "current mode is not equal to tag.fiveState.mode",
-            tagFiveMode: (v = e.fiveState) == null ? void 0 : v.mode,
+            tagFiveMode: (h = e.fiveState) == null ? void 0 : h.mode,
             mode: o
           };
-        if (n.followModelVisibility === !0 && (o === "Floorplan" || o === "Mapview") && this.getVisibleByFloorIndex(e) === !1)
+        if (t.followModelVisibility === !0 && (o === "Floorplan" || o === "Mapview") && this.getVisibleByFloorIndex(e) === !1)
           return { value: !1, checkedList: s, reason: "followModelVisibility check failed" };
-        if (y(o) && n.visiblePanoIndex !== void 0 && n.visiblePanoIndex !== "all" && t !== void 0) {
-          if (s.push("visiblePanoIndex"), Array.isArray(n.visiblePanoIndex) && !n.visiblePanoIndex.includes(t))
+        if (x(o) && t.visiblePanoIndex !== void 0 && t.visiblePanoIndex !== "all" && n !== void 0) {
+          if (s.push("visiblePanoIndex"), Array.isArray(t.visiblePanoIndex) && !t.visiblePanoIndex.includes(n))
             return {
               value: !1,
               checkedList: s,
-              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${t}, visiblePanoIndex: ${n.visiblePanoIndex}`
+              reason: `current panoIndex is not included in visiblePano. currentPanoIndex: ${n}, visiblePanoIndex: ${t.visiblePanoIndex}`
             };
-          if (n.visiblePanoIndex === "current" && t !== ((g = e.fiveState) == null ? void 0 : g.panoIndex))
+          if (t.visiblePanoIndex === "current" && n !== ((y = e.fiveState) == null ? void 0 : y.panoIndex))
             return {
               value: !1,
               checkedList: s,
-              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${t}, tag.panoIndex: ${(P = e.fiveState) == null ? void 0 : P.panoIndex}`
+              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${n}, tag.panoIndex: ${(C = e.fiveState) == null ? void 0 : C.panoIndex}`
             };
         }
-        if (n.visibleDistance !== void 0 && (s.push("visibleDistance"), n.visibleDistance !== "unLimited")) {
-          const l = this.getDistance(e, f);
-          if (h(l, n.visibleDistance) === !1)
+        if (t.visibleDistance !== void 0 && (s.push("visibleDistance"), t.visibleDistance !== "unLimited")) {
+          const d = this.getDistance(e, l);
+          if (P(d, t.visibleDistance) === !1)
             return {
               value: !1,
               checkedList: s,
-              panoIndex: t,
-              visibleDistance: n.visibleDistance,
-              reason: `distance is not in visibleDistance. distance: ${l}, visibleDistance: ${n.visibleDistance.min} - ${n.visibleDistance.max}`
+              panoIndex: n,
+              visibleDistance: t.visibleDistance,
+              reason: `distance is not in visibleDistance. distance: ${d}, visibleDistance: ${t.visibleDistance.min} - ${t.visibleDistance.max}`
             };
         }
-        if (y(o) && n.angleRange && O(e)) {
+        if (x(o) && t.angleRange && Z(e)) {
           s.push("angleRange");
-          const l = this.getAngle(e, t);
-          if (h(l, n.angleRange) === !1)
-            return { value: !1, checkedList: s, reason: `angle is not in angleRange. angle: ${l}, angleRange: ${n.angleRange}` };
+          const d = this.getAngle(e, n);
+          if (P(d, t.angleRange) === !1)
+            return { value: !1, checkedList: s, reason: `angle is not in angleRange. angle: ${d}, angleRange: ${t.angleRange}` };
         }
-        if (n.intersectRaycaster !== !1 && (typeof n.intersectRaycaster != "object" || n.intersectRaycaster.enabled !== !1)) {
-          if (s.push("intersectRaycaster"), t === void 0)
+        if (t.intersectRaycaster !== !1 && (typeof t.intersectRaycaster != "object" || t.intersectRaycaster.enabled !== !1)) {
+          if (s.push("intersectRaycaster"), n === void 0)
             return {
               value: !1,
               checkedList: s,
-              reason: `intersectRaycaster check failed: panoIndex is ${t}`
+              reason: `intersectRaycaster check failed: panoIndex is ${n}`
             };
-          const l = this.getTagEnableByIntersect(e, t);
-          if (l.value === !1)
-            return Object.assign(l, { checkedList: s });
+          const d = this.getTagEnableByIntersect(e, n);
+          if (d.value === !1)
+            return Object.assign(d, { checkedList: s });
         }
         return {
           value: !0,
@@ -162,7 +173,7 @@ class Qe extends H {
           reason: "all check passed"
         };
       })();
-      return d && (d.visible = c.value, d.__debug_visible_reason__ = c), c.value;
+      return f && c.do_not_cache !== !0 && (f.visible = c.value, f.__debug_visible_reason__ = c), c.value;
     }
   }
   /**
@@ -171,26 +182,26 @@ class Qe extends H {
   getUnfoldedByPanoIndex(e, i) {
     if (!this.getCurrentVisibleState(e))
       return;
-    const t = this.getPanoIndexCache({ panoIndex: i, id: e.id });
-    if (t.unfolded !== void 0)
-      return t.unfolded;
+    const n = this.getPanoIndexCache({ panoIndex: i, id: e.id });
+    if (n.unfolded !== void 0)
+      return n.unfolded;
     {
       const o = this.getTagConfig(e).unfoldedConfig;
       if (!o)
         return;
-      const d = (() => {
+      const f = (() => {
         if (typeof o == "function")
           return o(this.five, { tag: e, distance: this.getDistance(e, { panoIndex: i }) });
         if (o.keep === "folded")
           return !1;
         if (o.keep === "unfolded")
           return !0;
-        if (o.unfoldDistance && h(this.getDistance(e, { panoIndex: i }), o.unfoldDistance) === !1)
+        if (o.unfoldDistance && P(this.getDistance(e, { panoIndex: i }), o.unfoldDistance) === !1)
           return !1;
       })();
-      t.unfolded = d;
+      n.unfolded = f;
       const s = this.getUnfoldedByCamera(e);
-      return s !== void 0 ? s : t.unfolded;
+      return s !== void 0 ? s : n.unfolded;
     }
   }
   /**
@@ -199,39 +210,39 @@ class Qe extends H {
   getUnfoldedByCamera(e) {
     return this.getCurrentVisibleState(e) ? (() => {
       var o;
-      const t = this.getTagConfig(e).unfoldedConfig;
-      if (t) {
-        if (typeof t == "function")
-          return t(this.five, { tag: e, distance: this.getDistance(e) });
-        if (t.keep === "folded")
+      const n = this.getTagConfig(e).unfoldedConfig;
+      if (n) {
+        if (typeof n == "function")
+          return n(this.five, { tag: e, distance: this.getDistance(e) });
+        if (n.keep === "folded")
           return !1;
-        if (t.keep === "unfolded")
+        if (n.keep === "unfolded")
           return !0;
-        if (t.autoUnfold === void 0 || t.autoUnfold === !1 || t.autoUnfold.enable === !1 || !t.autoUnfold.strategy)
+        if (n.autoUnfold === void 0 || n.autoUnfold === !1 || n.autoUnfold.enable === !1 || !n.autoUnfold.strategy)
           return;
-        if (t.autoUnfold.strategy === "ScreenPostion") {
-          const d = this.getTagProject(e);
-          if (d && h(d.x, t.autoUnfold.autoUnfoldProjectX) === !1)
+        if (n.autoUnfold.strategy === "ScreenPostion") {
+          const f = this.getTagProject(e);
+          if (f && P(f.x, n.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
-        if (t.autoUnfold.strategy === "MinimumDistance") {
+        if (n.autoUnfold.strategy === "MinimumDistance") {
           const c = this.filterPointTag.filter((r) => this.getCurrentVisibleState(r)).filter((r) => {
             const a = this.getTagProject(r);
             if (!a)
               return !1;
-            const { x: u, y: p, z: v } = a;
-            return !(Math.abs(v) > 1 || Math.abs(u) > 1 || Math.abs(p) > 1);
+            const { x: t, y: v, z: u } = a;
+            return !(Math.abs(u) > 1 || Math.abs(t) > 1 || Math.abs(v) > 1);
           }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: a }) => {
-            var u, p;
-            return !(typeof a == "function" || a.keep || a.autoUnfold === !1 || ((u = a.autoUnfold) == null ? void 0 : u.enable) === !1 || ((p = a.autoUnfold) == null ? void 0 : p.strategy) !== "MinimumDistance");
-          }).map((r) => M(x({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: a }) => {
-            const u = a.autoUnfold.distance;
-            return !(u && h(r, u) === !1);
+            var t, v;
+            return !(typeof a == "function" || a.keep || a.autoUnfold === !1 || ((t = a.autoUnfold) == null ? void 0 : t.enable) === !1 || ((v = a.autoUnfold) == null ? void 0 : v.strategy) !== "MinimumDistance");
+          }).map((r) => R(k({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: a }) => {
+            const t = a.autoUnfold.distance;
+            return !(t && P(r, t) === !1);
           }).sort((r, a) => r.distance - a.distance).findIndex((r) => r.id === e.id);
-          if (c === -1 || c <= ((o = t.autoUnfold.maxNumber) != null ? o : 1) - 1 === !1)
+          if (c === -1 || c <= ((o = n.autoUnfold.maxNumber) != null ? o : 1) - 1 === !1)
             return !1;
         }
-        return !0;
+        return n.autoUnfold.strategy !== "FoldWhenMove";
       }
     })() : void 0;
   }
@@ -246,16 +257,16 @@ class Qe extends H {
   }
   setVisible(e) {
     (e != null ? e : this.tags).forEach((i) => {
-      const f = this.getVisible(i);
-      i.state && (i.state.visible = f);
+      const l = this.getVisible(i);
+      i.state && (i.state.visible = l);
     });
   }
   setUnfoldedByPanoIndex() {
     this.tags.forEach((e) => {
       const i = this.getUnfoldedByPanoIndex(e);
       if (e.state && (i !== void 0 && (e.state.unfolded = i), i && !e.state.visible)) {
-        const f = this.getTagConfig(e);
-        typeof f.unfoldedConfig == "object" && f.unfoldedConfig.autoFoldWhenHide !== !1 && (e.state.unfolded = !1);
+        const l = this.getTagConfig(e);
+        typeof l.unfoldedConfig == "object" && l.unfoldedConfig.autoFoldWhenHide !== !1 && (e.state.unfolded = !1);
       }
     });
   }
@@ -263,42 +274,42 @@ class Qe extends H {
    * @description 一个点的标签
    */
   getTagProject(e) {
-    const i = C(e);
+    const i = M(e);
     if (!i)
       return;
-    const { x: f, y: t, z: o } = i.project(this.five.camera);
+    const { x: l, y: n, z: o } = i.project(this.five.camera);
     if (!(o > 1))
-      return { x: f, y: t, z: o };
+      return { x: l, y: n, z: o };
   }
   /** 通过射线检测标签可用性 */
   getTagEnableByIntersect(e, i) {
-    var n, r, a, u, p;
-    const f = R(R((n = this.getTagConfig(e).visibleConfig) != null ? n : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, o = y(this.five.getCurrentState().mode) ? this.workUtil.getObserverPosition(t) : this.five.camera.position;
+    var p, r, a, t, v;
+    const l = j(j((p = this.getTagConfig(e).visibleConfig) != null ? p : {}).intersectRaycaster), n = i != null ? i : this.five.getCurrentState().panoIndex, o = x(this.five.getCurrentState().mode) ? this.workUtil.getObserverPosition(n) : this.five.camera.position;
     if (o === void 0)
-      return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
-    const d = W(
+      return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: n } };
+    const f = G(
       (() => {
         var g;
-        const v = (g = f.checkPoints) != null ? g : "center";
-        return v === "center" ? C(e) : v === "corner" ? z(e) : Array.isArray(v) ? v : [];
+        const u = (g = l.checkPoints) != null ? g : "center";
+        return u === "center" ? M(e) : u === "corner" ? q(e) : Array.isArray(u) ? u : [];
       })()
     );
     let s = 0, c = 0;
-    for (const v of d) {
-      const g = new F.Vector3().subVectors(v, o).normalize();
-      I.set(o, g);
-      const P = o.distanceTo(v), [l] = this.five.model.intersectRaycaster(I), m = (() => {
-        if (!U(e))
+    for (const u of f) {
+      const g = new V.Vector3().subVectors(u, o).normalize();
+      T.set(o, g);
+      const I = o.distanceTo(u), [h] = this.five.model.intersectRaycaster(T), y = (() => {
+        if (!F(e))
           return;
-        const V = this.tags.filter(U).map((B) => {
-          var k;
-          return (k = B.model) == null ? void 0 : k.object;
-        }).filter(q), [w] = I.intersectObjects(V, !0);
-        return w;
-      })(), S = (r = f.distanceAccuracy) != null ? r : 0.01;
-      Math.min((a = l == null ? void 0 : l.distance) != null ? a : 1 / 0, (u = m == null ? void 0 : m.distance) != null ? u : 1 / 0) + S >= P ? s++ : c++;
-      const j = (p = f.needPassed) != null ? p : 1;
-      if (s >= j)
+        const w = this.tags.filter(F).map(($) => {
+          var D;
+          return (D = $.model) == null ? void 0 : D.object;
+        }).filter(N), [B] = T.intersectObjects(w, !0);
+        return B;
+      })(), C = (r = l.distanceAccuracy) != null ? r : 0.01;
+      Math.min((a = h == null ? void 0 : h.distance) != null ? a : 1 / 0, (t = y == null ? void 0 : y.distance) != null ? t : 1 / 0) + C >= I ? s++ : c++;
+      const _ = (v = l.needPassed) != null ? v : 1;
+      if (s >= _)
         return { value: !0 };
     }
     return c === 0 ? { value: !0 } : {
@@ -306,18 +317,18 @@ class Qe extends H {
       reason: {
         type: "intersectRaycaster check failed",
         passedCount: s,
-        needPassed: f.needPassed
+        needPassed: l.needPassed
       }
     };
   }
   /** 检测是否匹配当前楼层 */
   getVisibleByFloorIndex(e) {
-    var o, d, s, c, n, r, a;
+    var o, f, s, c, p, r, a;
     let i = 0;
-    const f = (o = e.fiveState) == null ? void 0 : o.panoIndex;
-    f !== void 0 ? i = (d = this.workUtil.getObserver(f)) == null ? void 0 : d.floorIndex : i = N(this.workUtil.work, (a = (r = (c = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : c.position) != null ? r : (n = e.mediaPlane) == null ? void 0 : n.position) != null ? a : C(e));
-    const t = this.five.model.shownFloor;
-    return t === null || t === i;
+    const l = (o = e.fiveState) == null ? void 0 : o.panoIndex;
+    l !== void 0 ? i = (f = this.workUtil.getObserver(l)) == null ? void 0 : f.floorIndex : i = X(this.workUtil.work, (a = (r = (c = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : c.position) != null ? r : (p = e.mediaPlane) == null ? void 0 : p.position) != null ? a : M(e));
+    const n = this.five.model.shownFloor;
+    return n === null || n === i;
   }
 }
 export {

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

@@ -147,7 +147,13 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
         disableFold?: true;
         /** min-max米内自动展开,否则收起 */
         unfoldDistance?: MinMax;
-        /** 自动展开策略,  false 时不自动展开 */
+        /**
+         * @description 自动展开策略
+         *
+         * @strategy 'ScreenPostion'：根据屏幕位置展开
+         * @strategy 'MinimumDistance'：最近标签自动展开
+         * @strategy 'FoldWhenMove'：移动屏幕自动收起
+         */
         autoUnfold?: false | {
             enable?: boolean;
             /** 自动展开 策略 */
@@ -168,6 +174,10 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
              * @default 无限制
              */
             distance?: MinMax;
+        } | {
+            enable?: boolean;
+            /** 移动屏幕自动收起 */
+            strategy?: 'FoldWhenMove';
         };
     } | ConfigFunction;
     /** 初始状态 */

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

@@ -64,15 +64,14 @@ export interface ImagePlaneGroup extends Group {
     children: ImagePlane[];
 }
 export type AudioAppearance = TagInstance<'Audio'>['data']['appearance'];
-export type AudioTagTypeConfigKey = `${StickType | 'Any'}-Audio-${AudioAppearance}`;
-type _ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any'}` | TagContentType | AudioTagTypeConfigKey | 'Any';
+type _ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any'}` | TagContentType | `Any-Audio-${AudioAppearance}` | 'Any';
 export type ContentTypeConfigKeySplit = [StickType | 'Any', TagContentType | 'Any'] | [TagContentType] | [StickType | 'Any', 'Audio', AudioAppearance] | ['Any'] | [];
-type FiveModeType = `[${Mode | 'PanoramaLike' | 'ModelLike'}]`;
+type FiveModeType = `[${Exclude<Mode, 'DepthPanorama'> | 'PanoramaLike' | 'ModelLike'}]`;
 export type ContentTypeConfigKey = FiveModeType | `${FiveModeType}-${_ContentTypeConfigKey}` | _ContentTypeConfigKey;
 /**
  * @description: 从 ContentTypeConfigKey 中提取 ContentTypeConfigKey 对应的 TagContentType 是啥
  */
-export type PickTagContentTypeInContentTypeConfigKey<T> = T extends FiveModeType ? any : T extends `${FiveModeType}-${infer P extends _ContentTypeConfigKey}` ? PickTagContentTypeInContentTypeConfigKey<P> : T extends `${any}-Audio-${any}` ? 'Audio' : T extends `${any}-${infer C}` ? C : T extends TagContentType ? T : any;
+export type PickTagContentTypeInContentTypeConfigKey<T> = T extends FiveModeType ? any : T extends `${FiveModeType}-${infer P extends _ContentTypeConfigKey}` ? PickTagContentTypeInContentTypeConfigKey<P> : T extends `${any}-${infer C}` ? C : T extends TagContentType ? T : any;
 export type TagConfigByKey<T> = PickTagContentTypeInContentTypeConfigKey<T> extends TagContentType ? TagConfig<PickTagContentTypeInContentTypeConfigKey<T>> : TagConfig<any>;
 export type PointTag<C extends TagContentType = TagContentType> = TagInstance<C, '2DPoint' | '3DPoint'>;
 /** 二维标签 */

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.26.0",
+  "version": "3.27.0",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",