Skip to content

Commit

Permalink
Merge branch 'feature/vNext' of https://github.com/dotnetcore/WTM int…
Browse files Browse the repository at this point in the history
…o feature/vNext
  • Loading branch information
liuliang-wt committed Aug 24, 2021
2 parents f7fe871 + e72defc commit a1f95d2
Show file tree
Hide file tree
Showing 744 changed files with 12,781 additions and 2,923 deletions.
14 changes: 7 additions & 7 deletions WalkingTec.Mvvm.sln
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalkingTec.Mvvm.ConsoleDemo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalkingTec.Mvvm.Demo.Test", "demo\WalkingTec.Mvvm.Demo.Test\WalkingTec.Mvvm.Demo.Test.csproj", "{D1363106-3DAB-4273-8750-05A96F9EFA9B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalkingTec.Mvvm.Vue3Demo", "demo\WalkingTec.Mvvm.Vue3Demo\WalkingTec.Mvvm.Vue3Demo\WalkingTec.Mvvm.Vue3Demo.csproj", "{46309A77-6127-4ED9-95BE-C830B3E6FD0E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalkingTec.Mvvm.BlazorDemo.Model", "demo\WalkingTec.Mvvm.BlazorDemo\WalkingTec.Mvvm.BlazorDemo.Model\WalkingTec.Mvvm.BlazorDemo.Model.csproj", "{341561A3-B563-4DFC-9EC5-702F85AAC174}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalkingTec.Mvvm.BlazorDemo.DataAccess", "demo\WalkingTec.Mvvm.BlazorDemo\WalkingTec.Mvvm.BlazorDemo.DataAccess\WalkingTec.Mvvm.BlazorDemo.DataAccess.csproj", "{94352C3E-899A-44A2-A052-578DC6A7159F}"
Expand All @@ -63,6 +61,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalkingTec.Mvvm.BlazorDemo.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalkingTec.Mvvm.BlazorDemo.Test", "demo\WalkingTec.Mvvm.BlazorDemo\WalkingTec.Mvvm.BlazorDemo.Test\WalkingTec.Mvvm.BlazorDemo.Test.csproj", "{22C2CB15-1537-47D2-86BF-A7FFEE3A0677}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalkingTec.Mvvm.Vue3Demo", "demo\WalkingTec.Mvvm.Vue3Demo\WalkingTec.Mvvm.Vue3Demo.csproj", "{411690A4-0021-4509-BF24-900437B5DC6E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -125,10 +125,6 @@ Global
{D1363106-3DAB-4273-8750-05A96F9EFA9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1363106-3DAB-4273-8750-05A96F9EFA9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1363106-3DAB-4273-8750-05A96F9EFA9B}.Release|Any CPU.Build.0 = Release|Any CPU
{46309A77-6127-4ED9-95BE-C830B3E6FD0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46309A77-6127-4ED9-95BE-C830B3E6FD0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46309A77-6127-4ED9-95BE-C830B3E6FD0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46309A77-6127-4ED9-95BE-C830B3E6FD0E}.Release|Any CPU.Build.0 = Release|Any CPU
{341561A3-B563-4DFC-9EC5-702F85AAC174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{341561A3-B563-4DFC-9EC5-702F85AAC174}.Debug|Any CPU.Build.0 = Debug|Any CPU
{341561A3-B563-4DFC-9EC5-702F85AAC174}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -145,6 +141,10 @@ Global
{22C2CB15-1537-47D2-86BF-A7FFEE3A0677}.Debug|Any CPU.Build.0 = Debug|Any CPU
{22C2CB15-1537-47D2-86BF-A7FFEE3A0677}.Release|Any CPU.ActiveCfg = Release|Any CPU
{22C2CB15-1537-47D2-86BF-A7FFEE3A0677}.Release|Any CPU.Build.0 = Release|Any CPU
{411690A4-0021-4509-BF24-900437B5DC6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{411690A4-0021-4509-BF24-900437B5DC6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{411690A4-0021-4509-BF24-900437B5DC6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{411690A4-0021-4509-BF24-900437B5DC6E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -165,11 +165,11 @@ Global
{D6C584E4-7330-4CD8-9ACC-CFFDC9DEEDD3} = {840C6DED-B5D5-4763-A6A7-6F615B72EC10}
{DFA81262-7D8B-4568-AB90-AED7922F45CA} = {DE184A47-CF5F-41C0-AB7D-CAD0AF2DAE75}
{D1363106-3DAB-4273-8750-05A96F9EFA9B} = {DE184A47-CF5F-41C0-AB7D-CAD0AF2DAE75}
{46309A77-6127-4ED9-95BE-C830B3E6FD0E} = {DE184A47-CF5F-41C0-AB7D-CAD0AF2DAE75}
{341561A3-B563-4DFC-9EC5-702F85AAC174} = {840C6DED-B5D5-4763-A6A7-6F615B72EC10}
{94352C3E-899A-44A2-A052-578DC6A7159F} = {840C6DED-B5D5-4763-A6A7-6F615B72EC10}
{D4104589-85BE-446A-A123-1E0FD1538A7B} = {840C6DED-B5D5-4763-A6A7-6F615B72EC10}
{22C2CB15-1537-47D2-86BF-A7FFEE3A0677} = {840C6DED-B5D5-4763-A6A7-6F615B72EC10}
{411690A4-0021-4509-BF24-900437B5DC6E} = {DE184A47-CF5F-41C0-AB7D-CAD0AF2DAE75}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8D25EAAD-E43A-466A-95DA-ECE1F3C462DC}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using WalkingTec.Mvvm.Mvc;
using WalkingTec.Mvvm.ReactDemo.ViewModels.CityVMs;
using WalkingTec.Mvvm.ReactDemo.Models;

namespace WalkingTec.Mvvm.ReactDemo.Controllers
{

[AuthorizeJwtWithCookie]
[ActionDescription("城市管理")]
[ApiController]
[Route("api/City")]
public partial class CityController : BaseApiController
{
[ActionDescription("Sys.Search")]
[HttpPost("Search")]
public IActionResult Search(CitySearcher searcher)
{
if (ModelState.IsValid)
{
var vm = Wtm.CreateVM<CityListVM>();
vm.Searcher = searcher;
return Content(vm.GetJson());
}
else
{
return BadRequest(ModelState.GetErrorJson());
}
}

[ActionDescription("Sys.Get")]
[HttpGet("{id}")]
public CityVM Get(string id)
{
var vm = Wtm.CreateVM<CityVM>(id);
return vm;
}

[ActionDescription("Sys.Create")]
[HttpPost("Add")]
public IActionResult Add(CityVM vm)
{
if (!ModelState.IsValid)
{
return BadRequest(ModelState.GetErrorJson());
}
else
{
vm.DoAdd();
if (!ModelState.IsValid)
{
return BadRequest(ModelState.GetErrorJson());
}
else
{
return Ok(vm.Entity);
}
}

}

[ActionDescription("Sys.Edit")]
[HttpPut("Edit")]
public IActionResult Edit(CityVM vm)
{
if (!ModelState.IsValid)
{
return BadRequest(ModelState.GetErrorJson());
}
else
{
vm.DoEdit(false);
if (!ModelState.IsValid)
{
return BadRequest(ModelState.GetErrorJson());
}
else
{
return Ok(vm.Entity);
}
}
}

[HttpPost("BatchDelete")]
[ActionDescription("Sys.Delete")]
public IActionResult BatchDelete(string[] ids)
{
var vm = Wtm.CreateVM<CityBatchVM>();
if (ids != null && ids.Count() > 0)
{
vm.Ids = ids;
}
else
{
return Ok();
}
if (!ModelState.IsValid || !vm.DoBatchDelete())
{
return BadRequest(ModelState.GetErrorJson());
}
else
{
return Ok(ids.Count());
}
}


[ActionDescription("Sys.Export")]
[HttpPost("ExportExcel")]
public IActionResult ExportExcel(CitySearcher searcher)
{
var vm = Wtm.CreateVM<CityListVM>();
vm.Searcher = searcher;
vm.SearcherMode = ListVMSearchModeEnum.Export;
return vm.GetExportData();
}

[ActionDescription("Sys.CheckExport")]
[HttpPost("ExportExcelByIds")]
public IActionResult ExportExcelByIds(string[] ids)
{
var vm = Wtm.CreateVM<CityListVM>();
if (ids != null && ids.Count() > 0)
{
vm.Ids = new List<string>(ids);
vm.SearcherMode = ListVMSearchModeEnum.CheckExport;
}
return vm.GetExportData();
}

[ActionDescription("Sys.DownloadTemplate")]
[HttpGet("GetExcelTemplate")]
public IActionResult GetExcelTemplate()
{
var vm = Wtm.CreateVM<CityImportVM>();
var qs = new Dictionary<string, string>();
foreach (var item in Request.Query.Keys)
{
qs.Add(item, Request.Query[item]);
}
vm.SetParms(qs);
var data = vm.GenerateTemplate(out string fileName);
return File(data, "application/vnd.ms-excel", fileName);
}

[ActionDescription("Sys.Import")]
[HttpPost("Import")]
public ActionResult Import(CityImportVM vm)
{

if (vm.ErrorListVM.EntityList.Count > 0 || !vm.BatchSaveData())
{
return BadRequest(vm.GetErrorJson());
}
else
{
return Ok(vm.EntityList.Count);
}
}


[HttpGet("GetCitys")]
public ActionResult GetCitys()
{
return Ok(DC.Set<City>().GetSelectListItems(Wtm, x => x.Name));
}

[HttpGet("GetCitysTree")]
public ActionResult GetCitysTree()
{
return Ok(DC.Set<City>().GetTreeSelectListItems(Wtm, x => x.Name));
}

}
}
Loading

0 comments on commit a1f95d2

Please sign in to comment.