tnx-shared 5.3.338 → 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 +12 -5
- 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-list-base.d.ts.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-dialog/components/entity-picker-data/entity-picker-data.component.d.ts.map +1 -1
- package/components/entity-picker/entity-picker-dialog/components/entity-picker-selected/entity-picker-selected.component.d.ts.map +1 -1
- package/esm2015/classes/base/data-list-base.js +1 -1
- package/esm2015/classes/form-schema.js +2 -1
- package/esm2015/components/entity-picker/entity-picker-dialog/components/entity-picker-data/entity-picker-data.component.js +5 -2
- package/esm2015/components/entity-picker/entity-picker-dialog/components/entity-picker-selected/entity-picker-selected.component.js +5 -2
- package/esm2015/components/user-picker/user-picker.component.js +4 -4
- package/fesm2015/tnx-shared.js +12 -5
- package/fesm2015/tnx-shared.js.map +1 -1
- package/package.json +2 -2
- package/tnx-shared.metadata.json +1 -1
|
@@ -2313,6 +2313,7 @@
|
|
|
2313
2313
|
// Nếu có value nghĩa là những cột này cần phải lấy dữ liệu xong rồi mới đến cột khác
|
|
2314
2314
|
_this.order = 1;
|
|
2315
2315
|
_this.mdWidthInSearch = 12;
|
|
2316
|
+
_this.showExtendContent = false;
|
|
2316
2317
|
_this.min = 0;
|
|
2317
2318
|
_this.max = 99999999999;
|
|
2318
2319
|
_this.isForeignField = false;
|
|
@@ -46707,7 +46708,10 @@
|
|
|
46707
46708
|
dataSource: column.dataSource,
|
|
46708
46709
|
groupCode: column.groupCode,
|
|
46709
46710
|
isOverrideFilter: column.isOverrideFilter,
|
|
46710
|
-
order: column.order
|
|
46711
|
+
order: column.order,
|
|
46712
|
+
isTree: column.isTree,
|
|
46713
|
+
fieldTree: column.fieldTree,
|
|
46714
|
+
valueParentRoot: column.valueParentRoot,
|
|
46711
46715
|
});
|
|
46712
46716
|
if (column.dataType == 'custom') {
|
|
46713
46717
|
newCol.dataType = column.code;
|
|
@@ -46979,7 +46983,10 @@
|
|
|
46979
46983
|
dataSource: column.dataSource,
|
|
46980
46984
|
groupCode: column.groupCode,
|
|
46981
46985
|
isOverrideFilter: column.isOverrideFilter,
|
|
46982
|
-
order: column.order
|
|
46986
|
+
order: column.order,
|
|
46987
|
+
isTree: column.isTree,
|
|
46988
|
+
fieldTree: column.fieldTree,
|
|
46989
|
+
valueParentRoot: column.valueParentRoot,
|
|
46983
46990
|
});
|
|
46984
46991
|
if (column.dataType == 'custom') {
|
|
46985
46992
|
newCol.dataType = column.code;
|
|
@@ -54959,7 +54966,7 @@
|
|
|
54959
54966
|
UserPickerComponent.prototype.ngOnInit = function () {
|
|
54960
54967
|
var _this = this;
|
|
54961
54968
|
this.control._component = this;
|
|
54962
|
-
var commonFieldPlus = 'maChucVu,lstTenDonVi';
|
|
54969
|
+
var commonFieldPlus = 'maChucVu,lstTenDonVi,idsDonVi';
|
|
54963
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 () {
|
|
54964
54971
|
var filters;
|
|
54965
54972
|
return __generator(this, function (_b) {
|
|
@@ -55506,8 +55513,8 @@
|
|
|
55506
55513
|
temp.label = item[this.controlPicker.displayField];
|
|
55507
55514
|
}
|
|
55508
55515
|
else {
|
|
55509
|
-
|
|
55510
|
-
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 : '');
|
|
55511
55518
|
}
|
|
55512
55519
|
temp.value._dropdownvalue = this.controlPicker.valueField;
|
|
55513
55520
|
return temp;
|