tnx-shared 5.3.408 → 5.3.410

package/bundles/tnx-shared.umd.js

@@ -30665,9 +30665,11 @@
             _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;
             return _this;
         }
@@ -30850,6 +30852,10 @@
             var url = this.serviceUri + "/UploadWithByteArray";
             return this._http.post(url, formData, { responseType: 'text' }).toPromise();
         };
+        FileObjectService.prototype.kySoSmartCA = function (model) {
+            var url = this.endPoint + "/" + this.version + "/KySoFile/SmartCASignFile";
+            return this.defaultPost(url, model);
+        };
         return FileObjectService;
     }(BaseService));
     FileObjectService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function FileObjectService_Factory() { return new FileObjectService(i0__namespace.ɵɵinject(i1__namespace$1.HttpClient), i0__namespace.ɵɵinject(i0__namespace.INJECTOR), i0__namespace.ɵɵinject(ModuleConfigService)); }, token: FileObjectService, providedIn: "root" });
@@ -35762,6 +35768,7 @@
                         command: function () {
                             _this.signFileSmartCA(item);
                         },
+                        visible: item.extension == '.PDF'
                     },
                     {
                         label: 'Ký số cá nhân (USB)', icon: 'fas fa-signature',
@@ -36832,7 +36839,10 @@
                                 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;
                             return [2 /*return*/];
@@ -50540,6 +50550,28 @@
             return styleClass;
         };
         FileViewerComponent.prototype.kySoHandle = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var res;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            this.showWaitBox('Đang thực hiện ký số, vui lòng kiểm tra ứng dụng SmartCA');
+                            return [4 /*yield*/, this._fileObjectService.kySoSmartCA(this.model.data)];
+                        case 1:
+                            res = _b.sent();
+                            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();
+                            return [2 /*return*/];
+                    }
+                });
+            });
         };
         FileViewerComponent.prototype.ngAfterViewInit = function () {
             var _this = this;
@@ -50548,11 +50580,33 @@
                 var _a;
                 var pdfViewer = (_a = window.PDFViewerApplication) === null || _a === void 0 ? void 0 : _a.pdfViewer;
                 if (pdfViewer) {
-                    // Add click listener to each page canvas
-                    var container = document.querySelector('#viewerContainer');
-                    container === null || container === void 0 ? void 0 : container.addEventListener('click', function (e) {
-                        _this.handlePageClick(e, pdfViewer);
+                    // Lấy tất cả canvas elements
+                    var canvases = document.querySelectorAll('#viewerContainer canvas');
+                    canvases.forEach(function (canvas) {
+                        canvas.addEventListener('click', function (e) {
+                            _this.handlePageClick(e, pdfViewer);
+                        });
+                    });
+                    // Optional: Theo dõi khi có canvas mới được render (khi scroll PDF)
+                    var observer = new MutationObserver(function () {
+                        var newCanvases = document.querySelectorAll('#viewerContainer canvas');
+                        newCanvases.forEach(function (canvas) {
+                            // Kiểm tra nếu chưa có listener (tránh thêm duplicate)
+                            if (!canvas._hasClickListener) {
+                                canvas.addEventListener('click', function (e) {
+                                    _this.handlePageClick(e, pdfViewer);
+                                });
+                                canvas._hasClickListener = true;
+                            }
+                        });
                     });
+                    var container = document.querySelector('#viewerContainer');
+                    if (container) {
+                        observer.observe(container, {
+                            childList: true,
+                            subtree: true
+                        });
+                    }
                 }
             }, 1000);
         };
@@ -50562,25 +50616,51 @@
             if (marker) {
                 marker.remove();
             }
-            if (target.classList.contains('canvasWrapper') ||
-                target.tagName === 'CANVAS') {
-                // Get page number and coordinates
+            if (target.tagName === 'CANVAS') {
                 var pageDiv = target.closest('.page');
                 var pageNumber = parseInt((pageDiv === null || pageDiv === void 0 ? void 0 : pageDiv.getAttribute('data-page-number')) || '1');
-                var rect = target.getBoundingClientRect();
-                var x = event.clientX - rect.left;
-                var y = event.clientY - rect.top;
-                // Create marker at this position
-                this.createMarker(target, x, y, pageNumber);
+                // Dùng offsetX/Y với scale adjustment
+                var x = event.offsetX;
+                var y = event.offsetY;
+                // Điều chỉnh theo scale của canvas
+                var scaleX = target.width / target.clientWidth;
+                var scaleY = target.height / target.clientHeight;
+                x = x * scaleX;
+                y = y * scaleY;
+                var WIDTH = this.model.data.width || 100;
+                var HEIGHT = this.model.data.height || 100;
+                // Convert pixel sang point
+                var clickXPoint = this.pixelToPoint(x);
+                var clickYPoint = this.pixelToPoint(y);
+                var widthPoint = this.pixelToPoint(WIDTH);
+                var heightPoint = this.pixelToPoint(HEIGHT);
+                var canvasHeightPoint = this.pixelToPoint(target.height);
+                // Chuyển đổi Y coordinate (PDF origin ở dưới)
+                var pdfY = canvasHeightPoint - clickYPoint;
+                var x1 = clickXPoint;
+                var y1 = pdfY - heightPoint;
+                var x2 = clickXPoint + widthPoint;
+                var y2 = pdfY;
+                var 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);
             }
         };
         FileViewerComponent.prototype.createMarker = function (parent, x, y, page) {
             var marker = document.createElement('div');
             marker.id = 'custom-marker';
-            marker.style.cssText = "\n            position: absolute;\n            left: " + x + "px;\n            top: " + y + "px;\n            width: 100px;\n            height: 100px;\n            background-image: url(" + this.model.data.fileBase64Content + ");\n            pointer-events: none;\n            background-size: contain;        /* Fits the image */\n            background-repeat: no-repeat;    /* No tiling */\n            background-position: center top; /* Positioning */\n            z-index: 999;\n        ";
+            marker.style.cssText = "\n            position: absolute;\n            left: " + x + "px;\n            top: " + y + "px;\n            transform: translate(-50%,-50%);\n            width: " + this.model.data.width + "px;\n            height: " + this.model.data.height + "px;\n            background-image: url(" + this.model.data.fileBase64Content + ");\n            pointer-events: none;\n            background-size: contain;        /* Fits the image */\n            background-repeat: no-repeat;    /* No tiling */\n            background-position: center top; /* Positioning */\n            z-index: 999;\n        ";
+            this.model.data.page = page;
             var pageContainer = parent.closest('.page');
             pageContainer === null || pageContainer === void 0 ? void 0 : pageContainer.appendChild(marker);
         };
+        FileViewerComponent.prototype.pixelToPoint = function (pixel, dpi) {
+            if (dpi === void 0) { dpi = 96; }
+            return pixel * 72 / dpi;
+        };
         return FileViewerComponent;
     }(ComponentBase));
     FileViewerComponent.decorators = [