fix:修复BUG/升级1.1.6版本

This commit is contained in:
Ying
2023-04-25 20:11:49 +08:00
parent 445e5f9662
commit 6a6866bbaf
2357 changed files with 456920 additions and 140567 deletions

View File

@@ -0,0 +1,36 @@
<?php
namespace PhpOffice\PhpSpreadsheet\RichText;
interface ITextElement
{
/**
* Get text.
*
* @return string Text
*/
public function getText();
/**
* Set text.
*
* @param string $text Text
*
* @return ITextElement
*/
public function setText($text);
/**
* Get font.
*
* @return null|\PhpOffice\PhpSpreadsheet\Style\Font
*/
public function getFont();
/**
* Get hash code.
*
* @return string Hash code
*/
public function getHashCode();
}

View File

@@ -0,0 +1,171 @@
<?php
namespace PhpOffice\PhpSpreadsheet\RichText;
use PhpOffice\PhpSpreadsheet\Cell\Cell;
use PhpOffice\PhpSpreadsheet\Cell\DataType;
use PhpOffice\PhpSpreadsheet\IComparable;
class RichText implements IComparable
{
/**
* Rich text elements.
*
* @var ITextElement[]
*/
private $richTextElements;
/**
* Create a new RichText instance.
*/
public function __construct(?Cell $cell = null)
{
// Initialise variables
$this->richTextElements = [];
// Rich-Text string attached to cell?
if ($cell !== null) {
// Add cell text and style
if ($cell->getValue() != '') {
$objRun = new Run($cell->getValue());
$objRun->setFont(clone $cell->getWorksheet()->getStyle($cell->getCoordinate())->getFont());
$this->addText($objRun);
}
// Set parent value
$cell->setValueExplicit($this, DataType::TYPE_STRING);
}
}
/**
* Add text.
*
* @param ITextElement $text Rich text element
*
* @return $this
*/
public function addText(ITextElement $text)
{
$this->richTextElements[] = $text;
return $this;
}
/**
* Create text.
*
* @param string $text Text
*
* @return TextElement
*/
public function createText($text)
{
$objText = new TextElement($text);
$this->addText($objText);
return $objText;
}
/**
* Create text run.
*
* @param string $text Text
*
* @return Run
*/
public function createTextRun($text)
{
$objText = new Run($text);
$this->addText($objText);
return $objText;
}
/**
* Get plain text.
*
* @return string
*/
public function getPlainText()
{
// Return value
$returnValue = '';
// Loop through all ITextElements
foreach ($this->richTextElements as $text) {
$returnValue .= $text->getText();
}
return $returnValue;
}
/**
* Convert to string.
*
* @return string
*/
public function __toString()
{
return $this->getPlainText();
}
/**
* Get Rich Text elements.
*
* @return ITextElement[]
*/
public function getRichTextElements()
{
return $this->richTextElements;
}
/**
* Set Rich Text elements.
*
* @param ITextElement[] $textElements Array of elements
*
* @return $this
*/
public function setRichTextElements(array $textElements)
{
$this->richTextElements = $textElements;
return $this;
}
/**
* Get hash code.
*
* @return string Hash code
*/
public function getHashCode()
{
$hashElements = '';
foreach ($this->richTextElements as $element) {
$hashElements .= $element->getHashCode();
}
return md5(
$hashElements .
__CLASS__
);
}
/**
* Implement PHP __clone to create a deep clone, not just a shallow copy.
*/
public function __clone()
{
$vars = get_object_vars($this);
foreach ($vars as $key => $value) {
$newValue = is_object($value) ? (clone $value) : $value;
if (is_array($value)) {
$newValue = [];
foreach ($value as $key2 => $value2) {
$newValue[$key2] = is_object($value2) ? (clone $value2) : $value2;
}
}
$this->$key = $newValue;
}
}
}

View File

@@ -0,0 +1,65 @@
<?php
namespace PhpOffice\PhpSpreadsheet\RichText;
use PhpOffice\PhpSpreadsheet\Style\Font;
class Run extends TextElement implements ITextElement
{
/**
* Font.
*
* @var ?Font
*/
private $font;
/**
* Create a new Run instance.
*
* @param string $text Text
*/
public function __construct($text = '')
{
parent::__construct($text);
// Initialise variables
$this->font = new Font();
}
/**
* Get font.
*
* @return null|\PhpOffice\PhpSpreadsheet\Style\Font
*/
public function getFont()
{
return $this->font;
}
/**
* Set font.
*
* @param Font $font Font
*
* @return $this
*/
public function setFont(?Font $font = null)
{
$this->font = $font;
return $this;
}
/**
* Get hash code.
*
* @return string Hash code
*/
public function getHashCode()
{
return md5(
$this->getText() .
(($this->font === null) ? '' : $this->font->getHashCode()) .
__CLASS__
);
}
}

View File

@@ -0,0 +1,71 @@
<?php
namespace PhpOffice\PhpSpreadsheet\RichText;
class TextElement implements ITextElement
{
/**
* Text.
*
* @var string
*/
private $text;
/**
* Create a new TextElement instance.
*
* @param string $text Text
*/
public function __construct($text = '')
{
// Initialise variables
$this->text = $text;
}
/**
* Get text.
*
* @return string Text
*/
public function getText()
{
return $this->text;
}
/**
* Set text.
*
* @param string $text Text
*
* @return $this
*/
public function setText($text)
{
$this->text = $text;
return $this;
}
/**
* Get font.
*
* @return null|\PhpOffice\PhpSpreadsheet\Style\Font
*/
public function getFont()
{
return null;
}
/**
* Get hash code.
*
* @return string Hash code
*/
public function getHashCode()
{
return md5(
$this->text .
__CLASS__
);
}
}