fixa-admin 0.0.62 → 0.0.63
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/fesm2022/fixa-admin.mjs
CHANGED
|
@@ -817,7 +817,6 @@ class GridComponent {
|
|
|
817
817
|
}
|
|
818
818
|
set filterItems(v) {
|
|
819
819
|
if (v != null && v.length > 0) {
|
|
820
|
-
debugger;
|
|
821
820
|
this._filterItems = v;
|
|
822
821
|
v.forEach((el) => {
|
|
823
822
|
if (!this._filterBoxItems.find((item) => item.field == el.field)) {
|
|
@@ -853,18 +852,10 @@ class GridComponent {
|
|
|
853
852
|
}
|
|
854
853
|
else if (el.type == 'boolean') {
|
|
855
854
|
items.push({
|
|
856
|
-
label: this._translate.
|
|
857
|
-
next: (value) => {
|
|
858
|
-
return value;
|
|
859
|
-
},
|
|
860
|
-
}),
|
|
855
|
+
label: this._translate.instant("true"),
|
|
861
856
|
value: true
|
|
862
857
|
}, {
|
|
863
|
-
label: this._translate.
|
|
864
|
-
next: (value) => {
|
|
865
|
-
return value;
|
|
866
|
-
},
|
|
867
|
-
}),
|
|
858
|
+
label: this._translate.instant("false"),
|
|
868
859
|
value: false
|
|
869
860
|
});
|
|
870
861
|
this._filterBoxItems.push({
|
|
@@ -908,7 +899,7 @@ class GridComponent {
|
|
|
908
899
|
}
|
|
909
900
|
}
|
|
910
901
|
get column() {
|
|
911
|
-
return this.
|
|
902
|
+
return this._column;
|
|
912
903
|
}
|
|
913
904
|
set column(v) {
|
|
914
905
|
setTimeout(() => {
|
|
@@ -1020,11 +1011,7 @@ class GridComponent {
|
|
|
1020
1011
|
filterParams,
|
|
1021
1012
|
cellRenderer: params => {
|
|
1022
1013
|
if (params.value) {
|
|
1023
|
-
return this._translate.
|
|
1024
|
-
next: (value) => {
|
|
1025
|
-
return value;
|
|
1026
|
-
},
|
|
1027
|
-
});
|
|
1014
|
+
return this._translate.instant(params.value);
|
|
1028
1015
|
}
|
|
1029
1016
|
else {
|
|
1030
1017
|
return '';
|
|
@@ -1163,11 +1150,7 @@ class GridComponent {
|
|
|
1163
1150
|
case 'enum':
|
|
1164
1151
|
Object.keys(el.filterItems).forEach((item) => {
|
|
1165
1152
|
items.push({
|
|
1166
|
-
label: this._translate.
|
|
1167
|
-
next: (value) => {
|
|
1168
|
-
return value;
|
|
1169
|
-
},
|
|
1170
|
-
}),
|
|
1153
|
+
label: this._translate.instant(el.filterItems[item]),
|
|
1171
1154
|
value: el.filterItems[item]
|
|
1172
1155
|
});
|
|
1173
1156
|
});
|
|
@@ -1175,18 +1158,10 @@ class GridComponent {
|
|
|
1175
1158
|
case 'boolean':
|
|
1176
1159
|
Object.keys(el.filterItems).forEach((item) => {
|
|
1177
1160
|
items.push({
|
|
1178
|
-
label: this._translate.
|
|
1179
|
-
next: (value) => {
|
|
1180
|
-
return value;
|
|
1181
|
-
},
|
|
1182
|
-
}),
|
|
1161
|
+
label: this._translate.instant("true"),
|
|
1183
1162
|
value: true
|
|
1184
1163
|
}, {
|
|
1185
|
-
label: this._translate.
|
|
1186
|
-
next: (value) => {
|
|
1187
|
-
return value;
|
|
1188
|
-
},
|
|
1189
|
-
}),
|
|
1164
|
+
label: this._translate.instant("false"),
|
|
1190
1165
|
value: false
|
|
1191
1166
|
});
|
|
1192
1167
|
});
|
|
@@ -1419,7 +1394,6 @@ class GridComponent {
|
|
|
1419
1394
|
return item.label;
|
|
1420
1395
|
}
|
|
1421
1396
|
if (item.children && item.children.length > 0) {
|
|
1422
|
-
debugger;
|
|
1423
1397
|
const found = findItemByValue(item.children, targetValue);
|
|
1424
1398
|
if (found) {
|
|
1425
1399
|
return found;
|
|
@@ -1473,9 +1447,12 @@ class GridComponent {
|
|
|
1473
1447
|
.pipe(debounceTime(500))
|
|
1474
1448
|
.pipe(distinctUntilChanged())
|
|
1475
1449
|
.subscribe((c) => {
|
|
1476
|
-
|
|
1477
|
-
item.items
|
|
1478
|
-
|
|
1450
|
+
if (c.target.value != null && c.target.value != "") {
|
|
1451
|
+
this._filterItems.find((el) => el.field == item.field).items(c.target.value).then((res) => {
|
|
1452
|
+
item.items = res;
|
|
1453
|
+
this._cdr.detectChanges();
|
|
1454
|
+
});
|
|
1455
|
+
}
|
|
1479
1456
|
});
|
|
1480
1457
|
}
|
|
1481
1458
|
this.searchChangeObserver.next(event);
|
|
@@ -1528,6 +1505,10 @@ class GridComponent {
|
|
|
1528
1505
|
operator = FilterOperator.equals;
|
|
1529
1506
|
value = `${params.request.filterModel[key].time.substr(0, 2)}:${params.request.filterModel[key].time.substr(2, 2)}:${params.request.filterModel[key].time.substr(4, 2)}`;
|
|
1530
1507
|
}
|
|
1508
|
+
else if (params.request.filterModel[key].type && params.request.filterModel[key].type == 'inRange') {
|
|
1509
|
+
operator = FilterOperator.between;
|
|
1510
|
+
value = [params.request.filterModel[key].filter, params.request.filterModel[key].filterTo];
|
|
1511
|
+
}
|
|
1531
1512
|
else {
|
|
1532
1513
|
if (FilterOperator[params.request.filterModel[key].type]) {
|
|
1533
1514
|
operator = FilterOperator[params.request.filterModel[key].type];
|
|
@@ -1543,11 +1524,11 @@ class GridComponent {
|
|
|
1543
1524
|
this.filterItemsValues.push({
|
|
1544
1525
|
field: findEl.field,
|
|
1545
1526
|
label: findEl.label,
|
|
1546
|
-
value: value
|
|
1527
|
+
value: typeof value == 'object' && value.length == 2 ? value[0] + '-' + value[1] : value
|
|
1547
1528
|
});
|
|
1548
1529
|
}
|
|
1549
1530
|
else {
|
|
1550
|
-
findFilterItemsEl.value = value;
|
|
1531
|
+
findFilterItemsEl.value = typeof value == 'object' && value.length == 2 ? value[0] + '-' + value[1] : value;
|
|
1551
1532
|
}
|
|
1552
1533
|
filter.filters.push({
|
|
1553
1534
|
disable: false,
|