Compare commits
No commits in common. "1ee4e5eb50f7811fdfda24855aec8708f366d140" and "f65e57c7354020c357778c9006303736a4d28351" have entirely different histories.
1ee4e5eb50
...
f65e57c735
|
@ -1,9 +1,5 @@
|
|||
# Changelog
|
||||
|
||||
## 1.3.13 (2023-04-11)
|
||||
* ```$xlsx->rightToLeft()``` - RTL mode. Column A is on the far right, Column B is one column left of Column A, and so on. Also, information in cells is displayed in the Right to Left format.
|
||||
|
||||
|
||||
## 1.3.12 (2023-03-31)
|
||||
* ```<style font-size="32">Big Text</style>``` - font size in cells, thx [Andrew Robinson](https://github.com/mrjemson)
|
||||
|
||||
|
|
|
@ -138,10 +138,6 @@ $xlsx->autoFilter('A1:B10');
|
|||
// the row and column of the indicated cell
|
||||
$xlsx->freezePanes('C3');
|
||||
|
||||
// RTL mode
|
||||
// Column A is on the far right, Column B is one column left of Column A, and so on. Also, information in cells is displayed in the Right to Left format.
|
||||
$xlsx->rightToLeft();
|
||||
|
||||
```
|
||||
### JS array to Excel (AJAX)
|
||||
```php
|
||||
|
|
|
@ -16,7 +16,6 @@ class SimpleXLSXGen
|
|||
public $curSheet;
|
||||
protected $defaultFont;
|
||||
protected $defaultFontSize;
|
||||
protected $rtl;
|
||||
protected $sheets;
|
||||
protected $template;
|
||||
protected $NF; // numFmts
|
||||
|
@ -81,7 +80,6 @@ class SimpleXLSXGen
|
|||
$this->curSheet = -1;
|
||||
$this->defaultFont = 'Calibri';
|
||||
$this->defaultFontSize = 10;
|
||||
$this->rtl = false;
|
||||
$this->sheets = [['name' => 'Sheet1', 'rows' => [], 'hyperlinks' => [], 'mergecells' => [], 'colwidth' => [], 'autofilter' => '']];
|
||||
$this->extLinkId = 0;
|
||||
$this->SI = []; // sharedStrings index
|
||||
|
@ -403,25 +401,13 @@ class SimpleXLSXGen
|
|||
. ($xf[3] & self::FL_COLOR ? '><fgColor rgb="' . $xf[5] . '"/><bgColor indexed="64"/></patternFill>' : ' />')
|
||||
. '</fill>';
|
||||
}
|
||||
$align = '';
|
||||
if ($xf[1] & self::A_LEFT) {
|
||||
$align .= ' horizontal="left"';
|
||||
} elseif ($xf[1] & self::A_RIGHT) {
|
||||
$align .= ' horizontal="right"';
|
||||
} elseif ($xf[1] & self::A_CENTER) {
|
||||
$align .= ' horizontal="center"';
|
||||
}
|
||||
if ($xf[1] & self::A_TOP) {
|
||||
$align .= ' vertical="top"';
|
||||
} elseif ($xf[1] & self::A_MIDDLE) {
|
||||
$align .= ' vertical="center"';
|
||||
} elseif ($xf[1] & self::A_BOTTOM) {
|
||||
$align .= ' vertical="bottom"';
|
||||
}
|
||||
if ($xf[1] & self::A_WRAPTEXT) {
|
||||
$align .= ' wrapText="1"';
|
||||
}
|
||||
|
||||
$align = ($xf[1] & self::A_LEFT ? ' horizontal="left"' : '')
|
||||
. ($xf[1] & self::A_RIGHT ? ' horizontal="right"' : '')
|
||||
. ($xf[1] & self::A_CENTER ? ' horizontal="center"' : '')
|
||||
. ($xf[1] & self::A_TOP ? ' vertical="top"' : '')
|
||||
. ($xf[1] & self::A_MIDDLE ? ' vertical="center"' : '')
|
||||
. ($xf[1] & self::A_BOTTOM ? ' vertical="bottom"' : '')
|
||||
. ($xf[1] & self::A_WRAPTEXT ? ' wrapText="1"' : '');
|
||||
// border
|
||||
$BR_ID = 0;
|
||||
if ($xf[6] !== '') {
|
||||
|
@ -597,14 +583,13 @@ class SimpleXLSXGen
|
|||
setlocale(LC_NUMERIC, 'C');
|
||||
$COLS = [];
|
||||
$ROWS = [];
|
||||
$SHEETVIEWS = '<sheetViews><sheetView tabSelected="1" workbookViewId="0"'.($this->rtl ? ' rightToLeft="1"' : '').'>';
|
||||
$AC = 'A1'; // Active Cell
|
||||
$SHEETVIEWS = '';
|
||||
if (count($this->sheets[$idx]['rows'])) {
|
||||
if ($this->sheets[$idx]['frozen'] !== '' || isset($this->sheets[$idx]['frozen'][0]) || isset($this->sheets[$idx]['frozen'][1])) {
|
||||
$x = $y = 0;
|
||||
if (is_string($this->sheets[$idx]['frozen'])) {
|
||||
$AC = $this->sheets[$idx]['frozen'];
|
||||
self::cell2coord($AC, $x, $y);
|
||||
$cell = $this->sheets[$idx]['frozen'];
|
||||
self::cell2coord($cell, $x, $y);
|
||||
} else {
|
||||
if (isset($this->sheets[$idx]['frozen'][0])) {
|
||||
$x = $this->sheets[$idx]['frozen'][0];
|
||||
|
@ -612,7 +597,7 @@ class SimpleXLSXGen
|
|||
if (isset($this->sheets[$idx]['frozen'][1])) {
|
||||
$y = $this->sheets[$idx]['frozen'][1];
|
||||
}
|
||||
$AC = self::coord2cell($x, $y);
|
||||
$cell = self::coord2cell($x, $y);
|
||||
}
|
||||
if ($x > 0 || $y > 0) {
|
||||
$split = '';
|
||||
|
@ -629,11 +614,9 @@ class SimpleXLSXGen
|
|||
if ($x === 0 && $y > 0) {
|
||||
$activepane = 'bottomLeft';
|
||||
}
|
||||
$SHEETVIEWS .= '<pane' . $split . ' topLeftCell="' . $AC . '" activePane="' . $activepane . '" state="frozen"/>';
|
||||
$SHEETVIEWS = '<sheetViews><sheetView tabSelected="1" workbookViewId="0"><pane' . $split . ' topLeftCell="' . $cell . '" activePane="' . $activepane . '" state="frozen"/></sheetView></sheetViews>';
|
||||
}
|
||||
}
|
||||
$SHEETVIEWS .= '<selection activeCell="' . $AC . '" sqref="' . $AC . '"/>';
|
||||
$SHEETVIEWS .= '</sheetView></sheetViews>';
|
||||
$COLS[] = '<cols>';
|
||||
$CUR_ROW = 0;
|
||||
$COL = [];
|
||||
|
@ -989,10 +972,6 @@ class SimpleXLSXGen
|
|||
$this->sheets[$this->curSheet]['colwidth'][$col] = $width;
|
||||
return $this;
|
||||
}
|
||||
public function rightToLeft($value = true) {
|
||||
$this->rtl = $value;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function esc($str)
|
||||
{
|
||||
|
@ -1015,7 +994,6 @@ class SimpleXLSXGen
|
|||
return $id;
|
||||
}
|
||||
|
||||
|
||||
public static function raw($value)
|
||||
{
|
||||
return "\0" . $value;
|
||||
|
|
Loading…
Reference in New Issue