suites paramètres writer

This commit is contained in:
Jephté Clain 2024-11-30 05:45:27 +04:00
parent 2fb49a110e
commit 4468c648da
4 changed files with 12 additions and 6 deletions

2
.idea/nulib-spout.iml generated
View File

@ -5,6 +5,8 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="nulib\ext\" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="nulib\ext\" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="nulib\ext\" /> <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="nulib\ext\" />
<sourceFolder url="file://$MODULE_DIR$/upstream-3.x/src" isTestSource="false" packagePrefix="OpenSpout\" /> <sourceFolder url="file://$MODULE_DIR$/upstream-3.x/src" isTestSource="false" packagePrefix="OpenSpout\" />
<sourceFolder url="file://$MODULE_DIR$/upstream-4.x/benchmarks" isTestSource="true" packagePrefix="OpenSpout\Benchmarks\" />
<sourceFolder url="file://$MODULE_DIR$/upstream-4.x/src" isTestSource="false" packagePrefix="OpenSpout\" />
<excludeFolder url="file://$MODULE_DIR$/vendor" /> <excludeFolder url="file://$MODULE_DIR$/vendor" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />

View File

@ -158,7 +158,8 @@ class SpoutBuilder extends AbstractBuilder {
} }
$writerParams = $params["spout"] ?? static::WRITER_PARAMS; $writerParams = $params["spout"] ?? static::WRITER_PARAMS;
$writerParams["->setDefaultColumnWidth"] ??= 10.5; $writerParams["default_column_width"] ??= 10.5;
self::ensure_style($writerParams["default_row_style"]);
switch ($writerType) { switch ($writerType) {
case "ods": case "ods":
case self::WRITER_TYPE_ODS: case self::WRITER_TYPE_ODS:
@ -174,7 +175,10 @@ class SpoutBuilder extends AbstractBuilder {
self::apply_params($writer, $writerParams, ref_params_xlsx::WRITER); self::apply_params($writer, $writerParams, ref_params_xlsx::WRITER);
break; break;
} }
self::ensure_style($writerParams["default_row_style"]); $defaultColumnWidth = $writerParams["default_column_width"];
if ($defaultColumnWidth !== null) $writer->setDefaultColumnWidth($defaultColumnWidth);
$defaultRowHeight = $writerParams["default_row_height"];
if ($defaultRowHeight !== null) $writer->setDefaultRowHeight($defaultRowHeight);
$defaultRowStyle = $writerParams["default_row_style"]; $defaultRowStyle = $writerParams["default_row_style"];
if ($defaultRowStyle !== null) $writer->setDefaultRowStyle($defaultRowStyle); if ($defaultRowStyle !== null) $writer->setDefaultRowStyle($defaultRowStyle);
$writer->writeToStream($this->getResource()); $writer->writeToStream($this->getResource());

View File

@ -6,10 +6,10 @@ class ref_params_ods extends ref_params {
]; ];
const WRITER = [ const WRITER = [
"->setDefaultColumnWidth" => ["float"],
"->setDefaultRowHeight" => ["float"],
"->setColumnWidth" => ["float", ["int", null]], "->setColumnWidth" => ["float", ["int", null]],
"->setColumnWidthForRange" => ["int", "int", "int"], "->setColumnWidthForRange" => ["int", "int", "int"],
"default_column_width" => "float",
"default_row_height" => "float",
"default_row_style" => self::STYLE, "default_row_style" => self::STYLE,
]; ];

View File

@ -6,10 +6,10 @@ class ref_params_xlsx extends ref_params {
]; ];
const WRITER = [ const WRITER = [
"->setDefaultColumnWidth" => ["float"],
"->setDefaultRowHeight" => ["float"],
"->setColumnWidth" => ["float", ["int", null]], "->setColumnWidth" => ["float", ["int", null]],
"->setColumnWidthForRange" => ["int", "int", "int"], "->setColumnWidthForRange" => ["int", "int", "int"],
"default_column_width" => "float",
"default_row_height" => "float",
"default_row_style" => self::STYLE, "default_row_style" => self::STYLE,
]; ];