tnx-shared 5.3.425 → 5.3.426

package/bundles/tnx-shared.umd.js

@@ -1714,6 +1714,7 @@
             _this.titleUnPicked = 'Danh sách các mục chưa chọn';
             _this.titlePicked = 'Danh sách các mục đã chọn';
             _this.fieldsPicked = null;
+            _this.datasourceFieldFilter = [];
             for (var key in init) {
                 _this[key] = init[key];
             }
@@ -26175,7 +26176,8 @@
                             if (itemWorkflowHistoryLast
                                 && itemWorkflowHistoryLast.actionCode != MaActionBatDauQuyTrinh
                                 && itemWorkflowHistoryLast.userIdCreated.toUpperCase() == userIdStringUpper
-                                && this.setting.showButtonThuHoi) {
+                                && this.setting.showButtonThuHoi
+                                && !rowData.hiddenButtonThuHoi) {
                                 buttonContexts.push({
                                     icon: 'pi pi-replay',
                                     label: 'Thu hồi',
@@ -38867,7 +38869,7 @@
                         },
                         ComponentContextService
                     ],
-                    styles: ["::ng-deep .file-upload{display:flex;border:1px solid #ced4da;border-radius:4px}::ng-deep .file-upload .fl-icon{flex:0 0 30px;display:flex;font-size:20px;justify-content:center;align-items:center;border-right:1px solid #ced4da}::ng-deep .file-upload .fl-icon>i{font-size:16px!important}::ng-deep .file-upload .fl-file-name{display:flex;align-items:center;flex-grow:1;cursor:pointer;opacity:.8;padding-left:12px;color:#109bf8;width:calc(100% - 110px);position:relative}::ng-deep .file-upload .fl-file-name>span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}::ng-deep .file-upload .fl-file-name:hover{opacity:1}::ng-deep .file-upload .fl-buttons{flex:0 0 80px;display:flex;border-right:1px solid #ced4da;align-items:center;justify-content:space-evenly;border-left:1px solid #ced4da}::ng-deep .file-upload .nfl-signature{display:flex;align-items:center;justify-content:center;cursor:pointer;opacity:.8;padding:0 10px;color:#109bf8;overflow:hidden}::ng-deep .file-upload .nfl-signature:hover{opacity:1}::ng-deep .file-upload .signature i{position:absolute;top:0;right:0}"]
+                    styles: ["::ng-deep .file-upload{display:flex;border:1px solid #ced4da;border-radius:4px}::ng-deep .file-upload .fl-icon{flex:0 0 30px;display:flex;font-size:20px;justify-content:center;align-items:center;border-right:1px solid #ced4da}::ng-deep .file-upload .fl-icon>i{font-size:16px!important}::ng-deep .file-upload .fl-file-name{display:flex;align-items:center;flex-grow:1;cursor:pointer;opacity:.8;padding-left:12px;color:#109bf8;width:calc(100% - 110px);position:relative}::ng-deep .file-upload .fl-file-name>span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}::ng-deep .file-upload .fl-file-name:hover{opacity:1}::ng-deep .file-upload .fl-buttons{flex:0 0 80px;display:flex;border-right:1px solid #ced4da;align-items:center;justify-content:space-evenly;border-left:1px solid #ced4da}::ng-deep .file-upload .nfl-signature{display:flex;align-items:center;justify-content:center;cursor:pointer;opacity:.8;padding:0 10px;color:#109bf8;overflow:hidden}::ng-deep .file-upload .nfl-signature:hover{opacity:1}::ng-deep .file-upload .signature i{position:absolute;top:50%!important;transform:translate(-50%,-50%)!important;right:0}"]
                 },] }
     ];
     FileUploadComponent.ctorParameters = function () { return [
@@ -46667,13 +46669,13 @@
         return UserPickerSetting;
     }());
     var DatasourceFieldFilter = [
-        { id: 'userName', ten: 'Tài khoản' },
-        { id: 'code', ten: 'Mã' },
-        { id: 'email', ten: 'Email' },
+        { id: 'userName', ten: 'Tài khoản', placeholder: 'thuan.pd\nvan.nbt' },
+        { id: 'code', ten: 'Mã cán bộ', placeholder: '00000408\n00014270' },
+        { id: 'email', ten: 'Email', placeholder: 'linh123@gmail.com\ntnam123@gmail.com' },
     ];
     var DatasourceFilterCanBo = [
-        { id: 'code', ten: 'Mã' },
-        { id: 'email', ten: 'Email' }
+        { id: 'code', ten: 'Mã cán bộ', placeholder: '00000408\n00014270' },
+        { id: 'email', ten: 'Email', placeholder: 'linh123@gmail.com\ntnam123@gmail.com' },
     ];
 
     var AutoCompletePickerComponent = /** @class */ (function (_super) {
@@ -48924,7 +48926,7 @@
         });
         EntityPickerDataComponent.prototype.ngOnInit = function () {
             var _this = this;
-            var _a;
+            var _a, _b;
             this.loadDetailFromQueryParam = true;
             this.plusUrl = this.control.plusUrl;
             this.setting.hiddenAuthorizeButton = true;
@@ -48948,6 +48950,9 @@
             if (this.control.baseService instanceof CanBoHoSoService) {
                 this.datasourceFieldFilter = DatasourceFilterCanBo;
             }
+            if ((_b = this.control.datasourceFieldFilter) === null || _b === void 0 ? void 0 : _b.length) {
+                this.datasourceFieldFilter = this.control.datasourceFieldFilter;
+            }
             this.control.columns.forEach(function (column) {
                 if (column.isDisplay) {
                     var newCol = new ColumnSchemaBase({
@@ -49640,6 +49645,7 @@
             configurable: true
         });
         EntityPickerSearchFormComponent.prototype.ngOnInit = function () {
+            var _this = this;
             this.doNotCheckBaseService = true;
             this.setting.schema = [
                 new RadioButtonListControlSchema({
@@ -49650,8 +49656,8 @@
                     mdWidth: 12,
                     hidden: !this.datasourceFieldFilter.length,
                     onChanged: function (evt) {
-                        var plusPlaceholder = evt.parentModel.fieldFilter == 'email' ? '@gmail.com' : '';
-                        evt.formControls['lstDataCheck'].placeholder = "linh123" + plusPlaceholder + "\nnam123" + plusPlaceholder;
+                        var _a;
+                        evt.formControls['lstDataCheck'].placeholder = (_a = _this.datasourceFieldFilter.find(function (p) { return p.id == evt.parentModel.fieldFilter; })) === null || _a === void 0 ? void 0 : _a.placeholder;
                     }
                 }),
                 new TextAreaControlSchema({
@@ -49674,16 +49680,17 @@
         };
         EntityPickerSearchFormComponent.prototype.onFormInitialized = function (controls) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
+                return __generator(this, function (_b) {
                     return [2 /*return*/];
                 });
             });
         };
         EntityPickerSearchFormComponent.prototype.initDataAdd = function (evt) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
+                return __generator(this, function (_b) {
                     if (this.datasourceFieldFilter.length) {
                         evt.rootModel.fieldFilter = this.datasourceFieldFilter[0].id;
+                        evt.formControls['lstDataCheck'].placeholder = this.datasourceFieldFilter[0].placeholder;
                     }
                     evt.rootModel.lstDataCheck = undefined;
                     evt.rootModel.lstDataNotExist = undefined;
@@ -49693,7 +49700,7 @@
         };
         EntityPickerSearchFormComponent.prototype.modifyDetailData = function (data) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
+                return __generator(this, function (_b) {
                     return [2 /*return*/];
                 });
             });
@@ -49701,11 +49708,11 @@
         EntityPickerSearchFormComponent.prototype.customSave = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var isValid;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0: return [4 /*yield*/, this.crudForm.validateForm()];
                         case 1:
-                            isValid = _a.sent();
+                            isValid = _b.sent();
                             if (!isValid)
                                 return [2 /*return*/];
                             this.model.data.lstData = this.model.data.lstDataCheck.split('\n').map(function (p) { return p.trim(); }).filter(function (p) { return p; });
@@ -50573,6 +50580,21 @@
         EntityPickerComponent.prototype.setDisabledState = function (isDisabled) {
             this.disabled = isDisabled;
         };
+        EntityPickerComponent.prototype._view = function (rowData) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!this.control.onViewDetail) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.control.onViewDetail(rowData)];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                        case 2: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         return EntityPickerComponent;
     }(DataListBase));
     EntityPickerComponent.decorators = [
@@ -57572,11 +57594,14 @@
 
     var UserPickerBoxComponent = /** @class */ (function (_super) {
         __extends(UserPickerBoxComponent, _super);
-        function UserPickerBoxComponent(_injector, _userV5Service, _organizationService, _coCauToChucService) {
-            var _this = _super.call(this, _injector) || this;
+        function UserPickerBoxComponent(_injector, _userV5Service, _organizationService, _coCauToChucService, _moduleConfigService) {
+            var _this = this;
+            var _a, _b, _c;
+            _this = _super.call(this, _injector) || this;
             _this._userV5Service = _userV5Service;
             _this._organizationService = _organizationService;
             _this._coCauToChucService = _coCauToChucService;
+            _this._moduleConfigService = _moduleConfigService;
             _this.multiple = false;
             _this.disabled = false;
             _this.enableCaching = true;
@@ -57605,6 +57630,10 @@
             _this.rootFilter = {};
             _this.treeLoading = false;
             _this.datasourceFieldFilter = DatasourceFieldFilter;
+            var _environment = _moduleConfigService.getConfig().environment;
+            if (((_b = (_a = _environment.cauHinhNghiepVu) === null || _a === void 0 ? void 0 : _a.datasourceFieldFilterCanBo) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+                _this.datasourceFieldFilter = (_c = _environment.cauHinhNghiepVu) === null || _c === void 0 ? void 0 : _c.datasourceFieldFilterCanBo;
+            }
             return _this;
         }
         UserPickerBoxComponent.prototype.ngOnInit = function () {
@@ -57626,7 +57655,7 @@
         UserPickerBoxComponent.prototype.nodeSelect = function (event) {
             return __awaiter(this, void 0, void 0, function () {
                 var target;
-                return __generator(this, function (_a) {
+                return __generator(this, function (_d) {
                     target = event.originalEvent.target;
                     if (target.classList.contains('custom-node')) {
                         this.selectedNodeData = target.id;
@@ -57657,19 +57686,19 @@
         UserPickerBoxComponent.prototype.initTree = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var rs;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             if (!this.controlSetting.lazyLoadOrganization) return [3 /*break*/, 2];
                             return [4 /*yield*/, this._organizationService.getOrganizationByParentId(this._commonService.guidEmpty())];
                         case 1:
-                            rs = _a.sent();
+                            rs = _d.sent();
                             this.rootTreeNode = rs.data;
                             this.loadTree(this.rootTreeNode[0], true);
                             return [3 /*break*/, 3];
                         case 2:
                             this.loadTree(null);
-                            _a.label = 3;
+                            _d.label = 3;
                         case 3: return [2 /*return*/];
                     }
                 });
@@ -57702,7 +57731,7 @@
             }
             else {
                 this._organizationService.getOrganizationTree(this.controlSetting.parentOrgCode).then(function (result) { return __awaiter(_this, void 0, void 0, function () {
-                    return __generator(this, function (_a) {
+                    return __generator(this, function (_d) {
                         this.rootTreeNode = result.data;
                         this.rootTreeNode[0].expanded = true;
                         this.treeLoading = true;
@@ -57722,15 +57751,15 @@
         UserPickerBoxComponent.prototype.modifyFilter = function (filters) {
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             Object.keys(this.rootFilter).forEach(function (item) {
                                 filters.push(_this.rootFilter[item]);
                             });
                             return [4 /*yield*/, appendDefaultFilter(filters, this.controlSetting.defaultFilters)];
                         case 1:
-                            _a.sent();
+                            _d.sent();
                             return [2 /*return*/];
                     }
                 });
@@ -57774,7 +57803,8 @@
         { type: i0.Injector },
         { type: UserV5Service },
         { type: OrganizationService },
-        { type: CoCauToChucTestService }
+        { type: CoCauToChucTestService },
+        { type: ModuleConfigService }
     ]; };
     UserPickerBoxComponent.propDecorators = {
         multiple: [{ type: i0.Input }],
@@ -59436,6 +59466,7 @@
 
     // 1
     // 2
+    // 3
     function coreDeclaration() {
         return [
             AddressComponent,