@realsee/dnalogel 2.0.1 → 2.0.2-alpha

package/libs/floorplan/Components/RuleLabels/RuleLabels.js

@@ -31,12 +31,12 @@ function add_css(target) {
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[12] = list[i][0];
-	child_ctx[13] = list[i][1];
+	child_ctx[13] = list[i][0];
+	child_ctx[14] = list[i][1];
 	return child_ctx;
 }
 
-// (19:2) {#each ruleLabelArray as [type, data] (type)}
+// (20:2) {#each ruleLabelArray as [type, data] (type)}
 function create_each_block(key_1, ctx) {
 	let first;
 	let ruleitem;
@@ -44,9 +44,10 @@ function create_each_block(key_1, ctx) {
 
 	const ruleitem_spread_levels = [
 		{
-			type: /*type*/ ctx[12],
-			data: /*data*/ ctx[13],
-			bounding: /*bounding*/ ctx[0]
+			type: /*type*/ ctx[13],
+			data: /*data*/ ctx[14],
+			bounding: /*bounding*/ ctx[1],
+			getRuleDistanceText: /*getRuleDistanceText*/ ctx[0]
 		}
 	];
 
@@ -74,12 +75,13 @@ function create_each_block(key_1, ctx) {
 		p(new_ctx, dirty) {
 			ctx = new_ctx;
 
-			const ruleitem_changes = (dirty & /*ruleLabelArray, bounding*/ 9)
+			const ruleitem_changes = (dirty & /*ruleLabelArray, bounding, getRuleDistanceText*/ 19)
 			? get_spread_update(ruleitem_spread_levels, [
 					{
-						type: /*type*/ ctx[12],
-						data: /*data*/ ctx[13],
-						bounding: /*bounding*/ ctx[0]
+						type: /*type*/ ctx[13],
+						data: /*data*/ ctx[14],
+						bounding: /*bounding*/ ctx[1],
+						getRuleDistanceText: /*getRuleDistanceText*/ ctx[0]
 					}
 				])
 			: {};
@@ -107,8 +109,8 @@ function create_fragment(ctx) {
 	let each_blocks = [];
 	let each_1_lookup = new Map();
 	let current;
-	let each_value = /*ruleLabelArray*/ ctx[3];
-	const get_key = ctx => /*type*/ ctx[12];
+	let each_value = /*ruleLabelArray*/ ctx[4];
+	const get_key = ctx => /*type*/ ctx[13];
 
 	for (let i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context(ctx, each_value, i);
@@ -125,8 +127,8 @@ function create_fragment(ctx) {
 			}
 
 			attr(div, "class", "floorplan-plugin__rule-labels-wrapper svelte-1mzj9p3");
-			set_style(div, "width", /*width*/ ctx[2], false);
-			set_style(div, "height", /*height*/ ctx[1], false);
+			set_style(div, "width", /*width*/ ctx[3], false);
+			set_style(div, "height", /*height*/ ctx[2], false);
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
@@ -138,19 +140,19 @@ function create_fragment(ctx) {
 			current = true;
 		},
 		p(ctx, [dirty]) {
-			if (dirty & /*ruleLabelArray, bounding*/ 9) {
-				each_value = /*ruleLabelArray*/ ctx[3];
+			if (dirty & /*ruleLabelArray, bounding, getRuleDistanceText*/ 19) {
+				each_value = /*ruleLabelArray*/ ctx[4];
 				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 & /*width*/ 8) {
+				set_style(div, "width", /*width*/ ctx[3], false);
 			}
 
-			if (dirty & /*height*/ 2) {
-				set_style(div, "height", /*height*/ ctx[1], false);
+			if (dirty & /*height*/ 4) {
+				set_style(div, "height", /*height*/ ctx[2], false);
 			}
 		},
 		i(local) {
@@ -195,55 +197,58 @@ function instance($$self, $$props, $$invalidate) {
 	let height;
 	let { floorIndex } = $$props;
 	let { floorplanData } = $$props;
+	let { getRuleDistanceText } = $$props;
 
 	$$self.$$set = $$props => {
-		if ('floorIndex' in $$props) $$invalidate(4, floorIndex = $$props.floorIndex);
-		if ('floorplanData' in $$props) $$invalidate(5, floorplanData = $$props.floorplanData);
+		if ('floorIndex' in $$props) $$invalidate(5, floorIndex = $$props.floorIndex);
+		if ('floorplanData' in $$props) $$invalidate(6, floorplanData = $$props.floorplanData);
+		if ('getRuleDistanceText' in $$props) $$invalidate(0, getRuleDistanceText = $$props.getRuleDistanceText);
 	};
 
 	$$self.$$.update = () => {
-		if ($$self.$$.dirty & /*floorplanData*/ 32) {
-			$: $$invalidate(0, bounding = floorplanData.bounding);
+		if ($$self.$$.dirty & /*floorplanData*/ 64) {
+			$: $$invalidate(1, bounding = floorplanData.bounding);
 		}
 
-		if ($$self.$$.dirty & /*floorplanData, floorIndex*/ 48) {
-			$: $$invalidate(10, ruleLabelData = floorplanData.floorDatas[floorIndex].rules);
+		if ($$self.$$.dirty & /*floorplanData, floorIndex*/ 96) {
+			$: $$invalidate(11, ruleLabelData = floorplanData.floorDatas[floorIndex].rules);
 		}
 
-		if ($$self.$$.dirty & /*ruleLabelData*/ 1024) {
-			$: $$invalidate(11, ruleLabelDataKeys = Object.keys(ruleLabelData));
+		if ($$self.$$.dirty & /*ruleLabelData*/ 2048) {
+			$: $$invalidate(12, ruleLabelDataKeys = Object.keys(ruleLabelData));
 		}
 
-		if ($$self.$$.dirty & /*ruleLabelDataKeys, ruleLabelData*/ 3072) {
-			$: $$invalidate(3, ruleLabelArray = ruleLabelDataKeys.map(key => [key, ruleLabelData[key]]));
+		if ($$self.$$.dirty & /*ruleLabelDataKeys, ruleLabelData*/ 6144) {
+			$: $$invalidate(4, ruleLabelArray = ruleLabelDataKeys.map(key => [key, ruleLabelData[key]]));
 		}
 
-		if ($$self.$$.dirty & /*bounding*/ 1) {
-			$: $$invalidate(8, boundingWidth = bounding.max.x - bounding.min.x);
+		if ($$self.$$.dirty & /*bounding*/ 2) {
+			$: $$invalidate(9, boundingWidth = bounding.max.x - bounding.min.x);
 		}
 
-		if ($$self.$$.dirty & /*bounding*/ 1) {
-			$: $$invalidate(6, boundingHeight = bounding.max.y - bounding.min.y);
+		if ($$self.$$.dirty & /*bounding*/ 2) {
+			$: $$invalidate(7, 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*/ 2) {
+			$: $$invalidate(10, 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 & /*bounding*/ 2) {
+			$: $$invalidate(8, 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 & /*contentWidth, boundingWidth*/ 1536) {
+			$: $$invalidate(3, width = contentWidth / boundingWidth * 100 + '%');
 		}
 
-		if ($$self.$$.dirty & /*contentHeight, boundingHeight*/ 192) {
-			$: $$invalidate(1, height = contentHeight / boundingHeight * 100 + '%');
+		if ($$self.$$.dirty & /*contentHeight, boundingHeight*/ 384) {
+			$: $$invalidate(2, height = contentHeight / boundingHeight * 100 + '%');
 		}
 	};
 
 	return [
+		getRuleDistanceText,
 		bounding,
 		height,
 		width,
@@ -262,7 +267,20 @@ function instance($$self, $$props, $$invalidate) {
 class Component extends SvelteComponent {
 	constructor(options) {
 		super();
-		init(this, options, instance, create_fragment, safe_not_equal, { floorIndex: 4, floorplanData: 5 }, add_css);
+
+		init(
+			this,
+			options,
+			instance,
+			create_fragment,
+			safe_not_equal,
+			{
+				floorIndex: 5,
+				floorplanData: 6,
+				getRuleDistanceText: 0
+			},
+			add_css
+		);
 	}
 }
 

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

@@ -1,3 +1,4 @@
+import type { PartialDeep } from 'type-fest';
 import type { BaseOptions } from '../../base/BasePlugin';
 import type { Five } from '@realsee/five';
 import type { ShowState } from '../utils/correctFiveState';
@@ -56,8 +57,8 @@ export declare class Controller extends BasePlugin.Controller<State, EventMap, P
     /** 隐藏户型图 */
     hide: (options?: Partial<HideOptions>) => Promise<void>;
     /** 更改插件 State */
-    setState(state: Partial<State>, options?: BaseOptions): void;
-    changeConfigs(_config: Partial<Config>, userAction?: boolean): void;
+    setState(state: PartialDeep<State>, options?: BaseOptions): void;
+    changeConfigs(config: Partial<Config>, userAction?: boolean): void;
     /** 更新户型图大小 */
     updateSize: () => void;
     protected formatData(serverData: PluginServerData): Promise<PluginData>;

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -545,10 +545,12 @@ export class Controller extends BasePlugin.Controller {
             autoShowEnable: true,
             ruleLabelsEnable: true,
             roomLabelsEnable: true,
+            adaptiveRoomLabelVisibleEnable: true,
             cameraImageUrl: CAMERA_IMAGE,
             attachedTo: FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER,
             getLabelElement: undefined,
-            adaptiveRoomLabelVisibleEnable: true,
+            getRoomAreaText: (size) => (size / 1000000).toFixed(1) + '㎡',
+            getRuleDistanceText: (distance) => distance.toString()
         };
         const paramsConfig = params ? omit(params, ['selector', 'scale']) : {};
         const config = Object.assign(Object.assign({}, baseConfig), paramsConfig);
@@ -621,12 +623,10 @@ export class Controller extends BasePlugin.Controller {
             const options = { userAction };
             state.visible ? this._show(options) : this._hide(options);
         }
+        this.render();
     }
-    changeConfigs(_config, userAction = true) {
-        const config = Object.assign(Object.assign({}, this.state.config), _config);
+    changeConfigs(config, userAction = true) {
         this.updateState({ config }, userAction);
-        if (!this.container)
-            return;
         this.render();
     }
     async formatData(serverData) {
@@ -634,7 +634,8 @@ export class Controller extends BasePlugin.Controller {
     }
     updateState(state, userAction) {
         const prevState = this.state;
-        this.state = Object.assign(Object.assign({}, this.state), state);
+        const config = state.config ? Object.assign(Object.assign({}, prevState.config), state.config) : prevState.config;
+        this.state = Object.assign(Object.assign(Object.assign({}, this.state), state), { config });
         if (equal(this.state, prevState, { deep: true }))
             return;
         this.hooks.emit('stateChange', { state: this.state, prevState, userAction });

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

@@ -21,6 +21,12 @@ export interface Config {
     ruleLabelsEnable: boolean;
     /** 是否要启用户型图分间标签功能，默认为 true */
     roomLabelsEnable: boolean;
+    /** 是否支持房屋标签自适应展示，默认为 true
+     * @description
+     * * 标签边框超过房间边框时，自动隐藏；不超过时自动展示。
+     * * 鼠标 hover 时，自动展示。
+     * */
+    adaptiveRoomLabelVisibleEnable: boolean;
     /** 自定义「雷达」图标 */
     cameraImageUrl: string;
     /** 计算户型图大小时，以模型的哪个高度为依据，默认为 BOUNDING_CENTER
@@ -31,12 +37,14 @@ export interface Config {
     attachedTo: FLOOR_PLAN_ATTACHED_TO;
     /** 分间标签的自定义函数，通过返回自定义 DOM 替换对应分间的标签 */
     getLabelElement: undefined | ((room: FloorplanRoomItem) => Element | null);
-    /** 是否支持房屋标签自适应展示，默认为 true
-     * @description
-     * * 标签边框超过房间边框时，自动隐藏；不超过时自动展示。
-     * * 鼠标 hover 时，自动展示。
-     * */
-    adaptiveRoomLabelVisibleEnable: boolean;
+    /** 自定义分间面积文本
+     * @param area 分间原始面积，单位是 mm²
+     */
+    getRoomAreaText: (areaSize: number) => string;
+    /** 自定义标尺距离文本
+     * @param distance 原始标尺距离，单位是 mm
+     */
+    getRuleDistanceText: (distance: number) => string;
 }
 export interface Parameters extends Partial<Config> {
     selector?: string | Element;
@@ -80,7 +88,7 @@ export interface EventMap extends BasePlugin.EventMap<State, FloorplanData> {
      * 点击户型图的回调
      * @return 当返回 false 时，会阻止默认行为
      */
-    click: () => boolean | void;
+    click: () => boolean | undefined;
 }
 export interface PluginServerData extends BasePlugin.ServerData {
     version: number;

package/package.json

@@ -8,7 +8,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.0.1",
+  "version": "2.0.2-alpha",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "yarn run tsb && yarn run build:rollup && yarn run build:components && yarn build:docs",
@@ -59,6 +59,7 @@
     "svelte-strip": "^1.0.1",
     "three": "0.117.1",
     "tslib": "^2.3.1",
+    "type-fest": "^2.19.0",
     "typedoc": "^0.22.11",
     "typescript": "^4.5.5",
     "vite": "^2.8.0"