@vitrosoftware/common-ui-ts 1.1.226 → 1.1.228

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.226",
+    "version": "1.1.228",
     "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.226';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.228';
 
 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.226';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.228';
 
 
 //----------------------------------------------------------------------------------------------------------------------

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

@@ -1,17 +1,18 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.226';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.226';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.226';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.226';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.226';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.226';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.226';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.226';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.226';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.226';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.226';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.226';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.226';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.226';
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.228';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.228';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.228';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.228';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.228';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.228';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.228';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.228';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.228';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.228';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.228';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.228';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.228';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.228';
+import { Unzip, UnzipInflate } from '/resource/dxfViewer/js/fflate/fflate.module.js?version=1.1.228'
 
 let treeViewData = [];
 let notes = [];
@@ -2282,6 +2283,11 @@ export class Annotation extends Drawable {
 
 /** Fetches and parses DXF file. */
 export class VitroDxfFetcher extends DxfFetcher {
+    constructor(url, encoding = "utf-8") {
+        super(url, encoding)
+        this.tail = ""
+        this.dxfChunkArray = []
+    }
 
     async SyncFetch() {
         //const response = fetch(this.url)
@@ -2327,6 +2333,11 @@ export class VitroDxfFetcher extends DxfFetcher {
     async Fetch(progressCbk = null) {
         const response = await fetch(this.url)
         const fileName = this._getFileName(response)
+
+        if (fileName.endsWith(".zdxf")) {
+            return await this._processZip(response, progressCbk);
+        }
+
         const totalSize = +response.headers.get('Content-Length')
 
         const reader = response.body.getReader()
@@ -2349,14 +2360,10 @@ export class VitroDxfFetcher extends DxfFetcher {
             }
         }
 
-        if (fileName.endsWith(".zdxf")) {
-            return await this._processZip(buffer, progressCbk);
-        }
-
         return this._decodeAndParse(buffer, progressCbk);
     }
 
-    _decodeAndParse(buffer, progressCbk) {
+    _decodeAndParse(buffer, progressCbk, fetcher = null) {
         const decoder = new TextDecoder('utf-8');
         const parser = new DxfParser();
 
@@ -2364,23 +2371,87 @@ export class VitroDxfFetcher extends DxfFetcher {
             progressCbk("parse", 0, null)
         }
 
-        return parser.parseSync(decoder.decode(buffer));
+        return parser.parseSync(decoder.decode(buffer), fetcher);
     }
 
-    async _processZip(zipBuffer, progressCbk) {
-        const zip = await JSZip.loadAsync(zipBuffer);
-        const dxfFile = Object.keys(zip.files).find((file) => file.endsWith(".dxf"));
+    async _processZip(response, progressCbk) {
+        const reader = response.body.getReader()
+        const decoder = new TextDecoder('utf-8');
+
+        const unzipper = new Unzip();
+        unzipper.register(UnzipInflate)
+        unzipper.onfile = file => {
+            if (!file.name.toLowerCase().endsWith('.dxf')) {
+                // ���������� ������ �����
+                file.ondata = () => { };
+                file.start();
+                return;
+            }
+
+            const totalSize = file.size;
+            let processed = 0;
+
+            if (progressCbk)
+                progressCbk('extract', 0, null);
 
-        if (!dxfFile) {
-            throw new Error("DXF-file not found.");
+            file.ondata = (err, chunk, final) => {
+                if (err) {
+                    console.log(err);
+                    return;
+                }
+
+                processed += chunk.byteLength;
+                const buffer = decoder.decode(chunk, { stream: !final });
+                this.DxfChunkParser(buffer);
+
+                if (progressCbk && totalSize > 0) {
+                    progressCbk('extract', processed / totalSize, { processed, totalSize });
+                }
+            };
+
+            file.start(); // ��������� ���������� �����
+        };
+
+        // ������ Unzip ������� ZIP-�����
+        while (true) {
+            const { value, done } = await reader.read();
+            if (done) {
+                unzipper.push(new Uint8Array(0), true); // ������ EOF
+                break;
+            }
+            unzipper.push(value, false);
         }
 
-        if (progressCbk !== null) {
-            progressCbk("extract", 0, null);
+        const firstString = this.dxfChunkArray[0]
+        this.dxfChunkArray = this.dxfChunkArray.slice(1)
+        const parser = new DxfParser(this)
+        return parser.parseSync(firstString)
+    }
+
+    DxfChunkParser(buffer) {
+        if (buffer[0] == '\n')
+            buffer = buffer.substring(1)
+        buffer = this.tail + buffer
+        const nFn = buffer.lastIndexOf('\n')
+        const nFr = buffer.lastIndexOf('\r')
+        let nF = Math.max(nFn, nFr)
+        this.tail = buffer.substring(nF + 1)
+        if (nFn - nFr == 1)
+            nF--
+        buffer = buffer.substring(0, nF)
+        this.dxfChunkArray.push(buffer);
+    }
+
+
+    GetNextChunk() {
+        if (this.dxfChunkArray.length == 0) {
+            return null
         }
-        const fileData = await zip.file(dxfFile).async("uint8array");
 
-        return this._decodeAndParse(fileData, progressCbk);
+        const firstString = this.dxfChunkArray[0]
+        this.dxfChunkArray = this.dxfChunkArray.slice(1)
+        firstString.split(/\r\n|\r|\n/g)
+        return firstString.split(/\r\n|\r|\n/g)
     }
 		
 }

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.226",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.228",
     kind: OptionKind.WORKER
   }
 };
@@ -37419,6 +37419,13 @@ const EVENT_SEARCH_ISSUE_LIST = 'vitro.search.issue.list';
 const EVENT_ISSUE_LIST_REFRESH = 'vitro.issue.list.refresh';
 const EVENT_ISSUE_LIST_SELECT_ITEM = 'vitro.issue.list.select.item';
 const EVENT_ITEM_CHANGED = 'vitro.item.changed';
+const ITEM_SELECT_DIALOG = 'ItemSelectDialog';
+const FILE_EXTENSION_PDF = '.pdf';
+const DOC_A = 'docA';
+const DOC_B = 'docB';
+let currentDocFileVersionList;
+let docAFileVersionList;
+let docBFileVersionList;
 
 function initContextMenuCanvas() {
     var pages = '#viewer .page:not(.has-new-svg)';
@@ -37526,6 +37533,8 @@ function initCompare() {
     bindCompareDlgPageChange();
     bindBtnsCompareDocsSelect();
     bindCompareDlgVersionChange();
+    initButtonSelectFileDocA();
+    initButtonSelectFileDocB();
 
     let fileName = context.file.fieldValueMap.name;
     $('div.compare-dlg_doc-a_name').text(fileName);
@@ -37543,26 +37552,8 @@ function initCompare() {
         }));
     });
 
-    let loadedVersionId = getLoadedVersionId();
-    let version = context.fileVersionList.find(item => item.id == loadedVersionId);
-    let loadedVersion = `v${version.name}`;
-    $('#docAVersion').val(loadedVersion);
-    let loadedVersionArray = version.name.split('.');
-    let loadedVersionMinor = loadedVersionArray[1];
-    let loadedVersionMajor = loadedVersionArray[0];
-    if (loadedVersionId != context.currentVersionId) {
-        let lastVersion = context.fileVersionList.find(item => item.id == context.currentVersionId);
-        let lastVersionLabel = `v${lastVersion.name}`;
-        $('#docBVersion').val(lastVersionLabel);
-    } else {
-        if (context.fileVersionList.length > 1) {
-            let previousVersion = context.fileVersionList[1];
-            let previousVersionLabel = `v${previousVersion.name}`;
-            $('#docBVersion').val(previousVersionLabel);
-        } else {
-            $('#docBVersion').val(loadedVersion);
-        }
-    }
+    currentDocFileVersionList = context.fileVersionList;
+    initDocVersion();
     $('#docAPage').val(1);
     $('#docBPage').val(1);
 }
@@ -37578,14 +37569,12 @@ function getLoadedVersionId() {
 function showDlgCompare() {
     $('.compare-dlg-wrap').show();
 
-    let currentPage = getCurrentPage();
-    $("#docAPage").val(currentPage);
-    $("#docBPage").val(currentPage);
+    resetDocFileVersionList();
+    resetDocPage();
+    initDocVersion();
 
     compareObjList = getCompareObjList();
-
     loadDocAObj(compareObjList.docA.url);
-
     loadDocBObj(compareObjList.docB.url);
 }
 
@@ -37603,6 +37592,7 @@ function getDocA() {
     let docAVersion = docAVersionValue.substring(1);
     let docAPage = Number($("#docAPage").val());
     let docAVersionFile = context.fileVersionList.find(item => item.name == docAVersion);
+    docAFileVersionList = context.fileVersionList;
     let docA = {
         name: fileName,
         version: docAVersionValue,
@@ -37622,6 +37612,7 @@ function getDocB() {
     let docBVersion = docBVersionValue.substring(1);
     let docBPage = Number($("#docBPage").val());
     let docBVersionFile = context.fileVersionList.find(item => item.name == docBVersion);
+    docBFileVersionList = context.fileVersionList;
     let docB = {
         name: fileName,
         version: docBVersionValue,
@@ -37759,14 +37750,14 @@ function isComparedDocumentCurrentOpened(url) {
 
 function bindCompareDlgDcoAVersionChange() {
     $('#docAVersion').on('change', function () {
-        compareObjList.docA = getDocA();
+        refreshCompareObjListDocA();
         loadDocAObj(compareObjList.docA.url);
     });
 }
 
 function bindCompareDlgDcoBVersionChange() {
     $('#docBVersion').on('change', function () {
-        compareObjList.docB = getDocB();
+        refreshCompareObjListDocB();
         loadDocBObj(compareObjList.docB.url);
     });
 }
@@ -37788,7 +37779,7 @@ function bindCompareDlgDcoAPageChange() {
         } else {
             enableAllpagesInOtherDropDown($('#docBPage'));
         }
-        compareObjList.docA = getDocA();
+        compareObjList.docA.page = Number($('#docAPage').val());
         reloadCompareThumb(pdfDocObjA, thumbContainer, Number($(this).val()));
     });
 }
@@ -37801,7 +37792,7 @@ function bindCompareDlgDcoBPageChange() {
         } else {
             enableAllpagesInOtherDropDown($('#docAPage'));
         }
-        compareObjList.docB = getDocB();
+        compareObjList.docB.page = Number($('#docBPage').val());
         reloadCompareThumb(pdfDocObjB, thumbContainer, Number($(this).val()));
     });
 }
@@ -38669,12 +38660,14 @@ function initItemChangedEventListener() {
 }
 
 function onItemChanged(e) {
-    const width = $('.vitro-issue-detail').width();
-    if (width && $('.vitro-issue-detail').is(':visible')) {
-        setContainerInset(width);
-    }
-    if (!$('.vitro-issue-detail').resizable('instance')) {
-        initResizable($('.vitro-issue-detail'));
+    if (!isEventItemSelectDialog(e)) {
+        const width = $('.vitro-issue-detail').width();
+        if (width && $('.vitro-issue-detail').is(':visible')) {
+            setContainerInset(width);
+        }
+        if (!$('.vitro-issue-detail').resizable('instance')) {
+            initResizable($('.vitro-issue-detail'));
+        }
     }
 }
 
@@ -38775,6 +38768,217 @@ function bindOnSidebarToggle() {
 function isScaleModeRelative() {
     const currentScaleMode = PDFViewerApplication.pdfViewer._currentScaleValue;
     return currentScaleMode == 'page-width' || currentScaleMode == 'page-fit' || currentScaleMode == 'auto';
+}
+
+function initButtonSelectFileDocA() {
+    const btn = $('<a id="btnSelectFileDocA">' + context.selectFileBtnText + '</a>');
+    btn.on('click', onClickButtonSelectFileDocA);
+    $('.compare-dlg_doc-a_file-select').append(btn);
+}
+
+async function onClickButtonSelectFileDocA(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    const idList = await context.getItemIdList();
+    const id = idList?.length ? idList[0] : false;
+    onSelectFileDocA(id);
+}
+
+async function onSelectFileDocA(id) {
+    if (isSelectedFileChanged(id, getDocFileIdFromUrl(compareObjList.docA.url))) {
+        const docObj = await getDocObj(id, $('#docAVersionList'), $("#docAVersion"), $("#docAPage"), $('div.compare-dlg_doc-a_name'), DOC_A);
+        if (docObj) {
+            compareObjList.docA = docObj;
+            loadDocAObj(compareObjList.docA.url);
+        }
+    }
+}
+
+function isSelectedFileChanged(id, compareObjListDocId) {
+    return id && (context.file.id !== id || (context.file.id === id && id !== compareObjListDocId));
+}
+
+async function getDocObj(id, fileVersionListElm, docVersionElm, docPageElm, fileNameElm, docType) {
+    const file = await context.itemService.get(id);
+    const fileName = file.fieldValueMap.name;
+
+    if (isValidDocumentFormat(fileName)) {
+        const fileId = file.id;
+        const versionList = await context.fileService.get(id);
+        const fileVersionList = getFileVersionList(versionList);
+        setDocFileVersionList(docType, fileVersionList);
+        const fileVersion = file.fieldValueMap.version.fieldValueMap.name;
+        setDlgDocFileName(fileNameElm, fileName);
+        refreshVersionList(fileVersionListElm, fileVersionList);
+        const docVersionValue = 'v' + fileVersion;
+        docVersionElm.val(docVersionValue);
+        docPageElm.val(1);
+        const docVersionFile = fileVersionList.find(item => item.name == fileVersion);
+
+        const doc = {
+            name: fileName,
+            version: docVersionValue,
+            page: 1,
+            uploadBy: docVersionFile.userName,
+            uploadDate: docVersionFile.date,
+            url: `/api/file/getByItemId/${fileId}/${fileVersion}`
+        };
+
+        return doc;
+    }
+
+    return false;
+}
+
+function setDocFileVersionList(docType, fileVersionList) {
+    if (docType === DOC_A) {
+        docAFileVersionList = fileVersionList;
+    } else {
+        docBFileVersionList = fileVersionList;
+    }
+}
+
+function refreshVersionList(fileVersionListElm, fileVersionList) {
+    fileVersionListElm.html(null);
+    $.each(fileVersionList, function (i, item) {
+        const value = 'v' + item.name;
+        fileVersionListElm.append($('<li>', {
+            value: value,
+            text: value,
+        }));
+    });
+}
+
+function getFileVersionList(versionList) {
+    const list = versionList?.map(version => {
+        return {
+            id: version.id,
+            name: version.fieldValueMap.name,
+            userName: version.insertUserName,
+            date: context.getDateText(version.insertDate)
+        };
+    });
+
+    return list;
+};
+
+function setDlgDocFileName(fileNameElm, fileName) {
+    fileNameElm.text(fileName);
+}
+
+function initButtonSelectFileDocB() {
+    const btn = $('<a id="btnSelectFileDocB">' + context.selectFileBtnText + '</a>');
+    btn.on('click', onClickButtonSelectFileDocB);
+    $('.compare-dlg_doc-b_file-select').append(btn);
+}
+
+async function onClickButtonSelectFileDocB(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    const idList = await context.getItemIdList();
+    const id = idList?.length ? idList[0] : false;
+    onSelectFileDocB(id);
+}
+
+async function onSelectFileDocB(id) {
+    if (isSelectedFileChanged(id, getDocFileIdFromUrl(compareObjList.docB.url))) {
+        const docObj = await getDocObj(id, $('#docBVersionList'), $("#docBVersion"), $("#docBPage"), $('div.compare-dlg_doc-b_name'), DOC_B);
+        if (docObj) {
+            compareObjList.docB = docObj;
+            loadDocBObj(compareObjList.docB.url);
+        }
+
+    }
+}
+
+function getDocFileIdFromUrl(url) {
+    const urlArr = url.split('/');
+    return itemId = urlArr[urlArr.length - 2];
+}
+
+function refreshCompareObjListDocA() {
+    refreshCompareObjListDoc(DOC_A);
+};
+
+function refreshCompareObjListDocB() {
+    refreshCompareObjListDoc(DOC_B);
+};
+
+function refreshCompareObjListDoc(docType) {
+    const docVersionValue = $("#" + docType + "Version").val();
+    const docVersion = docVersionValue.substring(1);
+    const docPage = Number($("#" + docType + "Page").val());
+    let docVersionFile;
+    if (docType === DOC_A) {
+        docVersionFile = docAFileVersionList.find(item => item.name == docVersion);
+    } else {
+        docVersionFile = docBFileVersionList.find(item => item.name == docVersion);
+    }
+    compareObjList[docType].page = docPage;
+    compareObjList[docType].version = docVersionValue;
+    compareObjList[docType].uploadBy = docVersionFile.userName;
+    compareObjList[docType].uploadDate = docVersionFile.date;
+    compareObjList[docType].url = getDocVersionUrl(compareObjList[docType].url, docVersion);
+}
+
+function getDocVersionUrl(url, version) {
+    const lastSlashIndex = url.lastIndexOf('/');
+    if (lastSlashIndex === -1) {
+        return url;
+    }
+    const partBeforeLastSlash = url.slice(0, lastSlashIndex + 1);
+    return partBeforeLastSlash + version;
+}
+
+function resetDocFileVersionList() {
+    docAFileVersionList = currentDocFileVersionList;
+    docBFileVersionList = currentDocFileVersionList;
+}
+
+function resetDocPage() {
+    const currentPage = getCurrentPage();
+    $("#docAPage").val(currentPage);
+    $("#docBPage").val(currentPage);
+}
+
+function initDocVersion() {
+    const loadedVersion = getInitVersionDocA();
+    const versionDocB = getInitVersionDocB(loadedVersion);
+    $('#docAVersion').val(loadedVersion);
+    $('#docBVersion').val(versionDocB);
+}
+
+function getInitVersionDocA() {
+    const loadedVersionId = getLoadedVersionId();
+    const version = context.fileVersionList.find(item => item.id == loadedVersionId);
+    const loadedVersion = `v${version.name}`;
+    return loadedVersion;
+}
+
+function getInitVersionDocB(loadedVersion) {
+    const loadedVersionId = getLoadedVersionId();
+    if (loadedVersionId != context.currentVersionId) {
+        const lastVersion = context.fileVersionList.find(item => item.id == context.currentVersionId);
+        const lastVersionLabel = `v${lastVersion.name}`;
+        return lastVersionLabel;
+    } else {
+        if (context.fileVersionList.length > 1) {
+            const previousVersion = context.fileVersionList[1];
+            const previousVersionLabel = `v${previousVersion.name}`;
+            return previousVersionLabel;
+        } else {
+            return loadedVersion;
+        }
+    }
+}
+
+function isValidDocumentFormat(filename) {
+    const lowercasedFilename = filename.toLowerCase();
+    return lowercasedFilename.endsWith(FILE_EXTENSION_PDF);
+}
+
+function isEventItemSelectDialog(e) {
+    return e?.detail?.eventScopeId?.startsWith(ITEM_SELECT_DIALOG);
 }
 const MARKUP_RESIZER_ID_PREFIX = 'markupResizer';
 const CSS_CLASS_MARKUP_RESIZER = 'vitro-markup-resizer';