tnx-shared 5.3.215 → 5.3.217

package/fesm2015/tnx-shared.js

@@ -11544,6 +11544,9 @@ class RequiredValidator {
     validate(event) {
         var _a;
         this._label = (_a = event.control.errorLabel) !== null && _a !== void 0 ? _a : event.control.label;
+        if (event.control.isHtmlLabel) {
+            this._label = event.control.fullLabel;
+        }
         return isNotEmpty(event.value, event.control);
     }
     getError() {
@@ -16409,9 +16412,9 @@ class ExportService {
         this.environment = this._moduleConfig.environment;
         this.serviceUri = `${this._moduleConfig.environment.apiDomain.templateEndpoint}/Export`;
     }
-    objectToExcel(data, fileName) {
+    objectToExcel(data, fileName, numOfHeaderRow) {
         return this._http
-            .post(`${this.serviceUri}/ObjectToExcel`, data, { responseType: 'blob' })
+            .post(`${this.serviceUri}/ObjectToExcel?numOfHeaderRow=${numOfHeaderRow}`, data, { responseType: 'blob' })
             .pipe(catchError((err) => this._commonService.handleError(err, this._injector)))
             .subscribe(res => {
             this.saveAsExcelFile(res, fileName);
@@ -19489,9 +19492,12 @@ class ListComponentBase extends ComponentBase {
             const tableEle = element.querySelector('table');
             const headEle = tableEle.querySelector('thead');
             const bodyEle = tableEle.querySelector('tbody');
-            const arrHeadEle = this.getArrHeadByHtml(headEle);
-            const arrRowData = this.getArrRowDataByHtml(bodyEle, arrHeadEle);
-            const strHeadEle = this.headHtmlToString(arrHeadEle);
+            // const arrHeadEle = this.getArrHeadByHtml(headEle);
+            const arrHeadEle = this.getArrHeadByHtmlForPrint(headEle);
+            const firstHead = arrHeadEle.allCol;
+            const arrRowData = this.getArrRowDataByHtml(bodyEle, firstHead);
+            // const strHeadEle = this.headHtmlToString(arrHeadEle);
+            const strHeadEle = this.headHtmlToStringNew(arrHeadEle.header);
             const strBodyEle = this.rowDataHtmlToString(arrRowData);
             const css = '<style type="text/css">table th, table td {border:1px solid #000;} table th {text-align: center;} table {width: 100%;border-collapse: collapse;} table td:first-child {text-align: center;}</style>';
             const table = `${css}<table>${strHeadEle}${strBodyEle}</table>`;
@@ -19504,9 +19510,12 @@ class ListComponentBase extends ComponentBase {
         const tableEle = element.querySelector('table');
         const headEle = tableEle.querySelector('thead');
         const bodyEle = tableEle.querySelector('tbody');
-        const arrHeadEle = this.getArrHeadByHtml(headEle);
-        const arrRowData = this.getArrRowDataHasRowSpanByHtml(bodyEle, arrHeadEle);
-        const strHeadEle = this.headHtmlToString(arrHeadEle);
+        // const arrHeadEle = this.getArrHeadByHtml(headEle);
+        const arrHeadEle = this.getArrHeadByHtmlForPrint(headEle);
+        const firstHead = arrHeadEle.allCol;
+        const arrRowData = this.getArrRowDataHasRowSpanByHtml(bodyEle, firstHead);
+        // const strHeadEle = this.headHtmlToString(arrHeadEle);
+        const strHeadEle = this.headHtmlToStringNew(arrHeadEle);
         const strBodyEle = this.rowDataHtmlHasRowSpanToString(arrRowData);
         const css = '<style type="text/css">table th, table td {border:1px solid #000;} table th {text-align: center;} table {width: 100%;border-collapse: collapse;} table td:first-child {text-align: center;}</style>';
         const table = `${css}<table>${strHeadEle}${strBodyEle}</table>`;
@@ -19516,6 +19525,7 @@ class ListComponentBase extends ComponentBase {
         this.exportByReadingHtml(true, isTree);
     }
     exportByReadingHtml(exportAll = false, isTree = false) {
+        var _a;
         if (this._groupField) {
             this._notifierService.showWarning('Chưa hỗ trợ xuất có nhóm dữ liệu!');
             return;
@@ -19525,16 +19535,21 @@ class ListComponentBase extends ComponentBase {
         const headEle = tableEle.querySelector('thead');
         const bodyEle = tableEle.querySelector('tbody');
         // header.
-        const arrHead = this.getArrHeadByHtml(headEle);
-        if (!arrHead) {
+        // const arrHead = this.getArrHeadByHtml(headEle);
+        let arrHead = this.getArrHeadByHtmlNew(headEle);
+        if (!(arrHead === null || arrHead === void 0 ? void 0 : arrHead.length)) {
             return;
         }
         // body.
-        const arrRowData = this.getArrRowDataByHtml(bodyEle, arrHead, exportAll);
+        const firstHead = arrHead[0];
+        // const arrRowData = this.getArrRowDataByHtml(bodyEle, arrHead, exportAll);
+        const arrRowData = this.getArrRowDataByHtml(bodyEle, firstHead, exportAll);
         // export.
-        const dataExport = [arrHead.map(i => i.value), ...arrRowData];
+        arrHead = arrHead.map(x => x.map(z => z.value));
+        // const dataExport = [arrHead.map(i => i.value), ...arrRowData];
+        const dataExport = [...arrHead, ...arrRowData];
         const fileName = `Danh sách ${this.setting.objectName}`;
-        this._exportService.objectToExcel(dataExport, fileName);
+        this._exportService.objectToExcel(dataExport, fileName, (_a = arrHead === null || arrHead === void 0 ? void 0 : arrHead.length) !== null && _a !== void 0 ? _a : 1);
     }
     headHtmlToString(arrHeadEle) {
         let result = '';
@@ -19543,12 +19558,28 @@ class ListComponentBase extends ComponentBase {
         });
         return result;
     }
+    headHtmlToStringNew(arrHeadEle) {
+        let result = '';
+        for (const itemHeader of arrHeadEle) {
+            result += '<tr>';
+            for (const itemTh of itemHeader) {
+                result += `<th colSpan="${itemTh.colSpan}" rowSpan="${itemTh.rowSpan}">${itemTh.value}</th>`;
+            }
+            result += '</tr>';
+        }
+        return result;
+    }
     rowDataHtmlToString(rowDatas) {
         const arrRowData = [];
-        rowDatas.forEach(arrRowDataChild => {
+        rowDatas.forEach((arrRowDataChild, indexChild) => {
             let rowData = '<tr>';
-            arrRowDataChild.forEach(element => {
-                rowData += `<td>${element}</td>`;
+            arrRowDataChild.forEach((element, index) => {
+                if (index == 0 && !this.setting.hiddenOrderColumn) {
+                    rowData += `<td>${indexChild + 1}</td>`;
+                }
+                else {
+                    rowData += `<td>${element}</td>`;
+                }
             });
             rowData += '</tr>';
             arrRowData.push(rowData);
@@ -19577,6 +19608,136 @@ class ListComponentBase extends ComponentBase {
         }
         return arrHeader;
     }
+    getArrHeadByHtmlNew(header) {
+        var _a, _b, _c;
+        const filter = Array.prototype.filter;
+        const allRow = header.querySelectorAll('tr');
+        const lstRow = filter.call(allRow, function (node) {
+            return !node.className.includes('filter-row');
+        });
+        const result = [];
+        const allTh = [];
+        for (const item of lstRow) {
+            allTh.push(item.querySelectorAll('th'));
+        }
+        const maxColSize = allTh.reduce((a, b) => {
+            const newArr = [...b];
+            const result = newArr.reduce((x, y) => y.colSpan + x, 0);
+            return result > a ? result : a;
+        }, 0);
+        const startIndex = this.setting.hiddenCheckbox ? 0 : 1;
+        const endIndex = maxColSize - (this.setting.hiddenFunctionColumn ? 1 : 2);
+        for (let ind = 0; ind < lstRow.length; ind++) {
+            const arrTh = [...allTh[ind]];
+            if (startIndex > endIndex) {
+                return null;
+            }
+            result[ind] = (_a = result[ind]) !== null && _a !== void 0 ? _a : [];
+            let colIndex = 0;
+            const numOfColSpan = arrTh.reduce((x, y) => x + y.colSpan - 1, 0);
+            for (let i = startIndex; i <= endIndex - numOfColSpan; i++) {
+                if (arrTh[i]) {
+                    if (arrTh[i].rowSpan && arrTh[i].rowSpan > 1) {
+                        for (let j = 1; j < arrTh[i].rowSpan; j++) {
+                            result[ind + j] = (_b = result[ind + j]) !== null && _b !== void 0 ? _b : [];
+                            if (result[ind + j][colIndex] == null || result[ind + j][colIndex] == undefined) {
+                                result[ind + j][colIndex] = {
+                                    index: i,
+                                    value: ''
+                                };
+                            }
+                        }
+                    }
+                    if (arrTh[i].colSpan && arrTh[i].colSpan > 1) {
+                        for (let j = 0; j < arrTh[i].colSpan; j++) {
+                            if (result[ind][colIndex] == null || result[ind][colIndex] == undefined) {
+                                result[ind][colIndex] = {
+                                    index: colIndex + startIndex,
+                                    value: j == 0 ? arrTh[i].innerText : ''
+                                };
+                            }
+                            for (let k = ind + 1; k < lstRow.length; k++) {
+                                const otherRow = [...allTh[k]];
+                                result[ind + k] = (_c = result[ind + k]) !== null && _c !== void 0 ? _c : [];
+                                if (!result[ind + k][colIndex]) {
+                                    result[ind + k][colIndex] = {
+                                        index: colIndex + startIndex,
+                                        value: otherRow[j].innerText
+                                    };
+                                }
+                            }
+                            colIndex++;
+                        }
+                    }
+                    else {
+                        if (result[ind][colIndex] == null || result[ind][colIndex] == undefined) {
+                            result[ind][colIndex] = {
+                                index: colIndex + startIndex,
+                                value: arrTh[i].innerText
+                            };
+                        }
+                        colIndex++;
+                    }
+                }
+                else {
+                    if (result[ind][colIndex] == null || result[ind][colIndex] == undefined) {
+                        result[ind][colIndex] = {
+                            index: colIndex + startIndex,
+                            value: ''
+                        };
+                    }
+                    colIndex++;
+                }
+            }
+        }
+        return result;
+    }
+    getArrHeadByHtmlForPrint(header) {
+        const filter = Array.prototype.filter;
+        const allRow = header.querySelectorAll('tr');
+        const lstRow = [...filter.call(allRow, function (node) {
+                return !node.className.includes('filter-row');
+            })];
+        const result = {
+            allCol: [],
+            header: []
+        };
+        for (let ind = 0; ind < lstRow.length; ind++) {
+            const lstCell = [...lstRow[ind].querySelectorAll('th')];
+            const startIndex = this.setting.hiddenCheckbox || ind != 0 ? 0 : 1;
+            let colIndex = startIndex;
+            const itemHeader = [];
+            const endIndex = lstCell.length - (this.setting.hiddenFunctionColumn || ind != 0 ? 1 : 2);
+            for (let i = startIndex; i <= endIndex; i++) {
+                if (ind == 0) {
+                    if (lstCell[i].colSpan && lstCell[i].colSpan > 1) {
+                        for (let j = 0; j < lstCell[i].colSpan; j++) {
+                            result.allCol.push({
+                                index: colIndex,
+                                value: ''
+                            });
+                            colIndex++;
+                        }
+                    }
+                    else {
+                        result.allCol.push({
+                            index: colIndex,
+                            value: ''
+                        });
+                        colIndex++;
+                    }
+                }
+                itemHeader.push({
+                    index: i,
+                    value: lstCell[i].innerText,
+                    colSpan: lstCell[i].colSpan,
+                    rowSpan: lstCell[i].rowSpan
+                });
+            }
+            result.header.push(itemHeader);
+        }
+        return result;
+    }
     getArrRowDataHasRowSpanByHtml(bodyEle, arrHead, exportAll = false) {
         const arrRow = exportAll ? bodyEle.querySelectorAll('tr') : bodyEle.querySelectorAll('tr.ui-state-highlight');
         if (!arrRow.length) {
@@ -19608,22 +19769,28 @@ class ListComponentBase extends ComponentBase {
             return [];
         }
         const arrRowData = [];
-        for (let i = 0; i < arrRow.length; i++) {
-            const row = arrRow[i];
+        // for (const element of arrRow) {
+        arrRow.forEach((rowElement, indexRow) => {
+            const row = rowElement;
             const arrTd = row.querySelectorAll('td');
             let currentTd;
             const rowData = [];
-            arrHead.forEach(head => {
+            arrHead.forEach((head, index) => {
                 currentTd = arrTd[head.index];
                 if (currentTd.innerText === '') {
                     rowData.push(this.getValueCheckboxFormat(currentTd));
                 }
                 else {
-                    rowData.push(currentTd.innerText);
+                    if (index == 0 && !this.setting.hiddenOrderColumn) {
+                        rowData.push(indexRow + 1);
+                    }
+                    else {
+                        rowData.push(currentTd.innerText);
+                    }
                 }
             });
             arrRowData.push(rowData);
-        }
+        });
         return arrRowData;
     }
     getValueCheckboxFormat(data) {