固定列/行优化

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -2056,6 +2056,12 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionRollback(System.Int32)">
+            <summary>
+            二次绩效撤回提交
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionEmployee(Performance.DtoModels.SecondEmployeeDto)">
             <summary>
             二次分配人员字典带出
@@ -2165,7 +2171,6 @@
             <param name="query"></param>
             <returns></returns>
         </member>
-<<<<<<< HEAD
         <member name="M:Performance.Api.BackgroundJob.Execute_Allot_Generate(Performance.Services.TaskService,Performance.EntityModels.bg_task)">
             <summary>
             生成测算表
@@ -2201,14 +2206,11 @@
             <param name="service"></param>
             <param name="tasks"></param>
         </member>
-=======
->>>>>>> 在线浏览编辑Excel
         <member name="T:Performance.Api.ClearLoggerJob">
             <summary>
             删除历史日志
             </summary>
         </member>
-<<<<<<< HEAD
         <member name="T:Performance.Api.ExpirationLimitMiddleware">
             <summary>
             过期限制
@@ -2221,8 +2223,6 @@
             <param name="builder"></param>
             <returns></returns>
         </member>
-=======
->>>>>>> 在线浏览编辑Excel
         <member name="M:Performance.Api.ClaimService.GetUserId">
             <summary>
             获取当前请求登录ID

performance/Performance.Services/OnlineExcel/Model/EpSheet.cs

@@ -7,6 +7,8 @@ namespace Performance.Services.OnlineExcel
     /// </summary>
     public class EpSheet
     {
+        public int fixedColumnsLeft { get; set; }
+        public int fixedRowsTop { get; set; }
         public object renders { get; set; }
         public object mergeCells { get; set; }
         public object data { get; set; }

performance/Performance.Services/OnlineExcel/OnlineExcelService.Read.cs

@@ -32,7 +32,7 @@ public partial class OnlineExcelService : IAutoInjection
             { "Bottom", "htBottom" },
         };
 
-        public static TimeSpan absoluteExpirationRelativeToNow = new TimeSpan(0, 5, 0);
+        public static TimeSpan absoluteExpirationRelativeToNow = new TimeSpan(0, 30, 0);
 
         private readonly IMemoryCache _cache;
         private readonly PerSheetService _sheetService;
@@ -143,14 +143,20 @@ public EpSheet ReadSheet(per_allot allot, string sheetName)
                     }
                     #endregion
 
+                    SheetType sheetType = _sheetService.GetSheetType(sheet.Name);
+                    var handler = PerSheetDataFactory.GetDataRead(sheetType);
+
                     EpSheet epSheet = new EpSheet()
                     {
+                        fixedColumnsLeft = handler?.Point.DataFirstCellNum ?? 0,
+                        fixedRowsTop = handler?.Point.DataFirstRowNum ?? 0,
                         cell = cells,
                         colWidths = colWidths,
                         data = datas,
                         renders = renders,
                         mergeCells = mergeCells,
                     };
+
                     _cache.Set(key, epSheet, absoluteExpirationRelativeToNow);
 
                     return epSheet;