增加TextStyle的lineSpacing参数配置行间距

Runtime/Component/Main/Serie.cs

@@ -194,7 +194,7 @@ namespace XCharts
     [System.Serializable]
     public class Serie : MainComponent
     {
-        [SerializeField] [DefaultValue("true")] private bool m_Show = true;
+        [SerializeField] private bool m_Show = true;
         [SerializeField] private SerieType m_Type;
         [SerializeField] private string m_Name;
         [SerializeField] private string m_Stack;
@@ -246,7 +246,7 @@ namespace XCharts
         [SerializeField] [Range(1, 10)] private int m_ShowDataDimension;
         [SerializeField] private bool m_ShowDataName;
         [SerializeField] private bool m_ShowDataIcon;
-        [SerializeField] private bool m_Clip = false;
+        [SerializeField] private bool m_Clip = true;
 
         [SerializeField] private List<SerieData> m_Data = new List<SerieData>();
 

Runtime/Component/Main/Tooltip.cs

@@ -1,4 +1,5 @@
-/******************************************/
+using System.Collections.ObjectModel;
+/******************************************/
 /*                                        */
 /*     Copyright (c) 2018 monitor1394     */
 /*     https://github.com/monitor1394     */
@@ -8,6 +9,8 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using System;
+using UnityEngine.EventSystems;
 
 namespace XCharts
 {
@@ -55,12 +58,11 @@ namespace XCharts
         [SerializeField] private float m_FixedHeight = 0;
         [SerializeField] private float m_MinWidth = 0;
         [SerializeField] private float m_MinHeight = 0;
-        [SerializeField] private int m_FontSize = 18;
-        [SerializeField] private FontStyle m_FontStyle = FontStyle.Normal;
         [SerializeField] private bool m_ForceENotation = false;
         [SerializeField] private float m_PaddingLeftRight = 5f;
         [SerializeField] private float m_PaddingTopBottom = 5f;
         [SerializeField] private Sprite m_BackgroundImage;
+        [SerializeField] private TextStyle m_TextStyle = new TextStyle(18, FontStyle.Normal);
         [SerializeField] private LineStyle m_LineStyle = new LineStyle(LineStyle.Type.Solid, 0.7f);
 
         private GameObject m_GameObject;
@@ -138,16 +140,10 @@ namespace XCharts
         /// 最小高度。如若 fixedHeight 设有值，优先取 fixedHeight。
         /// </summary>
         public float minHeight { get { return m_MinHeight; } set { m_MinHeight = value; } }
-        /// <summary>
-        /// font size.
-        /// 文字的字体大小。
-        /// </summary>
-        public int fontSize { get { return m_FontSize; } set { m_FontSize = value; } }
-        /// <summary>
-        /// font style.
-        /// 文字的字体风格。
-        /// </summary>
-        public FontStyle fontStyle { get { return m_FontStyle; } set { m_FontStyle = value; } }
+        [Obsolete("Use Tooltip.textStyle.fontSize instead.", true)]
+        public int fontSize { get; set; }
+        [Obsolete("Use Tooltip.textStyle.fontStyle instead.", true)]
+        public FontStyle fontStyle { get; set; }
         /// <summary>
         /// 是否强制使用科学计数法格式化显示数值。默认为false，当小数精度大于3时才采用科学计数法。
         /// </summary>
@@ -168,6 +164,10 @@ namespace XCharts
         /// </summary>
         public Sprite backgroundImage { get { return m_BackgroundImage; } set { m_BackgroundImage = value; SetBackground(m_BackgroundImage); } }
         /// <summary>
+        /// 提示框内容文本样式。
+        /// </summary>
+        public TextStyle textStyle { get { return m_TextStyle; } set { if (value != null) m_TextStyle = value; } }
+        /// <summary>
         /// 指示线样式。
         /// </summary>
         public LineStyle lineStyle { get { return m_LineStyle; } set { if (value != null) m_LineStyle = value; } }

Runtime/Component/Sub/TextStyle.cs

@@ -23,6 +23,7 @@ namespace XCharts
         [SerializeField] private Color m_Color = Color.clear;
         [SerializeField] private int m_FontSize = 18;
         [SerializeField] private FontStyle m_FontStyle = FontStyle.Normal;
+        [SerializeField] private float m_LineSpacing = 1;
 
         /// <summary>
         /// Rotation of text.
@@ -52,6 +53,11 @@ namespace XCharts
         /// 文本字体的风格。
         /// </summary>
         public FontStyle fontStyle { get { return m_FontStyle; } set { m_FontStyle = value; } }
+        /// <summary>
+        /// text line spacing.
+        /// 行间距。
+        /// </summary>
+        public float lineSpacing { get { return m_LineSpacing; } set { m_LineSpacing = value; } }
 
         public TextStyle()
         {
@@ -90,6 +96,7 @@ namespace XCharts
             this.color = style.color;
             this.rotate = style.rotate;
             this.offset = style.offset;
+            this.lineSpacing = style.lineSpacing;
         }
 
         public TextStyle Clone()
@@ -100,6 +107,7 @@ namespace XCharts
             textStyle.fontSize = fontSize;
             textStyle.fontStyle = fontStyle;
             textStyle.offset = offset;
+            textStyle.lineSpacing = lineSpacing;
             return textStyle;
         }
 
@@ -129,6 +137,7 @@ namespace XCharts
                 fontSize == other.fontSize &&
                 fontStyle == other.fontStyle &&
                 offset == other.offset &&
+                lineSpacing == other.lineSpacing &&
                 ChartHelper.IsValueEqualsColor(m_Color, other.color);
         }