diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java index 9ccff44..70a8c36 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java @@ -18,6 +18,10 @@ import com.tamguo.modules.sys.model.enums.SysMenuStatusEnum; @TableName(value="sys_menu") public class SysMenuEntity implements Serializable { private static final long serialVersionUID = 1L; + + public static final String ROOT_MENU_CODE = "0"; + public static final String TREE_CODE_MENU_SEPARATE = ","; + public static final String TREE_NAME_MENU_SEPARATE = "/"; @TableId private String menuCode; diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java index 153e441..acb29f8 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java @@ -89,10 +89,12 @@ public class SysMenuServiceImpl extends ServiceImpl 0) { + menu.setTreeLeaf(false); + }else { + menu.setTreeLeaf(true); + } + return menu; } } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CommonController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CommonController.java index 80faa97..67f2a31 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CommonController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CommonController.java @@ -8,6 +8,7 @@ import org.springframework.web.servlet.ModelAndView; public class CommonController { private final String TREE_SELECT_PAGE = "modules/sys/common/treeselect"; + private final String TREE_ICON_PAGE = "modules/sys/common/iconselect"; private final String SYS_DESKTOP_PAGE = "modules/sys/common/desktop"; @RequestMapping(path="sys/treeselect") @@ -16,6 +17,12 @@ public class CommonController { model.setViewName(TREE_SELECT_PAGE); return model; } + + @RequestMapping(path="sys/iconselect") + public ModelAndView iconselect(ModelAndView model) { + model.setViewName(TREE_ICON_PAGE); + return model; + } @RequestMapping(path="sys/desktop") public ModelAndView index(ModelAndView model) { diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/common/iconselect.html b/tamguo-oms/src/main/resources/templates/modules/sys/common/iconselect.html new file mode 100644 index 0000000..8b2de3f --- /dev/null +++ b/tamguo-oms/src/main/resources/templates/modules/sys/common/iconselect.html @@ -0,0 +1,2485 @@ + +图标选择 - JeeSite Demo + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/menu/add.html b/tamguo-oms/src/main/resources/templates/modules/sys/menu/add.html index f1b05e1..49eca25 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/menu/add.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/menu/add.html @@ -224,7 +224,7 @@ $("#menuIconButton").click(function(){ title: '图标选择', area: [(js.layer.$(js.layer.window).width() - 100) + 'px', (js.layer.$(js.layer.window).height() - 100) + 'px'], - content: '/js/tags/iconselect?value='+$("#menuIcon").val(), + content: ctx + 'sys/iconselect?value='+$("#menuIcon").val(), success: function(layero, index){ var info = '提示:双击选择图标。'; layero.find('.layui-layer-btn').append(info); diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/menu/update.html b/tamguo-oms/src/main/resources/templates/modules/sys/menu/update.html index 13e457f..c51691f 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/menu/update.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/menu/update.html @@ -224,7 +224,7 @@ $("#menuIconButton").click(function(){ title: '图标选择', area: [(js.layer.$(js.layer.window).width() - 100) + 'px', (js.layer.$(js.layer.window).height() - 100) + 'px'], - content: '/js/tags/iconselect?value='+$("#menuIcon").val(), + content: 'sys/iconselect?value='+$("#menuIcon").val(), success: function(layero, index){ var info = '提示:双击选择图标。'; layero.find('.layui-layer-btn').append(info);