@realsee/dnalogel 2.0.0-alpha.10 → 2.0.0-alpha.11

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.0.0-alpha.11
+- 1.fix: 修复 ModelRoomLabelPlugin 未监听多楼层切换 rerender 问题。
+- 2.feat: ModelFloorplanPlugin & TopviewFloorplanPlugin 新增 `northDesc?: string` 配置项，支持用户修改指北针名称。
+
 ## 2.0.0-alpha.10
 - 1.feat: 新增空间三维标签插件 PanoSpatialTagPlugin
 - 2.feat: 新增轻量 ejs 渲染模板函数 shared-utils/tinyEJSrender.js

package/dist/ModelRoomLabelPlugin/index.js

@@ -120,7 +120,7 @@ function get_each_context(ctx, list, i) {
 	return child_ctx;
 }
 
-// (68:2) {#each roomLabels as roomLableItem (roomLableItem.id)}
+// (70:2) {#each roomLabels as roomLableItem (roomLableItem.id)}
 function create_each_block(key_1, ctx) {
 	let first;
 	let roomlabelitem;
@@ -303,9 +303,11 @@ function instance($$self, $$props, $$invalidate) {
 	}
 
 	five.on('cameraUpdate', onFiveCameraUpdate);
+	five.on('modelShownFloorChange', onFiveCameraUpdate);
 
 	svelte.onDestroy(() => {
 		five.off('cameraUpdate', onFiveCameraUpdate);
+		five.off('modelShownFloorChange', onFiveCameraUpdate);
 	});
 
 	svelte.onMount(() => {

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

@@ -4,6 +4,7 @@ import type { FloorplanServerData } from '../typings/floorplanServerData';
 import type { FloorplanRoomItem } from '../typings/floorplanData';
 import { FLOOR_PLAN_ATTACHED_TO } from '../constant';
 export interface ModelFloorplanParameterType {
+    northDesc?: string;
     selector?: string | Element;
     scale?: number;
     modelOpacity?: number;

package/dist/floorplan/ModelFloorplanPlugin/index.js

@@ -145,12 +145,13 @@ function add_css$b(target) {
 	internal.append_styles(target, "svelte-5l80pv", ".floorplan-plugin__compass.svelte-5l80pv{position:absolute;left:50%;top:-46px;width:231px;height:41px;will-change:opacity;transform-origin:center 184px}.floorplan-plugin__compass-image.svelte-5l80pv{width:100%;height:100%;position:absolute;left:0;top:0;opacity:0.1;background-repeat:no-repeat;background-size:100% 100%}.floorplan-plugin__compass-text.svelte-5l80pv{position:absolute;left:50%;top:15px;transform:translateX(-50%);opacity:0.2;font-weight:bold;font-size:10px;color:#fff}");
 }
 
-// (11:0) {#if northRad}
+// (12:0) {#if northRad}
 function create_if_block$6(ctx) {
 	let div1;
 	let div0;
 	let t0;
 	let span;
+	let t1;
 
 	return {
 		c() {
@@ -158,20 +159,23 @@ function create_if_block$6(ctx) {
 			div0 = internal.element("div");
 			t0 = internal.space();
 			span = internal.element("span");
-			span.textContent = "北";
+			t1 = internal.text(/*northDesc*/ ctx[0]);
 			internal.attr(div0, "class", "floorplan-plugin__compass-image svelte-5l80pv");
 			internal.set_style(div0, "background-image", `url(${COMPASS_IMAGE})`);
 			internal.attr(span, "class", "floorplan-plugin__compass-text svelte-5l80pv");
 			internal.attr(div1, "class", "floorplan-plugin__compass svelte-5l80pv");
-			internal.set_style(div1, "transform", /*compassTransformStyle*/ ctx[1], false);
+			internal.set_style(div1, "transform", /*compassTransformStyle*/ ctx[2], false);
 		},
 		m(target, anchor) {
 			internal.insert(target, div1, anchor);
 			internal.append(div1, div0);
 			internal.append(div1, t0);
 			internal.append(div1, span);
+			internal.append(span, t1);
+		},
+		p(ctx, dirty) {
+			if (dirty & /*northDesc*/ 1) internal.set_data(t1, /*northDesc*/ ctx[0]);
 		},
-		p: internal.noop,
 		d(detaching) {
 			if (detaching) internal.detach(div1);
 		}
@@ -180,7 +184,7 @@ function create_if_block$6(ctx) {
 
 function create_fragment$f(ctx) {
 	let if_block_anchor;
-	let if_block = /*northRad*/ ctx[0] && create_if_block$6(ctx);
+	let if_block = /*northRad*/ ctx[1] && create_if_block$6(ctx);
 
 	return {
 		c() {
@@ -192,7 +196,7 @@ function create_fragment$f(ctx) {
 			internal.insert(target, if_block_anchor, anchor);
 		},
 		p(ctx, [dirty]) {
-			if (/*northRad*/ ctx[0]) if_block.p(ctx, dirty);
+			if (/*northRad*/ ctx[1]) if_block.p(ctx, dirty);
 		},
 		i: internal.noop,
 		o: internal.noop,
@@ -209,21 +213,23 @@ function rad2Deg(rad) {
 
 function instance$f($$self, $$props, $$invalidate) {
 	let { floorplanData } = $$props;
+	let { northDesc } = $$props;
 	const northRad = floorplanData.entrance?.northRad;
 	const rotate = !northRad ? 0 : rad2Deg(northRad);
 	const compassTransformStyle = `translateX(-50%) translateZ(10px) rotate(${-rotate + 90}deg)`;
 
 	$$self.$$set = $$props => {
-		if ('floorplanData' in $$props) $$invalidate(2, floorplanData = $$props.floorplanData);
+		if ('floorplanData' in $$props) $$invalidate(3, floorplanData = $$props.floorplanData);
+		if ('northDesc' in $$props) $$invalidate(0, northDesc = $$props.northDesc);
 	};
 
-	return [northRad, compassTransformStyle, floorplanData];
+	return [northDesc, northRad, compassTransformStyle, floorplanData];
 }
 
 class Compass extends internal.SvelteComponent {
 	constructor(options) {
 		super();
-		internal.init(this, options, instance$f, create_fragment$f, internal.safe_not_equal, { floorplanData: 2 }, add_css$b);
+		internal.init(this, options, instance$f, create_fragment$f, internal.safe_not_equal, { floorplanData: 3, northDesc: 0 }, add_css$b);
 	}
 }
 
@@ -2766,7 +2772,7 @@ function add_css(target) {
 	internal.append_styles(target, "svelte-177x2q7", ".floorplan-main.svelte-177x2q7{width:100%;height:100%}");
 }
 
-// (23:0) {#if visible}
+// (24:0) {#if visible}
 function create_if_block(ctx) {
 	let div;
 	let currentfloor;
@@ -2778,15 +2784,15 @@ function create_if_block(ctx) {
 
 	const currentfloor_spread_levels = [
 		{
-			five: /*five*/ ctx[1],
-			pxmm: /*pxmm*/ ctx[0],
-			floorIndex: /*floorIndex*/ ctx[5],
-			hoverEnable: /*hoverEnable*/ ctx[6],
-			floorplanData: /*floorplanData*/ ctx[10],
-			getLabelElement: /*getLabelElement*/ ctx[14],
-			roomLabelsEnable: /*roomLabelsEnable*/ ctx[8],
-			ruleLabelsEnable: /*ruleLabelsEnable*/ ctx[9],
-			onRoomHeightClick: /*onRoomHeightClick*/ ctx[13]
+			five: /*five*/ ctx[2],
+			pxmm: /*pxmm*/ ctx[1],
+			floorIndex: /*floorIndex*/ ctx[6],
+			hoverEnable: /*hoverEnable*/ ctx[7],
+			floorplanData: /*floorplanData*/ ctx[11],
+			getLabelElement: /*getLabelElement*/ ctx[15],
+			roomLabelsEnable: /*roomLabelsEnable*/ ctx[9],
+			ruleLabelsEnable: /*ruleLabelsEnable*/ ctx[10],
+			onRoomHeightClick: /*onRoomHeightClick*/ ctx[14]
 		}
 	];
 
@@ -2800,10 +2806,10 @@ function create_if_block(ctx) {
 
 	const camera_spread_levels = [
 		{
-			panoIndex: /*panoIndex*/ ctx[4],
-			floorplanData: /*floorplanData*/ ctx[10],
-			lastPanoramaLongitude: /*lastPanoramaLongitude*/ ctx[11],
-			cameraImageUrl: /*cameraImageUrl*/ ctx[12]
+			panoIndex: /*panoIndex*/ ctx[5],
+			floorplanData: /*floorplanData*/ ctx[11],
+			lastPanoramaLongitude: /*lastPanoramaLongitude*/ ctx[12],
+			cameraImageUrl: /*cameraImageUrl*/ ctx[13]
 		}
 	];
 
@@ -2814,7 +2820,7 @@ function create_if_block(ctx) {
 	}
 
 	camera = new Camera({ props: camera_props });
-	let if_block = /*compassEnable*/ ctx[7] && create_if_block_1(ctx);
+	let if_block = /*compassEnable*/ ctx[8] && create_if_block_1(ctx);
 
 	return {
 		c() {
@@ -2838,42 +2844,42 @@ function create_if_block(ctx) {
 		p(new_ctx, dirty) {
 			ctx = new_ctx;
 
-			const currentfloor_changes = (dirty & /*five, pxmm, floorIndex, hoverEnable, floorplanData, getLabelElement, roomLabelsEnable, ruleLabelsEnable, onRoomHeightClick*/ 26467)
+			const currentfloor_changes = (dirty & /*five, pxmm, floorIndex, hoverEnable, floorplanData, getLabelElement, roomLabelsEnable, ruleLabelsEnable, onRoomHeightClick*/ 52934)
 			? internal.get_spread_update(currentfloor_spread_levels, [
 					{
-						five: /*five*/ ctx[1],
-						pxmm: /*pxmm*/ ctx[0],
-						floorIndex: /*floorIndex*/ ctx[5],
-						hoverEnable: /*hoverEnable*/ ctx[6],
-						floorplanData: /*floorplanData*/ ctx[10],
-						getLabelElement: /*getLabelElement*/ ctx[14],
-						roomLabelsEnable: /*roomLabelsEnable*/ ctx[8],
-						ruleLabelsEnable: /*ruleLabelsEnable*/ ctx[9],
-						onRoomHeightClick: /*onRoomHeightClick*/ ctx[13]
+						five: /*five*/ ctx[2],
+						pxmm: /*pxmm*/ ctx[1],
+						floorIndex: /*floorIndex*/ ctx[6],
+						hoverEnable: /*hoverEnable*/ ctx[7],
+						floorplanData: /*floorplanData*/ ctx[11],
+						getLabelElement: /*getLabelElement*/ ctx[15],
+						roomLabelsEnable: /*roomLabelsEnable*/ ctx[9],
+						ruleLabelsEnable: /*ruleLabelsEnable*/ ctx[10],
+						onRoomHeightClick: /*onRoomHeightClick*/ ctx[14]
 					}
 				])
 			: {};
 
 			currentfloor.$set(currentfloor_changes);
 
-			const camera_changes = (dirty & /*panoIndex, floorplanData, lastPanoramaLongitude, cameraImageUrl*/ 7184)
+			const camera_changes = (dirty & /*panoIndex, floorplanData, lastPanoramaLongitude, cameraImageUrl*/ 14368)
 			? internal.get_spread_update(camera_spread_levels, [
 					{
-						panoIndex: /*panoIndex*/ ctx[4],
-						floorplanData: /*floorplanData*/ ctx[10],
-						lastPanoramaLongitude: /*lastPanoramaLongitude*/ ctx[11],
-						cameraImageUrl: /*cameraImageUrl*/ ctx[12]
+						panoIndex: /*panoIndex*/ ctx[5],
+						floorplanData: /*floorplanData*/ ctx[11],
+						lastPanoramaLongitude: /*lastPanoramaLongitude*/ ctx[12],
+						cameraImageUrl: /*cameraImageUrl*/ ctx[13]
 					}
 				])
 			: {};
 
 			camera.$set(camera_changes);
 
-			if (/*compassEnable*/ ctx[7]) {
+			if (/*compassEnable*/ ctx[8]) {
 				if (if_block) {
 					if_block.p(ctx, dirty);
 
-					if (dirty & /*compassEnable*/ 128) {
+					if (dirty & /*compassEnable*/ 256) {
 						internal.transition_in(if_block, 1);
 					}
 				} else {
@@ -2901,7 +2907,7 @@ function create_if_block(ctx) {
 			if (!div_intro) {
 				internal.add_render_callback(() => {
 					div_intro = internal.create_in_transition(div, transition.fade, {
-						duration: /*duration*/ ctx[2],
+						duration: /*duration*/ ctx[3],
 						easing: easing.linear
 					});
 
@@ -2926,13 +2932,16 @@ function create_if_block(ctx) {
 	};
 }
 
-// (39:4) {#if compassEnable}
+// (40:4) {#if compassEnable}
 function create_if_block_1(ctx) {
 	let compass;
 	let current;
 
 	compass = new Compass({
-			props: { floorplanData: /*floorplanData*/ ctx[10] }
+			props: {
+				floorplanData: /*floorplanData*/ ctx[11],
+				northDesc: /*northDesc*/ ctx[0]
+			}
 		});
 
 	return {
@@ -2945,7 +2954,8 @@ function create_if_block_1(ctx) {
 		},
 		p(ctx, dirty) {
 			const compass_changes = {};
-			if (dirty & /*floorplanData*/ 1024) compass_changes.floorplanData = /*floorplanData*/ ctx[10];
+			if (dirty & /*floorplanData*/ 2048) compass_changes.floorplanData = /*floorplanData*/ ctx[11];
+			if (dirty & /*northDesc*/ 1) compass_changes.northDesc = /*northDesc*/ ctx[0];
 			compass.$set(compass_changes);
 		},
 		i(local) {
@@ -2966,7 +2976,7 @@ function create_if_block_1(ctx) {
 function create_fragment(ctx) {
 	let if_block_anchor;
 	let current;
-	let if_block = /*visible*/ ctx[3] && create_if_block(ctx);
+	let if_block = /*visible*/ ctx[4] && create_if_block(ctx);
 
 	return {
 		c() {
@@ -2979,11 +2989,11 @@ function create_fragment(ctx) {
 			current = true;
 		},
 		p(ctx, [dirty]) {
-			if (/*visible*/ ctx[3]) {
+			if (/*visible*/ ctx[4]) {
 				if (if_block) {
 					if_block.p(ctx, dirty);
 
-					if (dirty & /*visible*/ 8) {
+					if (dirty & /*visible*/ 16) {
 						internal.transition_in(if_block, 1);
 					}
 				} else {
@@ -3019,6 +3029,7 @@ function create_fragment(ctx) {
 }
 
 function instance($$self, $$props, $$invalidate) {
+	let { northDesc } = $$props;
 	let { pxmm } = $$props;
 	let { five } = $$props;
 	let { duration = 0 } = $$props;
@@ -3036,24 +3047,26 @@ function instance($$self, $$props, $$invalidate) {
 	let { getLabelElement } = $$props;
 
 	$$self.$$set = $$props => {
-		if ('pxmm' in $$props) $$invalidate(0, pxmm = $$props.pxmm);
-		if ('five' in $$props) $$invalidate(1, five = $$props.five);
-		if ('duration' in $$props) $$invalidate(2, duration = $$props.duration);
-		if ('visible' in $$props) $$invalidate(3, visible = $$props.visible);
-		if ('panoIndex' in $$props) $$invalidate(4, panoIndex = $$props.panoIndex);
-		if ('floorIndex' in $$props) $$invalidate(5, floorIndex = $$props.floorIndex);
-		if ('hoverEnable' in $$props) $$invalidate(6, hoverEnable = $$props.hoverEnable);
-		if ('compassEnable' in $$props) $$invalidate(7, compassEnable = $$props.compassEnable);
-		if ('roomLabelsEnable' in $$props) $$invalidate(8, roomLabelsEnable = $$props.roomLabelsEnable);
-		if ('ruleLabelsEnable' in $$props) $$invalidate(9, ruleLabelsEnable = $$props.ruleLabelsEnable);
-		if ('floorplanData' in $$props) $$invalidate(10, floorplanData = $$props.floorplanData);
-		if ('lastPanoramaLongitude' in $$props) $$invalidate(11, lastPanoramaLongitude = $$props.lastPanoramaLongitude);
-		if ('cameraImageUrl' in $$props) $$invalidate(12, cameraImageUrl = $$props.cameraImageUrl);
-		if ('onRoomHeightClick' in $$props) $$invalidate(13, onRoomHeightClick = $$props.onRoomHeightClick);
-		if ('getLabelElement' in $$props) $$invalidate(14, getLabelElement = $$props.getLabelElement);
+		if ('northDesc' in $$props) $$invalidate(0, northDesc = $$props.northDesc);
+		if ('pxmm' in $$props) $$invalidate(1, pxmm = $$props.pxmm);
+		if ('five' in $$props) $$invalidate(2, five = $$props.five);
+		if ('duration' in $$props) $$invalidate(3, duration = $$props.duration);
+		if ('visible' in $$props) $$invalidate(4, visible = $$props.visible);
+		if ('panoIndex' in $$props) $$invalidate(5, panoIndex = $$props.panoIndex);
+		if ('floorIndex' in $$props) $$invalidate(6, floorIndex = $$props.floorIndex);
+		if ('hoverEnable' in $$props) $$invalidate(7, hoverEnable = $$props.hoverEnable);
+		if ('compassEnable' in $$props) $$invalidate(8, compassEnable = $$props.compassEnable);
+		if ('roomLabelsEnable' in $$props) $$invalidate(9, roomLabelsEnable = $$props.roomLabelsEnable);
+		if ('ruleLabelsEnable' in $$props) $$invalidate(10, ruleLabelsEnable = $$props.ruleLabelsEnable);
+		if ('floorplanData' in $$props) $$invalidate(11, floorplanData = $$props.floorplanData);
+		if ('lastPanoramaLongitude' in $$props) $$invalidate(12, lastPanoramaLongitude = $$props.lastPanoramaLongitude);
+		if ('cameraImageUrl' in $$props) $$invalidate(13, cameraImageUrl = $$props.cameraImageUrl);
+		if ('onRoomHeightClick' in $$props) $$invalidate(14, onRoomHeightClick = $$props.onRoomHeightClick);
+		if ('getLabelElement' in $$props) $$invalidate(15, getLabelElement = $$props.getLabelElement);
 	};
 
 	return [
+		northDesc,
 		pxmm,
 		five,
 		duration,
@@ -3083,21 +3096,22 @@ class Main extends internal.SvelteComponent {
 			create_fragment,
 			internal.safe_not_equal,
 			{
-				pxmm: 0,
-				five: 1,
-				duration: 2,
-				visible: 3,
-				panoIndex: 4,
-				floorIndex: 5,
-				hoverEnable: 6,
-				compassEnable: 7,
-				roomLabelsEnable: 8,
-				ruleLabelsEnable: 9,
-				floorplanData: 10,
-				lastPanoramaLongitude: 11,
-				cameraImageUrl: 12,
-				onRoomHeightClick: 13,
-				getLabelElement: 14
+				northDesc: 0,
+				pxmm: 1,
+				five: 2,
+				duration: 3,
+				visible: 4,
+				panoIndex: 5,
+				floorIndex: 6,
+				hoverEnable: 7,
+				compassEnable: 8,
+				roomLabelsEnable: 9,
+				ruleLabelsEnable: 10,
+				floorplanData: 11,
+				lastPanoramaLongitude: 12,
+				cameraImageUrl: 13,
+				onRoomHeightClick: 14,
+				getLabelElement: 15
 			},
 			add_css
 		);
@@ -3788,8 +3802,9 @@ class ModelFloorplanPluginController {
             return;
         if (this.size.width === 0)
             return;
-        const { hoverEnable, cameraImageUrl, getLabelElement, roomLabelsEnable, compassEnable, ruleLabelsEnable } = this.configs;
+        const { northDesc, hoverEnable, cameraImageUrl, getLabelElement, roomLabelsEnable, compassEnable, ruleLabelsEnable } = this.configs;
         const props = {
+            northDesc: northDesc ?? '北',
             five: this.five,
             pxmm: this.pxmm,
             cameraImageUrl,

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

@@ -3,6 +3,7 @@ import type { FloorplanServerData } from '../typings/floorplanServerData';
 import type { FloorplanRoomItem } from '../typings/floorplanData';
 import { FLOOR_PLAN_ATTACHED_TO } from '../constant';
 export interface TopviewFloorplanPluginParameterType {
+    northDesc?: string;
     selector?: string | Element;
     scale?: number;
     modelOpacity?: number;