Skip to content

Commit d472c57

Browse files
alienwowalienwow
authored
Merge pull request #104 from dotnetcore/develop
release v2.3.9
2 parents a1bafad + ed6c5d4 commit d472c57

1,626 files changed

Lines changed: 7528 additions & 1888 deletions

File tree

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
## v2.3.x
44

5+
### v2.3.9 (2019-10-19)
6+
7+
* **新增：** 多语言支持。https://wtmdoc.walkingtec.cn/#/Global/MultiLanguages
8+
老版本升级后会遇到单元测试项目中MockController.cs文件报错，将报错的行替换为
9+
_controller.GlobaInfo.SetModuleGetFunc(() => new List<FrameworkModule>());
10+
即可。
11+
12+
* **新增：** dotnet 3.0支持，线上新建项目时可选择dotnetcore3.0版本的项目
13+
14+
#### 前后端不分离模式
15+
* **新增：** 集成了UEditor。https://wtmdoc.walkingtec.cn/#/UI/UEditor
16+
* **新增：** 列表按钮现在可以设置Max属性，来控制打开窗体时最大化
17+
* **修改：** 现在View页面不再强制要求Model必须继承BaseVM
18+
* **修改：** 修改菜单无法删除的历史遗留bug
19+
520
### v2.3.6 (2019-9-27)
621

722
* **新增：** Debug模式下，debug窗口会输出ef执行的sql语句

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ WTM框架的前后端分离模式同样可以使用代码生成器同时生成
7474

7575
如果WTM帮助到了你，欢迎赞助点让我们持续建造更好的轮子：
7676

77-
<img src="https://mmbiz.qpic.cn/mmbiz_jpg/L66Un3Tp12ria8hmdkjlfYQdOjA9dusW5A834WX1RcXAPytEdtUgniaRnVoW9e2HPBGiaibXOru3MfvWylLunMeFBg/0?wx_fmt=jpeg" height="300" width="300">
77+
<img src="https://wtmdoc.walkingtec.cn/imgs/zanshang.jpg" >
7878

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ public ActionResult Create2(SchoolVM vm)
253253
}
254254
else
255255
{
256+
if(vm.Entity.Majors == null)
257+
{
258+
vm.Entity.Majors = new System.Collections.Generic.List<Major>();
259+
}
256260
vm.DoAdd();
257261
if (!ModelState.IsValid)
258262
{

‎demo/WalkingTec.Mvvm.Demo/Program.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.AspNetCore.Hosting;
66
using Microsoft.Extensions.Configuration;
77
using Microsoft.Extensions.DependencyInjection;
8+
using Microsoft.Extensions.Localization;
89
using Swashbuckle.AspNetCore.Swagger;
910
using WalkingTec.Mvvm.Core;
1011
using WalkingTec.Mvvm.Demo.Models;
@@ -16,7 +17,7 @@ namespace WalkingTec.Mvvm.Demo
1617
public class Program
1718
{
1819
public static void Main(string[] args)
19-
{
20+
{
2021
CreateWebHostBuilder(args).Build().Run();
2122
}
2223

‎demo/WalkingTec.Mvvm.Demo/Resources/Program.en.resx‎

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="Account" xml:space="preserve">
121+
<value>Account</value>
122+
</data>
123+
<data name="ApiDoc" xml:space="preserve">
124+
<value>Api Doc</value>
125+
</data>
126+
<data name="BackHome" xml:space="preserve">
127+
<value>Home</value>
128+
</data>
129+
<data name="ChangePassword" xml:space="preserve">
130+
<value>Change my password</value>
131+
</data>
132+
<data name="CloseAllTags" xml:space="preserve">
133+
<value>Close all tags</value>
134+
</data>
135+
<data name="CloseOtherTags" xml:space="preserve">
136+
<value>Close other tags</value>
137+
</data>
138+
<data name="CloseThisTag" xml:space="preserve">
139+
<value>Close this tag</value>
140+
</data>
141+
<data name="CodeGen" xml:space="preserve">
142+
<value>CodeGen</value>
143+
</data>
144+
<data name="HideShow" xml:space="preserve">
145+
<value>Hide/Show</value>
146+
</data>
147+
<data name="LogOut" xml:space="preserve">
148+
<value>LogOut</value>
149+
</data>
150+
<data name="NewPassword" xml:space="preserve">
151+
<value>New</value>
152+
</data>
153+
<data name="NewPasswordComfirm" xml:space="preserve">
154+
<value>New again</value>
155+
</data>
156+
<data name="OldPassword" xml:space="preserve">
157+
<value>Current</value>
158+
</data>
159+
<data name="OldPasswrodWrong" xml:space="preserve">
160+
<value>Current password is wrong</value>
161+
</data>
162+
<data name="PasswordNotSame" xml:space="preserve">
163+
<value>Inconsistent password</value>
164+
</data>
165+
<data name="Refresh" xml:space="preserve">
166+
<value>Refresh</value>
167+
</data>
168+
<data name="WtmDoc" xml:space="preserve">
169+
<value>WTM Doc</value>
170+
</data>
171+
<data name="{0}formaterror" xml:space="preserve">
172+
<value>The {0} field has an error format</value>
173+
</data>
174+
<data name="{0}number" xml:space="preserve">
175+
<value>The {0} field must be digit</value>
176+
</data>
177+
<data name="{0}required" xml:space="preserve">
178+
<value>The {0} field is required</value>
179+
</data>
180+
<data name="{0}stringmax{1}" xml:space="preserve">
181+
<value>The {0} field is limited {1} characters</value>
182+
</data>
183+
</root>

0 commit comments

Comments
 (0)