@sd-angular/core 1.0.69 → 1.0.70
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/sd-angular-core-grid-material.umd.js +35 -10
- package/bundles/sd-angular-core-grid-material.umd.js.map +1 -1
- package/bundles/sd-angular-core-grid-material.umd.min.js +1 -1
- package/bundles/sd-angular-core-grid-material.umd.min.js.map +1 -1
- package/esm2015/grid-material/src/lib/models/grid-action.model.js +1 -1
- package/esm2015/grid-material/src/lib/models/grid.model.js +1 -1
- package/esm2015/grid-material/src/lib/pipes/selection-visible.pipe.js +31 -6
- package/fesm2015/sd-angular-core-grid-material.js +30 -5
- package/fesm2015/sd-angular-core-grid-material.js.map +1 -1
- package/grid-material/src/lib/models/grid-action.model.d.ts +2 -0
- package/grid-material/src/lib/models/grid.model.d.ts +1 -0
- package/package.json +1 -1
- package/{sd-angular-core-1.0.69.tgz → sd-angular-core-1.0.70.tgz} +0 -0
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3JpZC1hY3Rpb24ubW9kZWwuanMiLCJzb3VyY2VSb290IjoiQzovVXNlcnMvbmdoaWF0dDE1X29uZW1vdW50L0RvY3VtZW50cy9saWItY29yZS11aS9wcm9qZWN0cy9zZC1jb3JlL2dyaWQtbWF0ZXJpYWwvIiwic291cmNlcyI6WyJzcmMvbGliL21vZGVscy9ncmlkLWFjdGlvbi5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IHR5cGUgU2RHcmlkTWF0ZXJpYWxBY3Rpb248VCA9IGFueT4gPSBTZEdyaWRNYXRlcmlhbEFjdGlvbk5vcm1hbDxUPiB8IFNkR3JpZE1hdGVyaWFsQWN0aW9uQ2hpbGRyZW48VD47XHJcblxyXG5leHBvcnQgaW50ZXJmYWNlIFNkR3JpZE1hdGVyaWFsQWN0aW9uTm9ybWFsPFQgPSBhbnk+IHtcclxuICBpY29uPzogc3RyaW5nIHwgKChyb3dEYXRhOiBUKSA9PiBzdHJpbmcpO1xyXG4gIGZvbnRTZXQ/OiAnbWF0ZXJpYWwtaWNvbnMnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtb3V0bGluZWQnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtb3V0bGluZWQnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtcm91bmQnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtc2hhcnAnO1xyXG4gIHRvb2x0aXA/OiBzdHJpbmc7XHJcbiAgdGl0bGU/OiBzdHJpbmc7XHJcbiAgY29sb3I/OiAncHJpbWFyeScgfCAnYWNjZW50JyB8ICd3YXJuJyB8ICdpbmZvJyB8ICdzdWNjZXNzJyB8ICd3YXJuaW5nJyB8ICdkYW5nZXInIHwgJ3NlY29uZGFyeSc7XHJcbiAgdHlwZT86ICdmaWxsJyB8ICdsaWdodCcgfCAnb3V0bGluZScgfCAnbGluayc7XHJcbiAgaGlkZGVuPzogYm9vbGVhbiB8ICgocm93RGF0YT86IFQpID0+
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3JpZC1hY3Rpb24ubW9kZWwuanMiLCJzb3VyY2VSb290IjoiQzovVXNlcnMvbmdoaWF0dDE1X29uZW1vdW50L0RvY3VtZW50cy9saWItY29yZS11aS9wcm9qZWN0cy9zZC1jb3JlL2dyaWQtbWF0ZXJpYWwvIiwic291cmNlcyI6WyJzcmMvbGliL21vZGVscy9ncmlkLWFjdGlvbi5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IHR5cGUgU2RHcmlkTWF0ZXJpYWxBY3Rpb248VCA9IGFueT4gPSBTZEdyaWRNYXRlcmlhbEFjdGlvbk5vcm1hbDxUPiB8IFNkR3JpZE1hdGVyaWFsQWN0aW9uQ2hpbGRyZW48VD47XHJcblxyXG5leHBvcnQgaW50ZXJmYWNlIFNkR3JpZE1hdGVyaWFsQWN0aW9uTm9ybWFsPFQgPSBhbnk+IHtcclxuICBpY29uPzogc3RyaW5nIHwgKChyb3dEYXRhOiBUKSA9PiBzdHJpbmcpO1xyXG4gIGZvbnRTZXQ/OiAnbWF0ZXJpYWwtaWNvbnMnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtb3V0bGluZWQnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtb3V0bGluZWQnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtcm91bmQnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtc2hhcnAnO1xyXG4gIHRvb2x0aXA/OiBzdHJpbmc7XHJcbiAgdGl0bGU/OiBzdHJpbmc7XHJcbiAgY29sb3I/OiAncHJpbWFyeScgfCAnYWNjZW50JyB8ICd3YXJuJyB8ICdpbmZvJyB8ICdzdWNjZXNzJyB8ICd3YXJuaW5nJyB8ICdkYW5nZXInIHwgJ3NlY29uZGFyeSc7XHJcbiAgdHlwZT86ICdmaWxsJyB8ICdsaWdodCcgfCAnb3V0bGluZScgfCAnbGluayc7XHJcbiAgaGlkZGVuPzogYm9vbGVhbiB8ICgocm93RGF0YT86IFQpID0+IGJvb2xlYW4pO1xyXG4gIGlzR3JvdXBlZD86IGJvb2xlYW47XHJcbiAgY2xpY2s6IChzZWxlY3RlZEl0ZW1zPzogVFtdKSA9PiB2b2lkO1xyXG59XHJcblxyXG5pbnRlcmZhY2UgU2RHcmlkTWF0ZXJpYWxBY3Rpb25DaGlsZHJlbjxUID0gYW55PiB7XHJcbiAgaWNvbj86IHN0cmluZyB8ICgocm93RGF0YTogVCkgPT4gc3RyaW5nKTtcclxuICBmb250U2V0PzogJ21hdGVyaWFsLWljb25zJyB8XHJcbiAgJ21hdGVyaWFsLWljb25zLW91dGxpbmVkJyB8XHJcbiAgJ21hdGVyaWFsLWljb25zLW91dGxpbmVkJyB8XHJcbiAgJ21hdGVyaWFsLWljb25zLXJvdW5kJyB8XHJcbiAgJ21hdGVyaWFsLWljb25zLXNoYXJwJztcclxuICB0b29sdGlwPzogc3RyaW5nO1xyXG4gIHRpdGxlPzogc3RyaW5nO1xyXG4gIGNvbG9yPzogJ3ByaW1hcnknIHwgJ2FjY2VudCcgfCAnd2FybicgfCAnaW5mbycgfCAnc3VjY2VzcycgfCAnd2FybmluZycgfCAnZGFuZ2VyJyB8ICdzZWNvbmRhcnknO1xyXG4gIHR5cGU/OiAnZmlsbCcgfCAnbGlnaHQnIHwgJ291dGxpbmUnIHwgJ2xpbmsnO1xyXG4gIGlzR3JvdXBlZD86IGJvb2xlYW47XHJcbiAgY2hpbGRyZW46IFNkR3JpZE1hdGVyaWFsQWN0aW9uTm9ybWFsPFQ+W107XHJcbn1cclxuXHJcbmV4cG9ydCB0eXBlIFNkR3JpZE1hdGVyaWFsQWN0aW9uU2ltcGxlPFQgPSBhbnk+ID0gU2RHcmlkTWF0ZXJpYWxBY3Rpb25TaW1wbGVOb3JtYWw8VD4gfCBTZEdyaWRNYXRlcmlhbEFjdGlvblNpbXBsZUNoaWxkcmVuPFQ+O1xyXG5cclxuaW50ZXJmYWNlIFNkR3JpZE1hdGVyaWFsQWN0aW9uU2ltcGxlTm9ybWFsPFQgPSBhbnk+IHtcclxuICBpY29uPzogc3RyaW5nIHwgKChyb3dEYXRhOiBUKSA9PiBzdHJpbmcpO1xyXG4gIGZvbnRTZXQ/OiAnbWF0ZXJpYWwtaWNvbnMnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtb3V0bGluZWQnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtb3V0bGluZWQnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtcm91bmQnIHxcclxuICAnbWF0ZXJpYWwtaWNvbnMtc2hhcnAnO1xyXG4gIHRvb2x0aXA/OiBzdHJpbmc7XHJcbiAgdGl0bGU/OiBzdHJpbmc7XHJcbiAgY29sb3I/OiAncHJpbWFyeScgfCAnYWNjZW50JyB8ICd3YXJuJyB8ICdpbmZvJyB8ICdzdWNjZXNzJyB8ICd3YXJuaW5nJyB8ICdkYW5nZXInIHwgJ3NlY29uZGFyeSc7XHJcbiAgdHlwZT86ICdmaWxsJyB8ICdsaWdodCcgfCAnb3V0bGluZScgfCAnbGluayc7XHJcbiAgY2xpY2s6IChzZWxlY3RlZEl0ZW1zPzogVFtdKSA9PiB2b2lkO1xyXG59XHJcblxyXG5pbnRlcmZhY2UgU2RHcmlkTWF0ZXJpYWxBY3Rpb25TaW1wbGVDaGlsZHJlbjxUID0gYW55PiB7XHJcbiAgaWNvbj86IHN0cmluZyB8ICgocm93RGF0YTogVCkgPT4gc3RyaW5nKTtcclxuICBmb250U2V0PzogJ21hdGVyaWFsLWljb25zJyB8XHJcbiAgJ21hdGVyaWFsLWljb25zLW91dGxpbmVkJyB8XHJcbiAgJ21hdGVyaWFsLWljb25zLW91dGxpbmVkJyB8XHJcbiAgJ21hdGVyaWFsLWljb25zLXJvdW5kJyB8XHJcbiAgJ21hdGVyaWFsLWljb25zLXNoYXJwJztcclxuICB0b29sdGlwPzogc3RyaW5nO1xyXG4gIHRpdGxlPzogc3RyaW5nO1xyXG4gIGNvbG9yPzogJ3ByaW1hcnknIHwgJ2FjY2VudCcgfCAnd2FybicgfCAnaW5mbycgfCAnc3VjY2VzcycgfCAnd2FybmluZycgfCAnZGFuZ2VyJyB8ICdzZWNvbmRhcnknO1xyXG4gIHR5cGU/OiAnZmlsbCcgfCAnbGlnaHQnIHwgJ291dGxpbmUnIHwgJ2xpbmsnO1xyXG4gIGNoaWxkcmVuOiBTZEdyaWRNYXRlcmlhbEFjdGlvblNpbXBsZU5vcm1hbDxUPltdO1xyXG59XHJcbiJdfQ==
|
|
@@ -5,4 +5,4 @@ export {};
|
|
|
5
5
|
// isExpanding?: boolean;
|
|
6
6
|
// expandDetail?: any;
|
|
7
7
|
// }
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3JpZC5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiJDOi9Vc2Vycy9uZ2hpYXR0MTVfb25lbW91bnQvRG9jdW1lbnRzL2xpYi1jb3JlLXVpL3Byb2plY3RzL3NkLWNvcmUvZ3JpZC1tYXRlcmlhbC8iLCJzb3VyY2VzIjpbInNyYy9saWIvbW9kZWxzL2dyaWQubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQWlEQSxpREFBaUQ7QUFDakQsMEJBQTBCO0FBQzFCLDBCQUEwQjtBQUMxQiwyQkFBMkI7QUFDM0Isd0JBQXdCO0FBQ3hCLElBQUkiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSBcInJ4anNcIjtcclxuZXhwb3J0IGludGVyZmFjZSBFZGl0b3JIYW5kbGVyIHtcclxuICBbY29sdW1uOiBzdHJpbmddOiB7XHJcbiAgICB2aXNpYmxlPzogYm9vbGVhbiB8ICdjcmVhdGUnIHwgJ3VwZGF0ZScsXHJcbiAgICBpdGVtcz86IGFueVtdIHwgT2JzZXJ2YWJsZTxhbnlbXT5cclxuICB9O1xyXG59XHJcblxyXG5leHBvcnQgaW50ZXJmYWNlIFNkSXRlbTxUID0gYW55PiB7XHJcbiAgc2RJZD86IHN0cmluZztcclxuICBvcmlnaW5JdGVtPzogYW55O1xyXG4gIHNlbGVjdGFibGU/OiBib29sZWFuO1xyXG4gIGlzU2VsZWN0ZWQ/OiBib29sZWFuO1xyXG4gIGFjdGlvbnM/OiBzdHJpbmdbXTtcclxuICBncm91cGVkQWN0aW9ucz86IHN0cmluZ1tdO1xyXG4gIGlzRXhwYW5kZWQ/OiBib29sZWFuO1xyXG4gIGlzRXhwYW5kaW5nPzogYm9vbGVhbjtcclxuICBleHBhbmREZXRhaWw/OiBhbnk7XHJcbiAgZWRpdG9yRXJyb3JNZXNzYWdlPzogc3RyaW5nO1xyXG4gIGVkaXRvclN0YXR1cz86ICdjcmVhdGUnIHwgJ3VwZGF0ZSc7XHJcbiAgZWRpdG9ySGFuZGxlclJvdz86IEVkaXRvckhhbmRsZXJSb3c7XHJcbiAgZWRpdG9ySGFuZGxlckNvbHVtbj86IHtcclxuICAgIFtrZXk6IHN0cmluZ106IHtcclxuICAgICAgdmlzaWJsZTogYm9vbGVhbjtcclxuICAgICAgZXJyb3JNZXNzYWdlPzogc3RyaW5nO1xyXG4gICAgfVxyXG4gIH07XHJcbiAgc2RHcm91cD86IHtcclxuICAgIGh0bWxUZW1wbGF0ZTogc3RyaW5nO1xyXG4gICAgaXRlbXM6IChUICYgU2RJdGVtPFQ+KVtdO1xyXG4gIH07XHJcbn1cclxuXHJcbmV4cG9ydCBpbnRlcmZhY2UgRWRpdG9ySGFuZGxlclJvdyB7XHJcbiAgc3RhdHVzPzogJ2NyZWF0ZScgfCAndXBkYXRlJztcclxuICB2aXNpYmxlPzogYm9vbGVhbjtcclxuICBlZGl0YWJsZT86IGJvb2xlYW47XHJcbiAgcmVtb3ZhYmxlPzogYm9vbGVhbjtcclxuICBzYXZhYmxlPzogYm9vbGVhbjtcclxuICBjYW5jZWxhYmxlPzogYm9vbGVhbjtcclxuICBlcnJvck1lc3NhZ2U/OiBzdHJpbmc7XHJcbiAgdGVtcG9yYXJ5PzogYW55O1xyXG4gIHNhdmluZz86IGJvb2xlYW47XHJcbn1cclxuXHJcbmV4cG9ydCB0eXBlIFNkR3JpZE1hdGVyaWFsSXRlbTxUID0gYW55PiA9IFQgJiBTZEl0ZW08VD47XHJcblxyXG5cclxuXHJcbi8vIGV4cG9ydCBpbnRlcmZhY2UgU2RHcmlkTWF0ZXJpYWxJdGVtPFQgPSBhbnk+IHtcclxuLy8gICBpc1NlbGVjdGVkPzogYm9vbGVhbjtcclxuLy8gICBpc0V4cGFuZGVkPzogYm9vbGVhbjtcclxuLy8gICBpc0V4cGFuZGluZz86IGJvb2xlYW47XHJcbi8vICAgZXhwYW5kRGV0YWlsPzogYW55O1xyXG4vLyB9XHJcbiJdfQ==
|
|
@@ -3,7 +3,9 @@ import hash from 'object-hash';
|
|
|
3
3
|
export class SdSelectionVisiblePipe {
|
|
4
4
|
constructor() {
|
|
5
5
|
this.transform = (rowData, selection) => {
|
|
6
|
+
var _a, _b;
|
|
6
7
|
const { actions } = selection;
|
|
8
|
+
const groupedActions = [];
|
|
7
9
|
rowData.actions = rowData.actions || [];
|
|
8
10
|
if (!(actions === null || actions === void 0 ? void 0 : actions.length)) {
|
|
9
11
|
rowData.selectable = true;
|
|
@@ -12,39 +14,62 @@ export class SdSelectionVisiblePipe {
|
|
|
12
14
|
for (const action of actions) {
|
|
13
15
|
if ('children' in action) {
|
|
14
16
|
let flag = false;
|
|
17
|
+
let hasGroup = false;
|
|
15
18
|
for (const childAction of action.children) {
|
|
16
|
-
const { hidden } = childAction;
|
|
19
|
+
const { hidden, isGrouped } = childAction;
|
|
17
20
|
const key = hash(childAction);
|
|
21
|
+
if (isGrouped) {
|
|
22
|
+
hasGroup = true;
|
|
23
|
+
}
|
|
18
24
|
if (typeof (hidden) === 'function') {
|
|
19
25
|
if (!hidden(rowData)) {
|
|
20
|
-
rowData.actions.push(key);
|
|
21
26
|
flag = true;
|
|
27
|
+
rowData.actions.push(key);
|
|
28
|
+
if (isGrouped) {
|
|
29
|
+
groupedActions.push(key);
|
|
30
|
+
}
|
|
22
31
|
}
|
|
23
32
|
}
|
|
24
33
|
else if (!hidden) {
|
|
25
|
-
rowData.actions.push(key);
|
|
26
34
|
flag = true;
|
|
35
|
+
rowData.actions.push(key);
|
|
36
|
+
if (isGrouped) {
|
|
37
|
+
groupedActions.push(key);
|
|
38
|
+
}
|
|
27
39
|
}
|
|
28
40
|
}
|
|
29
41
|
if (flag) {
|
|
30
42
|
rowData.actions.push(hash(action));
|
|
43
|
+
if (hasGroup) {
|
|
44
|
+
groupedActions.push(hash(action));
|
|
45
|
+
}
|
|
31
46
|
}
|
|
32
47
|
}
|
|
33
48
|
else {
|
|
34
|
-
const { hidden } = action;
|
|
49
|
+
const { hidden, isGrouped } = action;
|
|
35
50
|
const key = hash(action);
|
|
36
51
|
if (typeof (hidden) === 'function') {
|
|
37
52
|
if (!hidden(rowData)) {
|
|
38
53
|
rowData.actions.push(key);
|
|
54
|
+
if (isGrouped) {
|
|
55
|
+
groupedActions.push(key);
|
|
56
|
+
}
|
|
39
57
|
}
|
|
40
58
|
}
|
|
41
59
|
else if (!hidden) {
|
|
42
60
|
rowData.actions.push(key);
|
|
61
|
+
if (isGrouped) {
|
|
62
|
+
groupedActions.push(key);
|
|
63
|
+
}
|
|
43
64
|
}
|
|
44
65
|
}
|
|
45
66
|
}
|
|
46
67
|
rowData.selectable = !!rowData.actions.length;
|
|
47
|
-
|
|
68
|
+
if (!rowData.selectable || !groupedActions.length || ((_b = (_a = rowData === null || rowData === void 0 ? void 0 : rowData.sdGroup) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.length)) {
|
|
69
|
+
return rowData.selectable;
|
|
70
|
+
}
|
|
71
|
+
// Đối với trường hợp grouped, tuy selectable là true nhưng vẫn ẩn đi checkbox nếu các action đều thuộc groupedActions và rowData ko phải là dòng group
|
|
72
|
+
return rowData.actions.some(action => !groupedActions.includes(action));
|
|
48
73
|
};
|
|
49
74
|
}
|
|
50
75
|
}
|
|
@@ -53,4 +78,4 @@ SdSelectionVisiblePipe.decorators = [
|
|
|
53
78
|
name: 'selectionVisible'
|
|
54
79
|
},] }
|
|
55
80
|
];
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VsZWN0aW9uLXZpc2libGUucGlwZS5qcyIsInNvdXJjZVJvb3QiOiJDOi9Vc2Vycy9uZ2hpYXR0MTVfb25lbW91bnQvRG9jdW1lbnRzL2xpYi1jb3JlLXVpL3Byb2plY3RzL3NkLWNvcmUvZ3JpZC1tYXRlcmlhbC8iLCJzb3VyY2VzIjpbInNyYy9saWIvcGlwZXMvc2VsZWN0aW9uLXZpc2libGUucGlwZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxFQUFpQixNQUFNLGVBQWUsQ0FBQztBQUNwRCxPQUFPLElBQUksTUFBTSxhQUFhLENBQUM7QUFPL0IsTUFBTSxPQUFPLHNCQUFzQjtJQUhuQztRQUlFLGNBQVMsR0FBRyxDQUFDLE9BQWUsRUFBRSxTQUFrQyxFQUFXLEVBQUU7O1lBQzNFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxTQUFTLENBQUM7WUFDOUIsTUFBTSxjQUFjLEdBQWEsRUFBRSxDQUFDO1lBQ3BDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUM7WUFDeEMsSUFBSSxFQUFDLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxNQUFNLENBQUEsRUFBRTtnQkFDcEIsT0FBTyxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUM7Z0JBQzFCLE9BQU8sT0FBTyxDQUFDLFVBQVUsQ0FBQzthQUMzQjtZQUNELEtBQUssTUFBTSxNQUFNLElBQUksT0FBTyxFQUFFO2dCQUM1QixJQUFJLFVBQVUsSUFBSSxNQUFNLEVBQUU7b0JBQ3hCLElBQUksSUFBSSxHQUFHLEtBQUssQ0FBQztvQkFDakIsSUFBSSxRQUFRLEdBQUcsS0FBSyxDQUFDO29CQUNyQixLQUFLLE1BQU0sV0FBVyxJQUFJLE1BQU0sQ0FBQyxRQUFRLEVBQUU7d0JBQ3pDLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLEdBQUcsV0FBVyxDQUFDO3dCQUMxQyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7d0JBQzlCLElBQUcsU0FBUyxFQUFFOzRCQUNaLFFBQVEsR0FBRyxJQUFJLENBQUM7eUJBQ2pCO3dCQUNELElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLFVBQVUsRUFBRTs0QkFDbEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBRTtnQ0FDcEIsSUFBSSxHQUFHLElBQUksQ0FBQztnQ0FDWixPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztnQ0FDMUIsSUFBSSxTQUFTLEVBQUU7b0NBQ2IsY0FBYyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztpQ0FDMUI7NkJBQ0Y7eUJBQ0Y7NkJBQU0sSUFBSSxDQUFDLE1BQU0sRUFBRTs0QkFDbEIsSUFBSSxHQUFHLElBQUksQ0FBQzs0QkFDWixPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQzs0QkFDMUIsSUFBSSxTQUFTLEVBQUU7Z0NBQ2IsY0FBYyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQzs2QkFDMUI7eUJBQ0Y7cUJBQ0Y7b0JBQ0QsSUFBSSxJQUFJLEVBQUU7d0JBQ1IsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7d0JBQ25DLElBQUcsUUFBUSxFQUFFOzRCQUNYLGNBQWMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7eUJBQ25DO3FCQUNGO2lCQUNGO3FCQUFNO29CQUNMLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLEdBQUcsTUFBTSxDQUFDO29CQUNyQyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7b0JBQ3pCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLFVBQVUsRUFBRTt3QkFDbEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBRTs0QkFDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7NEJBQzFCLElBQUksU0FBUyxFQUFFO2dDQUNiLGNBQWMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7NkJBQzFCO3lCQUNGO3FCQUNGO3lCQUFNLElBQUksQ0FBQyxNQUFNLEVBQUU7d0JBQ2xCLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO3dCQUMxQixJQUFJLFNBQVMsRUFBRTs0QkFDYixjQUFjLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO3lCQUMxQjtxQkFDRjtpQkFDRjthQUNGO1lBQ0QsT0FBTyxDQUFDLFVBQVUsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUM7WUFDOUMsSUFBRyxDQUFDLE9BQU8sQ0FBQyxVQUFVLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxpQkFBSSxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsT0FBTywwQ0FBRSxLQUFLLDBDQUFFLE1BQU0sQ0FBQSxFQUFFO2dCQUNuRixPQUFPLE9BQU8sQ0FBQyxVQUFVLENBQUM7YUFDM0I7WUFDRCx1SkFBdUo7WUFDdkosT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUEsRUFBRSxDQUFDLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ3pFLENBQUMsQ0FBQTtJQUNILENBQUM7OztZQXJFQSxJQUFJLFNBQUM7Z0JBQ0osSUFBSSxFQUFFLGtCQUFrQjthQUN6QiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFBpcGUsIFBpcGVUcmFuc2Zvcm0gfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IGhhc2ggZnJvbSAnb2JqZWN0LWhhc2gnO1xyXG5pbXBvcnQgeyBTZEdyaWRNYXRlcmlhbFNlbGVjdGlvbiB9IGZyb20gJy4uL21vZGVscy9ncmlkLXNlbGVjdGlvbi5tb2RlbCc7XHJcbmltcG9ydCB7IFNkSXRlbSB9IGZyb20gJy4uL21vZGVscy9ncmlkLm1vZGVsJztcclxuXHJcbkBQaXBlKHtcclxuICBuYW1lOiAnc2VsZWN0aW9uVmlzaWJsZSdcclxufSlcclxuZXhwb3J0IGNsYXNzIFNkU2VsZWN0aW9uVmlzaWJsZVBpcGUgaW1wbGVtZW50cyBQaXBlVHJhbnNmb3JtIHtcclxuICB0cmFuc2Zvcm0gPSAocm93RGF0YTogU2RJdGVtLCBzZWxlY3Rpb246IFNkR3JpZE1hdGVyaWFsU2VsZWN0aW9uKTogYm9vbGVhbiA9PiB7XHJcbiAgICBjb25zdCB7IGFjdGlvbnMgfSA9IHNlbGVjdGlvbjtcclxuICAgIGNvbnN0IGdyb3VwZWRBY3Rpb25zOiBzdHJpbmdbXSA9IFtdO1xyXG4gICAgcm93RGF0YS5hY3Rpb25zID0gcm93RGF0YS5hY3Rpb25zIHx8IFtdO1xyXG4gICAgaWYgKCFhY3Rpb25zPy5sZW5ndGgpIHtcclxuICAgICAgcm93RGF0YS5zZWxlY3RhYmxlID0gdHJ1ZTtcclxuICAgICAgcmV0dXJuIHJvd0RhdGEuc2VsZWN0YWJsZTtcclxuICAgIH1cclxuICAgIGZvciAoY29uc3QgYWN0aW9uIG9mIGFjdGlvbnMpIHtcclxuICAgICAgaWYgKCdjaGlsZHJlbicgaW4gYWN0aW9uKSB7XHJcbiAgICAgICAgbGV0IGZsYWcgPSBmYWxzZTtcclxuICAgICAgICBsZXQgaGFzR3JvdXAgPSBmYWxzZTtcclxuICAgICAgICBmb3IgKGNvbnN0IGNoaWxkQWN0aW9uIG9mIGFjdGlvbi5jaGlsZHJlbikge1xyXG4gICAgICAgICAgY29uc3QgeyBoaWRkZW4sIGlzR3JvdXBlZCB9ID0gY2hpbGRBY3Rpb247XHJcbiAgICAgICAgICBjb25zdCBrZXkgPSBoYXNoKGNoaWxkQWN0aW9uKTtcclxuICAgICAgICAgIGlmKGlzR3JvdXBlZCkge1xyXG4gICAgICAgICAgICBoYXNHcm91cCA9IHRydWU7XHJcbiAgICAgICAgICB9XHJcbiAgICAgICAgICBpZiAodHlwZW9mIChoaWRkZW4pID09PSAnZnVuY3Rpb24nKSB7XHJcbiAgICAgICAgICAgIGlmICghaGlkZGVuKHJvd0RhdGEpKSB7XHJcbiAgICAgICAgICAgICAgZmxhZyA9IHRydWU7XHJcbiAgICAgICAgICAgICAgcm93RGF0YS5hY3Rpb25zLnB1c2goa2V5KTtcclxuICAgICAgICAgICAgICBpZiAoaXNHcm91cGVkKSB7XHJcbiAgICAgICAgICAgICAgICBncm91cGVkQWN0aW9ucy5wdXNoKGtleSk7XHJcbiAgICAgICAgICAgICAgfVxyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgICB9IGVsc2UgaWYgKCFoaWRkZW4pIHtcclxuICAgICAgICAgICAgZmxhZyA9IHRydWU7XHJcbiAgICAgICAgICAgIHJvd0RhdGEuYWN0aW9ucy5wdXNoKGtleSk7XHJcbiAgICAgICAgICAgIGlmIChpc0dyb3VwZWQpIHtcclxuICAgICAgICAgICAgICBncm91cGVkQWN0aW9ucy5wdXNoKGtleSk7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICAgIH1cclxuICAgICAgICB9XHJcbiAgICAgICAgaWYgKGZsYWcpIHtcclxuICAgICAgICAgIHJvd0RhdGEuYWN0aW9ucy5wdXNoKGhhc2goYWN0aW9uKSk7XHJcbiAgICAgICAgICBpZihoYXNHcm91cCkge1xyXG4gICAgICAgICAgICBncm91cGVkQWN0aW9ucy5wdXNoKGhhc2goYWN0aW9uKSk7XHJcbiAgICAgICAgICB9XHJcbiAgICAgICAgfVxyXG4gICAgICB9IGVsc2Uge1xyXG4gICAgICAgIGNvbnN0IHsgaGlkZGVuLCBpc0dyb3VwZWQgfSA9IGFjdGlvbjtcclxuICAgICAgICBjb25zdCBrZXkgPSBoYXNoKGFjdGlvbik7XHJcbiAgICAgICAgaWYgKHR5cGVvZiAoaGlkZGVuKSA9PT0gJ2Z1bmN0aW9uJykge1xyXG4gICAgICAgICAgaWYgKCFoaWRkZW4ocm93RGF0YSkpIHtcclxuICAgICAgICAgICAgcm93RGF0YS5hY3Rpb25zLnB1c2goa2V5KTtcclxuICAgICAgICAgICAgaWYgKGlzR3JvdXBlZCkge1xyXG4gICAgICAgICAgICAgIGdyb3VwZWRBY3Rpb25zLnB1c2goa2V5KTtcclxuICAgICAgICAgICAgfVxyXG4gICAgICAgICAgfVxyXG4gICAgICAgIH0gZWxzZSBpZiAoIWhpZGRlbikge1xyXG4gICAgICAgICAgcm93RGF0YS5hY3Rpb25zLnB1c2goa2V5KTtcclxuICAgICAgICAgIGlmIChpc0dyb3VwZWQpIHtcclxuICAgICAgICAgICAgZ3JvdXBlZEFjdGlvbnMucHVzaChrZXkpO1xyXG4gICAgICAgICAgfVxyXG4gICAgICAgIH1cclxuICAgICAgfVxyXG4gICAgfVxyXG4gICAgcm93RGF0YS5zZWxlY3RhYmxlID0gISFyb3dEYXRhLmFjdGlvbnMubGVuZ3RoO1xyXG4gICAgaWYoIXJvd0RhdGEuc2VsZWN0YWJsZSB8fCAhZ3JvdXBlZEFjdGlvbnMubGVuZ3RoIHx8IHJvd0RhdGE/LnNkR3JvdXA/Lml0ZW1zPy5sZW5ndGgpIHtcclxuICAgICAgcmV0dXJuIHJvd0RhdGEuc2VsZWN0YWJsZTtcclxuICAgIH1cclxuICAgIC8vIMSQ4buRaSB24bubaSB0csaw4budbmcgaOG7o3AgZ3JvdXBlZCwgdHV5IHNlbGVjdGFibGUgbMOgIHRydWUgbmjGsG5nIHbhuqtuIOG6qW4gxJFpIGNoZWNrYm94IG7hur91IGPDoWMgYWN0aW9uIMSR4buBdSB0aHXhu5ljIGdyb3VwZWRBY3Rpb25zIHbDoCByb3dEYXRhIGtvIHBo4bqjaSBsw6AgZMOybmcgZ3JvdXBcclxuICAgIHJldHVybiByb3dEYXRhLmFjdGlvbnMuc29tZShhY3Rpb249PiAhZ3JvdXBlZEFjdGlvbnMuaW5jbHVkZXMoYWN0aW9uKSk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -3084,7 +3084,9 @@ SdColumnInlineFilter.propDecorators = {
|
|
|
3084
3084
|
class SdSelectionVisiblePipe {
|
|
3085
3085
|
constructor() {
|
|
3086
3086
|
this.transform = (rowData, selection) => {
|
|
3087
|
+
var _a, _b;
|
|
3087
3088
|
const { actions } = selection;
|
|
3089
|
+
const groupedActions = [];
|
|
3088
3090
|
rowData.actions = rowData.actions || [];
|
|
3089
3091
|
if (!(actions === null || actions === void 0 ? void 0 : actions.length)) {
|
|
3090
3092
|
rowData.selectable = true;
|
|
@@ -3093,39 +3095,62 @@ class SdSelectionVisiblePipe {
|
|
|
3093
3095
|
for (const action of actions) {
|
|
3094
3096
|
if ('children' in action) {
|
|
3095
3097
|
let flag = false;
|
|
3098
|
+
let hasGroup = false;
|
|
3096
3099
|
for (const childAction of action.children) {
|
|
3097
|
-
const { hidden } = childAction;
|
|
3100
|
+
const { hidden, isGrouped } = childAction;
|
|
3098
3101
|
const key = hash__default(childAction);
|
|
3102
|
+
if (isGrouped) {
|
|
3103
|
+
hasGroup = true;
|
|
3104
|
+
}
|
|
3099
3105
|
if (typeof (hidden) === 'function') {
|
|
3100
3106
|
if (!hidden(rowData)) {
|
|
3101
|
-
rowData.actions.push(key);
|
|
3102
3107
|
flag = true;
|
|
3108
|
+
rowData.actions.push(key);
|
|
3109
|
+
if (isGrouped) {
|
|
3110
|
+
groupedActions.push(key);
|
|
3111
|
+
}
|
|
3103
3112
|
}
|
|
3104
3113
|
}
|
|
3105
3114
|
else if (!hidden) {
|
|
3106
|
-
rowData.actions.push(key);
|
|
3107
3115
|
flag = true;
|
|
3116
|
+
rowData.actions.push(key);
|
|
3117
|
+
if (isGrouped) {
|
|
3118
|
+
groupedActions.push(key);
|
|
3119
|
+
}
|
|
3108
3120
|
}
|
|
3109
3121
|
}
|
|
3110
3122
|
if (flag) {
|
|
3111
3123
|
rowData.actions.push(hash__default(action));
|
|
3124
|
+
if (hasGroup) {
|
|
3125
|
+
groupedActions.push(hash__default(action));
|
|
3126
|
+
}
|
|
3112
3127
|
}
|
|
3113
3128
|
}
|
|
3114
3129
|
else {
|
|
3115
|
-
const { hidden } = action;
|
|
3130
|
+
const { hidden, isGrouped } = action;
|
|
3116
3131
|
const key = hash__default(action);
|
|
3117
3132
|
if (typeof (hidden) === 'function') {
|
|
3118
3133
|
if (!hidden(rowData)) {
|
|
3119
3134
|
rowData.actions.push(key);
|
|
3135
|
+
if (isGrouped) {
|
|
3136
|
+
groupedActions.push(key);
|
|
3137
|
+
}
|
|
3120
3138
|
}
|
|
3121
3139
|
}
|
|
3122
3140
|
else if (!hidden) {
|
|
3123
3141
|
rowData.actions.push(key);
|
|
3142
|
+
if (isGrouped) {
|
|
3143
|
+
groupedActions.push(key);
|
|
3144
|
+
}
|
|
3124
3145
|
}
|
|
3125
3146
|
}
|
|
3126
3147
|
}
|
|
3127
3148
|
rowData.selectable = !!rowData.actions.length;
|
|
3128
|
-
|
|
3149
|
+
if (!rowData.selectable || !groupedActions.length || ((_b = (_a = rowData === null || rowData === void 0 ? void 0 : rowData.sdGroup) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.length)) {
|
|
3150
|
+
return rowData.selectable;
|
|
3151
|
+
}
|
|
3152
|
+
// Đối với trường hợp grouped, tuy selectable là true nhưng vẫn ẩn đi checkbox nếu các action đều thuộc groupedActions và rowData ko phải là dòng group
|
|
3153
|
+
return rowData.actions.some(action => !groupedActions.includes(action));
|
|
3129
3154
|
};
|
|
3130
3155
|
}
|
|
3131
3156
|
}
|