From 9a2f369bcee572ba086ca83d76a562a0ecaa587b Mon Sep 17 00:00:00 2001 From: xcd <834800634@qq.com> Date: 星期四, 16 七月 2020 17:22:09 +0800 Subject: [PATCH] 板卡修复回原点bug 主流程注释部分log信息,添加部分图片对象主动释放操作 修复Excel输出Alignment最后一项第一次无数据bug 添加平面补偿 --- src/Bro.M071.DBManager/ExcelExportHelper.cs | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Bro.M071.DBManager/ExcelExportHelper.cs b/src/Bro.M071.DBManager/ExcelExportHelper.cs index 443b6fb..b804e74 100644 --- a/src/Bro.M071.DBManager/ExcelExportHelper.cs +++ b/src/Bro.M071.DBManager/ExcelExportHelper.cs @@ -12,20 +12,23 @@ public class ExcelExportSet { - public List<string> Worksheets { get; set; } + public List<string> Worksheets { get; set; } = new List<string>(); /// <summary> /// Key锛� Worksheet鐨勫悕绉� Value:Worksheet瀵瑰簲鐨勫垪鍚嶉泦鍚�(key 涓鸿瀵煎嚭鐨勫垪鍚� value 涓哄鍑哄悗鏄剧ず鐨勫垪鍚�) /// </summary> - public Dictionary<string, Dictionary<string, string>> WorksheetColumns { get; set; } - public Dictionary<string, DataTable> WorksheetDataTable { get; set; } + public Dictionary<string, Dictionary<string, string>> WorksheetColumns { get; set; } = new Dictionary<string, Dictionary<string, string>>(); - public ExcelExportSet() - { - Worksheets = new List<string>(); - WorksheetColumns = new Dictionary<string, Dictionary<string, string>>(); - WorksheetDataTable = new Dictionary<string, DataTable>(); - } + public Dictionary<string, Dictionary<string, string>> WorksheetRows { get; set; } = new Dictionary<string, Dictionary<string, string>>(); + + public Dictionary<string, DataTable> WorksheetDataTable { get; set; } = new Dictionary<string, DataTable>(); + + //public ExcelExportSet() + //{ + // Worksheets = new List<string>(); + // WorksheetColumns = new Dictionary<string, Dictionary<string, string>>(); + // WorksheetDataTable = new Dictionary<string, DataTable>(); + //} } @@ -265,6 +268,7 @@ return ""; } } - } + + } -- Gitblit v1.8.0