1
0
mirror of https://github.com/shuchkin/simplexlsxgen.git synced 2023-08-10 21:12:59 +03:00

Fixed real numbers in 123.45 format detection, fast shared strings index

This commit is contained in:
Sergey Shuchkin 2020-08-21 21:57:02 +06:00
parent 9824e5b25d
commit 9b2c9d3e1c
2 changed files with 6 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# SimpleXLSXGen class 0.9.16 (Official) # SimpleXLSXGen class 0.9.17 (Official)
[<img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.herokuapp.com%2Fshuchkin" />](https://www.patreon.com/shuchkin) [<img src="https://img.shields.io/github/license/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/blob/master/license.md) [<img src="https://img.shields.io/github/stars/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/stargazers) [<img src="https://img.shields.io/github/forks/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/network) [<img src="https://img.shields.io/github/issues/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/issues) [<img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.herokuapp.com%2Fshuchkin" />](https://www.patreon.com/shuchkin) [<img src="https://img.shields.io/github/license/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/blob/master/license.md) [<img src="https://img.shields.io/github/stars/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/stargazers) [<img src="https://img.shields.io/github/forks/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/network) [<img src="https://img.shields.io/github/issues/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/issues)
Export data to Excel XLSX file. PHP XLSX generator. No external tools and libraries.<br/> Export data to Excel XLSX file. PHP XLSX generator. No external tools and libraries.<br/>
@ -62,7 +62,8 @@ SimpleXLSXGen::fromArray( $data )->saveAs('debug.xlsx');
## History ## History
v0.9.16 (2020-07-29) Fixed time detection in HH:MM:SS format v0.9.17 (2020-08-21) Fixed real numbers in 123.45 format detection, fast shared strings index (thx fredriksundin)<br/>
v0.9.16 (2020-07-29) Fixed time detection in HH:MM:SS format<br/>
v0.9.15 (2020-07-14) escape of shared strings for special chars in cells [#1](https://github.com/shuchkin/simplexlsxgen/issues/1) <br/> v0.9.15 (2020-07-14) escape of shared strings for special chars in cells [#1](https://github.com/shuchkin/simplexlsxgen/issues/1) <br/>
v0.9.14 (2020-05-31) fixed num2name A-Z,AA-AZ column names, thx Ertan Yusufoglu<br/> v0.9.14 (2020-05-31) fixed num2name A-Z,AA-AZ column names, thx Ertan Yusufoglu<br/>
v0.9.13 (2020-05-21) if string more 160 chars, save as inlineStr<br/> v0.9.13 (2020-05-21) if string more 160 chars, save as inlineStr<br/>

View File

@ -190,12 +190,12 @@ class SimpleXLSXGen {
if ( preg_match( '/^[-+]?\d{1,18}$/', $v ) ) { if ( preg_match( '/^[-+]?\d{1,18}$/', $v ) ) {
$cv = ltrim($v,'+'); $cv = ltrim($v,'+');
} elseif ( preg_match('/^[-+]?\d+\.?\d*$/', $v ) ) { } elseif ( preg_match('/^[-+]?\d+\.\d+$/', $v ) ) {
$cv = ltrim($v,'+'); $cv = ltrim($v,'+');
} elseif ( preg_match('/^([-+]?\d+)%$/', $v, $m) ) { } elseif ( preg_match('/^([-+]?\d+)%$/', $v, $m) ) {
$cv = round( $m[1] / 100, 2); $cv = round( $m[1] / 100, 2);
$cs = 1; // [9] 0% $cs = 1; // [9] 0%
} elseif ( preg_match('/^([-+]\d+\.\d*)%$/', $v, $m) ) { } elseif ( preg_match('/^([-+]\d+\.\d+)%$/', $v, $m) ) {
$cv = round( $m[1] / 100, 4 ); $cv = round( $m[1] / 100, 4 );
$cs = 2; // [10] 0.00% $cs = 2; // [10] 0.00%
} elseif ( preg_match('/^(\d\d\d\d)-(\d\d)-(\d\d)$/', $v, $m ) ){ } elseif ( preg_match('/^(\d\d\d\d)-(\d\d)-(\d\d)$/', $v, $m ) ){
@ -214,7 +214,7 @@ class SimpleXLSXGen {
$ct = 's'; // shared string $ct = 's'; // shared string
$v = str_replace(['&','<','>'],['&amp;','&lt;','&gt;'], $v); $v = str_replace(['&','<','>'],['&amp;','&lt;','&gt;'], $v);
$cv = false; $cv = false;
if ( isset($SI_KEYS[$v]) && $SI[$SI_KEYS[$v]] === $v ) { if ( isset($SI_KEYS[$v]) ) {
$cv = $SI_KEYS[$v]; $cv = $SI_KEYS[$v];
} }