@zeedhi/common 1.37.0 → 1.39.1

package/dist/zd-common.esm.js

@@ -2495,7 +2495,7 @@ class Loading extends Component {
          */
         this.text = 'Loading';
         this.isVisible = false;
-        this.zIndex = '100';
+        this.zIndex = 999;
         this.text = this.getInitValue('text', props.text, this.text);
         this.zIndex = this.getInitValue('zIndex', props.zIndex, this.zIndex);
         this.defaultText = this.text;
@@ -4313,11 +4313,11 @@ class Column extends Component {
      * Apply conditions
      * @param row Datasource row
      */
-    applyCondition(row) {
+    applyCondition(row, factoredConditions = this.factoredConditions) {
         const appliedConditions = {};
-        Object.keys(this.factoredConditions).forEach((condition) => {
-            const conditionFunction = this.factoredConditions[condition];
-            set(appliedConditions, condition, conditionFunction({ row }));
+        Object.keys(factoredConditions).forEach((condition) => {
+            const conditionFunction = factoredConditions[condition];
+            set(appliedConditions, condition, conditionFunction({ row, column: this }));
         });
         return appliedConditions;
     }
@@ -4331,11 +4331,7 @@ class Column extends Component {
         const appliedConditions = {};
         Object.keys(this.actionFactoredConditions).forEach((action) => {
             const factoredConditions = this.actionFactoredConditions[action];
-            appliedConditions[action] = {};
-            Object.keys(factoredConditions).forEach((condition) => {
-                const conditionFunction = factoredConditions[condition];
-                set(appliedConditions[action], condition, conditionFunction({ row }));
-            });
+            appliedConditions[action] = Object.assign({}, this.applyCondition(row, factoredConditions));
         });
         return appliedConditions;
     }
@@ -5068,7 +5064,6 @@ class GridEditable extends Grid {
         if (this.editing)
             return;
         if (column.editable) {
-            this.selectedRows = [];
             this.editing = true;
             this.preventRowClick = true;
             this.datasource.currentRow = row;
@@ -5138,7 +5133,7 @@ class GridEditable extends Grid {
         else {
             colValue = row[column.name];
         }
-        const componentProps = merge({}, column.componentProps, cellProps.componentProps);
+        const componentProps = merge({}, column.componentProps, cellProps === null || cellProps === void 0 ? void 0 : cellProps.componentProps);
         let compEvents = {};
         if (componentProps && componentProps.events) {
             compEvents = Event.factory(componentProps.events);
@@ -5848,7 +5843,7 @@ class Select extends TextInput {
      */
     constructor(props) {
         var _a, _b;
-        super(props);
+        super(Object.assign(Object.assign({}, props), { value: undefined }));
         /**
          * Field used to display values
          */
@@ -5931,6 +5926,7 @@ class Select extends TextInput {
         this.cachedData = [];
         this.cachedTotal = 0;
         this.formatterFn = FormatterParserProvider.getFormatter('ZdSelect');
+        this.pushedValue = null;
         this.loadMoreQtty = 0;
         this.debounceSearch = debounce(this.doSearch, 500);
         this.appendIcon = this.getInitValue('appendIcon', props.appendIcon, 'expand');
@@ -5952,7 +5948,13 @@ class Select extends TextInput {
             this.dataText = [this.dataText];
         const defaultDatasource = this.getDefaultDatasource(props);
         this.datasource = DatasourceFactory.factory(defaultDatasource);
-        this.setDefaultValue(props.value, (_b = props.datasource) === null || _b === void 0 ? void 0 : _b.lazyLoad);
+        this.overrideGet();
+        let defaultValue = props.value;
+        if (Accessor.isAccessorDefinition(props.value)) {
+            defaultValue = this.getAccessorValue(props.value);
+            this.getInitValue('value', props.value, this.value);
+        }
+        this.setDefaultValue(defaultValue, (_b = props.datasource) === null || _b === void 0 ? void 0 : _b.lazyLoad);
         this.preventLoadOnFocus = !defaultDatasource.lazyLoad;
         this.preventLoadOnFocus = this.getInitValue('preventLoadOnFocus', props.preventLoadOnFocus, this.preventLoadOnFocus);
         this.loadMoreQtty = this.datasource.limit;
@@ -5961,6 +5963,11 @@ class Select extends TextInput {
         this.createAccessors();
         this.initialized = true;
     }
+    getAccessorValue(accessorName) {
+        const [controller, accessor] = Accessor.getAccessor(accessorName);
+        const instance = Loader.getInstance(controller);
+        return instance[accessor];
+    }
     /**
      * Retrieves datasource structure applying infinity scroll
      * @param field Field structure
@@ -5972,6 +5979,16 @@ class Select extends TextInput {
         const searchIn = (((_a = field.datasource) === null || _a === void 0 ? void 0 : _a.searchIn) || []).concat(searchInDefault);
         return Object.assign(Object.assign({}, field.datasource), { searchIn, lazyLoad: (field.value !== '' && field.value !== undefined) || (field.datasource && field.datasource.lazyLoad) });
     }
+    overrideGet() {
+        const oldGet = this.datasource.get;
+        this.datasource.get = () => __awaiter(this, void 0, void 0, function* () {
+            yield oldGet.call(this.datasource);
+            if (this.indexOf(this.value) !== -1 || this.datasource.search || this.isFocused)
+                return;
+            yield this.setValue(this.value, false);
+            this.removePushedValue();
+        });
+    }
     get search() {
         return this.searchValue;
     }
@@ -5998,7 +6015,7 @@ class Select extends TextInput {
             }
             if (this.manualMode)
                 return;
-            this.cachedData = this.datasource.data;
+            this.cachedData = [...this.datasource.data];
             this.cachedTotal = this.datasource.total;
             if (pushed) {
                 this.pushedValue = this.selectedData;
@@ -6057,10 +6074,14 @@ class Select extends TextInput {
         if (!this.pushedValue && this.isFilledObj(this.selectValue) && this.indexOf(this.selectValue) === -1) {
             this.pushedValue = this.selectValue;
         }
-        if (this.isFilledObj(this.pushedValue) && this.indexOf(this.pushedValue) === -1) {
+        const index = this.indexOf(this.pushedValue);
+        if (this.isFilledObj(this.pushedValue) && index === -1) {
             this.datasource.data.unshift(this.pushedValue);
         }
-        this.cachedData = this.datasource.data;
+        else if (index !== 0) {
+            this.pushedValue = null;
+        }
+        this.cachedData = [...this.datasource.data];
         this.cachedTotal = this.datasource.total;
     }
     /**
@@ -6119,6 +6140,7 @@ class Select extends TextInput {
             }
             if (!searchValue) {
                 this.setFieldRowValue(null);
+                this.selectValue = this.selectedData;
                 return false;
             }
             this.setFieldRowValue(searchValue);
@@ -6229,7 +6251,7 @@ class Select extends TextInput {
             else {
                 this.removePushedValue();
                 this.datasource.search = this.searchValue;
-                this.datasource.data = this.cachedData;
+                this.datasource.data = [...this.cachedData];
                 this.datasource.total = this.cachedTotal;
             }
         });
@@ -6242,6 +6264,11 @@ class Select extends TextInput {
             yield this.datasource.setLimit(this.datasource.limit + this.loadMoreQtty);
             if (!this.datasource.search) {
                 this.afterLoad();
+                const { dataValue } = this;
+                const isSelected = this.selectValue && this.pushedValue && this.selectValue[dataValue] === this.pushedValue[dataValue];
+                if (isSelected)
+                    return;
+                this.removePushedValue();
             }
         });
     }
@@ -6255,7 +6282,7 @@ class Select extends TextInput {
             this.datasource.search = '';
             this.dirtySearchValue = '';
             if (!this.manualMode) {
-                this.datasource.data = this.cachedData;
+                this.datasource.data = [...this.cachedData];
                 this.datasource.total = this.cachedTotal;
             }
             this.checkValueOnBlur();
@@ -6268,13 +6295,17 @@ class Select extends TextInput {
         }
         if (this.manualMode)
             return;
-        if (this.isFilledObj(this.selectValue)) {
-            if (this.indexOf(this.selectValue) === -1) {
-                this.datasource.data.unshift(this.selectValue);
-                this.pushedValue = this.selectValue;
+        if (this.isFilledObj(this.selectValue) && this.indexOf(this.selectValue) === -1) {
+            if (this.pushedValue) {
+                this.removePushedValue();
             }
+            this.datasource.data.unshift(this.selectValue);
+            this.pushedValue = this.selectValue;
             return;
         }
+        const { dataValue } = this;
+        if (this.pushedValue && this.selectValue && this.selectValue[dataValue] === this.pushedValue[dataValue])
+            return;
         this.removePushedValue();
     }
     showLoadMore() {
@@ -7864,7 +7895,6 @@ class SelectMultiple extends Select {
      */
     constructor(props) {
         super(props);
-        this.selectedValue = [];
         /**
          * Selected items that were added to datasource
          */
@@ -7878,6 +7908,9 @@ class SelectMultiple extends Select {
          */
         this.moreChip = 0;
         this.showSelectAll = false;
+        if (!this.selectedValue) {
+            this.selectedValue = [];
+        }
         this.showSelectAll = this.getInitValue('showSelectAll', props.showSelectAll, this.showSelectAll);
         this.createAccessors();
     }
@@ -7917,20 +7950,23 @@ class SelectMultiple extends Select {
     set selectValue(rows) {
         if (!Array.isArray(rows))
             return;
-        if (!this.manualMode && this.insertedValues.length > 0) {
-            this.insertsRemoved = [];
+        if (!this.manualMode) {
             const values = rows.map((row) => row[this.dataValue]);
-            this.insertedValues = this.insertedValues.filter((inserted) => {
-                const removed = !values.includes(inserted[this.dataValue]);
-                if (removed) {
-                    this.insertsRemoved.push(inserted);
-                }
-                return !removed;
-            });
+            this.cutFromAToB(this.insertedValues, this.insertsRemoved, (value) => !values.includes(value[this.dataValue]));
+            this.cutFromAToB(this.insertsRemoved, this.insertedValues, (value) => values.includes(value[this.dataValue]));
         }
         this.selectedValue = rows;
         this.setFieldValue(this.getValues(rows));
     }
+    /**
+     * Removes item from array a and add it to array b if condition is satisfied
+     */
+    cutFromAToB(a, b, condition) {
+        const indices = a.reduce((result, value, index) => (condition(value) ? [...result, index] : result), []);
+        indices.forEach((index) => {
+            b.push(a.splice(index)[0]);
+        });
+    }
     setFieldValue(value) {
         return __awaiter(this, void 0, void 0, function* () {
             const promises = [];
@@ -7960,7 +7996,9 @@ class SelectMultiple extends Select {
                     }));
                 }
             });
-            yield Promise.all(promises);
+            if (promises.length) {
+                yield Promise.all(promises);
+            }
             if (searchValues.length > 0) {
                 this.setFieldRowValue(searchValues);
             }
@@ -8105,7 +8143,7 @@ class SelectMultiple extends Select {
     showLoadMore() {
         return !!this.datasource.data.length
             && !this.datasource.loadAll
-            && (this.datasource.data.length - this.insertedValues.length) < this.datasource.total;
+            && (this.datasource.data.length - this.insertedValues.length - this.insertsRemoved.length) < this.datasource.total;
     }
     /**
      * Load more data
@@ -8113,10 +8151,16 @@ class SelectMultiple extends Select {
     loadMore() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.datasource.setLimit(this.datasource.limit + this.loadMoreQtty);
+            this.insertsRemoved = this.insertsRemoved.filter((insert) => {
+                const value = insert[this.dataValue];
+                const foundInData = this.datasource.data.find(this.getCondition(value));
+                return !foundInData;
+            });
+            this.insertSelected();
             if (!this.datasource.search) {
                 this.setCache();
             }
-            this.insertSelected();
+            this.removePushedValue();
         });
     }
     /**
@@ -8310,6 +8354,9 @@ class TreeDataStructure {
             }
             return item;
         });
+        if (parent) { // remove all existing children to add new ones
+            this.treeData = this.treeData.filter((item) => item.tree__parent !== parent);
+        }
         if (!parent) {
             this.treeData = childData;
         }
@@ -8493,7 +8540,7 @@ class TreeDataStructure {
         this.treeStructure = {};
         const childData = this.originalDatasource.data.map((row) => (Object.assign(Object.assign({}, row), { tree__children: [], tree__opened: false, tree__searched: true, tree__level: 1, tree__parent: undefined })));
         this.treeData = childData;
-        this.treeStructure['no-parent'] = this.originalDatasource.data;
+        this.treeStructure['no-parent'] = childData;
     }
     /**
      * Search value against a memory datasource
@@ -8628,6 +8675,7 @@ class SelectTree extends TextInput {
          * Defines if should wait and not execute GET method when Datasource is created
          */
         this.lazyLoad = true;
+        this.selectValue = null;
         this.nodes = this.getInitValue('nodes', props.nodes, this.nodes);
         this.alwaysOpen = this.getInitValue('alwaysOpen', props.alwaysOpen, this.alwaysOpen);
         this.flattenSearchResults = this.getInitValue('flattenSearchResults', props.flattenSearchResults, this.flattenSearchResults);
@@ -8795,8 +8843,41 @@ class SelectTree extends TextInput {
     get searchValue() {
         return this.lastInputValue;
     }
+    clearRow(row) {
+        const result = Object.assign({}, row);
+        Object.keys(result).forEach((key) => {
+            if (key.indexOf('tree__') === 0) {
+                delete result[key];
+            }
+        });
+        return result;
+    }
+    get value() {
+        if (!this.selectValue)
+            return this.selectValue;
+        if (this.returnObject) {
+            return this.clearRow(this.selectValue.row);
+        }
+        return this.selectValue;
+    }
+    set value(value) {
+        this.selectValue = value;
+    }
     setValue(value) {
-        this.value = value;
+        if (this.returnObject) {
+            if (typeof value !== 'object') {
+                this.value = { id: value };
+            }
+            else {
+                this.value = { id: value[this.dataValue] };
+            }
+        }
+        else if (typeof value === 'object') {
+            this.value = value[this.dataValue];
+        }
+        else {
+            this.value = value;
+        }
     }
 }
 
@@ -8822,6 +8903,7 @@ class SelectTreeMultiple extends SelectTree {
          * Selected Nodes
          */
         this.selectedNodes = [];
+        this.selectValue = [];
         this.flat = this.getInitValue('flat', props.flat, this.flat);
         this.limit = this.getInitValue('limit', props.limit, this.limit);
         this.createAccessors();
@@ -8838,6 +8920,34 @@ class SelectTreeMultiple extends SelectTree {
     deselect(node, element) {
         this.callEvent('onDeselect', { element, component: this, node });
     }
+    get value() {
+        if (this.returnObject) {
+            return this.selectValue.map((value) => this.clearRow(value.row));
+        }
+        return this.selectValue;
+    }
+    set value(value) {
+        this.selectValue = value;
+    }
+    setValue(value) {
+        const arrValue = Array.isArray(value) ? value : [value];
+        if (this.returnObject) {
+            this.value = arrValue.map((item) => {
+                if (typeof item !== 'object') {
+                    return { id: item };
+                }
+                return { id: item[this.dataValue] };
+            });
+        }
+        else {
+            this.value = arrValue.map((item) => {
+                if (typeof item === 'object') {
+                    return item[this.dataValue];
+                }
+                return item;
+            });
+        }
+    }
 }
 
 /**
@@ -10107,7 +10217,6 @@ class TreeGridEditable extends TreeGrid {
         if (this.editing)
             return;
         if (column.editable) {
-            this.selectedRows = [];
             this.editing = true;
             this.preventRowClick = true;
             this.datasource.currentRow = row;
@@ -11056,17 +11165,37 @@ class PDFReport extends BaseReport {
 }
 
 class XLSReport extends BaseReport {
-    constructor() {
-        super(...arguments);
+    constructor(type) {
+        super();
         this.route = '/generateXLS';
+        this.expressionZeedhiToXls = {
+            AVG: 'AVERAGE',
+            COUNT: 'COUNTA',
+            MAX: 'MAX',
+            MIN: 'MIN',
+            SUM: 'SUM',
+        };
+        this.colunmXLS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        this.type = type || 'xls';
     }
-    buildDataset(data, columns) {
+    buildDataset(data, columns, metadata) {
+        let result;
+        if (this.type === 'xls') {
+            result = this.formatRawDataSet(data, columns);
+        }
+        else if (metadata) {
+            result = this.formatDataSet(metadata, data);
+        }
+        return JSON.stringify(result);
+    }
+    // formata o dataset para o formato "cru" xls
+    formatRawDataSet(data, columns) {
         const columnNames = columns.map((col) => col.name);
         const result = data.reduce((reduced, row) => {
             const values = columnNames.map((col) => row[col] || '');
             return [...reduced, values];
         }, [columnNames]);
-        return JSON.stringify(result);
+        return result;
     }
     buildMetadata(name, title, columns, filter) {
         const builtCols = this.buildColumns(columns);
@@ -11095,9 +11224,215 @@ class XLSReport extends BaseReport {
             orientation: 'PORTRAIT',
             columns: builtCols,
             filter: builtFilters,
+            reportXLS: true,
+            xlsMergedCell: [],
         };
         return Promise.resolve(JSON.stringify(metadataObj));
     }
+    isFormat3(format) {
+        return format === 'xls3';
+    }
+    // Ordenar o nome das colunas de acordo com seu index, excluindo o nome das colunas agrupadas
+    getColumnsNameFormat3(columns, metaData) {
+        const columnsNameGroup = metaData.groups.map((row) => row.field);
+        let columnsName = [];
+        Object.entries(columns).forEach((row) => {
+            const columnName = row[0];
+            if (columnsNameGroup.indexOf(columnName) === -1) {
+                const index = row[1].sequence;
+                columnsName[index] = columnName;
+            }
+        });
+        columnsName = columnsName.filter((columnName) => typeof columnName === 'string');
+        return columnsName;
+    }
+    // Ordenar o nome das colunas de acordo com seu index, e sempre deixando as colunas agrupadas nas primeiras posições
+    getColumnsName(columns, metaData, lengthGroup) {
+        const columnsNameGroup = metaData.groups.map((row) => row.field);
+        let columnsName = [];
+        Object.entries(columns).forEach((row) => {
+            const columnName = row[0];
+            const index = row[1].sequence;
+            if (columnsNameGroup.indexOf(columnName) === -1) {
+                columnsName[index + lengthGroup] = columnName;
+            }
+            else {
+                columnsName[index] = columnName;
+            }
+        });
+        columnsName = columnsName.filter((columnName) => typeof columnName === 'string');
+        return columnsName;
+    }
+    // Inicializa alguns valores auxiliares
+    initVars(metaData, type) {
+        metaData.xlsMergedCell = [];
+        const { columns } = metaData;
+        const lengthGroup = metaData.groups.length;
+        const indexLastGroup = lengthGroup - 1;
+        let columnsName = [];
+        if (this.isFormat3(type)) {
+            columnsName = this.getColumnsNameFormat3(columns, metaData);
+        }
+        else {
+            columnsName = this.getColumnsName(columns, metaData, lengthGroup);
+        }
+        const rowValues = [];
+        const formatedDataSet = [];
+        const groups = [];
+        groups.groupEnd = {};
+        groups.groupEnd.cellsfunc = {};
+        return {
+            columns, indexLastGroup, columnsName, rowValues, formatedDataSet, groups,
+        };
+    }
+    // formata a linha do grupo de acordo com o formato xls3
+    setRowGroupFormat3(row, rowValuesParam, groups, formatedDataSet, columnsName, columns, indexLastGroup) {
+        let rowValues = rowValuesParam;
+        const label = `${row.groupLabel}:${row.groupValue}`;
+        const index = row.groupIndex;
+        if (row.groupHeader) {
+            rowValues[index] = label;
+            groups[index] = { init: null, end: null };
+            formatedDataSet.push(rowValues);
+            rowValues = [];
+        }
+        else if (row.groupFooter) {
+            if (!row.groupLabel) {
+                rowValues.push('Total');
+            }
+            else {
+                rowValues.push(`Total (${label})`);
+            }
+            formatedDataSet.push(rowValues);
+            rowValues = [];
+            const funcXls = null;
+            columnsName.forEach((column) => {
+                this.formatRowFunc(column, columns, row, index, rowValues, funcXls, groups, indexLastGroup);
+            });
+        }
+        return rowValues;
+    }
+    // formata as expressões da linha
+    formatRowFunc(column, columns, row, index, rowValues, funcXlsParam, groups, indexLastGroup) {
+        let funcXls = funcXlsParam;
+        if ((row[column] === 0 || row[column]) && index !== undefined) {
+            const letter = this.colunmXLS[rowValues.length];
+            funcXls = this.expressionZeedhiToXls[columns[column].expression];
+            const cellsfunc = `${letter + groups[index].init}:${letter}${groups[index].end}`;
+            let expression = '';
+            if (indexLastGroup === index) {
+                expression = `=${funcXls}(${cellsfunc})`;
+            }
+            else {
+                expression = `=${funcXls}(${groups[index].cellsfunc[column]})`;
+                if (index === 0) {
+                    if (groups.groupEnd.cellsfunc[column]) {
+                        groups.groupEnd.cellsfunc[column] += `,${groups[index].cellsfunc[column]}`;
+                    }
+                    else {
+                        groups.groupEnd.cellsfunc[column] = groups[index].cellsfunc[column];
+                    }
+                }
+                groups[index].cellsfunc[column] = null;
+            }
+            rowValues.push(expression);
+            groups.forEach((group, indexGroup) => {
+                if (indexGroup !== indexLastGroup) {
+                    if (!group.cellsfunc) {
+                        group.cellsfunc = {};
+                    }
+                    if (group.cellsfunc[column]) {
+                        group.cellsfunc[column] += `,${cellsfunc}`;
+                    }
+                    else {
+                        group.cellsfunc[column] = cellsfunc;
+                    }
+                }
+            });
+        }
+        else {
+            let cell = row[column];
+            if (row.groupSummary) {
+                const groupEndFunc = groups.groupEnd.cellsfunc;
+                if (groupEndFunc[column]) {
+                    funcXls = this.expressionZeedhiToXls[columns[column].expression];
+                    cell = `=${funcXls}(${groupEndFunc[column]})`;
+                }
+            }
+            rowValues.push(cell);
+        }
+    }
+    // formata a linha de grupo de acordo com o formato xls2
+    setRowGroup(row, rowValues, groups, metaData, formatedDataSet, columnsName, columns, indexLastGroup) {
+        const label = `${row.groupLabel}:${row.groupValue}`;
+        const index = row.groupIndex;
+        if (row.groupHeader) {
+            rowValues[index] = label;
+            groups[index] = { init: null, end: null };
+        }
+        else if (row.groupFooter) {
+            if (!row.groupLabel) {
+                rowValues.push('Total');
+            }
+            else {
+                rowValues.push(`Total (${label})`);
+            }
+            const funcXls = null;
+            if (groups[index]) {
+                metaData.xlsMergedCell.push({
+                    start_row: groups[index].init,
+                    start_col: this.colunmXLS[index],
+                    end_row: formatedDataSet.length + 2,
+                    end_col: this.colunmXLS[index],
+                });
+            }
+            columnsName.forEach((column, columnIndex) => {
+                if (!(row.groupFooter && columnIndex === 0)) {
+                    this.formatRowFunc(column, columns, row, index, rowValues, funcXls, groups, indexLastGroup);
+                }
+            });
+        }
+        return rowValues;
+    }
+    // Defina o index dos grupos
+    setIndexGroups(groups, formatedDataSet) {
+        groups.forEach((group) => {
+            if (!group.init) {
+                group.init = formatedDataSet.length + 2;
+            }
+            group.end = formatedDataSet.length + 2;
+        });
+    }
+    // Preenche uma linha "normal"
+    setRowNormal(columnsName, rowValues, row) {
+        columnsName.forEach((column) => {
+            rowValues.push(row[column]);
+        });
+    }
+    formatDataSet(metaData, dataSet) {
+        const initVars = this.initVars(metaData, this.type);
+        const { columns, indexLastGroup, columnsName, formatedDataSet, groups, } = initVars;
+        let { rowValues } = initVars;
+        dataSet.forEach((row) => {
+            if (row.group || row.groupFooter) {
+                if (this.isFormat3(this.type)) {
+                    rowValues = this.setRowGroupFormat3(row, rowValues, groups, formatedDataSet, columnsName, columns, indexLastGroup);
+                }
+                else {
+                    rowValues = this.setRowGroup(row, rowValues, groups, metaData, formatedDataSet, columnsName, columns, indexLastGroup);
+                }
+            }
+            else {
+                this.setIndexGroups(groups, formatedDataSet);
+                this.setRowNormal(columnsName, rowValues, row);
+            }
+            if (!row.groupHeader) {
+                formatedDataSet.push(rowValues);
+            }
+            rowValues = [];
+        });
+        return [columnsName].concat(formatedDataSet);
+    }
 }
 
 class Report {
@@ -11133,8 +11468,8 @@ class Report {
         if (type === 'pdf') {
             return new PDFReport();
         }
-        if (type === 'xls') {
-            return new XLSReport();
+        if (type === 'xls' || type === 'xls2' || type === 'xls3') {
+            return new XLSReport(type);
         }
         throw new Error(`Invalid report type: ${type}`);
     }
@@ -11149,9 +11484,18 @@ class Report {
             const reportType = this.getReportType(type);
             const { route } = reportType;
             const { name, columns, datasource } = this.iterable;
+            const { groupedData } = Object.assign({}, this.iterable);
             const formattedColumns = this.removeActionColumns(columns);
-            const dataset = reportType.buildDataset(data, formattedColumns);
             const metadataObj = yield reportType.buildMetadata(name, this.title, formattedColumns, datasource.filter, portrait);
+            let dataset;
+            if ((reportType.type === 'xls2' || reportType.type === 'xls3') && groupedData) {
+                const rowMetadata = rowObj.metaData;
+                const metadataObjClone = merge(rowMetadata, JSON.parse(metadataObj));
+                dataset = reportType.buildDataset(groupedData, formattedColumns, metadataObjClone);
+            }
+            else {
+                dataset = reportType.buildDataset(data, formattedColumns);
+            }
             const filter = '[]';
             let row = {};
             if (rowObj) {