tnx-shared 5.3.330 → 5.3.332

package/bundles/tnx-shared.umd.js

@@ -20838,10 +20838,13 @@
                     return __generator(this, function (_d) {
                         switch (_d.label) {
                             case 0:
+                                if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))
+                                    return [2 /*return*/];
                                 selectedValue = element.selectedValue;
-                                if (!!selectedValue) return [3 /*break*/, 2];
+                                if (!!selectedValue) return [3 /*break*/, 3];
                                 lstIdDoiTac = this._commonService.distinct(dataSource.filter(function (item) { return !!item.idDoiTac; }).flatMap(function (item) { return item.idDoiTac.split(','); }));
-                                return [4 /*yield*/, this._hoSoDoiTacService.getAllWithIgnore([this.newFilter('id', exports.Operator.in, lstIdDoiTac)], 'id,ten')];
+                                if (!lstIdDoiTac.length) return [3 /*break*/, 2];
+                                return [4 /*yield*/, this._hoSoDoiTacService.getAllWithIgnore([this.newFilter('id', exports.Operator.in, lstIdDoiTac.filter(function (id) { return !!id; }))], 'id,ten')];
                             case 1:
                                 lstDoiTac_1 = (_c = (_b = (_d.sent())) === null || _b === void 0 ? void 0 : _b.data) !== null && _c !== void 0 ? _c : [];
                                 if (lstDoiTac_1.length) {
@@ -20849,8 +20852,9 @@
                                         item.tenDoiTac = lstDoiTac_1.filter(function (x) { return item.idDoiTac.includes(x.id); }).map(function (x) { return x.ten; }).join(', ');
                                     });
                                 }
-                                return [3 /*break*/, 3];
-                            case 2:
+                                _d.label = 2;
+                            case 2: return [3 /*break*/, 4];
+                            case 3:
                                 dataSource.forEach(function (x) {
                                     var _a;
                                     if (typeof selectedValue == 'object' && x.id == (selectedValue === null || selectedValue === void 0 ? void 0 : selectedValue.id)) {
@@ -20859,8 +20863,8 @@
                                     else if (isArray(selectedValue) && selectedValue.includes(x.id))
                                         (x.tenDoiTac = (_a = selectedValue.find(function (y) { return y.id == x.id; })) === null || _a === void 0 ? void 0 : _a.stridDoiTac);
                                 });
-                                _d.label = 3;
-                            case 3:
+                                _d.label = 4;
+                            case 4:
                                 this.getTenDonVi(dataSource);
                                 return [2 /*return*/];
                         }
@@ -20908,15 +20912,12 @@
                     result.fieldPlus += ',idNgachVienChuc';
                 }
             }
-            else {
+            if (!result.isOverrideColumns)
                 result.fieldPlus = 'idNgachVienChuc,ngaySinh,ngaySinh2,chucDanhs,idHocHam,idHocVi,dienThoaiDiDong,code';
-            }
             return result;
         };
         CanBoHoSoService.prototype.getTenDonVi = function (dataSource) {
             var e_1, _d;
-            if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))
-                return;
             try {
                 for (var dataSource_1 = __values(dataSource), dataSource_1_1 = dataSource_1.next(); !dataSource_1_1.done; dataSource_1_1 = dataSource_1.next()) {
                     var item = dataSource_1_1.value;
@@ -22457,6 +22458,7 @@
             _this.isSuperUser = false;
             _this.showFormWorkflow = false;
             _this.headerWorkflow = '';
+            _this.componentKey = '';
             _this.lstBtnAuthorizeMenu = [];
             _this.popupSizeWorkflow = new PopupSize({ width: 950, height: 540 });
             _this.showHistoryWorkflow = false;
@@ -22964,6 +22966,7 @@
             }
         };
         ListComponentBase.prototype.initColumnSchema = function (cols) {
+            var _a, _b, _c, _d;
             if (!cols || !cols.length)
                 return;
             var colFunction = null, colGroup = null, colHasToggleIcon = null;
@@ -22986,6 +22989,7 @@
                 colHasToggleIcon = this.setting.cols[0];
             }
             colHasToggleIcon.colHasToggleIcon = true;
+            this.componentKey = location.pathname + "/" + (((_d = (_c = (_b = (_a = this.container) === null || _a === void 0 ? void 0 : _a.nativeElement) === null || _b === void 0 ? void 0 : _b.closest('crud-list').parentNode) === null || _c === void 0 ? void 0 : _c.tagName) === null || _d === void 0 ? void 0 : _d.toLowerCase()) || '') + (this.setting.settingKey ? '/' + this.setting.settingKey : '');
             this.getColorSetting();
             this.getColumnSetting(colGroup);
             this.getPageSetting();
@@ -23202,16 +23206,12 @@
             var dataSetting = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.COLUMN_SETTING);
             var jsonData = this.tryParseJson(dataSetting);
             if (dataSetting && jsonData.valid && jsonData.value.length > 0) {
-                var pathName = location.pathname;
-                if (this.setting.settingKey) {
-                    pathName += '/' + this.setting.settingKey;
-                }
                 var settings = jsonData.value;
                 try {
                     for (var settings_1 = __values(settings), settings_1_1 = settings_1.next(); !settings_1_1.done; settings_1_1 = settings_1.next()) {
                         var element = settings_1_1.value;
                         // const element = settings[i];
-                        if (element.pathname === pathName) {
+                        if (element.pathname === this.componentKey) {
                             this.setting.columnSetting.sortField = element.setting.sortField;
                             this.setting.columnSetting.sortDir = element.setting.sortDir ? element.setting.sortDir : 0;
                             if (this.setting.columnSetting.sortDir == 0) {
@@ -23249,16 +23249,13 @@
             }
         };
         ListComponentBase.prototype.saveColumnSetting = function () {
-            var pathName = location.pathname;
-            if (this.setting.settingKey) {
-                pathName += '/' + this.setting.settingKey;
-            }
+            var _this = this;
             var columnSetting = [];
             var checkExist = false;
             var dataSetting = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.COLUMN_SETTING);
             if (dataSetting) {
                 columnSetting = JSON.parse(dataSetting);
-                var itemSetting = columnSetting.find(function (q) { return q.pathname == pathName; });
+                var itemSetting = columnSetting.find(function (q) { return q.pathname == _this.componentKey; });
                 if (itemSetting) {
                     itemSetting.setting.sortField = this.setting.columnSetting.sortField;
                     itemSetting.setting.sortDir = this.setting.columnSetting.sortDir;
@@ -23269,20 +23266,17 @@
                 }
             }
             if (!checkExist) {
-                columnSetting.push({ pathname: pathName, setting: this.setting.columnSetting });
+                columnSetting.push({ pathname: this.componentKey, setting: this.setting.columnSetting });
             }
             localStorage.setItem(ComCtxConstants.LOCALSTORAGE_KEY.COLUMN_SETTING, JSON.stringify(columnSetting));
         };
         ListComponentBase.prototype.deleteColumnSetting = function () {
-            var pathName = location.pathname;
-            if (this.setting.settingKey) {
-                pathName += '/' + this.setting.settingKey;
-            }
+            var _this = this;
             var columnSetting = [];
             var dataSetting = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.COLUMN_SETTING);
             if (dataSetting) {
                 columnSetting = JSON.parse(dataSetting);
-                var index = columnSetting.findIndex(function (q) { return q.pathname == pathName; });
+                var index = columnSetting.findIndex(function (q) { return q.pathname == _this.componentKey; });
                 if (index > -1)
                     columnSetting.splice(index, 1);
             }
@@ -23292,14 +23286,10 @@
         ListComponentBase.prototype.getColorSetting = function () {
             var dataPageSetting = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.COLOR_SETTING);
             if (dataPageSetting) {
-                var pathName = location.pathname;
-                if (this.setting.settingKey) {
-                    pathName += '/' + this.setting.settingKey;
-                }
                 var settings = JSON.parse(dataPageSetting);
                 for (var i = 0; i < settings.length; i++) {
                     var element = settings[i];
-                    if (element.pathname === pathName) {
+                    if (element.pathname === this.componentKey) {
                         this.setting.colorFilterField = element.colorFilterField;
                         this.setting.colorFilterTable = element.colorFilterTable;
                         break;
@@ -23324,17 +23314,13 @@
         };
         ListComponentBase.prototype.setColorSetting = function () {
             var _this = this;
-            var pathName = location.pathname;
-            if (this.setting.settingKey) {
-                pathName += '/' + this.setting.settingKey;
-            }
             var colorSetting = [];
             var checkExist = false;
             var dataColorSetting = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.COLOR_SETTING);
             if (dataColorSetting) {
                 colorSetting = JSON.parse(dataColorSetting);
                 colorSetting.forEach(function (element) {
-                    if (element.pathname === pathName) {
+                    if (element.pathname === _this.componentKey) {
                         element.colorFilterField = _this.setting.colorFilterField;
                         element.colorFilterTable = _this.setting.colorFilterTable;
                         checkExist = true;
@@ -23343,7 +23329,7 @@
             }
             if (!checkExist) {
                 colorSetting.push({
-                    pathname: pathName,
+                    pathname: this.componentKey,
                     colorFilterField: this.setting.colorFilterField,
                     colorFilterTable: this.setting.colorFilterTable
                 });
@@ -23353,14 +23339,10 @@
         ListComponentBase.prototype.getPageSetting = function () {
             var dataPageSetting = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.PAGE_SETTING);
             if (dataPageSetting) {
-                var pathName = location.pathname;
-                if (this.setting.settingKey) {
-                    pathName += '/' + this.setting.settingKey;
-                }
                 var pageSettings = JSON.parse(dataPageSetting);
                 for (var i = 0; i < pageSettings.length; i++) {
                     var element = pageSettings[i];
-                    if (element.pathname === pathName) {
+                    if (element.pathname === this.componentKey) {
                         this.setting.pageSetting.pageSize = element.pageSize;
                         break;
                     }
@@ -23369,24 +23351,20 @@
         };
         ListComponentBase.prototype.savePageSetting = function () {
             var _this = this;
-            var pathName = location.pathname;
-            if (this.setting.settingKey) {
-                pathName += '/' + this.setting.settingKey;
-            }
             var pageSetting = [];
             var checkExist = false;
             var dataPageSetting = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.PAGE_SETTING);
             if (dataPageSetting) {
                 pageSetting = JSON.parse(dataPageSetting);
                 pageSetting.forEach(function (element) {
-                    if (element.pathname === pathName) {
+                    if (element.pathname === _this.componentKey) {
                         element.pageSize = _this.setting.pageSetting.pageSize;
                         checkExist = true;
                     }
                 });
             }
             if (!checkExist) {
-                pageSetting.push({ pathname: pathName, pageSize: this.setting.pageSetting.pageSize });
+                pageSetting.push({ pathname: this.componentKey, pageSize: this.setting.pageSetting.pageSize });
             }
             localStorage.setItem(ComCtxConstants.LOCALSTORAGE_KEY.PAGE_SETTING, JSON.stringify(pageSetting));
         };
@@ -23659,7 +23637,7 @@
                     }
                 }
             }
-            return transformed.map(function (row) { return row.map(function (cell) { return cell || ""; }); });
+            return transformed.map(function (row) { return row.map(function (cell) { return cell || ''; }); });
         };
         ListComponentBase.prototype.getValueRow = function (rowData, index, value) {
             if (rowData[index] != null) {