Skip to content

修复导出参数设置无效的问题 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
threstone wants to merge 8 commits into
base: master
Choose a base branch
from
Open

修复导出参数设置无效的问题 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d06280
修复导出参数设置无效的问题
threstone Jan 19, 2023
b6db3df
change for Anduin
threstone Jan 19, 2023
d1eca56
tiny导出json没有[]包着，
threstone Jan 21, 2023
434eed5
增加导出json的double支持
threstone Jan 22, 2023
8e936bb
导表工具支持列导出类型
threstone Jan 25, 2023
6e8655c
支持json数据
threstone Feb 11, 2023
0c21465
导出json支持数组格式
threstone Mar 2, 2023
7d87a7c
忽略base空列
threstone Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed ExcelToLuaJson.zip
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions Export.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ class Export
private string _ExportExcelFileName = "";
private ExcelTableData excelTable;
public Export(string excelFileName)
{
{
_ExportExcelFileName = excelFileName;
excelTable = new ExcelTableData();
excelTable.LoadFromFile(excelFileName);
}

public void DoExport(string exportBasePath,string exportMode,string exportType)
public void DoExport(string exportBasePath, string exportMode, string exportType)
{
ExporterBase exporter = null;
switch (exportType)
{
case "lua":
{
exporter = new ExporterLua();
exporter = new ExporterLua(exportMode);
}
break;
case "json":
{
exporter = new ExporterJson();
exporter = new ExporterJson(exportMode);
}
break;
break;
}


Expand All @@ -44,6 +44,6 @@ public void DoExport(string exportBasePath,string exportMode,string exportType)

}


}
}
22 changes: 14 additions & 8 deletions Exporter/ExporterBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ namespace ExcelExport.Exporter
{
public class ExporterBase
{
private string _exportMode;
protected ExporterBase(string exportMode)
{
this._exportMode = exportMode;
}

protected virtual void ExportTiny(ExcelSheetData data,StreamWriter writer)
protected virtual void ExportTiny(ExcelSheetData data, StreamWriter writer)
{
//nothing
}

protected virtual void ExportBase(ExcelSheetData data,StreamWriter writer)
protected virtual void ExportBase(ExcelSheetData data, StreamWriter writer, string exportMode)
{
//nothing
}
Expand All @@ -39,29 +44,30 @@ private void CheckCreateDir(string dir)
{
var targetDir = Directory.GetParent(dir).ToString();
if (!Directory.Exists(targetDir))
{
{
Directory.CreateDirectory(targetDir);
}
}

public void SaveToFile(ExcelSheetData data , string fileName)
public void SaveToFile(ExcelSheetData data, string fileName)
{

CheckCreateDir(fileName);

var stream = new FileStream(fileName, FileMode.Create);
var writer = new StreamWriter(stream);

AddHeader(data, writer);
if (data.exportSchema == "base")
{
ExportBase(data, writer);
} else if(data.exportSchema == "tiny")
AddHeader(data, writer);
ExportBase(data, writer, this._exportMode);
AddEnd(data, writer);
}
else if (data.exportSchema == "tiny")
{
ExportTiny(data, writer);
}

AddEnd(data, writer);
writer.Close();
stream.Close();

Expand Down
103 changes: 74 additions & 29 deletions Exporter/ExporterJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ namespace ExcelExport.Exporter
{
public class ExporterJson : ExporterBase
{

public ExporterJson(string exportMode) : base(exportMode)
{
}
protected override void AddHeader(ExcelSheetData data, StreamWriter writer)
{
writer.WriteLine("{");
writer.WriteLine("[");
}

protected override void AddEnd(ExcelSheetData data, StreamWriter writer)
{
writer.WriteLine("}");
writer.WriteLine("]");
}

protected override void ExportTiny(ExcelSheetData data, StreamWriter writer)
Expand All @@ -30,38 +32,64 @@ protected override void ExportTiny(ExcelSheetData data, StreamWriter writer)
for (var rowCount = 0; rowCount < fieldDataKey.dataList.Count; rowCount++)
{
string str = "";
str = string.Format("{0}:\"{1}\"",fieldDataKey.dataList[rowCount], fieldDataValue.dataList[rowCount]);
int intRes = -1;
double doubleRes = 0;
string value = fieldDataValue.dataList[rowCount];
if (int.TryParse(value, out intRes))
{
str = string.Format("\"{0}\":{1}", fieldDataKey.dataList[rowCount], intRes);
}
else if (double.TryParse(value, out doubleRes))
{
str = string.Format("\"{0}\":{1}", fieldDataKey.dataList[rowCount], doubleRes);
}
else
{
if (value.StartsWith("[") && value.EndsWith("]"))
{
str = string.Format("\"{0}\":{1}", fieldDataKey.dataList[rowCount], value);
}
else
{
str = string.Format("\"{0}\":\"{1}\"", fieldDataKey.dataList[rowCount], value);
}
}

if (rowCount != fieldDataKey.dataList.Count)
if (rowCount != fieldDataKey.dataList.Count - 1)
{
str += ",";
}
writer.WriteLine(str);
}

writer.WriteLine("}");
}

protected override void ExportBase(ExcelSheetData data, StreamWriter writer)
protected override void ExportBase(ExcelSheetData data, StreamWriter writer, string exportMode)
{
FieldData fieldData = null;
var rowCount = data.filedList[0].RowCount;


for (var rowIndex = 0; rowIndex < rowCount; rowIndex++)
{

//处理keyCount
string key = "";
for (var i = 0; i < data.keyCount; i++)
{
key += string.Format("\"{0}\" : ", data.filedList[i].dataList[rowIndex]) + "{";
//key += string.Format("\"{0}\" : ", data.filedList[i].dataList[rowIndex]) + "{";
key += "{";
}

writer.WriteLine(key);
string appendStr = (key + "\n");

for (var i = 0; i < data.filedList.Count; i++)
{
fieldData = data.filedList[i];
bool isAppendEndStr = true;
if (!fieldData.CanExportTo(exportMode))
{
continue;
}

//数组列表
if (fieldData.IsArrayField())
{
Expand All @@ -79,42 +107,59 @@ protected override void ExportBase(ExcelSheetData data, StreamWriter writer)

str += "]";

writer.Write(str);
appendStr += str;
}
else
{
var tempData = fieldData.dataList[rowIndex];
//普通字段
if (fieldData.fieldType == typeof(string))
{
string str = string.Format(" \"{0}\":\"{1}\"", fieldData.fieldName, fieldData.dataList[rowIndex]);
writer.Write(str);
string str;
if ((tempData.StartsWith("{") && tempData.EndsWith("}")) || (tempData.StartsWith("[") && tempData.EndsWith("]")))
{
str = string.Format(" \"{0}\":{1}", fieldData.fieldName, tempData);
}
else
{
str = string.Format(" \"{0}\":\"{1}\"", fieldData.fieldName, tempData);
}
appendStr += str;
}
else
{
string str = string.Format(" \"{0}\":{1}", fieldData.fieldName, fieldData.dataList[rowIndex]);
writer.Write(str);
if (tempData != "")
{
string str = string.Format(" \"{0}\":{1}", fieldData.fieldName, tempData);
appendStr += str;
}
else {
isAppendEndStr = false;
}
}

}

//最后一行不给逗号分隔
if (i != data.filedList.Count - 1)
{
writer.WriteLine(",");
}
else
if (isAppendEndStr)
{
writer.WriteLine(" ");
appendStr += ",\n";
}
}

if (rowIndex == rowCount - 1)
{
writer.WriteLine(" }");
}
else

appendStr = appendStr.Substring(0, appendStr.Length - 2);
writer.WriteLine(appendStr);

if (appendStr.Length > 2)
{
writer.WriteLine(" },");
if (rowIndex == rowCount - 1)
{
writer.WriteLine(" }");
}
else
{
writer.WriteLine(" },");
}
}

}
Expand Down
45 changes: 26 additions & 19 deletions Exporter/ExporterLua.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ namespace ExcelExport.Exporter
{
public class ExporterLua : ExporterBase
{
public ExporterLua(string exportMode) : base(exportMode)
{
}

protected override void ExportTiny(ExcelSheetData data, StreamWriter writer)
{
var fieldDataKey = data.filedList[0];
Expand All @@ -30,27 +34,33 @@ protected override void ExportTiny(ExcelSheetData data, StreamWriter writer)
writer.WriteLine("}");
}

protected override void ExportBase(ExcelSheetData data, StreamWriter writer)
protected override void ExportBase(ExcelSheetData data, StreamWriter writer, string exportMode)
{
FieldData fieldData = null;
var rowCount = data.filedList[0].RowCount;


for (var rowIndex = 0; rowIndex < rowCount; rowIndex++)
{

//处理keyCount
string key = "";
for (var i = 0; i < data.keyCount; i++)
{
key += string.Format("[{0}] = ", data.filedList[i].dataList[rowIndex]) + "{";
}

writer.WriteLine(key);
string appendStr = key + "\n";

for (var i = 0; i < data.filedList.Count; i++)
{
fieldData = data.filedList[i];
fieldData = data.filedList[i];

if (!fieldData.CanExportTo("s"))
{
continue;
}

//数组列表
if (fieldData.IsArrayField())
{
Expand All @@ -66,41 +76,38 @@ protected override void ExportBase(ExcelSheetData data, StreamWriter writer)
}
}

writer.Write(str);
appendStr += str;
}
else
{
//普通字段
if (fieldData.fieldType == typeof(string))
{
string str = string.Format(" {0}=\"{1}\"", fieldData.fieldName, fieldData.dataList[rowIndex]);
writer.Write(str);
appendStr += str;
}
else
{
string str = string.Format(" {0}={1}", fieldData.fieldName, fieldData.dataList[rowIndex]);
writer.Write(str);
appendStr += str;
}
}

//最后一行不给逗号分隔
if (i != data.filedList.Count - 1)
{
writer.WriteLine(",");
}
else
{
writer.WriteLine(" ");
}
appendStr += ",\n";
}
if(rowIndex == rowCount - 1)

appendStr = appendStr.Substring(0, appendStr.Length - 2);
writer.WriteLine(appendStr);

if (rowIndex == rowCount - 1)
{
writer.WriteLine(" }");
} else
}
else
{
writer.WriteLine(" },");
}

}

}
Expand Down
7 changes: 4 additions & 3 deletions FormMain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,11 @@ private void btn_Export_Click(object sender, EventArgs e)
LogUtils.instance.AddLog("读取完成 : " + fileName);

LogUtils.instance.AddLog("开始导出到JSON");
exporter.DoExport(export_path.Text + "\\data\\client\\", "c", "json");
exporter.DoExport(export_path.Text + "\\client\\", "c", "json");
exporter.DoExport(export_path.Text + "\\server\\", "s", "json");

LogUtils.instance.AddLog("开始导出到LUA");
exporter.DoExport(export_path.Text + "\\data\\server\\", "s", "lua");
//LogUtils.instance.AddLog("开始导出到LUA");
//exporter.DoExport(export_path.Text + "\\data\\server\\", "s", "lua");

LogUtils.instance.AddLog("完成处理Excel :" + fileName);

Expand Down