SVN r1246

SVN-Revision: r1246

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

@@ -1511,7 +1511,7 @@ namespace Lskj.Control.Model
                         SetModuleName(dialog.FileName, fileExt, gridView.Columns.Cast<GridColumn>().Count(column => column.Visible), false, panel);
                     }
 
-                    if (SystemInfo.Instance.IsInsertWorksheet &&!string.IsNullOrWhiteSpace(FileName)) 
+                    if (SystemInfo.Instance.IsInsertWorksheet && !string.IsNullOrWhiteSpace(FileName))
                     {
                         AppendWorksheetToExcel(dialog.FileName, FileName);
                     }
@@ -4031,7 +4031,8 @@ namespace Lskj.Control.Model
                         if (item is BaseUserControl)
                         {
                             BaseUserControl baseUser = item as BaseUserControl;
-                            condition += string.Format("{0}={1}     ", baseUser.LabelText, baseUser.EditText);
+                            condition += string.Format("{0}:{1}     ", baseUser.LabelText, baseUser.EditText);
+
                         }
 
                     }
@@ -4068,14 +4069,28 @@ namespace Lskj.Control.Model
 
                 // 第一行的索引
                 int newRowNum = sheet.FirstRowNum;
+                int filterLastColumnIndex = NumberOfColumns > 0 ? NumberOfColumns - 1 : 0;
+                IRow originalHeaderRow = sheet.GetRow(newRowNum);
+                if (originalHeaderRow != null && originalHeaderRow.LastCellNum > 0)
+                {
+                    filterLastColumnIndex = originalHeaderRow.LastCellNum - 1;
+                }
                 // 向下移动所有行（包括第一行），为新行腾出空间
                 sheet.ShiftRows(newRowNum, sheet.LastRowNum, InsertRows);
                 // 设置筛选器位置(多表头不用设置)
                 if (!isBanded)
                 {
                     int lastRowNum = sheet.LastRowNum;
-                    var range = new CellRangeAddress(InsertRows, lastRowNum, 0, sheet.GetRow(1).LastCellNum - 1);//设置到第二行
+                    IRow headerRow = sheet.GetRow(newRowNum + InsertRows);
-                    sheet.SetAutoFilter(range); // 设置新的筛选器范围
+                    if (headerRow != null && headerRow.LastCellNum > 0)
+                    {
+                        filterLastColumnIndex = headerRow.LastCellNum - 1;
+                    }
+                    if (lastRowNum >= newRowNum + InsertRows)
+                    {
+                        var range = new CellRangeAddress(newRowNum + InsertRows, lastRowNum, 0, filterLastColumnIndex);
+                        sheet.SetAutoFilter(range); // 设置新的筛选器范围
+                    }
                 }
 
                 for (int i = 0; i < InsertRows; i++)

插件库/Lskj.Control/ModulePanelEx.cs

@@ -353,7 +353,7 @@ namespace Lskj.Control
             this.InitializePrintFile();
             // 常用工具
             this.InitializeCommonTool();
-            if (!BaseModuleImpl.HasStepFlow(this.Model.ModuleCode))
+            if (!BaseModuleImpl.HasStepFlow(this.Model.ModuleCode)|| this.SysModel.HideReviewBut)
             {
                 this.btnApply.Visible = false;
                 this.btnAdd.Location = this.btnUpdate.Location;