tnx-shared 5.1.456 → 5.1.458

package/bundles/tnx-shared.umd.js

@@ -14179,7 +14179,7 @@
             var e_5, _e;
             if (isLiteralObject(model)) {
                 if (model._dropdownvalue != null && model._dropdownvalue !== '') {
-                    return model[model._dropdownvalue] || model['value'];
+                    return model[model._dropdownvalue] == null ? model['value'] : model[model._dropdownvalue];
                 }
                 var data = {};
                 for (var key in model) {
@@ -32009,6 +32009,7 @@
             this.showQuickNote = true;
             this.allowAnonymous = false;
             this.autoRenderMenu = true;
+            this.onUserLoaded = new i0.EventEmitter();
             this._unsubscribeAll = new rxjs.Subject();
             // rootVersionDeploy = '1.3';
             this.currentRoute = '';
@@ -32250,6 +32251,7 @@
             root.data.allowAnonymous = this.allowAnonymous;
             // get current User
             this._userService.populateCurrentUser();
+            this.onUserLoaded.emit();
             this._componentContextService.subscribe(ComCtxConstants.ROOT.NEED_CLEAR_PERMISSION_CACHE, function () { return __awaiter(_this, void 0, void 0, function () {
                 var res;
                 return __generator(this, function (_a) {
@@ -32850,6 +32852,7 @@
         showQuickNote: [{ type: i0.Input }],
         allowAnonymous: [{ type: i0.Input }],
         autoRenderMenu: [{ type: i0.Input }],
+        onUserLoaded: [{ type: i0.Output }],
         handleShowPopupPermissionUtils: [{ type: i0.HostListener, args: ['document:keypress', ['$event'],] }]
     };
 
@@ -35946,7 +35949,7 @@
                 accept: this.accept,
                 mode: this.mode,
                 sharedFolderType: this.sharedFolderType,
-                fileDataService: this.fileDataService,
+                fileDataService: this.fileDataService
             });
         }
         return FileUploadSetting;
@@ -48524,6 +48527,7 @@
             _this.isOpenFull = false;
             _this.isCustomGenerateSearch = false;
             _this.isDisableOpenFull = false;
+            _this.searchBoxTooltip = 'Tìm kiếm theo các trường: ';
             return _this;
         }
         CommonSearchFormComponent.prototype.ngOnInit = function () {
@@ -48542,8 +48546,18 @@
                 this.setting.schema = this.addSearchBox(this.parentSetting.commonSchemas);
             }
             else {
-                var columnFilters = this.parentSetting.cols.filter(function (p) { return p.allowFilter && !p.field.startsWith('str'); });
-                this.lstTextControl = columnFilters.filter(function (p) { return p.fullTextSearch; }).map(function (p) { return p.field; });
+                var columnFilters = this.parentSetting.cols.filter(function (p) { return p.allowFilter && !p.field.startsWith('str'); }).sort(function (a, b) {
+                    if (a.order < b.order) {
+                        return -1;
+                    }
+                    if (a.order > b.order) {
+                        return 1;
+                    }
+                    return 0;
+                });
+                var lstTextSearchControl = columnFilters.filter(function (p) { return p.fullTextSearch; });
+                this.lstTextControl = lstTextSearchControl.map(function (p) { return p.field; });
+                this.searchBoxTooltip += "" + (lstTextSearchControl.map(function (x) { return x.label; })).join(', ');
                 this.setting.schema = this.genFormSchema(columnFilters);
             }
             this.isDisableOpenFull = this.setting.schema.length <= 4 && !this._commonService.isMobile();
@@ -48740,7 +48754,7 @@
     CommonSearchFormComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'common-search-form',
-                    template: "<div #commonSearchTemplate class=\"p-grid box-common-search\" [ngClass]=\"{'open-full': isOpenFull} \">\n    <div class=\"container-control no-label p-md-12 cs-pb-1\">\n        <span class=\"label\"></span>\n        <div>\n            <crud-form #crudForm [setting]=\"setting\" [context]=\"context\" [disableCaching]=\"true\" [(data)]=\"model.data\"\n                (onFormReady)=\"_handleFormReady($event)\">\n                <ng-template #keyword>\n                    <div class=\"search-box\">\n                        <input type=\"text\" pInputText class=\"link-or-action\" [placeholder]=\"'T\u1EEB kh\u00F3a'\"\n                            [(ngModel)]=\"keywords\" />\n                        <div class=\"cs-flex-evenly buttons\">\n                            <span [pTooltip]=\"'X\u00F3a b\u1ED9 l\u1ECDc'\" tooltipPosition=\"top\" (click)=\"clearFilter()\">\n                                <i class=\"pi pi-filter-slash\"></i>\n                            </span>\n                            <span [pTooltip]=\"'T\u00ECm ki\u1EBFm'\" tooltipPosition=\"top\" (click)=\"handleSearch()\">\n                                <i class=\"pi pi-search\"></i>\n                            </span>\n                            <span *ngIf=\"!isDisableOpenFull\" [pTooltip]=\"isOpenFull ? 'Thu g\u1ECDn' : 'M\u1EDF r\u1ED9ng'\"\n                                tooltipPosition=\"top\" (click)=\"toggleMenuSearch()\">\n                                <i [ngClass]=\"isOpenFull ? 'pi pi-caret-up' : 'pi pi-caret-down'\"></i>\n                            </span>\n                        </div>\n                    </div>\n                </ng-template>\n            </crud-form>\n        </div>\n    </div>\n</div>",
+                    template: "<div #commonSearchTemplate class=\"p-grid box-common-search\" [ngClass]=\"{'open-full': isOpenFull} \">\n    <div class=\"container-control no-label p-md-12 cs-pb-1\">\n        <span class=\"label\"></span>\n        <div>\n            <crud-form #crudForm [setting]=\"setting\" [context]=\"context\" [disableCaching]=\"true\" [(data)]=\"model.data\"\n                (onFormReady)=\"_handleFormReady($event)\">\n                <ng-template #keyword>\n                    <div class=\"search-box\">\n                        <input type=\"text\" pInputText class=\"link-or-action\" [placeholder]=\"'T\u1EEB kh\u00F3a'\"\n                            tooltipStyleClass=\"wrap max-width-300\" tooltipPosition=\"top\" [pTooltip]=\"searchBoxTooltip\"\n                            [(ngModel)]=\"keywords\" (keyup.esc)=\"handleSearch()\" />\n                        <div class=\"cs-flex-evenly buttons\">\n                            <span [pTooltip]=\"'X\u00F3a b\u1ED9 l\u1ECDc'\" tooltipPosition=\"top\" (click)=\"clearFilter()\">\n                                <i class=\"pi pi-filter-slash\"></i>\n                            </span>\n                            <span [pTooltip]=\"'T\u00ECm ki\u1EBFm'\" tooltipPosition=\"top\" (click)=\"handleSearch()\">\n                                <i class=\"pi pi-search\"></i>\n                            </span>\n                            <span *ngIf=\"!isDisableOpenFull\" [pTooltip]=\"isOpenFull ? 'Thu g\u1ECDn' : 'M\u1EDF r\u1ED9ng'\"\n                                tooltipPosition=\"top\" (click)=\"toggleMenuSearch()\">\n                                <i [ngClass]=\"isOpenFull ? 'pi pi-caret-up' : 'pi pi-caret-down'\"></i>\n                            </span>\n                        </div>\n                    </div>\n                </ng-template>\n            </crud-form>\n        </div>\n    </div>\n</div>",
                     providers: [ComponentContextService],
                     styles: [".cs-pb-1{padding-bottom:.25rem!important}.bg-input{position:relative}.bg-input button{position:absolute;top:0;right:0}.pointer-none{pointer-events:none}.cs-flex-evenly{display:flex;align-items:center;justify-content:space-evenly}.box-common-search{position:relative;height:60px;overflow:hidden;transition:all .5s ease-in-out}.box-common-search.open-full{height:auto}.search-box{background:#fff;border:1px solid #d2d2d2;border-radius:5px;display:flex;justify-content:space-between}.search-box:hover{border-color:#397ac3;box-shadow:0 0 0 .2rem #a6d5fa}.search-box input{max-width:270px;box-shadow:none;border:0}.search-box span{cursor:pointer;padding:.5rem}"]
                 },] }
@@ -56181,6 +56195,8 @@
         function TnAccordionTabComponent(_commonService) {
             this._commonService = _commonService;
             this.data = [];
+            this.onOpenedTab = new i0.EventEmitter();
+            this.onClosedTab = new i0.EventEmitter();
             this.template = {};
             this.activeIndex = [];
         }
@@ -56204,6 +56220,7 @@
             item.expanded = true;
             item.active = true;
             this.activeIndex.push(item.index);
+            this.onOpenedTab.emit(item);
         };
         TnAccordionTabComponent.prototype.onCloseTab = function (evt) {
             var item = this.data.find(function (x) { return x.index == evt.index; });
@@ -56211,6 +56228,7 @@
             item.expanded = false;
             item.active = false;
             this.activeIndex = this.activeIndex.filter(function (q) { return q != evt.index; });
+            this.onClosedTab.emit(item);
         };
         TnAccordionTabComponent.prototype.activeTab = function (item) {
             this.data.forEach(function (item) {
@@ -56248,7 +56266,9 @@
         children: [{ type: i0.ContentChildren, args: [i0.TemplateRef,] }],
         contentBeforeLink: [{ type: i0.ContentChild, args: ['contentBeforeLink',] }],
         contentBeforeTabList: [{ type: i0.ContentChild, args: ['contentBeforeTabList',] }],
-        data: [{ type: i0.Input }]
+        data: [{ type: i0.Input }],
+        onOpenedTab: [{ type: i0.Output }],
+        onClosedTab: [{ type: i0.Output }]
     };
 
     var PipeLine = /** @class */ (function () {