@realsee/dnalogel 2.11.0 → 2.11.2

package/libs/floorplan/TopviewFloorplanPlugin/Controller.d.ts

@@ -2,7 +2,7 @@ import type { PartialDeep } from 'type-fest';
 import type { BaseOptions } from '../../base/BasePlugin';
 import type { Five } from '@realsee/five';
 import type { FloorplanServerData } from '../typings/floorplanServerData';
-import type { State, Config, EventMap, Parameters, PluginData, PluginServerData } from './typing';
+import type { State, Config, EventMap, Parameters, PluginData, PluginServerData, HighlightData } from './typing';
 import * as BasePlugin from '../../base/BasePluginWithData';
 export declare class Controller extends BasePlugin.Controller<State, EventMap, PluginServerData, PluginData> {
     name: string;
@@ -24,6 +24,8 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     private hasAddedEventListener;
     /** 上一次隐藏是否是用户调用了 hide 导致的 */
     private isHiddenByHideFunc;
+    /** 高亮区域 */
+    private highlightData;
     constructor(five: Five, params?: Parameters);
     load(serverData: PluginServerData | FloorplanServerData, state?: Partial<State>, userAction?: boolean): Promise<void>;
     /** 更新户型图大小 */
@@ -41,6 +43,8 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     /** 更改插件 State */
     setState(state: PartialDeep<State>, options?: BaseOptions): void;
     changeConfigs(config: Partial<Config>, userAction?: boolean): void;
+    highlight: (highlightData: HighlightData) => void;
+    unhighlight: () => void;
     protected formatData(serverData: PluginServerData): Promise<PluginData>;
     private _show;
     private _hide;

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -1,28 +1,28 @@
-var w = Object.defineProperty, E = Object.defineProperties;
+var E = Object.defineProperty, w = Object.defineProperties;
 var F = Object.getOwnPropertyDescriptors;
-var v = Object.getOwnPropertySymbols;
+var m = Object.getOwnPropertySymbols;
 var A = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
-var p = (h, n, t) => n in h ? w(h, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[n] = t, l = (h, n) => {
+var p = (h, n, t) => n in h ? E(h, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[n] = t, u = (h, n) => {
   for (var t in n || (n = {}))
     A.call(n, t) && p(h, t, n[t]);
-  if (v)
-    for (var t of v(n))
+  if (m)
+    for (var t of m(n))
       C.call(n, t) && p(h, t, n[t]);
   return h;
-}, f = (h, n) => E(h, F(n));
-var o = (h, n, t) => (p(h, typeof n != "symbol" ? n + "" : n, t), t);
-var c = (h, n, t) => new Promise((e, i) => {
+}, f = (h, n) => w(h, F(n));
+var i = (h, n, t) => (p(h, typeof n != "symbol" ? n + "" : n, t), t);
+var c = (h, n, t) => new Promise((e, o) => {
   var s = (d) => {
     try {
       a(t.next(d));
-    } catch (u) {
-      i(u);
+    } catch (l) {
+      o(l);
     }
   }, r = (d) => {
     try {
       a(t.throw(d));
-    } catch (u) {
-      i(u);
+    } catch (l) {
+      o(l);
     }
   }, a = (d) => d.done ? e(d.value) : Promise.resolve(d.value).then(s, r);
   a((t = t.apply(h, n)).next());
@@ -30,14 +30,14 @@ var c = (h, n, t) => new Promise((e, i) => {
 import * as x from "three";
 import { equal as S } from "../../shared-utils/equal.js";
 import { Main as y } from "../Components/Main.js";
-import { formatData as m } from "../utils/formatData.js";
-import { CAMERA_IMAGE as I } from "../Assets/camera.js";
-import { omit as _ } from "../../shared-utils/filter.js";
-import { FLOOR_PLAN_ATTACHED_TO as D } from "../constant.js";
+import { formatData as v } from "../utils/formatData.js";
+import { CAMERA_IMAGE as D } from "../Assets/camera.js";
+import { omit as I } from "../../shared-utils/filter.js";
+import { FLOOR_PLAN_ATTACHED_TO as _ } from "../constant.js";
 import { Controller as L } from "../../base/BasePluginWithData.js";
 import { changeMode as T } from "../../shared-utils/five/changeMode.js";
 import { getPxmm as M, getAttachedY as P } from "../../shared-utils/getPxmm.js";
-import { changeModelCanvasOpacity as b } from "../../shared-utils/changeModelCanvasOpacity.js";
+import { changeModelCanvasOpacity as g } from "../../shared-utils/changeModelCanvasOpacity.js";
 import "../../shared-utils/isTruelyObject.js";
 import "../../vendor/svelte/internal/index.js";
 import "../../vendor/svelte/transition/index.js";
@@ -67,38 +67,45 @@ import "../../shared-utils/tap.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
 import "../../shared-utils/nearlyEqual.js";
-class Et extends L {
+class wt extends L {
   constructor(t, e) {
     super(t);
-    o(this, "name", "topviewFloorplanPlugin");
-    o(this, "state");
-    o(this, "data");
-    o(this, "app");
-    o(this, "selector");
-    o(this, "panoIndex", 0);
-    o(this, "floorIndex", 0);
-    o(this, "wrapper");
-    o(this, "container", document.createElement("div"));
-    o(this, "lastPanoramaLongitude", 0);
-    o(this, "size", { width: 0, height: 0 });
-    o(this, "hasAddedEventListener", !1);
-    o(this, "isHiddenByHideFunc", !1);
-    o(this, "updateSize", () => {
+    i(this, "name", "topviewFloorplanPlugin");
+    i(this, "state");
+    i(this, "data");
+    i(this, "app");
+    i(this, "selector");
+    i(this, "panoIndex", 0);
+    i(this, "floorIndex", 0);
+    i(this, "wrapper");
+    i(this, "container", document.createElement("div"));
+    i(this, "lastPanoramaLongitude", 0);
+    i(this, "size", { width: 0, height: 0 });
+    i(this, "hasAddedEventListener", !1);
+    i(this, "isHiddenByHideFunc", !1);
+    i(this, "highlightData", {});
+    i(this, "updateSize", () => {
       if (!this.data || !this.container || !this.wrapper || this.five.getCurrentState().mode !== "Topview")
         return;
-      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, s = e.y - t.y, r = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, a = M(this.five, this.wrapper, this.floorIndex, r), d = Math.ceil(i * a), u = Math.ceil(s * a);
-      this.size.width === d && this.size.height === u || (this.container.style.width = d + "px", this.container.style.height = u + "px", this.size = { width: d, height: u });
+      const { min: t, max: e } = this.data.bounding, o = e.x - t.x, s = e.y - t.y, r = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, a = M(this.five, this.wrapper, this.floorIndex, r), d = Math.ceil(o * a), l = Math.ceil(s * a);
+      this.size.width === d && this.size.height === l || (this.container.style.width = d + "px", this.container.style.height = l + "px", this.size = { width: d, height: l });
     });
-    o(this, "dispose", () => {
+    i(this, "dispose", () => {
       var t, e;
       this.removeEventListener(), (t = this.app) == null || t.$destroy(), this.app = void 0, (e = this.container) == null || e.remove(), this.data = void 0, this.wrapper = void 0, this.selector = void 0, this.hooks.emit("dispose");
     });
-    o(this, "_disable", (t) => {
-      var i, s;
+    i(this, "highlight", (t) => {
+      !this.state.config.highlightEnable || (this.highlightData = t, this.render());
+    });
+    i(this, "unhighlight", () => {
+      this.highlightData = {}, this.render();
+    });
+    i(this, "_disable", (t) => {
+      var o, s;
       const { userAction: e } = t;
-      (i = this.app) == null || i.$destroy(), this.app = void 0, (s = this.container) == null || s.remove(), this.removeEventListener(), this.hooks.emit("disable", { userAction: e });
+      (o = this.app) == null || o.$destroy(), this.app = void 0, (s = this.container) == null || s.remove(), this.removeEventListener(), this.hooks.emit("disable", { userAction: e });
     });
-    o(this, "onFiveModelLoaded", () => {
+    i(this, "onFiveModelLoaded", () => {
       if (this.state.enabled === !1 || this.wrapper || !this.selector)
         return;
       const t = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
@@ -106,29 +113,29 @@ class Et extends L {
         throw new Error("\u4E0D\u6B63\u786E\u7684\u7236\u5BB9\u5668\u9009\u62E9\u5668");
       this.wrapper = t, t.append(this.container);
     });
-    o(this, "onFiveModeChange", (...[t, , , , e]) => {
+    i(this, "onFiveModeChange", (...[t, , , , e]) => {
       t !== "Topview" && this.state.visible && (this.updateState({ visible: !1 }, e), this._hide({ userAction: e }));
     });
-    o(this, "onFivePanoArrived", (t) => {
+    i(this, "onFivePanoArrived", (t) => {
       var e;
       !((e = this.five) != null && e.work) || (this.panoIndex = t, this.floorIndex = this.five.work.observers[t].floorIndex);
     });
-    o(this, "onFiveCameraUpdate", (t, e) => {
+    i(this, "onFiveCameraUpdate", (t, e) => {
       !this.state.visible || (this.updatePosition(), this.updateSize());
     });
-    o(this, "onFiveWantsGesture", (t) => {
+    i(this, "onFiveWantsGesture", (t) => {
       if (!(t !== "pan" && t !== "pinch" && t !== "mouseWheel") && this.state.visible && !this.state.config.gestureEnable)
         return !1;
     });
-    o(this, "onFiveWantsMoveToPano", () => {
+    i(this, "onFiveWantsMoveToPano", () => {
       if (this.state.visible && this.state.config.preventRoomClick)
         return !1;
     });
-    o(this, "onFiveInitAnimationEnded", (...[, , t]) => {
+    i(this, "onFiveInitAnimationEnded", (...[, , t]) => {
       const { mode: e } = this.five.getCurrentState();
       e === "Topview" && !this.isHiddenByHideFunc && !this.state.visible && this.state.config.autoShowEnable && (this.updateState({ visible: !0 }, t), this._show({ userAction: t }));
     });
-    o(this, "onModelShownFloorChange", (t) => {
+    i(this, "onModelShownFloorChange", (t) => {
       if (this.floorIndex !== t) {
         if (t === null) {
           const e = this.five.getCurrentState().panoIndex;
@@ -139,10 +146,12 @@ class Et extends L {
       }
     });
     e != null && e.selector && (this.selector = e.selector, console.warn("\u4E0D\u63A8\u8350\u7EE7\u7EED\u4F7F\u7528 params.selector \u914D\u7F6E\u7236\u5BB9\u5668\uFF0C\u8BF7\u4F7F\u7528 appendTo \u65B9\u6CD5"));
-    const i = {
+    const o = {
       northDesc: "\u5317",
       modelOpacity: 1,
+      cameraEnable: !0,
       hoverEnable: !0,
+      highlightEnable: !1,
       compassEnable: !0,
       gestureEnable: !1,
       autoShowEnable: !0,
@@ -150,28 +159,28 @@ class Et extends L {
       roomLabelsEnable: !0,
       roomAreaEnable: !0,
       roomNameEnable: !0,
-      cameraImageUrl: I,
-      attachedTo: D.BOUNDING_CENTER,
+      cameraImageUrl: D,
+      attachedTo: _.BOUNDING_CENTER,
       getLabelElement: void 0,
       adaptiveRoomLabelVisibleEnable: !0,
       getRoomAreaText: (a) => (a / 1e6).toFixed(1) + "\u33A1",
       getRuleDistanceText: (a) => a.toString()
-    }, s = e ? _(e, ["selector", "scale"]) : {}, r = l(l({}, i), s);
+    }, s = e ? I(e, ["selector", "scale"]) : {}, r = u(u({}, o), s);
     this.state = {
       enabled: !0,
       visible: !1,
       config: r
     }, this.initContainer(), t.model.loaded ? this.onFiveModelLoaded() : t.once("modelLoaded", this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
-  load(t, e, i = !0) {
+  load(t, e, o = !0) {
     return c(this, null, function* () {
-      function s(g) {
-        return Object.prototype.hasOwnProperty.apply(g, ["version"]);
+      function s(b) {
+        return Object.prototype.hasOwnProperty.apply(b, ["version"]);
       }
       const r = t;
       r && !r.version && console.warn("\u4F20\u5165 serverData.data \u7684\u65B9\u5F0F\u540E\u7EED\u53EF\u80FD\u4E0D\u518D\u652F\u6301\uFF0C\u8BF7\u628A serverData \u6574\u4F53\u4F20\u5165 load \u51FD\u6570");
-      const a = JSON.parse(JSON.stringify(t)), d = s(a) ? a.data : a, u = this.data;
-      this.data = yield m(d), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, u), e && this.updateState(e, i), this.render();
+      const a = JSON.parse(JSON.stringify(t)), d = s(a) ? a.data : a, l = this.data;
+      this.data = yield v(d), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, l), e && this.updateState(e, o), this.render();
     });
   }
   updatePosition() {
@@ -179,7 +188,7 @@ class Et extends L {
     const t = P(this.five, this.floorIndex, this.state.config.attachedTo), e = (a = this.five.model) == null ? void 0 : a.bounding.getCenter(new x.Vector3()).setY(t);
     if (!e)
       return;
-    const i = e.clone().project(this.five.camera), s = (i.x + 1) / 2, r = -(i.y - 1) / 2;
+    const o = e.clone().project(this.five.camera), s = (o.x + 1) / 2, r = -(o.y - 1) / 2;
     this.container.style.left = s * 100 + "%", this.container.style.top = r * 100 + "%";
   }
   appendTo(t) {
@@ -215,12 +224,12 @@ class Et extends L {
     this.updateState({ enabled: !1 }, t.userAction || e), this._disable({ userAction: e });
   }
   setState(t, e = {}) {
-    const i = this.state, s = e.userAction !== void 0 ? e.userAction : !0;
-    if (this.updateState(t, s), t.enabled !== void 0 && i.enabled !== t.enabled) {
+    const o = this.state, s = e.userAction !== void 0 ? e.userAction : !0;
+    if (this.updateState(t, s), t.enabled !== void 0 && o.enabled !== t.enabled) {
       const r = { userAction: s };
       t.enabled ? this._enable(r) : this._disable(r);
     }
-    if (t.visible !== void 0 && i.visible !== t.visible) {
+    if (t.visible !== void 0 && o.visible !== t.visible) {
       const r = { userAction: s };
       t.visible ? this._show(r) : this._hide(r);
     }
@@ -230,7 +239,7 @@ class Et extends L {
   }
   formatData(t) {
     return c(this, null, function* () {
-      return yield m(t.data);
+      return yield v(t.data);
     });
   }
   _show(t) {
@@ -240,8 +249,8 @@ class Et extends L {
       this.isHiddenByHideFunc = !1;
       const { userAction: e } = t;
       this.hooks.emit("show", { userAction: e, auto: !1 }), this.five.getCurrentState().mode !== "Topview" && (yield T(this.five, ["Topview", void 0, void 0, e])), this.five.model.show(this.floorIndex), this.updatePosition(), this.updateSize();
-      const i = 500, s = this.state.config.modelOpacity;
-      b(this.five, s, i), this.hooks.emit("showAnimationEnded", { userAction: e, auto: !1 }), this.render();
+      const o = 500, s = this.state.config.modelOpacity;
+      g(this.five, s, o), this.hooks.emit("showAnimationEnded", { userAction: e, auto: !1 }), this.render();
     });
   }
   _hide(t) {
@@ -250,8 +259,8 @@ class Et extends L {
         return;
       const { userAction: e } = t;
       this.hooks.emit("hide", { userAction: e, auto: !1 });
-      const i = 1, s = 0;
-      b(this.five, i, s), this.render();
+      const o = 1, s = 0;
+      g(this.five, o, s), this.render();
     });
   }
   _enable(t) {
@@ -259,8 +268,8 @@ class Et extends L {
     this.addEventListener(), this.wrapper && this.wrapper.append(this.container), this.hooks.emit("enable", { userAction: e }), this.state.visible && this._show({ userAction: e });
   }
   updateState(t, e) {
-    const i = this.state, s = t.config ? l(l({}, i.config), t.config) : i.config;
-    this.state = f(l(l({}, this.state), t), { config: s }), !S(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    const o = this.state, s = t.config ? u(u({}, o.config), t.config) : o.config;
+    this.state = f(u(u({}, this.state), t), { config: s }), !S(this.state, o, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: o, userAction: e });
   }
   addEventListener() {
     if (!this.state.enabled || this.hasAddedEventListener)
@@ -286,13 +295,14 @@ class Et extends L {
   render(t) {
     if (!this.state.enabled || !this.container || !this.data || this.size.width === 0)
       return;
-    const e = f(l({}, this.state.config), {
+    const e = f(u({}, this.state.config), {
       visible: this.state.visible,
       duration: t != null ? t : 0,
       panoIndex: this.panoIndex,
       floorIndex: this.floorIndex,
       floorplanData: this.data,
-      lastPanoramaLongitude: this.lastPanoramaLongitude
+      lastPanoramaLongitude: this.lastPanoramaLongitude,
+      highlightData: this.highlightData
     });
     if (this.app)
       return this.app.$set(e);
@@ -300,5 +310,5 @@ class Et extends L {
   }
 }
 export {
-  Et as Controller
+  wt as Controller
 };

package/libs/floorplan/typings/index.d.ts

@@ -14,6 +14,10 @@ export interface Config {
     modelOpacity: number;
     /** 鼠标放置在分间上时，是否要自动高亮分间，默认为 true */
     hoverEnable: boolean;
+    /** 支持highlight功能，默认为 false */
+    highlightEnable: boolean;
+    /** 支持Camera功能，默认为 true */
+    cameraEnable: boolean;
     /** 是否要启用指北针功能，默认为 true */
     compassEnable: boolean;
     /** Five 切换到 Topview Mode 时，是否自动展示户型图，默认为 true */
@@ -118,4 +122,12 @@ export interface HideOptions {
     /** 是否是用户操作 */
     userAction: boolean;
 }
+export interface HighlightData {
+    /** id: floorIndex_roomId */
+    [id: string]: {
+        color: string;
+        opacity: number;
+        disabled?: boolean;
+    };
+}
 export { FloorplanData as PluginData };

package/package.json

@@ -7,23 +7,8 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.11.0",
+  "version": "2.11.2",
   "license": "SEE LICENSE IN TERMS.txt",
-  "scripts": {
-    "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",
-    "dev": "run-p dev:*",
-    "light-dev": "npm run dev:dist",
-    "dev:libs": "NODE_ENV=development BUILD_MODULE=libs vite build -m development",
-    "dev:dist": "NODE_ENV=development BUILD_MODULE=dist vite build -m development",
-    "dev:components": "NODE_ENV=development BUILD_MODULE=components vite build -m development",
-    "build": "run-p build:*",
-    "build:libs": "NODE_ENV=production BUILD_MODULE=libs vite build -m production",
-    "build:dist": "NODE_ENV=production BUILD_MODULE=dist vite build -m production",
-    "build:components": "NODE_ENV=production BUILD_MODULE=components vite build -m production",
-    "docs": "typedoc --options ./typedoc.json",
-    "prepublishOnly": "run-p build docs",
-    "postpublish": "cnpm sync @realsee/dnalogel"
-  },
   "files": [
     "libs",
     "dist",
@@ -88,5 +73,18 @@
   "peerDependencies": {
     "@realsee/five": "^5.0.0",
     "three": ">=0.115.0 <=0.117.1"
+  },
+  "scripts": {
+    "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",
+    "dev": "run-p dev:*",
+    "light-dev": "npm run dev:dist",
+    "dev:libs": "NODE_ENV=development BUILD_MODULE=libs vite build -m development",
+    "dev:dist": "NODE_ENV=development BUILD_MODULE=dist vite build -m development",
+    "dev:components": "NODE_ENV=development BUILD_MODULE=components vite build -m development",
+    "build": "run-p build:*",
+    "build:libs": "NODE_ENV=production BUILD_MODULE=libs vite build -m production",
+    "build:dist": "NODE_ENV=production BUILD_MODULE=dist vite build -m production",
+    "build:components": "NODE_ENV=production BUILD_MODULE=components vite build -m production",
+    "docs": "typedoc --options ./typedoc.json"
   }
-}
+}

package/libs/PanoTagPlugin/mocks/v1/mock-80P6A03eQRQKY3oqLj.d.ts

@@ -1,4 +0,0 @@
-declare const data: {
-    tagList: any[];
-};
-export default data;

package/libs/PanoTagPlugin/mocks/v1/mock-80P6A03eQRQKY3oqLj.js

@@ -1,6 +0,0 @@
-const t = {
-  tagList: []
-};
-export {
-  t as default
-};

package/libs/PanoTagPlugin/mocks/v1/mock-80QG2vMPboNv5DWrom.d.ts

@@ -1,93 +0,0 @@
-declare const _default: ({
-    id: number;
-    pointType: string;
-    dimensionType: string;
-    position: number[];
-    normal: number[];
-    style: {
-        point: {
-            iconUrl: string;
-            style: string;
-        };
-        style: string;
-    };
-    contentType: string;
-    data: {
-        text: string;
-        extraData: {
-            baseNormal: number[];
-            fiveState: {
-                distance: number;
-                fov: number;
-                latitude: number;
-                longitude: number;
-                mode: string;
-                offset: {
-                    x: number;
-                    y: number;
-                    z: number;
-                };
-                panoIndex: number;
-            };
-            style: {
-                point: {
-                    iconUrl: string;
-                    style: string;
-                };
-                style: string;
-            };
-            tagClosedStyle: string;
-            tagIconUrl: string;
-        };
-        mediaData?: undefined;
-    };
-} | {
-    id: number;
-    pointType: string;
-    dimensionType: string;
-    position: number[];
-    normal: number[];
-    style: {
-        point: {
-            iconUrl: string;
-            style: string;
-        };
-        style?: undefined;
-    };
-    contentType: string;
-    data: {
-        text: string;
-        mediaData: {
-            type: string;
-            url: string;
-            videoCoverUrl: string;
-            name: string;
-        }[];
-        extraData: {
-            baseNormal: number[];
-            fiveState: {
-                distance: number;
-                fov: number;
-                latitude: number;
-                longitude: number;
-                mode: string;
-                offset: {
-                    x: number;
-                    y: number;
-                    z: number;
-                };
-                panoIndex: number;
-            };
-            style: {
-                point: {
-                    iconUrl: string;
-                    style: string;
-                };
-                style?: undefined;
-            };
-            tagClosedStyle: string;
-            tagIconUrl: string;
-        };
-    };
-})[];
-export default _default;