tnx-shared 5.3.339 → 5.3.340
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 +3 -3
- 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/components/user-picker/user-picker.component.js +4 -4
- package/fesm2015/tnx-shared.js +3 -3
- package/fesm2015/tnx-shared.js.map +1 -1
- package/package.json +2 -2
|
@@ -54966,7 +54966,7 @@
|
|
|
54966
54966
|
UserPickerComponent.prototype.ngOnInit = function () {
|
|
54967
54967
|
var _this = this;
|
|
54968
54968
|
this.control._component = this;
|
|
54969
|
-
var commonFieldPlus = 'maChucVu,lstTenDonVi';
|
|
54969
|
+
var commonFieldPlus = 'maChucVu,lstTenDonVi,idsDonVi';
|
|
54970
54970
|
this.controlPicker = new EntityPickerControlSchema(Object.assign(Object.assign({}, this.control), { field: 'arrIdNguoiDung', label: 'Người dùng', title: 'Chọn người dùng', baseService: this._userV5Service, required: true, displayField: this.control.getDisplayName ? 'displayName' : this.control.displayField, fieldPlus: this.control.fieldPlus ? this.control.fieldPlus + "," + commonFieldPlus : commonFieldPlus, valueField: this.control.valueField, defaultFilters: function () { return __awaiter(_this, void 0, void 0, function () {
|
|
54971
54971
|
var filters;
|
|
54972
54972
|
return __generator(this, function (_b) {
|
|
@@ -55513,8 +55513,8 @@
|
|
|
55513
55513
|
temp.label = item[this.controlPicker.displayField];
|
|
55514
55514
|
}
|
|
55515
55515
|
else {
|
|
55516
|
-
|
|
55517
|
-
temp.label = (item.maChucVu ? item.maChucVu + ". " : '') + ("" + (temp.label || this.getDisplayName(item))) + (tenDonVi ? " - " + tenDonVi : '');
|
|
55516
|
+
// const tenDonVi = item.lstTenDonVi && item.lstTenDonVi.length > 0 ? item.lstTenDonVi.split(',')[0] : '';
|
|
55517
|
+
temp.label = (item.maChucVu ? item.maChucVu + ". " : '') + ("" + (temp.label || this.getDisplayName(item))) + (item.tenDonVi ? " - " + item.tenDonVi : '');
|
|
55518
55518
|
}
|
|
55519
55519
|
temp.value._dropdownvalue = this.controlPicker.valueField;
|
|
55520
55520
|
return temp;
|