diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index d4191711b..c5a0b297c 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -478,7 +478,7 @@ useable=Useable click_add=Click And Add menu_name=Menu Name unicode=Unicode -link=Link +link=URL visible=Visible permission_mark=Permission Mark display=Display @@ -489,14 +489,14 @@ save_sort=Save Sort menu=Menu parent_menu=Parent Menu aim=Aim -click_menu_turn=\u70B9\u51FB\u83DC\u5355\u8DF3\u8F6C\u7684\u9875\u9762 -link_window_info=\u94FE\u63A5\u5730\u5740\u6253\u5F00\u7684\u76EE\u6807\u7A97\u53E3,\u9ED8\u8BA4\:mainFrame -is_top_menu=\u662F\u5426\u9876\u90E8\u5BFC\u822A\u83DC\u5355 +click_menu_turn=Click The Menu Will Trun To This Page +link_window_info=The Aim Window Opened By The URL,Default\:mainFrame +is_top_menu=Top Level Menu icon=Icon -is_top_menu_info=\u8BE5\u83DC\u5355\u6216\u64CD\u4F5C\u662F\u5426\u9876\u90E8\u5BFC\u822A\u83DC\u5355 +is_top_menu_info=Whether This Menu Is The Top Navigation Menu sort_info=Sort Asc -is_show_sysmenu=\u8BE5\u83DC\u5355\u6216\u64CD\u4F5C\u662F\u5426\u663E\u793A\u5230\u7CFB\u7EDF\u83DC\u5355\u4E2D -control_permission_info=\u63A7\u5236\u5668\u4E2D\u5B9A\u4E49\u7684\u6743\u9650\u6807\u8BC6,\u5982\:@RequiresPermissions("\u6743\u9650\u6807\u8BC6") +is_show_sysmenu=Whether This Menu Is Display On The System Menu +control_permission_info=Permission Identity Defined In The Controller,Such As\:@RequiresPermissions("Permission Identity") role_name=Role Name data_range=Data Scope allot=Allot diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag index 4072e43c7..b641b49ba 100644 --- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag +++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag @@ -28,7 +28,7 @@ <%@ attribute name="unCheckedPS" type="java.lang.String" required="false" description="复选框取消选中时是否关联父子节点,ps关联父子,p关联父,s关联子,都不关联为空"%>
-
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp index 2d63eb34e..9a768d55f 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp @@ -108,7 +108,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp index 581ea9ddd..de02873bb 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp @@ -112,7 +112,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp index 561608de8..7fb886fbc 100644 --- a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp @@ -45,7 +45,8 @@
- ${not empty menu.id?'修改':'添加'}
+
+
@@ -60,8 +61,8 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/sys/roleList.jsp b/src/main/webapp/WEB-INF/views/sys/roleList.jsp index 255a4ab28..d67d657fc 100644 --- a/src/main/webapp/WEB-INF/views/sys/roleList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/roleList.jsp @@ -40,7 +40,7 @@ - + @@ -49,7 +49,7 @@ diff --git a/src/main/webapp/WEB-INF/views/sys/userList.jsp b/src/main/webapp/WEB-INF/views/sys/userList.jsp index ffb3c9530..36500729d 100644 --- a/src/main/webapp/WEB-INF/views/sys/userList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/userList.jsp @@ -83,32 +83,32 @@ -
+
-
-
- +
+
+
+ +
-
-
- +
+
+
+ +
- -
-
- - -
${role.name} <%-- --%> - ?', this.href)"> + ', this.href)">