SVN r723

SVN-Revision: r723

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

@@ -302,4 +302,9 @@ namespace Lskj.Control.Model
         ///模块选择返回框，是否单选模式
         /// </summary>
         public bool IsRadio { get; set; }
-        /
+        /// <summary>
+        ///模块选择返回框，配置列加载模式（默认根据sql动态加载列）
+        /// </summary>
+        public bool ConfigureColumnMode { get; set; }
+        /// <summary>
+        ///条件控件回车执行搜索后清空

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

@@ -441,6 +441,10 @@ namespace Lskj.Control.Model
         /// 称重控件
         /// </summary>
         public const int LabApiBtuton = 163;
+        /// <summary>
+        ///超链接
+        /// </summary>
+        public const int LabHyperlink = 164;
 
 
         /// <summary>

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

@@ -351,6 +351,14 @@ namespace Lskj.Control.Model
         /// 导入时转格式
         /// </summary>
         public string ImportConversionFormat;
+        /// <summary>
+        /// 字段浏览权限
+        /// </summary>
+        public string PrivilegeView;
+        /// <summary>
+        /// 字段操作权限
+        /// </summary>
+        public string PrivilegeOper;
 
         #endregion
 
@@ -438,4 +446,7 @@ namespace Lskj.Control.Model
             this.isVislble = item.Table.Columns.Contains("vislble") && !string.IsNullOrWhiteSpace(item["vislble"] + "") ? "1".Equals(item["vislble"] + "") : false;
             if (item.Table.Columns.Contains("LabPicUrlHeight"))
             {
-                int.TryParse
+                int.TryParse(item["LabPicUrlHeight"] + "", out LabPicUrlHeight);
+            }
+            this.IsCustomGroupPrimary = item.Table.Columns.Contains("IsCustomGroupPrimary") ? "1".Equals(item["IsCustomGroupPrimary"] + "") : false;
+            this.IsCustomGr

插件库/Lskj.Control/Model/MenuStrip/BaseMenuStrip.cs

@@ -508,7 +508,7 @@ namespace Lskj.Control.Model
                     switch (model.ActionType)
                     {
                         case 1: // 执行存储过程
-                            if (i == rows.Length - 1 || (execOnlyOne && i > 0))
+                            if (i == rows.Length - 1 || execOnlyOne )
                             {
                                 //执行最后一条
                                 FinallySucceeded = true;
@@ -1792,28 +1792,4 @@ namespace Lskj.Control.Model
                         DataRow[] dataRows = columnsTab.Select().Where(n => (n["name"] + "").Equals(colunmField.Key)).ToArray();
                         if (dataRows.Length == 0)
                         {
-                            string addColSql = string.Format("alter table P_PrivateDllTab add {0} {1}", colunmField.Key, colunmField.Value);
-                            SqlHelper.ExecuteNonQuery(addColSql);//添加列
-                        }
-                    }
-                }
-                else
-                {
-                    string createTabSql = "create table P_PrivateDllTab(id int IDENTITY(1,1) NOT NULL,{0})";
-                    string createCol = string.Empty;
-                    foreach (KeyValuePair<string, string> colunmField in colDic)
-                    {
-                        createCol += string.Format("{0} {1},", colunmField.Key, colunmField.Value);
-                    }
-                    createTabSql = string.Format(createTabSql, createCol.TrimEnd(','));
-                    SqlHelper.ExecuteNonQuery(createTabSql);//创建表
-                }
-                return true;
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-        }
-    }
-}
+                            string a

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

@@ -2492,6 +2492,8 @@ namespace Lskj.Control.Model
                         SerSearchBoxDataSource(control, controlValue + "");
                     }
                 }
+
+
                 // 树结构节点不清空数据
                 if (control != null && model.FieldType != ControlType.LabTreeType)
                 {
@@ -3956,6 +3958,8 @@ namespace Lskj.Control.Model
             model.ImportCurrentValue = item.Table.Columns.Contains("ImportCurrentValue") && !string.IsNullOrWhiteSpace(item["ImportCurrentValue"] + "") ? "1".Equals(item["ImportCurrentValue"] + "") : false;
             model.SchedStartDataControl = item.Table.Columns.Contains("SchedStartDataControl") && !string.IsNullOrWhiteSpace(item["SchedStartDataControl"] + "") ? "1".Equals(item["SchedStartDataControl"] + "") : false;
             model.ListBoxFontSize = item.Table.Columns.Contains("ListBoxFontSize") && !string.IsNullOrEmpty(item["ListBoxFontSize"] + "") ? Convert.ToInt32(item["ListBoxFontSize"] + "") : 0;
+            model.PrivilegeView = item.Table.Columns.Contains("PrivilegeView") ? item["PrivilegeView"] + "" : "";
+            model.PrivilegeOper = item.Table.Columns.Contains("PrivilegeOper") ? item["PrivilegeOper"] + "" : "";
             //为了和工具里和bs里统一
             if (model.FieldType == 42)
             {
@@ -4116,6 +4120,7 @@ namespace Lskj.Control.Model
                     autoTreeEdit.ValueMember = ControlType.LabMultiComTreeboxValueParam == model.FieldType || ControlType.LabMultiComTreeboxValue == model.FieldType || ControlType.LabMulitTreeValue == model.FieldType || ControlType.LabMulitTreeValueParam == model.FieldType || ControlType.LabTreeLookValue == model.FieldType || ControlType.LabCheckTreeLookValue == model.FieldType || ControlType.LabTreeLastlevelValue == model.FieldType || ControlType.LabCheckTreeLastlevelValue == model.FieldType ? model.ValueMember : model.TextMember;
                     autoTreeEdit.ValueField = model.ValueMember;
                     autoTreeEdit.TextField = model.TextMember;
+                    //工具中和bs里 122-123只能选末级
                     if (ControlType.LabTreeLastlevelValue == model.FieldType || ControlType.LabTreeLastlevelText == model.FieldType || ControlType.LabCheckTreeLastlevelValue == model.FieldType || ControlType.LabCheckTreeLastlevelText == model.FieldType) autoTreeEdit.isRootNode = false;
 
                     //工具中和bs里 132-135都是只能选末级，136-139可以选中全部