SVN r478

SVN-Revision: r478

插件库/Lskj.Control/GridControlEx.cs

@@ -418,7 +418,7 @@ namespace Lskj.Control
             this.gridView.DoubleClick += OnShowImageDoubleClick; ;
             #endregion
         }
-    
+
 
         /// <summary>
         /// 保存前反写多表头数据源
@@ -1178,7 +1178,7 @@ namespace Lskj.Control
             {
                 if (this.DisableFieldSources && item.isVislble) continue;
                 if (ControlType.IsNotLoadData(item.FieldType)) continue;
-                if (UpdateColumnRefresh && !string.IsNullOrWhiteSpace(UpdateColumns) &&!UpdateColumns.Split(',').Contains(item.FieldName)) continue;
+                if (UpdateColumnRefresh && !string.IsNullOrWhiteSpace(UpdateColumns) && !UpdateColumns.Split(',').Contains(item.FieldName)) continue;
                 if (!string.IsNullOrWhiteSpace(item.SqlSource))
                 {
                     DataTable dataTable = new DataTable();
@@ -4522,9 +4522,9 @@ namespace Lskj.Control
                 // 设置最终宽度（取较大值，并在40-80px之间）
                 this.gridView.IndicatorWidth = Math.Max(40, Math.Min(80, numberWidth));
             }
-            catch (Exception ex) 
+            catch (Exception ex)
             {
-            
+
             }
         }
 
@@ -6832,7 +6832,7 @@ namespace Lskj.Control
                 // 添加普通列，仅当原数据源存在时才添加
                 foreach (var col in normalColumns)
                 {
-                    if (originalDataSource.Columns.Contains(col.FieldName)&& col.FieldName!=GroupPrimary.FieldName)
+                    if (originalDataSource.Columns.Contains(col.FieldName) && col.FieldName != GroupPrimary.FieldName)
                     {
                         Type dataType = originalDataSource.Columns[col.FieldName].DataType;
                         dtResult.Columns.Add(col.FieldName, dataType);
@@ -6884,7 +6884,7 @@ namespace Lskj.Control
 
                             if (matchedRow != null && originalDataSource.Columns.Contains(subField.FieldName))
                             {
-                                value = matchedRow[subField.FieldName]?.ToString(); // 明确转换为string，避免类型错误
+                                value = matchedRow[subField.FieldName];
                             }
 
                             newRow[dynamicFieldName] = value;
@@ -7609,7 +7609,7 @@ namespace Lskj.Control
         /// <para>版本：1.0</para>
         /// </summary>
         /// <param name="UpdateColumnRefresh">判断是否只刷新UpdateColumn中配置的列的数据源</param>
-        public void RefreshDataSource(bool UpdateColumnRefresh=false)
+        public void RefreshDataSource(bool UpdateColumnRefresh = false)
         {
             this.mLoading = false;
             mControlSourceDic.Clear();
@@ -7924,15 +7924,15 @@ namespace Lskj.Control
         /// <summary>
         /// 清空url图片列缓存
         /// </summary>
-       
+
         private void ClearImage()
         {
             GridColumnCollection gridColumns = this.GridView.Columns;
-          
+
             foreach (GridColumn col in gridColumns)
             {
                 GridColumnModel model = col.Tag as GridColumnModel;
-                if (model!=null&&model.FieldType == ControlType.LabPicUrl) 
+                if (model != null && model.FieldType == ControlType.LabPicUrl)
                 {
                     model.LabPicUrlImages = new Hashtable();
                 }