Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

 aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java

@@ -597,13 +597,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
 * -------------------------------------------------------------------------------
@@ -612,9 +610,55 @@
 * 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>
 * -------------------------------------------------------------------------------
 */


@@ -672,7 +716,7 @@
        aaStyle.fontSize(12);
//        aaStyle.width(366);
//        aaStyle.height(49);
        aaStyle.color(AAColor.rgbaColor(172, 172, 172, 1f));
        aaStyle.color(AAColor.rgbaColor(142, 142, 142, 1f));


        AATooltip aaTooltip = new AATooltip()
@@ -685,7 +729,7 @@
                .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) //设置是否百分比堆叠显示图形
@@ -840,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);
                }
@@ -871,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()