Commit a04ed386 authored by 王源's avatar 王源 🎧

fix bug

parent 5d8757b6
...@@ -154,14 +154,14 @@ class Drawer ...@@ -154,14 +154,14 @@ class Drawer
* @param int $h 图片高度 * @param int $h 图片高度
* @param string $p 单元格索引 * @param string $p 单元格索引
* @param Worksheet $sheet * @param Worksheet $sheet
* @param bool $addBoard * @param int $boardPx
*/ */
public function draw2Excel($path, $h, $p, $sheet, $addBoard = true) public function draw2Excel($path, $h, $p, $sheet, $boardPx = 0)
{ {
try { try {
$path = $this->parseImagePath($path); $path = $this->parseImagePath($path);
if ($addBoard) { if ($boardPx) {
$path = $this->addBoard($path); $path = $this->addBoard($path, $boardPx);
} }
$drawing = new Drawing(); $drawing = new Drawing();
$drawing->setPath($path)->setCoordinates($p)->setHeight($h)->setWorksheet($sheet); $drawing->setPath($path)->setCoordinates($p)->setHeight($h)->setWorksheet($sheet);
......
...@@ -116,7 +116,7 @@ class ExcelImporter ...@@ -116,7 +116,7 @@ class ExcelImporter
} }
/** /**
* 必填检测数据 * 检测必填数据
* @param $requires * @param $requires
* @param $errorCount * @param $errorCount
* @throws \PhpOffice\PhpSpreadsheet\Exception * @throws \PhpOffice\PhpSpreadsheet\Exception
...@@ -136,7 +136,7 @@ class ExcelImporter ...@@ -136,7 +136,7 @@ class ExcelImporter
} }
/** /**
* 必填检测数据 * 检测数字类型数据
* @param $data * @param $data
* @param $errorCount * @param $errorCount
* @throws \PhpOffice\PhpSpreadsheet\Exception * @throws \PhpOffice\PhpSpreadsheet\Exception
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment