Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
Hanb Gao committed Sep 25, 2019
1 parent d29913a commit f90ee19
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 24 deletions.
37 changes: 22 additions & 15 deletions ECharts/ChartOpertation.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ public static class ChartOpertation
/// <summary>
/// 饼状图数据处理
/// </summary>
/// <param name="lengendData">图例数据</param>
/// <param name="seriesData">图表数据</param>
/// <param name="lengendData">图例数据</param>
/// <param name="isShowLengend">是否开启图例</param>
/// <param name="chartTitle">主标题文本，默认值：''，'\n'指定换行</param>
/// <param name="chartSubTitle"> 副标题文本，默认值：''，'\n'指定换行</param>
/// <param name="isCalculable"> 是否启用拖拽重计算特性，默认关闭</param>
/// <param name="dateTimeFormat"></param>
/// <returns></returns>
public static string ChartPieDataProcess(IEnumerable<ChartPieSeries> seriesData, List<string> lengendData, bool isShowLengend = false, string chartTitle = null, string chartSubTitle = null, bool isCalculable = false)
public static string ChartPieDataProcess(IEnumerable<ChartPieSeries> seriesData, List<string> lengendData, bool isShowLengend = false, string chartTitle = null, string chartSubTitle = null, bool isCalculable = false, string dateTimeFormat = "yyyy-MM-dd")
{
//标题
var title = new ChartTitle()
Expand Down Expand Up @@ -49,7 +50,7 @@ public static string ChartPieDataProcess(IEnumerable<ChartPieSeries> seriesData,
legend = chartLegend,
series = seriesDatas
};
return jsonData.ToJson();
return jsonData.ToJson(dateTimeFormat);
}

/// <summary>
Expand All @@ -64,8 +65,9 @@ public static string ChartPieDataProcess(IEnumerable<ChartPieSeries> seriesData,
/// <param name="chartSubTitle">副标题文本，默认值：""，"\n"指定换行</param>
/// <param name="isCalculable">是否启用拖拽重计算特性，默认关闭</param>
/// <param name="chartYAxisName">Y轴名称</param>
/// <param name="dateTimeFormat"></param>
/// <returns>图表所有数据</returns>
public static string ChartLineDataProcess(string chartTitle, string fm, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null)
public static string ChartLineDataProcess(string chartTitle, string fm, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null, string dateTimeFormat = "yyyy-MM-dd")
{
//标题
var title = new ChartTitle()
Expand Down Expand Up @@ -115,7 +117,7 @@ public static string ChartLineDataProcess(string chartTitle, string fm, List<obj
yAxis = chartYAxis,
series = seriesDatas
};
return jsonData.ToJson();
return jsonData.ToJson(dateTimeFormat);
}

/// <summary>
Expand All @@ -131,8 +133,9 @@ public static string ChartLineDataProcess(string chartTitle, string fm, List<obj
/// <param name="isCalculable">是否启用拖拽重计算特性，默认关闭</param>
/// <param name="chartYAxisName">Y轴名称</param>
/// <param name="chartTimeline">时间轴</param>
/// <param name="dateTimeFormat"></param>
/// <returns>图表所有数据</returns>
public static string TimeLineChartLineDataProcess(string chartTitle, string fm, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null, ChartTimeline chartTimeline = null)
public static string TimeLineChartLineDataProcess(string chartTitle, string fm, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null, ChartTimeline chartTimeline = null, string dateTimeFormat = "yyyy-MM-dd")
{
//标题
var title = new ChartTitle()
Expand Down Expand Up @@ -179,7 +182,7 @@ public static string TimeLineChartLineDataProcess(string chartTitle, string fm,
timeline = chartTimeline,//时间轴设置
options = chartOptions
};
return jsonData.ToJson();
return jsonData.ToJson(dateTimeFormat);
}

/// <summary>
Expand All @@ -194,8 +197,9 @@ public static string TimeLineChartLineDataProcess(string chartTitle, string fm,
/// <param name="chartSubTitle">副标题文本，默认值：''，'\n'指定换行</param>
/// <param name="isCalculable">是否启用拖拽重计算特性，默认关闭</param>
/// <param name="chartYAxisName">Y轴名称</param>
/// <param name="dateTimeFormat"></param>
/// <returns>图表所有数据</returns>
public static string ChartBarDataProcess(string chartTitle, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, ChartGrid chartGrid, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null)
public static string ChartBarDataProcess(string chartTitle, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, ChartGrid chartGrid, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null, string dateTimeFormat = "yyyy-MM-dd")
{
//标题
var title = new ChartTitle()
Expand Down Expand Up @@ -245,7 +249,7 @@ public static string ChartBarDataProcess(string chartTitle, List<object> chartAx
yAxis = chartYAxis,
series = seriesDatas
};
return jsonData.ToJson();
return jsonData.ToJson(dateTimeFormat);
}

/// <summary>
Expand All @@ -260,8 +264,9 @@ public static string ChartBarDataProcess(string chartTitle, List<object> chartAx
/// <param name="isShowLengend"></param>
/// <param name="chartSubTitle"></param>
/// <param name="isCalculable"></param>
/// <param name="dateTimeFormat"></param>
/// <returns></returns>
public static string ChartBarAndLineDataProcess(string chartTitle, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, List<ChartAxis> chartYaxis, ChartGrid chartGrid, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false)
public static string ChartBarAndLineDataProcess(string chartTitle, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, List<ChartAxis> chartYaxis, ChartGrid chartGrid, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string dateTimeFormat = "yyyy-MM-dd")
{
//标题
var title = new ChartTitle()
Expand Down Expand Up @@ -303,7 +308,7 @@ public static string ChartBarAndLineDataProcess(string chartTitle, List<object>
yAxis = chartYAxis,
series = seriesDatas
};
return jsonData.ToJson();
return jsonData.ToJson(dateTimeFormat);
}


Expand All @@ -322,8 +327,9 @@ public static string ChartBarAndLineDataProcess(string chartTitle, List<object>
/// <param name="isCalculable">是否启用拖拽重计算特性，默认关闭</param>
/// <param name="isShowY1AxisTick">是否显示Y轴坐标轴小标记</param>
/// <param name="isShowY1AxisLine">是否显示坐标轴线</param>
/// <param name="dateTimeFormat"></param>
/// <returns>图表所有数据</returns>
public static string ChartTiaoBarDataProcess(string chartTitle, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, ChartGrid chartGrid, bool isShowX = false, bool isShowY = true, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, bool isShowY1AxisTick = false, bool isShowY1AxisLine = false)
public static string ChartTiaoBarDataProcess(string chartTitle, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, List<string> lengendData, ChartGrid chartGrid, bool isShowX = false, bool isShowY = true, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, bool isShowY1AxisTick = false, bool isShowY1AxisLine = false, string dateTimeFormat = "yyyy-MM-dd")
{
//标题
var title = new ChartTitle()
Expand Down Expand Up @@ -376,7 +382,7 @@ public static string ChartTiaoBarDataProcess(string chartTitle, List<object> cha
yAxis = chartYAxis,
series = seriesDatas
};
return jsonData.ToJson();
return jsonData.ToJson(dateTimeFormat);
}

/// <summary>
Expand All @@ -389,8 +395,9 @@ public static string ChartTiaoBarDataProcess(string chartTitle, List<object> cha
/// <param name="chartGrid">直角坐标系内绘图网格</param>
/// <param name="chartSubTitle">副标题文本，默认值：''，'\n'指定换行</param>
/// <param name="isCalculable">是否启用拖拽重计算特性，默认关闭</param>
/// <param name="dateTimeFormat"></param>
/// <returns>图表所有数据</returns>
public static string ChartDuoWeiTiaoBarDataProcess(string chartTitle, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, ChartLegend chartLegend, ChartGrid chartGrid, string chartSubTitle = null, bool isCalculable = false)
public static string ChartDuoWeiTiaoBarDataProcess(string chartTitle, List<object> chartAxisData, IEnumerable<ChartRightangleSeries> seriesData, ChartLegend chartLegend, ChartGrid chartGrid, string chartSubTitle = null, bool isCalculable = false, string dateTimeFormat = "yyyy-MM-dd")
{
//标题
var title = new ChartTitle()
Expand Down Expand Up @@ -459,7 +466,7 @@ public static string ChartDuoWeiTiaoBarDataProcess(string chartTitle, List<objec
yAxis = chartYAxis,
series = seriesDatas
};
return jsonData.ToJson();
return jsonData.ToJson(dateTimeFormat);
}
}
}
2 changes: 1 addition & 1 deletion ECharts/ECharts.Net.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Description>Based on ECharts(https://echarts.baidu.com/echarts2/doc/doc.html) tool library,support .NET Framework and .NET Core</Description>
<AssemblyName>ECharts.Net</AssemblyName>
<RootNamespace>ECharts.Net</RootNamespace>
<Version>1.1</Version>
<Version>1.1.1</Version>
<PackageProjectUrl>https://xhanb.github.io/ECharts.Net/</PackageProjectUrl>
<RepositoryUrl>https://github.com/xhanb/ECharts.Net</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand Down
23 changes: 15 additions & 8 deletions ECharts/ECharts.Net.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f90ee19

Please sign in to comment.