Optimize multiple attribute names for AAChartModel

Author: AAChartModel

AAInfographics/AAChartCreator/AAChartModel.swift

@@ -121,7 +121,7 @@ public enum AAChartFontWeightType: String {
     case thin, regular, bold
 }
 
-public enum AALineDashStyleType: String {
+public enum AAChartLineDashStyleType: String {
     case solid
     case shortDash
     case shortDot
@@ -151,8 +151,9 @@ public class AAChartModel: AAObject {
     public var axesTextColor: String?                      //x 轴和 y 轴文字颜色
     public var chartType: AAChartType?                     //图表类型
     public var stacking: AAChartStackingType?              //堆积样式
-    public var symbol: AAChartSymbolType?                  //折线曲线连接点的类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
-    public var symbolStyle: AAChartSymbolStyleType?        //折线或者曲线的连接点是否为空心的
+    public var markerRadius: Int?                          //折线连接点的半径长度
+    public var markerSymbol: AAChartSymbolType?            //折线曲线连接点的类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
+    public var markerSymbolStyle: AAChartSymbolStyleType?  //折线或者曲线的连接点是否为空心的
     public var zoomType: AAChartZoomType?                  //缩放类型 AAChartZoomTypeX表示可沿着 x 轴进行手势缩放
     public var inverted: Bool?                             //x 轴是否翻转(垂直)
     public var xAxisReversed: Bool?                        //x 轴翻转
@@ -186,7 +187,6 @@ public class AAChartModel: AAObject {
     public var legendEnabled: Bool?                        //是否显示图例
     public var backgroundColor: Any?                       //图表背景色
     public var borderRadius: Int?                          //柱状图长条图头部圆角半径(可用于设置头部的形状,仅对条形图,柱状图有效)
-    public var markerRadius: Int?                          //折线连接点的半径长度
     public var touchEventEnabled: Bool?                    //是否支持触摸事件回调
 
     @discardableResult
@@ -275,25 +275,25 @@ public class AAChartModel: AAObject {
 
     @discardableResult
     public func symbol(_ prop: AAChartSymbolType) -> AAChartModel {
-        symbol = prop
+        markerSymbol = prop
         return self
     }
 
     @discardableResult
-    public func zoomType(_ prop: AAChartZoomType) -> AAChartModel {
-        zoomType = prop
+    public func symbolStyle(_ prop: AAChartSymbolStyleType) -> AAChartModel {
+        markerSymbolStyle = prop
         return self
     }
 
     @discardableResult
-    public func inverted(_ prop: Bool) -> AAChartModel {
-        inverted = prop
+    public func zoomType(_ prop: AAChartZoomType) -> AAChartModel {
+        zoomType = prop
         return self
     }
 
     @discardableResult
-    public func symbolStyle(_ prop: AAChartSymbolStyleType) -> AAChartModel {
-        symbolStyle = prop
+    public func inverted(_ prop: Bool) -> AAChartModel {
+        inverted = prop
         return self
     }
 

AAInfographics/AAChartCreator/AAOptionsConstructor.swift

@@ -125,13 +125,13 @@ public class AAOptionsConstructor {
             || chartType == .polygon {
             let aaMarker = AAMarker()
                 .radius(aaChartModel.markerRadius) //曲线连接点半径，默认是4
-                .symbol(aaChartModel.symbol?.rawValue) //曲线点类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
-            if (aaChartModel.symbolStyle == .innerBlank) {
+                .symbol(aaChartModel.markerSymbol?.rawValue) //曲线点类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
+            if (aaChartModel.markerSymbolStyle == .innerBlank) {
                 aaMarker
                     .fillColor("#ffffff") //点的填充色(用来设置折线连接点的填充色)
                     .lineWidth(2.0) //外沿线的宽度(用来设置折线连接点的轮廓描边的宽度)
                     .lineColor("") //外沿线的颜色(用来设置折线连接点的轮廓描边颜色，当值为空字符串时，默认取数据点或数据列的颜色)
-            } else if (aaChartModel.symbolStyle == .borderBlank) {
+            } else if (aaChartModel.markerSymbolStyle == .borderBlank) {
                 aaMarker
                     .lineWidth(2.0)
                     .lineColor(aaChartModel.backgroundColor)

AAInfographics/AAChartCreator/AASeriesElement.swift

@@ -124,7 +124,7 @@
     }
 
     @discardableResult
-    public func dashStyle(_ prop: AALineDashStyleType) -> AASeriesElement {
+    public func dashStyle(_ prop: AAChartLineDashStyleType) -> AASeriesElement {
         dashStyle = prop.rawValue
         return self
     }

AAInfographics/AAOptionsModel/AACrosshair.swift

@@ -38,7 +38,7 @@ public class AACrosshair: AAObject {
     public var width: Float?  //准星线宽度
 
     @discardableResult
-    public func dashStyle(_ prop: AALineDashStyleType) -> AACrosshair {
+    public func dashStyle(_ prop: AAChartLineDashStyleType) -> AACrosshair {
         dashStyle = prop.rawValue
         return self
     }

AAInfographics/AAOptionsModel/AAPlotLinesElement.swift

@@ -47,7 +47,7 @@ public class AAPlotLinesElement: AAObject {
     }
 
     @discardableResult
-    public func dashStyle(_ prop: AALineDashStyleType) -> AAPlotLinesElement {
+    public func dashStyle(_ prop: AAChartLineDashStyleType) -> AAPlotLinesElement {
         dashStyle = prop.rawValue
         return self
     }

AAInfographics/AAOptionsModel/AAYAxis.swift

@@ -40,7 +40,7 @@ public class AAYAxis: AAObject {
     public var reversed: Bool?
     public var gridLineWidth: Float? // y 轴网格线宽度
     public var gridLineColor: String?  // y 轴网格线颜色
-    public var gridLineDashStyle: AALineDashStyleType? //网格线线条样式，所有可用的线条样式参考：Highcharts线条样式
+    public var gridLineDashStyle: AAChartLineDashStyleType? //网格线线条样式，所有可用的线条样式参考：Highcharts线条样式
     public var alternateGridColor: String?  //backcolor of every other grid line area
     public var gridLineInterpolation: String? //Polar charts only. Whether the grid lines should draw as a polygon with straight lines between categories, or as circles. Can be either circle or polygon. 默认是：null.
     public var labels: AALabels? //用于设置 y 轴文字相关的
@@ -104,7 +104,7 @@ public class AAYAxis: AAObject {
     }
 
     @discardableResult
-    public func gridLineDashStyle(_ prop: AALineDashStyleType?) -> AAYAxis {
+    public func gridLineDashStyle(_ prop: AAChartLineDashStyleType?) -> AAYAxis {
         gridLineDashStyle = prop
         return self
     }

AAInfographicsDemo/Demo/AdditionalContent/DoubleChartsLinkedWorkVC.swift

@@ -84,7 +84,7 @@ class DoubleChartsLinkedWorkVC: UIViewController, AAChartViewDelegate {
     let aaOptions = AAOptionsConstructor.configureChartOptions(aaChartModel1)
     aaOptions.xAxis?
         .crosshair(AACrosshair()
-            .dashStyle(AALineDashStyleType.longDashDot)
+            .dashStyle(AAChartLineDashStyleType.longDashDot)
             .color(AAColor.black)
             .width(1)
     )

AAInfographicsDemo/Demo/CustomStyleChartVC.swift

@@ -244,7 +244,7 @@ class CustomStyleChartVC: UIViewController {
                     .color(AAGradientColor.freshPapaya)
                     .lineWidth(5)
                     .zones([["value": 8],
-                            ["dashStyle": AALineDashStyleType.dot.rawValue]
+                            ["dashStyle": AAChartLineDashStyleType.dot.rawValue]
                         ]),
                 AASeriesElement()
                     .name("所有专业")