fix: Bullet/Bubble/Violin Chart Render & deadloop of afterrender from…

… G2Plot and AfterChartRender in ChartComponentBase (#145) * fix: Bullet cannot be rendered. * fix: deadloop of afterrender from G2Plot and AfterChartRender of ChartComponentBase * fix: Bubble, Violin Chart render issue --------- Co-authored-by: Jeffers <[email protected]>
ant-design-blazor · Jul 10, 2024 · 2e71160 · 2e71160
1 parent fbf70d1
commit 2e71160
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 36 deletions.
diff --git a/src/AntDesign.Charts.Docs/Demos/Bubble/Bubble_Chart.razor b/src/AntDesign.Charts.Docs/Demos/Bubble/Bubble_Chart.razor
@@ -6,21 +6,10 @@
  <TabPane Key="1" Tab="Sample 1">
  <Scatter Config="config1" OnFirstRender="Chart1_FirstRender" />
  </TabPane>
- @* <TabPane Key="2" Tab="Sample 2"> *@
- @* <Scatter Config="config2" OnFirstRender="Chart2_FirstRender" /> *@
- @* </TabPane> *@
- @*<TabPane Key="3">
- <Tab>示例3</Tab>
- <ChildContent>
- <Bubble @ref="chart3" Data="data3" Config="config3" />
- </ChildContent>
+
+ <TabPane Key="2" Tab="Sample 2">
+ <Scatter Config="config2" OnFirstRender="Chart2_FirstRender" />
  </TabPane>
- <TabPane Key="4">
- <Tab>示例4</Tab>
- <ChildContent>
- <Bubble @ref="chart4" Data="data4" Config="config4" />
- </ChildContent>
- </TabPane>*@
 </Tabs>
 
 <Divider>动手实验</Divider>

diff --git a/src/AntDesign.Charts.Docs/Demos/Bullet/Bullet_Chart.razor b/src/AntDesign.Charts.Docs/Demos/Bullet/Bullet_Chart.razor
@@ -43,15 +43,19 @@
  BulletConfig config1 = new BulletConfig()
  {
  Data = new BulletViewConfigData[]
-{
+ {
  new BulletViewConfigData()
  {
- Title = "满意度",
-  Measures = new int[]{83 },
-  Targets = new int[]{90 },
- },
+  Title = "满意度",
+ Measures = new int[]{83 },
+ Targets = new int[]{90 },
+  Ranges = new double[]{100},
  },
- RangeMax = 100,
+ },
+ TargetField = "target",
+ RangeField = "ranges",
+ MeasureField = "measures",
+ XField = "title"
  };
 
 
@@ -136,7 +140,10 @@
  Ranges = new double[] {0,0.6,0.9,1},
  },
  },
- RangeMax = 100,
+ TargetField = "target",
+ RangeField = "ranges",
+ MeasureField = "measures",
+ XField = "title",
  RangeColors = new string[] { "#FFB1AC", "#FFDBA2", "#B4EBBF" },
 
 

diff --git a/src/AntDesign.Charts.Docs/Demos/Violin/Violin_Chart.razor b/src/AntDesign.Charts.Docs/Demos/Violin/Violin_Chart.razor
@@ -5,16 +5,16 @@
 
 <Tabs>
  <TabPane Key="1" Tab="Sample 1">
- <Violin Data="Data" Config="_config1" />
+ <Violin Data="Data" Config="_config1" OnFirstRender="onChart1_FirstRender" />
  </TabPane>
  <TabPane Key="2" Tab="Sample 2">
- <Violin Data="Data" Config="_config2" />
+ <Violin Data="Data" Config="_config2" OnFirstRender="onChart1_FirstRender" />
  </TabPane>
  <TabPane Key="3" Tab="Sample 3">
- <Violin Data="Data" Config="_config3" />
+ <Violin Data="Data" Config="_config3" OnFirstRender="onChart1_FirstRender" />
  </TabPane>
  <TabPane Key="4" Tab="Sample 4">
- <Violin Data="Data" Config="_config4" />
+ <Violin Data="Data" Config="_config4" OnFirstRender="onChart1_FirstRender" />
  </TabPane>
 </Tabs>
 
@@ -28,16 +28,16 @@
  private DynamicExample _example;
  private object[] Data { get; set; }
 
- protected override void OnAfterRender(bool firstRender)
+ private async Task onChart1_FirstRender(IChartComponent chart)
  {
- base.OnAfterRender(firstRender);
- _example.Chart = Chart;
+ var data1 = await DemoData.ViolinDataAsync(NavigationManager, HttpClient);
+ await chart.ChangeData(data1);
  }
 
- protected override async Task OnInitializedAsync()
+ protected override void OnAfterRender(bool firstRender)
  {
- Data = await DemoData.ViolinDataAsync(NavigationManager, HttpClient);
- await base.OnInitializedAsync();
+ base.OnAfterRender(firstRender);
+ _example.Chart = Chart;
  }
 
  #region Basic violin plot

diff --git a/src/AntDesign.Charts/Components/Base/ChartComponentBase.cs b/src/AntDesign.Charts/Components/Base/ChartComponentBase.cs
@@ -285,10 +285,10 @@ public async Task AfterChartRender()
  {
  IsCreated = true;
 
- if (Data != null)
- {
- await JS.InvokeVoidAsync(InteropChangeData, Ref.Id, Data, true);
- }
+ //if (Data != null)
+ //{
+ // await JS.InvokeVoidAsync(InteropChangeData, Ref.Id, Data, true);
+ //}
 
  if (OnCreateAfter.HasDelegate)
  await OnCreateAfter.InvokeAsync(this);

diff --git a/src/AntDesign.Charts/Components/Plots/Bullet/BulletConfig.cs b/src/AntDesign.Charts/Components/Plots/Bullet/BulletConfig.cs
@@ -103,6 +103,15 @@ public class BulletConfig : IBulletViewConfig, IPlotConfig
  public int? AppendPadding { get; set; }
  [JsonPropertyName("autoFit")]
  public bool? AutoFit { get; set; }
+
+ [JsonPropertyName("targetField")]
+ public string TargetField { get; set; }
+
+ [JsonPropertyName("rangeField")]
+ public string RangeField { get; set; }
+
+ [JsonPropertyName("measureField")]
+ public string MeasureField { get; set; }
  }
 
  public interface IBulletViewConfig : IViewConfig
@@ -163,7 +172,7 @@ public class BulletViewConfigData
  /// <summary>
  /// 目标值，array类型。支持多目标设置 
  /// </summary>
- [JsonPropertyName("targets")]
+ [JsonPropertyName("target")]
  public int[] Targets { get; set; }
 
  [JsonPropertyName("markerStyle")]