tnx-shared 5.3.330 → 5.3.331
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/tnx-shared.umd.js +11 -10
- package/bundles/tnx-shared.umd.js.map +1 -1
- package/bundles/tnx-shared.umd.min.js +1 -1
- package/bundles/tnx-shared.umd.min.js.map +1 -1
- package/esm2015/services/canbo-hoso.service.js +11 -10
- package/fesm2015/tnx-shared.js +10 -9
- package/fesm2015/tnx-shared.js.map +1 -1
- package/package.json +2 -2
- package/services/canbo-hoso.service.d.ts.map +1 -1
|
@@ -20838,10 +20838,13 @@
|
|
|
20838
20838
|
return __generator(this, function (_d) {
|
|
20839
20839
|
switch (_d.label) {
|
|
20840
20840
|
case 0:
|
|
20841
|
+
if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))
|
|
20842
|
+
return [2 /*return*/];
|
|
20841
20843
|
selectedValue = element.selectedValue;
|
|
20842
|
-
if (!!selectedValue) return [3 /*break*/,
|
|
20844
|
+
if (!!selectedValue) return [3 /*break*/, 3];
|
|
20843
20845
|
lstIdDoiTac = this._commonService.distinct(dataSource.filter(function (item) { return !!item.idDoiTac; }).flatMap(function (item) { return item.idDoiTac.split(','); }));
|
|
20844
|
-
return [
|
|
20846
|
+
if (!lstIdDoiTac.length) return [3 /*break*/, 2];
|
|
20847
|
+
return [4 /*yield*/, this._hoSoDoiTacService.getAllWithIgnore([this.newFilter('id', exports.Operator.in, lstIdDoiTac.filter(function (id) { return !!id; }))], 'id,ten')];
|
|
20845
20848
|
case 1:
|
|
20846
20849
|
lstDoiTac_1 = (_c = (_b = (_d.sent())) === null || _b === void 0 ? void 0 : _b.data) !== null && _c !== void 0 ? _c : [];
|
|
20847
20850
|
if (lstDoiTac_1.length) {
|
|
@@ -20849,8 +20852,9 @@
|
|
|
20849
20852
|
item.tenDoiTac = lstDoiTac_1.filter(function (x) { return item.idDoiTac.includes(x.id); }).map(function (x) { return x.ten; }).join(', ');
|
|
20850
20853
|
});
|
|
20851
20854
|
}
|
|
20852
|
-
|
|
20853
|
-
case 2:
|
|
20855
|
+
_d.label = 2;
|
|
20856
|
+
case 2: return [3 /*break*/, 4];
|
|
20857
|
+
case 3:
|
|
20854
20858
|
dataSource.forEach(function (x) {
|
|
20855
20859
|
var _a;
|
|
20856
20860
|
if (typeof selectedValue == 'object' && x.id == (selectedValue === null || selectedValue === void 0 ? void 0 : selectedValue.id)) {
|
|
@@ -20859,8 +20863,8 @@
|
|
|
20859
20863
|
else if (isArray(selectedValue) && selectedValue.includes(x.id))
|
|
20860
20864
|
(x.tenDoiTac = (_a = selectedValue.find(function (y) { return y.id == x.id; })) === null || _a === void 0 ? void 0 : _a.stridDoiTac);
|
|
20861
20865
|
});
|
|
20862
|
-
_d.label =
|
|
20863
|
-
case
|
|
20866
|
+
_d.label = 4;
|
|
20867
|
+
case 4:
|
|
20864
20868
|
this.getTenDonVi(dataSource);
|
|
20865
20869
|
return [2 /*return*/];
|
|
20866
20870
|
}
|
|
@@ -20908,15 +20912,12 @@
|
|
|
20908
20912
|
result.fieldPlus += ',idNgachVienChuc';
|
|
20909
20913
|
}
|
|
20910
20914
|
}
|
|
20911
|
-
|
|
20915
|
+
if (!result.isOverrideColumns)
|
|
20912
20916
|
result.fieldPlus = 'idNgachVienChuc,ngaySinh,ngaySinh2,chucDanhs,idHocHam,idHocVi,dienThoaiDiDong,code';
|
|
20913
|
-
}
|
|
20914
20917
|
return result;
|
|
20915
20918
|
};
|
|
20916
20919
|
CanBoHoSoService.prototype.getTenDonVi = function (dataSource) {
|
|
20917
20920
|
var e_1, _d;
|
|
20918
|
-
if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))
|
|
20919
|
-
return;
|
|
20920
20921
|
try {
|
|
20921
20922
|
for (var dataSource_1 = __values(dataSource), dataSource_1_1 = dataSource_1.next(); !dataSource_1_1.done; dataSource_1_1 = dataSource_1.next()) {
|
|
20922
20923
|
var item = dataSource_1_1.value;
|