@realsee/dnalogel 2.0.0-alpha.16 → 2.0.0-alpha.19

package/libs/floorplan/{ModelFloorplanPlugin/Components → Components}/RuleLabels/RuleLabels.js

@@ -1,6 +1,7 @@
 /* generated by Svelte v3.47.0 */
 import {
 	SvelteComponent,
+	append_styles,
 	assign,
 	attr,
 	check_outros,
@@ -16,6 +17,7 @@ import {
 	mount_component,
 	outro_and_destroy_block,
 	safe_not_equal,
+	set_style,
 	transition_in,
 	transition_out,
 	update_keyed_each
@@ -23,14 +25,18 @@ import {
 
 import RuleItem from './RuleItem';
 
+function add_css(target) {
+	append_styles(target, "svelte-12vlcaz", ".floorplan-plugin__rule-labels-wrapper.svelte-12vlcaz{position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);pointer-events:none}");
+}
+
 function get_each_context(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[7] = list[i][0];
-	child_ctx[8] = list[i][1];
+	child_ctx[12] = list[i][0];
+	child_ctx[13] = list[i][1];
 	return child_ctx;
 }
 
-// (12:2) {#each ruleLabelArray as [type, data] (type)}
+// (19:2) {#each ruleLabelArray as [type, data] (type)}
 function create_each_block(key_1, ctx) {
 	let first;
 	let ruleitem;
@@ -38,10 +44,9 @@ function create_each_block(key_1, ctx) {
 
 	const ruleitem_spread_levels = [
 		{
-			type: /*type*/ ctx[7],
-			data: /*data*/ ctx[8],
-			pxmm: /*pxmm*/ ctx[0],
-			bounding: /*bounding*/ ctx[2]
+			type: /*type*/ ctx[12],
+			data: /*data*/ ctx[13],
+			bounding: /*bounding*/ ctx[0]
 		}
 	];
 
@@ -69,13 +74,12 @@ function create_each_block(key_1, ctx) {
 		p(new_ctx, dirty) {
 			ctx = new_ctx;
 
-			const ruleitem_changes = (dirty & /*ruleLabelArray, pxmm, bounding*/ 7)
+			const ruleitem_changes = (dirty & /*ruleLabelArray, bounding*/ 9)
 			? get_spread_update(ruleitem_spread_levels, [
 					{
-						type: /*type*/ ctx[7],
-						data: /*data*/ ctx[8],
-						pxmm: /*pxmm*/ ctx[0],
-						bounding: /*bounding*/ ctx[2]
+						type: /*type*/ ctx[12],
+						data: /*data*/ ctx[13],
+						bounding: /*bounding*/ ctx[0]
 					}
 				])
 			: {};
@@ -103,8 +107,8 @@ function create_fragment(ctx) {
 	let each_blocks = [];
 	let each_1_lookup = new Map();
 	let current;
-	let each_value = /*ruleLabelArray*/ ctx[1];
-	const get_key = ctx => /*type*/ ctx[7];
+	let each_value = /*ruleLabelArray*/ ctx[3];
+	const get_key = ctx => /*type*/ ctx[12];
 
 	for (let i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context(ctx, each_value, i);
@@ -120,7 +124,9 @@ function create_fragment(ctx) {
 				each_blocks[i].c();
 			}
 
-			attr(div, "class", "floorplan-plugin__rulelabels");
+			attr(div, "class", "floorplan-plugin__rule-labels-wrapper svelte-12vlcaz");
+			set_style(div, "width", /*width*/ ctx[2], false);
+			set_style(div, "height", /*height*/ ctx[1], false);
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
@@ -132,12 +138,20 @@ function create_fragment(ctx) {
 			current = true;
 		},
 		p(ctx, [dirty]) {
-			if (dirty & /*ruleLabelArray, pxmm, bounding*/ 7) {
-				each_value = /*ruleLabelArray*/ ctx[1];
+			if (dirty & /*ruleLabelArray, bounding*/ 9) {
+				each_value = /*ruleLabelArray*/ ctx[3];
 				group_outros();
 				each_blocks = update_keyed_each(each_blocks, dirty, get_key, 1, ctx, each_value, each_1_lookup, div, outro_and_destroy_block, create_each_block, null, get_each_context);
 				check_outros();
 			}
+
+			if (dirty & /*width*/ 4) {
+				set_style(div, "width", /*width*/ ctx[2], false);
+			}
+
+			if (dirty & /*height*/ 2) {
+				set_style(div, "height", /*height*/ ctx[1], false);
+			}
 		},
 		i(local) {
 			if (current) return;
@@ -165,45 +179,81 @@ function create_fragment(ctx) {
 	};
 }
 
+const padding = 1000;
+const exteriorWallOffset = 180;
+
 function instance($$self, $$props, $$invalidate) {
 	let bounding;
 	let ruleLabelData;
 	let ruleLabelDataKeys;
 	let ruleLabelArray;
-	let { pxmm } = $$props;
+	let boundingWidth;
+	let boundingHeight;
+	let contentWidth;
+	let contentHeight;
+	let width;
+	let height;
 	let { floorIndex } = $$props;
 	let { floorplanData } = $$props;
 
 	$$self.$$set = $$props => {
-		if ('pxmm' in $$props) $$invalidate(0, pxmm = $$props.pxmm);
-		if ('floorIndex' in $$props) $$invalidate(3, floorIndex = $$props.floorIndex);
-		if ('floorplanData' in $$props) $$invalidate(4, floorplanData = $$props.floorplanData);
+		if ('floorIndex' in $$props) $$invalidate(4, floorIndex = $$props.floorIndex);
+		if ('floorplanData' in $$props) $$invalidate(5, floorplanData = $$props.floorplanData);
 	};
 
 	$$self.$$.update = () => {
-		if ($$self.$$.dirty & /*floorplanData*/ 16) {
-			$: $$invalidate(2, bounding = floorplanData.bounding);
+		if ($$self.$$.dirty & /*floorplanData*/ 32) {
+			$: $$invalidate(0, bounding = floorplanData.bounding);
+		}
+
+		if ($$self.$$.dirty & /*floorplanData, floorIndex*/ 48) {
+			$: $$invalidate(10, ruleLabelData = floorplanData.floorDatas[floorIndex].rules);
+		}
+
+		if ($$self.$$.dirty & /*ruleLabelData*/ 1024) {
+			$: $$invalidate(11, ruleLabelDataKeys = Object.keys(ruleLabelData));
 		}
 
-		if ($$self.$$.dirty & /*floorplanData, floorIndex*/ 24) {
-			$: $$invalidate(5, ruleLabelData = floorplanData.floorDatas[floorIndex].rules);
+		if ($$self.$$.dirty & /*ruleLabelDataKeys, ruleLabelData*/ 3072) {
+			$: $$invalidate(3, ruleLabelArray = ruleLabelDataKeys.map(key => [key, ruleLabelData[key]]));
 		}
 
-		if ($$self.$$.dirty & /*ruleLabelData*/ 32) {
-			$: $$invalidate(6, ruleLabelDataKeys = Object.keys(ruleLabelData));
+		if ($$self.$$.dirty & /*bounding*/ 1) {
+			$: $$invalidate(8, boundingWidth = bounding.max.x - bounding.min.x);
 		}
 
-		if ($$self.$$.dirty & /*ruleLabelDataKeys, ruleLabelData*/ 96) {
-			$: $$invalidate(1, ruleLabelArray = ruleLabelDataKeys.map(key => [key, ruleLabelData[key]]));
+		if ($$self.$$.dirty & /*bounding*/ 1) {
+			$: $$invalidate(6, boundingHeight = bounding.max.y - bounding.min.y);
+		}
+
+		if ($$self.$$.dirty & /*bounding*/ 1) {
+			$: $$invalidate(9, contentWidth = bounding.max.x - bounding.min.x - (padding - exteriorWallOffset) * 2);
+		}
+
+		if ($$self.$$.dirty & /*bounding*/ 1) {
+			$: $$invalidate(7, contentHeight = bounding.max.y - bounding.min.y - (padding - exteriorWallOffset) * 2);
+		}
+
+		if ($$self.$$.dirty & /*contentWidth, boundingWidth*/ 768) {
+			$: $$invalidate(2, width = contentWidth / boundingWidth * 100 + '%');
+		}
+
+		if ($$self.$$.dirty & /*contentHeight, boundingHeight*/ 192) {
+			$: $$invalidate(1, height = contentHeight / boundingHeight * 100 + '%');
 		}
 	};
 
 	return [
-		pxmm,
-		ruleLabelArray,
 		bounding,
+		height,
+		width,
+		ruleLabelArray,
 		floorIndex,
 		floorplanData,
+		boundingHeight,
+		contentHeight,
+		boundingWidth,
+		contentWidth,
 		ruleLabelData,
 		ruleLabelDataKeys
 	];
@@ -212,7 +262,7 @@ function instance($$self, $$props, $$invalidate) {
 class Component extends SvelteComponent {
 	constructor(options) {
 		super();
-		init(this, options, instance, create_fragment, safe_not_equal, { pxmm: 0, floorIndex: 3, floorplanData: 4 });
+		init(this, options, instance, create_fragment, safe_not_equal, { floorIndex: 4, floorplanData: 5 }, add_css);
 	}
 }
 

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

@@ -1,8 +1,8 @@
-import { Five, Subscribe } from '@realsee/five';
+import type { FLOOR_PLAN_ATTACHED_TO } from '../constant';
 import type { FloorplanEventHandlers } from './typings/events.type';
 import type { FloorplanServerData } from '../typings/floorplanServerData';
 import type { FloorplanRoomItem } from '../typings/floorplanData';
-import { FLOOR_PLAN_ATTACHED_TO } from '../constant';
+import { Five, Subscribe } from '@realsee/five';
 export interface ModelFloorplanParameterType {
     northDesc?: string;
     selector?: string | Element;

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -1,22 +1,13 @@
-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 { omit } from '../../shared-utils/filter';
+import { Subscribe } from '@realsee/five';
+import { FloorplanErrorType, FIVE_CAMERA_DEFAULT_FOV, SHOW_ANIME_DURATION } from './utils/constant';
 import to from '../../shared-utils/to';
+import Main from '../Components/Main';
 import formatData from '../utils/formatData';
 import equal from '../../shared-utils/equal';
 import getPxmm from '../../shared-utils/getPxmm';
 import correctFiveState, { checkShowState } from './utils/correctFiveState';
 import changeModelCanvasOpacity from '../../shared-utils/changeModelCanvasOpacity';
-import { omit } from '../../shared-utils/filter';
-import { Subscribe } from '@realsee/five';
-import { FloorplanErrorType, FIVE_CAMERA_DEFAULT_FOV, SHOW_ANIME_DURATION } from './utils/constant';
 export const MODEL_FLOORPLAN_PLUGIN_NAME = 'modelFloorplanPlugin';
 export default class ModelFloorplanPluginController {
     constructor(five, params) {
@@ -203,12 +194,12 @@ export default class ModelFloorplanPluginController {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: (opts) => __awaiter(this, void 0, void 0, function* () {
-                var _b, _c;
+            value: async (opts) => {
+                var _a, _b;
                 // 已经在展示中了
                 if (!this.showPromise && this.visible)
                     return true;
-                if (!((_b = this.five.model) === null || _b === void 0 ? void 0 : _b.loaded))
+                if (!((_a = this.five.model) === null || _a === void 0 ? void 0 : _a.loaded))
                     throw new Error(FloorplanErrorType.ModelNotLoaded);
                 if (!this.floorplanData)
                     throw new Error(FloorplanErrorType.DataNotLoaded);
@@ -218,18 +209,18 @@ export default class ModelFloorplanPluginController {
                     if (!!this.showPromise && sameWithLastOpts)
                         return this.showPromise;
                     if (!!this.showPromise && !sameWithLastOpts)
-                        (_c = this.showRejection) === null || _c === void 0 ? void 0 : _c.call(this, FloorplanErrorType.DifferentShowParams);
+                        (_b = this.showRejection) === null || _b === void 0 ? void 0 : _b.call(this, FloorplanErrorType.DifferentShowParams);
                 }
                 this.ModelFloorplanPluginsShowOpts = opts;
-                const getShowPromise = () => __awaiter(this, void 0, void 0, function* () {
-                    var _d, _e;
+                const getShowPromise = async () => {
+                    var _a, _b;
                     let hasRejected = false;
                     let externalErrorMsg;
                     this.showRejection = (errorMsg) => {
                         hasRejected = true;
                         externalErrorMsg = errorMsg;
                     };
-                    const [correctError] = yield to(correctFiveState(this.five, this.showState, opts === null || opts === void 0 ? void 0 : opts.userAction));
+                    const [correctError] = await to(correctFiveState(this.five, this.showState, opts === null || opts === void 0 ? void 0 : opts.userAction));
                     if (correctError)
                         throw correctError;
                     // 异步结束要判断当前是不是被中断了，是不是调用了隐藏
@@ -248,7 +239,7 @@ export default class ModelFloorplanPluginController {
                         this.floorIndex = opts.floorIndex;
                     this.five.model.show(this.floorIndex);
                     // 模型消失, 渲染户型图
-                    const modelOpacity = (_e = (_d = opts === null || opts === void 0 ? void 0 : opts.modelOpacity) !== null && _d !== void 0 ? _d : this.configs.modelOpacity) !== null && _e !== void 0 ? _e : 1;
+                    const modelOpacity = (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.modelOpacity) !== null && _a !== void 0 ? _a : this.configs.modelOpacity) !== null && _b !== void 0 ? _b : 1;
                     const renderDuration = (opts === null || opts === void 0 ? void 0 : opts.immediately) ? 0 : SHOW_ANIME_DURATION;
                     changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
                     this.render(renderDuration);
@@ -256,7 +247,7 @@ export default class ModelFloorplanPluginController {
                     this.five.on('wantsGesture', this.handleWantsGesture);
                     this.five.on('wantsTapGesture', this.handleWantsTapGesture);
                     return true;
-                });
+                };
                 const showPromise = getShowPromise()
                     .then(() => {
                     var _a;
@@ -278,7 +269,7 @@ export default class ModelFloorplanPluginController {
                 });
                 this.showPromise = showPromise;
                 return showPromise;
-            })
+            }
         });
         /** 隐藏户型图 */
         Object.defineProperty(this, "hide", {
@@ -308,8 +299,13 @@ export default class ModelFloorplanPluginController {
             configurable: true,
             writable: true,
             value: (shownFloor) => {
-                if (shownFloor === null)
+                if (this.floorIndex === shownFloor)
                     return;
+                if (shownFloor === null) {
+                    const panoIndex = this.five.getCurrentState().panoIndex;
+                    this.floorIndex = this.five.work.observers[panoIndex].floorIndex;
+                    return;
+                }
                 this.floorIndex = shownFloor;
                 this.updateSize();
                 this.render();
@@ -422,7 +418,9 @@ export default class ModelFloorplanPluginController {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: ({ latitude, longitude }, isFinal) => __awaiter(this, void 0, void 0, function* () {
+            value: async ({ latitude, longitude }, isFinal) => {
+                if (this.five.getCurrentState().mode !== 'Floorplan')
+                    return;
                 if (this.configs.autoShowEnable === false)
                     return;
                 // 如果操作结束后，户型图还在展示中，初始化模型状态
@@ -443,16 +441,16 @@ export default class ModelFloorplanPluginController {
                 const longitudeVisible = longitude < 30 * (Math.PI / 180) || longitude > 330 * (Math.PI / 180);
                 if (isFinal && !this.visible && latitudeVisible && longitudeVisible) {
                     // 当手指离开时需要等惯性结束之后在进行判断
-                    const handleInteriaPan = (any, isFinal) => __awaiter(this, void 0, void 0, function* () {
+                    const handleInteriaPan = async (any, isFinal) => {
                         if (!isFinal)
                             return;
                         this.five.off('interiaPan', handleInteriaPan);
-                        yield this.show({ isAutoShow: true });
-                    });
+                        await this.show({ isAutoShow: true });
+                    };
                     this.five.on('interiaPan', handleInteriaPan);
                     return;
                 }
-            })
+            }
         });
         this.five = five;
         this.hooks = new Subscribe();
@@ -466,9 +464,9 @@ export default class ModelFloorplanPluginController {
             left: '50%',
             top: '50%',
             transform: 'translate(-50%, -50%)',
-            pointerEvents: 'none',
             zIndex: 10,
         });
+        this.five.addExtraElement(this.container);
         // 如果初始化的时候模型已经加载完毕了，就不用再等 modelLoaded
         this.five.model.loaded ? this.handleModelLoaded() : five.once('modelLoaded', this.handleModelLoaded);
         five.once('dispose', this.dispose);
@@ -479,12 +477,10 @@ export default class ModelFloorplanPluginController {
         five.on('modelShownFloorChange', this.onModelShownFloorChange);
     }
     /** 加载户型图数据 */
-    load(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const copyData = JSON.parse(JSON.stringify(data));
-            this.floorplanData = yield formatData(copyData);
-            this.render();
-        });
+    async load(data) {
+        const copyData = JSON.parse(JSON.stringify(data));
+        this.floorplanData = await formatData(copyData);
+        this.render();
     }
     /** 把插件的渲染DOM插入到对应的容器中去 */
     appendTo(wrapper) {
@@ -495,8 +491,6 @@ export default class ModelFloorplanPluginController {
     /** 更改户型图楼层 */
     changeFloor(floorIndex) {
         this.five.model.show(floorIndex);
-        this.floorIndex = floorIndex;
-        this.render();
     }
     changeConfigs(params) {
         Object.assign(this.configs, params);
@@ -511,10 +505,9 @@ export default class ModelFloorplanPluginController {
             return;
         const { northDesc, hoverEnable, cameraImageUrl, getLabelElement, roomLabelsEnable, compassEnable, ruleLabelsEnable } = this.configs;
         const props = {
-            northDesc: northDesc !== null && northDesc !== void 0 ? northDesc : '北',
-            five: this.five,
-            pxmm: this.pxmm,
             cameraImageUrl,
+            getLabelElement,
+            northDesc: northDesc !== null && northDesc !== void 0 ? northDesc : '北',
             visible: this.visible,
             duration: duration !== null && duration !== void 0 ? duration : 0,
             panoIndex: this.panoIndex,
@@ -525,8 +518,6 @@ export default class ModelFloorplanPluginController {
             ruleLabelsEnable: ruleLabelsEnable !== null && ruleLabelsEnable !== void 0 ? ruleLabelsEnable : true,
             roomLabelsEnable: roomLabelsEnable !== null && roomLabelsEnable !== void 0 ? roomLabelsEnable : true,
             lastPanoramaLongitude: this.lastPanoramaLongitude,
-            getLabelElement,
-            onRoomHeightClick: this.handleClick,
         };
         if (!this.app) {
             this.app = new Main({

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

@@ -1,12 +1,3 @@
-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';
@@ -28,30 +19,28 @@ export function checkShowState(five, showState) {
  * 2. 内置了相应的动画时间计算
  * 3. 纠正成功会返回 true，失败「可能会被用户行为中断」会返回 false
  */
-export default function correctFiveState(five, showState, userAction = true) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // 当前已满足状态，不需要变更
+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 是异步行为，可能会被打断，需要在结束后加一次判断
         const result = checkShowState(five, showState);
-        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);
+        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] = await to(five.updateCamera(showState, time, userAction));
+    if (updateCameraError)
+        throw new Error(FloorplanErrorType.UpdateCameraError);
+    return;
 }

package/libs/floorplan/PanoFloorplanRadarPlugin/Controller.js

@@ -1,12 +1,3 @@
-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 {
@@ -72,9 +63,9 @@ export default class PanoFloorplanRadarPluginController {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: (data) => __awaiter(this, void 0, void 0, function* () {
+            value: async (data) => {
                 const copyData = JSON.parse(JSON.stringify(data));
-                const floorplanData = yield formatData(copyData);
+                const floorplanData = await formatData(copyData);
                 this.data = floorplanData;
                 // const loadImage = async () => {
                 //   const floorIndex = this.five.work.observers[this.five.getCurrentState().panoIndex].floorIndex
@@ -92,7 +83,7 @@ export default class PanoFloorplanRadarPluginController {
                 // }
                 // await loadImage()
                 this.render();
-            })
+            }
         });
         this.five = five;
         (params === null || params === void 0 ? void 0 : params.configs) && Object.assign(this.configs, params.configs);

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

@@ -1,22 +1,34 @@
 import type { Five } from '@realsee/five';
+import type { FLOOR_PLAN_ATTACHED_TO } from '../constant';
 import type { FloorplanServerData } from '../typings/floorplanServerData';
 import type { FloorplanRoomItem } from '../typings/floorplanData';
-import { FLOOR_PLAN_ATTACHED_TO } from '../constant';
-export interface TopviewFloorplanPluginParameterType {
+/** TopviewFloorplanPlugin 配置参数 */
+interface Configs {
     northDesc?: string;
-    selector?: string | Element;
-    scale?: number;
     modelOpacity?: number;
     cameraImageUrl?: string;
+    /** 是否开启高亮房间功能，默认为 false */
     hoverEnable?: boolean;
+    /** 是否开启放大缩小和拖动功能，默认为 false */
+    gestureEnable?: boolean;
+    /** 是否展示指南针，默认为 true */
     compassEnable?: boolean;
-    autoShowEnable?: boolean;
+    /** 是否展示户型图标尺，默认为 true */
     ruleLabelsEnable?: boolean;
+    /** 是否展示房间标签，默认为 true */
     roomLabelsEnable?: boolean;
+    /** 点击房间时，是否需要跳转到被点房间的全景态点位上，默认为 true */
     preventRoomClick?: boolean;
+    /** 户型图展示时，应该对应到模型的哪个位置上，默认是 BOUNDING_CENTER */
     attachedTo?: FLOOR_PLAN_ATTACHED_TO;
+    /** 用户自定义房间标间 DOM 函数 */
     getLabelElement?: (room: FloorplanRoomItem) => Element | null;
 }
+/** TopviewFloorplanPlugin 初始化参数 */
+export interface TopviewFloorplanPluginParameterType extends Configs {
+    selector?: string | Element;
+    scale?: number;
+}
 export declare type TopviewFloorplanPluginReturnType = TopviewFloorplanPluginController;
 export declare class TopviewFloorplanPluginController {
     size: {
@@ -41,22 +53,23 @@ export declare class TopviewFloorplanPluginController {
     /** 把插件的渲染DOM插入到对应的容器中去 */
     appendTo(wrapper: Element): this;
     dispose: () => void;
-    /** 模型楼层高亮改变时，自动进行楼层切换 */
+    private onFiveWantsMoveToPano;
+    private onFiveWantsGesture;
     private onModelShownFloorChange;
-    /** panoIndex 改变时，更新 floorIndex */
-    private handlePanoArrived;
-    /** 配置了 preventRoomClick 后，在户型图展示时阻止 Five 走点 */
-    private handleWantsMoveToPano;
-    /** 在户型图展示时阻止 Five 滑动行为 */
-    private handleWantsPanGesture;
-    private handleModelLoaded;
+    private onFivePanoArrived;
+    private onFivePanGesture;
+    private onFivePinchGesture;
+    private onFiveModelLoaded;
     /** 非 Topview 态隐藏户型图 */
-    private handleModeChange;
+    private onFiveModeChange;
     /** 动画结束后是 Topview 态就展示户型图 */
-    private handleInitAnimationEnded;
+    private onFiveInitAnimationEnded;
     private show;
     private hide;
     /** 更新户型图大小 */
     private updateSize;
+    /** 更新户型图位置 */
+    private updatePosition;
     private render;
 }
+export {};