修复合并单元格的样式问题

examples/export_demo.php

@@ -68,10 +68,11 @@ $orderField =  [
  * 订单数据导出demo
  */
 $filePath = $fileObj
-    ->defaultFormat(['align'=>[Pxlswrite::FORMAT_ALIGN_CENTER,Pxlswrite::FORMAT_ALIGN_VERTICAL_CENTER]])//全局默认样式
+    ->setDefaultStyle(['align'=>[Pxlswrite::FORMAT_ALIGN_CENTER,Pxlswrite::FORMAT_ALIGN_VERTICAL_CENTER]])//全局默认样式
     ->field($orderField)//设置字段&表格头
     ->setOrderData('generateOrderData',['order','time'],[],$pushHandle)
-    ->setColumn('A:B',50)
+    ->setColumn('A:A',50,['align'=>[Pxlswrite::FORMAT_ALIGN_LEFT,Pxlswrite::FORMAT_ALIGN_VERTICAL_CENTER]])
+    ->setColumn('B:B',50)
     ->setColumn('F:F',50)
     ->output();//输出excel文件到磁盘
 

src/Pxlswrite.php

@@ -536,10 +536,15 @@ class Pxlswrite extends Excel
      */
     public function mergeCells($_scope, $_data, $_formatHandler = null)
     {
-        if (!is_resource($_formatHandler)) {
-            $_formatHandler = $this->styleFormat($_formatHandler);
+        if(!empty($_formatHandler)){
+            if (!is_resource($_formatHandler)) {
+                $_formatHandler = $this->styleFormat($_formatHandler);
+            }
+            parent::mergeCells($_scope, $_data, $_formatHandler);
+        }else{
+            parent::mergeCells($_scope, $_data);
         }
-        parent::mergeCells($_scope, $_data, $_formatHandler);
+
         return $this;
     }
 
@@ -549,14 +554,14 @@ class Pxlswrite extends Excel
      * @return $this
      * @throws DataFormatException
      */
-    public function defaultFormat($_formatHandler)
+    public function setDefaultStyle($_formatHandler)
     {
         if (!is_resource($_formatHandler)) {
             $this->m_defaultStyle = $_formatHandler;
             $_formatHandler = $this->styleFormat($_formatHandler);
         }
 
-        parent::defaultFormat($_formatHandler);
+//        parent::defaultFormat($_formatHandler);
         return $this;
     }