tnx-shared 5.3.408 → 5.3.410

package/fesm2015/tnx-shared.js

@@ -26235,9 +26235,11 @@ class FileObjectService extends BaseService {
         this.thumborEndpoint = '';
         this.fileWithThumborEndpoint = '';
         this.filePathEndpoint = '';
+        this.version = '';
         this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.fileEndpoint;
         this.fileWithThumborEndpoint = _moduleConfigService.getConfig().environment.apiDomain.fileWithThumborEndpoint;
         this.thumborEndpoint = _moduleConfigService.getConfig().environment.apiDomain.thumbor;
+        this.version = _moduleConfigService.getConfig().environment.apiVersion;
         this.filePathEndpoint = _moduleConfigService.getConfig().environment.apiDomain.filePathEndpoint;
     }
     getFileUrlWithThumbor(fileId, width = 0, height = 0) {
@@ -26417,6 +26419,10 @@ class FileObjectService extends BaseService {
         const url = `${this.serviceUri}/UploadWithByteArray`;
         return this._http.post(url, formData, { responseType: 'text' }).toPromise();
     }
+    kySoSmartCA(model) {
+        const url = `${this.endPoint}/${this.version}/KySoFile/SmartCASignFile`;
+        return this.defaultPost(url, model);
+    }
 }
 FileObjectService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FileObjectService_Factory() { return new FileObjectService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: FileObjectService, providedIn: "root" });
 FileObjectService.decorators = [
@@ -31164,6 +31170,7 @@ class FileManagerComponent extends DataListBase {
                     command: () => {
                         this.signFileSmartCA(item);
                     },
+                    visible: item.extension == '.PDF'
                 },
                 {
                     label: 'Ký số cá nhân (USB)', icon: 'fas fa-signature',
@@ -32112,7 +32119,10 @@ class FileManagerComponent extends DataListBase {
                 entity: rowData.entity,
                 entityKey: rowData.entityKey,
                 fileBase64Content: dataKySo.fileBase64Content,
+                userChuKySoId: dataKySo.id,
                 showKySoButton: true,
+                width: dataKySo.width,
+                height: dataKySo.height,
             };
             this.forms.fileViewer.show = true;
         });
@@ -34046,6 +34056,19 @@ class FileViewerComponent extends ComponentBase {
         return styleClass;
     }
     kySoHandle() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.showWaitBox('Đang thực hiện ký số, vui lòng kiểm tra ứng dụng SmartCA');
+            const res = yield this._fileObjectService.kySoSmartCA(this.model.data);
+            if (res.success) {
+                this._notifierService.showSuccess('Thực hiện ký số thành công');
+            }
+            else {
+                this._notifierService.showWarning(res.error);
+            }
+            this.hideWaitBox();
+            this.show = false;
+            this.onClose.next();
+        });
     }
     ngAfterViewInit() {
         // Access the PDF.js viewer instance
@@ -34053,11 +34076,33 @@ class FileViewerComponent extends ComponentBase {
             var _a;
             const pdfViewer = (_a = window.PDFViewerApplication) === null || _a === void 0 ? void 0 : _a.pdfViewer;
             if (pdfViewer) {
-                // Add click listener to each page canvas
-                const container = document.querySelector('#viewerContainer');
-                container === null || container === void 0 ? void 0 : container.addEventListener('click', (e) => {
-                    this.handlePageClick(e, pdfViewer);
+                // Lấy tất cả canvas elements
+                const canvases = document.querySelectorAll('#viewerContainer canvas');
+                canvases.forEach((canvas) => {
+                    canvas.addEventListener('click', (e) => {
+                        this.handlePageClick(e, pdfViewer);
+                    });
+                });
+                // Optional: Theo dõi khi có canvas mới được render (khi scroll PDF)
+                const observer = new MutationObserver(() => {
+                    const newCanvases = document.querySelectorAll('#viewerContainer canvas');
+                    newCanvases.forEach((canvas) => {
+                        // Kiểm tra nếu chưa có listener (tránh thêm duplicate)
+                        if (!canvas._hasClickListener) {
+                            canvas.addEventListener('click', (e) => {
+                                this.handlePageClick(e, pdfViewer);
+                            });
+                            canvas._hasClickListener = true;
+                        }
+                    });
                 });
+                const container = document.querySelector('#viewerContainer');
+                if (container) {
+                    observer.observe(container, {
+                        childList: true,
+                        subtree: true
+                    });
+                }
             }
         }, 1000);
     }
@@ -34067,16 +34112,37 @@ class FileViewerComponent extends ComponentBase {
         if (marker) {
             marker.remove();
         }
-        if (target.classList.contains('canvasWrapper') ||
-            target.tagName === 'CANVAS') {
-            // Get page number and coordinates
+        if (target.tagName === 'CANVAS') {
             const pageDiv = target.closest('.page');
             const pageNumber = parseInt((pageDiv === null || pageDiv === void 0 ? void 0 : pageDiv.getAttribute('data-page-number')) || '1');
-            const rect = target.getBoundingClientRect();
-            const x = event.clientX - rect.left;
-            const y = event.clientY - rect.top;
-            // Create marker at this position
-            this.createMarker(target, x, y, pageNumber);
+            // Dùng offsetX/Y với scale adjustment
+            let x = event.offsetX;
+            let y = event.offsetY;
+            // Điều chỉnh theo scale của canvas
+            const scaleX = target.width / target.clientWidth;
+            const scaleY = target.height / target.clientHeight;
+            x = x * scaleX;
+            y = y * scaleY;
+            const WIDTH = this.model.data.width || 100;
+            const HEIGHT = this.model.data.height || 100;
+            // Convert pixel sang point
+            const clickXPoint = this.pixelToPoint(x);
+            const clickYPoint = this.pixelToPoint(y);
+            const widthPoint = this.pixelToPoint(WIDTH);
+            const heightPoint = this.pixelToPoint(HEIGHT);
+            const canvasHeightPoint = this.pixelToPoint(target.height);
+            // Chuyển đổi Y coordinate (PDF origin ở dưới)
+            const pdfY = canvasHeightPoint - clickYPoint;
+            const x1 = clickXPoint;
+            const y1 = pdfY - heightPoint;
+            const x2 = clickXPoint + widthPoint;
+            const y2 = pdfY;
+            const rectangle = `${Math.floor(x1)},${Math.floor(y1)},${Math.floor(x2)},${Math.floor(y2)}`;
+            console.log('PDF Rectangle:', rectangle);
+            console.log('==================');
+            this.model.data.signatureLocation = rectangle;
+            // Tạo marker với tọa độ đã điều chỉnh (nhưng hiển thị theo display size)
+            this.createMarker(target, event.offsetX, event.offsetY, pageNumber);
         }
     }
     createMarker(parent, x, y, page) {
@@ -34086,8 +34152,9 @@ class FileViewerComponent extends ComponentBase {
             position: absolute;
             left: ${x}px;
             top: ${y}px;
-            width: 100px;
-            height: 100px;
+            transform: translate(-50%,-50%);
+            width: ${this.model.data.width}px;
+            height: ${this.model.data.height}px;
             background-image: url(${this.model.data.fileBase64Content});
             pointer-events: none;
             background-size: contain;        /* Fits the image */
@@ -34095,9 +34162,13 @@ class FileViewerComponent extends ComponentBase {
             background-position: center top; /* Positioning */
             z-index: 999;
         `;
+        this.model.data.page = page;
         const pageContainer = parent.closest('.page');
         pageContainer === null || pageContainer === void 0 ? void 0 : pageContainer.appendChild(marker);
     }
+    pixelToPoint(pixel, dpi = 96) {
+        return pixel * 72 / dpi;
+    }
 }
 FileViewerComponent.decorators = [
     { type: Component, args: [{