diff --git a/demo/WalkingTec.Mvvm.ApiDemo/ApiTestController.cs b/demo/WalkingTec.Mvvm.ApiDemo/ApiTestController.cs index bc3e3a16a..752550caa 100644 --- a/demo/WalkingTec.Mvvm.ApiDemo/ApiTestController.cs +++ b/demo/WalkingTec.Mvvm.ApiDemo/ApiTestController.cs @@ -128,5 +128,32 @@ public IActionResult ExportExcelByIds(Guid[] ids) return File(data, "application/vnd.ms-excel", $"Export_FrameworkUser_{DateTime.Now.ToString("yyyy-MM-dd")}.xls"); } + [HttpGet("GetExcelTemplate")] + public IActionResult GetExcelTemplate() + { + var importVM = CreateVM(); + var qs = new Dictionary(); + foreach (var item in Request.Query.Keys) + { + qs.Add(item, Request.Query[item]); + } + importVM.SetParms(qs); + var data = importVM.GenerateTemplate(out string fileName); + return File(data, "application/vnd.ms-excel", fileName); + } + + //[HttpPost("Import")] + //[ActionDescription("导入")] + //public ActionResult Import(SchoolImportVM vm, IFormCollection nouse) + //{ + // if (vm.ErrorListVM.EntityList.Count > 0 || !vm.BatchSaveData()) + // { + // return PartialView(vm); + // } + // else + // { + // return FFResult().RefreshGrid().CloseDialog().Alert("成功导入 " + vm.EntityList.Count.ToString() + " 行数据"); + // } + //} } } diff --git a/demo/WalkingTec.Mvvm.Demo/appsettings.json b/demo/WalkingTec.Mvvm.Demo/appsettings.json index f0a801097..c90d59e21 100644 --- a/demo/WalkingTec.Mvvm.Demo/appsettings.json +++ b/demo/WalkingTec.Mvvm.Demo/appsettings.json @@ -16,8 +16,8 @@ "PageMode": "Single", //页面显示模式,Single或者Tab "FileUploadOptions": { "UploadLimit": 20971520, - "SaveFileMode": "local", //上传文件的保存方式,可选Database,local,dfs - "UploadDir": "D://" //当上传文件选择Local时,指定硬盘目录 + "SaveFileMode": "Database", //上传文件的保存方式,可选Database,local,dfs + "UploadDir": "D:\\" //当上传文件选择Local时,指定硬盘目录 }, "DFSServer": { "StorageMaxConnection": 100, diff --git a/src/WalkingTec.Mvvm.Core/Utils.cs b/src/WalkingTec.Mvvm.Core/Utils.cs index 76d9ecc7d..35748a256 100644 --- a/src/WalkingTec.Mvvm.Core/Utils.cs +++ b/src/WalkingTec.Mvvm.Core/Utils.cs @@ -520,7 +520,7 @@ public static string GetUrlByFileAttachmentId(IDataContext dc, Guid? fileAttachm var fileAttachment = dc.Set().Where(x => x.ID == fileAttachmentId.Value).FirstOrDefault(); if (fileAttachment != null) { - url = "/_Framework/OutputAttachment/" + fileAttachmentId.ToString(); + url = "/_Framework/GetFile/" + fileAttachmentId.ToString(); } return url; diff --git a/src/WalkingTec.Mvvm.Mvc/_FrameworkController.cs b/src/WalkingTec.Mvvm.Mvc/_FrameworkController.cs index aa24f13f0..6725210d1 100644 --- a/src/WalkingTec.Mvvm.Mvc/_FrameworkController.cs +++ b/src/WalkingTec.Mvvm.Mvc/_FrameworkController.cs @@ -133,7 +133,7 @@ public IActionResult GetPagingData(string _DONOT_USE_VMNAME,string _DONOT_USE_CS //var vmType = Type.GetType(_DONOT_USE_VMNAME); //var vmCreater = vmType.GetConstructor(Type.EmptyTypes); //var listVM = vmCreater.Invoke(null) as BaseVM; - CurrentCS = _DONOT_USE_CS; + CurrentCS = _DONOT_USE_CS ?? "default"; var listVM = CreateVM(_DONOT_USE_VMNAME, null, null, true) as IBasePagedListVM; listVM.FC = qs; if (listVM is IBasePagedListVM) @@ -200,7 +200,7 @@ public IActionResult GetExportExcel(string _DONOT_USE_VMNAME, string _DONOT_USE_ } var instanceType = Type.GetType(_DONOT_USE_VMNAME); - CurrentCS = _DONOT_USE_CS; + CurrentCS = _DONOT_USE_CS ?? "default"; var listVM = CreateVM(_DONOT_USE_VMNAME) as IBasePagedListVM; listVM.FC = qs; @@ -229,7 +229,7 @@ public IActionResult GetExportExcel(string _DONOT_USE_VMNAME, string _DONOT_USE_ [ActionDescription("获取模板")] public IActionResult GetExcelTemplate(string _DONOT_USE_VMNAME, string _DONOT_USE_CS = "default") { - CurrentCS = _DONOT_USE_CS; + CurrentCS = _DONOT_USE_CS ?? "default"; var importVM = CreateVM(_DONOT_USE_VMNAME) as IBaseImport; var qs = new Dictionary(); foreach (var item in Request.Query.Keys) @@ -296,7 +296,7 @@ public IActionResult Error() [ActionDescription("UploadFileRoute")] public IActionResult Upload(SaveFileModeEnum? sm = null, string groupName = null, bool IsTemprory = true, string _DONOT_USE_CS="default") { - CurrentCS = _DONOT_USE_CS; + CurrentCS = _DONOT_USE_CS ?? "default"; var FileData = Request.Form.Files[0]; sm = sm == null ? ConfigInfo.FileUploadOptions.SaveFileMode : sm; var vm = CreateVM(); @@ -318,7 +318,7 @@ public IActionResult Upload(SaveFileModeEnum? sm = null, string groupName = null [ActionDescription("UploadForLayUIRichTextBox")] public IActionResult UploadForLayUIRichTextBox(string _DONOT_USE_CS = "default") { - CurrentCS = _DONOT_USE_CS; + CurrentCS = _DONOT_USE_CS ?? "default"; var FileData = Request.Form.Files[0]; var sm = ConfigInfo.FileUploadOptions.SaveFileMode; var vm = CreateVM(); @@ -340,7 +340,7 @@ public IActionResult UploadForLayUIRichTextBox(string _DONOT_USE_CS = "default") [ActionDescription("获取文件名")] public IActionResult GetFileName(Guid id, string _DONOT_USE_CS = "default") { - CurrentCS = _DONOT_USE_CS; + CurrentCS = _DONOT_USE_CS ?? "default"; FileAttachmentVM vm = CreateVM(id); return Ok(vm.Entity.FileName); } @@ -348,7 +348,7 @@ public IActionResult GetFileName(Guid id, string _DONOT_USE_CS = "default") [ActionDescription("获取文件")] public IActionResult GetFile(Guid id, bool stream = false, string _DONOT_USE_CS = "default") { - CurrentCS = _DONOT_USE_CS; + CurrentCS = _DONOT_USE_CS ?? "default"; if (id == Guid.Empty) { return new StatusCodeResult(StatusCodes.Status404NotFound); @@ -383,7 +383,7 @@ public IActionResult GetFile(Guid id, bool stream = false, string _DONOT_USE_CS [ActionDescription("查看文件")] public IActionResult ViewFile(Guid id, string _DONOT_USE_CS = "default") { - CurrentCS = _DONOT_USE_CS; + CurrentCS = _DONOT_USE_CS ?? "default"; string html = string.Empty; FileAttachmentVM vm = CreateVM(id); if (vm.Entity.FileExt.ToLower() == "pdf")