From eafdcc5ad6a55d3dfdec6c4787c3f3a9f32efc7f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 29 九月 2020 13:27:50 +0800
Subject: [PATCH] 1. M071B机台配置 2. GTS板卡添加回原点捕获模式和输入信号模式 3. CameraBase使用Dictionary类型做图片缓存 4. M071流程显式Copy，原来是为了避免内存泄漏，但目前来看不是这方面原因 5. Gocator驱动添加GoDataSet之类KObject资源显式回收，怀疑其中也有非托管对象资源，测试确实起到内存回收作用
---
src/Bro.M071.DBManager/ExcelExportHelper.cs | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/Bro.M071.DBManager/ExcelExportHelper.cs b/src/Bro.M071.DBManager/ExcelExportHelper.cs
index ce6958e..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>();
+ //}
}
@@ -107,7 +110,7 @@
{
// autofit width of cells with small content
ExcelRange columnCells = workSheet.Cells[workSheet.Dimension.Start.Row, columnIndex, workSheet.Dimension.End.Row, columnIndex];
- int maxLength = columnCells.Max(cell => cell.Value.ToString().Count());
+ int maxLength = columnCells.Max(cell => (cell.Value ?? "").ToString().Count());
if (maxLength < 150)
{
workSheet.Column(columnIndex).AutoFit();
@@ -258,13 +261,14 @@
{
try
{
- return obj.ToString();
+ return (obj ?? "").ToString();
}
catch (Exception)
{
return "";
}
}
-
}
+
+
}
--
Gitblit v1.8.0