architwin 1.14.15 → 1.15.0

package/lib/atwinui/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { batchAddEventListenerByClassName, batchAddEventListenerById, setActiveToolbarItem, toggleDisplayPane, toggleActionBar, setupIndividualEventListeners, setupSpaceEventSubscriptions, handleShowMinimap, handleRenderMeetingUI } from './events';
+import { batchAddEventListenerByClassName, batchAddEventListenerById, setActiveToolbarItem, toggleDisplayPane, toggleActionBar, setupIndividualEventListeners, setupSpaceEventSubscriptions, handleShowMinimap, handleRenderMeetingUI, handleDisplayElements } from './events';
 import '../../static/atwinui.css';
 import { renderToolbarUI, setActiveMenu, setActiveActionBtn, setActiveThemeCard, toggleModelControl, toggleModal, setModalAction, toggleActionBarButtons } from './components/toolbar';
 import { SPACE_EVENTS } from '../types';
@@ -69,6 +69,14 @@ function initToolbarUI(payload) {
             if (event.target.id !== 'at-settings-btn') {
                 toggleBasepointCalibratePane(false);
             }
+            //@ts-expect-error
+            if (event.target.id === 'at-expand-btn') {
+                handleDisplayElements('at-expand-btn');
+            }
+            //@ts-expect-error
+            if (event.target.id === 'at-tag-iot-btn') {
+                handleDisplayElements('at-tag-iot-btn');
+            }
             //@ts-ignore
             yield toggleDisplayPane(event.target.id);
             log.info("setActiveMenu, batchAddEventListenerByClassName");

package/lib/color.js

@@ -21,6 +21,10 @@ export const colors = [
         name: "YELLOW_GREEN" /* TAG_COLOR.YELLOW_GREEN */,
         rgb: { r: 0.68, g: 1, b: 0.18 },
     },
+    {
+        name: "YELLO_ORANGE" /* TAG_COLOR.YELLOW_ORANGE */,
+        rgb: useHexToRgb("ffae42"),
+    },
     {
         name: "GREEN" /* TAG_COLOR.GREEN */,
         rgb: { r: 0, g: 0.5, b: 0 },
@@ -29,6 +33,10 @@ export const colors = [
         name: "LIGHT_BLUE" /* TAG_COLOR.LIGHT_BLUE */,
         rgb: { r: 0.65, g: 0.9, b: 1 },
     },
+    {
+        name: "SOFT_ROYAL_BLUE" /* TAG_COLOR.SOFT_ROYAL_BLUE */,
+        rgb: { r: 0.3, g: 0.5, b: 1.0 },
+    },
     {
         name: "BLUE" /* TAG_COLOR.BLUE */,
         rgb: { r: 0, g: 0, b: 1 },
@@ -104,10 +112,13 @@ export const colors = [
 ];
 export function getTagColorImageSrc(target) {
     let basePath = '../architwin/static';
-    if ('bundlePath' in _mpConfig) {
+    if ('bundlePath' in _mpConfig && !window.location.href.includes('localhost')) {
         console.log("Custom bundlePath detected. Using alternate asset link");
         basePath = 'https://cdn.jsdelivr.net/npm/architwin@latest/static';
     }
+    else {
+        basePath = "../../node_modules/architwin/static";
+    }
     if (target && typeof target !== 'string') {
         const res = colors.find(colors => JSON.stringify(colors.rgb) === JSON.stringify(target));
         if (res) {

package/lib/loaders/polydrawerLoader.js

@@ -1159,6 +1159,8 @@ export class BufferGeometry {
                 const outlineMesh = new THREE.LineSegments(outlineGeometry, outlineMaterial);
                 outlineMesh.name = windowMesh.name;
                 windowMesh.add(outlineMesh);
+                windowMesh.visible = windows[i].options ? windows[i].options.is_visible : true;
+                outlineMesh.visible = windows[i].options ? windows[i].options.is_visible : true;
                 // Add window center label if material is defined
                 if (windows[i].material || windows[i].name) {
                     try {
@@ -1209,6 +1211,7 @@ export class BufferGeometry {
                         const labelOffset = 0.01;
                         windowCenterLabel.position.copy(center3D).addScaledVector(normal.clone().negate(), labelOffset);
                         windowCenterLabel.name = windowMesh.name;
+                        windowCenterLabel.visible = windows[i].options ? windows[i].options.is_visible : true;
                         windowCenterLabel.lookAt(windowCenterLabel.position.clone().add(normal.clone().negate()));
                         //windowCenterLabel.name = windows[i].uuid ? `${windows[i].uuid}_windowLabel` : `windowLabel-${i}`;
                         this.groupedMesh.add(windowCenterLabel);

package/lib/types.d.ts

@@ -29,6 +29,19 @@ export interface ITag {
     category_uuid?: string;
     uuid?: string;
     media_url?: string;
+    tag_type?: TAG_TYPE;
+    sandboxId?: string;
+    iot_tag?: IoTTagDetails;
+    created_on?: string;
+}
+export interface IoTTagDetails {
+    linked_system?: string;
+    serial_number?: string;
+    manufacturer_site?: string;
+    system_link?: string;
+    iot_category?: string;
+    linked_devices?: DeviceInfo[];
+    model_name?: string;
     created_on?: string;
 }
 export interface ITagCategory {
@@ -752,6 +765,12 @@ export declare enum SPACE_EVENTS {
     CUSTOM_SWEEP_OFFSETY_UPDATED = "CUSTOM_SWEEP_OFFSETY_UPDATED",
     CUSTOM_MAP_SETTINGS_UPDATED = "CUSTOM_MAP_SETTINGS_UPDATED",
     SPACE_METADATA_RETRIEVED = "SPACE_METADATA_RETRIEVED",
+    GET_IOT_CATEGORIES = "GET_IOT_CATEGORIES",
+    GET_IOT_DEVICES = "GET_IOT_DEVICES",
+    IOT_TAG_SAVED = "IOT_TAG_SAVED",
+    TAG_SANDBOX_REGISTERED = "TAG_SANDBOX_REGISTERED",
+    GET_IOT_TAG_ICON = "GET_IOT_TAG_ICON",
+    GET_IOT_CAT_ICON = "GET_IOT_CAT_ICON",
     SCREEN_VIEWING_LEFT = "SCREEN_VIEWING_LEFT",
     POINTER_INTERSECTION_DATA = "POINTER_INTERSECTION_DATA",
     POINTER_CLICK = "POINTER_CLICK",
@@ -793,6 +812,7 @@ export declare const enum TAG_COLOR {
     YELLOW_GREEN = "YELLOW_GREEN",
     GREEN = "GREEN",
     LIGHT_BLUE = "LIGHT_BLUE",
+    SOFT_ROYAL_BLUE = "SOFT_ROYAL_BLUE",
     BLUE = "BLUE",
     DARK_BLUE = "DARK_BLUE",
     PURPLE = "PURPLE",
@@ -810,7 +830,8 @@ export declare const enum TAG_COLOR {
     LIGHT_ORANGE = "LIGHT_ORANGE",
     RED_ORANGE = "RED_ORANGE",
     LIGHT_GREY = "LIGHT_GREY",
-    GREY = "GREY"
+    GREY = "GREY",
+    YELLOW_ORANGE = "YELLO_ORANGE"
 }
 export declare enum MEETING_SIDEBAR {
     PREMEETING = "PREMEETING",
@@ -944,6 +965,10 @@ export interface IToolbarConfig {
         roomCreation?: boolean;
         bim?: boolean;
         generalSetting?: boolean;
+        iot?: {
+            visible?: boolean;
+            showIoTTags?: boolean;
+        };
         spaceScreenSharing?: boolean;
     };
     themeConfig?: IThemeConfig;
@@ -1289,6 +1314,16 @@ export interface SpaceMetadata {
             custom_floor_data?: CustomMapFloorData[] | null;
         };
     };
+    iot_tag?: {
+        linked_system: string;
+        serial_number: string;
+        manufacturer_site: string;
+        system_link?: string;
+        iot_category: string;
+        model_name: string;
+        linked_devices: [] | null;
+        tag_type: TAG_TYPE.IOT;
+    };
 }
 export interface CustomMapFloorData {
     floor_sequence: number;
@@ -1357,6 +1392,16 @@ export interface SpaceMetadata {
             custom_floor_data?: CustomMapFloorData[] | null;
         };
     };
+    iot_tag?: {
+        linked_system: string;
+        serial_number: string;
+        manufacturer_site: string;
+        system_link?: string;
+        iot_category: string;
+        model_name: string;
+        linked_devices: [] | null;
+        tag_type: TAG_TYPE.IOT;
+    };
 }
 export interface PathConfig {
     lineType: string;
@@ -1394,6 +1439,35 @@ export declare enum MAP_OPTIONS {
     DEFAULT_MAP = "Default Minimap",
     CUSTOM_MAP = "Custom Minimap"
 }
+export declare enum IOT_LINKED_SYSTEMS {
+    BEMAC = "BEMAC",
+    HANASYS = "HANASYS",
+    URL_LINK = "URLLink"
+}
+export interface ITagIOTCategory {
+    name: string;
+    uuid: string;
+    json_data?: {
+        icon: string;
+        iconURL: string;
+        iconBase64: string;
+    };
+}
+export declare enum TAG_TYPE {
+    MP = "MP",
+    IOT = "IoT"
+}
+export interface DeviceInfo {
+    id?: string;
+    ship_id?: string;
+    iot_system?: string;
+    name: string;
+    type?: string;
+    status?: 'online' | 'offline' | 'stale';
+    quality?: number;
+    last_update?: string;
+    data?: Record<string, any>;
+}
 export declare enum ONLINE_STATUS {
     ONLINE = "ONLINE",
     OFFLINE = "OFFLINE",

package/lib/types.js

@@ -109,6 +109,12 @@ export var SPACE_EVENTS;
     SPACE_EVENTS["CUSTOM_SWEEP_OFFSETY_UPDATED"] = "CUSTOM_SWEEP_OFFSETY_UPDATED";
     SPACE_EVENTS["CUSTOM_MAP_SETTINGS_UPDATED"] = "CUSTOM_MAP_SETTINGS_UPDATED";
     SPACE_EVENTS["SPACE_METADATA_RETRIEVED"] = "SPACE_METADATA_RETRIEVED";
+    SPACE_EVENTS["GET_IOT_CATEGORIES"] = "GET_IOT_CATEGORIES";
+    SPACE_EVENTS["GET_IOT_DEVICES"] = "GET_IOT_DEVICES";
+    SPACE_EVENTS["IOT_TAG_SAVED"] = "IOT_TAG_SAVED";
+    SPACE_EVENTS["TAG_SANDBOX_REGISTERED"] = "TAG_SANDBOX_REGISTERED";
+    SPACE_EVENTS["GET_IOT_TAG_ICON"] = "GET_IOT_TAG_ICON";
+    SPACE_EVENTS["GET_IOT_CAT_ICON"] = "GET_IOT_CAT_ICON";
     SPACE_EVENTS["SCREEN_VIEWING_LEFT"] = "SCREEN_VIEWING_LEFT";
     SPACE_EVENTS["POINTER_INTERSECTION_DATA"] = "POINTER_INTERSECTION_DATA";
     SPACE_EVENTS["POINTER_CLICK"] = "POINTER_CLICK";
@@ -186,6 +192,17 @@ export var MAP_OPTIONS;
     MAP_OPTIONS["DEFAULT_MAP"] = "Default Minimap";
     MAP_OPTIONS["CUSTOM_MAP"] = "Custom Minimap";
 })(MAP_OPTIONS || (MAP_OPTIONS = {}));
+export var IOT_LINKED_SYSTEMS;
+(function (IOT_LINKED_SYSTEMS) {
+    IOT_LINKED_SYSTEMS["BEMAC"] = "BEMAC";
+    IOT_LINKED_SYSTEMS["HANASYS"] = "HANASYS";
+    IOT_LINKED_SYSTEMS["URL_LINK"] = "URLLink";
+})(IOT_LINKED_SYSTEMS || (IOT_LINKED_SYSTEMS = {}));
+export var TAG_TYPE;
+(function (TAG_TYPE) {
+    TAG_TYPE["MP"] = "MP";
+    TAG_TYPE["IOT"] = "IoT";
+})(TAG_TYPE || (TAG_TYPE = {}));
 export var ONLINE_STATUS;
 (function (ONLINE_STATUS) {
     ONLINE_STATUS["ONLINE"] = "ONLINE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "architwin",
-  "version": "1.14.15",
+  "version": "1.15.0",
   "description": "ArchiTwin Library for Matterport",
   "main": "./lib/architwin.js",
   "types": "./lib/architwin.d.ts",

package/static/atwinui.css

@@ -413,6 +413,19 @@
     text-align: center;
 }
 
+/* Smaller version for inline use */
+.at_button--small {
+    font-size: 0.8em;
+    padding: 2px 0.6em;
+    line-height: 1.2em;
+    max-height: 1.8em;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 4px;
+    
+}
+
 .at_button_icon {
     padding: 2px 8px;
     cursor: pointer;
@@ -470,7 +483,23 @@
     position: absolute;
     z-index: 99;
     top: 10px;
-    right: 55px;
+    right: 75px;
+}
+
+.at_button_search{
+    cursor: pointer;
+    position: absolute;
+    z-index: 99;
+    top: 10px;
+    right: 12px;
+}
+
+.at_search_icon{
+    cursor: pointer;
+    position: absolute;
+    z-index: 98;
+    top: 10px;
+    right: 12px;
 }
 
 .at_justify_start {
@@ -740,8 +769,8 @@
     margin-top: 1px;
     margin-left: 4px;
     height: 2.45rem;
-    width: 9rem;
-    /* width: 11.75rem */
+    /* width: 9rem; */
+    width: 13rem
 }
 
 .at_field_search_input:focus {
@@ -1335,7 +1364,7 @@
     background-color: black;
     border: solid white 2px;
     font-size: smaller;
-    padding: 6px 0.8em 4px;
+    padding: 4px 0.8em 4px;
     border-radius: 8px;
     min-height: 31.3px;
     align-items: center;
@@ -2163,7 +2192,6 @@ dialog#at-screen-share-request-modal::backdrop {
     background-color: var(--bg-accent) !important;
 }
 
-
 /* Generic Elements */
 
 .at_section {
@@ -2420,7 +2448,40 @@ dialog#at-screen-share-request-modal::backdrop {
 }
 
 .at_partition_floor_row_item {
-    cursor: pointer;
+     cursor: pointer;
+}
+
+.at_section_title {
+    display: var(--container-display);
+    background-color: hsla(0,0%,19%,1);
+    border-radius: 4px;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+    font-size: 16px;
+    font-weight: normal;
+    font-family: Arial, sans-serif;
+    padding-left: 2px;
+    padding-right: 18px;
+}
+
+
+/* IOT */
+
+.at_iot_item_container {
+    display: var(--container-display);
+    flex-direction: column;
+    gap: 4px;
+    margin-bottom: 0.5rem;
+}
+
+.at_iot_list_container {
+    display: var(--container-display);
+    border-radius: var(--border-radius);
+    background-color: black;
+    flex-direction: column;
+    padding: 8px 6px 8px 6px;
+    min-height: 22rem;
 }
 
 .at_partition_child_expand_icon {
@@ -2442,4 +2503,24 @@ li.at_partition_wall_row_item {
 
 .at_wall_window_row_item.selected {
     padding-left: 5px;
-}
+}
+
+.at_save_button {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    height: 20px; /* match input height */
+    padding: 0 6px; /* enough for 保存 */
+    font-size: 10px;
+    line-height: 1; /* prevent vertical text overflow */
+    white-space: nowrap; /* keep 保存 on one line */
+    color: white;
+    border: 1px solid white;
+    border-radius: 4px;
+    background: none;
+    font-family: Arial, sans-serif;
+    transition: all 0.2s ease;
+    margin-left: 4px;
+    box-sizing: border-box;
+}