diff --git a/admin-console/src/main/resources/static/js/admin/role/roleFn.js b/admin-console/src/main/resources/static/js/admin/role/roleFn.js index 7a45a44aa378aa6cbadbe70f556fba863d0f2dbf..1a016f1c0f699c7fc23f13caafc7f7546b515add 100644 --- a/admin-console/src/main/resources/static/js/admin/role/roleFn.js +++ b/admin-console/src/main/resources/static/js/admin/role/roleFn.js @@ -16,7 +16,8 @@ layui.define([ 'form', 'laydate', 'table','roleApi'], function(exports) { var that = this; $.post(Common.ctxPath + "/admin/function/tree.json", {}, function(response) { var zNodes = response.data; - var setting = {"check":{"radioType":true,"enable":true}}; + // select parent node does not affect the children node + var setting = {"check":{"chkStyle":"checkbox","enable":true, "chkboxType": { "Y": "p", "N": "p" }}}; zTreeObj = $.fn.zTree.init($("#functionTree"), setting, zNodes); //功能树加载完毕后在初始化其他控件 that.initFirstRole(); diff --git a/admin-core/src/main/resources/codeTemplate/java/controller.java b/admin-core/src/main/resources/codeTemplate/java/controller.java index 381b2eb4a1b8cdee6f3a136aa0a45975cba09d13..acfebb60bd75fa02daa2eec29195bb18111be4d4 100644 --- a/admin-core/src/main/resources/codeTemplate/java/controller.java +++ b/admin-core/src/main/resources/codeTemplate/java/controller.java @@ -112,8 +112,8 @@ public class ${entity.name}Controller{ return new JsonResult().success(); } - \@PostMapping(MODEL + "/update.json") - \@Function("${basicfunctionCode}.update") + \@PostMapping(MODEL + "/edit.json") + \@Function("${basicfunctionCode}.edit") \@ResponseBody public JsonResult update(\@Validated(ValidateConfig.UPDATE.class) ${entity.name} ${entity.code}) { boolean success = ${service}.update(${entity.code}); diff --git a/admin-core/src/main/resources/static/plugins/frame/js/fsTab.js b/admin-core/src/main/resources/static/plugins/frame/js/fsTab.js index 6ac3565f8bbb69300555669c80e7f50e23f12de7..89c1e40aee97d992996aceb2b1b81ea576c85164 100644 --- a/admin-core/src/main/resources/static/plugins/frame/js/fsTab.js +++ b/admin-core/src/main/resources/static/plugins/frame/js/fsTab.js @@ -49,7 +49,6 @@ layui.define(['element'], function(exports){ element.on('tabDelete('+this.config.tabFilter+')', function(data){ - debugger; var li =$(this).parent(); var layId = $(li).attr("lay-id"); //删除tab上标记