@xtctwins/tctwins-industry-engine 0.1.1 → 0.1.2

package/dist/{tallPanel-fxMO0U73.mjs → tallPanel-_IjvX2X6.mjs}

@@ -1,10 +1,10 @@
-import { G as g, H as t, T as r, Q as y, R as x, L as S, M as b } from "./index-DoJj-LVm.mjs";
-import { defineComponent as k, ref as c, onMounted as P, watch as W, openBlock as _, createElementBlock as f, normalizeStyle as w, createElementVNode as o, toDisplayString as C, createVNode as T, unref as h, renderSlot as N, createCommentVNode as E } from "vue";
+import { G as g, H as t, T as r, Q as y, R as x, L as S, M as k } from "./index-B1oouGms.mjs";
+import { defineComponent as P, ref as c, onMounted as W, watch as b, openBlock as _, createElementBlock as f, normalizeStyle as w, createElementVNode as o, toDisplayString as C, createVNode as T, unref as h, renderSlot as N, createCommentVNode as E } from "vue";
 const H = { class: "tall_panel_content" }, $ = { class: "panel_top" }, B = { class: "panel_title" }, L = { class: "panel_close" }, M = { class: "panel_content" }, V = {
   key: 0,
   class: "width-set",
   id: "lineWidthSet"
-}, X = /* @__PURE__ */ k({
+}, X = /* @__PURE__ */ P({
   __name: "tallPanel",
   props: {
     panelTitle: {
@@ -31,7 +31,7 @@ const H = { class: "tall_panel_content" }, $ = { class: "panel_top" }, B = { cla
   },
   setup(a) {
     const m = g(), i = a, n = c(), l = c(i.width);
-    P(() => {
+    W(() => {
       i.pos == "left" && (n.value.style.left = `${0 + t("leftWidth")}px`), i.pos == "right" && (n.value.style.right = `${0 + t("rightWidth")}px`), n.value.style.top = `${0 + t("topHeight")}px`, n.value.style.bottom = `${0 + t("bottomHeight")}px`;
     });
     let d, p = 0, u = 0;
@@ -42,7 +42,7 @@ const H = { class: "tall_panel_content" }, $ = { class: "panel_top" }, B = { cla
       d && (u = e.x - p, p = e.x, l.value += u, l.value < 286 && (l.value = 286), r.setProperty("--left-toggle-left", (14 + l.value).toString() + "px"));
     }), document.addEventListener("mouseup", (e) => {
       d = !1;
-    }), W(
+    }), b(
       () => m.isToolActive(0),
       (e) => {
         t("navCubePos").pos.includes(t("treePos")) && y("navCubePos", { pos: t("navCubePos").pos, posNum: x(e, 286) }), r.setProperty("--left-toggle-left", e ? (14 + l.value).toString() + "px" : "14px");
@@ -78,7 +78,7 @@ const H = { class: "tall_panel_content" }, $ = { class: "panel_top" }, B = { cla
       ], 4);
     };
   }
-}), D = /* @__PURE__ */ b(X, [["__scopeId", "data-v-3e2b56c6"]]);
+}), D = /* @__PURE__ */ k(X, [["__scopeId", "data-v-dc9568d4"]]);
 export {
   D as _
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xtctwins/tctwins-industry-engine",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"main": "dist/Industry_Viewer_Lib.umd.js",
 	"style": "dist/style.css",
 	"module": "dist/Industry_Viewer_Lib.es.js",

package/types/App.vue.d.ts

@@ -1,4 +1,2 @@
-declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {
-    fileInputRef: HTMLInputElement;
-}, any>;
+declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/types/components/IndustryViewerComp.vue.d.ts

@@ -14,6 +14,8 @@ type __VLS_Props = {
     modelOptions?: Record<string, any>[];
     loadSequential?: boolean;
     loadInterval?: number;
+    /** 是否显示模型加载遮罩（网络获取 / 模型加载）。默认 false，不显示 */
+    showModelLoading?: boolean;
 };
 declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     emitHandler: (...args: any[]) => void;

package/types/i18n/index.d.ts

@@ -2,6 +2,10 @@ export type Locale = "zh-CN" | "en-US";
 export declare const messages: {
     "zh-CN": {
         industryViewer: {
+            modelLoading: {
+                network: string;
+                model: string;
+            };
             common: {
                 confirm: string;
                 cancel: string;
@@ -442,6 +446,10 @@ export declare const messages: {
     };
     "en-US": {
         industryViewer: {
+            modelLoading: {
+                network: string;
+                model: string;
+            };
             common: {
                 confirm: string;
                 cancel: string;
@@ -888,6 +896,10 @@ export declare const defaultI18nConfig: {
     messages: {
         "zh-CN": {
             industryViewer: {
+                modelLoading: {
+                    network: string;
+                    model: string;
+                };
                 common: {
                     confirm: string;
                     cancel: string;
@@ -1328,6 +1340,10 @@ export declare const defaultI18nConfig: {
         };
         "en-US": {
             industryViewer: {
+                modelLoading: {
+                    network: string;
+                    model: string;
+                };
                 common: {
                     confirm: string;
                     cancel: string;

package/types/i18n/locales/en-US.d.ts

@@ -1,5 +1,9 @@
 declare const _default: {
     industryViewer: {
+        modelLoading: {
+            network: string;
+            model: string;
+        };
         common: {
             confirm: string;
             cancel: string;

package/types/i18n/locales/zh-CN.d.ts

@@ -1,5 +1,9 @@
 declare const _default: {
     industryViewer: {
+        modelLoading: {
+            network: string;
+            model: string;
+        };
         common: {
             confirm: string;
             cancel: string;

package/types/pages/IndustryViewerEntry.vue.d.ts

@@ -1,5 +1,5 @@
 import { InstructionContent } from '../utils/eventBus';
-import { NavCubePos, TallPanelPos, ThemeColor, Offset, ToolPos, EditPrivilege } from '../store/initConfigs';
+import { TallPanelPos, ThemeColor, Offset, ToolPos, EditPrivilege, NavCubePosNum } from '../store/initConfigs';
 import { BcfContent } from '../store/bcfReflect';
 import { UserInfo } from '../store/userInfoStore';
 import { Locale } from '../i18n';
@@ -16,6 +16,8 @@ type __VLS_Props = {
     modelIds?: string[];
     loadSequential?: boolean;
     loadInterval?: number;
+    /** 是否显示模型加载遮罩（网络获取 / 模型加载）。默认 false，不显示 */
+    showModelLoading?: boolean;
     themeColor?: ThemeColor;
     topHeight?: number;
     bottomHeight?: number;
@@ -26,7 +28,7 @@ type __VLS_Props = {
     commentPos?: ToolPos;
     annotationPos?: ToolPos;
     roamPos?: ToolPos;
-    navCubePos?: NavCubePos;
+    navCubePos?: NavCubePosNum;
     navCubeSize?: number;
     skyboxImg?: HTMLImageElement;
     commentOffset?: Offset;

package/types/viewerManager/load/loadModel.d.ts

@@ -58,8 +58,12 @@ export interface ModelLoaderConfig {
  * @param options 附加加载参数，透传给接口层 BIMXViewer.loadModel 的 cfg：
  *                - brightness: 该模型的颜色亮度系数（1.0 原始，>1 提亮，<1 变暗），如 { brightness: 1.5 }
  *                - position / rotation / scale / origin / alignTo: 多模型坐标对齐参数
+ * @param onEngineLoadStart 引擎真正开始载入模型（调用 window.bimViewer.loadModel）时触发，
+ *   供组件层把 loading 文案从「网络获取」切换到「模型加载」。
+ *   可返回 Promise：引擎会先 await（组件层用 requestAnimationFrame 等真实绘制）
+ *   再进入会阻塞主线程的 loadModel，确保「模型加载中」文案已上屏。
  */
-export default function viewerLoadModel(modelId: string, modelType: string, modelArrayBuffer: ArrayBuffer, callback?: Function, options?: Record<string, any>): void;
+export default function viewerLoadModel(modelId: string, modelType: string, modelArrayBuffer: ArrayBuffer, callback?: Function, options?: Record<string, any>, onEngineLoadStart?: () => void | Promise<void>): Promise<void>;
 /**
  * 模型加载器：统一封装「下载 -> 引擎加载 -> meta 加载」。
  *
@@ -92,15 +96,28 @@ export declare class ModelLoader {
     private fetch;
     /** 模型主体下载路径：http 直接用原地址；OSS 补上 .xtc 等类型后缀 */
     private downloadModelPath;
-    /** 加载单个已就绪 buffer 的模型到引擎，模型成功后自动处理 meta */
-    loadSingle(modelId: string, buffer: ArrayBuffer, metaBuffer?: ArrayBuffer, options?: Record<string, any>): Promise<ModelLoadResult>;
+    /**
+     * 加载单个已就绪 buffer 的模型到引擎，模型成功后自动处理 meta。
+     *
+     * @param waitModelLoaded 为 true 时，Promise 会等到引擎真正抛出 modelLoaded 事件
+     *   （模型解析并渲染完成）后才 resolve，供组件层精确控制 loading 遮罩的结束时机；
+     *   为 false（默认）时保持旧行为，引擎 loadModel 回调即 resolve。
+     * @param onEngineLoadStart 引擎真正开始载入模型（调用 window.bimViewer.loadModel）时触发，
+     *   供组件层把 loading 文案从「网络获取」切换到「模型加载」。可返回 Promise。
+     */
+    loadSingle(modelId: string, buffer: ArrayBuffer, metaBuffer?: ArrayBuffer, options?: Record<string, any>, waitModelLoaded?: boolean, onEngineLoadStart?: () => void | Promise<void>): Promise<ModelLoadResult>;
     /** 引擎模型加载成功后处理 meta：可用则立即加载，否则挂起等 setMetaBuffer */
     private handleMetaAfterModelLoad;
     private loadMetadata;
     /** 绑定引擎 meta 事件（只绑一次），转发给 emit */
     private bindMetaEvents;
-    /** 按路径加载单个模型：并发下载 model + meta，下载完再引擎加载；下载失败不抛异常 */
-    loadFromPath(modelId: string, filePath: string, options?: Record<string, any>): Promise<ModelLoadResult | undefined>;
+    /**
+     * 按路径加载单个模型：并发下载 model + meta，下载完再引擎加载；下载失败不抛异常。
+     *
+     * @param onDownloaded 下载完成（即将进入引擎加载）时触发。
+     * @param onEngineLoadStart 引擎真正开始载入模型（调用 window.bimViewer.loadModel）时触发。可返回 Promise。
+     */
+    loadFromPath(modelId: string, filePath: string, options?: Record<string, any>, waitModelLoaded?: boolean, onDownloaded?: () => void, onEngineLoadStart?: () => void | Promise<void>): Promise<ModelLoadResult | undefined>;
     /** 下载 meta（.xts）；失败不阻断主流程 */
     private downloadMeta;
     /** 准备单个模型：并发下载 model + meta，返回可直接加载的数据；下载失败 buffer 为空（不抛异常） */
@@ -114,8 +131,13 @@ export declare class ModelLoader {
      *   这样下载与解析天然重叠，是引擎下最快的加载方式。
      *
      * loadInterval 仅作为可选的发起节流（默认 0 不节流）。
+     *
+     * @param waitModelLoaded 为 true 时，每个模型都等到引擎 modelLoaded 事件后才算完成，
+     *   供组件层精确控制 loading 遮罩的结束时机。
+     * @param onEngineLoadStart 引擎真正开始载入模型（调用 window.bimViewer.loadModel）时触发，
+     *   供组件层把 loading 文案从「网络获取」切换到「模型加载」。可返回 Promise。
      */
-    loadMulti(items: ModelLoadItem[]): Promise<ModelLoadResult[]>;
+    loadMulti(items: ModelLoadItem[], waitModelLoaded?: boolean, onEngineLoadStart?: () => void | Promise<void>): Promise<ModelLoadResult[]>;
     /** 延迟指定毫秒数 */
     private sleep;
 }