@vitrosoftware/common-ui-ts 1.1.260 → 1.1.261

package/dist/src/controls/BimViewer/services/BimViewerService.d.ts

@@ -18,6 +18,7 @@ export interface BimViewerService {
     currentVersionTooltipText?: string;
     notCurrentVersionTooltipText?: string;
     showItemSelectDialog: () => Promise<string[]>;
+    saveCoordinationModel: () => Promise<any>;
     listConfig: ListConfig;
     searchId: string;
     parentId: string;
@@ -27,11 +28,4 @@ export interface BimViewerService {
     container: any;
     getSettingsFromLocalStorage: () => any;
     setSettingsToLocalStorage: (settings: string) => void;
-    showFileSaveDialog: (listId: string, extensionList?: {
-        name?: string;
-        code: string;
-    }[], defaultName?: string) => Promise<{
-        destFolderId: string;
-        name: string;
-    }>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.260",
+    "version": "1.1.261",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",

package/src/controls/BimViewer/js/bim-viewer-models.js

@@ -677,10 +677,10 @@ class VitroModel {
         });
     },
 
-    GetText3DList: function (callback, error, async = true) {
+    GetText3DList: function (vitroModel, callback, error, async = true) {
         var paramObj = {};
 
-        paramObj.modelList = BIMCommon.GetModelList(BIMCommon.ModelList);
+        paramObj.modelList = BIMCommon.GetModelList([vitroModel]);
 
         var webRelativeUrl = BIMCommon.CreateWebServerUrl();
         $.ajax({

package/src/controls/BimViewer/js/bim-viewer.js

@@ -1,11 +1,11 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.260';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.261';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
     GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers, buildVectorTextGeometry
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.260';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.261';
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -1044,7 +1044,7 @@ xktLoader.globalizeObjectIds = false; // For multiple models in TreeView
 //------------------------------------------------------------------------------------------------------------------
 function doLoadModel(viewer, xktLoader, srcModel, isMain, isLoadAnnotation) {
     const model = xktLoader.load({
-        id: Date.now(),
+        id: crypto.randomUUID(),
         src: srcModel.FilePath,
         edges: true,
         backfaces: true,
@@ -1066,8 +1066,7 @@ function doLoadModel(viewer, xktLoader, srcModel, isMain, isLoadAnnotation) {
 
             model.vitroModelLoader.largeModel = model;
             model.vitroModelLoader.startSmallLoad = true;
-
-            load3DText(model);
+            model.ModelList = BIMCommon.ModelList;
 
             $('#btnToggleSectionPlan').addClass('toggled');
         }
@@ -1075,6 +1074,8 @@ function doLoadModel(viewer, xktLoader, srcModel, isMain, isLoadAnnotation) {
             viewer.scene.fire("reloadSmallScenes");
         }
 
+        load3DText(model);
+
         //------------------------------------------------------------------------------------------------------------------
         // Create some Annotations
         //------------------------------------------------------------------------------------------------------------------
@@ -1097,6 +1098,7 @@ function doLoadModel(viewer, xktLoader, srcModel, isMain, isLoadAnnotation) {
 
 function load3DText(model) {
     BIMModel.GetText3DList(
+        model.vitroModel,
         (data) => {
             var entityList = [];
 
@@ -1238,6 +1240,7 @@ viewer.on('vitroCompareStatus', (status) => {
     // setDisplay('btnSaveBCFViewpointJSON', style_Display);
     // setDisplay('btnLoadBCFViewpointJSON', style_Display);
     setStyleDisplay('btnAddModel', style_Display);
+    setStyleDisplay('btnSaveCoordinationModel', style_Display);
 
     if (status) {
         delContextMenu(viewer);
@@ -3440,30 +3443,85 @@ function bindBtnAddModel() {
             isModelSelectInProgress = true;
             context.showItemSelectDialog().then(itemIdList => {
                 itemIdList.forEach(itemId => {
-                    BIMCommon.GetFileItem(itemId, undefined, function (modelId) {
-                        context.getItem(modelId).then(itemAttach => {
+                    addModel(itemId);
+                });
 
-                            context.getItem(itemId).then(item => {
-                                context.addItem(item);
-                            });
+            }).finally(() => isModelSelectInProgress = false);
+        }
+    });
+}
 
-                            const filePath = context.getFilePath(itemAttach.id);
-                            const fileName = context.file.fieldValueMap?.name;
-                            const model = new BIMCommon.VitroModel(itemId, undefined, filePath, fileName);
+function IsCoordinationModel(item) {
 
-                            BIMCommon.ModelList.push(model);
+    if (item && item.fieldValueMap && item.fieldValueMap.name) {
+        const ext = item.fieldValueMap.name.split('.').pop().toLowerCase();
 
-                        const sceneModel = doLoadModel(viewer, xktLoader, model, false, false);
-                            addToTreeView(model, sceneModel.id);
+        return ext === 'vcm';
+    }
 
-                            $('#btnToggleCompare').hide();
-                        });
+    return false
+}
 
-                    }, function () {
-                        alert("The file is being processed");
-                    });
-                });
-            }).finally(() => isModelSelectInProgress = false);
+function loadItem(item, versionStr, callback) {
+    if (IsCoordinationModel(item)) {
+        context.getReferenceItemList(item.id).then(referenceItemList => {
+            referenceItemList.forEach(refItem => {
+                loadItem(refItem, versionStr, callback);
+            });
+        });
+    }
+    else {
+        loadItemModel(item, versionStr, callback);
+    }
+}
+
+function loadItemModel(item, versionStr, callback) {
+    if (!item) {
+        return;
+    }
+
+    const fileName = item.fieldValueMap?.name;
+
+    BIMCommon.GetFileItem(item.id, versionStr, function (modelId) {
+        context.getItem(modelId).then(itemAttach => {
+            const filePath = context.getFilePath(itemAttach.id);
+            const model = new BIMCommon.VitroModel(item.id, versionStr, filePath, fileName);
+            const isFirstModel = BIMCommon.ModelList.length === 0;
+
+            BIMCommon.ModelList.push(model);
+
+            if (!isFirstModel) {
+                $('#btnToggleCompare').hide();
+                $('#btnSaveCoordinationModel').show();
+            }
+
+            const sceneModel = doLoadModel(viewer, xktLoader, model, isFirstModel, isFirstModel);
+            addToTreeView(model, sceneModel.id);
+
+            if (callback) {
+                callback(sceneModel);
+            }
+        });
+
+    }, function () {
+        alert("The file " + fileName +" is being processed");
+    });
+}
+
+function addModel(itemId)
+{
+    context.getItem(itemId).then((item => {
+        loadItem(item, undefined, undefined);
+        context.addItem(item);
+        $('#btnToggleCompare').show();
+    }));
+}
+
+function bindSaveCoordinationModel() {
+    $(document).on('click', '#btnSaveCoordinationModel', function () {
+        if (!isModelSelectInProgress) {
+            isModelSelectInProgress = true;
+            context.saveCoordinationModel().finally(() => isModelSelectInProgress = false);
         }
     });
 }
@@ -4150,7 +4208,12 @@ function bindCompareDlgDcoBVersionChange() {
 }
 
 function initVersionSelectValues() {
-    let version = context.fileVersionList.find(item => item.id == context.versionId);
+    const version = context.fileVersionList.find(item => item.id == context.versionId);
+
+    if (!version || !version?.name) {
+        return;
+    }
+
     let currentVersion = `v${version.name}`;
     if (currentVersion != $('#docAVersion').val()) {
         $('#docAVersion').val(currentVersion);
@@ -5176,34 +5239,25 @@ viewer.cameraControl.on("picked", (pickResult) => {
 
 //------------------------------------------------------------------------------------------------------------------
 
-window.viewer = viewer;
 
 let version = context.fileVersionList.find(x => x.id === context.versionId);
 let versionStr = version ? version.name : null;
 
-BIMCommon.GetFileItem(context.file.id, versionStr, function (modelId) {
-
-    context.getItem(modelId).then(item => {
-        var filePath = context.getFilePath(item.id);
-        var fileName = context.file.fieldValueMap?.name;
-
-        document.title += " - " + fileName;
-        //fileVersion = '';
-        //fileVersionPath = filePath;
-        hideXeokitSpinner();
+window.viewer = viewer;
 
-        const model = new BIMCommon.VitroModel(context.file.id, versionStr, filePath, fileName);
+const callback = (model) => {
+    hideXeokitSpinner();
 
-        BIMCommon.ModelList.push(model);
+    if (!window.model) {
+        window.model = model;
+    }
+}
 
-        window.model = doLoadModel(viewer, xktLoader, model, true, true);
-        window.model.ModelList = BIMCommon.ModelList;
+var fileName = context.file.fieldValueMap?.name;
 
-    })
-    
-}, function () {
-    alert("The file is being processed");
-});
+document.title += " - " + fileName;
+loadItem(context.file, versionStr, callback);
+context.addItem(context.file);
 
 var userLocale =
     navigator.languages && navigator.languages.length
@@ -5255,6 +5309,7 @@ function init() {
     bindBtnClearComparison();
 
     bindBtnAddModel();
+    bindSaveCoordinationModel();
 
     initCompare();
     bindSelectList();

package/src/controls/DxfViewer/js/dxf-viewer.js

@@ -1,18 +1,18 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.260';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.260';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.260';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.260';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.260';
-import { DxfScene, Entity, ColorCode, PdMode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.260';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.260';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.260';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.260';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.260';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.260';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.260';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.260';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.260';
-import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.260'
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.261';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.261';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.261';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.261';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.261';
+import { DxfScene, Entity, ColorCode, PdMode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.261';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.261';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.261';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.261';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.261';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.261';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.261';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.261';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.261';
+import * as fflate from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.261'
 
 let treeViewData = [];
 let notes = [];

package/src/controls/PdfViewer/js/pdf-viewer.js

@@ -21208,7 +21208,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.260",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.261",
     kind: OptionKind.WORKER
   }
 };