majiameng / spreadsheet-php

src/Gateways/Export.php

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

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/Excel/SpreadSheet.php

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

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;