diff --git a/ECharts/ChartOpertation.cs b/ECharts/ChartOpertation.cs index 2e997b4..0e818b1 100644 --- a/ECharts/ChartOpertation.cs +++ b/ECharts/ChartOpertation.cs @@ -13,14 +13,15 @@ public static class ChartOpertation /// /// 饼状图数据处理 /// - /// 图例数据 /// 图表数据 + /// 图例数据 /// 是否开启图例 /// 主标题文本,默认值:'','\n'指定换行 /// 副标题文本,默认值:'','\n'指定换行 /// 是否启用拖拽重计算特性,默认关闭 + /// /// - public static string ChartPieDataProcess(IEnumerable seriesData, List lengendData, bool isShowLengend = false, string chartTitle = null, string chartSubTitle = null, bool isCalculable = false) + public static string ChartPieDataProcess(IEnumerable seriesData, List lengendData, bool isShowLengend = false, string chartTitle = null, string chartSubTitle = null, bool isCalculable = false, string dateTimeFormat = "yyyy-MM-dd") { //标题 var title = new ChartTitle() @@ -49,7 +50,7 @@ public static string ChartPieDataProcess(IEnumerable seriesData, legend = chartLegend, series = seriesDatas }; - return jsonData.ToJson(); + return jsonData.ToJson(dateTimeFormat); } /// @@ -64,8 +65,9 @@ public static string ChartPieDataProcess(IEnumerable seriesData, /// 副标题文本,默认值:"","\n"指定换行 /// 是否启用拖拽重计算特性,默认关闭 /// Y轴名称 + /// /// 图表所有数据 - public static string ChartLineDataProcess(string chartTitle, string fm, List chartAxisData, IEnumerable seriesData, List lengendData, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null) + public static string ChartLineDataProcess(string chartTitle, string fm, List chartAxisData, IEnumerable seriesData, List lengendData, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null, string dateTimeFormat = "yyyy-MM-dd") { //标题 var title = new ChartTitle() @@ -115,7 +117,7 @@ public static string ChartLineDataProcess(string chartTitle, string fm, List @@ -131,8 +133,9 @@ public static string ChartLineDataProcess(string chartTitle, string fm, List是否启用拖拽重计算特性,默认关闭 /// Y轴名称 /// 时间轴 + /// /// 图表所有数据 - public static string TimeLineChartLineDataProcess(string chartTitle, string fm, List chartAxisData, IEnumerable seriesData, List 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 chartAxisData, IEnumerable seriesData, List 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() @@ -179,7 +182,7 @@ public static string TimeLineChartLineDataProcess(string chartTitle, string fm, timeline = chartTimeline,//时间轴设置 options = chartOptions }; - return jsonData.ToJson(); + return jsonData.ToJson(dateTimeFormat); } /// @@ -194,8 +197,9 @@ public static string TimeLineChartLineDataProcess(string chartTitle, string fm, /// 副标题文本,默认值:'','\n'指定换行 /// 是否启用拖拽重计算特性,默认关闭 /// Y轴名称 + /// /// 图表所有数据 - public static string ChartBarDataProcess(string chartTitle, List chartAxisData, IEnumerable seriesData, List lengendData, ChartGrid chartGrid, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null) + public static string ChartBarDataProcess(string chartTitle, List chartAxisData, IEnumerable seriesData, List lengendData, ChartGrid chartGrid, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string chartYAxisName = null, string dateTimeFormat = "yyyy-MM-dd") { //标题 var title = new ChartTitle() @@ -245,7 +249,7 @@ public static string ChartBarDataProcess(string chartTitle, List chartAx yAxis = chartYAxis, series = seriesDatas }; - return jsonData.ToJson(); + return jsonData.ToJson(dateTimeFormat); } /// @@ -260,8 +264,9 @@ public static string ChartBarDataProcess(string chartTitle, List chartAx /// /// /// + /// /// - public static string ChartBarAndLineDataProcess(string chartTitle, List chartAxisData, IEnumerable seriesData, List lengendData, List chartYaxis, ChartGrid chartGrid, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false) + public static string ChartBarAndLineDataProcess(string chartTitle, List chartAxisData, IEnumerable seriesData, List lengendData, List chartYaxis, ChartGrid chartGrid, bool isShowLengend = false, string chartSubTitle = null, bool isCalculable = false, string dateTimeFormat = "yyyy-MM-dd") { //标题 var title = new ChartTitle() @@ -303,7 +308,7 @@ public static string ChartBarAndLineDataProcess(string chartTitle, List yAxis = chartYAxis, series = seriesDatas }; - return jsonData.ToJson(); + return jsonData.ToJson(dateTimeFormat); } @@ -322,8 +327,9 @@ public static string ChartBarAndLineDataProcess(string chartTitle, List /// 是否启用拖拽重计算特性,默认关闭 /// 是否显示Y轴坐标轴小标记 /// 是否显示坐标轴线 + /// /// 图表所有数据 - public static string ChartTiaoBarDataProcess(string chartTitle, List chartAxisData, IEnumerable seriesData, List 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 chartAxisData, IEnumerable seriesData, List 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() @@ -376,7 +382,7 @@ public static string ChartTiaoBarDataProcess(string chartTitle, List cha yAxis = chartYAxis, series = seriesDatas }; - return jsonData.ToJson(); + return jsonData.ToJson(dateTimeFormat); } /// @@ -389,8 +395,9 @@ public static string ChartTiaoBarDataProcess(string chartTitle, List cha /// 直角坐标系内绘图网格 /// 副标题文本,默认值:'','\n'指定换行 /// 是否启用拖拽重计算特性,默认关闭 + /// /// 图表所有数据 - public static string ChartDuoWeiTiaoBarDataProcess(string chartTitle, List chartAxisData, IEnumerable seriesData, ChartLegend chartLegend, ChartGrid chartGrid, string chartSubTitle = null, bool isCalculable = false) + public static string ChartDuoWeiTiaoBarDataProcess(string chartTitle, List chartAxisData, IEnumerable seriesData, ChartLegend chartLegend, ChartGrid chartGrid, string chartSubTitle = null, bool isCalculable = false, string dateTimeFormat = "yyyy-MM-dd") { //标题 var title = new ChartTitle() @@ -459,7 +466,7 @@ public static string ChartDuoWeiTiaoBarDataProcess(string chartTitle, ListBased on ECharts(https://echarts.baidu.com/echarts2/doc/doc.html) tool library,support .NET Framework and .NET Core ECharts.Net ECharts.Net - 1.1 + 1.1.1 https://xhanb.github.io/ECharts.Net/ https://github.com/xhanb/ECharts.Net git diff --git a/ECharts/ECharts.Net.xml b/ECharts/ECharts.Net.xml index f182769..dd961a6 100644 --- a/ECharts/ECharts.Net.xml +++ b/ECharts/ECharts.Net.xml @@ -2488,19 +2488,20 @@ 图表操作数据处理类 - + 饼状图数据处理 - 图例数据 图表数据 + 图例数据 是否开启图例 主标题文本,默认值:'','\n'指定换行 副标题文本,默认值:'','\n'指定换行 是否启用拖拽重计算特性,默认关闭 + - + 线性图数据处理 @@ -2513,9 +2514,10 @@ 副标题文本,默认值:"","\n"指定换行 是否启用拖拽重计算特性,默认关闭 Y轴名称 + 图表所有数据 - + 时间轴线性图数据处理 @@ -2529,9 +2531,10 @@ 是否启用拖拽重计算特性,默认关闭 Y轴名称 时间轴 + 图表所有数据 - + 柱状图数据处理 @@ -2544,9 +2547,10 @@ 副标题文本,默认值:'','\n'指定换行 是否启用拖拽重计算特性,默认关闭 Y轴名称 + 图表所有数据 - + 折柱混搭 @@ -2559,9 +2563,10 @@ + - + 条形图数据处理 @@ -2577,9 +2582,10 @@ 是否启用拖拽重计算特性,默认关闭 是否显示Y轴坐标轴小标记 是否显示坐标轴线 + 图表所有数据 - + 多维条形图数据处理 @@ -2590,6 +2596,7 @@ 直角坐标系内绘图网格 副标题文本,默认值:'','\n'指定换行 是否启用拖拽重计算特性,默认关闭 + 图表所有数据