SVN r266

SVN-Revision: r266

插件库/Lskj.Control/GridControlEx.cs

@@ -669,7 +669,7 @@ namespace Lskj.Control
                 return;
             }
 
-            if (!string.IsNullOrEmpty(model.SqlSource) && !(model.FieldType == ControlType.LabSelectReturnIdNew || model.FieldType == ControlType.LabSelectReturnTextNew))
+            if (!string.IsNullOrEmpty(model.SqlSource) && !ControlType.IsNotLoadData(model.FieldType))
             {
                 Task<DataTable> sourceTask = new Task<DataTable>(() =>
                 {
@@ -1073,7 +1073,7 @@ namespace Lskj.Control
             foreach (GridColumnModel item in mControlList)
             {
                 if (this.DisableFieldSources && item.isVislble) continue;
-                if (item.FieldType == ControlType.LabSelectReturnIdNew || item.FieldType == ControlType.LabSelectReturnTextNew) continue;
+                if(ControlType.IsNotLoadData(item.FieldType)) continue;
                 if (!string.IsNullOrWhiteSpace(item.SqlSource))
                 {
                     DataTable dataTable = new DataTable();
@@ -7727,4 +7727,36 @@ namespace Lskj.Control
         {
             int returnIndex = 0;
             isContain = false;
-            DataRow dragEn
+            DataRow dragEndRow = sourceTab.Rows[dragEndRowIndex];
+            if (selectRows.Contains(dragEndRow))
+            {
+                isContain = true;
+                dragEndRowIndex = dragEndRowIndex - 1;
+                if (dragEndRowIndex >= 0)
+                {
+                    dragEndRow = sourceTab.Rows[dragEndRowIndex];
+                    if (selectRows.Contains(dragEndRow))
+                    {
+                        bool iscontain = false;
+                        returnIndex = GetDragEndRowIndex(sourceTab, dragEndRowIndex, selectRows, out iscontain);
+                    }
+                    else
+                    {
+                        returnIndex = dragEndRowIndex;
+                    }
+                }
+                else
+                {
+                    returnIndex = -1;
+                }
+            }
+            else
+            {
+                returnIndex = dragEndRowIndex;
+            }
+            return returnIndex;
+        }
+        #endregion
+
+    }
+}

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

@@ -477,4 +477,29 @@ namespace Lskj.Control.Model
                     modelType = 7;
                     break;
                 case "AuditPopupBasicInfoGridView"://单据弹出加载附加信息
-                    modelType = 
+                    modelType = 8;
+                    break;
+                default:
+                    modelType = 0;
+                    break;
+            }
+            return modelType;
+        }
+        /// <summary>
+        /// <para>说明：是否为日期类型</para>
+        /// <para>创建人：龚宇超</para>
+        /// <para>创建日期： </para>
+        /// <para>修改人：</para>
+        /// <para>修改日期：</para>
+        /// <para>修改备注：</para>
+        /// <para>版本：1.0</para>
+        /// </summary>
+        /// <param name="fieldType">Type of the field.</param>
+        /// <returns><c>true</c> if the specified field type is date; otherwise, <c>false</c>.</returns>
+        public static bool IsDate(int fieldType)
+        {
+            return fieldType == LabDate ||
+                   fieldType == LabDateTime ||
+                   fieldType == LabDateTimeShort ||
+                   fieldType == LabTime ||
+                   fieldType == LabS

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

@@ -1406,7 +1406,7 @@ namespace Lskj.Control.Model
                                     model.SourceSql += "and 1<>1";
                                 }
                                 DataTable table = new DataTable();
-                                if (model.FieldType != ControlType.LabSelectReturnIdNew && model.FieldType != ControlType.LabSelectReturnTextNew)
+                                if (!ControlType.IsNotLoadData(model.FieldType))
                                 {
                                     if (mControlSourceDic.ContainsKey(model))
                                     {
@@ -3760,7 +3760,7 @@ namespace Lskj.Control.Model
         private System.Windows.Forms.Control InitControl(ControlModel model, bool isLoadBorder = true)
         {
            
-            if (!string.IsNullOrEmpty(model.SourceSql)&& !(model.FieldType == ControlType.LabSelectReturnIdNew || model.FieldType == ControlType.LabSelectReturnTextNew))
+            if (!string.IsNullOrEmpty(model.SourceSql)&& !ControlType.IsNotLoadData(model.FieldType))
             {
                 Task<DataTable> sourceTask = null;
                 if (StaticControl.AddParentGrid.Key != null && Model != null && StaticControl.AddParentGrid.Key.Equals(Model.ModuleCode))