From f1f808b23cf9b11f58f83dce05714f1dffba26d2 Mon Sep 17 00:00:00 2001 From: neil3d Date: Sat, 25 Jul 2020 16:44:15 +0800 Subject: [PATCH] exclude sheet and column with prefix --- CSDefineGenerator.cs | 15 ++++++++++++--- Docs/ExampleData.xlsx | Bin 10258 -> 11873 bytes GUI/DataManager.cs | 4 ++-- GUI/MainForm.Designer.cs | 26 ++++++++++++++++++++++++-- GUI/MainForm.cs | 1 + GUI/MainForm.resx | 3 +++ JsonExporter.cs | 32 +++++++++++++++++++++----------- Program.Options.cs | 6 ++++++ Program.cs | 4 ++-- Properties/AssemblyInfo.cs | 4 ++-- 10 files changed, 73 insertions(+), 22 deletions(-) diff --git a/CSDefineGenerator.cs b/CSDefineGenerator.cs index 3dfce14..cf290a9 100644 --- a/CSDefineGenerator.cs +++ b/CSDefineGenerator.cs @@ -27,7 +27,7 @@ public string code { } } - public CSDefineGenerator(string excelName, ExcelLoader excel) + public CSDefineGenerator(string excelName, ExcelLoader excel, string excludePrefix) { //-- 创建代码字符串 StringBuilder sb = new StringBuilder(); @@ -44,7 +44,7 @@ public CSDefineGenerator(string excelName, ExcelLoader excel) for (int i = 0; i < excel.Sheets.Count; i++) { DataTable sheet = excel.Sheets[i]; - sb.Append(_exportSheet(sheet)); + sb.Append(_exportSheet(sheet, excludePrefix)); } sb.AppendLine(); @@ -53,11 +53,15 @@ public CSDefineGenerator(string excelName, ExcelLoader excel) mCode = sb.ToString(); } - private string _exportSheet(DataTable sheet) + private string _exportSheet(DataTable sheet, string excludePrefix) { if (sheet.Columns.Count < 0 || sheet.Rows.Count < 2) return ""; + string sheetName = sheet.TableName; + if (excludePrefix.Length > 0 && sheetName.StartsWith(excludePrefix)) + return ""; + // get field list List fieldList = new List(); DataRow typeRow = sheet.Rows[0]; @@ -65,6 +69,11 @@ private string _exportSheet(DataTable sheet) foreach (DataColumn column in sheet.Columns) { + // 过滤掉包含指定前缀的列 + string columnName = column.ToString(); + if (excludePrefix.Length > 0 && columnName.StartsWith(excludePrefix)) + continue; + FieldDef field; field.name = column.ToString(); field.type = typeRow[column].ToString(); diff --git a/Docs/ExampleData.xlsx b/Docs/ExampleData.xlsx index 256066e75afbe92f204d6214a6c6ac7be1743a54..54333794c281677e7df6ea8d693050ca81401ed2 100644 GIT binary patch delta 5993 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 delta 4598 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 17, 17 + + False + 241, 17 diff --git a/JsonExporter.cs b/JsonExporter.cs index 35cdd15..9fb4ec3 100644 --- a/JsonExporter.cs +++ b/JsonExporter.cs @@ -25,13 +25,18 @@ public string context { /// 构造函数：完成内部数据创建 /// /// ExcelLoader Object - public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string dateFormat, bool forceSheetName, int headerRows) + public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string dateFormat, bool forceSheetName, int headerRows, string excludePrefix) { mHeaderRows = headerRows-1; List validSheets = new List(); for (int i = 0; i < excel.Sheets.Count; i++) { DataTable sheet = excel.Sheets[i]; + + // 过滤掉包含特定前缀的表单 + string sheetName = sheet.TableName; + if (excludePrefix.Length>0 && sheetName.StartsWith(excludePrefix)) + continue; if (sheet.Columns.Count > 0 && sheet.Rows.Count > 0) validSheets.Add(sheet); @@ -47,7 +52,7 @@ public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string da { // single sheet //-- convert to object - object sheetValue = convertSheet(validSheets[0], exportArray, lowcase); + object sheetValue = convertSheet(validSheets[0], exportArray, lowcase, excludePrefix); //-- convert to json string mContext = JsonConvert.SerializeObject(sheetValue, jsonSettings); @@ -58,7 +63,7 @@ public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string da Dictionary data = new Dictionary(); foreach (var sheet in validSheets) { - object sheetValue = convertSheet(sheet, exportArray, lowcase); + object sheetValue = convertSheet(sheet, exportArray, lowcase, excludePrefix); data.Add(sheet.TableName, sheetValue); } @@ -67,15 +72,15 @@ public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string da } } - private object convertSheet(DataTable sheet, bool exportArray, bool lowcase) + private object convertSheet(DataTable sheet, bool exportArray, bool lowcase, string excludePrefix) { if (exportArray) - return convertSheetToArray(sheet, lowcase); + return convertSheetToArray(sheet, lowcase, excludePrefix); else - return convertSheetToDict(sheet, lowcase); + return convertSheetToDict(sheet, lowcase, excludePrefix); } - private object convertSheetToArray(DataTable sheet, bool lowcase) + private object convertSheetToArray(DataTable sheet, bool lowcase, string excludePrefix) { List values = new List(); @@ -85,7 +90,7 @@ private object convertSheetToArray(DataTable sheet, bool lowcase) DataRow row = sheet.Rows[i]; values.Add( - convertRowToDict(sheet, row, lowcase, firstDataRow) + convertRowToDict(sheet, row, lowcase, firstDataRow, excludePrefix) ); } @@ -95,7 +100,7 @@ private object convertSheetToArray(DataTable sheet, bool lowcase) /// /// 以第一列为ID，转换成ID->Object的字典对象 /// - private object convertSheetToDict(DataTable sheet, bool lowcase) + private object convertSheetToDict(DataTable sheet, bool lowcase, string excludePrefix) { Dictionary importData = new Dictionary(); @@ -108,7 +113,7 @@ private object convertSheetToDict(DataTable sheet, bool lowcase) if (ID.Length <= 0) ID = string.Format("row_{0}", i); - var rowObject = convertRowToDict(sheet, row, lowcase, firstDataRow); + var rowObject = convertRowToDict(sheet, row, lowcase, firstDataRow, excludePrefix); // 多余的字段 // rowObject[ID] = ID; importData[ID] = rowObject; @@ -120,12 +125,17 @@ private object convertSheetToDict(DataTable sheet, bool lowcase) /// /// 把一行数据转换成一个对象，每一列是一个属性 /// - private Dictionary convertRowToDict(DataTable sheet, DataRow row, bool lowcase, int firstDataRow) + private Dictionary convertRowToDict(DataTable sheet, DataRow row, bool lowcase, int firstDataRow, string excludePrefix) { var rowData = new Dictionary(); int col = 0; foreach (DataColumn column in sheet.Columns) { + // 过滤掉包含指定前缀的列 + string columnName = column.ToString(); + if (excludePrefix.Length > 0 && columnName.StartsWith(excludePrefix)) + continue; + object value = row[column]; if (value.GetType() == typeof(System.DBNull)) diff --git a/Program.Options.cs b/Program.Options.cs index 3cc4c44..2615a2a 100644 --- a/Program.Options.cs +++ b/Program.Options.cs @@ -73,6 +73,12 @@ public bool ForceSheetName { get; set; } + + [Option('x', "exclude_prefix", Required = false, DefaultValue = "", HelpText = "exclude sheet or column start with specified prefix.")] + public string ExcludePrefix { + get; + set; + } } } } diff --git a/Program.cs b/Program.cs index 29b7803..86159a9 100644 --- a/Program.cs +++ b/Program.cs @@ -106,13 +106,13 @@ private static void Run(Options options) ExcelLoader excel = new ExcelLoader(excelPath, header); //-- export - JsonExporter exporter = new JsonExporter(excel, options.Lowcase, options.ExportArray, dateFormat, options.ForceSheetName, header); + JsonExporter exporter = new JsonExporter(excel, options.Lowcase, options.ExportArray, dateFormat, options.ForceSheetName, header, options.ExcludePrefix); exporter.SaveToFile(exportPath, cd); //-- 生成C#定义文件 if (options.CSharpPath != null && options.CSharpPath.Length > 0) { - CSDefineGenerator generator = new CSDefineGenerator(excelName, excel); + CSDefineGenerator generator = new CSDefineGenerator(excelName, excel, options.ExcludePrefix); generator.SaveToFile(options.CSharpPath, cd); } } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 04a2596..51dfab5 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0.0")] -[assembly: AssemblyFileVersion("1.3.0.0")] +[assembly: AssemblyVersion("1.4.0.0")] +[assembly: AssemblyFileVersion("1.4.0.0")]