|
@@ -683,18 +683,24 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
|
|
|
private void DataGrid_CellToolTipOpening(object? sender, GridCellToolTipOpeningEventArgs e)
|
|
|
{
|
|
|
- if (GetColumn(e.RowColumnIndex.ColumnIndex) is not DynamicActionColumn col)
|
|
|
- return;
|
|
|
- var toolTip = col.ToolTip;
|
|
|
- if (toolTip is null)
|
|
|
- return;
|
|
|
+ var column = GetColumn(e.RowColumnIndex.ColumnIndex);
|
|
|
+ if (column is DynamicActionColumn ac)
|
|
|
+ {
|
|
|
+ var toolTip = ac.ToolTip;
|
|
|
+ if (toolTip is null)
|
|
|
+ return;
|
|
|
|
|
|
- var row = GetRowFromIndex(e.RowColumnIndex.RowIndex);
|
|
|
+ var row = GetRowFromIndex(e.RowColumnIndex.RowIndex);
|
|
|
|
|
|
- e.ToolTip.Template = TemplateGenerator.CreateControlTemplate(
|
|
|
- typeof(ToolTip),
|
|
|
- () => toolTip.Invoke(col, row)
|
|
|
- );
|
|
|
+ e.ToolTip.Template = TemplateGenerator.CreateControlTemplate(
|
|
|
+ typeof(ToolTip),
|
|
|
+ () => toolTip.Invoke(ac, row)
|
|
|
+ );
|
|
|
+ }
|
|
|
+ else if(column is DynamicGridColumn gc)
|
|
|
+ {
|
|
|
+ e.ToolTip.Content = gc.Editor.ToolTip;
|
|
|
+ }
|
|
|
}
|
|
|
public void AddVisualFilter(string column, string value, FilterType filtertype = FilterType.Contains)
|
|
|
{
|
|
@@ -1278,6 +1284,8 @@ public class DynamicGridGridUIComponent<T> : IDynamicGridUIComponent<T>, IDynami
|
|
|
|
|
|
newColumn.HeaderStyle = GetHeaderCellStyle(column);
|
|
|
|
|
|
+ newColumn.ShowHeaderToolTip = !column.Editor.ToolTip.IsNullOrWhiteSpace();
|
|
|
+
|
|
|
var cellstyle = GetCellStyle(column);
|
|
|
if (Parent.IsDirectEditMode())
|
|
|
{
|