@vitrosoftware/common-ui-ts 1.1.227 → 1.1.228

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.227",
+    "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.227';
+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.227';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.228';
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -3885,7 +3885,7 @@ function bindBtnAddModel() {
 
                         const filePath = context.getFilePath(itemAttach.id);
                         const fileName = context.file.fieldValueMap?.name;
-                        const model = new BIMCommon.VitroModel(itemId, versionStr, filePath, fileName);
+                        const model = new BIMCommon.VitroModel(itemId, undefined, filePath, fileName);
 
                         BIMCommon.ModelList.push(model);
 

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.227';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.227';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.227';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.227';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.227';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.227';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.227';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.227';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.227';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.227';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.227';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.227';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.227';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.227';
+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 = [];
@@ -449,6 +450,18 @@ export class VitroDxfScene extends DxfScene {
         delete this.overlays
     }
 
+	_BuildScene() {
+        const scene = super._BuildScene()
+
+		scene.layers = []
+        for (const layer of this.layers.values()) {
+			layer.isVisible = layer.visible && !layer.frozen
+            scene.layers.push(layer)
+        }
+
+        return scene
+    }
+	
     _ProcessLayers(dxf, xrefMap) {
         if (xrefMap) {
             for (const [, xref] of Object.entries(xrefMap)) {
@@ -1195,7 +1208,8 @@ export class Viewer extends DxfViewer {
 			options.colorCorrection = true
 			options.clearColor = new three.Color("#fff")
 			options.buildScene = true
-			options.retainParsedDxf = true
+			options.retainParsedDxf = true,
+			options.autoZoom = true
 		}
 
 		super(domContainer, options)
@@ -1331,7 +1345,9 @@ export class Viewer extends DxfViewer {
 		this.hasMissingChars = scene.hasMissingChars
 
 		for (const layer of scene.layers) {
-			this.layers.set(layer.name, new Layer(layer.name, layer.displayName, layer.color))
+			const layerObj = new Layer(layer.name, layer.displayName, layer.color)
+			layerObj.isVisible = layer.isVisible
+			this.layers.set(layer.name, layerObj)
 		}
 
 		/* Load all blocks on the first pass. */
@@ -1436,6 +1452,7 @@ export class Viewer extends DxfViewer {
 			this._Emit("added", { obj })
 			if (layer) {
 				layer.PushObject(obj)
+				obj.visible = layer.isVisible
 			}
 		}
 	}
@@ -1573,13 +1590,13 @@ export class Viewer extends DxfViewer {
 			deltaY: 1,
 			deltaMode: 0
 		})
-		this.canvas.dispatchEvent(wheelEvent)
+		this.canvas.dispatchEvent(wheelEvent);
 		wheelEvent = new WheelEvent('wheel', {
 			deltaY: -1,
 			deltaMode: 0,
 			position: [0, 0, 0]
 		})
-		this.canvas.dispatchEvent(wheelEvent)
+		this.canvas.dispatchEvent(wheelEvent);
 	}
 
 	RenderVieports(space) {
@@ -1964,6 +1981,7 @@ export class Viewer extends DxfViewer {
 	}
 
 	ZoomIn(scale) {
+		this.options.autoZoom = false;
 		const centerX = this.canvasWidth / 2 * window.devicePixelRatio;
 		const centerY = this.canvasHeight / 2 * window.devicePixelRatio;
 		scale = scale ? scale : Math.pow(0.95, 3);
@@ -1972,6 +1990,7 @@ export class Viewer extends DxfViewer {
 	}
 
 	ZoomOut(scale) {
+		this.options.autoZoom = false;
 		const centerX = this.canvasWidth / 2 * window.devicePixelRatio;
 		const centerY = this.canvasHeight / 2 * window.devicePixelRatio;
 		scale = scale ? scale : Math.pow(0.95, 3);
@@ -2264,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)
@@ -2309,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()
@@ -2331,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();
 
@@ -2346,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);
+
+            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 });
+                }
+            };
 
-        if (!dxfFile) {
-            throw new Error("DXF-file not found.");
+            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)
     }
 		
 }
@@ -3266,24 +3355,35 @@ for (const eventName of ['loaded', 'cleared', 'destroyed', 'resized', 'pointerdo
     Subscribe(eventName);
 }
 
+let lastWheelClickTime = 0;
+const wheelDblClickThreshold = 400;
+
 function emit(eventName, event) {
     if (eventName == 'dxf-pointerdown' && event.detail.domEvent.button == 1) {
-        var layout = null;
-        const viewer = window.dxfViewer;
-        const scene = viewer.scene;
-        for (let i = 0; i < scene.layouts.length; i++) {
-            if (window.dxfViewer.spaceName === scene.layouts[i].space) {
-                if (i == scene.layouts.length - 1)
-                    layout = scene.layouts[0];
-                else
-                    layout = scene.layouts[i + 1];
-
-                break;
+        const now = Date.now();
+        if (now - lastWheelClickTime < wheelDblClickThreshold) {
+            doZoomAuto();
+            lastWheelClickTime = 0;
+        } else {
+            lastWheelClickTime = now;
+
+            var layout = null;
+            const viewer = window.dxfViewer;
+            const scene = viewer.scene;
+            for (let i = 0; i < scene.layouts.length; i++) {
+                if (window.dxfViewer.spaceName === scene.layouts[i].space) {
+                    if (i == scene.layouts.length - 1)
+                        layout = scene.layouts[0];
+                    else
+                        layout = scene.layouts[i + 1];
+
+                    break;
+                }
             }
-        }
 
-        if (layout) {
-            
+            if (layout) {
+
+            }
         }
     }
     else if (eventName == 'dxf-pointerdown' && event.detail.domEvent.button == 0) {
@@ -3331,7 +3431,7 @@ function emit(eventName, event) {
         }
     }
     else if (eventName == 'dxf-viewChanged') {
-        if (+$('#scaleSelect').data('value') && dxfViewer.camera.zoom !== 1) {
+        if (dxfViewer.camera.zoom !== 1 && !window.dxfViewer.options.autoZoom) {
             updateScaleSelectValue();
         }
         anno.UpdateLabelPosition();
@@ -3570,12 +3670,17 @@ function doZoomPageFit() {
 function doZoomAuto() {
     doZoomPageFit();
     window.dxfViewer.DoFakeZoomToRedrawScene();
+    $('#pageAutoOption').text(context.scaleAutoLabel);
+    $('#scaleSelect').data('value', $('#scaleSelect').val());
+    $('#scaleSelect').val(context.scaleAutoLabel);
 }
 
 function changeZoom(scale) {
     if (scale === 'auto') {
+        window.dxfViewer.options.autoZoom = true;
         doZoomAuto();
     } else {
+        window.dxfViewer.options.autoZoom = false;
         scale = +scale;
         if (scale === 1) {
             doZoomPageFit();