若依 2.4

2018-09-03 08:45:08 +08:00
parent a4c1912ab2
commit 4fe158fa94
112 changed files with 1687 additions and 4035 deletions
--- a/src/main/resources/templates/system/role/add.html
+++ b/src/main/resources/templates/system/role/add.html
@@ -2,7 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
-<link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
+<link th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-role-add">
@@ -59,24 +59,17 @@
 	<div th:include="include::footer"></div>
 	<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
 	<script type="text/javascript">
-		// 树结构初始化加载
-		var setting = {
-			check:{enable:true,nocheckInherit:true,chkboxType:{"Y":"ps","N":"ps"}},
-			view:{selectedMulti:false,nameIsHTML: true},
-			data:{simpleData:{enable:true},key:{title:"title"}},
-			callback:{
-				beforeClick: function (treeId, treeNode, clickFlag) {
-					var menuTrees = $.fn.zTree.getZTreeObj(treeId);
-					menuTrees.checkNode(treeNode, !treeNode.checked, true, true);
-					return false;
-				}
-			}
-		}, menuTrees, loadTree = function(){
-			$.get(ctx + "system/menu/roleMenuTreeData", function(data) {
-				menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true);
-			}, null, null, "正在加载，请稍后...");
-		};loadTree();
-	
+	    $(function() {
+			var url = ctx + "system/menu/roleMenuTreeData";
+			var options = {
+				id: "menuTrees",
+		        url: url,
+		        check: { enable: true, nocheckInherit: true, chkboxType: { "Y": "ps", "N": "ps" } },
+		        expandLevel: 0
+		    };
+			$.tree.init(options);
+		});
+		
 		$("#form-role-add").validate({
 			rules:{
 				roleName:{
@@ -129,26 +122,13 @@
 			}
 		});
 	
-		function selectCheckeds() {
-		    var menuIds = "";
-		    var treeNodes = menuTrees.getCheckedNodes(true);
-		    for (var i = 0; i < treeNodes.length; i++) {
-		        if (0 == i) {
-		        	menuIds = treeNodes[i].id;
-		        } else {
-		        	menuIds += ("," + treeNodes[i].id);
-		        }
-		    }
-		    return menuIds;
-		}
-	
 		function add() {
 			var roleName = $("input[name='roleName']").val();
 			var roleKey = $("input[name='roleKey']").val();
 			var roleSort = $("input[name='roleSort']").val();
 			var status = $("input[name='status']").is(':checked') == true ? 0 : 1;
 			var remark = $("input[name='remark']").val();
-			var menuIds = selectCheckeds();
+			var menuIds = $.tree.getCheckedNodes();
 			$.ajax({
 				cache : true,
 				type : "POST",
--- a/src/main/resources/templates/system/role/edit.html
+++ b/src/main/resources/templates/system/role/edit.html
@@ -2,7 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
-<link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
+<link th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-role-edit" th:object="${role}">
@@ -60,23 +60,16 @@
 	<div th:include="include::footer"></div>
 	<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
 	<script type="text/javascript">
-		// 树结构初始化加载
-		var setting = {
-			check:{enable:true,nocheckInherit:true,chkboxType:{"Y":"ps","N":"ps"}},
-			view:{selectedMulti:false,nameIsHTML: true},
-			data:{simpleData:{enable:true},key:{title:"title"}},
-			callback:{
-				beforeClick: function (treeId, treeNode, clickFlag) {
-					var menuTrees = $.fn.zTree.getZTreeObj(treeId);
-					menuTrees.checkNode(treeNode, !treeNode.checked, true, true);
-					return false;
-				}
-			}
-		}, menuTrees, loadTree = function(){
-			$.get(ctx + "system/menu/roleMenuTreeData?roleId=" + $("#roleId").val(), function(data) {
-				menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true);
-			}, null, null, "正在加载，请稍后...");
-		};loadTree();
+	     $(function() {
+			var url = ctx + "system/menu/roleMenuTreeData?roleId=" + $("#roleId").val();
+			var options = {
+				id: "menuTrees",
+		        url: url,
+		        check: { enable: true, nocheckInherit: true, chkboxType: { "Y": "ps", "N": "ps" } },
+		        expandLevel: 0
+		    };
+			$.tree.init(options);
+		});
 	
 		$("#form-role-edit").validate({
 			rules:{
@@ -135,20 +128,7 @@
 				edit();
 			}
 		});
-	
-		function selectCheckeds() {
-		    var menuIds = "";
-		    var treeNodes = menuTrees.getCheckedNodes(true);
-		    for (var i = 0; i < treeNodes.length; i++) {
-		        if (0 == i) {
-		        	menuIds = treeNodes[i].id;
-		        } else {
-		        	menuIds += ("," + treeNodes[i].id);
-		        }
-		    }
-		    return menuIds;
-		}
-	
+
 		function edit() {
 			var roleId = $("input[name='roleId']").val();
 			var roleName = $("input[name='roleName']").val();
@@ -156,7 +136,7 @@
 			var roleSort = $("input[name='roleSort']").val();
 			var status = $("input[name='status']").is(':checked') == true ? 0 : 1;
 			var remark = $("input[name='remark']").val();
-			var menuIds = selectCheckeds();
+			var menuIds = $.tree.getCheckedNodes();
 			$.ajax({
 				cache : true,
 				type : "POST",
--- a/src/main/resources/templates/system/role/role.html
+++ b/src/main/resources/templates/system/role/role.html
@@ -112,6 +112,7 @@
 		            formatter: function(value, row, index) {
 		                var actions = [];
 		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.roleId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		                actions.push('<a class="btn btn-primary btn-xs ' + removeFlag + '" href="#" onclick="rule(\'' + row.roleId + '\')"><i class="fa fa-check-square-o"></i>权限</a> ');
 		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.roleId + '\')"><i class="fa fa-remove"></i>删除</a>');
 		                return actions.join('');
 		            }
@@ -119,6 +120,12 @@
 		    };
 		    $.table.init(options);
 		});
+		
+		/*角色管理-分配数据权限*/
+		function rule(roleId) {
+		    var url = prefix + '/rule/' + roleId;
+		    $.modal.open("分配数据权限", url);
+		}
 	</script>
 </body>
 </html>
--- a/src/main/resources/templates/system/role/rule.html
+++ b/src/main/resources/templates/system/role/rule.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<link th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
+<body class="white-bg">
+	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+		<form class="form-horizontal m" id="form-role-edit" th:object="${role}">
+			<input id="roleId" name="roleId" type="hidden" th:field="*{roleId}"/>
+			<div class="form-group">
+				<label class="col-sm-3 control-label ">角色名称：</label>
+				<div class="col-sm-8">
+					<input class="form-control" type="text" name="roleName" id="roleName" th:field="*{roleName}" readonly="true"/>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">权限字符：</label>
+				<div class="col-sm-8">
+					<input class="form-control" type="text" name="roleKey" id="roleKey" th:field="*{roleKey}" readonly="true">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">数据范围：</label>
+				<div class="col-sm-8">
+					<select id="dataScope" name="dataScope" class="form-control m-b">
+						<option value="1" th:field="*{dataScope}">全部数据权限</option>
+						<option value="2" th:field="*{dataScope}">自定数据权限</option>
+					</select>
+					<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 特殊情况下，设置为“自定数据权限”</span>
+				</div>
+			</div>
+			<div class="form-group" id="roleRule" style="display: none">
+				<label class="col-sm-3 control-label">数据权限</label>
+				<div class="col-sm-8">
+					<div id="deptTrees" class="ztree"></div>
+				</div>
+			</div>
+			<div class="form-group">
+				<div class="form-control-static col-sm-offset-9">
+					<button type="submit" class="btn btn-primary">提交</button>
+					<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+				</div>
+			</div>
+		</form>
+	</div>
+	<div th:include="include::footer"></div>
+	<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
+	<script type="text/javascript">
+	
+	    $(function() {
+			var url = ctx + "system/dept/roleDeptTreeData?roleId=" + $("#roleId").val();
+			var options = {
+				id: "deptTrees",
+		        url: url,
+		        check: { enable: true, nocheckInherit: true, chkboxType: { "Y": "ps", "N": "ps" } },
+		        expandLevel: 2
+		    };
+			$.tree.init(options);
+			$("#dataScope").change();
+	    });
+
+		$("#form-role-edit").validate({
+			submitHandler:function(form){
+				edit();
+			}
+		});
+		
+		function edit() {
+			var roleId = $("input[name='roleId']").val();
+			var roleName = $("input[name='roleName']").val();
+			var roleKey = $("input[name='roleKey']").val();
+			var dataScope = $("#dataScope").val();
+            var deptIds = $.tree.getCheckedNodes();
+			$.ajax({
+				cache : true,
+				type : "POST",
+				url : ctx + "system/role/rule",
+				data : {
+					"roleId": roleId,
+					"roleName": roleName,
+					"roleKey": roleKey,
+					"dataScope": dataScope,
+			        "deptIds": deptIds
+				},
+				async : false,
+				error : function(request) {
+					$.modal.alertError("系统错误");
+				},
+				success : function(data) {
+					$.operate.saveSuccess(data);
+				}
+			});
+		}
+		
+		$("#dataScope").change(function(event){
+        	var dataScope = $(event.target).val();
+        	dataScopeVisible(dataScope);
+        });
+		
+		function dataScopeVisible(dataScope) {
+			if (dataScope == 2) {
+	    		$("#roleRule").show();
+	    	} else {
+	    		$._tree.checkAllNodes(false);
+	    		$("#roleRule").hide();
+	    	}
+		}
+	</script>
+</body>
+</html>