diff --git a/OpenAuth.Domain/Interface/IRepository.cs b/OpenAuth.Domain/Interface/IRepository.cs
index 33f58a07..b4dd76fd 100644
--- a/OpenAuth.Domain/Interface/IRepository.cs
+++ b/OpenAuth.Domain/Interface/IRepository.cs
@@ -41,7 +41,7 @@ namespace OpenAuth.Domain.Interface
///
/// 批量更新
///
- void Update(Expression> exp, T entity);
+ void Update(Expression> exp, T entity);
///
/// 批量删除
diff --git a/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml b/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml
index d9a5f513..5119bd5f 100644
--- a/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml
@@ -87,7 +87,7 @@
paging: true,
filterMult: false,
showTfoot: false,
- height: '700'
+ height: '100%'
});
}
diff --git a/OpenAuth.Mvc/Views/ModuleElementManager/Index.cshtml b/OpenAuth.Mvc/Views/ModuleElementManager/Index.cshtml
index c61300c3..67722d06 100644
--- a/OpenAuth.Mvc/Views/ModuleElementManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleElementManager/Index.cshtml
@@ -1,5 +1,5 @@
@{
- Layout = "~/Views/Shared/_BjuiLayout.cshtml";
+ Layout = null;
}
@model IEnumerable
diff --git a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
index 491d5405..b744afdd 100644
--- a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
@@ -92,7 +92,7 @@
paging: true,
filterMult: false,
showTfoot: false,
- height: '700'
+ height: '100%'
});
}
diff --git a/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml b/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml
index 8bfedd83..b272fc02 100644
--- a/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml
@@ -98,7 +98,7 @@
paging: true,
filterMult: false,
showTfoot: false,
- height: '700'
+ height: '100%'
});
}
diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
index 976012af..15caaee0 100644
--- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
@@ -85,7 +85,7 @@
paging: true,
filterMult: false,
showTfoot: false,
- height: '700'
+ height: '100%'
});
}
diff --git a/OpenAuth.Mvc/Views/StockManager/Index.cshtml b/OpenAuth.Mvc/Views/StockManager/Index.cshtml
index cd3c342d..d27d4d68 100644
--- a/OpenAuth.Mvc/Views/StockManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/StockManager/Index.cshtml
@@ -86,7 +86,7 @@
paging: true,
filterMult: false,
showTfoot: false,
- height: '700'
+ height: '100%'
});
}
diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
index 3116df02..e3fda919 100644
--- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
@@ -87,7 +87,7 @@
paging: true,
filterMult: false,
showTfoot: false,
- height: '700'
+ height: '100%' //TODO:这种高度如果记录数较少的时候,看起有点怪,这个可以根据自己爱好修改
});
}
diff --git a/OpenAuth.Repository/BaseRepository.cs b/OpenAuth.Repository/BaseRepository.cs
index 62b6fe03..efa65def 100644
--- a/OpenAuth.Repository/BaseRepository.cs
+++ b/OpenAuth.Repository/BaseRepository.cs
@@ -75,10 +75,12 @@ namespace OpenAuth.Repository
Save();
}
- public void Update(Expression> exp, T entity)
+ public void Update(Expression> identityExp, T entity)
{
//TODO: 暂时有问题,EntityFramework.Extension的Update必须有new操作
- Context.Set().Where(exp).Update(u => entity);
+ // Context.Set().Where(exp).Update(u => entity);
+ Context.Set().AddOrUpdate(identityExp, entity);
+ Save();
}
public void Delete(Expression> exp)
diff --git a/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj b/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj
index 6475e417..f2523834 100644
--- a/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj
+++ b/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj
@@ -76,7 +76,9 @@
-
+
+ Designer
+
@@ -117,7 +119,6 @@
-