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 +31 added lines, -20 removed lines

@@ -123,7 +123,10 @@ 
         $this->fileTitle = [];
         $this->data = [];
         $this->field = [];
-        if($this->freezePane) $this->workSheet->freezePane($this->freezePane); //冻结窗格
+        if($this->freezePane) {
+            $this->workSheet->freezePane($this->freezePane);
+        }
+        //冻结窗格
     }
 
     /**
@@ -153,7 +156,7 @@ 
             if (isset($titleConfig['mergeColumns'])) {
                 $this->mergeColumns = $titleConfig['mergeColumns'];
             }
-        }else{
+        } else{
             /**
              *  $titleConfig = [
              *       '姓名'=>'name',
@@ -164,7 +167,7 @@ 
         // 根据字段映射方式处理 title
         if ($this->fieldMappingMethod === ConstCode::FIELD_MAPPING_METHOD_FIELD_CORRESPONDING_NAME) {
             $this->fileTitle = array_flip($titleData);// 字段对应名称方式 - 需要将键值对调
-        }else{
+        } else{
             $this->fileTitle = $titleData;// 名称对应字段方式 - 保持原样
         }
         $this->data = $data;
@@ -184,7 +187,7 @@ 
                 foreach ($val as $k => $v){
                     $this->field[] = $v;
                 }
-            }else{
+            } else{
                 $this->field[] = $val;
             }
         }
@@ -220,7 +223,7 @@ 
             if (!empty($this->mergeColumns)) {
                 $this->autoMergeColumns($rowStart, $this->_row - 1);
             }
-        }else{   //根据设置分组字段进行分组
+        } else{   //根据设置分组字段进行分组
             /** 数据分组 **/
             $data = [];
             $group_left_count = count($this->group_left);
@@ -235,13 +238,13 @@ 
                     ];
                 }
                 $this->excelGroupLeft($data, $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, $group_left_count);
-            }else{
+            } else{
                 throw new TinymengException(StatusCode::COMMON_PARAM_INVALID,
                     '左侧分组过多，导出失败！'
                 );
@@ -299,7 +302,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)) {
@@ -317,7 +320,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); //自动计算宽度
                 }
             }
@@ -348,9 +351,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'])){
@@ -374,18 +377,18 @@ 
                     $drawing->setCoordinates($rowName.$this->_row);
                     $drawing->setWorksheet($this->workSheet);
                 }
-            }elseif(is_array($content) && isset($content['formula'])){
+            } elseif(is_array($content) && isset($content['formula'])){
                 // 新增：支持 ['formula' => '公式'] 写法
                 $this->workSheet->setCellValueExplicit($rowName.$this->_row, $content['formula'], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_FORMULA);
-            }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);
                 }
             }
@@ -427,7 +430,9 @@ 
             if (!empty($this->mergeColumns)) {
                 foreach ($this->mergeColumns as $field) {
                     // 跳过分组字段本身
-                    if (in_array($field, $this->group_left)) continue;
+                    if (in_array($field, $this->group_left)) {
+                        continue;
+                    }
                     $colIdx = array_search($field, $this->field);
                     if ($colIdx !== false) {
                         $colLetter = $this->cellName($colIdx);
@@ -442,7 +447,7 @@ 
                 foreach ($val['data'] as $dataRow){
                     $this->excelSetCellValue($dataRow);
                 }
-            }else{
+            } else{
                 $sub_group_start = $this->_row;
                 $rowName = $this->cellName($group_field_positions[1]); // 使用第二个分组字段的实际位置
                 
@@ -497,10 +502,14 @@ 
      */
     private function autoMergeColumns($rowStart, $rowEnd)
     {
-        if ($rowEnd <= $rowStart) return;
+        if ($rowEnd <= $rowStart) {
+            return;
+        }
         foreach ($this->mergeColumns as $fieldName) {
             $colIdx = array_search($fieldName, $this->field);
-            if ($colIdx === false) continue;
+            if ($colIdx === false) {
+                continue;
+            }
             $colLetter = $this->cellName($colIdx);
             $lastValue = null;
             $mergeStart = $rowStart;
@@ -526,7 +535,9 @@ 
      */
     private function applySheetStyle()
     {
-        if (empty($this->sheetStyle)) return;
+        if (empty($this->sheetStyle)) {
+            return;
+        }
         // 计算数据区范围
         $startCol = 'A';
         $endCol = $this->cellName(count($this->field) - 1);