@realsee/dnalogel 2.20.0-dev.1 → 2.20.0-dev.11

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

@@ -56,11 +56,12 @@ export interface EventMap extends BasePlugin.EventMap<State> {
     }) => void;
     loadVideoFirstFrame: () => void;
 }
-export type TagEvents = {
+export type TagEvents<C extends TagContentType = TagContentType> = {
     unfolded: () => void;
     folded: () => void;
     show: () => void;
     hide: () => void;
+    dataChanged: (data: TagInstance<C>['data']) => void;
 };
 export interface TagCacheInterface {
     visible?: boolean;

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

@@ -2,7 +2,7 @@ import type { State as FiveState } from '@realsee/five';
 import type { TagConfig } from './TagConfig';
 import type { ContentTypeMap, TagContentType } from './TagData';
 import type { Position, TagId, StickType, TagStyle, ElementRenderer, PickTagContentTypeInContentTypeConfigKey, ContentTypeConfigKey } from './Utils';
-import type { DeprecatedTagProperty } from '../../Archive/deprecated';
+import type { ContentType, DeprecatedTagProperty } from '../../Archive/deprecated';
 export interface Tags {
     version?: string;
     /** tag配置 > 按type配置 > 全局配置 */
@@ -19,11 +19,11 @@ export type Tag<C extends TagContentType = TagContentType, S extends StickType =
     /** 开启/禁用 */
     enabled?: boolean;
     /** 唯一标识 */
-    id?: TagId;
+    id: TagId;
     /** @type {StickType} 附着方式 */
     stickType: S;
     /** @type {TagContentType} 内容类型，根据内容类型展示对应UI */
-    contentType: C;
+    contentType: C extends ContentType.Unknown ? string : C;
     /** 点 */
     position: S extends 'Plane' ? [Position, Position, Position, Position] : S extends '2DPoint' | '3DPoint' | 'Model' ? Position : Position | [Position, Position, Position, Position];
     /** 法向量 */
@@ -33,7 +33,7 @@ export type Tag<C extends TagContentType = TagContentType, S extends StickType =
     /** 标签 wrapper 的 classname */
     className?: string;
     /** 标签数据 */
-    data?: C extends TagContentType ? ContentTypeMap[C] : ContentTypeMap[keyof ContentTypeMap];
+    data: C extends TagContentType ? ContentTypeMap[C] : ContentTypeMap[keyof ContentTypeMap];
     /** 「展开/收起」 「可见/不可见」 的策略配置 */
     config?: TagConfig<C>;
     /** 打标签时的 five state */

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

@@ -4,8 +4,8 @@ import type { ContentTypeMap, TagContentType } from './TagData';
 import type { MinMax } from './Utils';
 import type { PartialObjectDeep } from './Utils';
 import type { TagInstance } from './TagInstance';
-type ConfigFunction<C extends TagContentType = TagContentType> = (five: Five, tagState: {
-    tag: TagInstance<C>;
+type ConfigFunction = (five: Five, tagState: {
+    tag: TagInstance<any>;
     /** 标签点或中心点的到摄像机的距离 */
     distance: number;
     /** 3D标签中 「标签所在平面或垂直于标签法线的平面」 与 「摄像机到标签点或中心点的向量」 的夹角 */
@@ -68,7 +68,7 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
          * @default undefined
          */
         angleRange?: MinMax;
-    } | ConfigFunction<C>;
+    } | ConfigFunction;
     /** 展开/收起配置 */
     unfoldedConfig?: {
         /** 保持展开/收起，设置后unfoldedConfig下所有其他配置都不生效 */
@@ -109,7 +109,7 @@ export interface TagConfig<C extends TagContentType = TagContentType> {
             /** 展开的最大距离, 默认为无限制 */
             distance?: MinMax;
         };
-    } | ConfigFunction<C>;
+    } | ConfigFunction;
     /** 初始状态 */
     initialState?: {
         /** 显示/隐藏 */

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

@@ -1,7 +1,7 @@
 import type { Tag } from './Tag';
 import type TagContentSvelte from '../../Components/Tag/index.svelte';
 import type { TagContentType } from './TagData';
-import type { StickType, TagGLTFObject } from './Utils';
+import type { PartialObjectDeep, StickType, TagGLTFObject } from './Utils';
 import type { Create3DDomContainerReturnType } from '../../../CSS3DRenderPlugin';
 import type { Vector3 } from 'three';
 import type { ImagePlane, VideoPlane } from '../../utils/model/mediaPlane';
@@ -15,6 +15,7 @@ export type TagInstance<C extends TagContentType = TagContentType, S extends Sti
         leftPercent: number;
         topPercent: number;
     } | null;
+    zIndex?: number;
     temporaryState: {
         visible: boolean;
     };
@@ -41,11 +42,12 @@ export type TagInstance<C extends TagContentType = TagContentType, S extends Sti
         visible?: boolean;
         unfolded: boolean;
     };
-    hooks: Subscribe<TagEvents>;
+    hooks: Subscribe<TagEvents<C>>;
     unfold: () => void;
     fold: () => void;
     enable: () => void;
     disable: () => void;
     destroy: () => void;
+    changeData: (data: PartialObjectDeep<TagInstance<C>['data']>) => void;
 };
 export {};

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

@@ -35,8 +35,11 @@ export interface TagIconUrl {
 export interface TagStyle {
     /** 小圆点样式 */
     point?: {
-        /** @deprecated v2.11.0 废弃，使用 width: number 控制 */
-        size?: TagIconSize;
+        /**
+         * @deprecated v2.11.0 废弃，使用 width: number 控制
+         * @description S: 18; M: 20; L: 24; XL: 28
+         */
+        size?: 'S' | 'M' | 'L' | 'XL' | number;
     } & TagIconUrl;
 }
 export type TagGLTFObject = GLTFObject & {
@@ -46,7 +49,10 @@ export type TagGLTFObject = GLTFObject & {
     updateTagCss3DObjectMatrix?: () => void;
 };
 /** 返回一个销毁函数 */
-export type ElementRenderer = (container: HTMLElement) => () => void;
+export type ElementRenderer = (container: HTMLElement, tag: TagInstance<any, any>) => () => void;
+export type TagRendererMap = Map<string, {
+    renderer: ElementRenderer;
+}>;
 export interface TagObjectGroup extends Group {
     children: Array<TagGLTFObjectGroup>;
 }
@@ -56,18 +62,14 @@ export interface TagGLTFObjectGroup extends Group {
 export interface ImagePlaneGroup extends Group {
     children: ImagePlane[];
 }
-/**
- * @description S: 18; M: 20; L: 24; XL: 28
- */
-export type TagIconSize = 'S' | 'M' | 'L' | 'XL' | number;
 export type AudioAppearance = TagInstance<'Audio'>['data']['appearance'];
 export type AudioTagTypeConfigKey = `${StickType | 'Any'}-Audio-${AudioAppearance}`;
-export type ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any'}` | TagContentType | AudioTagTypeConfigKey;
+export type ContentTypeConfigKey = `${StickType | 'Any'}-${TagContentType | 'Any'}` | TagContentType | AudioTagTypeConfigKey | `Mixin-${string}`;
 /**
  * @description: 从 ContentTypeConfigKey 中提取 ContentTypeConfigKey 对应的 TagContentType 是啥，没找到就是 never
  */
-export type PickTagContentTypeInContentTypeConfigKey<T extends ContentTypeConfigKey> = T extends `${any}-Audio-${any}` ? 'Audio' : T extends `${any}-${infer C}` ? C : T extends TagContentType ? T : never;
-export type ContentTypeConfigKeySplit = [StickType | 'Any', TagContentType | 'Any'] | [TagContentType] | [StickType | 'Any', 'Audio', AudioAppearance];
+export type PickTagContentTypeInContentTypeConfigKey<T extends ContentTypeConfigKey> = T extends `${any}-Audio-${any}` ? 'Audio' : T extends `Mixin-${string}` ? string : T extends `${any}-${infer C}` ? C : T extends TagContentType ? T : never;
+export type ContentTypeConfigKeySplit = [StickType | 'Any', TagContentType | 'Any'] | ['Mixin', string] | [TagContentType] | [StickType | 'Any', 'Audio', AudioAppearance];
 export type PointTag<C extends TagContentType = TagContentType> = TagInstance<C, '2DPoint' | '3DPoint'>;
 /** 二维标签 */
 export type Point2DTag<C extends TagContentType = TagContentType> = TagInstance<C, '2DPoint'>;

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let n = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "2.20.0-dev.1");
+    e(this, "VERSION", "2.20.0-dev.11");
     e(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.info(
-    "%c %c@realsee/dnalogel %cv2.20.0-dev.1",
+    "%c %c@realsee/dnalogel %cv2.20.0-dev.11",
     [
       "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

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.20.0-dev.1",
+  "version": "2.20.0-dev.11",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",