From 3f91c5945acd3846cf6a0b8b2ee8a3e19dc2a4c0 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Fri, 10 Mar 2017 15:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=94=B9=E4=B8=BA=E5=8F=AF?=
 =?UTF-8?q?=E8=87=AA=E7=94=B1=E6=8C=87=E5=AE=9A=E6=98=AF=E6=A8=AA=E5=90=91?=
 =?UTF-8?q?=E8=BF=98=E6=98=AF=E7=BA=B5=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chart/chart.php | 70 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 20 deletions(-)

diff --git a/chart/chart.php b/chart/chart.php
index 41ff52d..1920235 100644
--- a/chart/chart.php
+++ b/chart/chart.php
@@ -36,8 +36,8 @@
 
         private $title=null;
 
-        private $x_type=null;
-        private $col_name=null;
+        private $category='x';              //分类位置
+        private $item_name=null;            //数据项名称
 
         private $save_as_image=false;
 
@@ -67,10 +67,10 @@
             $this->save_as_image=$sai;
         }
 
-        public function set_cols($xt,$cn)
+        public function set_category($c,$in)
         {
-            $this->x_type=$xt;
-            $this->col_name=$cn;
+            $this->category=$c;
+            $this->item_name=$in;
         }
 
         public function add_data($name,$type,$data)
@@ -97,6 +97,14 @@
             echo ']},';
         }
 
+        private function echo_grid()
+        {
+            echo '  grid:
+                    {
+                        containLabel:true
+                    },';
+        }
+
         private function echo_toolbox() //输出工具箱
         {
             echo 'toolbox:
@@ -108,18 +116,13 @@
                   },';
         }
 
-        private function echo_x()       //输出横向轴配置
+        private function echo_category()
         {
-            echo 'xAxis:[
-                  {';
-
-            if($this->x_type)
-            echo '  type:"'.$this->x_type.'",';
-
+            echo '  type:"category",';
             echo '  data:[';
 
             $first=true;
-            foreach($this->col_name as $name)
+            foreach($this->item_name as $name)
             {
                 if($first==false)
                     echo ',';
@@ -129,13 +132,29 @@
                 echo '"'.$name.'"';
             }
 
-            echo ']
-            }],';
+            echo ']';
         }
 
-        private function echo_y()
+        private function echo_value()
         {
-            echo 'yAxis:[{type:"value"}],';
+            echo '  type:"value"';
+        }
+
+        private function echo_axis($dir)
+        {
+            echo $dir.'Axis:[
+                  {';
+
+            if($this->category==$dir)       //如果分类在X
+            {
+                $this->echo_category();
+            }
+            else
+            {
+                $this->echo_value();
+            }
+
+            echo '}],';
         }
 
         private function echo_series()
@@ -184,7 +203,17 @@
 
         public function draw()
         {
-            echo '<div id="'.$this->id.'" style="width:'.$this->width.'px;height:'.$this->height.'px;"></div>';
+            echo '<div id="'.$this->id.'" style="width:';
+
+            if($this->width==0)
+                echo '100%;height:';
+            else
+                echo $this->width.'px;height:';
+
+            if($this->height==0)
+                echo '100%;"></div>';
+            else
+                echo $this->width.'px;"></div>';
 
             echo '<script type="text/javascript">
 
@@ -198,13 +227,14 @@
             echo 'title:{text:"'.$this->title.'"},
                   tooltip:{},';
 
+            $this->echo_grid();
             $this->echo_legend();
 
             if($this->save_as_image)
                 $this->echo_toolbox();
 
-            $this->echo_x();
-            $this->echo_y();
+            $this->echo_axis('x');
+            $this->echo_axis('y');
 
             $this->echo_series();