@realsee/dnalogel 2.0.2-alpha → 2.0.2

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

@@ -1,86 +1,11 @@
-import type { FLOOR_PLAN_ATTACHED_TO } from '../constant';
-import type * as BasePlugin from '../../base/BasePluginWithData';
-import type { FloorplanServerData } from '../typings/floorplanServerData';
-import type { FloorplanData, FloorplanRoomItem } from '../typings/floorplanData';
-export interface Config {
-    /** 指北针的显示文案，默认为 '北' */
-    northDesc: string;
-    /** 户型图展示时，模型的透明度，默认为 1 */
-    modelOpacity: number;
-    /** 鼠标放置在分间上时，是否要自动高亮分间，默认为 true */
-    hoverEnable: boolean;
+import type * as FloorplanPlugin from '../typings';
+export * from '../typings';
+export interface Config extends FloorplanPlugin.Config {
     /** 是否开启放大缩小和拖动功能，默认为 false */
     gestureEnable: boolean;
-    /** 是否要启用指北针功能，默认为 true */
-    compassEnable: boolean;
-    /** Five 切换到 Topview Mode 时，是否自动展示户型图，默认为 true */
-    autoShowEnable: boolean;
-    /** 是否要启用户型图分间标尺功能，默认为 true */
-    ruleLabelsEnable: boolean;
-    /** 是否要启用户型图分间标签功能，默认为 true */
-    roomLabelsEnable: boolean;
-    /** 自定义「雷达」图标 */
-    cameraImageUrl: string;
-    /** 点击房间时，是否需要跳转到被点房间的全景态点位上，默认为 true */
+    /** 点击房间时，是否阻止跳转到被点房间的全景态点位上，默认为 false */
     preventRoomClick?: boolean;
-    /** 计算户型图大小时，以模型的哪个高度为依据，默认为 BOUNDING_CENTER
-     * - FLOOR_PLAN_ATTACHED_TO.FLOOR: 户型图大小与模型的地板进行贴合
-     * - FLOOR_PLAN_ATTACHED_TO.CEILING: 户型图大小与模型的天花板进行贴合
-     * - FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER: 户型图大小与模型的中心进行贴合
-     */
-    attachedTo: FLOOR_PLAN_ATTACHED_TO;
-    /** 分间标签的自定义函数，通过返回自定义 DOM 替换对应分间的标签 */
-    getLabelElement: undefined | ((room: FloorplanRoomItem) => Element | null);
-    /** 是否支持房屋标签自适应展示，默认为 true
-     * @description
-     * * 标签边框超过房间边框时，自动隐藏；不超过时自动展示。
-     * * 鼠标 hover 时，自动展示。
-     * */
-    adaptiveRoomLabelVisibleEnable: boolean;
 }
-export interface State extends BasePlugin.State {
-    visible: boolean;
+export interface State extends FloorplanPlugin.State {
     config: Config;
 }
-export interface EventMap extends BasePlugin.EventMap<State, FloorplanData> {
-    /** 展示结束的回调
-     * @param event.userAction 是否是用户操作
-     */
-    showAnimationEnded: (event: {
-        userAction: boolean;
-    }) => void;
-    /** visible 从 false 到 true 的回调
-     * @param event.userAction 是否是用户操作
-     */
-    show: (event: {
-        userAction: boolean;
-    }) => void;
-    /** visible 从 true 到 false 的回调
-     * @param event.userAction 是否是用户操作
-     */
-    hide: (event: {
-        userAction: boolean;
-    }) => void;
-    /** enabled 从 false 到 true 的回调
-     * @param event.userAction 是否是用户操作
-     */
-    enable: (event: {
-        userAction: boolean;
-    }) => void;
-    /** enabled 从 true 到 false 的回调
-     * @param event.userAction 是否是用户操作
-     */
-    disable: (event: {
-        userAction: boolean;
-    }) => void;
-}
-/** 插件初始化参数 */
-export interface Parameters extends Partial<Config> {
-    selector?: string | Element;
-    scale?: number;
-}
-export interface PluginServerData extends BasePlugin.ServerData {
-    version: number;
-    data: FloorplanServerData;
-}
-export { FloorplanData as PluginData };

package/dist/floorplan/typings/index.d.ts

@@ -0,0 +1,117 @@
+import type { FloorplanRoomItem } from './floorplanData';
+import type { FLOOR_PLAN_ATTACHED_TO } from '../constant';
+import type { FloorplanData } from '../typings/floorplanData';
+import type * as BasePlugin from '../../base/BasePluginWithData';
+import type { FloorplanServerData } from '../typings/floorplanServerData';
+export interface State extends BasePlugin.State {
+    visible: boolean;
+    config: Config;
+}
+export interface Config {
+    /** 指北针的显示文案，默认为 '北' */
+    northDesc: string;
+    /** 户型图展示时，模型的透明度，默认为 1 */
+    modelOpacity: number;
+    /** 鼠标放置在分间上时，是否要自动高亮分间，默认为 true */
+    hoverEnable: boolean;
+    /** 是否要启用指北针功能，默认为 true */
+    compassEnable: boolean;
+    /** Five 切换到 Topview Mode 时，是否自动展示户型图，默认为 true */
+    autoShowEnable: boolean;
+    /** 是否要启用户型图分间标尺功能，默认为 true */
+    ruleLabelsEnable: boolean;
+    /** 是否要启用户型图分间标签功能，默认为 true */
+    roomLabelsEnable: boolean;
+    /** 是否支持房屋标签自适应展示，默认为 true
+     * @description
+     * * 标签边框超过房间边框时，自动隐藏；不超过时自动展示。
+     * * 鼠标 hover 时，自动展示。
+     * */
+    adaptiveRoomLabelVisibleEnable: boolean;
+    /** 自定义「雷达」图标 */
+    cameraImageUrl: string;
+    /** 计算户型图大小时，以模型的哪个高度为依据，默认为 BOUNDING_CENTER
+     * - FLOOR_PLAN_ATTACHED_TO.FLOOR: 户型图大小与模型的地板进行贴合
+     * - FLOOR_PLAN_ATTACHED_TO.CEILING: 户型图大小与模型的天花板进行贴合
+     * - FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER: 户型图大小与模型的中心进行贴合
+     */
+    attachedTo: FLOOR_PLAN_ATTACHED_TO;
+    /** 分间标签的自定义函数，通过返回自定义 DOM 替换对应分间的标签 */
+    getLabelElement: undefined | ((room: FloorplanRoomItem) => Element | null);
+    /** 自定义分间面积文本
+     * @param area 分间原始面积，单位是 mm²
+     */
+    getRoomAreaText: (areaSize: number) => string;
+    /** 自定义标尺距离文本
+     * @param distance 原始标尺距离，单位是 mm
+     */
+    getRuleDistanceText: (distance: number) => string;
+}
+/** 插件初始化参数 */
+export interface Parameters extends Partial<Config> {
+    selector?: string | Element;
+    scale?: number;
+}
+export interface PluginServerData extends BasePlugin.ServerData {
+    version: number;
+    data: FloorplanServerData;
+}
+export interface ViewEvent {
+    /** 是否是用户滑动模型导致的户型图自动展示/消失 */
+    auto: boolean;
+    /** 是否是用户操作 */
+    userAction: boolean;
+}
+export interface EventMap extends BasePlugin.EventMap<State, FloorplanData> {
+    /**
+     * 展示结束的回调
+     * @param event.auto 是否是自动操作
+     * @param event.userAction 是否是用户操作
+     */
+    showAnimationEnded: (event: ViewEvent) => void;
+    /** visible 从 false 到 true 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    show: (event: ViewEvent) => void;
+    /** visible 从 true 到 false 的回调
+     * @param event.auto 是否是自动操作
+     * @param event.userAction 是否是用户操作
+     */
+    hide: (event: ViewEvent) => void;
+    /** enabled 从 false 到 true 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    enable: (event: {
+        userAction: boolean;
+    }) => void;
+    /** enabled 从 true 到 false 的回调
+     * @param event.userAction 是否是用户操作
+     */
+    disable: (event: {
+        userAction: boolean;
+    }) => void;
+    /**
+     * 点击户型图的回调
+     * @return 当返回 false 时，会阻止默认行为
+     */
+    click: () => boolean | undefined;
+}
+export interface ShowOptions {
+    /** 展示户型图时，希望到达的楼层数 */
+    floorIndex: number;
+    /** 是否自动展示 */
+    isAutoShow: boolean;
+    /** 展示户型图时，模型透明度 */
+    modelOpacity: number;
+    /** 是否需要 opacity 动画 */
+    immediately: boolean;
+    /** 是否是用户操作 */
+    userAction: boolean;
+}
+export interface HideOptions {
+    /** 是否自动隐藏 */
+    isAutoHide: boolean;
+    /** 是否是用户操作 */
+    userAction: boolean;
+}
+export { FloorplanData as PluginData };

package/dist/index.es.js

@@ -6125,6 +6125,8 @@ class Controller$4 extends Controller$6 {
             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);
@@ -6198,6 +6200,10 @@ class Controller$4 extends Controller$6 {
             state.visible ? this._show(options) : this._hide(options);
         }
     }
+    changeConfigs(config, userAction = true) {
+        this.updateState({ config }, userAction);
+        this.render();
+    }
     /** 更新户型图位置 */
     updatePosition() {
         var _a;
@@ -6216,7 +6222,8 @@ class Controller$4 extends Controller$6 {
     }
     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 });
@@ -6553,6 +6560,8 @@ class Controller$3 extends Controller$6 {
             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);
@@ -6654,6 +6663,10 @@ class Controller$3 extends Controller$6 {
             state.visible ? this._show(options) : this._hide(options);
         }
     }
+    changeConfigs(config, userAction = true) {
+        this.updateState({ config }, userAction);
+        this.render();
+    }
     async formatData(serverData) {
         return await formatData(serverData.data);
     }
@@ -6662,7 +6675,7 @@ class Controller$3 extends Controller$6 {
             return;
         this.isHiddenByHideFunc = false;
         const { userAction } = options;
-        this.hooks.emit('show', { userAction });
+        this.hooks.emit('show', { userAction, auto: false });
         if (this.five.getCurrentState().mode !== 'Topview') {
             await changeMode(this.five, ['Topview', undefined, undefined, userAction]);
         }
@@ -6672,14 +6685,14 @@ class Controller$3 extends Controller$6 {
         const renderDuration = 500;
         const modelOpacity = this.state.config.modelOpacity;
         changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
-        this.hooks.emit('showAnimationEnded', { userAction });
+        this.hooks.emit('showAnimationEnded', { userAction, auto: false });
         this.render();
     }
     async _hide(options) {
         if (!this.state.enabled)
             return;
         const { userAction } = options;
-        this.hooks.emit('hide', { userAction });
+        this.hooks.emit('hide', { userAction, auto: false });
         const modelOpacity = 1;
         const renderDuration = 0;
         changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
@@ -6696,7 +6709,8 @@ class Controller$3 extends Controller$6 {
     }
     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/dist/index.js

@@ -6153,6 +6153,8 @@ class Controller$4 extends Controller$6 {
             attachedTo: exports.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);
@@ -6226,6 +6228,10 @@ class Controller$4 extends Controller$6 {
             state.visible ? this._show(options) : this._hide(options);
         }
     }
+    changeConfigs(config, userAction = true) {
+        this.updateState({ config }, userAction);
+        this.render();
+    }
     /** 更新户型图位置 */
     updatePosition() {
         var _a;
@@ -6244,7 +6250,8 @@ class Controller$4 extends Controller$6 {
     }
     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 });
@@ -6581,6 +6588,8 @@ class Controller$3 extends Controller$6 {
             attachedTo: exports.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);
@@ -6682,6 +6691,10 @@ class Controller$3 extends Controller$6 {
             state.visible ? this._show(options) : this._hide(options);
         }
     }
+    changeConfigs(config, userAction = true) {
+        this.updateState({ config }, userAction);
+        this.render();
+    }
     async formatData(serverData) {
         return await formatData(serverData.data);
     }
@@ -6690,7 +6703,7 @@ class Controller$3 extends Controller$6 {
             return;
         this.isHiddenByHideFunc = false;
         const { userAction } = options;
-        this.hooks.emit('show', { userAction });
+        this.hooks.emit('show', { userAction, auto: false });
         if (this.five.getCurrentState().mode !== 'Topview') {
             await changeMode(this.five, ['Topview', undefined, undefined, userAction]);
         }
@@ -6700,14 +6713,14 @@ class Controller$3 extends Controller$6 {
         const renderDuration = 500;
         const modelOpacity = this.state.config.modelOpacity;
         changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
-        this.hooks.emit('showAnimationEnded', { userAction });
+        this.hooks.emit('showAnimationEnded', { userAction, auto: false });
         this.render();
     }
     async _hide(options) {
         if (!this.state.enabled)
             return;
         const { userAction } = options;
-        this.hooks.emit('hide', { userAction });
+        this.hooks.emit('hide', { userAction, auto: false });
         const modelOpacity = 1;
         const renderDuration = 0;
         changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
@@ -6724,7 +6737,8 @@ class Controller$3 extends Controller$6 {
     }
     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/dist/index.umd.js

@@ -6141,6 +6141,8 @@
                 attachedTo: exports.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);
@@ -6214,6 +6216,10 @@
                 state.visible ? this._show(options) : this._hide(options);
             }
         }
+        changeConfigs(config, userAction = true) {
+            this.updateState({ config }, userAction);
+            this.render();
+        }
         /** 更新户型图位置 */
         updatePosition() {
             var _a;
@@ -6232,7 +6238,8 @@
         }
         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 });
@@ -6569,6 +6576,8 @@
                 attachedTo: exports.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);
@@ -6670,6 +6679,10 @@
                 state.visible ? this._show(options) : this._hide(options);
             }
         }
+        changeConfigs(config, userAction = true) {
+            this.updateState({ config }, userAction);
+            this.render();
+        }
         async formatData(serverData) {
             return await formatData(serverData.data);
         }
@@ -6678,7 +6691,7 @@
                 return;
             this.isHiddenByHideFunc = false;
             const { userAction } = options;
-            this.hooks.emit('show', { userAction });
+            this.hooks.emit('show', { userAction, auto: false });
             if (this.five.getCurrentState().mode !== 'Topview') {
                 await changeMode(this.five, ['Topview', undefined, undefined, userAction]);
             }
@@ -6688,14 +6701,14 @@
             const renderDuration = 500;
             const modelOpacity = this.state.config.modelOpacity;
             changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
-            this.hooks.emit('showAnimationEnded', { userAction });
+            this.hooks.emit('showAnimationEnded', { userAction, auto: false });
             this.render();
         }
         async _hide(options) {
             if (!this.state.enabled)
                 return;
             const { userAction } = options;
-            this.hooks.emit('hide', { userAction });
+            this.hooks.emit('hide', { userAction, auto: false });
             const modelOpacity = 1;
             const renderDuration = 0;
             changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
@@ -6712,7 +6725,8 @@
         }
         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 });