diff --git a/CHANGELOG.md b/CHANGELOG.md index 550ce76..a1669a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ ## v.5.6 -Excel::setActiveSheet($name): Excel -- Set active (default) sheet by case-insensitive name -Sheet::isName($name): bool -- Case-insensitive name checking -Sheet::setPrintArea($range): Sheet -Sheet::setPrintTopRows($rows): Sheet -Sheet::setPrintLeftColumns($cols): Sheet -Sheet::setPrintGridlines($bool): Sheet +* Excel::setActiveSheet($name): Excel -- Set active (default) sheet by case-insensitive name +* Sheet::isName($name): bool -- Case-insensitive name checking +* Sheet::setPrintArea($range): Sheet +* Sheet::setPrintTopRows($rows): Sheet +* Sheet::setPrintLeftColumns($cols): Sheet +* Sheet::setPrintGridlines($bool): Sheet ## v.5.5 diff --git a/README.md b/README.md index 6cf0153..35fb704 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Latest Stable Version](http://poser.pugx.org/avadim/fast-excel-writer/v)](https://packagist.org/packages/avadim/fast-excel-writer) -[![Total Downloads](http://poser.pugx.org/avadim/fast-excel-writer/downloads)](https://packagist.org/packages/avadim/fast-excel-writer) +[![GitHub Release](https://img.shields.io/github/v/release/aVadim483/fast-excel-writer)](https://packagist.org/packages/avadim/fast-excel-writer) +[![Packagist Downloads](https://img.shields.io/packagist/dt/avadim/fast-excel-writer?color=%2300aa00)](https://packagist.org/packages/avadim/fast-excel-writer) [![License](http://poser.pugx.org/avadim/fast-excel-writer/license)](https://packagist.org/packages/avadim/fast-excel-writer) [![PHP Version Require](http://poser.pugx.org/avadim/fast-excel-writer/require/php)](https://packagist.org/packages/avadim/fast-excel-writer) diff --git a/src/FastExcelWriter/Writer/Writer.php b/src/FastExcelWriter/Writer/Writer.php index 60cca1a..99b6a68 100644 --- a/src/FastExcelWriter/Writer/Writer.php +++ b/src/FastExcelWriter/Writer/Writer.php @@ -1179,6 +1179,12 @@ public function writeSheetDataEnd(Sheet $sheet) $sheet->fileWriter->write(''); } + if ($sheet->autoFilter) { + $minCell = $sheet->autoFilter; + $maxCell = Excel::cellAddress($sheet->rowCountWritten, $sheet->colCountWritten); + $sheet->fileWriter->write(''); + } + $mergedCells = $sheet->getMergedCells(); if ($mergedCells) { $sheet->fileWriter->write(''); @@ -1188,12 +1194,6 @@ public function writeSheetDataEnd(Sheet $sheet) $sheet->fileWriter->write(''); } - if ($sheet->autoFilter) { - $minCell = $sheet->autoFilter; - $maxCell = Excel::cellAddress($sheet->rowCountWritten, $sheet->colCountWritten); - $sheet->fileWriter->write(''); - } - $links = $sheet->getExternalLinks(); if ($links) { $sheet->fileWriter->write('');