@sd-angular/core 1.3.201 → 1.3.202

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.
@@ -1195,9 +1195,16 @@ class SdTable {
1195
1195
  obj[column.field] = Date.toFormat(date, 'HH:mm');
1196
1196
  }
1197
1197
  else if (column.type === 'values' || column.type === 'lazy-values') {
1198
- // Nếu là values thì lấy giá trị của value được chọn
1199
- obj[column.field] =
1200
- ((_z = (_y = __classPrivateFieldGet(this, _cacheObjValues)[column.field]) === null || _y === void 0 ? void 0 : _y[item[column.field]]) === null || _z === void 0 ? void 0 : _z[column.option.displayField]) || item[column.field];
1198
+ const value = item[column.field];
1199
+ if (column.type === 'lazy-values' && typeof column.option.mapValue === 'function') {
1200
+ const val = column.option.mapValue(value, item);
1201
+ const vals = (Array.isArray(val) ? val : [val]).filter(e => !!(e === null || e === void 0 ? void 0 : e.toString()));
1202
+ obj[column.field] = (_y = vals.map(val => { var _a, _b; return ((_b = (_a = __classPrivateFieldGet(this, _cacheObjValues)[column.field]) === null || _a === void 0 ? void 0 : _a[val]) === null || _b === void 0 ? void 0 : _b[column.option.displayField]) || val; })) === null || _y === void 0 ? void 0 : _y.join(', ');
1203
+ }
1204
+ else {
1205
+ const vals = (Array.isArray(value) ? value : [value]).filter(e => !!(e === null || e === void 0 ? void 0 : e.toString()));
1206
+ obj[column.field] = (_z = vals.map(val => { var _a, _b; return ((_b = (_a = __classPrivateFieldGet(this, _cacheObjValues)[column.field]) === null || _a === void 0 ? void 0 : _a[val]) === null || _b === void 0 ? void 0 : _b[column.option.displayField]) || val; })) === null || _z === void 0 ? void 0 : _z.join(', ');
1207
+ }
1201
1208
  }
1202
1209
  else {
1203
1210
  obj[column.field] = item[column.field];
@@ -1443,7 +1450,7 @@ class SdTable {
1443
1450
  }
1444
1451
  }));
1445
1452
  _format.set(this, (rawItems, columns) => __awaiter(this, void 0, void 0, function* () {
1446
- var _5, _6, _7, _8, _9;
1453
+ var _5, _6, _7;
1447
1454
  const items = rawItems.map(MapToSdTableItem);
1448
1455
  for (const column of columns) {
1449
1456
  // Clickable
@@ -1459,7 +1466,9 @@ class SdTable {
1459
1466
  }
1460
1467
  return (_b = item.data) === null || _b === void 0 ? void 0 : _b[field];
1461
1468
  })
1462
- .filter(val => (!!val || val === 0) && !Object.keys(__classPrivateFieldGet(this, _cacheObjValues)[field]).includes(val))
1469
+ .filter(val => !!(val === null || val === void 0 ? void 0 : val.toString()))
1470
+ .reduce((current, next) => [...current, ...(Array.isArray(next) ? next : [next])], [])
1471
+ .filter(val => !Object.keys(__classPrivateFieldGet(this, _cacheObjValues)[field]).includes(val))
1463
1472
  .union();
1464
1473
  if (values.length) {
1465
1474
  const lazyItems = (yield views(values).catch(err => {
@@ -1522,10 +1531,13 @@ class SdTable {
1522
1531
  }
1523
1532
  if (column.type === 'values' || column.type === 'lazy-values') {
1524
1533
  if (column.type === 'lazy-values' && typeof column.option.mapValue === 'function') {
1525
- display.data = ((_6 = (_5 = __classPrivateFieldGet(this, _cacheObjValues)[field]) === null || _5 === void 0 ? void 0 : _5[column.option.mapValue(value, rowData)]) === null || _6 === void 0 ? void 0 : _6[column.option.displayField]) || value;
1534
+ const val = column.option.mapValue(value, rowData);
1535
+ const vals = (Array.isArray(val) ? val : [val]).filter(e => !!(e === null || e === void 0 ? void 0 : e.toString()));
1536
+ display.data = (_5 = vals.map(val => { var _a, _b; return ((_b = (_a = __classPrivateFieldGet(this, _cacheObjValues)[field]) === null || _a === void 0 ? void 0 : _a[val]) === null || _b === void 0 ? void 0 : _b[column.option.displayField]) || val; })) === null || _5 === void 0 ? void 0 : _5.join(', ');
1526
1537
  }
1527
1538
  else {
1528
- display.data = ((_8 = (_7 = __classPrivateFieldGet(this, _cacheObjValues)[field]) === null || _7 === void 0 ? void 0 : _7[value]) === null || _8 === void 0 ? void 0 : _8[column.option.displayField]) || value;
1539
+ const vals = (Array.isArray(value) ? value : [value]).filter(e => !!(e === null || e === void 0 ? void 0 : e.toString()));
1540
+ display.data = (_6 = vals.map(val => { var _a, _b; return ((_b = (_a = __classPrivateFieldGet(this, _cacheObjValues)[field]) === null || _a === void 0 ? void 0 : _a[val]) === null || _b === void 0 ? void 0 : _b[column.option.displayField]) || val; })) === null || _6 === void 0 ? void 0 : _6.join(', ');
1529
1541
  }
1530
1542
  }
1531
1543
  if (column.type === 'number' && Number.isNumber(value)) {
@@ -1545,7 +1557,7 @@ class SdTable {
1545
1557
  display.badge = {
1546
1558
  type: !(column === null || column === void 0 ? void 0 : column.badgeType) ? 'icon' : column.badgeType,
1547
1559
  color: column.badge(value, rowData),
1548
- icon: (_9 = column.badgeIcon) === null || _9 === void 0 ? void 0 : _9.call(column, value, rowData),
1560
+ icon: (_7 = column.badgeIcon) === null || _7 === void 0 ? void 0 : _7.call(column, value, rowData),
1549
1561
  };
1550
1562
  }
1551
1563
  else if (column.type === 'bool') {