Fix AAChartModel#1460 = Change CustomClickEventCallbackMessageVC entrance

AAChartModel · AAChartModel · commit bdd3577cbb48 · 2023-03-28T19:23:51.000+08:00
diff --git a/AAChartKitDemo/ChartsDemo/CustomClickEventCallbackMessageVC.m b/AAChartKitDemo/ChartsDemo/CustomClickEventCallbackMessageVC.m
@@ -7,9 +7,9 @@
 #import "AAChartKit.h"
 #import "AADOMRectModel.h"
 
-static NSString *kUserContentMessageNameChartClicked = @"click";
-static NSString *kUserContentMessageNameChartMoveOver = @"moveOver";
-static NSString *kUserContentMessageNameChartDefaultSelected = @"defaultSelected";
+static NSString * const kUserContentMessageNameChartClicked = @"click";
+static NSString * const kUserContentMessageNameChartMoveOver = @"moveOver";
+static NSString * const kUserContentMessageNameChartDefaultSelected = @"defaultSelected";
 
 @interface CustomWeakProxy : NSProxy
 
@@ -143,18 +143,18 @@ - (NSString *)configureClickOrMoveOverEventJSEventWithUserContentMessageName:(NS
 - (AAOptions *)columnChartWithCustomJSFunction {
     AAOptions *aaOptions = [self areasplineChart].aa_toAAOptions;
 
-    ////        获取用户点击位置的代码逻辑, 参考:
-    ////        * https://www.highcharts.com/forum/viewtopic.php?t=11983
-    ////        * https://developer.mozilla.org/zh-CN/docs/Web/API/Element/getBoundingClientRect
+    //        获取用户点击位置的代码逻辑, 参考:
+    //        * https://www.highcharts.com/forum/viewtopic.php?t=11983
+    //        * https://developer.mozilla.org/zh-CN/docs/Web/API/Element/getBoundingClientRect
     //
-    ////        JSON.stringify(), 参考:
-    ////        * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify
+    //        JSON.stringify(), 参考:
+    //        * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify
     aaOptions.plotOptions.series
             .pointSet(AAPoint.new
-                    .eventsSet(AAPointEvents.new
-                               .clickSet([self configureClickOrMoveOverEventJSEventWithUserContentMessageName:kUserContentMessageNameChartClicked])
-                            .mouseOverSet([self configureClickOrMoveOverEventJSEventWithUserContentMessageName:kUserContentMessageNameChartMoveOver])
-                    ));
+                      .eventsSet(AAPointEvents.new
+                                 .clickSet([self configureClickOrMoveOverEventJSEventWithUserContentMessageName:kUserContentMessageNameChartClicked])
+                                 .mouseOverSet([self configureClickOrMoveOverEventJSEventWithUserContentMessageName:kUserContentMessageNameChartMoveOver])
+                                 ));
 
     //默认选中的位置索引
     NSInteger defaultSelectedIndex = 5;
diff --git a/AAChartKitDemo/ChartsDemo/MainVC.m b/AAChartKitDemo/ChartsDemo/MainVC.m
@@ -228,9 +228,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             
         case 4: {
             /*图表数据动态刷新*/
-            CustomClickEventCallbackMessageVC *vc = CustomClickEventCallbackMessageVC.new;
-//            vc.selectedIndex = row;
-//            vc.navigationItemTitleArr = self.chartTypeNameArr[section];
+            OnlyRefreshChartDataVC *vc = OnlyRefreshChartDataVC.new;
+            vc.selectedIndex = row;
+            vc.navigationItemTitleArr = self.chartTypeNameArr[section];
             [self.navigationController  pushViewController:vc animated:YES];
         }
             break;
@@ -449,6 +449,13 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             [self.navigationController pushViewController:vc animated:YES];
         }
             break;
+                        
+        case 29: {
+            /*完全自定义图表交互事件回调的信息*/
+            CustomClickEventCallbackMessageVC *vc = CustomClickEventCallbackMessageVC.new;
+            [self.navigationController  pushViewController:vc animated:YES];
+        }
+            break;
             
         default:
             break;
@@ -488,7 +495,7 @@ - (NSArray *)sectionTypeArr {
             @"JS Function For AAAxis Labels---通过 JSFunction 自定义 AAAxis 的 Labels",
             @"JS Function For AALegend Click Events---通过 JSFunction 自定义 Legend  图例的点击事件",
             @"JS Function For AAChartEvents---通过 JSFunction 自定义 AAChartEvents 的事件",
-
+            @"Custom Event Callback Message---完全自定义图表交互事件回调的信息"
         ];
     }
     return _sectionTypeArr;
@@ -826,8 +833,11 @@ - (NSArray *)chartTypeNameArr {
               @"customizeYAxisPlotLinesLabelBeSpecialStyle---自定义 Y 轴轴线上面的标签文字特殊样式",
               @"configureECGStyleChart---配置心电图样式图表📈",
               @"configureTheSizeOfTheSliceOfDonutAndPieChart---配置环形图和饼图的扇区大小",
+            ],
+            /*完全自定义图表交互事件回调的信息*/
+            @[@"Custom Click Event Callback Message---自定义点击及滑动事件回调的信息"
             ]
-
+            
         ];
     }
     return _chartTypeNameArr;
