tnx-shared 5.3.329 → 5.3.330

package/bundles/tnx-shared.umd.js

@@ -20629,8 +20629,8 @@
             return __awaiter(this, void 0, void 0, function () {
                 var profileInfo, idsCanBo, common, filters, idsDonViCanBoLogin_1, idsDonVi_1, coCauToChucFilters_1, newfilters;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             profileInfo = this._userService.getCurrentUser();
                             idsCanBo = [];
@@ -20648,7 +20648,7 @@
                                     }
                                 })];
                         case 1:
-                            _b.sent();
+                            _d.sent();
                             if (idsDonViCanBoLogin_1.length == 0) {
                                 return [2 /*return*/, []];
                             }
@@ -20665,7 +20665,7 @@
                                     }
                                 })];
                         case 2:
-                            _b.sent();
+                            _d.sent();
                             if (idsDonVi_1.length == 0) {
                                 return [2 /*return*/, []];
                             }
@@ -20680,7 +20680,7 @@
                                     }
                                 })];
                         case 3:
-                            _b.sent();
+                            _d.sent();
                             return [2 /*return*/, idsCanBo];
                         case 4: return [2 /*return*/, []];
                     }
@@ -20726,8 +20726,8 @@
         CanBoHoSoService.prototype.getInfoAfterGetData = function (dataSource) {
             return __awaiter(this, void 0, void 0, function () {
                 var guidEmpty, idsCanBo, lstCanBo;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             guidEmpty = this._commonService.guidEmpty();
                             idsCanBo = this._commonService.distinctArray(dataSource
@@ -20735,7 +20735,7 @@
                                 .map(function (x) { return x.idCanBo; }));
                             return [4 /*yield*/, this.getAll([this.newFilter('id', exports.Operator.in, idsCanBo)], 'id,code,hoVaTen,ngaySinh,gioiTinh')];
                         case 1:
-                            lstCanBo = (_b.sent()).data;
+                            lstCanBo = (_d.sent()).data;
                             dataSource.forEach(function (element) {
                                 if (element.idCanBo != guidEmpty) {
                                     var canBo = lstCanBo.find(function (x) { return x.id == element.idCanBo; });
@@ -20766,12 +20766,12 @@
         CanBoHoSoService.prototype.getCoCauToChucRootDonVi_ByUserId = function (userId) {
             return __awaiter(this, void 0, void 0, function () {
                 var url;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             url = this.serviceUri + "/GetCoCauToChucRootDonVi_ByUserId/" + userId;
                             return [4 /*yield*/, this.defaultGet(url)];
-                        case 1: return [2 /*return*/, _b.sent()];
+                        case 1: return [2 /*return*/, _d.sent()];
                     }
                 });
             });
@@ -20779,12 +20779,12 @@
         CanBoHoSoService.prototype.GetCoCauToChucRootDonVi_ByListUserId = function (lstUserId) {
             return __awaiter(this, void 0, void 0, function () {
                 var url;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             url = this.serviceUri + "/GetCoCauToChucRootDonVi_ByListUserId";
                             return [4 /*yield*/, this.defaultPost(url, lstUserId)];
-                        case 1: return [2 /*return*/, _b.sent()];
+                        case 1: return [2 /*return*/, _d.sent()];
                     }
                 });
             });
@@ -20792,12 +20792,12 @@
         CanBoHoSoService.prototype.getCoCauToChucRootDonVi = function (gridInfo) {
             return __awaiter(this, void 0, void 0, function () {
                 var url;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             url = this.serviceUri + "/GetAllByFilter/GetCoCauToChucRootDonVi";
                             return [4 /*yield*/, this.defaultPost(url, gridInfo)];
-                        case 1: return [2 /*return*/, _b.sent()];
+                        case 1: return [2 /*return*/, _d.sent()];
                     }
                 });
             });
@@ -20813,6 +20813,17 @@
             else if (((_a = control.columns) === null || _a === void 0 ? void 0 : _a.length) > 0) {
                 columns.push.apply(columns, __spreadArray([], __read(control.columns)));
             }
+            if (control.dataType == exports.EnumControlPickerType.DOITAC && !columns.some(function (item) { return item.code == 'idDoiTac'; })) {
+                columns.push(new EntityPickerColumn({
+                    label: 'Đối tác',
+                    code: 'idDoiTac',
+                    baseService: this._hoSoDoiTacService,
+                    multiple: true,
+                    fullTextSearch: true,
+                    isArrayField: true,
+                    width: '200px',
+                }));
+            }
             var result = new AutoCompletePickerControlSchema(Object.assign(Object.assign({ field: 'idCanBo', label: 'Cán bộ', title: 'Chọn cán bộ', multiple: false, baseService: this, plusUrl: 'WithChucDanhChucVu', displayField: 'hoVaTen', fieldPlus: 'code', fieldSearchText: ['email', 'code'], funcGetLabel: function (item) {
                     var result = item.hoVaTen;
                     if (item.code) {
@@ -20822,23 +20833,53 @@
                         result += "- " + item.tenDonVi;
                     }
                     return result;
-                }, required: true, afterGetDataDropdown: function (dataSource, element) {
-                    _this.getTenDonVi(dataSource);
-                }, afterGetDataPicked: function (dataSource, element) { return __awaiter(_this, void 0, void 0, function () {
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+                }, required: true, afterGetDataDropdown: function (dataSource, element) { return __awaiter(_this, void 0, void 0, function () {
+                    var _b, _c, selectedValue, lstIdDoiTac, lstDoiTac_1;
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
+                            case 0:
+                                selectedValue = element.selectedValue;
+                                if (!!selectedValue) return [3 /*break*/, 2];
+                                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')];
+                            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) {
+                                    dataSource.forEach(function (item) {
+                                        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:
+                                dataSource.forEach(function (x) {
+                                    var _a;
+                                    if (typeof selectedValue == 'object' && x.id == (selectedValue === null || selectedValue === void 0 ? void 0 : selectedValue.id)) {
+                                        x.tenDoiTac = selectedValue === null || selectedValue === void 0 ? void 0 : selectedValue.stridDoiTac;
+                                    }
+                                    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:
+                                this.getTenDonVi(dataSource);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); }, afterGetDataPicked: function (dataSource, element) { return __awaiter(_this, void 0, void 0, function () {
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
                             case 0: return [4 /*yield*/, this.getDataPlus(dataSource)];
                             case 1:
-                                _b.sent();
+                                _d.sent();
                                 return [2 /*return*/];
                         }
                     });
                 }); }, afterGetDataUnPicked: function (dataSource, element) { return __awaiter(_this, void 0, void 0, function () {
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
                             case 0: return [4 /*yield*/, this.getDataPlus(dataSource)];
                             case 1:
-                                _b.sent();
+                                _d.sent();
                                 return [2 /*return*/];
                         }
                     });
@@ -20859,17 +20900,6 @@
                     }
                     return filters;
                 } }, control), { columns: columns }));
-            if (control.dataType == exports.EnumControlPickerType.DOITAC && !this.lstEntityPickerColumn.some(function (item) { return item.code == 'idDoiTac'; })) {
-                this.lstEntityPickerColumn.push(new EntityPickerColumn({
-                    label: 'Đối tác',
-                    code: 'idDoiTac',
-                    baseService: this._hoSoDoiTacService,
-                    multiple: true,
-                    fullTextSearch: true,
-                    isArrayField: true,
-                    width: '200px',
-                }));
-            }
             if (result.fieldPlus) {
                 if (result.fieldPlus
                     .split(',')
@@ -20884,7 +20914,7 @@
             return result;
         };
         CanBoHoSoService.prototype.getTenDonVi = function (dataSource) {
-            var e_1, _b;
+            var e_1, _d;
             if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))
                 return;
             try {
@@ -20905,7 +20935,7 @@
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (dataSource_1_1 && !dataSource_1_1.done && (_b = dataSource_1.return)) _b.call(dataSource_1);
+                    if (dataSource_1_1 && !dataSource_1_1.done && (_d = dataSource_1.return)) _d.call(dataSource_1);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -20913,9 +20943,9 @@
         CanBoHoSoService.prototype.getDataPlus = function (dataSource) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var dataSource_2, dataSource_2_1, item, _b, _c, i, _d, _e, i;
-                var e_2, _f, e_3, _g, e_4, _h;
-                return __generator(this, function (_j) {
+                var dataSource_2, dataSource_2_1, item, _d, _e, i, _f, _g, i;
+                var e_2, _h, e_3, _j, e_4, _k;
+                return __generator(this, function (_l) {
                     try {
                         for (dataSource_2 = __values(dataSource), dataSource_2_1 = dataSource_2.next(); !dataSource_2_1.done; dataSource_2_1 = dataSource_2.next()) {
                             item = dataSource_2_1.value;
@@ -20925,8 +20955,8 @@
                             item.strChucDanhs = '';
                             if (item.chucDanhs) {
                                 try {
-                                    for (_b = (e_3 = void 0, __values(item.chucDanhs)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                        i = _c.value;
+                                    for (_d = (e_3 = void 0, __values(item.chucDanhs)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                                        i = _e.value;
                                         if (i.chucDanh) {
                                             item.strChucDanhs += i.chucDanh;
                                         }
@@ -20935,7 +20965,7 @@
                                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                                 finally {
                                     try {
-                                        if (_c && !_c.done && (_g = _b.return)) _g.call(_b);
+                                        if (_e && !_e.done && (_j = _d.return)) _j.call(_d);
                                     }
                                     finally { if (e_3) throw e_3.error; }
                                 }
@@ -20943,8 +20973,8 @@
                             item.strDonViChucVus = '';
                             if ((_a = item.donViChucVus) === null || _a === void 0 ? void 0 : _a.length) {
                                 try {
-                                    for (_d = (e_4 = void 0, __values(item.donViChucVus)), _e = _d.next(); !_e.done; _e = _d.next()) {
-                                        i = _e.value;
+                                    for (_f = (e_4 = void 0, __values(item.donViChucVus)), _g = _f.next(); !_g.done; _g = _f.next()) {
+                                        i = _g.value;
                                         if (i.chucVu) {
                                             item.strDonViChucVus += "<p>" + i.chucVu + " - " + i.donVi + "</p>";
                                         }
@@ -20956,7 +20986,7 @@
                                 catch (e_4_1) { e_4 = { error: e_4_1 }; }
                                 finally {
                                     try {
-                                        if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
+                                        if (_g && !_g.done && (_k = _f.return)) _k.call(_f);
                                     }
                                     finally { if (e_4) throw e_4.error; }
                                 }
@@ -20973,7 +21003,7 @@
                     catch (e_2_1) { e_2 = { error: e_2_1 }; }
                     finally {
                         try {
-                            if (dataSource_2_1 && !dataSource_2_1.done && (_f = dataSource_2.return)) _f.call(dataSource_2);
+                            if (dataSource_2_1 && !dataSource_2_1.done && (_h = dataSource_2.return)) _h.call(dataSource_2);
                         }
                         finally { if (e_2) throw e_2.error; }
                     }
@@ -21000,12 +21030,12 @@
         CanBoHoSoService.prototype.getLyLichKhoaHocCanBo = function (id) {
             return __awaiter(this, void 0, void 0, function () {
                 var url;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             url = this.serviceUri + "/GetLyLichKhoaHocCanBo/" + id;
                             return [4 /*yield*/, this.defaultGet(url)];
-                        case 1: return [2 /*return*/, _b.sent()];
+                        case 1: return [2 /*return*/, _d.sent()];
                     }
                 });
             });
@@ -21013,12 +21043,12 @@
         CanBoHoSoService.prototype.GetDonViChucVu = function (idCanBo) {
             return __awaiter(this, void 0, void 0, function () {
                 var url;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             url = this.serviceUri + "/GetDonViChucVu/" + idCanBo;
                             return [4 /*yield*/, this.defaultGet(url)];
-                        case 1: return [2 /*return*/, _b.sent()];
+                        case 1: return [2 /*return*/, _d.sent()];
                     }
                 });
             });
@@ -44416,9 +44446,9 @@
                 displayField: this.control.displayField,
                 valueField: this.control.valueField,
                 fieldPlus: this.control.fieldPlus,
-                funcGetLabel: this.control.funcGetLabel,
-                plusUrl: this.control.plusUrl,
                 sorts: this.control.sorts,
+                funcGetLabel: this.control.funcGetLabel,
+                plusUrl: this.control.plusUrl
             });
             if (pageSize) {
                 result.pageSize = pageSize;
@@ -44478,7 +44508,9 @@
                         case 3: return [4 /*yield*/, this.control.baseService.getDataDropdownByFilter(filters, this.getDropdownOptions())];
                         case 4:
                             dataSource = _b.sent();
-                            this.fireEventAfterGetDataDropDown(dataSource);
+                            return [4 /*yield*/, this.fireEventAfterGetDataDropDown(dataSource)];
+                        case 5:
+                            _b.sent();
                             this.reStructureDataSource(dataSource);
                             this.results = this.dataSource;
                             // Return để một số nơi khác dùng, k remove
@@ -44488,9 +44520,19 @@
             });
         };
         AutoCompletePickerComponent.prototype.fireEventAfterGetDataDropDown = function (dataSource) {
-            if (this.control.afterGetDataDropdown) {
-                this.control.afterGetDataDropdown(dataSource, this);
-            }
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (!this.control.afterGetDataDropdown) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.control.afterGetDataDropdown(dataSource, this)];
+                        case 1:
+                            _b.sent();
+                            _b.label = 2;
+                        case 2: return [2 /*return*/];
+                    }
+                });
+            });
         };
         AutoCompletePickerComponent.prototype.resetControl = function () {
             // if (this._value != null) {
@@ -44673,32 +44715,36 @@
                     switch (_b.label) {
                         case 0:
                             this.showFormPicker = false;
-                            if (!this.dirty) return [3 /*break*/, 7];
-                            if (!this.control.multiple) return [3 /*break*/, 3];
+                            if (!this.dirty) return [3 /*break*/, 9];
+                            if (!this.control.multiple) return [3 /*break*/, 4];
                             dataSource = [];
-                            if (!(this.value && this.value.length > 0)) return [3 /*break*/, 2];
+                            if (!(this.value && this.value.length > 0)) return [3 /*break*/, 3];
                             return [4 /*yield*/, this.control.baseService.getDataDropdownByFilter([
                                     this.newFilter(this.control.valueField, exports.Operator.in, this.value)
                                 ], this.getDropdownOptions(this.value.length))];
                         case 1:
                             dataSource = _b.sent();
-                            this.fireEventAfterGetDataDropDown(dataSource);
-                            _b.label = 2;
+                            return [4 /*yield*/, this.fireEventAfterGetDataDropDown(dataSource)];
                         case 2:
+                            _b.sent();
+                            _b.label = 3;
+                        case 3:
                             this.reStructureDataSource(dataSource);
                             this.selectedValueObject = this.dataSource;
-                            return [3 /*break*/, 6];
-                        case 3:
+                            return [3 /*break*/, 8];
+                        case 4:
                             dataSource = [];
-                            if (!this.value) return [3 /*break*/, 5];
+                            if (!this.value) return [3 /*break*/, 7];
                             return [4 /*yield*/, this.control.baseService.getDataDropdownByFilter([
                                     this.newFilter(this.control.valueField, exports.Operator.equal, this.value)
                                 ], this.getDropdownOptions(1))];
-                        case 4:
-                            dataSource = _b.sent();
-                            this.fireEventAfterGetDataDropDown(dataSource);
-                            _b.label = 5;
                         case 5:
+                            dataSource = _b.sent();
+                            return [4 /*yield*/, this.fireEventAfterGetDataDropDown(dataSource)];
+                        case 6:
+                            _b.sent();
+                            _b.label = 7;
+                        case 7:
                             this.reStructureDataSource(dataSource);
                             if (this.dataSource.length > 0) {
                                 this.selectedValueObject = this.dataSource[0];
@@ -44706,11 +44752,11 @@
                             else {
                                 this.selectedValueObject = null;
                             }
-                            _b.label = 6;
-                        case 6:
+                            _b.label = 8;
+                        case 8:
                             this.updateSelectedValue();
-                            _b.label = 7;
-                        case 7: return [2 /*return*/];
+                            _b.label = 9;
+                        case 9: return [2 /*return*/];
                     }
                 });
             });
@@ -44776,13 +44822,20 @@
                             return [4 /*yield*/, appendDefaultFilter(filters, this.control.defaultFilters)];
                         case 1:
                             _b.sent();
-                            this.control.baseService.getDataDropdownByFilter(filters, this.getDropdownOptions(obj.length)).then(function (res) {
-                                _this.fireEventAfterGetDataDropDown(res);
-                                _this.reStructureDataSource(res);
-                                _this.results = _this.dataSource;
-                                _this.selectedValueObject = _this.dataSource;
-                                resolve(_this.selectedValueObject);
-                            });
+                            this.control.baseService.getDataDropdownByFilter(filters, this.getDropdownOptions(obj.length)).then(function (res) { return __awaiter(_this, void 0, void 0, function () {
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0: return [4 /*yield*/, this.fireEventAfterGetDataDropDown(res)];
+                                        case 1:
+                                            _b.sent();
+                                            this.reStructureDataSource(res);
+                                            this.results = this.dataSource;
+                                            this.selectedValueObject = this.dataSource;
+                                            resolve(this.selectedValueObject);
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); });
                             return [3 /*break*/, 3];
                         case 2:
                             this.results = [];
@@ -44792,18 +44845,26 @@
                         case 3: return [3 /*break*/, 5];
                         case 4:
                             if (obj != null) {
-                                this.control.baseService.getDataDropdownByFilter([this.newFilter(this.control.valueField, exports.Operator.equal, obj)], this.getDropdownOptions(1)).then(function (res) {
-                                    if ((res === null || res === void 0 ? void 0 : res.length) > 0) {
-                                        _this.fireEventAfterGetDataDropDown(res);
-                                        _this.reStructureDataSource(res);
-                                        _this.results = _this.dataSource;
-                                        _this.selectedValueObject = _this.dataSource[0];
-                                        resolve(_this.selectedValueObject);
-                                        if (_this.control.callBack && _this.control.callBack.select) {
-                                            _this.control.callBack.select(_this.selectedValue);
+                                this.control.baseService.getDataDropdownByFilter([this.newFilter(this.control.valueField, exports.Operator.equal, obj)], this.getDropdownOptions(1)).then(function (res) { return __awaiter(_this, void 0, void 0, function () {
+                                    return __generator(this, function (_b) {
+                                        switch (_b.label) {
+                                            case 0:
+                                                if (!((res === null || res === void 0 ? void 0 : res.length) > 0)) return [3 /*break*/, 2];
+                                                return [4 /*yield*/, this.fireEventAfterGetDataDropDown(res)];
+                                            case 1:
+                                                _b.sent();
+                                                this.reStructureDataSource(res);
+                                                this.results = this.dataSource;
+                                                this.selectedValueObject = this.dataSource[0];
+                                                resolve(this.selectedValueObject);
+                                                if (this.control.callBack && this.control.callBack.select) {
+                                                    this.control.callBack.select(this.selectedValue);
+                                                }
+                                                _b.label = 2;
+                                            case 2: return [2 /*return*/];
                                         }
-                                    }
-                                });
+                                    });
+                                }); });
                             }
                             else {
                                 this.results = [];
@@ -46601,12 +46662,12 @@
                             _b.sent();
                             _b.label = 5;
                         case 5:
-                            if (this.setting.columnSetting.sortField) {
-                                gridInfo.sorts.push({
-                                    field: this.setting.columnSetting.sortField,
-                                    dir: this.setting.columnSetting.sortDir ? 1 : -1
-                                });
-                            }
+                            // if (this.setting.columnSetting.sortField) {
+                            //     gridInfo.sorts.push(<Sort>{
+                            //         field: this.setting.columnSetting.sortField,
+                            //         dir: this.setting.columnSetting.sortDir ? 1 : -1
+                            //     });
+                            // }
                             if (this.searchData && Array.isArray(this.searchData.lstData)) {
                                 gridInfo.filters.push(this.newFilter(this.searchData.fieldFilter, exports.Operator.in, this.searchData.lstData));
                             }
@@ -47341,14 +47402,7 @@
                         case 4:
                             _b.sent();
                             _b.label = 5;
-                        case 5:
-                            if (this.setting.columnSetting.sortField) {
-                                gridInfo.sorts.push({
-                                    field: this.setting.columnSetting.sortField,
-                                    dir: this.setting.columnSetting.sortDir ? 1 : -1
-                                });
-                            }
-                            return [2 /*return*/];
+                        case 5: return [2 /*return*/];
                     }
                 });
             });
@@ -47793,6 +47847,8 @@
             this.setting.fieldSearchText = this.control.fieldSearchText;
             this.setting.showEditLink = !this.readOnly && this.control.showEditLink;
             this.setting.hiddenPageSetting = this.control.hiddenPageSetting;
+            this.setting.columnSetting.sortField = this.control.sortField;
+            this.setting.columnSetting.sortDir = this.control.sortDir;
             this.plusUrl = this.control.plusUrl;
             // Todo: HieuND
             this.control.columns.forEach(function (column) {