@sd-angular/core 1.3.204 → 1.3.206

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.
Files changed (22) hide show
  1. package/bundles/sd-angular-core-grid-material.umd.js +8 -1
  2. package/bundles/sd-angular-core-grid-material.umd.js.map +1 -1
  3. package/bundles/sd-angular-core-grid-material.umd.min.js +2 -2
  4. package/bundles/sd-angular-core-grid-material.umd.min.js.map +1 -1
  5. package/bundles/sd-angular-core-table.umd.js +91 -75
  6. package/bundles/sd-angular-core-table.umd.js.map +1 -1
  7. package/bundles/sd-angular-core-table.umd.min.js +1 -1
  8. package/bundles/sd-angular-core-table.umd.min.js.map +1 -1
  9. package/esm2015/grid-material/src/lib/components/column-inline-filter/column-inline-filter.component.js +4 -1
  10. package/esm2015/grid-material/src/lib/grid-material.component.js +6 -2
  11. package/esm2015/grid-material/src/lib/services/grid-filter/grid-filter.model.js +1 -1
  12. package/esm2015/table/src/lib/table.component.js +17 -6
  13. package/fesm2015/sd-angular-core-grid-material.js +8 -1
  14. package/fesm2015/sd-angular-core-grid-material.js.map +1 -1
  15. package/fesm2015/sd-angular-core-table.js +16 -5
  16. package/fesm2015/sd-angular-core-table.js.map +1 -1
  17. package/grid-material/sd-angular-core-grid-material.metadata.json +1 -1
  18. package/grid-material/src/lib/components/column-inline-filter/column-inline-filter.component.d.ts +2 -1
  19. package/grid-material/src/lib/grid-material.component.d.ts +2 -1
  20. package/grid-material/src/lib/services/grid-filter/grid-filter.model.d.ts +2 -1
  21. package/package.json +1 -1
  22. package/{sd-angular-core-1.3.204.tgz → sd-angular-core-1.3.206.tgz} +0 -0
package/bundles/sd-angular-core-table.umd.js CHANGED
@@ -1370,82 +1370,98 @@
1370
1370
  var rawColumnFilter = filterInfo.rawColumnFilter, orderBy = filterInfo.orderBy, orderDirection = filterInfo.orderDirection, pageSize = filterInfo.pageSize, pageNumber = filterInfo.pageNumber;
1371
1371
  var items = localItems.filter(function (tableItem) {
1372
1372
  var e_5, _8;
1373
- var _a, _b, _c, _d;
1373
+ var _a, _b, _c, _d, _e, _f;
1374
1374
  var item = tableItem.data;
1375
- try {
1376
- for (var columns_1 = __values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
1377
- var column = columns_1_1.value;
1378
- var field = column.field, type = column.type;
1379
- var filterValue = (rawColumnFilter[field] || '').toString().trim().toLowerCase();
1380
- var columnValue = (item[field] || '').toString().trim().toLowerCase();
1381
- if (filterValue) {
1382
- if (!columnValue && type !== 'datetime' && type !== 'date' && type !== 'time') {
1383
- return false;
1375
+ var _loop_1 = function (column) {
1376
+ var field = column.field, type = column.type;
1377
+ var filterValue = (rawColumnFilter[field] || '').toString().trim().toLowerCase();
1378
+ var columnValue = (item[field] || '').toString().trim().toLowerCase();
1379
+ if (filterValue) {
1380
+ if (!columnValue && type !== 'datetime' && type !== 'date' && type !== 'time') {
1381
+ return { value: false };
1382
+ }
1383
+ if (type === 'string') {
1384
+ if (columnValue.indexOf(filterValue) === -1) {
1385
+ return { value: false };
1384
1386
  }
1385
- if (type === 'string') {
1386
- if (columnValue.indexOf(filterValue) === -1) {
1387
- return false;
1387
+ }
1388
+ else if (type === 'values' || type === 'lazy-values') {
1389
+ var columnType_1 = column;
1390
+ var isMultiple = ['MULTIPLE'].includes(columnType_1.option.selection);
1391
+ if (isMultiple) {
1392
+ var columnValues_1 = (_a = item[field].map(function (i) { var _a; return ((_a = i[columnType_1.option.valueField]) !== null && _a !== void 0 ? _a : '').toString().trim().toLowerCase(); })) !== null && _a !== void 0 ? _a : [];
1393
+ var filterValues = (_b = rawColumnFilter[field]) === null || _b === void 0 ? void 0 : _b.map(function (v) { return (v !== null && v !== void 0 ? v : '').toString().trim().toLowerCase(); });
1394
+ if ((filterValues === null || filterValues === void 0 ? void 0 : filterValues.length) && filterValues.some(function (fv) { return !columnValues_1.includes(fv); })) {
1395
+ return { value: false };
1388
1396
  }
1389
1397
  }
1390
- else if (type === 'values' || type === 'lazy-values') {
1398
+ else {
1391
1399
  if (columnValue !== filterValue) {
1392
- return false;
1400
+ return { value: false };
1393
1401
  }
1394
1402
  }
1395
- else if (type === 'number') {
1396
- var fValue = +filterValue.replace('>=', '').replace('<=', '').replace('>', '').replace('<', '');
1397
- var cValue = +columnValue;
1398
- if (fValue || fValue === 0) {
1399
- if (!cValue && cValue !== 0) {
1400
- return false;
1401
- }
1402
- if (filterValue.indexOf('>=') > -1 && cValue < fValue) {
1403
- return false;
1404
- }
1405
- else if (filterValue.indexOf('<=') > -1 && cValue > fValue) {
1406
- return false;
1407
- }
1408
- else if (filterValue.indexOf('<') > -1 && cValue >= fValue) {
1409
- return false;
1410
- }
1411
- else if (filterValue.indexOf('>') > -1 && cValue <= fValue) {
1412
- return false;
1413
- }
1414
- else if (cValue !== fValue) {
1415
- return false;
1416
- }
1403
+ }
1404
+ else if (type === 'number') {
1405
+ var fValue = +filterValue.replace('>=', '').replace('<=', '').replace('>', '').replace('<', '');
1406
+ var cValue = +columnValue;
1407
+ if (fValue || fValue === 0) {
1408
+ if (!cValue && cValue !== 0) {
1409
+ return { value: false };
1417
1410
  }
1418
- }
1419
- else if (type === 'bool') {
1420
- if (filterValue === '1' && columnValue !== '1' && columnValue !== 'true') {
1421
- return false;
1411
+ if (filterValue.indexOf('>=') > -1 && cValue < fValue) {
1412
+ return { value: false };
1422
1413
  }
1423
- else if (filterValue === '0' && columnValue !== '0' && columnValue !== 'false') {
1424
- return false;
1414
+ else if (filterValue.indexOf('<=') > -1 && cValue > fValue) {
1415
+ return { value: false };
1416
+ }
1417
+ else if (filterValue.indexOf('<') > -1 && cValue >= fValue) {
1418
+ return { value: false };
1419
+ }
1420
+ else if (filterValue.indexOf('>') > -1 && cValue <= fValue) {
1421
+ return { value: false };
1422
+ }
1423
+ else if (cValue !== fValue) {
1424
+ return { value: false };
1425
1425
  }
1426
1426
  }
1427
- else if (type === 'datetime' || type === 'date' || type === 'time') {
1428
- var from = (_b = (_a = rawColumnFilter[field]) === null || _a === void 0 ? void 0 : _a.from) !== null && _b !== void 0 ? _b : rawColumnFilter[field];
1429
- var to = (_d = (_c = rawColumnFilter[field]) === null || _c === void 0 ? void 0 : _c.to) !== null && _d !== void 0 ? _d : rawColumnFilter[field];
1430
- var fromDate = Date.begin(from);
1431
- var toDate = Date.end(to);
1432
- if (fromDate || toDate) {
1433
- if (!columnValue) {
1434
- return false;
1435
- }
1436
- var columnTime = new Date(columnValue).getTime();
1437
- var fromDateTime = (fromDate === null || fromDate === void 0 ? void 0 : fromDate.getTime()) || null;
1438
- var toDateTime = (toDate === null || toDate === void 0 ? void 0 : toDate.getTime()) || null;
1439
- if (fromDateTime && fromDateTime > columnTime) {
1440
- return false;
1441
- }
1442
- if (toDateTime && columnTime > toDateTime) {
1443
- return false;
1444
- }
1427
+ }
1428
+ else if (type === 'bool') {
1429
+ if (filterValue === '1' && columnValue !== '1' && columnValue !== 'true') {
1430
+ return { value: false };
1431
+ }
1432
+ else if (filterValue === '0' && columnValue !== '0' && columnValue !== 'false') {
1433
+ return { value: false };
1434
+ }
1435
+ }
1436
+ else if (type === 'datetime' || type === 'date' || type === 'time') {
1437
+ var from = (_d = (_c = rawColumnFilter[field]) === null || _c === void 0 ? void 0 : _c.from) !== null && _d !== void 0 ? _d : rawColumnFilter[field];
1438
+ var to = (_f = (_e = rawColumnFilter[field]) === null || _e === void 0 ? void 0 : _e.to) !== null && _f !== void 0 ? _f : rawColumnFilter[field];
1439
+ var fromDate = Date.begin(from);
1440
+ var toDate = Date.end(to);
1441
+ if (fromDate || toDate) {
1442
+ if (!columnValue) {
1443
+ return { value: false };
1444
+ }
1445
+ var columnTime = new Date(columnValue).getTime();
1446
+ var fromDateTime = (fromDate === null || fromDate === void 0 ? void 0 : fromDate.getTime()) || null;
1447
+ var toDateTime = (toDate === null || toDate === void 0 ? void 0 : toDate.getTime()) || null;
1448
+ if (fromDateTime && fromDateTime > columnTime) {
1449
+ return { value: false };
1450
+ }
1451
+ if (toDateTime && columnTime > toDateTime) {
1452
+ return { value: false };
1445
1453
  }
1446
1454
  }
1447
1455
  }
1448
1456
  }
1457
+ };
1458
+ try {
1459
+ for (var columns_1 = __values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
1460
+ var column = columns_1_1.value;
1461
+ var state_1 = _loop_1(column);
1462
+ if (typeof state_1 === "object")
1463
+ return state_1.value;
1464
+ }
1449
1465
  }
1450
1466
  catch (e_5_1) { e_5 = { error: e_5_1 }; }
1451
1467
  finally {
@@ -1694,7 +1710,7 @@
1694
1710
  items_1 = [];
1695
1711
  promises_1 = [];
1696
1712
  handleData = function () { return __awaiter(_this, void 0, void 0, function () {
1697
- var _u, results, results_1, results_1_1, result, results_2, totalPage, percent, allColumns, allExportedColumns, _loop_1, exportItems_2, exportItems_2_1, item, e_7_1;
1713
+ var _u, results, results_1, results_1_1, result, results_2, totalPage, percent, allColumns, allExportedColumns, _loop_2, exportItems_2, exportItems_2_1, item, e_7_1;
1698
1714
  var e_8, _8, e_7, _9;
1699
1715
  var _this = this;
1700
1716
  return __generator(this, function (_10) {
@@ -1739,7 +1755,7 @@
1739
1755
  this.exportTitle = "Exporting..." + percent + "%";
1740
1756
  allColumns = __classPrivateFieldGet(this, _allColumns).call(this);
1741
1757
  allExportedColumns = __classPrivateFieldGet(this, _allExportedColumns).call(this);
1742
- _loop_1 = function (item) {
1758
+ _loop_2 = function (item) {
1743
1759
  var obj, handle, columns_3, columns_3_1, exportColumn, e_9_1;
1744
1760
  var e_9, _8;
1745
1761
  return __generator(this, function (_9) {
@@ -1878,7 +1894,7 @@
1878
1894
  case 6:
1879
1895
  if (!!exportItems_2_1.done) return [3 /*break*/, 9];
1880
1896
  item = exportItems_2_1.value;
1881
- return [5 /*yield**/, _loop_1(item)];
1897
+ return [5 /*yield**/, _loop_2(item)];
1882
1898
  case 7:
1883
1899
  _10.sent();
1884
1900
  _10.label = 8;
@@ -2129,13 +2145,13 @@
2129
2145
  };
2130
2146
  this.detectChanges = function () { return _this.ref.detectChanges(); };
2131
2147
  _loadValues.set(this, function (columns) { return __awaiter(_this, void 0, void 0, function () {
2132
- var promises, _loop_2, this_1, columns_5, columns_5_1, column, results, _loop_3, this_2, results_3, results_3_1, result;
2148
+ var promises, _loop_3, this_1, columns_5, columns_5_1, column, results, _loop_4, this_2, results_3, results_3_1, result;
2133
2149
  var e_10, _8, e_11, _9;
2134
2150
  return __generator(this, function (_10) {
2135
2151
  switch (_10.label) {
2136
2152
  case 0:
2137
2153
  promises = [];
2138
- _loop_2 = function (column) {
2154
+ _loop_3 = function (column) {
2139
2155
  if (column.type === 'values' && !this_1.cacheValues[column.field]) {
2140
2156
  if (typeof column.option.items === 'function') {
2141
2157
  promises.push(column.option
@@ -2172,7 +2188,7 @@
2172
2188
  try {
2173
2189
  for (columns_5 = __values(columns), columns_5_1 = columns_5.next(); !columns_5_1.done; columns_5_1 = columns_5.next()) {
2174
2190
  column = columns_5_1.value;
2175
- _loop_2(column);
2191
+ _loop_3(column);
2176
2192
  }
2177
2193
  }
2178
2194
  catch (e_10_1) { e_10 = { error: e_10_1 }; }
@@ -2186,7 +2202,7 @@
2186
2202
  return [4 /*yield*/, Promise.all(promises)];
2187
2203
  case 1:
2188
2204
  results = _10.sent();
2189
- _loop_3 = function (result) {
2205
+ _loop_4 = function (result) {
2190
2206
  this_2.cacheValues[result.key] = result.data.map(function (e) {
2191
2207
  var _8;
2192
2208
  return (_8 = {},
@@ -2200,7 +2216,7 @@
2200
2216
  try {
2201
2217
  for (results_3 = __values(results), results_3_1 = results_3.next(); !results_3_1.done; results_3_1 = results_3.next()) {
2202
2218
  result = results_3_1.value;
2203
- _loop_3(result);
2219
+ _loop_4(result);
2204
2220
  }
2205
2221
  }
2206
2222
  catch (e_11_1) { e_11 = { error: e_11_1 }; }
@@ -2216,15 +2232,15 @@
2216
2232
  });
2217
2233
  }); });
2218
2234
  _format.set(this, function (rawItems, columns) { return __awaiter(_this, void 0, void 0, function () {
2219
- var _5, _6, _7, items, _loop_4, this_3, columns_6, columns_6_1, column, e_12_1;
2235
+ var _5, _6, _7, items, _loop_5, this_3, columns_6, columns_6_1, column, e_12_1;
2220
2236
  var e_12, _8;
2221
2237
  var _this = this;
2222
2238
  return __generator(this, function (_9) {
2223
2239
  switch (_9.label) {
2224
2240
  case 0:
2225
2241
  items = rawItems.map(MapToSdTableItem);
2226
- _loop_4 = function (column) {
2227
- var field, cellStyle, click, tooltip, htmlTemplate, transform, _8, views, mapValue_1, values_1, lazyItems, _loop_5, items_2, items_2_1, item, e_13_1;
2242
+ _loop_5 = function (column) {
2243
+ var field, cellStyle, click, tooltip, htmlTemplate, transform, _8, views, mapValue_1, values_1, lazyItems, _loop_6, items_2, items_2_1, item, e_13_1;
2228
2244
  var e_13, _9;
2229
2245
  return __generator(this, function (_10) {
2230
2246
  switch (_10.label) {
@@ -2263,7 +2279,7 @@
2263
2279
  Object.assign(__classPrivateFieldGet(this_3, _cacheObjValues)[field], Array.toObject(lazyItems, column.option.valueField) || {});
2264
2280
  _10.label = 2;
2265
2281
  case 2:
2266
- _loop_5 = function (item) {
2282
+ _loop_6 = function (item) {
2267
2283
  var rowData, value, display, newValue, _8, date, time, val, vals, vals, option;
2268
2284
  return __generator(this, function (_9) {
2269
2285
  switch (_9.label) {
@@ -2367,7 +2383,7 @@
2367
2383
  case 4:
2368
2384
  if (!!items_2_1.done) return [3 /*break*/, 7];
2369
2385
  item = items_2_1.value;
2370
- return [5 /*yield**/, _loop_5(item)];
2386
+ return [5 /*yield**/, _loop_6(item)];
2371
2387
  case 5:
2372
2388
  _10.sent();
2373
2389
  _10.label = 6;
@@ -2398,7 +2414,7 @@
2398
2414
  case 2:
2399
2415
  if (!!columns_6_1.done) return [3 /*break*/, 5];
2400
2416
  column = columns_6_1.value;
2401
- return [5 /*yield**/, _loop_4(column)];
2417
+ return [5 /*yield**/, _loop_5(column)];
2402
2418
  case 3:
2403
2419
  _9.sent();
2404
2420
  _9.label = 4;