- 优化 GlobalFilter Apply 自动重命名表达式参数名,避免内容重复问题;

- 修复 表达式解析 Guid.NewGuid() 的错误;
This commit is contained in:
28810
2019-12-05 20:10:39 +08:00
parent e01f7a2061
commit 05cf13f560
14 changed files with 90 additions and 109 deletions

View File

@ -464,54 +464,5 @@
部门对象
</summary>
</member>
<member name="F:Business.OtherOrder.joinYear">
<summary>
入学年份
</summary>
</member>
<member name="F:Business.OtherOrder.period">
<summary>
学段
</summary>
</member>
<member name="F:Business.OtherOrder.count">
<summary>
人数
</summary>
</member>
<!-- Badly formed XML comment ignored for member "T:Business.OtherOrder.orderTypeEmun" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.orderTypeEmun.错题本" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.orderTypeEmun.学情套餐" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.orderTypeEmun.耗材" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.orderTypeEmun.其他" -->
<!-- Badly formed XML comment ignored for member "T:Business.OtherOrder.isInvoiceEmun" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.isInvoiceEmun.否" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.isInvoiceEmun.是" -->
<!-- Badly formed XML comment ignored for member "T:Business.OtherOrder.staEmun" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.staEmun.新建" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.staEmun.待内勤审核" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.staEmun.待财务审核" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.staEmun.审核不通过" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.staEmun.审核通过" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.staEmun.已撤回" -->
<!-- Badly formed XML comment ignored for member "F:Business.OtherOrder.staEmun.已作废" -->
<member name="F:Business.OtherOrder.dataEnum.待标注">
<summary>
待标注
</summary>
</member>
<member name="F:Business.OtherOrder.dataEnum.合格">
<summary>
合格
</summary>
</member>
<member name="F:Business.OtherOrder.dataEnum.不合格">
<summary>
不合格
</summary>
</member>
<!-- Badly formed XML comment ignored for member "M:Business.OtherOrder.orderTypeNameMap(Business.OtherOrder.orderTypeEmun)" -->
<!-- Badly formed XML comment ignored for member "M:Business.OtherOrder.isInvoiceNameMap(Business.OtherOrder.isInvoiceEmun)" -->
<!-- Badly formed XML comment ignored for member "M:Business.OtherOrder.staNameMap(Business.OtherOrder.staEmun)" -->
</members>
</doc>

View File

@ -200,9 +200,33 @@ namespace FreeSql.Tests
public string Name { get; set; }
}
public class gf_t1
{
public Guid id { get; set; }
public int rowstate { get; set; }
}
public class gf_t2
{
public Guid id { get; set; }
public decimal rowstate { get; set; }
}
public class gf_t3
{
public Guid id { get; set; }
public decimal rowstate { get; set; }
}
[Fact]
public void Test02()
{
g.mysql.GlobalFilter.Apply<gf_t1>("gft1", a => a.rowstate > -1)
.Apply<gf_t2>("gft2", a => a.rowstate > -2)
.Apply<gf_t3>("gft3", a => a.rowstate > -3);
var gft1 = g.mysql.Select<gf_t1>().Where(a => a.id == Guid.NewGuid()).ToList();
var gft2 = g.mysql.Select<gf_t2>().Where(a => a.id == Guid.NewGuid()).ToList();
var gft3 = g.mysql.Select<gf_t3>().Where(a => a.id == Guid.NewGuid()).ToList();
var tekset = g.sqlite.Select<employee>().IncludeMany(a => a.departments).ToList();
g.sqlserver.Delete<TBatInst>().Where("1=1").ExecuteAffrows();