From b6cf31ea20ebe52054cc0e3c15d1e5666aa4560d Mon Sep 17 00:00:00 2001 From: anhoder Date: Sat, 18 Mar 2023 13:05:12 +0800 Subject: [PATCH] Fix incorrect font color read from xlsx Place the read font color after setting the styles --- src/PhpSpreadsheet/Reader/Xlsx.php | 41 +++++++++--------- .../Reader/Xlsx/Issue3464Test.php | 38 ++++++++++++++++ tests/data/Reader/XLSX/issue.3464.xlsx | Bin 0 -> 6118 bytes 3 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 tests/PhpSpreadsheetTests/Reader/Xlsx/Issue3464Test.php create mode 100644 tests/data/Reader/XLSX/issue.3464.xlsx diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php index 4d8a4933f7..0786517622 100644 --- a/src/PhpSpreadsheet/Reader/Xlsx.php +++ b/src/PhpSpreadsheet/Reader/Xlsx.php @@ -507,26 +507,6 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet $relsWorkbook = $this->loadZip("$dir/_rels/" . basename($relTarget) . '.rels', ''); $relsWorkbook->registerXPathNamespace('rel', Namespaces::RELATIONSHIPS); - $sharedStrings = []; - $relType = "rel:Relationship[@Type='" - //. Namespaces::SHARED_STRINGS - . "$xmlNamespaceBase/sharedStrings" - . "']"; - $xpath = self::getArrayItem($relsWorkbook->xpath($relType)); - - if ($xpath) { - $xmlStrings = $this->loadZip("$dir/$xpath[Target]", $mainNS); - if (isset($xmlStrings->si)) { - foreach ($xmlStrings->si as $val) { - if (isset($val->t)) { - $sharedStrings[] = StringHelper::controlCharacterOOXML2PHP((string) $val->t); - } elseif (isset($val->r)) { - $sharedStrings[] = $this->parseRichText($val); - } - } - } - } - $worksheets = []; $macros = $customUI = null; foreach ($relsWorkbook->Relationship as $elex) { @@ -682,6 +662,27 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet $dxfs = $this->styleReader->dxfs($this->readDataOnly); $styles = $this->styleReader->styles(); + // Read content after setting the styles + $sharedStrings = []; + $relType = "rel:Relationship[@Type='" + //. Namespaces::SHARED_STRINGS + . "$xmlNamespaceBase/sharedStrings" + . "']"; + $xpath = self::getArrayItem($relsWorkbook->xpath($relType)); + + if ($xpath) { + $xmlStrings = $this->loadZip("$dir/$xpath[Target]", $mainNS); + if (isset($xmlStrings->si)) { + foreach ($xmlStrings->si as $val) { + if (isset($val->t)) { + $sharedStrings[] = StringHelper::controlCharacterOOXML2PHP((string) $val->t); + } elseif (isset($val->r)) { + $sharedStrings[] = $this->parseRichText($val); + } + } + } + } + $xmlWorkbook = $this->loadZipNoNamespace($relTarget, $mainNS); $xmlWorkbookNS = $this->loadZip($relTarget, $mainNS); diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue3464Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue3464Test.php new file mode 100644 index 0000000000..f08af48639 --- /dev/null +++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue3464Test.php @@ -0,0 +1,38 @@ +setReadEmptyCells(false); + + $sheet = $objReader->load(self::$testbook)->getActiveSheet(); + $rickText = $sheet->getCell([1, 1])->getValue(); + self::assertInstanceOf(RichText::class, $rickText); + + $elements = $rickText->getRichTextElements(); + self::assertCount(2, $elements); + + self::assertEquals("产品介绍\n", $elements[0]->getText()); + $font = $elements[0]->getFont(); + self::assertNotNull($font); + self::assertEquals('7f7f7f', $font->getColor()->getRGB()); + + self::assertEquals('(这是一行示例数据，在导入时需要删除该行)', $elements[1]->getText()); + $font = $elements[1]->getFont(); + self::assertNotNull($font); + self::assertEquals('ff2600', $font->getColor()->getRGB()); + } +} diff --git a/tests/data/Reader/XLSX/issue.3464.xlsx b/tests/data/Reader/XLSX/issue.3464.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..9a9dacc35a3be935d867c2d3e20e63e2636bdb8f GIT binary patch literal 6118 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 literal 0 HcmV?d00001