tnx-shared 5.3.379 → 5.3.380
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 +4 -2
- 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/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/esm2015/classes/base/list-base.js +2 -1
- package/esm2015/classes/form-schema.js +2 -1
- package/esm2015/components/common-search-form/common-search-form.component.js +3 -3
- package/fesm2015/tnx-shared.js +4 -2
- package/fesm2015/tnx-shared.js.map +1 -1
- package/package.json +2 -2
- package/tnx-shared.metadata.json +1 -1
|
@@ -1106,6 +1106,7 @@
|
|
|
1106
1106
|
this.entityKey = 'id';
|
|
1107
1107
|
this.modelSchemas = [];
|
|
1108
1108
|
this.cols = [];
|
|
1109
|
+
this.rawCols = [];
|
|
1109
1110
|
this.commonSchemas = [];
|
|
1110
1111
|
this.columnSetting = new ColumnSetting();
|
|
1111
1112
|
this.pageSetting = new PageSetting();
|
|
@@ -27376,6 +27377,7 @@
|
|
|
27376
27377
|
this.model.baseReady = false;
|
|
27377
27378
|
if (this.setting.cols) {
|
|
27378
27379
|
this.setting.cols = this.setting.cols.filter(function (q) { return !q.removeOnInit; });
|
|
27380
|
+
Object.assign(this.setting.rawCols, this.setting.cols);
|
|
27379
27381
|
}
|
|
27380
27382
|
this.setting.customGetData = this.customGetData;
|
|
27381
27383
|
this.mergeInfoToColumnSchema();
|
|
@@ -33399,7 +33401,7 @@
|
|
|
33399
33401
|
this.mdWidth = this.parentSetting.mdWidthCommonSearch;
|
|
33400
33402
|
this.setting.baseService = this.parentSetting.baseService;
|
|
33401
33403
|
this.isCustomGenerateSearch = this.parentSetting.commonSchemas.length > 0;
|
|
33402
|
-
var columnFilters = this.parentSetting.
|
|
33404
|
+
var columnFilters = this.parentSetting.rawCols.filter(function (p) { return p.allowFilter && !p.field.startsWith('str'); }).sort(function (a, b) {
|
|
33403
33405
|
if (a.order < b.order) {
|
|
33404
33406
|
return -1;
|
|
33405
33407
|
}
|
|
@@ -33626,7 +33628,7 @@
|
|
|
33626
33628
|
var _a;
|
|
33627
33629
|
if (!data.hasOwnProperty(item) || (!data[item] || data[item].length < 1))
|
|
33628
33630
|
return;
|
|
33629
|
-
var valueField = ((_a = _this.parentSetting.
|
|
33631
|
+
var valueField = ((_a = _this.parentSetting.rawCols.find(function (p) { return p.field === item; })) === null || _a === void 0 ? void 0 : _a.valueField) || 'id';
|
|
33630
33632
|
if (data[item].length) {
|
|
33631
33633
|
data[item] = data[item].map(function (p) { return p[valueField]; });
|
|
33632
33634
|
}
|