From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
index 79330b5..4b0caf0 100644
--- a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
+++ b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
@@ -70,7 +70,11 @@
public Integer xAxisTickInterval; //x 杞村埢搴︾偣闂撮殧鏁�(璁剧疆姣忛殧鍑犱釜鐐规樉绀轰竴涓� X杞寸殑鍐呭)
public String[] categories; //x 杞存槸鍚︽樉绀烘暟鎹�
public Number xAxisGridLineWidth; //x 杞寸綉鏍肩嚎鐨勫搴�
+ public String xAxisGridLineColor; //x 杞寸綉鏍肩嚎鐨勯鑹�
public Boolean xAxisVisible; //x 杞存槸鍚︽樉绀�
+ public String xAxisColor; //x 杞撮鑹�
+ public Number xAxisLineWidth; //x 杞寸嚎瀹藉害
+
public Boolean yAxisVisible; //y 杞存槸鍚︽樉绀�
public Boolean yAxisLabelsEnabled; //y 杞存槸鍚︽樉绀烘暟鎹�
public String yAxisTitle; //y 杞存爣棰�
@@ -79,6 +83,7 @@
public Number yAxisMax; //y 杞存渶澶у��
public Boolean yAxisAllowDecimals; //y 杞存槸鍚﹀厑璁告樉绀哄皬鏁�
public Number yAxisGridLineWidth; //y 杞寸綉鏍肩嚎鐨勫搴�
+ public String yAxisGridLineColor; //y 杞寸綉鏍肩嚎鐨勫搴�
public Object[] colorsTheme; //鍥捐〃涓婚棰滆壊鏁扮粍
public Boolean legendEnabled; //鏄惁鏄剧ず鍥句緥
public Object backgroundColor; //鍥捐〃鑳屾櫙鑹�
@@ -224,8 +229,30 @@
return this;
}
+ public AAChartModel xAxisGridLineColor(String prop) {
+ xAxisGridLineColor = prop;
+ return this;
+
+
+ }
+
+ public AAChartModel xAxisColor(String prop) {
+ xAxisColor = prop;
+ return this;
+ }
+
+ public AAChartModel xAxisLineWidth(Number prop) {
+ xAxisLineWidth = prop;
+ return this;
+ }
+
public AAChartModel yAxisGridLineWidth(Number prop) {
yAxisGridLineWidth = prop;
+ return this;
+ }
+
+ public AAChartModel yAxisGridLineColor(String prop) {
+ yAxisGridLineColor = prop;
return this;
}
@@ -335,7 +362,7 @@
yAxisLabelsEnabled = true;
yAxisGridLineWidth = 1f;
legendEnabled = true;
- backgroundColor = "#FF333738";
+ backgroundColor = "#333738";
borderRadius = 0f;//鏌辩姸鍥鹃暱鏉″浘澶撮儴鍦嗚鍗婂緞(鍙敤浜庤缃ご閮ㄧ殑褰㈢姸,浠呭鏉″舰鍥�,鏌辩姸鍥炬湁鏁�,璁剧疆涓�1000鏃�,鏌卞舰鍥炬垨鑰呮潯褰㈠浘澶撮儴涓烘褰�)
markerRadius = 6f;//鎶樼嚎杩炴帴鐐圭殑鍗婂緞闀垮害,濡傛灉鍊艰缃负0,杩欐牱灏辩浉褰撲簬涓嶆樉绀轰簡
}
--
Gitblit v1.8.0