@vitrosoftware/common-ui-ts 1.1.214 → 1.1.216

package/dist/src/controls/TableView/TableViewConstants.d.ts

@@ -60,7 +60,8 @@ export declare enum EVENT {
     ON_GET_TYPE = "OnGetType",
     ON_BUTTON_CLICK = "OnButtonClick",
     ON_AFTER_COL_RESIZE = "OnAfterColResize",
-    ON_EXPORT = "OnExport"
+    ON_EXPORT = "OnExport",
+    ON_AFTER_SECTION_RESIZE = "OnAfterSectionResize"
 }
 export declare enum CFG_ATTRIBUTE {
     SELECTING_SINGLE = "SelectingSingle",
@@ -76,7 +77,9 @@ export declare enum CFG_ATTRIBUTE {
     CONST_WIDTH = "ConstWidth",
     CALCULATED_CHANGES = "CalculatedChanges",
     CUSTOM_SCROLL = "CustomScroll",
-    SHOW_V_SCROLL = "ShowVScroll"
+    SHOW_V_SCROLL = "ShowVScroll",
+    MID_WIDTH = "MidWidth",
+    RIGHT_WIDTH = "RightWidth"
 }
 export declare enum URL {
     LAYOUT = "Layout",

package/dist/src/services/ColumnService.d.ts

@@ -1,9 +1,10 @@
+import type { ListConfig } from '../models/ListConfig';
 export interface ColumnService {
-    getSystemList(): {
+    getSystemList(listConfig: ListConfig): {
         internalName: string;
         name: string;
         component: string;
     }[];
-    getName(internalName: string): string;
+    getName(internalName: string, listConfig: ListConfig): string;
     isSystemUserLookupPicker(internalName: string): boolean;
 }

package/package.json

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

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.214';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.216';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
     GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.214';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.216';
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -4018,8 +4018,8 @@ function onPaneRightResizeHandler(width) {
 }
 
 function onIssueDetailResizeEndHandler(event, ui) {
-    $('#propInspector').width(ui.size.width).css('left', getPaneRightPosition(ui.size.width) + 'px');
-    $('#sidebarWrap').width(ui.size.width).css('left', getPaneRightPosition(ui.size.width) + 'px');
+    $('#propInspector').width(ui.size.width);
+    $('#sidebarWrap').width(ui.size.width);
     setPaneRightSettings(ui.size.width);
 }
 
@@ -4051,8 +4051,8 @@ function onPropsInspectorResizeHandler(width) {
 };
 
 function onPropsInspectorResizeEndHandler(event, ui) {
-    $('#issueDetail').width(ui.size.width).css('left', getPaneRightPosition(ui.size.width) + 'px');
-    $('#sidebarWrap').width(ui.size.width).css('left', getPaneRightPosition(ui.size.width) + 'px');
+    $('#issueDetail').width(ui.size.width);
+    $('#sidebarWrap').width(ui.size.width);
     setPaneRightSettings(ui.size.width);
 }
 
@@ -4065,8 +4065,8 @@ function onIssueListResizeHandler(width) {
 }
 
 function onIssueListResizeEndHandler(event, ui) {
-    $('#issueDetail').width(ui.size.width).css('left', getPaneRightPosition(ui.size.width) + 'px');
-    $('#propInspector').width(ui.size.width).css('left', getPaneRightPosition(ui.size.width) + 'px');
+    $('#issueDetail').width(ui.size.width);
+    $('#propInspector').width(ui.size.width);
     setPaneRightSettings(ui.size.width);
 }
 

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

@@ -1,17 +1,17 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.214';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.214';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.214';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.214';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.214';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.214';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.214';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.214';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.214';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.214';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.214';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.214';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.214';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.214';
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.216';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.216';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.216';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.216';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.216';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.216';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.216';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.216';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.216';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.216';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.216';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.216';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.216';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.216';
 
 let treeViewData = [];
 let notes = [];
@@ -3303,8 +3303,6 @@ function emit(eventName, event) {
         createThumbnail(event.detail.space.layout.name, window.dxfViewer.GetSpace());
         initNotesBySpaceHandle(spaceHandle);
         initLayers();
-        window.dxfViewer.controls.minZoom = 0.1;
-        window.dxfViewer.controls.maxZoom = 10;
     }
     else if (eventName == 'dxf-drawableCreated') {
         const detail = event.detail;

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.214",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.216",
     kind: OptionKind.WORKER
   }
 };
@@ -25746,6 +25746,9 @@ class PDFSidebar {
   getWidth(){
       return this.#width;
   }
+  mouseUp(evt) {
+      this.#mouseUp(evt);
+  }
 }
 exports.PDFSidebar = PDFSidebar;
 
@@ -37561,9 +37564,6 @@ function initCompare() {
     }
     $('#docAPage').val(1);
     $('#docBPage').val(1);
-
-
-    bindPageSelect();
 }
 
 function getLoadedVersionId() {
@@ -37706,24 +37706,6 @@ function createComparePanel(compareObjList) {
     return wrap;
 }
 
-function bindPageSelect() {
-    $(document).on('webViewerPageRendered', function (e, pageNr) {
-        $('#docAPageList').html(null);
-        $('#docBPageList').html(null);
-        let pageCount = getPdfPageCount();
-        for (var i = 1; i <= pageCount; i++) {
-            $('#docAPageList').append($('<li>', {
-                value: i,
-                text: i,
-            }));
-            $('#docBPageList').append($('<li>', {
-                value: i,
-                text: i,
-            }));
-        }
-    });
-}
-
 function bindBtnDoCompare() {
     $('#btnDoCompare').click(function () {
         if ($(this).hasClass('disabled')) {
@@ -38583,7 +38565,8 @@ function initNotes() {
         });
         const pageLoaded = $('.page[data-loaded="true"]');
         pageLoaded?.each((index, item) => {
-            if (!renderedPageList.includes(item.attr('data-page-number'))) {
+            const pageNr = $(item).attr('data-page-number');
+            if (!renderedPageList.includes(pageNr)) {
                 initMarkupByPageNr(pageNr);
             }
         });
@@ -38611,6 +38594,7 @@ function initPaneWidth() {
         }, 50);
     }
     initItemChangedEventListener();
+    bindOnSidebarToggle();
 }
 
 function setWidthPaneLeft(width) {
@@ -38631,11 +38615,9 @@ function onResizeEndPaneRightHandler(event, ui) {
     setSettings(settings);
     if (ui.element.hasClass('body__sidebar')) {
         setWidthSidebarIssueDetail(ui.size.width);
-        $('.vitro-issue-detail').css('left', $('#viewerContainer').width() + 'px'); 
     }
     if (ui.element.hasClass('vitro-issue-detail')) {
         setWidthSidebarIssueList(ui.size.width);
-        $('.body__sidebar').css('left', $('#viewerContainer').width() + 'px');
     }
 }
 
@@ -38693,6 +38675,105 @@ function onItemChanged() {
     if (!$('.vitro-issue-detail').resizable('instance')) {
         initResizable($('.vitro-issue-detail'));
     }
+}
+
+function setCompareDlgPageDropdownValues(dropDownId, pageMax, currentPage, docName) {
+    var dropDownElm = $('#' + dropDownId + 'List');
+    dropDownElm.html(null);
+    for (var i = 1; i <= pageMax; i++) {
+        dropDownElm.append($('<li>', {
+            value: i,
+            text: i,
+        }));
+    }
+}
+
+function loadDocAObj(pdfUrl) {
+    var thumbContainer = $('.compare-dlg_doc-a_thumb');
+    var dropDownId = 'docAPage';
+    clearThumbContainer(thumbContainer);
+    if (isComparedDocumentCurrentOpened(pdfUrl)) {
+        pdfDocObjA = PDFViewerApplication.pdfDocument;
+        var currentPage = getCurrentPagePreloadedDocument(dropDownId);
+        updateCompareDlg(dropDownId, currentPage, getPdfPageCount(), compareObjList.docA.name, pdfDocObjA, thumbContainer);
+    } else {
+        var loadingTask = pdfjsLib.getDocument(pdfUrl);
+        loadingTask.promise.then(function (pdf) {
+            pdfDocObjA = pdf;
+            var currentPage = getCurrentPageNotPreloadedDocument(dropDownId, pdf.numPages);
+            updateCompareDlg(dropDownId, currentPage, pdf.numPages, compareObjList.docA.name, pdfDocObjA, thumbContainer);
+        });
+    }
+    checkAllowCompare();
+}
+
+function loadDocBObj(pdfUrl) {
+    var thumbContainer = $('.compare-dlg_doc-b_thumb');
+    var dropDownId = 'docBPage';
+    clearThumbContainer(thumbContainer);
+    if (isComparedDocumentCurrentOpened(pdfUrl)) {
+        pdfDocObjB = PDFViewerApplication.pdfDocument;
+        var currentPage = getCurrentPagePreloadedDocument(dropDownId);
+        updateCompareDlg(dropDownId, currentPage, getPdfPageCount(), compareObjList.docB.name, pdfDocObjB, thumbContainer);
+    } else {
+        var loadingTask = pdfjsLib.getDocument(pdfUrl);
+        loadingTask.promise.then(function (pdf) {
+            pdfDocObjB = pdf;
+            var currentPage = getCurrentPageNotPreloadedDocument(dropDownId, pdf.numPages);
+            updateCompareDlg(dropDownId, currentPage, pdf.numPages, compareObjList.docB.name, pdfDocObjB, thumbContainer);
+        });
+    }
+    checkAllowCompare();
+}
+
+function updateCompareDlg(dropDownId, currentPage, pageCount, docName, pdf, thumbContainer) {
+    $('#' + dropDownId).val(currentPage);
+    setCompareDlgPageDropdownValues(dropDownId, pageCount, currentPage, docName);
+    createThumbnail(pdf, currentPage, thumbContainer);
+}
+
+function getCurrentPagePreloadedDocument(dropDownId) {
+    const inputPage = $('#' + dropDownId).val() ? parseInt($('#' + dropDownId).val()) : false;
+    var currentPage = inputPage && inputPage <= getPdfPageCount() ? inputPage : getCurrentPage();
+    return currentPage;
+}
+
+function getCurrentPageNotPreloadedDocument(dropDownId, pageCount) {
+    var currentPage = $('#' + dropDownId).val() ? parseInt($('#' + dropDownId).val()) : getCurrentPage();
+    if (currentPage > pageCount || !currentPage) {
+        currentPage = pageNrDefault;
+    }
+    return currentPage;
+}
+
+function checkAllowCompare() {
+    if (isNotAllowCompare()) {
+        showComparisonWarning();
+        $('#btnDoCompare').addClass('disabled');
+    }
+}
+
+function bindOnSidebarToggle() {
+    $('#btnToggleSidebarNotes').on('click', function () {
+        if (PDFViewerApplication?.pdfSidebar?.isOpen && isScaleModeRelative()) {
+            setTimeout(function () { PDFViewerApplication.pdfSidebar.mouseUp() }, 100);
+        }
+    });
+    $('.body__sidebar-close').on('click', function () {
+        if (PDFViewerApplication?.pdfSidebar?.isOpen && isScaleModeRelative()) {
+            setTimeout(function () { PDFViewerApplication.pdfSidebar.mouseUp() }, 100);
+        }
+    });
+    $('#sidebarToggle').on('click', function () {
+        if (($('.body__sidebar').is(':visible') || $('.vitro-issue-detail').is(':visible')) && isScaleModeRelative()) {
+            setTimeout(function () { PDFViewerApplication.pdfSidebar.mouseUp() }, 100);
+        }
+    });
+}
+
+function isScaleModeRelative() {
+    const currentScaleMode = PDFViewerApplication.pdfViewer._currentScaleValue;
+    return currentScaleMode == 'page-width' || currentScaleMode == 'page-fit' || currentScaleMode == 'auto';
 }
 $(document).ready(function() {
     context.openFile();