SVN r1138

SVN-Revision: r1138

插件库/Lskj.Control/Model/GridColumnModel.cs

@@ -233,6 +233,9 @@ namespace Lskj.Control.Model
         /// 合并数据是否求和(合并单元格只计算一次)
         /// </summary>
         public bool isSumMerge { get; set; }
+        /// <summary>
+        /// 字体大小
+        /// </summary>
         public int FontSize;
         /// <summary>
         /// Gets the source row.
@@ -379,6 +382,14 @@ namespace Lskj.Control.Model
         /// 单元格内容为空时的提示信息
         /// </summary>
         public string PromptText;
+        /// <summary>
+        /// 列注释（标题注释）
+        /// </summary>
+        public string ColumnAnnotation;
+        /// <summary>
+        /// 标题颜色
+        /// </summary>
+        public string TitleColor;
 
         #endregion
 
@@ -474,4 +485,5 @@ namespace Lskj.Control.Model
             this.PrivilegeView = item.Table.Columns.Contains("PrivilegeView") ? item["PrivilegeView"] + "" : string.Empty;
             this.PrivilegeOper = item.Table.Columns.Contains("PrivilegeOper") ? item["PrivilegeOper"] + "" : string.Empty;
             this.AdditionalAssociations = item.Table.Columns.Contains("AdditionalAssociations") ? "1".Equals(item["AdditionalAssociations"] + "") : false;
-            thi
+            this.ProhibitPaste = item.Table.Columns.Contains("ProhibitPaste") ? "1".Equals(item["ProhibitPaste"] + "") : false;
+            this.ModuleFrameDisplayText = item.Table.Columns.Contains("ModuleFrameDisplayText") ? "1".Equals(item["ModuleFrameDisplayT