@realsee/dnalogel 3.66.0-alpha.2 → 3.66.0-alpha.4

package/libs/PanoTagPlugin/controller/index.js

@@ -12,19 +12,19 @@ var g = (d, a, e) => a in d ? P(d, a, { enumerable: !0, configurable: !0, writab
 }, c = (d, a) => U(d, A(a));
 var p = (d, a, e) => (g(d, typeof a != "symbol" ? a + "" : a, e), e);
 var l = (d, a, e) => new Promise((i, t) => {
-  var o = (s) => {
+  var o = (r) => {
     try {
-      n(e.next(s));
+      n(e.next(r));
     } catch (h) {
       t(h);
     }
-  }, r = (s) => {
+  }, s = (r) => {
     try {
-      n(e.throw(s));
+      n(e.throw(r));
     } catch (h) {
       t(h);
     }
-  }, n = (s) => s.done ? i(s.value) : Promise.resolve(s.value).then(o, r);
+  }, n = (r) => r.done ? i(r.value) : Promise.resolve(r.value).then(o, s);
   n((e = e.apply(d, a)).next());
 });
 import * as u from "three";
@@ -218,10 +218,17 @@ import "../Components/Tag/CustomTag.js";
 import "../../vendor/classnames/index.js";
 import "../Components/TagItem.js";
 import "../Components/Common/TagPoint.js";
-import "../Components/Common/TagPopover.js";
-import "../Components/Common/TagPopoverArrow.js";
-const S = "Dnalogel-PanoTagPlugin", Uo = (d) => `${S}--${d}`;
-class Ao extends R {
+import "../Components/Common/TagPopover/index.js";
+import "../Components/Common/TagPopover/PopoverContent.js";
+import "../Components/Common/TagPopover/TagPopoverArrow.js";
+import "../Components/Common/TagPopover/TagPopup.js";
+import "../Components/Common/VideoIcon.js";
+import "../Components/Common/TagPopover/PanoramaIcon.js";
+import "../Components/Common/TagPopover/TagPopoverToolBar.js";
+import "../Components/Common/TagPopover/ArrowRightIcon.js";
+import "../Components/Common/TagPopover/ShareIcon.js";
+const S = "Dnalogel-PanoTagPlugin", Lo = (d) => `${S}--${d}`;
+class Io extends R {
   constructor(e, i) {
     super(e);
     /** state */
@@ -282,10 +289,10 @@ class Ao extends R {
         i.position.copy(t.position), i.quaternion.copy(t.quaternion);
         const o = this.five.camera.position;
         i.lookAt(o.clone().setY(i.position.y));
-        const r = t.quaternion.clone(), n = i.quaternion.clone(), s = W();
-        s.onUpdate(({ progress: D }) => {
-          t.quaternion.copy(r.clone().slerp(n, D));
-        }), s.play();
+        const s = t.quaternion.clone(), n = i.quaternion.clone(), r = W();
+        r.onUpdate(({ progress: D }) => {
+          t.quaternion.copy(s.clone().slerp(n, D));
+        }), r.play();
       });
     }));
     /** 楼层切换时，需要更新标签可见性 */
@@ -302,9 +309,9 @@ class Ao extends R {
       this.renderQueue.forEach((e, i) => {
         const { keys: t } = e;
         if (i === "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,
@@ -313,13 +320,13 @@ class Ao extends R {
             zIndex: this.params.containerZIndex
           };
           if (this.TagContainerSvelte) {
-            let s = {};
+            let r = {};
             if (t.length === 0)
-              s = n;
+              r = n;
             else
               for (const h of t)
-                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");
@@ -327,8 +334,8 @@ class Ao extends R {
               target: this.container,
               props: c(f({}, n), { state: c(f({}, 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 });
             });
           }
         }
@@ -345,10 +352,10 @@ class Ao extends R {
     }
   }
   appendTo(e) {
-    var t, o, r;
+    var t, o, s;
     this.container = e;
     const i = (o = (t = this.TagContainerSvelte) == null ? void 0 : t.$$) == null ? void 0 : o.root;
-    i && i !== this.container && ((r = this.TagContainerSvelte) == null || r.$destroy(), this.TagContainerSvelte = void 0);
+    i && i !== this.container && ((s = this.TagContainerSvelte) == null || s.$destroy(), this.TagContainerSvelte = void 0);
   }
   /**
    * @description 加载数据
@@ -359,7 +366,7 @@ class Ao extends R {
       this.clearTags();
       try {
         console.debug(this.NAME, " load:", { data: JSON.parse(JSON.stringify(e)) });
-      } catch (r) {
+      } catch (s) {
       }
       this.config = m({}, this.config, {
         globalConfig: (t = e.globalConfig) != null ? t : {},
@@ -375,17 +382,17 @@ class Ao extends R {
   addTag(e) {
     return l(this, null, function* () {
       const t = (Array.isArray(e) ? e : [e]).filter((o) => o.position).map((o) => {
-        const r = M(o);
-        if (r === "2DPoint" || r === "3DPoint")
+        const s = M(o);
+        if (s === "2DPoint" || s === "3DPoint")
           return new z(this, o);
-        if (r === "Model")
+        if (s === "Model")
           return new j(this, o);
-        if (r === "Plane")
+        if (s === "Plane")
           return new Q(this, o);
       });
       return t.forEach(I), this.tags.push(...t), 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(t, (n) => {
+        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(t, (n) => {
           this.tags.includes(n) && (n.updateVisible(), n.updateZIndex());
         }), this.setUnfolded(), this.addRenderQueue({ type: "TagContainerSvelte" }), this.hooks.emit("tagsLengthChange");
       }));
@@ -457,11 +464,11 @@ class Ao extends R {
    * @description 销毁
    */
   dispose() {
-    var e, i, t, o, r, n;
-    this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filterCSS3DTag.forEach((s) => {
+    var e, i, t, 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"), (i = this.store.disposers) == null || i.forEach((s) => s == null ? void 0 : s()), this.store.disposers = [], (o = (t = this.store).eventListenerDisposer) == null || o.call(t), 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"), (i = this.store.disposers) == null || i.forEach((r) => r == null ? void 0 : r()), this.store.disposers = [], (o = (t = this.store).eventListenerDisposer) == null || o.call(t), 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 闪烁标签
@@ -550,8 +557,8 @@ class Ao extends R {
   clearTags() {
     var e;
     this.tags.length && (this.tags.forEach((i) => {
-      var t, o, r, n, s, h;
-      (t = i.tag3DContentSvelte) == null || t.dispose(), (r = (o = i.mediaPlane) == null ? void 0 : o.parent) == null || r.remove(i.mediaPlane), (h = (s = (n = i.model) == null ? void 0 : n.object) == null ? void 0 : s.parent) == null || h.remove(i.model.object);
+      var t, o, s, n, r, h;
+      (t = i.tag3DContentSvelte) == null || t.dispose(), (s = (o = i.mediaPlane) == null ? void 0 : o.parent) == null || s.remove(i.mediaPlane), (h = (r = (n = i.model) == null ? void 0 : n.object) == null ? void 0 : r.parent) == null || h.remove(i.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();
   }
   /**
@@ -594,17 +601,17 @@ class Ao extends R {
       this.state.enabled && (this.filterPointTag.forEach((h) => h.updateScreenPosition({ force: !0 })), this.temporaryState.visible = !0, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }));
     }, t = () => {
       this.state.enabled && (this.temporaryState.visible = !1, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }));
-    }, { observe: o, unobserve: r } = y(
+    }, { observe: o, unobserve: s } = y(
       L(() => {
         this.store.resizeObserverDisposer && t();
       }, 500),
       e
-    ), { observe: n, unobserve: s } = y(
+    ), { observe: n, unobserve: r } = y(
       b(() => i(), 400),
       e
     );
     return o(), n(), () => {
-      r(), s();
+      s(), r();
     };
   }
   setUnfoldedByCamera() {
@@ -638,7 +645,7 @@ class Ao extends R {
   }
 }
 export {
-  Ao as PanoTagPluginController,
-  Ao as default,
-  Uo as pluginFlag
+  Io as PanoTagPluginController,
+  Io as default,
+  Lo as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,7 +1,7 @@
 import r from "./controller/index.js";
-import { pluginFlag as Kr } from "./controller/index.js";
-import { defaultGlobalConfig as Mr } from "./typings/tag/TagConfig.js";
-import { ContentType as Or, DimensionType as Qr, PointType as Rr } from "./Archive/deprecated.js";
+import { pluginFlag as Sr } from "./controller/index.js";
+import { defaultGlobalConfig as Vr } from "./typings/tag/TagConfig.js";
+import { ContentType as Xr, DimensionType as Yr, PointType as Zr } from "./Archive/deprecated.js";
 import "three";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "../shared-utils/positionToVector3.js";
@@ -191,17 +191,24 @@ import "./controller/Tag/PlaneTag.js";
 import "./Components/TagContainer.js";
 import "./Components/TagItem.js";
 import "./Components/Common/TagPoint.js";
-import "./Components/Common/TagPopover.js";
-import "./Components/Common/TagPopoverArrow.js";
+import "./Components/Common/TagPopover/index.js";
+import "./Components/Common/TagPopover/PopoverContent.js";
+import "./Components/Common/TagPopover/TagPopoverArrow.js";
+import "./Components/Common/TagPopover/TagPopup.js";
+import "./Components/Common/VideoIcon.js";
+import "./Components/Common/TagPopover/PanoramaIcon.js";
+import "./Components/Common/TagPopover/TagPopoverToolBar.js";
+import "./Components/Common/TagPopover/ArrowRightIcon.js";
+import "./Components/Common/TagPopover/ShareIcon.js";
 import "../shared-utils/animationFrame/BetterTween.js";
-const Hr = (o, t) => new r(o, t);
+const Or = (o, t) => new r(o, t);
 export {
-  Or as ContentType,
-  Qr as DimensionType,
-  Hr as PanoTagPlugin,
+  Xr as ContentType,
+  Yr as DimensionType,
+  Or as PanoTagPlugin,
   r as PanoTagPluginController,
-  Rr as PointType,
-  Hr as default,
-  Mr as defaultGlobalConfig,
-  Kr as pluginFlag
+  Zr as PointType,
+  Or as default,
+  Vr as defaultGlobalConfig,
+  Sr as pluginFlag
 };

package/libs/PanoTagPlugin/tag.config.js

@@ -18,13 +18,12 @@ const e = {
       // debug: true,
       hoverDelay: 200,
       popoverConfig: {
-        position: "auto",
-        transition: "fade",
-        transitionDuration: 300,
+        placement: "auto",
+        transitionDuration: 100,
         // theme: 'light',
         toolbar: {
           showMore: !0,
-          share: !0
+          showShare: !0
         }
       }
     }

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

@@ -6,6 +6,21 @@ import type { PartialObjectDeep } from '../../../typings/typings';
 import type { Vector3 } from 'three';
 import type { TagInstance } from '../..';
 type TagVisibleMode = Mode | Mode[] | 'PanoramaLike' | 'ModelLike' | 'all';
+/**
+ * @description 标签悬停时popover的位置
+ * @default 'auto'
+ * top 是标签上方，bottom 是标签下方，left 是标签左侧，right 是标签右侧
+ * top-left 是标签上方，Popover的左边界与标签的左边界对齐
+ * top-right 是标签上方，Popover的右边界与标签的右边界对齐
+ * bottom-left 是标签下方，Popover的左边界与标签的左边界对齐
+ * bottom-right 是标签下方，Popover的右边界与标签的右边界对齐
+ * left-top 是标签左侧，Popover的上边界与标签的上边界对齐
+ * left-bottom 是标签左侧，Popover的下边界与标签的下边界对齐
+ * right-top 是标签右侧，Popover的上边界与标签的上边界对齐
+ * right-bottom 是标签右侧，Popover的下边界与标签的下边界对齐
+ * auto 是根据标签位置自动计算
+ */
+export type TagPlacement = 'top' | 'bottom' | 'left' | 'right' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right' | 'left-top' | 'left-bottom' | 'right-top' | 'right-bottom' | 'auto';
 export interface TagConfig<C extends TagContentType = TagContentType> {
     /**
      * @description 显示/隐藏相关配置
@@ -265,20 +280,22 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
         popoverConfig?: {
             /**
              * @description 鼠标悬停时popover的位置, 默认根据标签位置自动计算
+             * @description top 是标签上方，bottom 是标签下方，left 是标签左侧，right 是标签右侧
+             * @description top-left 是标签上方，Popover的左边界与标签的左边界对齐
+             * @description top-right 是标签上方，Popover的右边界与标签的右边界对齐
+             * @description bottom-left 是标签下方，Popover的左边界与标签的左边界对齐
+             * @description bottom-right 是标签下方，Popover的右边界与标签的右边界对齐
+             * @description left-top 是标签左侧，Popover的上边界与标签的上边界对齐
+             * @description left-bottom 是标签左侧，Popover的下边界与标签的下边界对齐
+             * @description right-top 是标签右侧，Popover的上边界与标签的上边界对齐
+             * @description right-bottom 是标签右侧，Popover的下边界与标签的下边界对齐
+             * @description auto 是根据标签位置自动计算
              * @default 'auto'
              */
-            position?: 'top' | 'bottom' | 'left' | 'right' | 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight' | 'auto';
+            placement?: TagPlacement;
             /**
-             * @description 鼠标悬停时popover的过渡动画，可选值为 'fade' | 'slide' | 'fly'，默认 'slide'
-             * fade: 淡入淡出
-             * slide: 滑动
-             * fly: 飞入
-             * @default 'slide'
-             */
-            transition?: 'fade' | 'slide' | 'fly';
-            /**
-             * @description 鼠标悬停时popover的过渡动画的持续时间, 单位为毫秒, 默认200ms
-             * @default 200
+             * @description 鼠标悬停时popover的过渡动画的持续时间, 单位为毫秒, 默认100ms
+             * @default 100
              */
             transitionDuration?: number;
             /**
@@ -291,7 +308,7 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
              */
             toolbar?: {
                 showMore?: boolean;
-                share?: boolean;
+                showShare?: boolean;
             };
             /**
              * @description 鼠标悬停时popover的图片URL转换函数

package/libs/base/BasePlugin.js

@@ -22,7 +22,7 @@ let F = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.66.0-alpha.2");
+    i(this, "VERSION", "3.66.0-alpha.4");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");