@realsee/dnalogel 2.0.0-alpha.12 → 2.0.0-alpha.13

package/libs/floorplan/ModelFloorplanPlugin/utils/correctFiveState.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { Five } from '@realsee/five';
 import changeMode from '../../../shared-utils/five/changeMode';
 import { FloorplanErrorType } from './constant';
@@ -19,28 +28,30 @@ export function checkShowState(five, showState) {
  * 2. 内置了相应的动画时间计算
  * 3. 纠正成功会返回 true，失败「可能会被用户行为中断」会返回 false
  */
-export default async function correctFiveState(five, showState, userAction = true) {
-    // 当前已满足状态，不需要变更
-    const result = checkShowState(five, showState);
-    if (result === true)
-        return;
-    // 纠正 mode
-    if (five.currentMode !== Five.Mode.Floorplan) {
-        const [changeModeError] = await to(changeMode(five, Five.Mode.Floorplan, showState, undefined, userAction));
-        if (changeModeError)
-            throw changeModeError;
-        // changeMode 是异步行为，可能会被打断，需要在结束后加一次判断
+export default function correctFiveState(five, showState, userAction = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // 当前已满足状态，不需要变更
         const result = checkShowState(five, showState);
-        if (result === false)
-            throw new Error(FloorplanErrorType.ChangeModeError);
+        if (result === true)
+            return;
+        // 纠正 mode
+        if (five.currentMode !== Five.Mode.Floorplan) {
+            const [changeModeError] = yield to(changeMode(five, Five.Mode.Floorplan, showState, undefined, userAction));
+            if (changeModeError)
+                throw changeModeError;
+            // changeMode 是异步行为，可能会被打断，需要在结束后加一次判断
+            const result = checkShowState(five, showState);
+            if (result === false)
+                throw new Error(FloorplanErrorType.ChangeModeError);
+            return;
+        }
+        // 纠正相机状态
+        // 根据 latitude、longitude、fov 计算动画时间，最多 1s
+        const { latitude, longitude, fov } = five.getCurrentState();
+        const time = Math.min(1000, Math.max(200, Math.abs(latitude - Math.PI / 2) * 1000, (longitude > Math.PI ? 2 * Math.PI - longitude : longitude) * 500, Math.abs(fov - showState.fov) * 10));
+        const [updateCameraError] = yield to(five.updateCamera(showState, time, userAction));
+        if (updateCameraError)
+            throw new Error(FloorplanErrorType.UpdateCameraError);
         return;
-    }
-    // 纠正相机状态
-    // 根据 latitude、longitude、fov 计算动画时间，最多 1s
-    const { latitude, longitude, fov } = five.getCurrentState();
-    const time = Math.min(1000, Math.max(200, Math.abs(latitude - Math.PI / 2) * 1000, (longitude > Math.PI ? 2 * Math.PI - longitude : longitude) * 500, Math.abs(fov - showState.fov) * 10));
-    const [updateCameraError] = await to(five.updateCamera(showState, time, userAction));
-    if (updateCameraError)
-        throw new Error(FloorplanErrorType.UpdateCameraError);
-    return;
+    });
 }

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/CurrentFloor/CurrentFloor.js

@@ -214,7 +214,9 @@ function instance($$self, $$props, $$invalidate) {
 
 	$$self.$$.update = () => {
 		if ($$self.$$.dirty & /*extraObjects, floorIndex*/ 132) {
-			$: $$invalidate(5, currentFloorExtraObjects = extraObjects?.filter(object => object.floorIndex === floorIndex));
+			$: $$invalidate(5, currentFloorExtraObjects = extraObjects === null || extraObjects === void 0
+			? void 0
+			: extraObjects.filter(object => object.floorIndex === floorIndex));
 		}
 	};
 

package/libs/floorplan/PanoFloorplanRadarPlugin/Controller.js

@@ -1,47 +1,107 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import Main from './Components/Main';
 import formatData, { formatExtraObjects } from '../utils/formatData';
 export default class PanoFloorplanRadarPluginController {
-    app;
-    five;
-    wrapperSelector = '';
-    data;
-    wrapper = null;
-    extraObjects;
-    originExtraObjects;
-    configs = {};
     constructor(five, params) {
+        Object.defineProperty(this, "app", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "five", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "wrapperSelector", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ''
+        });
+        Object.defineProperty(this, "data", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "wrapper", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.defineProperty(this, "extraObjects", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "originExtraObjects", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "configs", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+        Object.defineProperty(this, "dispose", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                var _a;
+                (_a = this.app) === null || _a === void 0 ? void 0 : _a.$destroy();
+            }
+        });
+        Object.defineProperty(this, "load", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (data) => __awaiter(this, void 0, void 0, function* () {
+                const copyData = JSON.parse(JSON.stringify(data));
+                const floorplanData = yield formatData(copyData);
+                this.data = floorplanData;
+                // const loadImage = async () => {
+                //   const floorIndex = this.five.work.observers[this.five.getCurrentState().panoIndex].floorIndex
+                //   // 当有 svgString 时，没有加载过程
+                //   if (floorplanData.outlines[floorIndex]?.svgContent) return
+                //   // 如果当前楼层图片不存在，不存在加载过程
+                //   const nowFloorImageSrc = floorplanData.outlines[floorIndex]?.url
+                //   if (!nowFloorImageSrc) return
+                //   // 图片加载完成时再 render
+                //   await new Promise<void>((resolve) => {
+                //     const nowFloorImage = new Image()
+                //     nowFloorImage.src = nowFloorImageSrc
+                //     nowFloorImage.onload = () => resolve()
+                //   })
+                // }
+                // await loadImage()
+                this.render();
+            })
+        });
         this.five = five;
-        params?.configs && Object.assign(this.configs, params.configs);
-        if (typeof params?.wrapper === 'string')
+        (params === null || params === void 0 ? void 0 : params.configs) && Object.assign(this.configs, params.configs);
+        if (typeof (params === null || params === void 0 ? void 0 : params.wrapper) === 'string')
             this.wrapperSelector = params.wrapper;
-        else if (params?.wrapper instanceof Element)
+        else if ((params === null || params === void 0 ? void 0 : params.wrapper) instanceof Element)
             this.wrapper = params.wrapper;
         five.once('dispose', this.dispose);
     }
-    dispose = () => {
-        this.app?.$destroy();
-    };
-    load = async (data) => {
-        const copyData = JSON.parse(JSON.stringify(data));
-        const floorplanData = await formatData(copyData);
-        this.data = floorplanData;
-        // const loadImage = async () => {
-        //   const floorIndex = this.five.work.observers[this.five.getCurrentState().panoIndex].floorIndex
-        //   // 当有 svgString 时，没有加载过程
-        //   if (floorplanData.outlines[floorIndex]?.svgContent) return
-        //   // 如果当前楼层图片不存在，不存在加载过程
-        //   const nowFloorImageSrc = floorplanData.outlines[floorIndex]?.url
-        //   if (!nowFloorImageSrc) return
-        //   // 图片加载完成时再 render
-        //   await new Promise<void>((resolve) => {
-        //     const nowFloorImage = new Image()
-        //     nowFloorImage.src = nowFloorImageSrc
-        //     nowFloorImage.onload = () => resolve()
-        //   })
-        // }
-        // await loadImage()
-        this.render();
-    };
     /** 把插件的渲染DOM插入到对应的容器中去 */
     appendTo(wrapper) {
         this.wrapper = wrapper;
@@ -59,6 +119,7 @@ export default class PanoFloorplanRadarPluginController {
         this.render();
     }
     render() {
+        var _a;
         // 处理 wrapper
         if (!this.wrapper) {
             const _wrapper = document.querySelector(this.wrapperSelector);
@@ -74,7 +135,7 @@ export default class PanoFloorplanRadarPluginController {
             floorplanData: this.data,
             extraObjects: this.extraObjects,
             cameraImageUrl: this.configs.cameraImageUrl,
-            hoverEnable: this.configs.hoverEnable ?? false,
+            hoverEnable: (_a = this.configs.hoverEnable) !== null && _a !== void 0 ? _a : false,
         };
         if (!this.app) {
             this.app = new Main({

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { pluginStyle } from './style';
 import formatData from '../utils/formatData';
 import { omit } from '../../shared-utils/filter';
@@ -5,20 +14,217 @@ import getPxmm from '../../shared-utils/getPxmm';
 import Main from "../ModelFloorplanPlugin/Components/Main";
 import changeModelCanvasOpacity from '../../shared-utils/changeModelCanvasOpacity';
 export class TopviewFloorplanPluginController {
-    size = { width: 0, height: 0 };
-    visible = false;
-    pxmm = 0;
-    app;
-    five;
-    panoIndex = 0;
-    floorIndex = 0;
-    configs = {};
-    lastPanoramaLongitude = 0;
-    selector;
-    floorplanData;
-    wrapper;
-    container = document.createElement('div');
     constructor(five, params) {
+        Object.defineProperty(this, "size", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: { width: 0, height: 0 }
+        });
+        Object.defineProperty(this, "visible", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "pxmm", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "app", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "five", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "panoIndex", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "floorIndex", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "configs", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+        Object.defineProperty(this, "lastPanoramaLongitude", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "selector", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "floorplanData", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "wrapper", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "container", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: document.createElement('div')
+        });
+        Object.defineProperty(this, "dispose", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                var _a, _b;
+                this.hide();
+                (_a = this.container) === null || _a === void 0 ? void 0 : _a.remove();
+                (_b = this.app) === null || _b === void 0 ? void 0 : _b.$destroy();
+                this.five.off('modeChange', this.handleModeChange);
+                this.five.off('panoArrived', this.handlePanoArrived);
+                this.five.off('modelLoaded', this.handleModelLoaded);
+                this.five.off('wantsMoveToPano', this.handleWantsMoveToPano);
+                this.five.off('wantsPanGesture', this.handleWantsPanGesture);
+                this.five.off('initAnimationEnded', this.handleInitAnimationEnded);
+                this.five.off('modelShownFloorChange', this.onModelShownFloorChange);
+            }
+        });
+        /** 模型楼层高亮改变时，自动进行楼层切换 */
+        Object.defineProperty(this, "onModelShownFloorChange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (shownFloor) => {
+                if (shownFloor === null)
+                    return;
+                this.floorIndex = shownFloor;
+                this.updateSize();
+                this.render();
+            }
+        });
+        /** panoIndex 改变时，更新 floorIndex */
+        Object.defineProperty(this, "handlePanoArrived", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (index) => {
+                var _a;
+                if (!((_a = this.five) === null || _a === void 0 ? void 0 : _a.work))
+                    return;
+                this.panoIndex = index;
+                this.floorIndex = this.five.work.observers[index].floorIndex;
+            }
+        });
+        /** 配置了 preventRoomClick 后，在户型图展示时阻止 Five 走点 */
+        Object.defineProperty(this, "handleWantsMoveToPano", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (!this.visible)
+                    return;
+                if (this.configs.preventRoomClick)
+                    return false;
+                return;
+            }
+        });
+        /** 在户型图展示时阻止 Five 滑动行为 */
+        Object.defineProperty(this, "handleWantsPanGesture", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (!this.visible)
+                    return;
+                return false;
+            }
+        });
+        Object.defineProperty(this, "handleModelLoaded", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (this.wrapper)
+                    return;
+                if (!this.selector)
+                    return;
+                const wrapper = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
+                if (!wrapper)
+                    throw new Error('不正确的父容器选择器');
+                this.wrapper = wrapper;
+                wrapper.append(this.container);
+            }
+        });
+        /** 非 Topview 态隐藏户型图 */
+        Object.defineProperty(this, "handleModeChange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (mode) => {
+                if (mode !== 'Topview')
+                    return this.hide();
+            }
+        });
+        /** 动画结束后是 Topview 态就展示户型图 */
+        Object.defineProperty(this, "handleInitAnimationEnded", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                const { mode } = this.five.getCurrentState();
+                if (mode === 'Topview')
+                    this.show();
+            }
+        });
+        /** 更新户型图大小 */
+        Object.defineProperty(this, "updateSize", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (!this.floorplanData)
+                    return;
+                if (!this.container || !this.wrapper)
+                    return;
+                if (this.five.getCurrentState().mode !== 'Topview')
+                    return;
+                // 计算户型图展示大小
+                const { min, max } = this.floorplanData.bounding;
+                const width = max.x - min.x;
+                const height = max.y - min.y;
+                // 每毫米对应的 px 值
+                const options = this.configs.attachedTo ? { attachedTo: this.configs.attachedTo } : undefined;
+                const pxmm = getPxmm(this.five, this.wrapper, this.floorIndex, options);
+                const _width = Math.ceil(width * pxmm);
+                const _height = Math.ceil(height * pxmm);
+                this.pxmm = pxmm;
+                this.size = { width: _width, height: _height };
+                this.container.style.width = _width + 'px';
+                this.container.style.height = _height + 'px';
+            }
+        });
         this.five = five;
         this.selector = params.selector;
         this.configs = omit(params, ['selector']);
@@ -34,10 +240,12 @@ export class TopviewFloorplanPluginController {
         this.five.on('modelShownFloorChange', this.onModelShownFloorChange);
     }
     /** 加载户型图数据 */
-    async load(data) {
-        const copyData = JSON.parse(JSON.stringify(data));
-        this.floorplanData = await formatData(copyData);
-        this.render();
+    load(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const copyData = JSON.parse(JSON.stringify(data));
+            this.floorplanData = yield formatData(copyData);
+            this.render();
+        });
     }
     /** 把插件的渲染DOM插入到对应的容器中去 */
     appendTo(wrapper) {
@@ -45,69 +253,6 @@ export class TopviewFloorplanPluginController {
         wrapper.appendChild(this.container);
         return this;
     }
-    dispose = () => {
-        this.hide();
-        this.container?.remove();
-        this.app?.$destroy();
-        this.five.off('modeChange', this.handleModeChange);
-        this.five.off('panoArrived', this.handlePanoArrived);
-        this.five.off('modelLoaded', this.handleModelLoaded);
-        this.five.off('wantsMoveToPano', this.handleWantsMoveToPano);
-        this.five.off('wantsPanGesture', this.handleWantsPanGesture);
-        this.five.off('initAnimationEnded', this.handleInitAnimationEnded);
-        this.five.off('modelShownFloorChange', this.onModelShownFloorChange);
-    };
-    /** 模型楼层高亮改变时，自动进行楼层切换 */
-    onModelShownFloorChange = (shownFloor) => {
-        if (shownFloor === null)
-            return;
-        this.floorIndex = shownFloor;
-        this.updateSize();
-        this.render();
-    };
-    /** panoIndex 改变时，更新 floorIndex */
-    handlePanoArrived = (index) => {
-        if (!this.five?.work)
-            return;
-        this.panoIndex = index;
-        this.floorIndex = this.five.work.observers[index].floorIndex;
-    };
-    /** 配置了 preventRoomClick 后，在户型图展示时阻止 Five 走点 */
-    handleWantsMoveToPano = () => {
-        if (!this.visible)
-            return;
-        if (this.configs.preventRoomClick)
-            return false;
-        return;
-    };
-    /** 在户型图展示时阻止 Five 滑动行为 */
-    handleWantsPanGesture = () => {
-        if (!this.visible)
-            return;
-        return false;
-    };
-    handleModelLoaded = () => {
-        if (this.wrapper)
-            return;
-        if (!this.selector)
-            return;
-        const wrapper = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
-        if (!wrapper)
-            throw new Error('不正确的父容器选择器');
-        this.wrapper = wrapper;
-        wrapper.append(this.container);
-    };
-    /** 非 Topview 态隐藏户型图 */
-    handleModeChange = (mode) => {
-        if (mode !== 'Topview')
-            return this.hide();
-    };
-    /** 动画结束后是 Topview 态就展示户型图 */
-    handleInitAnimationEnded = () => {
-        const { mode } = this.five.getCurrentState();
-        if (mode === 'Topview')
-            this.show();
-    };
     show() {
         this.visible = true;
         this.five.model.show(this.floorIndex);
@@ -130,28 +275,6 @@ export class TopviewFloorplanPluginController {
         this.five.on('wantsMoveToPano', this.handleWantsMoveToPano);
         this.five.on('wantsPanGesture', this.handleWantsPanGesture);
     }
-    /** 更新户型图大小 */
-    updateSize = () => {
-        if (!this.floorplanData)
-            return;
-        if (!this.container || !this.wrapper)
-            return;
-        if (this.five.getCurrentState().mode !== 'Topview')
-            return;
-        // 计算户型图展示大小
-        const { min, max } = this.floorplanData.bounding;
-        const width = max.x - min.x;
-        const height = max.y - min.y;
-        // 每毫米对应的 px 值
-        const options = this.configs.attachedTo ? { attachedTo: this.configs.attachedTo } : undefined;
-        const pxmm = getPxmm(this.five, this.wrapper, this.floorIndex, options);
-        const _width = Math.ceil(width * pxmm);
-        const _height = Math.ceil(height * pxmm);
-        this.pxmm = pxmm;
-        this.size = { width: _width, height: _height };
-        this.container.style.width = _width + 'px';
-        this.container.style.height = _height + 'px';
-    };
     render(duration) {
         if (!this.container || !this.floorplanData)
             return;
@@ -160,19 +283,19 @@ export class TopviewFloorplanPluginController {
         const { northDesc, getLabelElement, cameraImageUrl, preventRoomClick, hoverEnable, compassEnable, roomLabelsEnable, ruleLabelsEnable, } = this.configs;
         const handleClick = preventRoomClick ? () => false : undefined;
         const props = {
-            northDesc: northDesc ?? '北',
+            northDesc: northDesc !== null && northDesc !== void 0 ? northDesc : '北',
             five: this.five,
             pxmm: this.pxmm,
             cameraImageUrl,
             visible: this.visible,
-            duration: duration ?? 0,
+            duration: duration !== null && duration !== void 0 ? duration : 0,
             panoIndex: this.panoIndex,
             floorIndex: this.floorIndex,
             floorplanData: this.floorplanData,
-            hoverEnable: hoverEnable ?? false,
-            compassEnable: compassEnable ?? true,
-            ruleLabelsEnable: ruleLabelsEnable ?? true,
-            roomLabelsEnable: roomLabelsEnable ?? true,
+            hoverEnable: hoverEnable !== null && hoverEnable !== void 0 ? hoverEnable : false,
+            compassEnable: compassEnable !== null && compassEnable !== void 0 ? compassEnable : true,
+            ruleLabelsEnable: ruleLabelsEnable !== null && ruleLabelsEnable !== void 0 ? ruleLabelsEnable : true,
+            roomLabelsEnable: roomLabelsEnable !== null && roomLabelsEnable !== void 0 ? roomLabelsEnable : true,
             lastPanoramaLongitude: this.lastPanoramaLongitude,
             getLabelElement,
             onRoomHeightClick: handleClick,