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/AAOptionsConstructor.java | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
index 61c7c07..981fe76 100644
--- a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
+++ b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
@@ -582,13 +582,11 @@
* SegmentFault : https://segmentfault.com/u/huanghunbieguan
* <p>
* -------------------------------------------------------------------------------
- */
-
-/**
+ * <p>
* -------------------------------------------------------------------------------
- *
- * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
- *
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
* Please contact me on GitHub,if there are any problems encountered in use.
* GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
* -------------------------------------------------------------------------------
@@ -597,9 +595,70 @@
* StackOverflow : https://stackoverflow.com/users/7842508/codeforu
* JianShu : http://www.jianshu.com/u/f1e6753d4254
* SegmentFault : https://segmentfault.com/u/huanghunbieguan
- *
+ * <p>
* -------------------------------------------------------------------------------
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
+ * Please contact me on GitHub,if there are any problems encountered in use.
+ * GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
+ * -------------------------------------------------------------------------------
+ * And if you want to contribute for this project, please contact me as well
+ * GitHub : https://github.com/AAChartModel
+ * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
+ * JianShu : http://www.jianshu.com/u/f1e6753d4254
+ * SegmentFault : https://segmentfault.com/u/huanghunbieguan
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
+ * Please contact me on GitHub,if there are any problems encountered in use.
+ * GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
+ * -------------------------------------------------------------------------------
+ * And if you want to contribute for this project, please contact me as well
+ * GitHub : https://github.com/AAChartModel
+ * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
+ * JianShu : http://www.jianshu.com/u/f1e6753d4254
+ * SegmentFault : https://segmentfault.com/u/huanghunbieguan
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
+ * Please contact me on GitHub,if there are any problems encountered in use.
+ * GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
+ * -------------------------------------------------------------------------------
+ * And if you want to contribute for this project, please contact me as well
+ * GitHub : https://github.com/AAChartModel
+ * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
+ * JianShu : http://www.jianshu.com/u/f1e6753d4254
+ * SegmentFault : https://segmentfault.com/u/huanghunbieguan
+ * <p>
+ * -------------------------------------------------------------------------------
+ */
+/**
+ * -------------------------------------------------------------------------------
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
+ * Please contact me on GitHub,if there are any problems encountered in use.
+ * GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
+ * -------------------------------------------------------------------------------
+ * And if you want to contribute for this project, please contact me as well
+ * GitHub : https://github.com/AAChartModel
+ * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
+ * JianShu : http://www.jianshu.com/u/f1e6753d4254
+ * SegmentFault : https://segmentfault.com/u/huanghunbieguan
+ * <p>
+ * -------------------------------------------------------------------------------
*/
@@ -657,20 +716,20 @@
aaStyle.fontSize(12);
// aaStyle.width(366);
// aaStyle.height(49);
- aaStyle.color(AAColor.rgbaColor(255, 255, 255, 0.4f));
+ aaStyle.color(AAColor.rgbaColor(142, 142, 142, 1f));
AATooltip aaTooltip = new AATooltip()
.enabled(true) //鍚敤娴姩鎻愮ず妗�
// .shared(true) //澶氱粍鏁版嵁鍏变韩涓�涓诞鍔ㄦ彁绀烘
- .backgroundColor(AAColor.rgbaColor(85, 88, 89, 1f))
+ .backgroundColor(AAColor.rgbaColor(57, 56, 61, 1f))
.borderRadius(16)
.borderWidth(0)
.valueDecimals(2)
.style(aaStyle)
.valueSuffix(aaChartModel.tooltipValueSuffix) //娴姩鎻愮ず妗嗙殑鍗曚綅鍚嶇О鍚庣紑
.useHTML(true)
- .pointFormat("<div style='margin:5px 0;padding:0;display;flex;flex-direction:row;align-items:center'>" + "<span style='display:inline-block;width:10px;height:10px;background-color:rgba(54, 255, 186, 1);border-radius:50%'></span>" + "<span style='margin-left:6px; font-size:12px;color: rgba(255, 255, 255, 0.40)'>{series.name}: </span>" + "<span style='font-size:12px; color:rgba(255, 255, 255, 0.90)'>{point.y}</span>" + "</div>");
+ .pointFormat("<div style='margin:5px 0;padding:0;display;flex;flex-direction:row;align-items:center'>" + "<span style='display:inline-block;width:10px;height:10px;background-color:rgba(54, 255, 186, 1);border-radius:50%'></span>" + "<span style='margin-left:6px; font-size:12px;color: rgba(142, 142, 142, 1)'>{series.name}: </span>" + "<span style='font-size:12px; color:rgba(172, 172, 172, 1)'>{point.y}</span>" + "</div>");
AAPlotOptions aaPlotOptions = new AAPlotOptions()
.series(new AASeries().stacking(aaChartModel.stacking) //璁剧疆鏄惁鐧惧垎姣斿爢鍙犳樉绀哄浘褰�
@@ -825,18 +884,23 @@
Boolean aaXAxisLabelsEnabled = aaChartModel.xAxisLabelsEnabled;
AALabels aaXAxisLabels = new AALabels()
.enabled(aaXAxisLabelsEnabled);//璁剧疆 x 杞存槸鍚︽樉绀烘枃瀛�
+
if (aaXAxisLabelsEnabled) {
aaXAxisLabels.style(new AAStyle()
- .color(aaChartModel.axesTextColor));
+ .color(aaChartModel.axesTextColor)
+ );
}
AAXAxis aaXAxis = new AAXAxis()
.labels(aaXAxisLabels) //璁剧疆 x 杞存槸鍚︽樉绀烘枃瀛�
.reversed(aaChartModel.xAxisReversed)
.gridLineWidth(aaChartModel.xAxisGridLineWidth) //x杞寸綉鏍肩嚎瀹藉害
+ .gridLineColor(aaChartModel.xAxisGridLineColor) //x杞寸綉鏍肩嚎瀹藉害
.categories(aaChartModel.categories)
.visible(aaChartModel.xAxisVisible) //x杞存槸鍚﹀彲瑙�
- .tickInterval(aaChartModel.xAxisTickInterval);//x杞村潗鏍囩偣闂撮殧鏁�
+ .tickInterval(aaChartModel.xAxisTickInterval)//x杞村潗鏍囩偣闂撮殧鏁�
+ .lineColor(aaChartModel.xAxisColor) // 璁剧疆 X 杞磋酱绾块鑹蹭负绾㈣壊锛堝崄鍏繘鍒堕鑹插�硷級
+ .lineWidth(aaChartModel.xAxisLineWidth);
aaOptions.xAxis(aaXAxis);
}
@@ -856,6 +920,7 @@
.allowDecimals(aaChartModel.yAxisAllowDecimals) //鏄惁鍏佽鏄剧ず灏忔暟
.reversed(aaChartModel.yAxisReversed)
.gridLineWidth(aaChartModel.yAxisGridLineWidth) //y杞寸綉鏍肩嚎瀹藉害
+ .gridLineColor(aaChartModel.yAxisGridLineColor)//y杞寸綉鏍肩嚎棰滆壊
.title(new AATitle()
.text(aaChartModel.yAxisTitle)
.style(new AAStyle()
--
Gitblit v1.8.0