V1.2

src/Data/Import/Sheet.php

@@ -5,6 +5,7 @@
 namespace Vartruexuan\HyperfExcel\Data\Import;
 
 use Vartruexuan\HyperfExcel\Data\BaseObject;
+use Vartruexuan\HyperfExcel\Exception\ExcelException;
 
 class Sheet extends BaseObject
 {
@@ -159,8 +160,27 @@ public function formatRowByHeader($row, $header)
          * @var  Column $column
          */
         foreach ($this->columns as $column) {
-            $data[$column->field ?: $column->title] = $row[$header[$column->title]];
+            $headerIndex = $header[$column->title] ?? '';
+            $data[$column->field ?: $column->title] = $row[$headerIndex] ?? '';
         }
         return $data;
     }
+
+
+    /**
+     * 校验header头正确性
+     *
+     * @param array $header
+     * @return void
+     * @throws ExcelException
+     */
+    public function validateHeader(array $header = [])
+    {
+        foreach ($this->columns as $column) {
+            if (!in_array($column->title, $header)) {
+                throw  new ExcelException("The column header does not exist in [{$column->title}]");
+            }
+        }
+    }
+
 }

src/Driver/XlsWriterDriver.php

@@ -20,6 +20,7 @@
 use Vartruexuan\HyperfExcel\Event\BeforeExportSheet;
 use Vartruexuan\HyperfExcel\Event\BeforeImportExcel;
 use Vartruexuan\HyperfExcel\Event\BeforeImportSheet;
+use Vartruexuan\HyperfExcel\Exception\EmptyDataException;
 use Vartruexuan\HyperfExcel\Exception\ExcelException;
 use Vartruexuan\HyperfExcel\Helper\Helper;
 use Vtiful\Kernel\Excel;
@@ -245,7 +246,7 @@ protected function importSheet(Excel $excel, ImportSheet $sheet, ImportConfig $c
         $sheetName = $sheet->name;
 
         $this->event->dispatch(new BeforeImportSheet($config, $this, $sheet));
-        
+
         $excel->openSheet($sheetName);
 
         $header = [];
@@ -256,7 +257,10 @@ protected function importSheet(Excel $excel, ImportSheet $sheet, ImportConfig $c
                 // 跳过指定行
                 $excel->setSkipRows($sheet->headerIndex - 1);
             }
-            $header = $excel->nextRow();
+            if (null === $header = $excel->nextRow()) {
+                throw new EmptyDataException('The imported data is empty.');
+            }
+            $sheet->validateHeader($header);
         }
 
         $columnTypes = $sheet->getColumnTypes($header ?? []);

src/Event/Error.php

@@ -9,7 +9,7 @@
 
 class Error extends Event
 {
-    public function __construct(public BaseConfig $config, public Driver $driver, public \Throwable $exception)
+    public function __construct(public BaseConfig $config, public Driver $driver, public \Throwable $exception,public bool $isPush = true)
     {
         parent::__construct($config, $driver);
     }

src/Exception/EmptyDataException.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Vartruexuan\HyperfExcel\Exception;
+
+class EmptyDataException extends ExcelException
+{
+
+}

src/Job/BaseJob.php

@@ -43,7 +43,7 @@ public function fail(\Throwable $e): void
     {
         $driver = $this->getDriver();
         $driver->logger->error('job failed:' . $e->getMessage(), ['exception' => $e]);
-        $driver->event->dispatch(new Error($this->config, $driver, $e));
+        $driver->event->dispatch(new Error($this->config, $driver, $e, false));
     }
 
     abstract function handle();

src/Listener/ProgressListener.php

@@ -190,6 +190,8 @@ function error(object $event)
         $event->driver->progress->setProgress($event->config, new ProgressData([
             'status' => ProgressData::PROGRESS_STATUS_FAIL,
         ]));
-        $event->driver->progress->pushMessage($event->config->getToken(), $event->exception->getMessage());
+        if($event->isPush){
+            $event->driver->progress->pushMessage($event->config->getToken(), $event->exception->getMessage());
+        }
     }
 }