tnx-shared 5.3.202 → 5.3.203

package/fesm2015/tnx-shared.js

@@ -1349,6 +1349,7 @@ class UserPickerControlSchema extends FormControlBase {
         this.displayField = 'fullNameNew';
         this.fieldPlus = '';
         this.returnType = 'value';
+        this.getDisplayName = false;
         this.fieldSearchText = [];
         this.operatorFieldSearchText = Operator.contain;
         this.usePicker = true;
@@ -12637,49 +12638,54 @@ class CrudFormComponent extends ComponentBase {
         // });
     }
     initControlDefaultValue(parentModel, control, parentPath) {
-        this.initPrivateData(parentModel, control.field);
-        let _parentPath = control.field;
-        if (parentPath != null)
-            _parentPath = parentPath + '.' + _parentPath;
-        if (control instanceof TableSchema) {
-            if (!parentModel[control.field] || !(parentModel[control.field] instanceof Array)) {
-                parentModel[control.field] = [];
-            }
-            const addMore = control.initRowCount - parentModel[control.field].length;
-            if (addMore > 0 && !parentModel._status[control.field].ready) {
-                parentModel._status[control.field].ready = true;
-            }
-            let i = 0;
-            for (const item of parentModel[control.field]) {
-                for (const subControl of control.rowTemplate) {
-                    this.initControlDefaultValue(item, subControl, _parentPath + '[' + i + ']');
+        return __awaiter(this, void 0, void 0, function* () {
+            this.initPrivateData(parentModel, control.field);
+            let _parentPath = control.field;
+            if (parentPath != null)
+                _parentPath = parentPath + '.' + _parentPath;
+            if (control instanceof TableSchema) {
+                if (!parentModel[control.field] || !(parentModel[control.field] instanceof Array)) {
+                    parentModel[control.field] = [];
+                }
+                const addMore = control.initRowCount - parentModel[control.field].length;
+                if (addMore > 0 && !parentModel._status[control.field].ready) {
+                    parentModel._status[control.field].ready = true;
+                }
+                let i = 0;
+                for (const item of parentModel[control.field]) {
+                    for (const subControl of control.rowTemplate) {
+                        this.initControlDefaultValue(item, subControl, _parentPath + '[' + i + ']');
+                    }
+                    i++;
                 }
-                i++;
-            }
-        }
-        else if (control instanceof ContainerSchema) {
-            if (parentModel[control.field] == null || !isLiteralObject(parentModel[control.field])) {
-                parentModel[control.field] = {};
-            }
-            for (const subControl of control.controls) {
-                this.initControlDefaultValue(parentModel[control.field], subControl, _parentPath);
             }
-        }
-        else {
-            if (!parentModel.hasOwnProperty(control.field) && control.field != null) {
-                if (control.defaultValue !== null && control.defaultValue !== undefined) {
-                    parentModel[control.field] = control.defaultValue;
+            else if (control instanceof ContainerSchema) {
+                if (parentModel[control.field] == null || !isLiteralObject(parentModel[control.field])) {
+                    parentModel[control.field] = {};
                 }
-                else if (control instanceof DropdownControlSchema) {
-                    if (control.autoDisplayFirst
-                        && control._component
-                        && control._component._hasLoadedDatasource
-                        && control._component.dataSourceInternal.length > 0) {
-                        parentModel[control.field] = control._component.dataSourceInternal[0].value[control.valueField];
+                for (const subControl of control.controls) {
+                    this.initControlDefaultValue(parentModel[control.field], subControl, _parentPath);
+                }
+            }
+            else {
+                if (control.funcSetDefaultValue) {
+                    control.defaultValue = yield control.funcSetDefaultValue();
+                }
+                if (!parentModel.hasOwnProperty(control.field) && control.field != null) {
+                    if (control.defaultValue !== null && control.defaultValue !== undefined) {
+                        parentModel[control.field] = control.defaultValue;
+                    }
+                    else if (control instanceof DropdownControlSchema) {
+                        if (control.autoDisplayFirst
+                            && control._component
+                            && control._component._hasLoadedDatasource
+                            && control._component.dataSourceInternal.length > 0) {
+                            parentModel[control.field] = control._component.dataSourceInternal[0].value[control.valueField];
+                        }
                     }
                 }
             }
-        }
+        });
     }
     initPrivateData(parentModel, field) {
         if (!parentModel._source)
@@ -34458,7 +34464,7 @@ class AnnouncementsService extends BaseService {
         }
         this.openThongBao(notificationParams);
     }
-    redirectToNotificationPage(orgIds = [], userIds = [], title, link, templateTextCode, objTemplate, isSendEmail = true, isChangeUser = true) {
+    redirectToNotificationPage(orgIds = [], userIds = [], title, link, templateTextCode, objTemplate, isSendEmail = true, isChangeUser = true, emails = []) {
         return __awaiter(this, void 0, void 0, function* () {
             orgIds = this._commonService.distinctArray(orgIds);
             userIds = this._commonService.distinctArray(userIds);
@@ -34474,6 +34480,7 @@ class AnnouncementsService extends BaseService {
             }
             notificationParams.orgIds = orgIds.join(',');
             notificationParams.userIds = userIds.join(',');
+            notificationParams.emails = emails.join(',');
             notificationParams.title = title;
             notificationParams.link = link ? encodeURIComponent(link) : '';
             notificationParams.templateTextCode = templateTextCode;
@@ -44306,6 +44313,7 @@ class TnDialogComponent {
         this.showFooter = true;
         this.hiddenSave = true;
         this.maximizable = true;
+        this.showHeader = true;
         this.onSave = new EventEmitter();
         this.onCancel = new EventEmitter();
         this.onShow = new EventEmitter();
@@ -44388,7 +44396,7 @@ class TnDialogComponent {
 TnDialogComponent.decorators = [
     { type: Component, args: [{
                 selector: 'tn-dialog',
-                template: "<p-dialog #dialog [closeOnEscape]=\"closeOnEscape\" [appendTo]=\"'body'\" [focusOnShow]=\"false\" [focusTrap]=\"false\"\n    [header]=\"header | translate\" [(visible)]=\"visible\" [modal]=\"modal\" [responsive]=\"true\" [maximizable]=\"maximizable\"\n    [autoZIndex]=\"true\" [styleClass]=\"styleClass\" [maskStyleClass]=\"maskClass\"\n    [style]=\"{'width': popupSize.width + 'px', 'min-width': popupSize.width + 'px', 'height': popupSize.height + 'px', 'min-height': popupSize.height + 'px'}\"\n    (onShow)=\"handleShowDialog($event)\" (onHide)=\"handleHideDialog($event)\">\n    <tn-custom-scrollbar #scrollbar [useDefaultScrollBar]=\"useDefaultScrollBar\" [class]=\"scrollBarStyleClass\"\n        [config]=\"scrollConfig\" [style]=\"scrollStyle\" class=\"tn-dialog-scrollbar\">\n        <ng-content></ng-content>\n    </tn-custom-scrollbar>\n    <p-footer *ngIf=\"showFooter\">\n        <p-footer *ngIf=\"formBase && formBase.buttonTemplate\" style=\"display: flex;float: right\">\n            <ng-container *ngTemplateOutlet=\"formBase.buttonTemplate\">\n            </ng-container>\n        </p-footer>\n        <ng-container *ngIf=\"!formBase || !formBase.buttonTemplate\">\n            <p-footer *ngIf=\"footer\">\n                <ng-container *ngTemplateOutlet=\"footer\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"buttonTemplateInput\">\n                <ng-container *ngTemplateOutlet=\"buttonTemplateInput\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"!footer && !buttonTemplateInput\">\n                <button pButton preventTab type=\"button\" icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\n                    [label]=\"'FORM.CANCEL' | translate\" (click)=\"handleHideDialog($event)\"></button>\n            </p-footer>\n        </ng-container>\n    </p-footer>\n</p-dialog>",
+                template: "<p-dialog #dialog [closeOnEscape]=\"closeOnEscape\" [appendTo]=\"'body'\" [focusOnShow]=\"false\" [focusTrap]=\"false\"\n    [header]=\"header | translate\" [(visible)]=\"visible\" [modal]=\"modal\" [responsive]=\"true\" [maximizable]=\"maximizable\"\n    [autoZIndex]=\"true\" [styleClass]=\"styleClass\" [maskStyleClass]=\"maskClass\" [showHeader]=\"showHeader\"\n    [style]=\"{'width': popupSize.width + 'px', 'min-width': popupSize.width + 'px', 'height': popupSize.height + 'px', 'min-height': popupSize.height + 'px'}\"\n    (onShow)=\"handleShowDialog($event)\" (onHide)=\"handleHideDialog($event)\">\n    <tn-custom-scrollbar #scrollbar [useDefaultScrollBar]=\"useDefaultScrollBar\" [class]=\"scrollBarStyleClass\"\n        [config]=\"scrollConfig\" [style]=\"scrollStyle\" class=\"tn-dialog-scrollbar\">\n        <ng-content></ng-content>\n    </tn-custom-scrollbar>\n    <p-footer *ngIf=\"showFooter\">\n        <p-footer *ngIf=\"formBase && formBase.buttonTemplate\" style=\"display: flex;float: right\">\n            <ng-container *ngTemplateOutlet=\"formBase.buttonTemplate\">\n            </ng-container>\n        </p-footer>\n        <ng-container *ngIf=\"!formBase || !formBase.buttonTemplate\">\n            <p-footer *ngIf=\"footer\">\n                <ng-container *ngTemplateOutlet=\"footer\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"buttonTemplateInput\">\n                <ng-container *ngTemplateOutlet=\"buttonTemplateInput\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"!footer && !buttonTemplateInput\">\n                <button pButton preventTab type=\"button\" icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\n                    [label]=\"'FORM.CANCEL' | translate\" (click)=\"handleHideDialog($event)\"></button>\n            </p-footer>\n        </ng-container>\n    </p-footer>\n</p-dialog>",
                 styles: [""]
             },] }
 ];
@@ -44417,6 +44425,7 @@ TnDialogComponent.propDecorators = {
     minY: [{ type: Input }],
     hiddenSave: [{ type: Input }],
     maximizable: [{ type: Input }],
+    showHeader: [{ type: Input }],
     onSave: [{ type: Output }],
     onCancel: [{ type: Output }],
     onShow: [{ type: Output }],
@@ -45310,7 +45319,7 @@ class UserPickerComponent extends ComponentBase {
     ngOnInit() {
         this.control._component = this;
         const commonFieldPlus = 'maChucVu,lstTenDonVi';
-        this.controlPicker = new EntityPickerControlSchema(Object.assign(Object.assign({}, this.control), { field: 'arrIdNguoiDung', label: 'Người dùng', title: 'Chọn người dùng', baseService: this._userV5Service, required: true, displayField: this.control.getDisplayName ? 'displayName' : 'fullNameNew', fieldPlus: this.control.fieldPlus ? `${this.control.fieldPlus},${commonFieldPlus}` : commonFieldPlus, valueField: this.control.valueField, defaultFilters: this.control.defaultFilters, multiple: this.control.multiple, funcGetLabel: (item) => {
+        this.controlPicker = new EntityPickerControlSchema(Object.assign(Object.assign({}, this.control), { field: 'arrIdNguoiDung', label: 'Người dùng', title: 'Chọn người dùng', baseService: this._userV5Service, required: true, displayField: this.control.getDisplayName ? 'displayName' : this.control.displayField, fieldPlus: this.control.fieldPlus ? `${this.control.fieldPlus},${commonFieldPlus}` : commonFieldPlus, valueField: this.control.valueField, defaultFilters: this.control.defaultFilters, multiple: this.control.multiple, funcGetLabel: (item) => {
                 var _a;
                 if (this.control.funcGetLabel)
                     return this.control.funcGetLabel(item);