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

增加Symbol选择Custom类型时的Warning提示

Browse Source
This commit is contained in:
monitor1394
2023-05-04 07:57:04 +08:00
parent 36d629b29a
commit fdd686b038
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation~/zh/changelog.md
View File

@@ -66,6 +66,7 @@ slug: /changelog
## master
* (2023.05.04) 增加`Symbol`选择`Custom`类型时的`Warning`提示
* (2023.04.15) 修复`DataZoom`在多个图表时可能异常的问题 (#252)
* (2023.04.14) 修复`Tooltip`在只有一个数据时可能异常的问题
* (2023.04.14) 增加`BaseChart`的`TriggerTooltip()`接口尝试触发`ToolTip`

8
Editor/ChildComponents/BasePropertyDrawer.cs
View File

@@ -73,6 +73,14 @@ namespace XCharts.Editor
return prop.propertyPath + "_" + index;
}
protected void AddHelpBox(string message, MessageType type = MessageType.Warning, int line = 2)
{
var offset = EditorGUI.indentLevel * ChartEditorHelper.INDENT_WIDTH;
EditorGUI.HelpBox(new Rect(m_DrawRect.x + offset, m_DrawRect.y, m_DrawRect.width - offset, EditorGUIUtility.singleLineHeight * line), message, type);
for (int i = 0; i < line; i++)
AddSingleLineHeight();
}
protected void AddSingleLineHeight()
{
m_Heights[m_KeyName] += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;

5
Editor/ChildComponents/SerieSymbolDrawer.cs
View File

@@ -15,10 +15,11 @@ namespace XCharts.Editor
if (MakeComponentFoldout(prop, "m_Show", true))
{
++EditorGUI.indentLevel;
var type = (SymbolType) prop.FindPropertyRelative("m_Type").enumValueIndex;
var type = (SymbolType)prop.FindPropertyRelative("m_Type").enumValueIndex;
PropertyField(prop, "m_Type");
if (type == SymbolType.Custom)
{
AddHelpBox("Custom symbol only work in PictorialBar serie", MessageType.Warning);
PropertyField(prop, "m_Image");
PropertyField(prop, "m_ImageType");
PropertyField(prop, "m_Width");
@@ -27,7 +28,7 @@ namespace XCharts.Editor
}
PropertyField(prop, "m_Gap");
PropertyField(prop, "m_SizeType");
switch ((SymbolSizeType) prop.FindPropertyRelative("m_SizeType").enumValueIndex)
switch ((SymbolSizeType)prop.FindPropertyRelative("m_SizeType").enumValueIndex)
{
case SymbolSizeType.Custom:
PropertyField(prop, "m_Size");

3
Editor/ChildComponents/SymbolStyleDrawer.cs
View File

@@ -15,10 +15,11 @@ namespace XCharts.Editor
if (MakeComponentFoldout(prop, "m_Show", true))
{
++EditorGUI.indentLevel;
var type = (SymbolType) prop.FindPropertyRelative("m_Type").enumValueIndex;
var type = (SymbolType)prop.FindPropertyRelative("m_Type").enumValueIndex;
PropertyField(prop, "m_Type");
if (type == SymbolType.Custom)
{
AddHelpBox("Custom Symbol only work in PictorialBar serie", MessageType.Warning);
PropertyField(prop, "m_Image");
PropertyField(prop, "m_ImageType");
PropertyField(prop, "m_Width");

1
Runtime/Serie/SerieHelper.cs
View File

@@ -760,7 +760,6 @@ namespace XCharts.Runtime
}
}
private static List<SerieData> emptyFilter = new List<SerieData>();
/// <summary>
/// 根据dataZoom更新数据列表缓存
/// </summary>