tnx-shared 5.3.409 → 5.3.411

package/bundles/tnx-shared.umd.js

@@ -1357,6 +1357,7 @@
             this.hiddenKySoSimCaNhan = false;
             this.hiddenKySoUsbCaNhan = false;
             this.hiddenKySoDonVi = false;
+            this.hiddenKySoSmartCA = false;
             this.hiddenButPhe = false;
             this.arrFieldMustValidate = [];
             this.getCustomDataTrinhKy = function (rowData) { return ({}); };
@@ -35768,7 +35769,8 @@
                         command: function () {
                             _this.signFileSmartCA(item);
                         },
-                        visible: item.extension == '.PDF'
+                        visible: (this._fileObjectService.isTypeFileKySo(item.name)
+                            && this.layout !== exports.EnumFileLayout.SIMPLE_FOR_LIST && !this.parentSetting.hiddenKySoSmartCA),
                     },
                     {
                         label: 'Ký số cá nhân (USB)', icon: 'fas fa-signature',
@@ -36819,20 +36821,49 @@
         };
         FileManagerComponent.prototype.signFileSmartCA = function (rowData) {
             return __awaiter(this, void 0, void 0, function () {
-                var dataKySo;
+                var sourceFileId, sourceFile, rsConvert, e_5, dataKySo;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
-                        case 0: return [4 /*yield*/, this._userChuKySoService.getDetailByFilter([
+                        case 0:
+                            sourceFileId = rowData.id;
+                            sourceFile = rowData;
+                            if (!this._fileExplorerService.needConvertBeforeSign(rowData.name)) return [3 /*break*/, 4];
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, this._fileExplorerService.convertDocumentToPdfAndSave({
+                                    instanceId: sourceFileId,
+                                    name: this._fileExplorerService.changeFileExtension(rowData.name, 'pdf'),
+                                    folderInstanceId: rowData.parentFolderId,
+                                    ownerType: this._userService.getCurrentUser().userId.toString(),
+                                })];
+                        case 2:
+                            rsConvert = _b.sent();
+                            if (!rsConvert || !rsConvert.success) {
+                                this._notifierService.showWarning("C\u00F3 l\u1ED7i x\u1EA3y ra khi chuy\u1EC3n \u0111\u1ED5i t\u00E0i li\u1EC7u " + rowData.name + " th\u00E0nh pdf \u0111\u1EC3 k\u00FD. Vui l\u00F2ng th\u1EED l\u1EA1i sau");
+                                return [2 /*return*/];
+                            }
+                            else {
+                                this._notifierService.showSuccess("Chuy\u1EC3n \u0111\u1ED5i t\u00E0i li\u1EC7u " + rowData.name + " th\u00E0nh pdf th\u00E0nh c\u00F4ng");
+                                sourceFileId = rsConvert.data;
+                                sourceFile = { id: sourceFileId };
+                            }
+                            return [3 /*break*/, 4];
+                        case 3:
+                            e_5 = _b.sent();
+                            this._notifierService.showWarning("C\u00F3 l\u1ED7i x\u1EA3y ra khi chuy\u1EC3n \u0111\u1ED5i t\u00E0i li\u1EC7u " + rowData.name + " th\u00E0nh pdf \u0111\u1EC3 k\u00FD. Vui l\u00F2ng th\u1EED l\u1EA1i sau");
+                            return [2 /*return*/];
+                        case 4: return [4 /*yield*/, this._userChuKySoService.getDetailByFilter([
                                 this.newFilter('provider', exports.Operator.equal, 'SmartCA'),
                                 this.newFilter('userId', exports.Operator.equal, this._userService.getCurrentUser().userId),
                             ])];
-                        case 1:
+                        case 5:
                             dataKySo = (_b.sent()).data;
                             if (!dataKySo) {
                                 this._notifierService.showWarning('Người dùng chưa cấu hình thông tin ký số');
                             }
                             this.forms.fileViewer.formData.data = {
-                                fileId: rowData.id,
+                                fileId: sourceFileId,
                                 isFileVersion: false,
                                 fileName: rowData.name,
                                 service: rowData.serviceCode,
@@ -37022,7 +37053,7 @@
             });
         };
         FileManagerComponent.prototype.buildTreeData = function (data, rootFolderId) {
-            var e_5, _b;
+            var e_6, _b;
             var result = [];
             var rootData = data.filter(function (x) { return x.parentFolderId == rootFolderId; });
             if (rootData.length > 0) {
@@ -37038,12 +37069,12 @@
                         });
                     }
                 }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
                 finally {
                     try {
                         if (rootData_1_1 && !rootData_1_1.done && (_b = rootData_1.return)) _b.call(rootData_1);
                     }
-                    finally { if (e_5) throw e_5.error; }
+                    finally { if (e_6) throw e_6.error; }
                 }
             }
             return result;
@@ -50555,6 +50586,9 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            if (!this.model.data.signatureLocation) {
+                                return [2 /*return*/, this._notifierService.showWarning('Vui lòng chọn vị trí chữ ký trước khi thực hiện ký số')];
+                            }
                             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:
@@ -50567,6 +50601,7 @@
                             }
                             this.hideWaitBox();
                             this.show = false;
+                            this.onClose.next();
                             return [2 /*return*/];
                     }
                 });
@@ -50579,11 +50614,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);
         };
@@ -50593,29 +50650,37 @@
             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;
+                // 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 TRƯỚC
+                // Convert pixel sang point
                 var clickXPoint = this.pixelToPoint(x);
                 var clickYPoint = this.pixelToPoint(y);
                 var widthPoint = this.pixelToPoint(WIDTH);
                 var heightPoint = this.pixelToPoint(HEIGHT);
-                // SAU ĐÓ mới tính toán như C#
+                var canvasHeightPoint = this.pixelToPoint(target.height);
+                // Chuyển đổi Y coordinate (PDF origin ở dưới)
+                var pdfY = canvasHeightPoint - clickYPoint;
                 var x1 = clickXPoint;
-                var y1 = clickYPoint - heightPoint;
+                var y1 = pdfY - heightPoint;
                 var x2 = clickXPoint + widthPoint;
-                var y2 = clickYPoint;
-                var rectangle = x1 + "," + y1 + "," + x2 + "," + y2;
+                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;
-                this.createMarker(target, x, y, pageNumber);
+                // 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) {
@@ -50628,7 +50693,7 @@
         };
         FileViewerComponent.prototype.pixelToPoint = function (pixel, dpi) {
             if (dpi === void 0) { dpi = 96; }
-            return Math.round(pixel * 72 / dpi * 100); // Làm tròn 2 chữ số thập phân
+            return pixel * 72 / dpi;
         };
         return FileViewerComponent;
     }(ComponentBase));