tnx-shared 5.3.337 → 5.3.338
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 +25 -7
- 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/classes/base/data-form-base.d.ts +2 -2
- package/classes/base/data-form-base.d.ts.map +1 -1
- package/esm2015/classes/base/data-form-base.js +5 -5
- package/esm2015/models/export-item.js +1 -1
- package/esm2015/services/canbo-hoso.service.js +22 -4
- package/fesm2015/tnx-shared.js +25 -7
- package/fesm2015/tnx-shared.js.map +1 -1
- package/package.json +2 -2
- package/services/canbo-hoso.service.d.ts +1 -0
- package/services/canbo-hoso.service.d.ts.map +1 -1
- package/tnx-shared.metadata.json +1 -1
|
@@ -19680,7 +19680,7 @@
|
|
|
19680
19680
|
});
|
|
19681
19681
|
return [3 /*break*/, 3];
|
|
19682
19682
|
case 2:
|
|
19683
|
-
this.handleInsertError();
|
|
19683
|
+
this.handleInsertError(response);
|
|
19684
19684
|
_e.label = 3;
|
|
19685
19685
|
case 3: return [2 /*return*/];
|
|
19686
19686
|
}
|
|
@@ -19700,7 +19700,7 @@
|
|
|
19700
19700
|
DataFormBase.prototype.getPromiseActionInsert = function () {
|
|
19701
19701
|
return this.setting.baseService.post(this.model.data, this.insertPlusUrl);
|
|
19702
19702
|
};
|
|
19703
|
-
DataFormBase.prototype.handleInsertError = function () {
|
|
19703
|
+
DataFormBase.prototype.handleInsertError = function (response) {
|
|
19704
19704
|
};
|
|
19705
19705
|
DataFormBase.prototype.onUpdate = function () {
|
|
19706
19706
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -19725,7 +19725,7 @@
|
|
|
19725
19725
|
});
|
|
19726
19726
|
return [3 /*break*/, 3];
|
|
19727
19727
|
case 2:
|
|
19728
|
-
this.handleUpdateError();
|
|
19728
|
+
this.handleUpdateError(response);
|
|
19729
19729
|
_e.label = 3;
|
|
19730
19730
|
case 3: return [2 /*return*/];
|
|
19731
19731
|
}
|
|
@@ -19745,7 +19745,7 @@
|
|
|
19745
19745
|
});
|
|
19746
19746
|
});
|
|
19747
19747
|
};
|
|
19748
|
-
DataFormBase.prototype.handleUpdateError = function () {
|
|
19748
|
+
DataFormBase.prototype.handleUpdateError = function (response) {
|
|
19749
19749
|
};
|
|
19750
19750
|
DataFormBase.prototype.getPromiseActionUpdate = function () {
|
|
19751
19751
|
return this.setting.baseService.put(this.model.data.id.toString(), this.model.data, this.updatePlusUrl);
|
|
@@ -20838,7 +20838,7 @@
|
|
|
20838
20838
|
width: '200px',
|
|
20839
20839
|
}));
|
|
20840
20840
|
}
|
|
20841
|
-
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:
|
|
20841
|
+
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: control.fieldPlus, fieldSearchText: ['email', 'code'], funcGetLabel: function (item) {
|
|
20842
20842
|
var result = item.hoVaTen;
|
|
20843
20843
|
if (item.code) {
|
|
20844
20844
|
result = item.code + " - " + result + " ";
|
|
@@ -20926,8 +20926,26 @@
|
|
|
20926
20926
|
result.fieldPlus += ',idNgachVienChuc';
|
|
20927
20927
|
}
|
|
20928
20928
|
}
|
|
20929
|
-
if (!result.isOverrideColumns)
|
|
20930
|
-
result.fieldPlus = 'idNgachVienChuc,ngaySinh,ngaySinh2,chucDanhs,idHocHam,idHocVi,dienThoaiDiDong,code';
|
|
20929
|
+
if (!result.isOverrideColumns && !result.fieldPlus) {
|
|
20930
|
+
result.fieldPlus = 'idNgachVienChuc,ngaySinh,ngaySinh2,chucDanhs,idHocHam,idHocVi,dienThoaiDiDong,code,email';
|
|
20931
|
+
}
|
|
20932
|
+
else {
|
|
20933
|
+
result.fieldPlus += result.fieldPlus ? ',code' : 'code';
|
|
20934
|
+
}
|
|
20935
|
+
return result;
|
|
20936
|
+
};
|
|
20937
|
+
CanBoHoSoService.prototype.generatePickerControlSchemaSimple = function (control) {
|
|
20938
|
+
var columns = __spreadArray([], __read(this.lstEntityPickerColumn));
|
|
20939
|
+
var result = new AutoCompletePickerControlSchema(Object.assign({ field: 'idCanBo', label: 'Cán bộ', title: 'Chọn cán bộ', multiple: false, baseService: this, displayField: 'hoVaTen', fieldPlus: 'code', fieldSearchText: ['email', 'code'], funcGetLabel: function (item) {
|
|
20940
|
+
var result = item.hoVaTen;
|
|
20941
|
+
if (item.code) {
|
|
20942
|
+
result = item.code + " - " + result + " ";
|
|
20943
|
+
}
|
|
20944
|
+
if (item.lstTenDonVi) {
|
|
20945
|
+
result += "- " + item.lstTenDonVi;
|
|
20946
|
+
}
|
|
20947
|
+
return result;
|
|
20948
|
+
}, required: true, columns: columns }, control));
|
|
20931
20949
|
return result;
|
|
20932
20950
|
};
|
|
20933
20951
|
CanBoHoSoService.prototype.getTenDonVi = function (dataSource) {
|