SVN r526

SVN-Revision: r526

插件库/Lskj.Control/GridControlEx.cs

@@ -368,6 +368,10 @@ namespace Lskj.Control
         /// 聚合多表头控件
         /// </summary>
         public BandedGridControlEx CustomGroupBandEx;
+        /// <summary>
+        /// 导出名不包含日期
+        /// </summary>
+        public bool ExportNameWithoutDate = false;
 
         public GridControlEx()
         {
@@ -3932,7 +3936,7 @@ namespace Lskj.Control
             mutilLookUp.TextField = model.TextMember;
             mutilLookUp.SourceSQL = model.SqlSource;
             mutilLookUp.IsType = model.FieldType;
-            mutilLookUp.ValueMember = (model.FieldType == ControlType.LabMultiSelectValue|| model.FieldType == ControlType.LabMultiSelectValueNew) ||
+            mutilLookUp.ValueMember = (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew) ||
                                       model.FieldType == ControlType.LabMultiSelectValueParam ? model.ValueMember : model.TextMember;
             mutilLookUp.Tag = model;
 
@@ -7262,7 +7266,7 @@ namespace Lskj.Control
                 }
 
 
-                if (!SystemInfo.Instance.DisableFilteringQuantity) 
+                if (!SystemInfo.Instance.DisableFilteringQuantity)
                 {
                     DataTable filterTable = gridView.GetGridViewFilteredAndSortedDataToDataTable();
                     DataRow[] dataRowArray = filterTable.Select();
@@ -7285,7 +7289,7 @@ namespace Lskj.Control
                         }
                     }
                 }
-              
+
             }
             catch (Exception ex)
             {
@@ -8261,4 +8265,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/ModuleGridEx.cs

@@ -559,6 +559,7 @@ namespace Lskj.Control
             this.gcMain.ExportPermission = false;
             if (this.SysModel.ExportEnable && this.ValidateCond(this.SysModel.ExportCond, dr, "P_SystemDllTab", "exportCond") && this.SysModel.ExportPermission)
             {
+                bbi_export.Tag = SysModel;
                 pm_oper.AddItem(bbi_export);
                 this.gcMain.ExportPermission = true; //this.SysModel.ExportPermission;
             }
@@ -3076,7 +3077,7 @@ namespace Lskj.Control
 
                 List<string> ImportReturnName = this.SearchObj.getImportReturnValueControl();
                 List<string> ImportReturnValue = new List<string>();
-                if (ImportReturnName.Count>0)
+                if (ImportReturnName.Count > 0)
                 {
                     foreach (string item in ImportReturnName)
                     {
@@ -3086,15 +3087,15 @@ namespace Lskj.Control
                         {
                             Value = BaseImpl.GetDefaultValue(baseUserControl.Model.Default);
                             this.SearchObj.SetControlValue(item, Value);
-                        } 
+                        }
-                        else if (baseUserControl.Model.ImportCurrentValue) 
+                        else if (baseUserControl.Model.ImportCurrentValue)
                         {
                             Value = this.SearchObj.GetControlValue(item);
                         }
-                        
+
                         ImportReturnValue.Add(Value);
                     }
- 
+
                 }
 
                 //快速导入
@@ -3102,7 +3103,7 @@ namespace Lskj.Control
                 {
                     bool ImportResults = this.gcMain.GridView.QuickImport(this.SysModel, _parmaryKey, leftField, leftValue, ImportReturnName, ImportReturnValue, this.ParentGridEx);
                     // 刷新数据
-                    if (ImportResults) 
+                    if (ImportResults)
                     {
                         if (ImportReturnName.Count > 0)
                         {
@@ -3118,7 +3119,7 @@ namespace Lskj.Control
                             string newResult = SqlHelper.ExecuteScalar(sql) + "";
                         }
                     }
-                    
+
                     //GridColumnCollection gridColumns = this.gcMain.GridView.Columns;
                     //DataTable NewTable = this.gcMain.GridControl.DataSourceTable();
                     //foreach (DataRow rowItem in ImportTable.Rows)
@@ -3146,7 +3147,7 @@ namespace Lskj.Control
                     //    NewTable.Rows.Add(newRow);
                     //}
                 }
-                else 
+                else
                 {
 
                     FrmImport import = new FrmImport(this.SysModel.MenuTable, this.Model.ModuleCode, _parmaryKey, this.gcMain, this.SysModel.PrefixKey, leftField, leftValue, this.Model.FormText, this.SysModel.ConcatenatedPrefix);
@@ -3198,6 +3199,7 @@ namespace Lskj.Control
         private void ExportGridRecord()
         {
             LogUtil.WriteDebug(this.Model.ModuleCode, "导出数据", this.SysModel.MenuText, "导出数据");
+            this.gcMain.ExportNameWithoutDate = SysModel.ExportNameWithoutDate;
             if (this.gcMain is TreeGridControlEx)
             {
                 TreeGridControlEx treeControlEx = this.gcMain as TreeGridControlEx;
@@ -5226,4 +5228,4 @@ namespace Lskj.Control
 
         public void SelectTheSpecifiedRow()
         {
-            if (!string.IsNullOrWhiteSpace(this.TagName) &&ParentGridEx!=null&&ParentGridEx.GridView.OptionsSelection.MultiSelect == true&& GridControlObj.GridView.OptionsSelection.MultiSelect == true&& this.ParentControlEx.
+            if (!string.IsNullOrWhiteSpace(this.TagName) && ParentGridEx != null && ParentGridEx.GridView.OptionsSelection.MultiSelect == true && GridControlObj.GridView.OptionsSelection.MultiSelect == true && this.P