采用ACE界面

OpenAuth.Mvc/Controllers/BaseController.cs

@@ -12,12 +12,15 @@
 
 using OpenAuth.Mvc.Models;
 using System;
+using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
 using System.Reflection;
 using System.Web;
 using System.Web.Mvc;
+using Infrastructure;
 using OpenAuth.App.SSO;
+using OpenAuth.App.ViewModel;
 
 namespace OpenAuth.Mvc.Controllers
 {
@@ -28,7 +31,8 @@ namespace OpenAuth.Mvc.Controllers
     /// </summary>
     public class BaseController : SSOController
     {
-        protected BjuiResponse BjuiResponse = new BjuiResponse();
+        protected Response Result = new Response();
+        protected ModuleView CurrentModule;
 
         protected override void OnActionExecuting(ActionExecutingContext filterContext)
         {
@@ -44,17 +48,13 @@ namespace OpenAuth.Mvc.Controllers
                 throw new Exception("未能找到Action");
 
             var authorize = function.GetCustomAttribute(typeof(AuthenticateAttribute));
-            var module = AuthUtil.GetCurrentUser().Modules.FirstOrDefault(u => u.Url.ToLower().Contains(controllername));
+            CurrentModule = AuthUtil.GetCurrentUser().Modules.FirstOrDefault(u => u.Url.ToLower().Contains(controllername));
             //当前登录用户没有Action记录&&Action有authenticate标识
-            if (authorize != null && module == null)
+            if (authorize != null && CurrentModule == null)
             {
                 filterContext.Result = new RedirectResult("/Login/Index");
                 return;
             }
-            else
-            {
-                ViewBag.Module = module;  //为View显示服务，主要是为了显示按钮
-            }
 
             var version = ConfigurationManager.AppSettings["version"];
             if (version == "demo" && Request.HttpMethod == "POST")

OpenAuth.Mvc/Controllers/CategoryManagerController.cs

@@ -49,10 +49,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         public string Delete(Guid Id)
@@ -63,11 +63,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = e.Message;
+                 Result.Status = false;
+                Result.Message = e.Message;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         

OpenAuth.Mvc/Controllers/CommonAppliesController.cs

@@ -48,10 +48,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         public ActionResult Detail(Guid id)
@@ -81,12 +81,12 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
                 throw;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         /// <summary>
@@ -101,12 +101,12 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
                 throw;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
 

OpenAuth.Mvc/Controllers/ErrorController.cs

@@ -22,10 +22,10 @@ namespace OpenAuth.Mvc.Controllers
         public string DemoError()
         {
             Response.Charset = "utf-8";
-            var response = new BjuiResponse
+            var response = new Response
             {
-                statusCode = "400",
-                message = "演示版本，不能进行此操作"
+                Status = false,
+                Message = "演示版本，不能进行此操作"
             };
             return JsonHelper.Instance.Serialize(response);
         }
@@ -43,10 +43,10 @@ namespace OpenAuth.Mvc.Controllers
         public string Http500()
         {
             Response.Charset = "utf-8";
-            var response = new BjuiResponse
+            var response = new Response
             {
-                statusCode = "500",
-                message = "服务器内部错误，请联系管理员"
+                Status = false,
+                Message = "内部错误"
             };
             return JsonHelper.Instance.Serialize(response);
         }

OpenAuth.Mvc/Controllers/HomeController.cs

@@ -1,4 +1,7 @@
-using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.Mvc;
 using Infrastructure;
 using OpenAuth.App;
 using OpenAuth.App.SSO;
@@ -18,14 +21,54 @@ namespace OpenAuth.Mvc.Controllers
         
         public ActionResult Index()
         {
-            var user = AuthUtil.GetCurrentUser();
-            return View(user.Modules);
-        }
-        
-        public ActionResult Main()
-        {
+            ViewBag.NavBar = GetNavBar();
             return View();
         }
+
+        public string GetNavBar()
+        {
+            var user = AuthUtil.GetCurrentUser();
+            return BuilderNavBar(user.ModuleWithChildren);
+        }
+
+
+        public string BuilderNavBar(IEnumerable<TreeItem<ModuleView>> modules)
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach (var moduleView in modules)
+            {
+                if (moduleView.Children.Any())
+                {
+                    sb.Append("<li class=\"\">\r\n");
+                    sb.Append("<a href=\"#\" class=\"dropdown-toggle\">\r\n");
+                    sb.Append("<i class=\"menu-icon fa "+moduleView.Item.IconName+"\"></i>\r\n");
+                    sb.Append("<span class=\"menu-text\">\r\n");
+                    sb.Append(""+moduleView.Item.Name+"\r\n");
+                    sb.Append("</span>\r\n");
+                    sb.Append("\r\n");
+                    sb.Append("<b class=\"arrow fa fa-angle-down\"></b>\r\n");
+                    sb.Append("</a>\r\n");
+                    sb.Append("\r\n");
+                    sb.Append("<b class=\"arrow\"></b>\r\n");
+                    sb.Append("<ul class=\"submenu\">");
+                    sb.Append(BuilderNavBar(moduleView.Children));
+                    sb.Append("</ul>");
+                    sb.Append("</li>\r\n");
+                }
+                else
+                {
+                    sb.Append("<li class=\"\">\r\n");
+                    sb.Append("<a href=\""+moduleView.Item.Url+"\">\r\n");
+                    sb.Append("<i class=\"menu-icon fa "+moduleView.Item.IconName+"\"></i>\r\n");
+                    sb.Append("<span class=\"menu-text\"> "+moduleView.Item.Name+ " </span>\r\n");
+                    sb.Append("</a>\r\n");
+                    sb.Append("\r\n");
+                    sb.Append("<b class=\"arrow\"></b>\r\n");
+                    sb.Append("</li>\r\n");
+                }
+            }
+            return sb.ToString();
+        }
         
         public ActionResult Git()
         {
@@ -39,6 +82,23 @@ namespace OpenAuth.Mvc.Controllers
         [ChildActionOnly]
         public ActionResult MenuHeader()
         {
+            var sb = new StringBuilder();
+            foreach (var element in CurrentModule.Elements)
+            {
+                sb.Append("<button "
+                + " id='" + element.DomId + "' "
+                + " class='btn btn-sm " + element.Class + "' "
+                + " onclick='" + element.Script + "' " + element.Attr
+                + ">" + element.Name + "</button>");
+            }
+            ViewBag.Buttons = sb.ToString();
+            return View();
+        }
+
+        [ChildActionOnly]
+        public ActionResult Navbar()
+        {
+            ViewBag.NavBar = GetNavBar();
             return View();
         }
     }

OpenAuth.Mvc/Controllers/LoginController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Configuration;
 using System.Web.Mvc;
+using Infrastructure;
 using OpenAuth.App.SSO;
 using OpenAuth.Mvc.Models;
 
@@ -27,10 +28,10 @@ namespace OpenAuth.Mvc.Controllers
                     return Redirect("/home/index?Token=" + result.Token);
                 else
                 {
-                    var response = new BjuiResponse
+                    var response = new Response
                     {
-                        statusCode = "300",
-                        message = "登陆失败"
+                        Status = false,
+                        Message = "登陆失败"
                     };
                     return View(response);
                 }
@@ -38,10 +39,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                var response = new BjuiResponse
+                var response = new Response
                 {
-                    statusCode = "300",
-                    message = e.Message
+                    Status = false,
+                    Message = e.Message
                 };
                 return View(response);
             }

OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs

@@ -24,7 +24,6 @@ namespace OpenAuth.Mvc.Controllers
 {
     public class ModuleElementManagerController : BaseController
     {
-        private readonly BjuiResponse _bjuiResponse = new BjuiResponse();
         private ModuleElementManagerApp _app;
 
         public ModuleElementManagerController()
@@ -49,10 +48,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (DbEntityValidationException e)
             {
-                _bjuiResponse.statusCode = "300";
-                _bjuiResponse.message = e.Message;
+                
+                 Result.Status=false;
+                 Result.Message = e.Message;
             }
-            return JsonHelper.Instance.Serialize(_bjuiResponse);
+            return JsonHelper.Instance.Serialize( Result);
         }
         public string Del(string moduleElements)
         {
@@ -63,10 +63,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                _bjuiResponse.statusCode = "300";
-                _bjuiResponse.message = e.Message;
+                 Result.Status=false;
+                 Result.Message = e.Message;
             }
-            return JsonHelper.Instance.Serialize(_bjuiResponse);
+            return JsonHelper.Instance.Serialize( Result);
         }
 
         /// <summary>

OpenAuth.Mvc/Controllers/ModuleManagerController.cs

@@ -89,10 +89,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         public string Delete(string Id)
@@ -106,11 +106,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = e.Message;
+                 Result.Status = false;
+                Result.Message = e.Message;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
         #endregion
 

OpenAuth.Mvc/Controllers/OrgManagerController.cs

@@ -59,10 +59,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
         
         public string LoadChildren(Guid id)
@@ -83,11 +83,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = e.Message;
+                 Result.Status = false;
+                Result.Message = e.Message;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
     }
 }

OpenAuth.Mvc/Controllers/RelevanceManagerController.cs

@@ -28,10 +28,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
         [HttpPost]
         public string UnAssign(string type, Guid firstId, Guid[] secIds)
@@ -42,10 +42,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
     }
 }

OpenAuth.Mvc/Controllers/ResourceManagerController.cs

@@ -36,10 +36,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         /// <summary>
@@ -64,11 +64,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = e.Message;
+                 Result.Status = false;
+                Result.Message = e.Message;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         /// <summary>

OpenAuth.Mvc/Controllers/RoleManagerController.cs

@@ -37,10 +37,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         /// <summary>
@@ -62,11 +62,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = e.Message;
+                 Result.Status = false;
+                Result.Message = e.Message;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         #region 为用户设置角色界面
@@ -85,14 +85,14 @@ namespace OpenAuth.Mvc.Controllers
         public string AccessRoles(Guid userId, Guid[] ids)
         {
             _app.AccessRole(userId, ids);
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         [System.Web.Mvc.HttpPost]
         public string DelAccessRoles(Guid userId, Guid[] ids)
         {
             _app.DelAccessRole(userId, ids);
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         #endregion 为用户设置角色界面

OpenAuth.Mvc/Controllers/StockManagerController.cs

@@ -41,10 +41,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         /// <summary>
@@ -63,11 +63,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = e.Message;
+                 Result.Status = false;
+                Result.Message = e.Message;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
     }
 }

OpenAuth.Mvc/Controllers/UserManagerController.cs

@@ -36,10 +36,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = ex.Message;
+                 Result.Status = false;
+                Result.Message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         /// <summary>
@@ -62,11 +62,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = e.Message;
+                 Result.Status = false;
+                Result.Message = e.Message;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
         

OpenAuth.Mvc/Controllers/WorkflowSchemasController.cs

@@ -32,11 +32,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                BjuiResponse.statusCode = "300";
-                BjuiResponse.message = e.Message;
+                 Result.Status = false;
+                Result.Message = e.Message;
             }
 
-            return JsonHelper.Instance.Serialize(BjuiResponse);
+            return JsonHelper.Instance.Serialize(Result);
         }
 
     }