Commit 2d42cf4c authored by 罗显健's avatar 罗显健

合并

parents 4607c60a ce2b4c3d
...@@ -13,7 +13,6 @@ using NPOI.SS.Util; ...@@ -13,7 +13,6 @@ using NPOI.SS.Util;
using RtfPipe; using RtfPipe;
// //
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Windows.Forms;
using System.Diagnostics; using System.Diagnostics;
namespace FunnyPick namespace FunnyPick
...@@ -1126,38 +1125,38 @@ namespace FunnyPick ...@@ -1126,38 +1125,38 @@ namespace FunnyPick
/// <param name="keyID">主键ID</param> /// <param name="keyID">主键ID</param>
/// <param name="m">导出模型</param> /// <param name="m">导出模型</param>
/// <param name="exportPath">导出路径</param> /// <param name="exportPath">导出路径</param>
public void UnifyExport(LinkLabel lnk, string xml, int keyID, ExportModel m = null, string exportPath = "") //public void UnifyExport(LinkLabel lnk, string xml, int keyID, ExportModel m = null, string exportPath = "")
{ //{
//赋值全局数据源 // //赋值全局数据源
this._ds = this.GetDataFromXml(xml, keyID); // this._ds = this.GetDataFromXml(xml, keyID);
//模板导出路径 // //模板导出路径
this.ExportFileName = this.GetExportFileFullName(exportPath); // this.ExportFileName = this.GetExportFileFullName(exportPath);
//如未显式指定导出模型,则从配置文件读取 // //如未显式指定导出模型,则从配置文件读取
if (m == null) // if (m == null)
m = Utils.GetExportModel(xml); // m = Utils.GetExportModel(xml);
//显示上下文菜单 // //显示上下文菜单
this.ShowContextMenu(lnk, m); // this.ShowContextMenu(lnk, m);
} //}
/// <summary> /// <summary>
/// 统一导出接口 /// 统一导出接口
/// </summary> /// </summary>
/// <param name="lnk">标签控件</param> /// <param name="lnk">标签控件</param>
/// <param name="ds">数据源</param> /// <param name="ds">数据源</param>
/// <param name="m">导出模型</param> /// <param name="m">导出模型</param>
public void UnifyExport(LinkLabel lnk, DataSet ds, ExportModel m) //public void UnifyExport(LinkLabel lnk, DataSet ds, ExportModel m)
{ //{
if (ds == null || m == null) // if (ds == null || m == null)
{ // {
Utils.ThrowErrorMessage("导出Excel必须赋值数据源和导出模型!"); // Utils.ThrowErrorMessage("导出Excel必须赋值数据源和导出模型!");
return; // return;
} // }
//赋值全局数据源 // //赋值全局数据源
this._ds = ds; // this._ds = ds;
//模板导出路径 // //模板导出路径
this.ExportFileName = this.GetExportFileFullName(); // this.ExportFileName = this.GetExportFileFullName();
//显示上下文菜单 // //显示上下文菜单
this.ShowContextMenu(lnk, m); // this.ShowContextMenu(lnk, m);
} //}
/// <summary> /// <summary>
/// 获取导出文件全名 /// 获取导出文件全名
...@@ -1185,64 +1184,64 @@ namespace FunnyPick ...@@ -1185,64 +1184,64 @@ namespace FunnyPick
/// </summary> /// </summary>
/// <param name="lnk"></param> /// <param name="lnk"></param>
/// <param name="UniquePrefix"></param> /// <param name="UniquePrefix"></param>
private void ShowContextMenu(LinkLabel lnk, ExportModel m) //private void ShowContextMenu(LinkLabel lnk, ExportModel m)
{ //{
//根据模板目录创建下拉菜单项(显示时去掉统一前缀,简洁显示) // //根据模板目录创建下拉菜单项(显示时去掉统一前缀,简洁显示)
DirectoryInfo directory = new DirectoryInfo(Utils.ExcelTemplateFilePath); // DirectoryInfo directory = new DirectoryInfo(Utils.ExcelTemplateFilePath);
var items = directory.GetFiles().Where(f => f.Name.IndexOf(m.UniquePrefix) == 0) // var items = directory.GetFiles().Where(f => f.Name.IndexOf(m.UniquePrefix) == 0)
.Select(p => new MenuItem(p.Name.Replace(m.UniquePrefix, ""), new EventHandler(MenuItem_Click)) { Tag = m }) // .Select(p => new MenuItem(p.Name.Replace(m.UniquePrefix, ""), new EventHandler(MenuItem_Click)) { Tag = m })
.ToArray(); // .ToArray();
if (items.Length == 0) // if (items.Length == 0)
{ // {
Utils.ShowMessage("请先配置模板信息!"); // Utils.ShowMessage("请先配置模板信息!");
return; // return;
} // }
//创建菜单并显示 // //创建菜单并显示
ContextMenu cm = new ContextMenu(); // //ContextMenu cm = new ContextMenu();
cm.MenuItems.AddRange(items); // //cm.MenuItems.AddRange(items);
cm.Show(lnk, new Point(0, lnk.Height)); // //cm.Show(lnk, new Point(0, lnk.Height));
} //}
/// <summary> /// <summary>
/// 模板项点击事件 /// 模板项点击事件
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void MenuItem_Click(object sender, EventArgs e) //private void MenuItem_Click(object sender, EventArgs e)
{ //{
var item = sender as MenuItem; // var item = sender as MenuItem;
if (string.IsNullOrEmpty(item.Text)) // if (string.IsNullOrEmpty(item.Text))
return; // return;
try // try
{ // {
Utils.ShowWaitDialog("正在导出Excel文件, 请稍候!", "Exporting excel file, please wait!"); // Utils.ShowWaitDialog("正在导出Excel文件, 请稍候!", "Exporting excel file, please wait!");
//打开模板 // //打开模板
var m = item.Tag as ExportModel; // var m = item.Tag as ExportModel;
this._mouldFilePath = $@"{Utils.ExcelTemplateFilePath}\{m.UniquePrefix}{item.Text}"; // this._mouldFilePath = $@"{Utils.ExcelTemplateFilePath}\{m.UniquePrefix}{item.Text}";
this._Workbook = this.GetWorkbook(this._mouldFilePath); // this._Workbook = this.GetWorkbook(this._mouldFilePath);
//根据设置导出 // //根据设置导出
bool IsSuccess = false; // bool IsSuccess = false;
if (!string.IsNullOrEmpty(m.GroupTableName.Trim()) && !string.IsNullOrEmpty(m.GroupColumnName.Trim())) // if (!string.IsNullOrEmpty(m.GroupTableName.Trim()) && !string.IsNullOrEmpty(m.GroupColumnName.Trim()))
{ // {
IsSuccess = this.ExportSheets(m.GroupTableName, m.GroupColumnName); // IsSuccess = this.ExportSheets(m.GroupTableName, m.GroupColumnName);
} // }
else // else
{ // {
IsSuccess = this.Export(); // IsSuccess = this.Export();
} // }
//成功时,打开文件 // //成功时,打开文件
if (IsSuccess) // if (IsSuccess)
{ // {
Process.Start(this.ExportFileName); // Process.Start(this.ExportFileName);
} // }
} // }
finally // finally
{ // {
Utils.CloseWaitDialog(); // Utils.CloseWaitDialog();
} // }
} //}
#endregion #endregion
} }
......
...@@ -11,10 +11,4 @@ ...@@ -11,10 +11,4 @@
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" /> <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="System.Windows.Forms">
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.Windows.Forms.dll</HintPath>
</Reference>
</ItemGroup>
</Project> </Project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment