From: Edward <edward@roojs.com>
Date: Wed, 23 Jan 2013 08:02:48 +0000 (+0800)
Subject: SimpleExcel.php
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=e0a1b93764e71e72ec47dbc1d2bf550621fc02c0;p=Pman.Core

SimpleExcel.php
---

diff --git a/SimpleExcel.php b/SimpleExcel.php
index c7801588..3fc59301 100644
--- a/SimpleExcel.php
+++ b/SimpleExcel.php
@@ -77,10 +77,6 @@ class Pman_Core_SimpleExcel extends Pman
             }
             
         }
-         
-         print_r($data);exit;
-         
-        
         
         $workbook->close();
         $this->outfile2 = $outfile2;
@@ -183,9 +179,18 @@ class Pman_Core_SimpleExcel extends Pman
                 }
                 
                 $v = @iconv('UTF-8', 'UTF-8//IGNORE', $v);
-                $format = isset($col_cfg['format']) ? $formats[$col_cfg['format']] : false;
                 
-          //    echo "<PRE>WRITE: ". htmlspecialchars(print_r(array($r+1, $c,$v), true));
+                $format = false;
+                if(isset($col_cfg['format'])){
+                    $format = $formats[$col_cfg['format']];
+                }
+                if(isset($data['color'])){
+                    if($format === false){
+                        $format = $data['color'];
+                    }else{
+                        $format = array_merge($format,$data['color']);
+                    }
+                }
                 $worksheet->write($start_row+$r, $c, $v, $format);
             }
         }