|
|
@@ -16,14 +16,14 @@ using DW5S.Repostory;
|
|
|
using Serilog;
|
|
|
using static DevExpress.Xpo.Helpers.AssociatedCollectionCriteriaHelper;
|
|
|
using DW5S.Service;
|
|
|
-using DevExpress.Skins;
|
|
|
-using DevExpress.XtraSpreadsheet.Model;
|
|
|
+using DW5S.ViewModel;
|
|
|
+using XdCxRhDW5S.ViewModel;
|
|
|
|
|
|
namespace DW5S.App.UserControl
|
|
|
{
|
|
|
public partial class CtrlXl : DevExpress.XtraEditors.XtraUserControl
|
|
|
{
|
|
|
- List<XlInfo> list = new List<XlInfo>();
|
|
|
+ List<XlViewModel> list = new List<XlViewModel>();
|
|
|
int maxCount = 0;
|
|
|
int maxPage = 0;
|
|
|
int currentPage = 1;
|
|
|
@@ -40,7 +40,7 @@ namespace DW5S.App.UserControl
|
|
|
|
|
|
private void TxtSat_EditValueChanged(object sender, EventArgs e)
|
|
|
{
|
|
|
- var sat = txtSat.EditValue as SatInfo;
|
|
|
+ var sat = txtSat.EditValue as SatViewModel;
|
|
|
satCode = sat?.SatCode;
|
|
|
ctrlPage1.RefreshData();
|
|
|
|
|
|
@@ -52,10 +52,10 @@ namespace DW5S.App.UserControl
|
|
|
var unitOfWork = IocContainer.UnitOfWork;
|
|
|
var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
|
|
|
var sat = await repsXl.GetAllSat();
|
|
|
- txtSat.UseDefault("不限制", true).SetData(sat, nameof(SatInfo.Sat));
|
|
|
+ txtSat.UseDefault("不限制", true).SetData(sat.To<List<SatViewModel>>(), displayField: nameof(SatViewModel.Sat)).UseDoubleClickToSelectAll();
|
|
|
|
|
|
- gridXl.UseDefault(list).UseRowNumber().UseDeleteAsync<XlInfo>(Del)
|
|
|
- .UseClearAsync<XlInfo>(Clear).UseExportXlsx()
|
|
|
+ gridXl.UseDefault(list).UseRowNumber().UseDeleteAsync<XlViewModel>(Del)
|
|
|
+ .UseClearAsync<XlViewModel>(Clear).UseExportXlsx()
|
|
|
.AddMenu("星历推算", SvgHelper.LoadFromFile("Image\\XlCalc.svg"), () =>
|
|
|
{
|
|
|
var ids = gridView1.GetSelectedRows();
|
|
|
@@ -64,7 +64,7 @@ namespace DW5S.App.UserControl
|
|
|
XtraMessageBox.Show("请选择需要星历推算的数据信息!");
|
|
|
return;
|
|
|
}
|
|
|
- var item = gridView1.GetRow(ids[0]) as XlInfo;
|
|
|
+ var item = gridView1.GetRow(ids[0]) as XlViewModel;
|
|
|
XlCalculateForm form = new XlCalculateForm(item.TwoLine);
|
|
|
form.ShowDialog();
|
|
|
});
|
|
|
@@ -85,7 +85,7 @@ namespace DW5S.App.UserControl
|
|
|
queryable = queryable.OrderByDescending(p => p.TimeUTC).ThenByDescending(p => p.Lon);
|
|
|
var pageData = await repsXl.GetPageData(arg, queryable);
|
|
|
list.Clear();
|
|
|
- list.AddRange(pageData.Data);
|
|
|
+ list.AddRange(dtResult);
|
|
|
gridView1.RefreshData();
|
|
|
return pageData;
|
|
|
}
|
|
|
@@ -139,7 +139,7 @@ namespace DW5S.App.UserControl
|
|
|
|
|
|
}
|
|
|
|
|
|
- private async Task<bool> Del(List<XlInfo> list)
|
|
|
+ private async Task<bool> Del(List<XlViewModel> list)
|
|
|
{
|
|
|
|
|
|
try
|
|
|
@@ -147,7 +147,7 @@ namespace DW5S.App.UserControl
|
|
|
this.Enabled = false;
|
|
|
var unitOfWork = IocContainer.UnitOfWork;
|
|
|
var repsXl = unitOfWork.Of<XlInfo>();
|
|
|
- await repsXl.DeleteAsync(list);
|
|
|
+ await repsXl.DeleteAsync(list.To<List<XlInfo>>());
|
|
|
await unitOfWork.SaveAsync();
|
|
|
ctrlPage1.RefreshData();
|
|
|
return true;
|
|
|
@@ -164,14 +164,14 @@ namespace DW5S.App.UserControl
|
|
|
this.Enabled = true;
|
|
|
}
|
|
|
}
|
|
|
- private async Task<bool> Clear(List<XlInfo> list)
|
|
|
+ private async Task<bool> Clear(List<XlViewModel> list)
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
this.Enabled = false;
|
|
|
var unitOfWork = IocContainer.UnitOfWork;
|
|
|
var repsXl = unitOfWork.Of<XlInfo>();
|
|
|
- await repsXl.DeleteAsync(list);
|
|
|
+ await repsXl.DeleteAsync(list.To<List<XlInfo>>());
|
|
|
await unitOfWork.SaveAsync();
|
|
|
ctrlPage1.RefreshData();
|
|
|
return true;
|
zoule