tnx-shared 5.3.289 → 5.3.290

package/fesm2015/tnx-shared.js

@@ -23765,25 +23765,23 @@ class ListBase extends ComponentBaseWithButton {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const lstData = (_a = (yield this.setting.baseService.getDataCustomRoute(this.plusUrl, this.currentGridInfo.filters, this.currentGridInfo.fields, this.currentGridInfo.sorts, -1, 1)).data) !== null && _a !== void 0 ? _a : [];
-            yield this.beforeExportAllData(lstData);
+            const lstVisibleField = this.setting.cols
+                .filter(item => item.visible && item.dataType !== 'trangThaiV5')
+                .map(item => item.field);
+            yield this.beforeExportAllData(lstData, lstVisibleField);
             yield this._crudService.getRefDataInDatasource(lstData, this.setting.fieldNeedGetRef);
-            const lstVisibleField = this.setting.cols.filter(item => item.visible && item.dataType != 'trangThaiV5').map(item => {
-                if (item.controlType == 'dropdown' && item.field.startsWith('str')) {
-                    return item.field.slice(3);
-                }
-                return item.field;
-            });
             const lstHeader = ['TT'];
-            lstVisibleField.forEach(item => {
-                const schema = this.setting.modelSchemas.find(x => x.field == item);
-                lstHeader.push((schema === null || schema === void 0 ? void 0 : schema.name) || "");
+            const fieldSchemaMap = new Map(this.setting.modelSchemas.map(schema => [schema.field, schema.name]));
+            lstVisibleField.forEach(field => {
+                const schemaName = fieldSchemaMap.get(field) || fieldSchemaMap.get(field.slice(3)) || "";
+                lstHeader.push(schemaName);
             });
             const printData = [
                 lstHeader,
                 ...lstData.map((item, index) => {
                     const row = [index + 1];
-                    this.setting.cols.filter(col => col.visible && col.dataType != 'trangThaiV5').forEach(col => {
-                        row.push(item[col.field]);
+                    lstVisibleField.forEach(field => {
+                        row.push(item[field]);
                     });
                     return row;
                 })
@@ -23791,7 +23789,7 @@ class ListBase extends ComponentBaseWithButton {
             this._exportService.objectToExcel(printData, 'Danh sách ' + this.setting.objectName, 1);
         });
     }
-    beforeExportAllData(dataSource) {
+    beforeExportAllData(dataSource, lstVisibleField) {
         return __awaiter(this, void 0, void 0, function* () {
         });
     }