tnx-shared 5.3.339 → 5.3.341
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 +7 -4
- 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/form-schema.d.ts +1 -0
- package/classes/form-schema.d.ts.map +1 -1
- package/components/entity-picker/entity-picker.component.d.ts.map +1 -1
- package/esm2015/classes/form-schema.js +1 -1
- package/esm2015/components/entity-picker/entity-picker.component.js +5 -2
- package/esm2015/components/user-picker/user-picker.component.js +4 -4
- package/fesm2015/tnx-shared.js +7 -4
- package/fesm2015/tnx-shared.js.map +1 -1
- package/package.json +2 -2
- package/tnx-shared.metadata.json +1 -1
|
@@ -47963,7 +47963,10 @@
|
|
|
47963
47963
|
if (this.control.useDefaultPluslUrlInList) {
|
|
47964
47964
|
this.plusUrl = this.control.plusUrl;
|
|
47965
47965
|
}
|
|
47966
|
-
if (this.control.
|
|
47966
|
+
if (this.control.pageSizeOfList) {
|
|
47967
|
+
this.setting.pageSetting.pageSize = this.control.pageSizeOfList;
|
|
47968
|
+
}
|
|
47969
|
+
else if (this.control.pageSize) {
|
|
47967
47970
|
this.setting.pageSetting.pageSize = this.control.pageSize;
|
|
47968
47971
|
}
|
|
47969
47972
|
this.setting.cols = [];
|
|
@@ -54966,7 +54969,7 @@
|
|
|
54966
54969
|
UserPickerComponent.prototype.ngOnInit = function () {
|
|
54967
54970
|
var _this = this;
|
|
54968
54971
|
this.control._component = this;
|
|
54969
|
-
var commonFieldPlus = 'maChucVu,lstTenDonVi';
|
|
54972
|
+
var commonFieldPlus = 'maChucVu,lstTenDonVi,idsDonVi';
|
|
54970
54973
|
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
54974
|
var filters;
|
|
54972
54975
|
return __generator(this, function (_b) {
|
|
@@ -55513,8 +55516,8 @@
|
|
|
55513
55516
|
temp.label = item[this.controlPicker.displayField];
|
|
55514
55517
|
}
|
|
55515
55518
|
else {
|
|
55516
|
-
|
|
55517
|
-
temp.label = (item.maChucVu ? item.maChucVu + ". " : '') + ("" + (temp.label || this.getDisplayName(item))) + (tenDonVi ? " - " + tenDonVi : '');
|
|
55519
|
+
// const tenDonVi = item.lstTenDonVi && item.lstTenDonVi.length > 0 ? item.lstTenDonVi.split(',')[0] : '';
|
|
55520
|
+
temp.label = (item.maChucVu ? item.maChucVu + ". " : '') + ("" + (temp.label || this.getDisplayName(item))) + (item.tenDonVi ? " - " + item.tenDonVi : '');
|
|
55518
55521
|
}
|
|
55519
55522
|
temp.value._dropdownvalue = this.controlPicker.valueField;
|
|
55520
55523
|
return temp;
|