foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-28 03:58:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复Legend都隐藏时Value轴还显示数值的问题

Browse Source
This commit is contained in:
monitor1394
2019-12-11 02:14:37 +08:00
parent fd8569107b
commit 47e5937706
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/Component/Main/Axis.cs
View File

@@ -495,6 +495,7 @@ namespace XCharts
int split = GetSplitNumber(coordinateWidth, dataZoom); int split = GetSplitNumber(coordinateWidth, dataZoom);
if (m_Type == AxisType.Value) if (m_Type == AxisType.Value)
{ {
if (minValue == 0 && maxValue == 0) return string.Empty;
float value = 0; float value = 0;
if (forcePercent) maxValue = 100; if (forcePercent) maxValue = 100;
if (m_Interval > 0) if (m_Interval > 0)
@@ -635,6 +636,7 @@ namespace XCharts
{ {
if (!show) return false; if (!show) return false;
if (IsCategory() && data.Count <= 0) return false; if (IsCategory() && data.Count <= 0) return false;
else if (IsValue() && m_RuntimeMinValue == 0 && m_RuntimeMaxValue == 0) return false;
else return true; else return true;
} }
@@ -658,7 +660,10 @@ namespace XCharts
switch (minMaxType) switch (minMaxType)
{ {
case Axis.AxisMinMaxType.Default: case Axis.AxisMinMaxType.Default:
if (minValue > 0 && maxValue > 0) if (minValue == 0 && maxValue == 0)
{
}
else if (minValue > 0 && maxValue > 0)
{ {
minValue = 0; minValue = 0;
maxValue = needFormat ? ChartHelper.GetMaxDivisibleValue(maxValue) : maxValue; maxValue = needFormat ? ChartHelper.GetMaxDivisibleValue(maxValue) : maxValue;
@@ -685,6 +690,7 @@ namespace XCharts
internal float GetCurrMinValue(float duration) internal float GetCurrMinValue(float duration)
{ {
if (m_RuntimeMinValue == 0 && m_RuntimeMaxValue == 0) return 0;
if (!m_RuntimeMinValueChanged) return m_RuntimeMinValue; if (!m_RuntimeMinValueChanged) return m_RuntimeMinValue;
var time = Time.time - m_RuntimeMinValueUpdateTime; var time = Time.time - m_RuntimeMinValueUpdateTime;
var total = duration / 1000; var total = duration / 1000;
@@ -702,6 +708,7 @@ namespace XCharts
internal float GetCurrMaxValue(float duration) internal float GetCurrMaxValue(float duration)
{ {
if (m_RuntimeMinValue == 0 && m_RuntimeMaxValue == 0) return 0;
if (!m_RuntimeMaxValueChanged) return m_RuntimeMaxValue; if (!m_RuntimeMaxValueChanged) return m_RuntimeMaxValue;
var time = Time.time - m_RuntimeMaxValueUpdateTime; var time = Time.time - m_RuntimeMaxValueUpdateTime;
var total = duration / 1000; var total = duration / 1000;

2
Runtime/Internal/CoordinateChart.cs
View File

@@ -886,7 +886,7 @@ namespace XCharts
private void DrawYAxisTickAndSplit(VertexHelper vh, int yAxisIndex, YAxis yAxis) private void DrawYAxisTickAndSplit(VertexHelper vh, int yAxisIndex, YAxis yAxis)
{ {
if (yAxis.show) if (yAxis.NeedShowSplit())
{ {
var size = yAxis.GetScaleNumber(coordinateWidth, m_DataZoom); var size = yAxis.GetScaleNumber(coordinateWidth, m_DataZoom);
var totalWidth = coordinateY; var totalWidth = coordinateY;

2
Runtime/Utility/XChartsMgr.cs
View File

@@ -25,7 +25,7 @@ namespace XCharts
public class XChartsMgr : MonoBehaviour public class XChartsMgr : MonoBehaviour
{ {
public const string version = "1.0.5"; public const string version = "1.0.5";
public const int date = 20191204; public const int date = 20191211;
[SerializeField] private string m_NowVersion; [SerializeField] private string m_NowVersion;
[SerializeField] private string m_NewVersion; [SerializeField] private string m_NewVersion;