Skip to content

Commit 1f9dc97

Browse files
committed
Optimize code details
1 parent 8baf896 commit 1f9dc97

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

AAInfographics/AAOptionsModel/AASeries.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public class AASeries: AAObject {
3737
private var marker: AAMarker?
3838
private var stacking: String?
3939
private var animation: AAAnimation?
40-
private var keys: Array<String>?
40+
private var keys: [String]?
4141
private var colorByPoint: Bool? //决定了图表是否给每个数据列或每个点分配一个颜色,默认值是 false, 即默认是给每个数据类分配颜色,
4242
private var connectNulls: Bool? //设置折线是否断点重连
43-
private var events: Dictionary<String, Any>?
43+
private var events: [String: Any]?
4444
private var shadow: AAShadow?
4545

4646
@discardableResult
@@ -68,7 +68,7 @@ public class AASeries: AAObject {
6868
}
6969

7070
@discardableResult
71-
public func keys(_ prop: Array<String>) -> AASeries {
71+
public func keys(_ prop: [String]) -> AASeries {
7272
keys = prop
7373
return self
7474
}
@@ -86,7 +86,7 @@ public class AASeries: AAObject {
8686
}
8787

8888
@discardableResult
89-
public func events(_ prop: Dictionary<String, Any>?) -> AASeries {
89+
public func events(_ prop: [String: Any]?) -> AASeries {
9090
events = prop
9191
return self
9292
}

AAInfographicsDemo/Demo/AdditionalContent/CustomTooltipWithJSFunctionVC.swift

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ function () {
519519
"95-99", "100 + "]
520520

521521
let aaXAxis1 = AAXAxis()
522-
.reversed(true)
522+
.reversed(true)
523523
.categories(aaCategories)
524524
.labels(
525525
AALabels()
@@ -549,21 +549,15 @@ function () {
549549
.min( -4000000)
550550
.max( 4000000)
551551

552-
let aaSeries = AASeries()
553-
.animation(
554-
AAAnimation()
555-
.duration(800)
556-
.easing(AAChartAnimationType.bounce.rawValue))
557-
.stacking(AAChartStackingType.normal.rawValue)
558-
559-
let aaColumn = AAColumn()
560-
.grouping(false)
561-
.borderWidth(0)
562-
.borderRadius(5)
563-
564552
let aaPlotOptions = AAPlotOptions()
565-
.series(aaSeries)
566-
.column(aaColumn)
553+
.series(
554+
AASeries()
555+
.animation(
556+
AAAnimation()
557+
.duration(800)
558+
.easing(AAChartAnimationType.bounce.rawValue)
559+
)
560+
.stacking(AAChartStackingType.normal.rawValue))
567561

568562
let aaTooltip = AATooltip()
569563
.enabled(true)

0 commit comments

Comments
 (0)