majiameng / spreadsheet-php

config/TSpreadSheet.php

Spacing +10 added lines, -10 removed lines

@@ -1,14 +1,14 @@
 <?php
 
 return [
-    'creator'=>'tinymeng',                  //文件创建者
-    'pathName'=>null,                       //文件存储位置
-    'fileName'=>null,                       //文件名称
-    'horizontalCenter'=>true,               //是否居中
-    'titleHeight'=>null,                    //定义表头行高,常用22
-    'titleWidth'=>null,                     //定义表头列宽(未设置则自动计算宽度),常用20
-    'height'=>null,                         //定义数据行高,常用22
-    'autoFilter'=>false,                    //自动筛选(是否开启)
-    'autoDataType'=>true,                   //自动适应文本类型
-    'freezePane'=>false,                    //冻结窗格（要冻结的首行首列"B2"，false不开启）
+    'creator'=>'tinymeng', //文件创建者
+    'pathName'=>null, //文件存储位置
+    'fileName'=>null, //文件名称
+    'horizontalCenter'=>true, //是否居中
+    'titleHeight'=>null, //定义表头行高,常用22
+    'titleWidth'=>null, //定义表头列宽(未设置则自动计算宽度),常用20
+    'height'=>null, //定义数据行高,常用22
+    'autoFilter'=>false, //自动筛选(是否开启)
+    'autoDataType'=>true, //自动适应文本类型
+    'freezePane'=>false, //冻结窗格（要冻结的首行首列"B2"，false不开启）
 ];

src/Gateways/Import.php

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
      * @return $this
      * @throws Exception
      */
-    public function initWorkSheet($filename='')
+    public function initWorkSheet($filename = '')
     {
-        if(!empty($filename)){
+        if (!empty($filename)) {
             $this->setFileName($filename);
         }
         $this->spreadSheet = IOFactory::load($this->fileName);

src/Gateways/Export.php

Spacing +23 added lines, -23 removed lines

@@ -33,7 +33,7 @@ 
     /**
      * __construct
      */
-    public function __construct($config=[]){
+    public function __construct($config = []) {
         $this->setConfig($config);
 
         $this->spreadSheet = new Spreadsheet();
@@ -46,7 +46,7 @@ 
      * @param $config
      * @return $this
      */
-    public function setConfig($config){
+    public function setConfig($config) {
         foreach ($config as $key => $value) {
             if (property_exists($this, $key)) {
                 $this->$key = $value;
@@ -64,7 +64,7 @@ 
     {
         /** 实例化定义默认excel **/
         $this->spreadSheet->getProperties()->setCreator($this->creator)->setLastModifiedBy($this->creator);
-        if($this->horizontalCenter){
+        if ($this->horizontalCenter) {
             $this->spreadSheet->getDefaultStyle()->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER); //默认水平居中
             $this->spreadSheet->getDefaultStyle()->getAlignment()->setVertical(Alignment::VERTICAL_CENTER); //默认垂直居中
             $this->spreadSheet->getDefaultStyle()->getAlignment()->setHorizontal(Alignment::VERTICAL_CENTER); //默认垂直居中
@@ -77,19 +77,19 @@ 
      * @return $this
      * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
-    public function createWorkSheet($sheetName="Worksheet")
+    public function createWorkSheet($sheetName = "Worksheet")
     {
         $this->sheetName = $sheetName;
         /** @var workSheet */
         $this->workSheet = $this->greateWorkSheet($sheetName);
-        if($this->workSheet == null){
-            if($this->sheetCount==1){
+        if ($this->workSheet == null) {
+            if ($this->sheetCount == 1) {
                 $this->workSheet = $this->spreadSheet->getActiveSheet();
-            }else{
+            } else {
                 $this->workSheet = $this->spreadSheet->createSheet();
             }
-            $this->sheetCount += 1;//总sheet数量
-            $this->workSheet->setTitle($sheetName);//设置sheet名称
+            $this->sheetCount += 1; //总sheet数量
+            $this->workSheet->setTitle($sheetName); //设置sheet名称
         }
 
         /** 初始化当前workSheet */
@@ -115,13 +115,13 @@ 
     public function generate()
     {
         /** 开启自动筛选 **/
-        if($this->autoFilter){
+        if ($this->autoFilter) {
             $this->spreadSheet->getActiveSheet()->setAutoFilter(
                 $this->spreadSheet->getActiveSheet()->calculateWorksheetDimension()
             );
         }
         //文件存储
-        if(empty($this->fileName)){
+        if (empty($this->fileName)) {
             $this->getFileName($this->sheetName);
         }
         return $this;
@@ -132,8 +132,8 @@ 
      * @param $file_name
      * @return string
      */
-    private function getFileName($sheetName){
-        $this->fileName = $sheetName.'_'.date('Y-m-d').'_'.rand(111,999).'.xlsx';
+    private function getFileName($sheetName) {
+        $this->fileName = $sheetName.'_'.date('Y-m-d').'_'.rand(111, 999).'.xlsx';
         return $this->fileName;
     }
 
@@ -143,18 +143,18 @@ 
      * @return void
      * @throws ExceptionAlias
      */
-    public function download($filename=''){
-        if(empty($filename)){
+    public function download($filename = '') {
+        if (empty($filename)) {
             $filename = $this->fileName;
-        }else{
+        } else {
             $filename = $this->getFileName($filename);
         }
 
         /** 输出下载 **/
-        ob_end_clean();//清除缓冲区,避免乱码
-        header( 'Access-Control-Allow-Headers:responsetype,content-type,usertoken');
-        header( 'Access-Control-Allow-Methods:GET,HEAD,PUT,POST,DELETE,PATCH');
-        header( 'Access-Control-Allow-Origin:*');
+        ob_end_clean(); //清除缓冲区,避免乱码
+        header('Access-Control-Allow-Headers:responsetype,content-type,usertoken');
+        header('Access-Control-Allow-Methods:GET,HEAD,PUT,POST,DELETE,PATCH');
+        header('Access-Control-Allow-Origin:*');
         header('Content-Type: application/vnd.ms-excel');
         header('Content-Disposition: attachment;filename="'.$filename);
         header('Cache-Control: max-age=0');
@@ -171,12 +171,12 @@ 
      * @return string
      * @throws ExceptionAlias
      */
-    public function save($filename='',$pathName=''): string
+    public function save($filename = '', $pathName = ''): string
     {
         $pathName = $this->getPathName($pathName);
-        if(empty($filename)){
+        if (empty($filename)) {
             $filename = $this->fileName;
-        }else{
+        } else {
             $filename = $this->getFileName($filename);
         }
         FileTool::mkdir($pathName);

Braces +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
         if($this->workSheet == null){
             if($this->sheetCount==1){
                 $this->workSheet = $this->spreadSheet->getActiveSheet();
-            }else{
+            } else{
                 $this->workSheet = $this->spreadSheet->createSheet();
             }
             $this->sheetCount += 1;//总sheet数量
@@ -146,7 +146,7 @@ 
     public function download($filename=''){
         if(empty($filename)){
             $filename = $this->fileName;
-        }else{
+        } else{
             $filename = $this->getFileName($filename);
         }
 
@@ -176,7 +176,7 @@ 
         $pathName = $this->getPathName($pathName);
         if(empty($filename)){
             $filename = $this->fileName;
-        }else{
+        } else{
             $filename = $this->getFileName($filename);
         }
         FileTool::mkdir($pathName);

src/Connector/Gateway.php

Spacing +10 added lines, -10 removed lines

@@ -43,8 +43,8 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/4/24 17:35
      */
-    protected function cellName($columnIndex){
-        $columnIndex =(int)$columnIndex+1;
+    protected function cellName($columnIndex) {
+        $columnIndex = (int) $columnIndex + 1;
         static $indexCache = [];
 
         if (!isset($indexCache[$columnIndex])) {
@@ -53,7 +53,7 @@ 
             do {
                 $characterValue = ($indexValue % 26) ?: 26;
                 $indexValue = ($indexValue - $characterValue) / 26;
-                $base26 = chr($characterValue + 64) . ($base26 ?: '');
+                $base26 = chr($characterValue + 64).($base26 ?: '');
             } while ($indexValue > 0);
             $indexCache[$columnIndex] = $base26;
         }
@@ -66,10 +66,10 @@ 
      * @param string
      * @return mixed
      */
-    protected function formatValue($v){
-        if($this->format === false) return $v;
-        if(is_numeric($v) && strlen($v)===10){
-            $v = date($this->format_date,$v);//时间戳转时间格式
+    protected function formatValue($v) {
+        if ($this->format === false) return $v;
+        if (is_numeric($v) && strlen($v) === 10) {
+            $v = date($this->format_date, $v); //时间戳转时间格式
         }
         return $v;
     }
@@ -79,9 +79,9 @@ 
      * @param $lastCell
      * @return array
      */
-    protected function getCellName($lastCell){
+    protected function getCellName($lastCell) {
         $cellName = array();
-        for($i='A'; $i!=$lastCell; $i++) {
+        for ($i = 'A'; $i != $lastCell; $i++) {
             $cellName[] = $i;
         }
         $cellName[] = $i++;
@@ -95,7 +95,7 @@ 
      * @return array|string|string[]
      * @throws PhpSpreadsheetException
      */
-    protected function verifyFile($path, $verifyFile = true, $zip = null){
+    protected function verifyFile($path, $verifyFile = true, $zip = null) {
         if ($verifyFile && preg_match('~^data:image/[a-z]+;base64,~', $path) !== 1) {
             // Check if a URL has been passed. https://stackoverflow.com/a/2058596/1252979
             if (filter_var($path, FILTER_VALIDATE_URL)) {

Braces +3 added lines, -1 removed lines

@@ -67,7 +67,9 @@
      * @return mixed
      */
     protected function formatValue($v){
-        if($this->format === false) return $v;
+        if($this->format === false) {
+            return $v;
+        }
         if(is_numeric($v) && strlen($v)===10){
             $v = date($this->format_date,$v);//时间戳转时间格式
         }

src/Util/TConfig.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  */
 namespace tinymeng\spreadsheet\Util;
 
-trait TConfig{
+trait TConfig {
 
     /**
      * 文件创建者
@@ -244,13 +244,13 @@ 
      */
     private function getPathName($pathName)
     {
-        if(!empty($pathName)){
+        if (!empty($pathName)) {
             return $pathName;
         }
-        if($this->pathName){
+        if ($this->pathName) {
             return $this->pathName;
         }
-        $pathName = dirname( dirname(dirname(SPREADSHEET_ROOT_PATH))).DIRECTORY_SEPARATOR."public".DIRECTORY_SEPARATOR."export".DIRECTORY_SEPARATOR.date('Ymd').DIRECTORY_SEPARATOR;
+        $pathName = dirname(dirname(dirname(SPREADSHEET_ROOT_PATH))).DIRECTORY_SEPARATOR."public".DIRECTORY_SEPARATOR."export".DIRECTORY_SEPARATOR.date('Ymd').DIRECTORY_SEPARATOR;
         return $pathName;
     }
 

src/Excel/SpreadSheet.php

Spacing +27 added lines, -27 removed lines

@@ -12,7 +12,7 @@ 
 use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use tinymeng\tools\FileTool;
 
-trait SpreadSheet{
+trait SpreadSheet {
 
     /**
      * sheet名称
@@ -29,7 +29,7 @@ 
      * 文件信息
      * @var array
      */
-    private $fileTitle=[];
+    private $fileTitle = [];
 
     /**
      * 标题占用行数
@@ -90,7 +90,7 @@ 
      */
     public $image_path = '/images';
 
-    public function setTitle($title){
+    public function setTitle($title) {
         $this->title = $title;
         $this->getTitleFields();
         return $this;
@@ -100,7 +100,7 @@ 
      * @param $value
      * @return $this
      */
-    public function setRelativePath($value){
+    public function setRelativePath($value) {
         $this->relative_path = $value;
         return $this;
     }
@@ -109,7 +109,7 @@ 
      * @param $value
      * @return $this
      */
-    public function setImagePath($value){
+    public function setImagePath($value) {
         $this->image_path = $value;
         return $this;
     }
@@ -121,40 +121,40 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/2/22 11:30
      */
-    public function getExcelData(){
+    public function getExcelData() {
         /* 循环读取每个单元格的数据 */
         $result = [];
-        $dataRow = $this->titleFieldsRow+1;
+        $dataRow = $this->titleFieldsRow + 1;
 
         //行数循环
-        for ($row = $dataRow; $row <= $this->rowCount; $row++){
-            $rowFlog = false;//行是否有内容（过滤空行）
+        for ($row = $dataRow; $row <= $this->rowCount; $row++) {
+            $rowFlog = false; //行是否有内容（过滤空行）
             //列数循环 , 列数是以A列开始
             $data = [];
-            foreach ($this->cellName as $column){
+            foreach ($this->cellName as $column) {
                 $cell = $this->workSheet->getCell($column.$row);
                 $value = trim($cell->getFormattedValue());
-                if(isset($this->title_fields[$column])){
+                if (isset($this->title_fields[$column])) {
                     $data[$this->title_fields[$column]] = $value;
-                    if(!empty($value)) $rowFlog = true;//有内容
+                    if (!empty($value)) $rowFlog = true; //有内容
                 }
             }
-            if($rowFlog) $result[] = $data;
+            if ($rowFlog) $result[] = $data;
         }
 
         /*
          * 读取表格图片数据
          * (如果为空右击图片转为浮动图片)
          */
-        $image_filename_prefix = time().rand(100,999).$this->sheet;
+        $image_filename_prefix = time().rand(100, 999).$this->sheet;
         foreach ($this->workSheet->getDrawingCollection() as $drawing) {
             /**@var $drawing Drawing* */
             list($column, $row) = Coordinate::coordinateFromString($drawing->getCoordinates());
-            $image_filename = "/{$image_filename_prefix}-" . $drawing->getCoordinates();
+            $image_filename = "/{$image_filename_prefix}-".$drawing->getCoordinates();
             $image_suffix = $this->saveImage($drawing, $image_filename);
-            $image_name = ltrim($this->relative_path, '/') . "{$image_filename}.{$image_suffix}";
-            if(isset($this->title_fields[$column])) {
-                $result[$row-($this->titleFieldsRow+1)][$this->title_fields[$column]] = $image_name;
+            $image_name = ltrim($this->relative_path, '/')."{$image_filename}.{$image_suffix}";
+            if (isset($this->title_fields[$column])) {
+                $result[$row - ($this->titleFieldsRow + 1)][$this->title_fields[$column]] = $image_name;
             }
         }
         return $result;
@@ -166,7 +166,7 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/2/22 11:30
      */
-    public function getTitle(){
+    public function getTitle() {
         return $this->title;
     }
 
@@ -176,21 +176,21 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/2/22 11:30
      */
-    public function getTitleFields(){
+    public function getTitleFields() {
         $title = $this->getTitle();
 
         $row = $this->titleFieldsRow;
         $titleDataArr = [];
 
-        foreach ($this->cellName as $column){
+        foreach ($this->cellName as $column) {
             $value = trim($this->workSheet->getCell($column.$row)->getValue());
-            if(!empty($value)){
+            if (!empty($value)) {
                 $titleDataArr[$value] = $column;
             }
         }
         $title_fields = [];
         foreach ($title as $key=>$value) {
-            if(isset($titleDataArr[$key])){
+            if (isset($titleDataArr[$key])) {
                 $title_fields[$titleDataArr[$key]] = $value;
             }
         }
@@ -208,20 +208,20 @@ 
     protected function saveImage(Drawing $drawing, $image_filename)
     {
         FileTool::mkdir($this->image_path);
-        $image_filename .= '.' . $drawing->getExtension();
+        $image_filename .= '.'.$drawing->getExtension();
         switch ($drawing->getExtension()) {
             case 'jpg':
             case 'jpeg':
                 $source = imagecreatefromjpeg($drawing->getPath());
-                imagejpeg($source, $this->image_path . $image_filename);
+                imagejpeg($source, $this->image_path.$image_filename);
                 break;
             case 'gif':
                 $source = imagecreatefromgif($drawing->getPath());
-                imagegif($source, $this->image_path . $image_filename);
+                imagegif($source, $this->image_path.$image_filename);
                 break;
             case 'png':
                 $source = imagecreatefrompng($drawing->getPath());
-                imagepng($source, $this->image_path . $image_filename);
+                imagepng($source, $this->image_path.$image_filename);
                 break;
             default:
                 throw new Exception('image format error!');

Braces +7 added lines, -2 removed lines

@@ -136,10 +136,15 @@
                 $value = trim($cell->getFormattedValue());
                 if(isset($this->title_fields[$column])){
                     $data[$this->title_fields[$column]] = $value;
-                    if(!empty($value)) $rowFlog = true;//有内容
+                    if(!empty($value)) {
+                        $rowFlog = true;
+                    }
+                    //有内容
                 }
             }
-            if($rowFlog) $result[] = $data;
+            if($rowFlog) {
+                $result[] = $data;
+            }
         }
 
         /*

src/Excel/TWorkSheet.php

Spacing +88 added lines, -88 removed lines

@@ -11,7 +11,7 @@ 
 use tinymeng\tools\exception\StatusCode;
 use tinymeng\tools\exception\TinymengException;
 
-trait TWorkSheet{
+trait TWorkSheet {
 
     /**
      * sheet名称
@@ -54,7 +54,7 @@ 
      * 文件信息
      * @var array
      */
-    private $fileTitle=[];
+    private $fileTitle = [];
 
 
     /**
@@ -74,7 +74,7 @@ 
      * @param $data
      * @return $this
      */
-    public function setData($data){
+    public function setData($data) {
         $this->data = $data;
         return $this;
     }
@@ -83,7 +83,7 @@ 
      * @param $data
      * @return $this
      */
-    public function getData(){
+    public function getData() {
         return $this->data;
     }
 
@@ -99,7 +99,7 @@ 
         $this->fileTitle = [];
         $this->data = [];
         $this->field = [];
-        if($this->freezePane) $this->workSheet->freezePane($this->freezePane); //冻结窗格
+        if ($this->freezePane) $this->workSheet->freezePane($this->freezePane); //冻结窗格
     }
 
     /**
@@ -109,9 +109,9 @@ 
      * @throws TinymengException
      * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
-    public function setWorkSheetData($fileTitle,$data)
+    public function setWorkSheetData($fileTitle, $data)
     {
-        if(isset($fileTitle['title_row']) || isset($fileTitle['group_left'])){
+        if (isset($fileTitle['title_row']) || isset($fileTitle['group_left'])) {
             /**
              * $fileTitle = [
              *       'title_row'=>1,
@@ -121,10 +121,10 @@ 
              *       ],
              *  ];
              */
-            $this->title_row = $fileTitle['title_row']??1;
-            $this->group_left = $fileTitle['group_left']??[];
-            $this->fileTitle = $fileTitle['title']??[];
-        }else{
+            $this->title_row = $fileTitle['title_row'] ?? 1;
+            $this->group_left = $fileTitle['group_left'] ?? [];
+            $this->fileTitle = $fileTitle['title'] ?? [];
+        } else {
             /**
              *  $fileTitle = [
              *       '姓名'=>'name',
@@ -135,7 +135,7 @@ 
         $this->data = $data;
 
         /** 设置第一行格式 */
-        if($this->mainTitleLine == true){
+        if ($this->mainTitleLine == true) {
             $this->excelHeader();
         }
 
@@ -143,17 +143,17 @@ 
         $this->excelTitle();
 
         /** 获取列表里所有字段 **/
-        foreach ($this->fileTitle as $key => $val){
-            if(is_array($val)){
-                foreach ($val as $k => $v){
+        foreach ($this->fileTitle as $key => $val) {
+            if (is_array($val)) {
+                foreach ($val as $k => $v) {
                     $this->field[] = $v;
                 }
-            }else{
+            } else {
                 $this->field[] = $val;
             }
         }
         /** 查询结果赋值 **/
-        if(!empty($this->data)){
+        if (!empty($this->data)) {
             $this->excelSetValue();
         }
         return $this;
@@ -164,33 +164,33 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/2/22 11:43
      */
-    public function excelSetValue(){
-        if(empty($this->group_left)){ //判断左侧是否分组
-            foreach ($this->data as $key => $val){
+    public function excelSetValue() {
+        if (empty($this->group_left)) { //判断左侧是否分组
+            foreach ($this->data as $key => $val) {
                 $this->excelSetCellValue($val);
             }
-        }else{   //根据设置分组字段进行分组
+        } else {   //根据设置分组字段进行分组
             /** 数据分组 **/
             $data = [];
             $group_left_count = count($this->group_left);
-            if($group_left_count == 1){
-                foreach ($this->data as $k => $v){
+            if ($group_left_count == 1) {
+                foreach ($this->data as $k => $v) {
                     $data[$v[$this->group_left[0]]][] = $v;
                 }
-                foreach ($data as $k =>$v){
+                foreach ($data as $k =>$v) {
                     $data[$k] = [
                         'data' => $v,
                         'count' => count($v)
                     ];
                 }
                 $this->excelGroupLeft($data, 0, $group_left_count);
-            }elseif($group_left_count == 2){
+            }elseif ($group_left_count == 2) {
                 foreach ($this->data as $v) {
                     $data[$v[$this->group_left[0]]][$v[$this->group_left[1]]][] = $v;
                 }
                 $this->data = $this->arrayCount($data);
                 $this->excelGroupLeft($this->data, 0, $group_left_count);
-            }else{
+            } else {
                 throw new TinymengException(StatusCode::COMMON_PARAM_INVALID,
                     '左侧分组过多，导出失败！'
                 );
@@ -202,36 +202,36 @@ 
      * @return void
      * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
-    public function excelHeader(){
+    public function excelHeader() {
         $row = 1;
         $this->workSheet->setCellValue('A'.$row, $this->mainTitle);
-        $this->workSheet->mergeCells('A'.$row.':'.$this->cellName($this->_col-1).$row);
+        $this->workSheet->mergeCells('A'.$row.':'.$this->cellName($this->_col - 1).$row);
     }
 
     /**
      * @return void
      * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
-    private function excelTitle(){
-        if($this->mainTitleLine == true){
-            $this->_row ++;//当前行数
+    private function excelTitle() {
+        if ($this->mainTitleLine == true) {
+            $this->_row++; //当前行数
         }
 
         $_merge = $this->cellName($this->_col);
         foreach ($this->fileTitle as $key => $val) {
-            if(!empty($this->titleHeight)) {
-                $this->workSheet->getRowDimension($this->_col)->setRowHeight($this->titleHeight);//行高度
+            if (!empty($this->titleHeight)) {
+                $this->workSheet->getRowDimension($this->_col)->setRowHeight($this->titleHeight); //行高度
             }
             $rowName = $this->cellName($this->_col);
-            $this->workSheet->getStyle($rowName . $this->_row)->getAlignment()->setWrapText(true);//自动换行
+            $this->workSheet->getStyle($rowName.$this->_row)->getAlignment()->setWrapText(true); //自动换行
             if (is_array($val)) {
                 $num = 1;
                 $_cols = $this->_col;
                 foreach ($val as $k => $v) {
-                    $this->workSheet->setCellValue($this->cellName($_cols) . ($this->_row+1), $k);
-                    if(!empty($this->titleWidth)) {
+                    $this->workSheet->setCellValue($this->cellName($_cols).($this->_row + 1), $k);
+                    if (!empty($this->titleWidth)) {
                         $this->workSheet->getColumnDimension($this->cellName($_cols))->setWidth($this->titleWidth); //列宽度
-                    }else{
+                    } else {
                         $this->workSheet->getColumnDimension($this->cellName($_cols))->setAutoSize(true); //自动计算宽度
                     }
                     if ($num < count($val)) {
@@ -240,23 +240,23 @@ 
                     }
                     $_cols++;
                 }
-                $this->workSheet->mergeCells($_merge . $this->_row.':' . $this->cellName($this->_col) .$this->_row);
-                $this->workSheet->setCellValue($_merge . $this->_row, $key);//设置值
+                $this->workSheet->mergeCells($_merge.$this->_row.':'.$this->cellName($this->_col).$this->_row);
+                $this->workSheet->setCellValue($_merge.$this->_row, $key); //设置值
             } else {
                 if ($this->title_row != 1) {
-                    $this->workSheet->mergeCells($rowName . $this->_row.':' . $rowName . ($this->_row + $this->title_row - 1));
+                    $this->workSheet->mergeCells($rowName.$this->_row.':'.$rowName.($this->_row + $this->title_row - 1));
                 }
-                $this->workSheet->setCellValue($rowName . $this->_row, $key);//设置值
-                if(!empty($this->titleWidth)){
+                $this->workSheet->setCellValue($rowName.$this->_row, $key); //设置值
+                if (!empty($this->titleWidth)) {
                     $this->workSheet->getColumnDimension($rowName)->setWidth($this->titleWidth); //列宽度
-                }else{
+                } else {
                     $this->workSheet->getColumnDimension($rowName)->setAutoSize(true); //自动计算宽度
                 }
             }
             $this->_col++;
             $_merge = $this->cellName($this->_col);
         }
-        $this->_row += $this->title_row;//当前行数
+        $this->_row += $this->title_row; //当前行数
     }
 
     /**
@@ -267,60 +267,60 @@ 
     private function excelSetCellValue($val)
     {
         //设置单元格行高
-        if(!empty($this->height)){
+        if (!empty($this->height)) {
             $this->workSheet->getRowDimension($this->_row)->setRowHeight($this->height);
         }
         $_lie = 0;
-        foreach ($this->field as $v){
+        foreach ($this->field as $v) {
             $rowName = $this->cellName($_lie);
 
-            if(strpos($v,'.') !== false){
-                $v = explode('.',$v);
+            if (strpos($v, '.') !== false) {
+                $v = explode('.', $v);
                 $content = $val;
-                for ($i=0;$i<count($v);$i++){
-                    $content = $content[$v[$i]]??'';
+                for ($i = 0; $i < count($v); $i++) {
+                    $content = $content[$v[$i]] ?? '';
                 }
-            }elseif($v == '_id'){
-                $content = $this->_row-$this->title_row;//自增序号列
-            }else{
-                $content = ($val[$v]??'');
+            }elseif ($v == '_id') {
+                $content = $this->_row - $this->title_row; //自增序号列
+            } else {
+                $content = ($val[$v] ?? '');
             }
-            if(is_array($content) && isset($content['type']) && isset($content['content'])){
-                if($content['type'] == 'image'){
+            if (is_array($content) && isset($content['type']) && isset($content['content'])) {
+                if ($content['type'] == 'image') {
                     $path = $this->verifyFile($content['content']);
                     $drawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
                     $drawing->setPath($path);
-                    if(!empty($content['height'])) {
+                    if (!empty($content['height'])) {
                         $drawing->setHeight($content['height']);
                     }
-                    if(!empty($content['width'])) {
-                        $drawing->setWidth($content['width']);//只设置高，宽会自适应，如果设置宽后，高则失效
+                    if (!empty($content['width'])) {
+                        $drawing->setWidth($content['width']); //只设置高，宽会自适应，如果设置宽后，高则失效
                     }
-                    if(!empty($content['offsetX'])) {
-                        $drawing->setOffsetX($content['offsetX']);//设置X方向偏移量
+                    if (!empty($content['offsetX'])) {
+                        $drawing->setOffsetX($content['offsetX']); //设置X方向偏移量
                     }
-                    if(!empty($content['offsetY'])) {
-                        $drawing->setOffsetY($content['offsetY']);//设置Y方向偏移量
+                    if (!empty($content['offsetY'])) {
+                        $drawing->setOffsetY($content['offsetY']); //设置Y方向偏移量
                     }
 
                     $drawing->setCoordinates($rowName.$this->_row);
                     $drawing->setWorksheet($this->workSheet);
                 }
-            }else {
-                $content = $this->formatValue($content);//格式化数据
-                if (is_numeric($content)){
-                    if($this->autoDataType && strlen($content)<11){
-                        $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content,DataType::TYPE_NUMERIC);
-                    }else{
-                        $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content,DataType::TYPE_STRING2);
+            } else {
+                $content = $this->formatValue($content); //格式化数据
+                if (is_numeric($content)) {
+                    if ($this->autoDataType && strlen($content) < 11) {
+                        $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content, DataType::TYPE_NUMERIC);
+                    } else {
+                        $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content, DataType::TYPE_STRING2);
                     }
-                }else{
-                    $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content,DataType::TYPE_STRING2);
+                } else {
+                    $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content, DataType::TYPE_STRING2);
                 }
             }
-            $_lie ++;
+            $_lie++;
         }
-        $this->_row ++;
+        $this->_row++;
     }
 
     /**
@@ -333,22 +333,22 @@ 
     private function excelGroupLeft(array $data, int $_lie, $group_left_count)
     {
         $group_start = $this->_col; //二级合并单元格开始
-        foreach ($data as $key => $val){
+        foreach ($data as $key => $val) {
             $rowName = $this->cellName($_lie);
-            $coordinate = $rowName.$this->_col.':'.$rowName.($this->_col+$val['count']-1);
+            $coordinate = $rowName.$this->_col.':'.$rowName.($this->_col + $val['count'] - 1);
             $this->workSheet->mergeCells($coordinate);
-            if($group_left_count == 1){
-                foreach ($val['data'] as $data){
+            if ($group_left_count == 1) {
+                foreach ($val['data'] as $data) {
                     $this->excelSetCellValue($data);
                 }
-            }else{
-                $rowName = $this->cellName($_lie+1);  //对应的列值
-                foreach ($val['data'] as $k => $v){
-                    $group_end_col = $group_start + $v['count']-1;
+            } else {
+                $rowName = $this->cellName($_lie + 1); //对应的列值
+                foreach ($val['data'] as $k => $v) {
+                    $group_end_col = $group_start + $v['count'] - 1;
                     $coordinate = $rowName.$group_start.':'.$rowName.$group_end_col;
                     $this->workSheet->mergeCells($coordinate);
-                    $group_start = $group_end_col+1;
-                    foreach ($v['data'] as $data){
+                    $group_start = $group_end_col + 1;
+                    foreach ($v['data'] as $data) {
                         $this->excelSetCellValue($data);
                     }
                 }
@@ -363,13 +363,13 @@ 
      * @param array $data 二维数组原始数据
      * @return array
      */
-    private function arrayCount($data=[])
+    private function arrayCount($data = [])
     {
-        foreach ($data as $key => $val){
+        foreach ($data as $key => $val) {
             $num = 0;
-            foreach ($val as $k => $v){
+            foreach ($val as $k => $v) {
                 $sub_num = count($v);
-                $num = $num+$sub_num;
+                $num = $num + $sub_num;
                 $val[$k] = [
                     'count' => $sub_num,
                     'data' => $v

Braces +17 added lines, -14 removed lines

@@ -99,7 +99,10 @@ 
         $this->fileTitle = [];
         $this->data = [];
         $this->field = [];
-        if($this->freezePane) $this->workSheet->freezePane($this->freezePane); //冻结窗格
+        if($this->freezePane) {
+            $this->workSheet->freezePane($this->freezePane);
+        }
+        //冻结窗格
     }
 
     /**
@@ -124,7 +127,7 @@ 
             $this->title_row = $fileTitle['title_row']??1;
             $this->group_left = $fileTitle['group_left']??[];
             $this->fileTitle = $fileTitle['title']??[];
-        }else{
+        } else{
             /**
              *  $fileTitle = [
              *       '姓名'=>'name',
@@ -148,7 +151,7 @@ 
                 foreach ($val as $k => $v){
                     $this->field[] = $v;
                 }
-            }else{
+            } else{
                 $this->field[] = $val;
             }
         }
@@ -169,7 +172,7 @@ 
             foreach ($this->data as $key => $val){
                 $this->excelSetCellValue($val);
             }
-        }else{   //根据设置分组字段进行分组
+        } else{   //根据设置分组字段进行分组
             /** 数据分组 **/
             $data = [];
             $group_left_count = count($this->group_left);
@@ -184,13 +187,13 @@ 
                     ];
                 }
                 $this->excelGroupLeft($data, 0, $group_left_count);
-            }elseif($group_left_count == 2){
+            } elseif($group_left_count == 2){
                 foreach ($this->data as $v) {
                     $data[$v[$this->group_left[0]]][$v[$this->group_left[1]]][] = $v;
                 }
                 $this->data = $this->arrayCount($data);
                 $this->excelGroupLeft($this->data, 0, $group_left_count);
-            }else{
+            } else{
                 throw new TinymengException(StatusCode::COMMON_PARAM_INVALID,
                     '左侧分组过多，导出失败！'
                 );
@@ -231,7 +234,7 @@ 
                     $this->workSheet->setCellValue($this->cellName($_cols) . ($this->_row+1), $k);
                     if(!empty($this->titleWidth)) {
                         $this->workSheet->getColumnDimension($this->cellName($_cols))->setWidth($this->titleWidth); //列宽度
-                    }else{
+                    } else{
                         $this->workSheet->getColumnDimension($this->cellName($_cols))->setAutoSize(true); //自动计算宽度
                     }
                     if ($num < count($val)) {
@@ -249,7 +252,7 @@ 
                 $this->workSheet->setCellValue($rowName . $this->_row, $key);//设置值
                 if(!empty($this->titleWidth)){
                     $this->workSheet->getColumnDimension($rowName)->setWidth($this->titleWidth); //列宽度
-                }else{
+                } else{
                     $this->workSheet->getColumnDimension($rowName)->setAutoSize(true); //自动计算宽度
                 }
             }
@@ -280,9 +283,9 @@ 
                 for ($i=0;$i<count($v);$i++){
                     $content = $content[$v[$i]]??'';
                 }
-            }elseif($v == '_id'){
+            } elseif($v == '_id'){
                 $content = $this->_row-$this->title_row;//自增序号列
-            }else{
+            } else{
                 $content = ($val[$v]??'');
             }
             if(is_array($content) && isset($content['type']) && isset($content['content'])){
@@ -306,15 +309,15 @@ 
                     $drawing->setCoordinates($rowName.$this->_row);
                     $drawing->setWorksheet($this->workSheet);
                 }
-            }else {
+            } else {
                 $content = $this->formatValue($content);//格式化数据
                 if (is_numeric($content)){
                     if($this->autoDataType && strlen($content)<11){
                         $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content,DataType::TYPE_NUMERIC);
-                    }else{
+                    } else{
                         $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content,DataType::TYPE_STRING2);
                     }
-                }else{
+                } else{
                     $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content,DataType::TYPE_STRING2);
                 }
             }
@@ -341,7 +344,7 @@ 
                 foreach ($val['data'] as $data){
                     $this->excelSetCellValue($data);
                 }
-            }else{
+            } else{
                 $rowName = $this->cellName($_lie+1);  //对应的列值
                 foreach ($val['data'] as $k => $v){
                     $group_end_col = $group_start + $v['count']-1;

src/TSpreadSheet.php

Spacing +4 added lines, -4 removed lines

@@ -28,17 +28,17 @@ 
      * @return mixed
      * @throws \Exception
      */
-    protected static function init($gateway, $config=[])
+    protected static function init($gateway, $config = [])
     {
         $gateway = StringTool::uFirst($gateway);
-        $class = __NAMESPACE__ . '\\Gateways\\' . $gateway;
+        $class = __NAMESPACE__.'\\Gateways\\'.$gateway;
         if (class_exists($class)) {
             $configFile = SPREADSHEET_ROOT_PATH."/config/TSpreadSheet.php";
             if (!file_exists($configFile)) {
                 return false;
             }
             $baseConfig = require $configFile;
-            $app = new $class(array_replace_recursive($baseConfig,$config));
+            $app = new $class(array_replace_recursive($baseConfig, $config));
             if ($app instanceof GatewayInterface) {
                 return $app;
             }
@@ -55,7 +55,7 @@ 
      * @param $config
      * @return mixed
      */
-    public static function __callStatic($gateway, $config=[])
+    public static function __callStatic($gateway, $config = [])
     {
         return self::init($gateway, ...$config);
     }

example/import.php

Spacing +2 added lines, -2 removed lines

@@ -20,11 +20,11 @@
 
 //读取并初始化表格内容数据
 $TSpreadSheet = TSpreadSheet::import()
-    ->initWorkSheet($filename);//读取并初始化表格内容数据
+    ->initWorkSheet($filename); //读取并初始化表格内容数据
 
 //设置title对应字段,获取表格内容
 $data = $TSpreadSheet->setTitle($title)->getExcelData();
-var_dump($data);die;
+var_dump($data); die;
 /**
  * array(3) {
  * [0]=>