SVN r398

SVN-Revision: r398
2025-03-26 05:51:06 +00:00
parent a6ad652bfe
commit 124dae6e45
1 changed files with 11 additions and 1 deletions
@@ -339,6 +339,14 @@ namespace Lskj.Control.Model
        /// Url图片列高度
        /// </summary>
        public int LabPicUrlHeight;
+        /// <summary>
+        /// 聚合主键列
+        /// </summary>
+        public bool IsCustomGroupPrimary;
+        /// <summary>
+        /// 聚合字段列
+        /// </summary>
+        public bool IsCustomGroupField;

        #endregion

@@ -428,4 +436,6 @@ namespace Lskj.Control.Model
            this.RepeatedVerification = item.Table.Columns.Contains("RepeatedVerification") && !string.IsNullOrWhiteSpace(item["RepeatedVerification"] + "") ? "1".Equals(item["RepeatedVerification"] + "") : false;
            this.SelectionConditions = item.Table.Columns.Contains("SelectionConditions") ? item["SelectionConditions"] + "" : string.Empty;
            this._frozenFlag = item.Table.Columns.Contains("frozenFlag") && ("1".Equals(item["frozenFlag"] + "") || "True".Equals(item["frozenFlag"] + ""));
-            this._lookUpWidth = item.Table.Columns.Contains("LookUpWidth") ? int.TryParse(item["LookUpWidth"] + "", out int lookUpWidth) ?
+            this._lookUpWidth = item.Table.Columns.Contains("LookUpWidth") ? int.TryParse(item["LookUpWidth"] + "", out int lookUpWidth) ? lookUpWidth : 0 : 0;
+            this._lookUpFieldsWidth = item.Table.Columns.Contains("LookUpFieldsWidth") ? item["LookUpFieldsWidth"] + "" : "";
+            this.isDynamic = item.Table.Columns.Contains("isDynamic") && !string.IsNullOrWhiteSpace(item["isDynamic"] + "") ? "1".Equals(item["i