添加动态列表列头描述

VIZ.TVP.Module/Control/ControlList/Controller/ControlObject/ControlObjectController.cs

@@ -124,7 +124,7 @@ namespace VIZ.TVP.Module
                 this.CancelListValuePropertyChanged();
                 this.CancelListValuePropertyChanged();
                 List<GridColumnDefinition> columns;
                 List<GridColumnDefinition> columns;
                 List<ExpandoObject> items;
                 List<ExpandoObject> items;
-                vizCommandControlObjectService.GetControlObjectXmlData(field.Value, out columns, out items);
+                vizCommandControlObjectService.GetControlObjectXmlData(field.Value, field.FieldSchema.Schema, out columns, out items);
                 field.ListValueColumns = columns;
                 field.ListValueColumns = columns;
                 field.ListValue = items;
                 field.ListValue = items;
             }
             }

VIZ.TVP.Service/VIZ/Implementation/VizCommandControlObjectService.cs

@@ -20,10 +20,11 @@ namespace VIZ.TVP.Service
         /// 获取控制对象XML数据
         /// 获取控制对象XML数据
         /// </summary>
         /// </summary>
         /// <param name="xml">xml内容</param> 
         /// <param name="xml">xml内容</param> 
+        /// <param name="schema">定义信息</param>
         /// <param name="columns">列信息</param>
         /// <param name="columns">列信息</param>
         /// <param name="items">数据源</param>
         /// <param name="items">数据源</param>
         /// <returns></returns>
         /// <returns></returns>
-        public void GetControlObjectXmlData(string xml, out List<GridColumnDefinition> columns, out List<ExpandoObject> items)
+        public void GetControlObjectXmlData(string xml, ControlObject_Schema_Node schema, out List<GridColumnDefinition> columns, out List<ExpandoObject> items)
         {
         {
             columns = new List<GridColumnDefinition>();
             columns = new List<GridColumnDefinition>();
             items = new List<ExpandoObject>();
             items = new List<ExpandoObject>();
@@ -50,9 +51,18 @@ namespace VIZ.TVP.Service
 
 
                         if (!isCreatedColumns)
                         if (!isCreatedColumns)
                         {
                         {
+                            ControlObject_Field_node node = schema.Fields.FirstOrDefault(p => p.Name == cell.Name);
+
                             GridColumnDefinition column = new GridColumnDefinition();
                             GridColumnDefinition column = new GridColumnDefinition();
                             column.FieldName = cell.Name;
                             column.FieldName = cell.Name;
-                            column.Header = cell.Name;
+                            if (cell.Name == node?.Description)
+                            {
+                                column.Header = cell.Name;
+                            }
+                            else
+                            {
+                                column.Header = $"({node?.Description}){cell.Name}";
+                            }
 
 
                             columns.Add(column);
                             columns.Add(column);
                         }
                         }

VIZ.TVP.Service/VIZ/Interface/IVizCommandControlObjectService.cs

@@ -17,11 +17,12 @@ namespace VIZ.TVP.Service
         /// <summary>
         /// <summary>
         /// 获取控制对象XML数据
         /// 获取控制对象XML数据
         /// </summary>
         /// </summary>
-        /// <param name="xml">xml内容</param>
+        /// <param name="xml">xml内容</param> 
+        /// <param name="schema">定义信息</param>
         /// <param name="columns">列信息</param>
         /// <param name="columns">列信息</param>
         /// <param name="items">数据源</param>
         /// <param name="items">数据源</param>
         /// <returns></returns>
         /// <returns></returns>
-        void GetControlObjectXmlData(string xml, out List<GridColumnDefinition> columns, out List<ExpandoObject> items);
+        void GetControlObjectXmlData(string xml, ControlObject_Schema_Node schema, out List<GridColumnDefinition> columns, out List<ExpandoObject> items);
 
 
         /// <summary>
         /// <summary>
         /// 获取控制对象XML数据
         /// 获取控制对象XML数据

VIZ.TVP.UnitTest/ControlObjectTest.cs

@@ -22,7 +22,7 @@ namespace VIZ.TVP.UnitTest
             {
             {
                 string xml = sr.ReadToEnd();
                 string xml = sr.ReadToEnd();
 
 
-                service.GetControlObjectXmlData(xml, out var columns, out var items);
+                service.GetControlObjectXmlData(xml, null, out var columns, out var items);
 
 
                 string output = service.GetControlObjectXml(items);
                 string output = service.GetControlObjectXml(items);
             }
             }