Add xAxisArray and yAxisArray properties for AAOptions

Author: AAChartModel

AAInfographics/AAJSFiles.bundle/AAChartView.html

@@ -25,6 +25,14 @@
             var aaGlobalChart;
             function loadTheHighChartView(sender, receivedWidth, receivedHeight) {
                 var aaOptions = JSON.parse(sender);
+                if (aaOptions.xAxisArray) {
+                    aaOptions.xAxis = aaOptions.xAxisArray
+                }
+                
+                if (aaOptions.yAxisArray) {
+                    aaOptions.yAxis = aaOptions.yAxisArray
+                }
+                
                 var o = document.getElementById('container'); //获得元素
                 if (receivedWidth != 0) {
                     o.style.width = receivedWidth; //设置宽度

AAInfographics/AAOptionsModel/AAOptions.swift

@@ -37,7 +37,9 @@ public class AAOptions: AAObject {
     var title: AATitle?
     var subtitle: AASubtitle?
     var xAxis: AAXAxis?
-    var yAxis: Any?
+    var yAxis: AAYAxis?
+    var xAxisArray: [AAXAxis]?
+    var yAxisArray: [AAYAxis]?
     var tooltip: AATooltip?
     var plotOptions: AAPlotOptions?
     var series: [AASeriesElement]?
@@ -71,11 +73,23 @@ public class AAOptions: AAObject {
     }
 
     @discardableResult
-    public func yAxis(_ prop: Any?) -> AAOptions {
+    public func yAxis(_ prop: AAYAxis?) -> AAOptions {
         yAxis = prop
         return self
     }
 
+    @discardableResult
+    public func xAxisArray(_ prop: [AAXAxis]?) -> AAOptions {
+        xAxisArray = prop
+        return self
+    }
+    
+    @discardableResult
+    public func yAxisArray(_ prop: [AAYAxis]?) -> AAOptions {
+        yAxisArray = prop
+        return self
+    }
+    
     @discardableResult
     public func tooltip(_ prop: AATooltip?) -> AAOptions {
         tooltip = prop

AAInfographicsDemo/Demo/AdditionalContent/DrawChartWithAAOptionsVC.swift

@@ -184,8 +184,7 @@ class DrawChartWithAAOptionsVC: UIViewController {
         //坐标轴显示在对立面后，x 轴是在上方显示，y 轴是在右方显示（即坐标轴会显示在对立面）。
         //该配置一般是用于多坐标轴区分展示，另外在 Highstock 中，y 轴默认是在对立面显示的。
         //默认是：false.
-        let aaYAxis = aaOptions.yAxis as? AAYAxis
-        aaYAxis?.opposite(true)
+        aaOptions.yAxis?.opposite(true)
         return aaOptions
     }
 
@@ -205,8 +204,7 @@ class DrawChartWithAAOptionsVC: UIViewController {
         )
 
         let aaOptions = AAOptionsConstructor.configureAAOptions(aaChartModel: aaChartModel)
-        let aaYAxis = aaOptions.yAxis as? AAYAxis
-        aaYAxis?.min(1000)
+        aaOptions.yAxis?.min(1000)
         return aaOptions
     }
 
@@ -279,7 +277,7 @@ class DrawChartWithAAOptionsVC: UIViewController {
             .chart(aaChart)
             .title(aaTitle)
             .xAxis(aaXAxis)
-            .yAxis(YAxisArr)
+            .yAxisArray(YAxisArr)
             .plotOptions(aaPlotOptions)
             .series(aaSeriesArr)
         return aaOptions
@@ -375,8 +373,7 @@ class DrawChartWithAAOptionsVC: UIViewController {
         )
 
         aaOptions.tooltip?.crosshairs(false)
-        let aaYAxis = aaOptions.yAxis as? AAYAxis
-        aaYAxis?
+        aaOptions.yAxis?
             .gridLineColor(AAColor.white)
             .plotBands([
             AAPlotBandsElement()
@@ -412,8 +409,7 @@ class DrawChartWithAAOptionsVC: UIViewController {
           )
 
           aaOptions.tooltip?.crosshairs(false)
-          let aaYAxis = aaOptions.yAxis as? AAYAxis
-          aaYAxis?
+          aaOptions.yAxis?
             .gridLineColor(AAColor.white)
             .plotBands([
               AAPlotBandsElement()
@@ -476,8 +472,7 @@ class DrawChartWithAAOptionsVC: UIViewController {
                 .to(50)
                 .color("#acf08f"),
         ]
-    let aaYAxis = aaOptions.yAxis as? AAYAxis
-    aaYAxis?.plotBands(aaPlotBandsArr)
+    aaOptions.yAxis?.plotBands(aaPlotBandsArr)
 
     return aaOptions
     }
@@ -550,8 +545,7 @@ class DrawChartWithAAOptionsVC: UIViewController {
                     )
         ]
 
-    let aaYAxis = aaOptions.yAxis as? AAYAxis
-    aaYAxis?.plotLines(aaPlotLinesArr)
+    aaOptions.yAxis?.plotLines(aaPlotLinesArr)
 
     return aaOptions
     }
@@ -811,10 +805,7 @@ function () {
             .style(aaStyle)
         )
 
-        
-        let aaYAxis = aaOptions.yAxis as? AAYAxis
-
-        aaYAxis?
+        aaOptions.yAxis?
             .opposite(true)
             .tickWidth(2)
             .lineWidth(1.5)//Y轴轴线颜色