@realsee/dnalogel 2.1.0-alpha.13 → 2.1.0-alpha.16

package/libs/PanoTagPlugin/Components/Tag/index.svelte

@@ -0,0 +1,154 @@
+<script>var _a, _b;
+import { ContentType } from '../../typings';
+import TextTag from './TextTag.svelte';
+import ImageTextTag from './ImageTextTag.svelte';
+import MarketingTag from './MarketingTag.svelte';
+import { noTypecheck } from '../../utils';
+import { setContext } from 'svelte';
+import AudioTag from './AudioTag.svelte';
+import MediaPlane from './MediaPlane.svelte';
+import LinkTag from './LinkTag.svelte';
+import CustomTag from './CustomTag.svelte';
+export let withAnimation = false;
+export let tag;
+export let hooks;
+export let state;
+export let mediaStore;
+export let temporaryState;
+$: unfolded = (_a = tag.state) === null || _a === void 0 ? void 0 : _a.unfolded;
+$: visible = (_b = tag.state) === null || _b === void 0 ? void 0 : _b.visible;
+$: isVisible = state.visible && temporaryState.visible && visible;
+$: tagId = tag.id;
+setContext('hooks', hooks);
+let lastVisibleState;
+let lastUnfoldedState;
+function exposureEmit(isVisible) {
+    if (isVisible)
+        hooks.emit('exposure', { id: tagId, type: 'start' });
+    else
+        hooks.emit('exposure', { id: tagId, type: 'end' });
+}
+$: exposureEmit(isVisible);
+$: {
+    if (tag.hooks) {
+        if (unfolded !== undefined && unfolded !== lastUnfoldedState) {
+            lastUnfoldedState = unfolded;
+            if (unfolded)
+                tag.hooks.emit('unfolded');
+            else
+                tag.hooks.emit('folded');
+        }
+        if (visible !== undefined && visible !== lastVisibleState) {
+            lastVisibleState = visible;
+            if (visible)
+                tag.hooks.emit('show');
+            else
+                tag.hooks.emit('hide');
+        }
+    }
+}
+</script>
+
+<div
+  class="content__container"
+  class:disable={tag.enabled === false || tag.temporaryState?.visible === false}
+  class:hide={!state.visible || !temporaryState.visible || !tag.state?.visible}
+  class:withAnimation
+  class:unClickable={tag.clickable === false}
+  style:width={tag.pointType === 'PointTag' ? 0 : '100%'}
+  style:height={tag.pointType === 'PointTag' ? 0 : '100%'}
+  data-id={tag.id}
+  on:click|stopPropagation={(event) => hooks.emit('click', { event, target: 'TagContent', tag })}
+>
+  <div class="content__wrapper">
+    <div class="content" class:unfolded={tag.state?.unfolded}>
+      {#if tag.element}
+        <CustomTag tag={noTypecheck(tag)} />
+      {:else if tag.contentType === ContentType.Text}
+        <TextTag tag={noTypecheck(tag)} />
+      {:else if tag.contentType === ContentType.ImageText}
+        <ImageTextTag tag={noTypecheck(tag)} />
+      {:else if tag.contentType === ContentType.Audio}
+        <AudioTag {mediaStore} tag={noTypecheck(tag)} />
+      {:else if tag.contentType === ContentType.Marketing}
+        <MarketingTag tag={noTypecheck(tag)} />
+      {:else if tag.contentType === ContentType.Link}
+        <LinkTag tag={noTypecheck(tag)} />
+      {:else if tag.contentType === ContentType.MediaPlane}
+        <MediaPlane tag={noTypecheck(tag)} />
+      {/if}
+    </div>
+  </div>
+</div>
+
+<style>
+  @font-face {
+    font-family: 'TG-TYPE';
+    font-style: normal;
+    font-weight: 400;
+    /* src: local('TG-TYPE-Bold'), url(//vrlab-static.ljcdn.com/release/web/TG-TYPE-Bold.769fe64d.otf) format('woff2'); */
+    src: local('TG-TYPE-Bold'),
+      url(data:application/font-woff2;charset=utf-8;base64,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)
+        format('woff2');
+  }
+
+  .content__container {
+    position: relative;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    font-family: PingFangSC, Segoe UI, Rototo, sans-serif;
+  }
+
+  .content__container.unClickable {
+    pointer-events: none !important;
+  }
+
+  .content__container.unClickable :global(*) {
+    pointer-events: none !important;
+  }
+
+  :global(*) {
+    -webkit-tap-highlight-color: transparent;
+  }
+  .content__wrapper {
+    pointer-events: none;
+    width: 100%;
+    height: 100%;
+  }
+
+  .withAnimation {
+    transition: opacity 0.3s linear;
+  }
+
+  .content__container.hide {
+    opacity: 0;
+    pointer-events: none;
+  }
+
+  .content__container.disable {
+    display: none;
+  }
+
+  .content__container.hide :global(*) {
+    pointer-events: none;
+  }
+
+  .content {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    font-size: 12px;
+    line-height: 18px;
+    color: #fff;
+  }
+  .content:not(.unfolded) {
+    pointer-events: none;
+  }
+  .content:not(.unfolded) :global(*) {
+    pointer-events: none !important;
+  }
+  .content.unfolded {
+    pointer-events: auto;
+  }
+</style>

package/libs/PanoTagPlugin/Components/TagWrapper.js

@@ -1,4 +1,4 @@
-/* generated by Svelte v3.50.1 */
+/* generated by Svelte v3.52.0 */
 import {
 	SvelteComponent,
 	append,
@@ -27,13 +27,13 @@ import { noTypecheck } from '../utils';
 import { DimensionType, ContentType, PointType } from '../typings';
 import TagContent from './Tag/index';
 import TagPoint from './Common/Point/PointSwitch';
-import { onMount } from 'svelte';
+import 'svelte';
 
 function add_css(target) {
 	append_styles(target, "svelte-1vzhbu2", ".wrapper.svelte-1vzhbu2{position:absolute;width:0rem;height:0rem;overflow:visible;pointer-events:auto}.point.svelte-1vzhbu2{-webkit-tap-highlight-color:transparent;position:absolute;transform:translate(-50%, -50%);left:50%;top:50%}");
 }
 
-// (43:2) {#if tag.dimensionType === DimensionType.Two}
+// (38:2) {#if tag.dimensionType === DimensionType.Two}
 function create_if_block_1(ctx) {
 	let tagcontent;
 	let current;
@@ -82,7 +82,7 @@ function create_if_block_1(ctx) {
 	};
 }
 
-// (46:2) {#if tag.pointType === PointType.PointTag && tag.style?.point?.style !== 'noPoint'}
+// (41:2) {#if tag.pointType === PointType.PointTag && tag.style?.point?.style !== 'noPoint'}
 function create_if_block(ctx) {
 	let div;
 	let tagpoint;
@@ -148,9 +148,9 @@ function create_fragment(ctx) {
 			attr(div, "data-id", div_data_id_value = /*tag*/ ctx[1].id);
 			toggle_class(div, "hide", /*hide*/ ctx[10]);
 			toggle_class(div, "unfolded", /*unfolded*/ ctx[6]);
-			set_style(div, "left", /*left*/ ctx[9], false);
-			set_style(div, "top", /*top*/ ctx[8], false);
-			set_style(div, "z-index", /*zIndex*/ ctx[7], false);
+			set_style(div, "left", /*left*/ ctx[9]);
+			set_style(div, "top", /*top*/ ctx[8]);
+			set_style(div, "z-index", /*zIndex*/ ctx[7]);
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
@@ -219,15 +219,15 @@ function create_fragment(ctx) {
 			}
 
 			if (dirty & /*left*/ 512) {
-				set_style(div, "left", /*left*/ ctx[9], false);
+				set_style(div, "left", /*left*/ ctx[9]);
 			}
 
 			if (dirty & /*top*/ 256) {
-				set_style(div, "top", /*top*/ ctx[8], false);
+				set_style(div, "top", /*top*/ ctx[8]);
 			}
 
 			if (dirty & /*zIndex*/ 128) {
-				set_style(div, "z-index", /*zIndex*/ ctx[7], false);
+				set_style(div, "z-index", /*zIndex*/ ctx[7]);
 			}
 		},
 		i(local) {
@@ -250,6 +250,7 @@ function create_fragment(ctx) {
 }
 
 function instance($$self, $$props, $$invalidate) {
+	let show;
 	let hide;
 	let unfolded;
 	let left;
@@ -282,14 +283,6 @@ function instance($$self, $$props, $$invalidate) {
 		hooks.emit('click', { event, target: 'TagPoint', tag });
 	};
 
-	onMount(() => {
-		hooks.emit('exposure', { id: tag.id, type: 'start' });
-
-		return () => {
-			hooks.emit('exposure', { id: tag.id, type: 'end' });
-		};
-	});
-
 	$$self.$$set = $$props => {
 		if ('withAnimation' in $$props) $$invalidate(0, withAnimation = $$props.withAnimation);
 		if ('tag' in $$props) $$invalidate(1, tag = $$props.tag);
@@ -301,9 +294,13 @@ function instance($$self, $$props, $$invalidate) {
 
 	$$self.$$.update = () => {
 		if ($$self.$$.dirty & /*tag, _a*/ 4098) {
-			$: $$invalidate(10, hide = !($$invalidate(12, _a = tag.state) === null || _a === void 0
+			$: $$invalidate(17, show = $$invalidate(12, _a = tag.state) === null || _a === void 0
 			? void 0
-			: _a.visible));
+			: _a.visible);
+		}
+
+		if ($$self.$$.dirty & /*show*/ 131072) {
+			$: $$invalidate(10, hide = !show);
 		}
 
 		if ($$self.$$.dirty & /*tag, _b*/ 8194) {
@@ -356,7 +353,8 @@ function instance($$self, $$props, $$invalidate) {
 		_b,
 		_c,
 		_d,
-		_e
+		_e,
+		show
 	];
 }
 

package/libs/PanoTagPlugin/Components/TagWrapper.svelte

@@ -0,0 +1,64 @@
+<script>var _a, _b, _c, _d, _e;
+import { noTypecheck } from '../utils';
+import { DimensionType, ContentType, PointType } from '../typings';
+import TagContent from './Tag/index.svelte';
+import TagPoint from './Common/Point/PointSwitch.svelte';
+import 'svelte';
+export let withAnimation = false;
+export let tag;
+export let hooks;
+export let state;
+export let mediaStore;
+export let temporaryState;
+$: show = (_a = tag.state) === null || _a === void 0 ? void 0 : _a.visible;
+$: hide = !show;
+$: unfolded = (_b = tag.state) === null || _b === void 0 ? void 0 : _b.unfolded;
+$: left = ((_c = tag.pointTagStyle) === null || _c === void 0 ? void 0 : _c.leftPercent) + '%';
+$: top = ((_d = tag.pointTagStyle) === null || _d === void 0 ? void 0 : _d.topPercent) + '%';
+$: zIndex = tag.contentType === ContentType.Link ? 20 : ((_e = tag.state) === null || _e === void 0 ? void 0 : _e.unfolded) ? 10 : 0;
+let timeout;
+let animating = false;
+function setAnimating(trigger) {
+    if (timeout !== undefined)
+        clearTimeout(timeout);
+    animating = true;
+    timeout = setTimeout(() => {
+        animating = false;
+    }, 800);
+}
+$: setAnimating(unfolded);
+const handlePointClick = (event) => {
+    if (animating)
+        return;
+    hooks.emit('click', { event, target: 'TagPoint', tag });
+};
+</script>
+
+<div class="wrapper" class:hide class:unfolded style:left style:top style:z-index={zIndex} data-id={tag.id}>
+  {#if tag.dimensionType === DimensionType.Two}
+    <TagContent {mediaStore} {withAnimation} tag={noTypecheck(tag)} {hooks} {state} {temporaryState} />
+  {/if}
+  {#if tag.pointType === PointType.PointTag && tag.style?.point?.style !== 'noPoint'}
+    <div class="point" on:click|stopPropagation={handlePointClick}>
+      <TagPoint {tag} />
+    </div>
+  {/if}
+</div>
+
+<style>
+  .wrapper {
+    position: absolute;
+    width: 0px;
+    height: 0px;
+    overflow: visible;
+    pointer-events: auto;
+  }
+
+  .point {
+    -webkit-tap-highlight-color: transparent;
+    position: absolute;
+    transform: translate(-50%, -50%);
+    left: 50%;
+    top: 50%;
+  }
+</style>

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -96,6 +96,10 @@ export class TagComputer extends TagCacheController {
                     return config(this.five, { tag, distance });
                 }
                 else {
+                    if (config.keep === 'hidden')
+                        return false;
+                    if (config.keep === 'visible')
+                        return true;
                     // console.log(tag.id, '点位检测', tag)
                     // 点位检测
                     if (config.visiblePanoIndex !== undefined) {
@@ -166,6 +170,10 @@ export class TagComputer extends TagCacheController {
                     return config(this.five, { tag, distance });
                 }
                 else {
+                    if (config.keep === 'folded')
+                        return false;
+                    if (config.keep === 'unfolded')
+                        return true;
                     if (config.disableUnfold === true)
                         return false;
                     if (config.disableFold === true)
@@ -202,6 +210,10 @@ export class TagComputer extends TagCacheController {
                 return config(this.five, { tag, distance });
             }
             else {
+                if (config.keep === 'folded')
+                    return false;
+                if (config.keep === 'unfolded')
+                    return true;
                 if (config.disableUnfold === true)
                     return false;
                 if (config.disableFold === true)

package/libs/PanoTagPlugin/controller/index.js

@@ -2,14 +2,14 @@ import { Subscribe } from '@realsee/five';
 import { Quaternion } from 'three';
 import objectAssignDeep from 'object-assign-deep';
 import { writable } from 'svelte/store';
-import PointTagSvelte from '../Components/PointTag';
-import TagContentSvelte from '../Components/Tag/index';
+import PointTagSvelte from '../Components/PointTag.svelte';
+import TagContentSvelte from '../Components/Tag/index.svelte';
 import { addDebugPoints, arrayPositionToVector3, actionAfterFiveModelLoad, debounce, normalPositionToPositions, planeNormal, resizeObserver, throttle, } from '../utils';
 import { TagComputer } from './TagComputer';
 import { CSS3DRenderPlugin } from '../../CSS3DRenderPlugin';
 import { DimensionType, PointType } from '../typings';
 // declare const __APP_VERSION__: string
-const VERSION = '1.0.0';
+const VERSION = '1.1.0';
 const PLUGIN_NAME = `DnalogelPlugin-PanoTagPlugin@${VERSION}`;
 // 初始是否展开
 const TAG_INITIAL_UNFOLDED = false;
@@ -219,7 +219,7 @@ class PanoTagPluginController extends TagComputer {
         var _a, _b, _c, _d, _e, _f;
         this.disposeAllCSS3DContainer();
         (_a = this.PointTagSvelte) === null || _a === void 0 ? void 0 : _a.$destroy();
-        this.filter3DTag().forEach((tag) => { var _a; return (_a = tag.tag3DContentSvelte) === null || _a === void 0 ? void 0 : _aApp.$destroy(); });
+        this.filter3DTag().forEach((tag) => { var _a; return (_a = tag.tag3DContentSvelte) === null || _a === void 0 ? void 0 : _a.svelteApp.$destroy(); });
         this.tags = [];
         (_b = this.store.disposers) === null || _b === void 0 ? void 0 : _b.forEach((d) => d === null || d === void 0 ? void 0 : d());
         this.store.disposers = [];
@@ -349,7 +349,7 @@ class PanoTagPluginController extends TagComputer {
         (_a = this.PointTagSvelte) === null || _a === void 0 ? void 0 : _a.$set({ tags: [] });
         this.filter3DTag().forEach((tag) => {
             var _a;
-            (_a = tag.tag3DContentSvelte) === null || _a === void 0 ? void 0 : _aApp.$destroy();
+            (_a = tag.tag3DContentSvelte) === null || _a === void 0 ? void 0 : _a.svelteApp.$destroy();
             tag.tag3DContentSvelte = undefined;
         });
     }
@@ -418,7 +418,10 @@ class PanoTagPluginController extends TagComputer {
     handleFiveWantsMoveToPano() {
         this.tags.forEach((tag) => {
             const config = this.getTagConfig(tag);
-            if (typeof config.visibleConfig === 'object' && config.visibleConfig.alwaysShowWhenMovePano) {
+            if (typeof config.visibleConfig === 'object' && config.visibleConfig.keep) {
+                tag.temporaryState = Object.assign(Object.assign({}, tag.temporaryState), { visible: config.visibleConfig.keep === 'visible' });
+            }
+            else if (typeof config.visibleConfig === 'object' && config.visibleConfig.alwaysShowWhenMovePano) {
                 tag.temporaryState = Object.assign(Object.assign({}, tag.temporaryState), { visible: true });
             }
             else {
@@ -445,9 +448,11 @@ class PanoTagPluginController extends TagComputer {
                 return;
             // 先检查一下能不能关闭
             const config = this.getTagConfig(params.tag);
-            if (typeof config.unfoldedConfig === 'object' && config.unfoldedConfig.disableUnfold) {
-                if (!params.tag.state.unfolded) {
-                    return;
+            if (typeof config.unfoldedConfig === 'object') {
+                if (config.unfoldedConfig.disableUnfold || config.unfoldedConfig.keep) {
+                    if (!params.tag.state.unfolded) {
+                        return;
+                    }
                 }
             }
             else {
@@ -478,7 +483,7 @@ class PanoTagPluginController extends TagComputer {
         (_a = this.PointTagSvelte) === null || _a === void 0 ? void 0 : _a.$set({ state: this.state, temporaryState: this.temporaryState, withAnimation: this.store.visibleWithAnimation });
         this.filter3DTag().forEach((tag) => {
             var _a;
-            (_a = tag.tag3DContentSvelte) === null || _a === void 0 ? void 0 : _aApp.$set({
+            (_a = tag.tag3DContentSvelte) === null || _a === void 0 ? void 0 : _a.svelteApp.$set({
                 state: this.state,
                 temporaryState: this.temporaryState,
                 withAnimation: this.store.visibleWithAnimation,
@@ -525,6 +530,8 @@ class PanoTagPluginController extends TagComputer {
                         return; // 如果有标签由于camera的转动而展开，则将所有没有配置autoUnfold的标签收起
                     if (unfoldedConfig.disableFold)
                         return; // 不收起disableFold标签
+                    if (unfoldedConfig.keep)
+                        return; // 不动keep标签
                 }
                 if (tag.state)
                     tag.state.unfolded = false;

package/libs/PanoTagPlugin/tag.config.js

@@ -21,8 +21,7 @@ const DefaultConfig = {
         'Any-Link-Any': {
             unfoldedConfig: {
                 // VR 跳转标签没有展开/收起状态
-                disableFold: true,
-                autoUnfold: undefined,
+                keep: 'unfolded',
             },
             initialState: {
                 unfolded: true,
@@ -33,7 +32,7 @@ const DefaultConfig = {
         },
         '3D-MediaPlane-PlaneTag': {
             unfoldedConfig: {
-                disableFold: true,
+                keep: 'unfolded',
             },
             visibleConfig: {
                 angleRange: undefined,

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

@@ -1,7 +1,7 @@
 import type { PanoTagPluginController } from '../index';
 import type { ContentType, DimensionType, TagId, PointType, Tag } from '../typings';
 import type * as BasePlugin from '../../base/BasePlugin';
-import type TagContentSvelte from '../Components/Tag/index';
+import type TagContentSvelte from '../Components/Tag/index.svelte';
 import type { Vector3 } from 'three';
 import type { Create3DDomContainerReturnType } from '../../CSS3DRenderPlugin';
 import type { Writable } from 'svelte/store';

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

@@ -87,6 +87,8 @@ export declare type Tag<C extends ContentType = any, P extends PointType = any,
 export interface TagConfig<C extends ContentType = ContentType, T extends PointType = PointType, D extends DimensionType = DimensionType, CustomDataType extends Object = {}> {
     /** 显示/隐藏配置 */
     visibleConfig?: {
+        /** 保持可见/不可见, 设置后visibleConfig下所有其他配置都不生效 */
+        keep?: 'visible' | 'hidden';
         /** 走点时不隐藏 */
         alwaysShowWhenMovePano?: true;
         /** min-max米内显示 | 无距离限制 */
@@ -111,11 +113,19 @@ export interface TagConfig<C extends ContentType = ContentType, T extends PointT
     }) => boolean);
     /** 展开/收起配置 */
     unfoldedConfig?: {
+        /** 保持展开/收起，设置后unfoldedConfig下所有其他配置都不生效 */
+        keep?: 'unfolded' | 'folded';
         /** 划动到不可见状态时，自动收起，disableFold: true 的标签不受此参数影响 */
         autoUnfoldWhenHide?: false;
-        /** 部分标签是无法打开的 */
+        /**
+         * @deprecated replace by { keep: 'folded' }
+         * @deprecated 部分标签是无法打开的
+         */
         disableUnfold?: true;
-        /** 部分标签是无法收起的 */
+        /**
+         * @deprecated replace by { keep: 'unfolded' }
+         * @deprecated 部分标签是无法收起的
+         */
         disableFold?: true;
         /** min-max米内自动展开,否则收起 */
         unfoldDistance?: MinMax;

package/libs/floorplan/Components/BaseImage.js

@@ -1,4 +1,4 @@
-/* generated by Svelte v3.50.1 */
+/* generated by Svelte v3.52.0 */
 import {
 	SvelteComponent,
 	append_styles,

package/libs/floorplan/Components/BaseImage.svelte

@@ -0,0 +1,26 @@
+<script>var _a, _b;
+import NormalImage from './Normalmage.svelte';
+import SvgImage from './SvgImage.svelte';
+export let floorIndex;
+export let floorplanData;
+$: imageData = floorplanData.outlines[floorIndex];
+$: svgContent = (_b = (_a = floorplanData.outlines) === null || _a === void 0 ? void 0 : _a[floorIndex]) === null || _b === void 0 ? void 0 : _b.svgContent;
+</script>
+
+<div class="floorplan-plugin__base-image">
+  {#if svgContent}
+    <SvgImage content={svgContent} />
+  {:else if imageData}
+    <NormalImage url={imageData.url} />
+  {/if}
+</div>
+
+<style>
+  .floorplan-plugin__base-image {
+    position: absolute;
+    z-index: 10;
+    width: 100%;
+    height: 100%;
+    pointer-events: none;
+  }
+</style>

package/libs/floorplan/Components/Camera.js

@@ -1,4 +1,4 @@
-/* generated by Svelte v3.50.1 */
+/* generated by Svelte v3.52.0 */
 import {
 	SvelteComponent,
 	append,
@@ -30,15 +30,15 @@ function create_fragment(ctx) {
 			div0 = element("div");
 			attr(div0, "class", "floorplan__camera-rotate svelte-17cl35n");
 			set_style(div0, "background-image", `url(${/*cameraImageUrl*/ ctx[0] || CAMERA_IMAGE})`);
-			set_style(div0, "width", /*domSizeStyle*/ ctx[4], false);
-			set_style(div0, "height", /*domSizeStyle*/ ctx[4], false);
-			set_style(div0, "left", '-' + /*domSizeStyle*/ ctx[4], false);
-			set_style(div0, "top", '-' + /*domSizeStyle*/ ctx[4], false);
-			set_style(div0, "transform", `rotate(${/*rotate*/ ctx[3]}deg)`, false);
-			set_style(div0, "transform-origin", `${/*domSizeStyle*/ ctx[4]} ${/*domSizeStyle*/ ctx[4]}`, false);
+			set_style(div0, "width", /*domSizeStyle*/ ctx[4]);
+			set_style(div0, "height", /*domSizeStyle*/ ctx[4]);
+			set_style(div0, "left", '-' + /*domSizeStyle*/ ctx[4]);
+			set_style(div0, "top", '-' + /*domSizeStyle*/ ctx[4]);
+			set_style(div0, "transform", `rotate(${/*rotate*/ ctx[3]}deg)`);
+			set_style(div0, "transform-origin", `${/*domSizeStyle*/ ctx[4]} ${/*domSizeStyle*/ ctx[4]}`);
 			attr(div1, "class", "floorplan__camera-position svelte-17cl35n");
-			set_style(div1, "left", /*positionLeft*/ ctx[1], false);
-			set_style(div1, "top", /*positionTop*/ ctx[2], false);
+			set_style(div1, "left", /*positionLeft*/ ctx[1]);
+			set_style(div1, "top", /*positionTop*/ ctx[2]);
 		},
 		m(target, anchor) {
 			insert(target, div1, anchor);

package/libs/floorplan/Components/Camera.svelte

@@ -0,0 +1,46 @@
+<script>import { CAMERA_IMAGE } from '../Assets/camera';
+import rad2Deg from '../../shared-utils/math/rad2Deg';
+export let panoIndex;
+export let floorplanData;
+export let lastPanoramaLongitude;
+export let cameraImageUrl;
+const { observers } = floorplanData;
+const observer = observers[panoIndex];
+const leftRatio = observer.positionInImage.x;
+const topRatio = observer.positionInImage.y;
+const positionLeft = leftRatio * 100 + '%';
+const positionTop = topRatio * 100 + '%';
+const rotate = -rad2Deg(lastPanoramaLongitude) + 45;
+// TODO: 统一这里的判断条件，目前写了多处
+const bodyWidth = document.body.clientWidth;
+const bodyHeight = document.body.clientHeight;
+const size = bodyWidth < 500 || bodyHeight < 500 ? 17 : 37;
+const domSizeStyle = `${size / 16}rem`;
+</script>
+
+<div class="floorplan__camera-position" style:left={positionLeft} style:top={positionTop}>
+  <div
+    class="floorplan__camera-rotate"
+    style:width={domSizeStyle}
+    style:height={domSizeStyle}
+    style:left={'-' + domSizeStyle}
+    style:top={'-' + domSizeStyle}
+    style:transform={`rotate(${rotate}deg)`}
+    style:transform-origin={`${domSizeStyle} ${domSizeStyle}`}
+    style="background-image: {`url(${cameraImageUrl || CAMERA_IMAGE})`}"
+  />
+</div>
+
+<style lang="postcss">
+  .floorplan__camera-position {
+    position: absolute;
+    width: 0;
+    height: 0;
+  }
+
+  .floorplan__camera-rotate {
+    position: absolute;
+    background-repeat: no-repeat;
+    background-size: 100%;
+  }
+</style>

package/libs/floorplan/Components/Compass.js

@@ -1,4 +1,4 @@
-/* generated by Svelte v3.50.1 */
+/* generated by Svelte v3.52.0 */
 import {
 	SvelteComponent,
 	append,
@@ -42,7 +42,7 @@ function create_if_block(ctx) {
 			set_style(div0, "background-image", `url(${COMPASS_IMAGE})`);
 			attr(span, "class", "floorplan-plugin__compass-text svelte-rpkaro");
 			attr(div1, "class", "floorplan-plugin__compass svelte-rpkaro");
-			set_style(div1, "transform", /*compassTransformStyle*/ ctx[2], false);
+			set_style(div1, "transform", /*compassTransformStyle*/ ctx[2]);
 		},
 		m(target, anchor) {
 			insert(target, div1, anchor);