From 4e7208e74468e44504937a112752c45618d6e58a Mon Sep 17 00:00:00 2001 From: yubaolee Date: Tue, 8 Dec 2015 00:29:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E4=BF=AE=E5=A4=8D=E7=94=B1?= =?UTF-8?q?=E4=BA=8EBJUI=E7=9A=84JS=E5=87=BD=E6=95=B0=E5=90=8D=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E7=9B=B8=E5=90=8C=E9=80=A0=E6=88=90=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B7=B7=E4=B9=B1=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=A1=A8=E8=AE=B0=E5=BD=95=EF=BC=8C=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E7=94=A8=E8=84=9A=E6=9C=AC=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ModuleManagerController.cs | 16 +++++++++++- OpenAuth.Mvc/Views/Home/Index.cshtml | 24 ++++++++++++++---- OpenAuth.Mvc/Views/Home/MenuHeader.cshtml | 1 + .../ModuleElementManager/AssignForUser.cshtml | 2 +- OpenAuth.Mvc/Views/ModuleManager/Add.cshtml | 2 +- OpenAuth.Mvc/Views/ModuleManager/Index.cshtml | 8 +++--- OpenAuth.Mvc/Views/OrgManager/Index.cshtml | 6 ++--- OpenAuth.Mvc/Views/RoleManager/Index.cshtml | 14 +++++----- OpenAuth.Mvc/Views/UserManager/Index.cshtml | 16 ++++++------ 单独初始化数据.sql | Bin 19910 -> 0 bytes 建表&初始化数据.sql | Bin 93428 -> 97134 bytes 11 files changed, 59 insertions(+), 30 deletions(-) delete mode 100644 单独初始化数据.sql diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs index 1def878c..9715cadf 100644 --- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs @@ -54,6 +54,20 @@ namespace OpenAuth.Mvc.Controllers { var orgs = SessionHelper.GetSessionUser().Modules; //添加根节点 + //orgs.Add(new Module + //{ + // Id = 0, + // ParentId = -1, + // Name = "根节点", + // CascadeId = "0" + //}); + return JsonHelper.Instance.Serialize(orgs); + } + + public string LoadModuleWithRoot() + { + var orgs = SessionHelper.GetSessionUser().Modules.MapToList(); + //添加根节点 orgs.Add(new Module { Id = 0, @@ -72,7 +86,7 @@ namespace OpenAuth.Mvc.Controllers { Id = 0, ParentId = -1, - Name = "用户可访问模块（包括角色所拥有的）", + Name = "用户及角色拥有的模块", CascadeId = "0" }); return JsonHelper.Instance.Serialize(orgs); diff --git a/OpenAuth.Mvc/Views/Home/Index.cshtml b/OpenAuth.Mvc/Views/Home/Index.cshtml index 432407cc..a2199fcc 100644 --- a/OpenAuth.Mvc/Views/Home/Index.cshtml +++ b/OpenAuth.Mvc/Views/Home/Index.cshtml @@ -148,7 +148,13 @@ if (treeNode.target && treeNode.target == 'dialog') $(event.target).dialog({ id: treeNode.tabid, url: treeNode.url, title: treeNode.name }); else - $(event.target).navtab({ id: treeNode.tabid, url: treeNode.url, title: treeNode.name, fresh: treeNode.fresh, external: treeNode.external }); + $(event.target).navtab({ + id: treeNode.tabid, + url: treeNode.url, + title: treeNode.name, + fresh: treeNode.fresh, + external: treeNode.external + }); } @@ -234,7 +240,9 @@ - +
@@ -249,10 +257,16 @@
-
+
@@ -262,7 +276,7 @@ -
+
Loading... diff --git a/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml b/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml index 4f7b2cc9..f8b8f562 100644 --- a/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml +++ b/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml @@ -14,6 +14,7 @@ { sb.Append("<" + element.Type + " data-icon='" + element.Icon + "' " + + " id='" + element.DomId + "' " + " class='" + element.Class + "' " + " onclick='" + element.Script + "' " + element.Attr + ">" + element.Name + ""); diff --git a/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml b/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml index f7ced0a4..a5adefbb 100644 --- a/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml +++ b/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml @@ -101,7 +101,7 @@ }, callback: { onClick: zTreeOnClick } }; - $.getJSON('ModuleManager/LoadForTree', function (json) { + $.getJSON('ModuleManager/LoadForUser?userId=' + $('#userId').val(), function (json) { var zTreeObj = $.fn.zTree.init($('#@_treeId'), setting, json); zTreeObj.expandAll(true); }); diff --git a/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml index 814903e8..ac71ae16 100644 --- a/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml +++ b/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml @@ -125,7 +125,7 @@ onCheck: zTreeCheck } }; - $.getJSON('ModuleManager/LoadForTree', function (json) { + $.getJSON('ModuleManager/LoadModuleWithRoot', function (json) { var zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json); zTreeObj.expandAll(true); }); diff --git a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml index ad8a7c41..f7c12a6d 100644 --- a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml @@ -120,14 +120,14 @@ }, callback: {onClick: zTreeOnClick} }; - $.getJSON('ModuleManager/LoadForTree', function (json) { + $.getJSON('ModuleManager/LoadModuleWithRoot', function (json) { var zTreeObj = $.fn.zTree.init($('#@_treeId'), setting, json); zTreeObj.expandAll(true); }); } //删除 - function del() { + function delModule() { var selected = getSelected('#@_gridId',2); if (selected == null) return; @@ -150,7 +150,7 @@ url: '/ModuleManager/Add?id=' + selected, title: '编辑', onClose:function() { - refreshGrid(); + refreshModuleGrid(); } }); @@ -172,7 +172,7 @@ } - function refreshGrid() { + function refreshModuleGrid() { $('#@_gridId').datagrid('refresh'); // loadDataGrid(); } diff --git a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml index ce1f53dd..2a9c9f7b 100644 --- a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml @@ -125,18 +125,18 @@ }); } - function refreshGrid() { + function refreshOrgGrid() { $('#@_gridId').datagrid('refresh'); } //删除 - function del() { + function delOrg() { var selected = getSelected('#@_gridId',2); if (selected == null) return; $.getJSON('OrgManager/DelOrg?Id=' + selected, function (data) { if (data.statusCode == "200") - refreshGrid(); + refreshOrgGrid(); else { $(this).alertmsg('warn', data.message); } diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml index 52f99f56..a8c58d9e 100644 --- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml @@ -120,13 +120,13 @@ } //删除 - function del() { + function delRole() { var selected = getSelected('#@_gridId', 2); if (selected == null) return; $.getJSON('RoleManager/Delete?Id=' + selected, function (data) { if (data.statusCode == "200") - refreshGrid(); + refreshRoleGrid(); else { $(this).alertmsg('warn', data.message); } @@ -143,18 +143,18 @@ url: '/RoleManager/Add?id=' + selected, title: '编辑', onClose:function() { - refreshGrid(); + refreshRoleGrid(); } }); } - function refreshGrid() { + function refreshRoleGrid() { $('#@_gridId').datagrid('refresh'); // loadDataGrid(); } - //角色模块授权按钮 - function openModuleAccess(obj) { + //为角色分配模块 + function assignRoleModule(obj) { var selected = getSelected('#@_gridId',2); if (selected == null) return; @@ -170,7 +170,7 @@ } //为角色分配菜单 - function openAssignElement(obj) { + function assignRoleElement(obj) { var selected = getSelected('#@_gridId', 2); if (selected == null) return; diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml index 52565d64..8ae3343a 100644 --- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml @@ -124,7 +124,7 @@ //删除 - function del() { + function delUser() { var selected = getSelected('#@_gridId', 2); if (selected == null) return; @@ -138,7 +138,7 @@ } //自定义的编辑按钮 - function editOrg() { + function editUser() { var selected = getSelected('#@_gridId', 2); if (selected == null) return; @@ -147,18 +147,18 @@ url: '/UserManager/Add?id=' + selected, title: '编辑', onClose: function () { - refreshGrid(); + refreshUserGrid(); } }); } - function refreshGrid() { + function refreshUserGrid() { $('#@_gridId').datagrid('refresh'); } //用户模块授权按钮 - function openModuleAccess(obj) { + function openUserModuleAccess(obj) { var selected = getSelected('#@_gridId', 2); if (selected == null) return; @@ -174,7 +174,7 @@ } //用户角色授权 - function openRoleAccess(obj) { + function openUserRoleAccess(obj) { var selected = getSelected('#@_gridId', 2); if (selected == null) return; @@ -188,8 +188,8 @@ }); } - //为角色分配菜单 - function openAssignElement(obj) { + //分配菜单 + function openAssignUserElement(obj) { var selected = getSelected('#@_gridId', 2); if (selected == null) return; diff --git a/单独初始化数据.sql b/单独初始化数据.sql deleted file mode 100644 index 3807e8d55da8442afe4d467d941a783a9971d502..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19910 zcmeHPOK%%h6uzrUAhBg_R&fz&;v`MdR7j*wQX(1$*+~nE0ywWGZ61~FKnjbZuz?kg zRJsKgY!O@j06%~=D^~ptARgbj$2aH9%*}Z0jA^K@tk^Sm?qlYD-+A6U`RDItQ!}%s zU{=hcd0;lpzL_?Mre(IxjJaV}%`4_*a}(F-cgVc1J_VGnnR{rnj`~yRqhOXy9c8;H zqaHVKe1JZ#;CR_IQQE**N2tAOYg3CFS~tuN#%|$k2JKs@N4=HI2u2(>Lm z>4+J{)iE5?cL^o>o`!O}&$8JvcmD_X+25HYZY*Jr=Yh4a>=RYYfMs|S-vg&5azyNxYs0pN{-*X^yNnTPnEfJT;|PEJnTBMHRENPqvWz^Kn`j{rzW`TJJ3}FEv{`b94ecor6yA%u!*! zj5`e5Qc`mC%hTU)U;pUY;{kIXK5N7lad&y}dDHUwW6bnE=KG>D+jp1QIPPm1XZsv9 zXTxeY%{0={q~Z6$L0vv$HQ_p1uy?Ry>o}&rgR2iuwRjEMlspHm+1a0I*z!&2$*9)W zSILI($Uc^jm7-ORJa{(wtGIy(mab zwviw&fc1=M1v+w)yI}42p`D5D(3phHBwwe5-+)HCTwGIVjM(G;p)noMNYzrKZFyiE zd^##m*$8N)+l*1@57JSL#^?o+jo!R_zeUN%FJgOn5xso5vn>9P)Q(%)vpsC_tvRNB z8#b$DqJ9m$w5cP5;k+d(pbY(CM^meG9rZy_4XC9Y}-~(ZJ9T5WdIpl7ZEL3O;bnqfwI3t?S6-B ztpY}%sI6`W@qK_gcP+EHj}1g@b(~W<^{H#`pk=bwpnc}1xu2*{b3x_YhUWJW_Y?1x zV$eZoLK>5@)m)qO@0NYKCbHr;aYUn2TbYl0=$|4k%B8q?b;?{(umTA=ed9! zInDPVo{~l)nJTDST;J(}w8&30Dk-5a9%F@jJcF}9We0O9GyLkKldt7$4f9X3MJRKr z^dPl1+r6;MsO6q zDen$#*KdAE2i+X?$Nk>KcnoXuN5qB-niJKZHsvfEwtjmY)zr~CdW5*Gm1}$ybahf! zbN-vWK-Sfinb#JuP~CVc^Oy}qT3y}6+GTe8N|sC^DEWJ`?of@frKK{^*Rag&580J70_@jOL?Y zHj=g*$ zyY9DxHSm44vN~0vl|J(HURwY0iJ+CtF#9m&9TD8;4Yl?gaP1$iygysKdCGM5vhL%< zGkA7Rlm2&mg5o)$8Q|H?%8w7n;MqAG`=MLiK5&sity`n}f<&XrYWr_rEZ3wwsc9v4 zlUgpOK6|9FyMo?t?l0~lYtEymy)a zy4?v&&lKNDn0<%)GIlubo=QPC``!D!r#)>y{cYGh`VR-R-tHvWt-fd9jUIhZmHb+I zXI5lMBNLCG=iwET)jU$ZvCDJl_kAQA?yibXa3y3H+;O*SmI3`}ZslzBW!*FWF2Wyo z-a1-1*?%O+J2axm&`6A4K()8`RPvW;@qHN8D_Gwa9BFrIRHo0`1Mib(?uU89hzss~ zP0o`Xay9s^_pH0bgFI)IXUT9o(zi+1HFY)5_I^4$;?&Ld1 zad#`mSuA*v`25~U%pZBlGZXS!&p-K~c=&Dgug@7jvf8wlg)|8rJ55aIo%FbV>rl51 vTAVVJ`C}?sXT~(@lmD=`{bf{|lejV~I^mjRh-1Zh{ws}+5Xf@Nd!7FRcnkAB diff --git a/建表&初始化数据.sql b/建表&初始化数据.sql index e5fddc2e80a319841646000ddec41ea1e63399b8..a1e827c767b69f9a118e651746d3d53295f9339a 100644 GIT binary patch delta 4613 zcmb7HZA?>V6n;;v; z*zbol`E&C(aYj8E%}>VFie2)L_I&s1Sk)DxLRIh6K5JVFvja3(Nmlq|N!z9vs7M4w zkyua9iYbsk2Ksb3U3PYq{ts|YfOtkUzlxVG!_7(Z&zmW7yd}#WRCasG_#&}dtc%5V z2WSwZsLz00+ctkDaqdiFQ2V$o8;BG%1;w5rA}y9_pQOs#=9!s{I?BarRmHr32+bh* zdYLvgPn%`?UMh_pb7^PhM)S2@*GDZDBd5lvgk2s5X2k1#|z5!zz5&-=<=w(U2t zzXFo9lds-cZjIFjx<~Wn{R@fOn0^!zo)=xBMQb|O9UuF8?LsI~-uuoeZ?&h&l)jqwr0IteA)mpRx~h`kv~@lccX~O*W8Z8}oC*Hb0bke&n(Ks9c5q#D;j%SO-T|P68qJ1?JyHN^J$`8q>%sjY@Zd-_$$Do4)S9`v za-ha0Urj`!zl5isfI4fEzH9|7<7UsH0*K=4<&c7ttx#`7bz(4=HH>K8*qKcgD8|@I zqIn*NWPCdhimhcK$=dO-4^vS%ABfv+*r)1u;wdjpWlsTATBp=WZXV}^3SH)f^VYEp z`Q6y#V_QzRHCVF>ysBrkE5+j-KfCCrS?0742W;gzPI+w9r}R|f-6Hm!d00m95roqe zALl)s;mt=Oa7u5716?KDuApBjfo!Hy-A#KYgF%Y32QP(LBM8@|8W?UTkz+lHcyR|* z;idI-B6*&sSDBqj_*xm1F%_$P6l1GNP1^}B99j#dJgo^2mczF;a7yO&3U&f3Db)>- zgx+<){CzTfQUX%V{ekMPwIKz2o`H)zZV!%E!C4;Hjk(XlSJpTkHbBTm*UfIy7Q$V% zRONK`EWxx0cd+Rb5kM|E)WL`7-3a%r3qgwYzCKVC!bM%i|7VVk6{Y<`(#o0sD493-;&Jb)aV}cXvVq+!sgpHo9xnVoj75 zTksIRcCR1G&p= AUH||9 delta 4100 zcmb7GT}+#06#mW(P(K^&2sRTKRyL3^1O{V5rwdMO7~#iNWLvFT#{!IL>2QpNb`!5O zUYLfL?Z|}&7b0dcWZ7rdWieQqNupV_&c&Z4&Xy1_jM)|0g)zqSeqZ+!FM3|m8(N<8 zoadbLo}XK{b5?)NiGH?mhgPfAYjxT-txhk-y^REaWMU!m`LYeSpEqltGJoA z%kPuRy`pR78XGpf1Re5?%0I4FWyi+WuZLQugh-f^c%uNm$j)WqDhuJF3hu-sa9#zM zaH`?#8{krQzF2w#Y*C7Jwg~34b6K(eRSXFpcNhbEpb*?gR=~d9>H@Md;%)4#S2cnvKu-uRR#rEw;9?MZQWQ{u98{PksJLL za6yszZ$+FN*KGl2vdG$ILNyB)sDjH3{o<1_hVxsw!l8+~UCrenMz~_Gz=Y|;mN3;~ zq!vEq1!lnWb--*Asj|;{vmZ2r7voi6$F_Rt;(d%^RRh8$1|zRtY>uV6GePkk(s?%5PN? zFJ)vb2A@~iGbG#t|0txzVx}s)(AfrYMGKGc3_J1tJuu4{?Cpk8jJLBLA#rCq*p4^p z+?{L&e(;goNEcVN81b>2mbm(GR}(dleJ^`5n2sy*pa_Frc2$|tlpF^i&b&_xQu8Yj57LI@oqki^nEe2p3S6_jDvpYt@okqt&$i;K70kf!M1pbIqDGBEs zee6t-0_T8TYPrji3N|qIxgx@MjEXkP5q9xg7H`3~ zyp{oZk{*|&1-N6ByHjGs%wEr?_hb(Y$p{0ygs_~7bZ9(8)8o4n?D!`7FzVy%&0xx) H8?WX+6Xg~f