Skip to content

Commit bccf4ec

Browse files
authored
Merge pull request #229 from dotnetcore/develop
release: release v2.4.5
2 parents 3fbf020 + 13be0d9 commit bccf4ec

File tree

90 files changed

+1130
-625
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1130
-625
lines changed

CHANGELOG.md

+23
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,31 @@
44

55
3.0版本正式发布,支持.netcore 3.0,与2.4.x最新版本在功能上同步更新
66

7+
3.0.5版本升级为支持.netcore 3.1
8+
79
## v2.4.x
810

11+
v2.4.5 (2020-1-4)
12+
本次为累积更新,修复了一个月以来issue上提出的主要bug
13+
* **修改:** 修复了获取PersistPoco的下拉选项时,没有过滤IsVaild=false的问题
14+
* **修改:** 修复了弹出窗口在手机上显示不全的问题
15+
* **修改:** 修复了UEditor单图上传错误的问题
16+
* **修改:** 修复当搜索条件只有一个时,在搜索框中按回车键会出现异常页面的问题
17+
* **修改:** 修复了Transfer 穿梭框显示问题的问题
18+
* **修改:** 修复了在form表达外使用ImageTagHelper 会获得一个异常的问题
19+
* **修改:** 修复了textbox加了padding-text之后tab无法切换的问题
20+
* **修改:** 修复了selector display="true"时,显示错误的问题
21+
* **修改:** 修复了使用一些第三方控件导致view无法显示的问题
22+
* **修改:** 修复了代码生成器中点击关闭按钮报错的问题
23+
* **修改:** 修复了连续三级空菜单没有隐藏的问题
24+
* **修改:** React模式系统自带管理模块加入了中英文多语言
25+
26+
* **新增:** upload控件增加了进度条,通过设置ShowProgress可以选择是否显示(鸣谢 ‘阿拉斯没有家’同学 https://github.com/buffonlwx)
27+
* **新增:** ListVM中的GridAction中增加了下载类型的按钮
28+
* **新增:** BaseController中的CreateDC方法现在可以使用连接字符串的key,而不需要写死整个连接字符串
29+
* **新增:** BaseController中的CreateDC方法现在可以指定数据库类型
30+
* **新增:** 菜单维护时外部菜单可以使用/aaa/bbb的形式来指定一个内部地址,这样方便大家把一个具体方法配置到左侧菜单上
31+
932
### v2.4.3 / v3.0.4 (2019-12-8)
1033

1134
* **新增:** 增加多附件上传控件,特别鸣谢‘草监牛寺’同学,参见文档 https://wtmdoc.walkingtec.cn/#/UI/UploadMulti

demo/WalkingTec.Mvvm.Demo/Controllers/HomeController.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ public class HomeController : BaseController
2222
public IActionResult Index()
2323
{
2424
ViewData["title"] = "WTM";
25-
var vm = CreateVM<IndexVM>();
26-
vm.AllMenu = FFMenus;
27-
return View(vm);
25+
return View();
2826
}
2927

3028
[AllowAnonymous]

demo/WalkingTec.Mvvm.Demo/Controllers/SchoolController.cs

+5
Original file line numberDiff line numberDiff line change
@@ -324,5 +324,10 @@ public IActionResult ExportExcel(SchoolListVM vm)
324324
return File(data, "application/vnd.ms-excel", $"Export_ActionLog_{DateTime.Now.ToString("yyyy-MM-dd")}.xls");
325325
}
326326

327+
[HttpPost]
328+
public IActionResult Download(long id,long[] ids)
329+
{
330+
return File(new byte[0], "application/vnd.ms-excel", $"Export_ActionLog_{DateTime.Now.ToString("yyyy-MM-dd")}.xls");
331+
}
327332
}
328333
}

demo/WalkingTec.Mvvm.Demo/Program.cs

+8
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,12 @@ public static string CSSelector(ActionExecutingContext context)
102102
}
103103
}
104104
}
105+
106+
public static class ConfigInfoExtension
107+
{
108+
public static string Key1(this Configs self)
109+
{
110+
return self.AppSettings["Key1"];
111+
}
112+
}
105113
}

demo/WalkingTec.Mvvm.Demo/ViewModels/HomeVMs/IndexVM.cs

-94
This file was deleted.

demo/WalkingTec.Mvvm.Demo/ViewModels/SchoolVMs/SchoolListVM.cs

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ protected override List<GridAction> InitGridAction()
2323
this.MakeAction("School","Edit2","主子表修改","主子表修改", GridActionParameterTypesEnum.SingleId,dialogWidth:800),
2424
this.MakeStandardAction("School", GridActionStandardTypesEnum.Import, "导入","", dialogWidth: 800),
2525
this.MakeStandardAction("School", GridActionStandardTypesEnum.ExportExcel, "导出",""),
26+
this.MakeAction("School","Download","下载",null, GridActionParameterTypesEnum.SingleId).SetOnClickScript("download"),
2627
this.MakeActionsGroup("批量处理",new List<GridAction>(){
2728
this.MakeStandardAction("School", GridActionStandardTypesEnum.BatchEdit, "批量修改","", dialogWidth: 800),
2829
this.MakeStandardAction("School", GridActionStandardTypesEnum.BatchDelete, "批量删除","", dialogWidth: 800),

demo/WalkingTec.Mvvm.Demo/Views/School/Index.cshtml

+6
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@
99
</wt:searchpanel>
1010

1111
<wt:grid vm="@Model" url="/School/Search"/>
12+
13+
<script>
14+
function download(ids, datas) {
15+
debugger;
16+
}
17+
</script>

demo/WalkingTec.Mvvm.Demo/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77
],
88
"DBType": "sqlserver", //使用的数据库,可选mysql,sqlserver,pgsql
9-
"IsOldSqlServer": true, //如果使用sql server2008或者更老的,请设置为true
9+
"IsOldSqlServer": false, //如果使用sql server2008或者更老的,请设置为true
1010
"CookiePre": "WTM", //cookie前缀
1111
"EnableLog": true, //是否启用日志
1212
"LogExceptionOnly": false, //当启用日志的时候,是否只记录错误信息

0 commit comments

Comments
 (0)