@vitrosoftware/common-ui-ts 1.1.187 → 1.1.188

package/dist/index.js

@@ -63078,7 +63078,7 @@ var Viewer = function Viewer(props) {
 };
 
 var name = "@vitrosoftware/common-ui-ts";
-var version$1 = "1.1.187";
+var version$1 = "1.1.188";
 var description = "vitro software common ui ts";
 var author = "";
 var license = "MIT";

package/package.json

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

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

@@ -1,18 +1,36 @@
+class VitroModel {
+    constructor(itemId, version, filePath, fileName) {
+        this.FileItemId = itemId;
+        this.FileVersion = version;
+        this.FilePath = filePath;
+        this.FileName = fileName;
+    }
+}
 var BIMCommon = BIMCommon ||
 {
-    FileItemId: undefined,
-    FileVersion: undefined,
+    VitroModel: VitroModel,
+
+    ModelList: [],
     FileCompareVersion: undefined,
 
+    GetModelList: function (modelList) {
+        return modelList.map(x => ({
+            ItemId: x.FileItemId,
+            Version: x.FileVersion
+        }));
+    },
+
     GetFileItem: function (itemId, version, callback, error) {
-        var webRelativeUrl = BIMCommon.CreateWebServerUrl();        
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl() +
+            "/bimViewer/api/Model/Get/" + itemId;
+
+        if (version) {
+            webRelativeUrl += "/" + version;
+        }
 
         jQuery.ajax({
             type: "GET",
-            url: webRelativeUrl +
-                "/bimViewer/api/Model/Get/" +
-                itemId + "/" +
-                version,
+            url: webRelativeUrl,
             cache: false,
             contentType: "application/json",
             error: function (jqXHR, textStatus, errorThrown) {
@@ -28,7 +46,7 @@
         });
     },
 
-    GetSmallModel: async function (viewer, version, sceneOptions, signal, callback, error) {        
+    GetSmallModel: async function (viewer, modelList, sceneOptions, signal, callback, error) {        
         function ConvertToInt32(buffer) {
             return new DataView(buffer).getInt32(0, true);
         }
@@ -36,8 +54,7 @@
         var webRelativeUrl = BIMCommon.CreateWebServerUrl();
         var paramObj = {};
 
-        paramObj.itemId = BIMCommon.FileItemId;
-        paramObj.version = version;
+        paramObj.modelList = BIMCommon.GetModelList(modelList);
         paramObj.canvasBoundary = viewer.scene.canvas.boundary;
         paramObj.viewMatrix = Array.from(viewer.camera.viewMatrix);
         paramObj.projMatrix = Array.from(viewer.camera.projMatrix);
@@ -303,12 +320,11 @@
 
 var BIMModel = BIMModel ||
 {
-
     GetParentIdList: function (elementId, recurse, isGeometry, callback, error, async = true) {
 
         var paramObj = {};
-        paramObj.itemId = BIMCommon.FileItemId;
-        paramObj.version = BIMCommon.FileVersion;
+
+        paramObj.modelList = BIMCommon.GetModelList(BIMCommon.ModelList);
         paramObj.elementId = elementId.toString();
 
         var webRelativeUrl = BIMCommon.CreateWebServerUrl();
@@ -337,8 +353,8 @@
 	
     GetPropertyList: function (elementId, callback, error, async = true) {
         var paramObj = {};
-        paramObj.itemId = BIMCommon.FileItemId;
-        paramObj.version = BIMCommon.FileVersion;
+
+        paramObj.modelList = BIMCommon.GetModelList(BIMCommon.ModelList);
         paramObj.elementId = elementId.toString();
          
         var webRelativeUrl = BIMCommon.CreateWebServerUrl();
@@ -368,12 +384,29 @@
     GetChildList: function (elementId, recurse, isGeometry, callback, error, async = true) {
 
         var paramObj = {};
-        paramObj.itemId = BIMCommon.FileItemId;
-        paramObj.version = BIMCommon.FileVersion;
+
+        paramObj.modelList = BIMCommon.GetModelList(BIMCommon.ModelList);
         paramObj.elementId = elementId.toString();
         paramObj.recurse = recurse;
         paramObj.isGeometry = isGeometry;
 
+        BIMModel.GetChildListByParam(paramObj, callback, error, async);
+    },
+
+    GetElementChildList: function (itemId, version, elementId, recurse, isGeometry, callback, error, async = true) {
+
+        var paramObj = {};
+
+        paramObj.itemId = itemId;
+        paramObj.version = version;
+        paramObj.elementId = elementId.toString();
+        paramObj.recurse = recurse;
+        paramObj.isGeometry = isGeometry;
+
+        BIMModel.GetChildListByParam(paramObj, callback, error, async);
+    },
+
+    GetChildListByParam: function (paramObj, callback, error, async = true) {
         var webRelativeUrl = BIMCommon.CreateWebServerUrl();
         $.ajax({
             type: "POST",
@@ -398,11 +431,12 @@
         });
     },
 
+
     GetChildIdList: function (elementId, recurse, isGeometry, callback, error, async = true) {
 
         var paramObj = {};
-        paramObj.itemId = BIMCommon.FileItemId;
-        paramObj.version = BIMCommon.FileVersion;
+
+        paramObj.modelList = BIMCommon.GetModelList(BIMCommon.ModelList);
         paramObj.elementId = elementId.toString();
         paramObj.recurse = recurse;
         paramObj.isGeometry = isGeometry;
@@ -436,8 +470,8 @@
         var webRelativeUrl = BIMCommon.CreateWebServerUrl();
 
         var paramObj = {};
-        paramObj.itemId = BIMCommon.FileItemId;
-        paramObj.version = BIMCommon.FileVersion;
+        paramObj.itemId = BIMCommon.ModelList[0].FileItemId;//todo:
+        paramObj.version = BIMCommon.ModelList[0].FileVersion;
 		paramObj.comparedVersion = BIMCommon.FileCompareVersion;
 
         var jsonString = JSON.stringify(paramObj);