From 1b08ec149b98551b6ec90995b476f2b80b3357f4 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sun, 13 Feb 2022 13:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2PC=E7=AB=AF=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E6=9D=83=E9=99=90=E6=95=B4=E6=94=B9=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/syseverole/sysEveRolePCMenu.js | 266 ++++++++++++++++++
.../template/js/syseverole/syseveroleadd.js | 214 +-------------
.../template/js/syseverole/syseveroleedit.js | 246 +---------------
.../template/js/syseverole/syseverolelist.js | 30 +-
.../tpl/syseverole/sysEveRolePCMenu.html | 55 ++++
.../tpl/syseverole/syseveroleadd.html | 17 --
.../tpl/syseverole/syseveroleedit.html | 17 --
.../tpl/syseverole/syseverolelist.html | 7 +-
8 files changed, 364 insertions(+), 488 deletions(-)
create mode 100644 userauth/src/main/resources/template/js/syseverole/sysEveRolePCMenu.js
create mode 100644 userauth/src/main/resources/template/tpl/syseverole/sysEveRolePCMenu.html
diff --git a/userauth/src/main/resources/template/js/syseverole/sysEveRolePCMenu.js b/userauth/src/main/resources/template/js/syseverole/sysEveRolePCMenu.js
new file mode 100644
index 000000000..ef6ce7fd0
--- /dev/null
+++ b/userauth/src/main/resources/template/js/syseverole/sysEveRolePCMenu.js
@@ -0,0 +1,266 @@
+
+layui.config({
+ base: basePath,
+ version: skyeyeVersion
+}).extend({
+ window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'fsCommon', 'fsTree', 'form'], function (exports) {
+ winui.renderColor();
+ var index = parent.layer.getFrameIndex(window.name);
+ var $ = layui.$,
+ form = layui.form,
+ fsTree = layui.fsTree,
+ fsCommon = layui.fsCommon;
+
+ var checkeRows = '';
+
+ matchingLanguage();
+ form.render();
+ form.on('submit(formEditBean)', function (data) {
+ if (winui.verifyForm(data.elem)) {
+ var tree = $.fn.zTree.getZTreeObj("treeDemo");
+ var nodes = tree.getCheckedNodes(true);
+ var menuIds = new Array();
+ for(var i = 0; i < nodes.length; i++){
+ menuIds.push(nodes[i].id);
+ }
+ var params = {
+ roleName: $("#roleName").html(),
+ roleDesc: $("#roleDesc").html(),
+ menuIds: JSON.stringify(menuIds),
+ rowId: parent.rowId
+ };
+
+ AjaxPostUtil.request({url: reqBasePath + "editSysRolePCAuth", params: params, type: 'json', method: "PUT", callback: function(json){
+ if(json.returnCode == 0){
+ parent.layer.close(index);
+ parent.refreshCode = '0';
+ }else{
+ winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
+ }
+ }});
+ }
+ return false;
+ });
+
+ /********* tree 处理 start *************/
+ var trees = {};
+ var treeDoms = $("ul.fsTree");
+
+ AjaxPostUtil.request({url: reqBasePath + "sys016", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function(json){
+ if(json.returnCode == 0){
+ $("#roleName").text(json.bean.roleName);
+ $("#roleDesc").text(json.bean.roleDesc);
+ checkeRows = json.rows;
+ if(treeDoms.length > 0) {
+ $(treeDoms).each(function(i) {
+ var treeId = $(this).attr("id");
+ var funcNo = $(this).attr("funcNo");
+ var url = $(this).attr("url");
+ var tree = fsTree.render({
+ id: treeId,
+ funcNo: funcNo,
+ url: url + "?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+ getTree: getTree,
+ checkEnable: true,
+ loadEnable: false,
+ showLine: false,
+ showIcon: false,
+ addDiyDom: addDiyDom,
+ fontCss: setFontCss
+ }, function(id){
+ var zTreeObj = $.fn.zTree.getZTreeObj(id);
+ var zTree = zTreeObj.getCheckedNodes(false);
+ for (var i = 0; i < zTree.length; i++) {
+ for(var j = 0; j < checkeRows.length; j++){
+ if(zTree[i].id == checkeRows[j].menuId){
+ zTreeObj.checkNode(zTree[i], true);
+ }
+ }
+ }
+ var li_head = ' 所属系统
菜单权限
菜单类型
';
+ var rows = $("#" + treeId).find('li');
+ if(rows.length > 0) {
+ rows.eq(0).before(li_head)
+ } else {
+ $("#" + treeId).append(li_head);
+ $("#" + treeId).append('无符合条件数据
')
+ }
+ });
+ if(treeDoms.length == 1) {
+ trees[treeId] = tree;
+ } else {
+ //深度拷贝对象
+ trees[treeId] = $.extend(true, {}, tree);
+ }
+ });
+ //绑定按钮事件
+ fsCommon.buttonEvent("tree", getTree);
+ }
+ }else{
+ winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+ }
+ }});
+
+ function getTree(treeId) {
+ if($.isEmpty(trees)) {
+ fsCommon.warnMsg("未配置tree！");
+ return;
+ }
+ if($.isEmpty(treeId)) {
+ treeId = "treeDemo";
+ }
+ return trees[treeId];
+ }
+
+ /********* tree 处理 end *************/
+
+ /**
+ * 自定义DOM节点
+ */
+ function addDiyDom(treeId, treeNode) {
+ var spaceWidth = 15;
+ var liObj = $("#" + treeNode.tId);
+ var aObj = $("#" + treeNode.tId + "_a");
+ var switchObj = $("#" + treeNode.tId + "_switch");
+ var icoObj = $("#" + treeNode.tId + "_ico");
+ var spanObj = $("#" + treeNode.tId + "_span");
+ aObj.attr('title', '');
+ aObj.append('');
+ var div = $(liObj).find('div').eq(0);
+ switchObj.remove();
+ spanObj.remove();
+ icoObj.remove();
+ div.append(switchObj);
+ div.append(spanObj);
+ var spaceStr = "";
+ switchObj.before(spaceStr);
+ var editStr = '';
+ editStr = '' + (treeNode.sysName == null ? ' ' : treeNode.sysName) + '
';
+ aObj.before(editStr);
+ editStr = '' + (treeNode.appType == null ? ' ' : treeNode.appType) + '
';
+ aObj.append(editStr);
+ editStr = '' + (treeNode.type == null ? ' ' : treeNode.type) + '
';
+ aObj.append(editStr);
+ }
+
+
+ var lastValue = "", nodeList = [], fontCss = {}, hiddenNodes = [];
+ $("#menuName").val('');
+ var key = $("#menuName");
+ key.bind("focus", focusKey)
+ .bind("blur", blurKey)
+ .bind("propertychange", searchNode) //property(属性)change(改变)的时候，触发事件
+ .bind("input", searchNode);
+
+ function focusKey(e) {
+ if (key.hasClass("empty")) {
+ key.removeClass("empty");
+ }
+ }
+
+ function blurKey(e) {
+ if (key.get(0).value === "") {
+ key.addClass("empty");
+ }
+ }
+
+ //搜索树
+ function searchNode(e) {
+ var zTreeObj = $.fn.zTree.getZTreeObj("treeDemo");
+ var value = $.trim(key.get(0).value);
+ var keyType = "name";
+
+ if (key.hasClass("empty")) {
+ value = "";
+ }
+
+ //显示上次搜索后背隐藏的结点
+ zTreeObj.showNodes(hiddenNodes);
+ //查找不符合条件的叶子节点
+ function filterFunc(node){
+ var _keywords = $("#menuName").val();
+ if(node.name.indexOf(_keywords) != -1)
+ return false;
+ if(node.isParent) {
+ //是父节点时需要判断子节点是否符合条件，是的话则父节点需要保留
+ var bl = CheckChildNodesIsContainKeyword(node);
+ return bl;
+ } else {
+ //是子节点时，需要判断父节点是否符合条件，是的话则子节点需要保留
+ var bl2 = CheckParentNodesIsContainKeyword(node);
+ return bl2;
+ }
+ return true;
+ };
+ //获取不符合条件的叶子结点
+ hiddenNodes = zTreeObj.getNodesByFilter(filterFunc);
+ //隐藏不符合条件的叶子结点
+ zTreeObj.hideNodes(hiddenNodes);
+ if (lastValue === value) return;
+ lastValue = value;
+ if (value === ""){
+ updateNodes(false);
+ return;
+ };
+ updateNodes(false);
+ nodeList = zTreeObj.getNodesByParamFuzzy(keyType, value); //调用ztree的模糊查询功能，得到符合条件的节点
+ updateNodes(true); //更新节点
+ };
+
+ //tree搜索时：是父节点时需要判断子节点是否符合条件，是的话则父节点需要保留
+ function CheckChildNodesIsContainKeyword(pNode) {
+ var childs = pNode.children;
+ var isexit = true;
+ if(!isNull(childs)){
+ for(var i = 0; i < childs.length; i++) {
+ if(childs[i].isParent) {
+ isexit = CheckChildNodesIsContainKeyword(childs[i]);
+ if(!isexit)
+ return isexit;
+ } else {
+ var _keywords = $("#menuName").val();
+ if(childs[i].name.indexOf(_keywords) != -1)
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ //tree 搜索时：子节点时，需要判断父节点是否符合条件，是的话则子节点需要保留
+ function CheckParentNodesIsContainKeyword(cNode) {
+ var pnode = cNode.getParentNode();
+ if(pnode != null) {
+ var _keywords = $("#menuName").val();
+ if(pnode.name.indexOf(_keywords) != -1)
+ return false;
+ else {
+ return CheckParentNodesIsContainKeyword(pnode)
+ }
+ }
+ return true;
+ }
+
+
+ //高亮显示被搜索到的节点
+ function updateNodes(highlight) {
+ var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+ for( var i = 0; i < nodeList.length; i++) {
+ nodeList[i].highlight = highlight;//高亮显示搜索到的节点(highlight是自己设置的一个属性)
+ zTree.expandNode(nodeList[i].getParentNode(), true, false, false);//将搜索到的节点的父节点展开
+ zTree.updateNode(nodeList[i]);//更新节点数据，主要用于该节点显示属性的更新
+ }
+ }
+
+ function setFontCss(treeId, treeNode) {
+ return (!!treeNode.highlight) ? {color:"#00ff66", "font-weight":"bold"} : {color:"#333", "font-weight":"normal"};
+ }
+
+ // 取消
+ $("body").on("click", "#cancle", function(){
+ parent.layer.close(index);
+ });
+
+});
\ No newline at end of file
diff --git a/userauth/src/main/resources/template/js/syseverole/syseveroleadd.js b/userauth/src/main/resources/template/js/syseverole/syseveroleadd.js
index 04ef00602..e1997e3ba 100644
--- a/userauth/src/main/resources/template/js/syseverole/syseveroleadd.js
+++ b/userauth/src/main/resources/template/js/syseverole/syseveroleadd.js
@@ -4,36 +4,26 @@ layui.config({
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'fsCommon', 'fsTree', 'textool', 'form'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'textool', 'form'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form,
- fsTree = layui.fsTree,
- fsCommon = layui.fsCommon,
textool = layui.textool;
- matchingLanguage();
- form.render();
-
textool.init({
eleId: 'roleDesc',
maxlength: 250,
tools: ['count', 'copy', 'reset', 'clear']
});
+ matchingLanguage();
+ form.render();
form.on('submit(formAddBean)', function (data) {
if (winui.verifyForm(data.elem)) {
- var tree = $.fn.zTree.getZTreeObj("treeDemo");
- var nodes = tree.getCheckedNodes(true);
- var menuIds = new Array();
- for(var i = 0; i < nodes.length; i++){
- menuIds.push(nodes[i].id);
- }
var params = {
roleName: $("#roleName").val(),
- roleDesc: $("#roleDesc").val(),
- menuIds: JSON.stringify(menuIds)
+ roleDesc: $("#roleDesc").val()
};
AjaxPostUtil.request({url: reqBasePath + "sys015", params: params, type: 'json', method: "POST", callback: function(json){
@@ -48,202 +38,6 @@ layui.config({
return false;
});
- /********* tree 处理 start *************/
-
- var trees = {};
-
- var treeDoms = $("ul.fsTree");
- if(treeDoms.length > 0) {
- $(treeDoms).each(function(i) {
- var treeId = $(this).attr("id");
- var funcNo = $(this).attr("funcNo");
- var url = $(this).attr("url");
- var tree = fsTree.render({
- id: treeId,
- funcNo: funcNo,
- url: url + "?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
- getTree: getTree,
- checkEnable: true,
- loadEnable: false,
- showLine: false,
- showIcon: false,
- addDiyDom: addDiyDom,
- fontCss: setFontCss,
- expandSpeed: 'speed'
- }, function(id){
- var li_head = ' 所属系统
菜单权限
菜单类型
';
- var rows = $("#" + treeId).find('li');
- if(rows.length > 0) {
- rows.eq(0).before(li_head)
- } else {
- $("#" + treeId).append(li_head);
- $("#" + treeId).append('无符合条件数据
')
- }
- });
- if(treeDoms.length == 1) {
- trees[treeId] = tree;
- } else {
- //深度拷贝对象
- trees[treeId] = $.extend(true, {}, tree);
- }
- });
- //绑定按钮事件
- fsCommon.buttonEvent("tree", getTree);
- }
-
- function getTree(treeId) {
- if($.isEmpty(trees)) {
- fsCommon.warnMsg("未配置tree！");
- return;
- }
- if($.isEmpty(treeId)) {
- treeId = "treeDemo";
- }
- return trees[treeId];
- }
-
- /********* tree 处理 end *************/
-
- /**
- * 自定义DOM节点
- */
- function addDiyDom(treeId, treeNode) {
- var spaceWidth = 15;
- var liObj = $("#" + treeNode.tId);
- var aObj = $("#" + treeNode.tId + "_a");
- var switchObj = $("#" + treeNode.tId + "_switch");
- var icoObj = $("#" + treeNode.tId + "_ico");
- var spanObj = $("#" + treeNode.tId + "_span");
- aObj.attr('title', '');
- aObj.append('');
- var div = $(liObj).find('div').eq(0);
- switchObj.remove();
- spanObj.remove();
- icoObj.remove();
- div.append(switchObj);
- div.append(spanObj);
- var spaceStr = "";
- switchObj.before(spaceStr);
- var editStr = '';
- editStr = '' + (treeNode.sysName == null ? ' ' : treeNode.sysName) + '
';
- aObj.before(editStr);
- editStr = '' + (treeNode.pageType == null ? ' ' : treeNode.pageType) + '
';
- aObj.append(editStr);
- }
-
- var lastValue = "", nodeList = [], fontCss = {}, hiddenNodes = [];
- $("#menuName").val('');
- var key = $("#menuName");
- key.bind("focus", focusKey)
- .bind("blur", blurKey)
- .bind("propertychange", searchNode) //property(属性)change(改变)的时候，触发事件
- .bind("input", searchNode);
-
- function focusKey(e) {
- if (key.hasClass("empty")) {
- key.removeClass("empty");
- }
- }
-
- function blurKey(e) {
- if (key.get(0).value === "") {
- key.addClass("empty");
- }
- }
-
- //搜索树
- function searchNode(e) {
- var zTreeObj = $.fn.zTree.getZTreeObj("treeDemo");
- var value = $.trim(key.get(0).value);
- var keyType = "name";
-
- if (key.hasClass("empty")) {
- value = "";
- }
-
- //显示上次搜索后背隐藏的结点
- zTreeObj.showNodes(hiddenNodes);
- //查找不符合条件的叶子节点
- function filterFunc(node){
- var _keywords = $("#menuName").val();
- if(node.name.indexOf(_keywords) != -1)
- return false;
- if(node.isParent) {
- //是父节点时需要判断子节点是否符合条件，是的话则父节点需要保留
- var bl = CheckChildNodesIsContainKeyword(node);
- return bl;
- } else {
- //是子节点时，需要判断父节点是否符合条件，是的话则子节点需要保留
- var bl2 = CheckParentNodesIsContainKeyword(node);
- return bl2;
- }
- return true;
- };
- //获取不符合条件的叶子结点
- hiddenNodes = zTreeObj.getNodesByFilter(filterFunc);
- //隐藏不符合条件的叶子结点
- zTreeObj.hideNodes(hiddenNodes);
- if (lastValue === value) return;
- lastValue = value;
- if (value === ""){
- updateNodes(false);
- return;
- };
- updateNodes(false);
- nodeList = zTreeObj.getNodesByParamFuzzy(keyType, value); //调用ztree的模糊查询功能，得到符合条件的节点
- updateNodes(true); //更新节点
- };
-
- //tree搜索时：是父节点时需要判断子节点是否符合条件，是的话则父节点需要保留
- function CheckChildNodesIsContainKeyword(pNode) {
- var childs = pNode.children;
- var isexit = true;
- if(!isNull(childs)){
- for(var i = 0; i < childs.length; i++) {
- if(childs[i].isParent) {
- isexit = CheckChildNodesIsContainKeyword(childs[i]);
- if(!isexit)
- return isexit;
- } else {
- var _keywords = $("#menuName").val();
- if(childs[i].name.indexOf(_keywords) != -1)
- return false;
- }
- }
- }
-
- return true;
- }
-
- //tree 搜索时：子节点时，需要判断父节点是否符合条件，是的话则子节点需要保留
- function CheckParentNodesIsContainKeyword(cNode) {
- var pnode = cNode.getParentNode();
- if(pnode != null) {
- var _keywords = $("#menuName").val();
- if(pnode.name.indexOf(_keywords) != -1)
- return false;
- else {
- return CheckParentNodesIsContainKeyword(pnode)
- }
- }
- return true;
- }
-
-
- //高亮显示被搜索到的节点
- function updateNodes(highlight) {
- var zTree = $.fn.zTree.getZTreeObj("treeDemo");
- for( var i = 0; i < nodeList.length; i++) {
- nodeList[i].highlight = highlight;//高亮显示搜索到的节点(highlight是自己设置的一个属性)
- zTree.expandNode(nodeList[i].getParentNode(), true, false, false);//将搜索到的节点的父节点展开
- zTree.updateNode(nodeList[i]);//更新节点数据，主要用于该节点显示属性的更新
- }
- }
-
- function setFontCss(treeId, treeNode) {
- return (!!treeNode.highlight) ? {color:"#00ff66", "font-weight":"bold"} : {color:"#333", "font-weight":"normal"};
- }
-
// 取消
$("body").on("click", "#cancle", function(){
parent.layer.close(index);
diff --git a/userauth/src/main/resources/template/js/syseverole/syseveroleedit.js b/userauth/src/main/resources/template/js/syseverole/syseveroleedit.js
index ed0637343..4b0401890 100644
--- a/userauth/src/main/resources/template/js/syseverole/syseveroleedit.js
+++ b/userauth/src/main/resources/template/js/syseverole/syseveroleedit.js
@@ -4,31 +4,34 @@ layui.config({
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'fsCommon', 'fsTree', 'textool', 'form'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'textool', 'form'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form,
- fsTree = layui.fsTree,
- fsCommon = layui.fsCommon,
textool = layui.textool;
- var checkeRows = '';
+ AjaxPostUtil.request({url: reqBasePath + "sys016", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function(json){
+ if(json.returnCode == 0){
+ $("#roleName").val(json.bean.roleName);
+ $("#roleDesc").val(json.bean.roleDesc);
+ textool.init({
+ eleId: 'roleDesc',
+ maxlength: 250,
+ tools: ['count', 'copy', 'reset', 'clear']
+ });
+ }else{
+ winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+ }
+ }});
matchingLanguage();
form.render();
form.on('submit(formEditBean)', function (data) {
if (winui.verifyForm(data.elem)) {
- var tree = $.fn.zTree.getZTreeObj("treeDemo");
- var nodes = tree.getCheckedNodes(true);
- var menuIds = new Array();
- for(var i = 0; i < nodes.length; i++){
- menuIds.push(nodes[i].id);
- }
var params = {
roleName: $("#roleName").val(),
roleDesc: $("#roleDesc").val(),
- menuIds: JSON.stringify(menuIds),
rowId: parent.rowId
};
@@ -44,227 +47,6 @@ layui.config({
return false;
});
- /********* tree 处理 start *************/
-
- var trees = {};
- var treeDoms = $("ul.fsTree");
-
-
- AjaxPostUtil.request({url: reqBasePath + "sys016", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function(json){
- if(json.returnCode == 0){
- $("#roleName").val(json.bean.roleName);
- $("#roleDesc").val(json.bean.roleDesc);
- textool.init({
- eleId: 'roleDesc',
- maxlength: 250,
- tools: ['count', 'copy', 'reset', 'clear']
- });
- checkeRows = json.rows;
- if(treeDoms.length > 0) {
- $(treeDoms).each(function(i) {
- var treeId = $(this).attr("id");
- var funcNo = $(this).attr("funcNo");
- var url = $(this).attr("url");
- var tree = fsTree.render({
- id: treeId,
- funcNo: funcNo,
- url: url + "?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
- getTree: getTree,
- checkEnable: true,
- loadEnable: false,
- showLine: false,
- showIcon: false,
- addDiyDom: addDiyDom,
- fontCss: setFontCss,
- expandSpeed: 'speed'
- }, function(id){
- var zTreeObj = $.fn.zTree.getZTreeObj(id);
- var zTree = zTreeObj.getCheckedNodes(false);
- for (var i = 0; i < zTree.length; i++) {
- for(var j = 0; j < checkeRows.length; j++){
- if(zTree[i].id == checkeRows[j].menuId){
- zTreeObj.checkNode(zTree[i], true);
- checkeRows.splice(j, 1);
- }
- }
- }
- var li_head = ' 所属系统
菜单权限
菜单类型
';
- var rows = $("#" + treeId).find('li');
- if(rows.length > 0) {
- rows.eq(0).before(li_head)
- } else {
- $("#" + treeId).append(li_head);
- $("#" + treeId).append('无符合条件数据
')
- }
- });
- if(treeDoms.length == 1) {
- trees[treeId] = tree;
- } else {
- //深度拷贝对象
- trees[treeId] = $.extend(true, {}, tree);
- }
- });
- //绑定按钮事件
- fsCommon.buttonEvent("tree", getTree);
- }
- }else{
- winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
- }
- }});
-
- function getTree(treeId) {
- if($.isEmpty(trees)) {
- fsCommon.warnMsg("未配置tree！");
- return;
- }
- if($.isEmpty(treeId)) {
- treeId = "treeDemo";
- }
- return trees[treeId];
- }
-
- /********* tree 处理 end *************/
-
- /**
- * 自定义DOM节点
- */
- function addDiyDom(treeId, treeNode) {
- var spaceWidth = 15;
- var liObj = $("#" + treeNode.tId);
- var aObj = $("#" + treeNode.tId + "_a");
- var switchObj = $("#" + treeNode.tId + "_switch");
- var icoObj = $("#" + treeNode.tId + "_ico");
- var spanObj = $("#" + treeNode.tId + "_span");
- aObj.attr('title', '');
- aObj.append('');
- var div = $(liObj).find('div').eq(0);
- switchObj.remove();
- spanObj.remove();
- icoObj.remove();
- div.append(switchObj);
- div.append(spanObj);
- var spaceStr = "";
- switchObj.before(spaceStr);
- var editStr = '';
- editStr = '' + (treeNode.sysName == null ? ' ' : treeNode.sysName) + '
';
- aObj.before(editStr);
- editStr = '' + (treeNode.pageType == null ? ' ' : treeNode.pageType) + '
';
- aObj.append(editStr);
- }
-
- var lastValue = "", nodeList = [], fontCss = {}, hiddenNodes = [];
- $("#menuName").val('');
- var key = $("#menuName");
- key.bind("focus", focusKey)
- .bind("blur", blurKey)
- .bind("propertychange", searchNode) //property(属性)change(改变)的时候，触发事件
- .bind("input", searchNode);
-
- function focusKey(e) {
- if (key.hasClass("empty")) {
- key.removeClass("empty");
- }
- }
-
- function blurKey(e) {
- if (key.get(0).value === "") {
- key.addClass("empty");
- }
- }
-
- //搜索树
- function searchNode(e) {
- var zTreeObj = $.fn.zTree.getZTreeObj("treeDemo");
- var value = $.trim(key.get(0).value);
- var keyType = "name";
-
- if (key.hasClass("empty")) {
- value = "";
- }
-
- //显示上次搜索后背隐藏的结点
- zTreeObj.showNodes(hiddenNodes);
- //查找不符合条件的叶子节点
- function filterFunc(node){
- var _keywords = $("#menuName").val();
- if(node.name.indexOf(_keywords) != -1)
- return false;
- if(node.isParent) {
- //是父节点时需要判断子节点是否符合条件，是的话则父节点需要保留
- var bl = CheckChildNodesIsContainKeyword(node);
- return bl;
- } else {
- //是子节点时，需要判断父节点是否符合条件，是的话则子节点需要保留
- var bl2 = CheckParentNodesIsContainKeyword(node);
- return bl2;
- }
- return true;
- };
- //获取不符合条件的叶子结点
- hiddenNodes = zTreeObj.getNodesByFilter(filterFunc);
- //隐藏不符合条件的叶子结点
- zTreeObj.hideNodes(hiddenNodes);
- if (lastValue === value) return;
- lastValue = value;
- if (value === ""){
- updateNodes(false);
- return;
- };
- updateNodes(false);
- nodeList = zTreeObj.getNodesByParamFuzzy(keyType, value); //调用ztree的模糊查询功能，得到符合条件的节点
- updateNodes(true); //更新节点
- };
-
- //tree搜索时：是父节点时需要判断子节点是否符合条件，是的话则父节点需要保留
- function CheckChildNodesIsContainKeyword(pNode) {
- var childs = pNode.children;
- var isexit = true;
- if(!isNull(childs)){
- for(var i = 0; i < childs.length; i++) {
- if(childs[i].isParent) {
- isexit = CheckChildNodesIsContainKeyword(childs[i]);
- if(!isexit)
- return isexit;
- } else {
- var _keywords = $("#menuName").val();
- if(childs[i].name.indexOf(_keywords) != -1)
- return false;
- }
- }
- }
-
- return true;
- }
-
- //tree 搜索时：子节点时，需要判断父节点是否符合条件，是的话则子节点需要保留
- function CheckParentNodesIsContainKeyword(cNode) {
- var pnode = cNode.getParentNode();
- if(pnode != null) {
- var _keywords = $("#menuName").val();
- if(pnode.name.indexOf(_keywords) != -1)
- return false;
- else {
- return CheckParentNodesIsContainKeyword(pnode)
- }
- }
- return true;
- }
-
-
- //高亮显示被搜索到的节点
- function updateNodes(highlight) {
- var zTree = $.fn.zTree.getZTreeObj("treeDemo");
- for( var i = 0; i < nodeList.length; i++) {
- nodeList[i].highlight = highlight;//高亮显示搜索到的节点(highlight是自己设置的一个属性)
- zTree.expandNode(nodeList[i].getParentNode(), true, false, false);//将搜索到的节点的父节点展开
- zTree.updateNode(nodeList[i]);//更新节点数据，主要用于该节点显示属性的更新
- }
- }
-
- function setFontCss(treeId, treeNode) {
- return (!!treeNode.highlight) ? {color:"#00ff66", "font-weight":"bold"} : {color:"#333", "font-weight":"normal"};
- }
-
// 取消
$("body").on("click", "#cancle", function(){
parent.layer.close(index);
diff --git a/userauth/src/main/resources/template/js/syseverole/syseverolelist.js b/userauth/src/main/resources/template/js/syseverole/syseverolelist.js
index 48dddcaf9..7845a38d3 100644
--- a/userauth/src/main/resources/template/js/syseverole/syseverolelist.js
+++ b/userauth/src/main/resources/template/js/syseverole/syseverolelist.js
@@ -30,7 +30,7 @@ layui.config({
{ field: 'userNum', title: '使用用户数量', width: 150 },
{ field: 'parentName', title: '父角色', width: 150 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
- { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 220, toolbar: '#tableBar'}
+ { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 300, toolbar: '#tableBar'}
]],
done: function(){
matchingLanguage();
@@ -40,13 +40,15 @@ layui.config({
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
- if (layEvent === 'del') { //删除
+ if (layEvent === 'del') { // 删除
del(data, obj);
- }else if (layEvent === 'edit') { //编辑
+ }else if (layEvent === 'edit') { // 编辑
edit(data);
- }else if (layEvent === 'appmenu') { //手机端菜单授权
+ }else if (layEvent === 'appmenu') { // 手机端菜单授权
appmenu(data);
- }
+ }else if (layEvent === 'pcMenu') { // PC端菜单授权
+ pcMenu(data);
+ }
});
form.render();
@@ -99,14 +101,20 @@ layui.config({
pageId: "syseveroleappmenu",
area: ['90vw', '90vh'],
callBack: function(refreshCode){
- if (refreshCode == '0') {
- winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1,time: 2000});
- loadTable();
- } else if (refreshCode == '-9999') {
- winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
- }
}});
}
+
+ // PC端菜单授权
+ function pcMenu(data){
+ rowId = data.id;
+ _openNewWindows({
+ url: "../../tpl/syseverole/sysEveRolePCMenu.html",
+ title: "PC端菜单授权",
+ pageId: "sysEveRolePCMenu",
+ area: ['90vw', '90vh'],
+ callBack: function(refreshCode){
+ }});
+ }
//刷新数据
$("body").on("click", "#reloadTable", function(){
diff --git a/userauth/src/main/resources/template/tpl/syseverole/sysEveRolePCMenu.html b/userauth/src/main/resources/template/tpl/syseverole/sysEveRolePCMenu.html
new file mode 100644
index 000000000..349f8ec48
--- /dev/null
+++ b/userauth/src/main/resources/template/tpl/syseverole/sysEveRolePCMenu.html
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/userauth/src/main/resources/template/tpl/syseverole/syseveroleadd.html b/userauth/src/main/resources/template/tpl/syseverole/syseveroleadd.html
index f40244aef..827dc4ddf 100644
--- a/userauth/src/main/resources/template/tpl/syseverole/syseveroleadd.html
+++ b/userauth/src/main/resources/template/tpl/syseverole/syseveroleadd.html
@@ -5,9 +5,6 @@
-
-
-
@@ -24,16 +21,6 @@
-
-