From 907b3a6777edf2f6b117eae6676883e1052015ed Mon Sep 17 00:00:00 2001 From: An An <2236368544@qq.com> Date: Fri, 26 Jan 2024 16:07:17 +0800 Subject: [PATCH] =?UTF-8?q?Rename=20AAEvents=20to=20be=20AASeriesEvents=20?= =?UTF-8?q?=E2=9D=97=E2=9D=97=E2=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AAChartKitDemo/ChartsDemo/DrawChartWithAAOptionsVC.m | 2 +- AAChartKitDemo/ChartsDemo/JSFunctionForAALegendVC.m | 4 ++-- AAChartKitDemo/ChartsDemo/JSFunctionForAATooltipVC.m | 8 ++++---- AAChartKitDemo/ChartsDemo/TooltipOptionsVC.m | 2 +- AAChartKitLib/AAOptionsModel/AASeries.h | 8 ++++---- AAChartKitLib/AAOptionsModel/AASeries.m | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/AAChartKitDemo/ChartsDemo/DrawChartWithAAOptionsVC.m b/AAChartKitDemo/ChartsDemo/DrawChartWithAAOptionsVC.m index bd93d901b..e0bb9dbe2 100644 --- a/AAChartKitDemo/ChartsDemo/DrawChartWithAAOptionsVC.m +++ b/AAChartKitDemo/ChartsDemo/DrawChartWithAAOptionsVC.m @@ -139,7 +139,7 @@ - (AAOptions *)configureTheAAOptionsOfAreaChart { //禁用图例点击事件 - aaOptions.plotOptions.series.events = AAEvents.new + aaOptions.plotOptions.series.events = AASeriesEvents.new .legendItemClickSet(@AAJSFunc(function() { return false; })); diff --git a/AAChartKitDemo/ChartsDemo/JSFunctionForAALegendVC.m b/AAChartKitDemo/ChartsDemo/JSFunctionForAALegendVC.m index 66011cad0..2289687b0 100644 --- a/AAChartKitDemo/ChartsDemo/JSFunctionForAALegendVC.m +++ b/AAChartKitDemo/ChartsDemo/JSFunctionForAALegendVC.m @@ -93,7 +93,7 @@ - (AAOptions *)disableLegendClickEventForNormalChart { ; //禁用图例点击事件 - aaOptions.plotOptions.series.events = AAEvents.new + aaOptions.plotOptions.series.events = AASeriesEvents.new .legendItemClickSet(@AAJSFunc(function() { return false; })); @@ -198,7 +198,7 @@ - (AAOptions *)customLegendItemClickEvent { ; //自定义图例点击事件 - aaOptions.plotOptions.series.events = AAEvents.new + aaOptions.plotOptions.series.events = AASeriesEvents.new .legendItemClickSet(@AAJSFunc(function(event) { function getVisibleMode(series, serieName) { var allVisible = true; diff --git a/AAChartKitDemo/ChartsDemo/JSFunctionForAATooltipVC.m b/AAChartKitDemo/ChartsDemo/JSFunctionForAATooltipVC.m index 5c0d13c77..1a9d4686d 100644 --- a/AAChartKitDemo/ChartsDemo/JSFunctionForAATooltipVC.m +++ b/AAChartKitDemo/ChartsDemo/JSFunctionForAATooltipVC.m @@ -185,7 +185,7 @@ - (AAOptions *)customAreaChartTooltipStyleWithDifferentUnitSuffix { ; //禁用图例点击事件 - aaOptions.plotOptions.series.events = AAEvents.new + aaOptions.plotOptions.series.events = AASeriesEvents.new .legendItemClickSet(@AAJSFunc(function() { return false; })); @@ -247,7 +247,7 @@ - (AAOptions *)customAreaChartTooltipStyleWithColorfulHtmlLabels { ; //禁用图例点击事件 - aaOptions.plotOptions.series.events = AAEvents.new + aaOptions.plotOptions.series.events = AASeriesEvents.new .legendItemClickSet(@AAJSFunc(function() { return false; })); @@ -302,7 +302,7 @@ - (AAOptions *)customLineChartTooltipStyleWhenValueBeZeroDoNotShow { ; //禁用图例点击事件 - aaOptions.plotOptions.series.events = AAEvents.new + aaOptions.plotOptions.series.events = AASeriesEvents.new .legendItemClickSet(@AAJSFunc(function() { return false; })); @@ -750,7 +750,7 @@ - (AAOptions *)customAreasplineChartTooltipStyleByDivWithCSS { })); //禁用图例点击事件 - aaOptions.plotOptions.series.events = AAEvents.new + aaOptions.plotOptions.series.events = AASeriesEvents.new .legendItemClickSet(@AAJSFunc(function() { return false; })); diff --git a/AAChartKitDemo/ChartsDemo/TooltipOptionsVC.m b/AAChartKitDemo/ChartsDemo/TooltipOptionsVC.m index e93526033..21c5ef1d1 100644 --- a/AAChartKitDemo/ChartsDemo/TooltipOptionsVC.m +++ b/AAChartKitDemo/ChartsDemo/TooltipOptionsVC.m @@ -190,7 +190,7 @@ - (AAOptions *)customAreasplineChartTooltipContentWithHeaderFormat { ; //禁用图例点击事件 - aaOptions.plotOptions.series.events = AAEvents.new + aaOptions.plotOptions.series.events = AASeriesEvents.new .legendItemClickSet(@AAJSFunc(function() { return false; })); diff --git a/AAChartKitLib/AAOptionsModel/AASeries.h b/AAChartKitLib/AAOptionsModel/AASeries.h index e4b317549..94b1fdcc9 100755 --- a/AAChartKitLib/AAOptionsModel/AASeries.h +++ b/AAChartKitLib/AAOptionsModel/AASeries.h @@ -34,7 +34,7 @@ #import -@class AAMarker, AAAnimation, AAShadow, AADataLabels, AAEvents, AAStates, AAPoint; +@class AAMarker, AAAnimation, AAShadow, AADataLabels, AASeriesEvents, AAStates, AAPoint; @interface AASeries : NSObject @@ -54,7 +54,7 @@ AAPropStatementAndPropSetFuncStatement(strong, AASeries, NSArray *, keys) //plotOptions.series.connectNulls //https://www.zhihu.com/question/24173311 AAPropStatementAndPropSetFuncStatement(assign, AASeries, BOOL , connectNulls) //设置折线是否断点重连 -AAPropStatementAndPropSetFuncStatement(strong, AASeries, AAEvents *, events) +AAPropStatementAndPropSetFuncStatement(strong, AASeries, AASeriesEvents *, events) AAPropStatementAndPropSetFuncStatement(strong, AASeries, AAShadow *, shadow) AAPropStatementAndPropSetFuncStatement(strong, AASeries, AADataLabels *, dataLabels) AAPropStatementAndPropSetFuncStatement(strong, AASeries, AAStates *, states) @@ -66,9 +66,9 @@ AAPropStatementAndPropSetFuncStatement(strong, AASeries, NSNumber *, minPointLen @end -@interface AAEvents : NSObject +@interface AASeriesEvents : NSObject -AAPropStatementAndPropSetFuncStatement(copy, AAEvents, NSString *, legendItemClick) +AAPropStatementAndPropSetFuncStatement(copy, AASeriesEvents, NSString *, legendItemClick) @end diff --git a/AAChartKitLib/AAOptionsModel/AASeries.m b/AAChartKitLib/AAOptionsModel/AASeries.m index a1f314206..ec66ff7d6 100755 --- a/AAChartKitLib/AAOptionsModel/AASeries.m +++ b/AAChartKitLib/AAOptionsModel/AASeries.m @@ -48,7 +48,7 @@ @implementation AASeries AAPropSetFuncImplementation(AASeries, NSArray *, keys) //AAPropSetFuncImplementation(AASeries, BOOL , colorByPoint) //设置为 true 则是给每个点分配颜色。 AAPropSetFuncImplementation(AASeries, BOOL , connectNulls) -AAPropSetFuncImplementation(AASeries, AAEvents *, events) +AAPropSetFuncImplementation(AASeries, AASeriesEvents *, events) AAPropSetFuncImplementation(AASeries, AAShadow *, shadow) AAPropSetFuncImplementation(AASeries, AADataLabels *, dataLabels) AAPropSetFuncImplementation(AASeries, AAStates *, states) @@ -61,11 +61,11 @@ @implementation AASeries @end -@implementation AAEvents +@implementation AASeriesEvents //AAPropSetFuncImplementation(AAEvents, NSString *, legendItemClick) -AAJSFuncTypePropSetFuncImplementation(AAEvents, NSString *, legendItemClick) +AAJSFuncTypePropSetFuncImplementation(AASeriesEvents, NSString *, legendItemClick) - (void)setLegendItemClick:(NSString *)legendItemClick { _legendItemClick = [legendItemClick aa_toPureJSString];