tnx-shared 5.3.280 → 5.3.282

package/bundles/tnx-shared.umd.js

@@ -4879,6 +4879,13 @@
             var blob = new Blob([int8Array], { type: 'image/png' });
             return blob;
         };
+        CommonService.prototype.getInnerText = function (str) {
+            if (!str)
+                return '';
+            var element = document.createElement('div');
+            element.innerHTML = str;
+            return element.innerText;
+        };
         return CommonService;
     }());
     CommonService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function CommonService_Factory() { return new CommonService(i0__namespace.ɵɵinject(ModuleConfigService)); }, token: CommonService, providedIn: "root" });
@@ -25445,13 +25452,25 @@
         ListComponentBase.prototype.handleHideHistoryWorkflow = function () {
             this.showHistoryWorkflow = false;
         };
+        ListComponentBase.prototype.validateWorkflowCustom = function (crudListSetting, itemWorkflowSetting, workflowAction, currentItem) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_h) {
+                    return [2 /*return*/, true];
+                });
+            });
+        };
         ListComponentBase.prototype.processWorkflow = function (crudListSetting, itemWorkflowSetting, workflowAction) {
             return __awaiter(this, void 0, void 0, function () {
-                var domainNewTab, compRef;
+                var validateRes, domainNewTab, compRef;
                 var _this = this;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
-                        case 0:
+                        case 0: return [4 /*yield*/, this.validateWorkflowCustom(crudListSetting, itemWorkflowSetting, workflowAction, this.currentItem)];
+                        case 1:
+                            validateRes = _h.sent();
+                            if (!validateRes) {
+                                return [2 /*return*/];
+                            }
                             if (workflowAction.openNewTab) {
                                 domainNewTab = workflowAction.domainNewTab;
                                 if (!domainNewTab)
@@ -25471,7 +25490,7 @@
                             this.processWorkflowModel.showEditForm = true;
                             this.processWorkflowModel.header = workflowAction.name;
                             return [4 /*yield*/, this._federationService.loadRemoteNewComponent('commonapp', 'ProcessWorkflowFormComponent', this.processWorkflowFormViewContainer)];
-                        case 1:
+                        case 2:
                             compRef = _h.sent();
                             if (this.dialogProcessWorkflowForm) {
                                 this.dialogProcessWorkflowForm.buttonTemplateInput = compRef.instance.buttonTemplate;
@@ -54572,7 +54591,8 @@
                 temp.label = item[this.controlPicker.displayField];
             }
             else {
-                temp.label = this._userV5Service.getFullCanBoLabel(item, true);
+                var tenDonVi = item.lstTenDonVi && item.lstTenDonVi.length > 0 ? item.lstTenDonVi.split(',')[0] : '';
+                temp.label = (item.maChucVu ? item.maChucVu + ". " : '') + ("" + temp.label) + (tenDonVi ? " - " + tenDonVi : '');
             }
             temp.value._dropdownvalue = this.controlPicker.valueField;
             return temp;