labxiekai 部署微服务应用

app_web/public/assets/json/view-config.json

@@ -24,24 +24,24 @@
         "viewtag": "12f53853382743f095a6af867669d8c1"
     },
     "sysappeditview": {
-        "title": "应用编辑视图",
-        "caption": "应用",
+        "title": "接入应用",
+        "caption": "接入应用",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "uaa",
         "viewname": "SysAppEditView",
         "viewtag": "137b8f036994965b8926455611848134"
     },
-    "sys_rolepickupgridview": {
+    "sysrolepickupgridview": {
         "title": "角色选择表格视图",
         "caption": "系统角色",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "uaa",
-        "viewname": "SYS_ROLEPickupGridView",
+        "viewname": "SysRolePickupGridView",
         "viewtag": "1a3413067ee48ab30691eab9f345f517"
     },
     "sysuserroleeditview": {
-        "title": "用户角色关系表编辑视图",
-        "caption": "用户角色关系",
+        "title": "用户",
+        "caption": "用户",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "uaa",
         "viewname": "SysUserRoleEditView",
@@ -71,12 +71,12 @@
         "viewname": "SYS_USER_ROLEPickupGridView",
         "viewtag": "320dc0d5f5dc15c74cdfe3dbb820d2ac"
     },
-    "sys_role_permissionmpickupview": {
+    "sysrolepermissionmpickupview": {
         "title": "角色权限关系表数据多项选择视图",
         "caption": "角色权限关系",
         "viewtype": "DEMPICKUPVIEW",
         "viewmodule": "uaa",
-        "viewname": "SYS_ROLE_PERMISSIONMPickupView",
+        "viewname": "SysRolePermissionMPickupView",
         "viewtag": "3e133a839b837d9e47f80e161d66a861"
     },
     "sys_permissiongridview": {
@@ -87,20 +87,20 @@
         "viewname": "SYS_PERMISSIONGridView",
         "viewtag": "42f3fa04c9dc77f235207bcbe6ac3888"
     },
-    "sys_roleeditview2": {
-        "title": "角色编辑视图",
-        "caption": "系统角色",
+    "sysroleeditview2": {
+        "title": "角色",
+        "caption": "角色",
         "viewtype": "DEEDITVIEW2",
         "viewmodule": "uaa",
-        "viewname": "SYS_ROLEEditView2",
+        "viewname": "SysRoleEditView2",
         "viewtag": "4470edcdb57a14007444c0d9867e571c"
     },
-    "sys_role_permissionredirectview": {
+    "sysrolepermissionredirectview": {
         "title": "角色权限关系表数据重定向视图",
         "caption": "角色权限关系",
         "viewtype": "DEREDIRECTVIEW",
         "viewmodule": "uaa",
-        "viewname": "SYS_ROLE_PERMISSIONRedirectView",
+        "viewname": "SysRolePermissionRedirectView",
         "viewtag": "47fb02384b5797f4b095e247619515f4"
     },
     "sysrolepermissiongridview": {
@@ -119,20 +119,20 @@
         "viewname": "SYS_ROLE_PERMISSIONPickupGridView",
         "viewtag": "6baae51f242438b90446176f76405183"
     },
-    "sys_role_permissionpickupview": {
+    "sysrolepermissionpickupview": {
         "title": "角色权限关系表数据选择视图",
         "caption": "角色权限关系",
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "uaa",
-        "viewname": "SYS_ROLE_PERMISSIONPickupView",
+        "viewname": "SysRolePermissionPickupView",
         "viewtag": "6cd33d562ef19ad47dd26b312b9a020e"
     },
-    "sys_roleeditview": {
-        "title": "角色编辑视图",
-        "caption": "系统角色",
+    "sysroleeditview": {
+        "title": "角色",
+        "caption": "角色",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "uaa",
-        "viewname": "SYS_ROLEEditView",
+        "viewname": "SysRoleEditView",
         "viewtag": "6f5a41631520da5e33294a1225101e66"
     },
     "sys_userredirectview": {
@@ -199,12 +199,12 @@
         "viewname": "SYS_USERPickupGridView",
         "viewtag": "936880f60b6ef17d39d5248b5fe390b4"
     },
-    "sys_usereditview": {
-        "title": "用户表编辑视图",
-        "caption": "系统用户",
+    "sysusereditview": {
+        "title": "用户",
+        "caption": "用户",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "uaa",
-        "viewname": "SYS_USEREditView",
+        "viewname": "SysUserEditView",
         "viewtag": "9a896aa77c214ed87ab9be4fd6c6bec5"
     },
     "sys_permissionpickupgridview": {
@@ -279,12 +279,12 @@
         "viewname": "SYS_USERPickupView",
         "viewtag": "d53cb0ce933245fae5f0623bac4fbf48"
     },
-    "sys_role_permissioncustomview": {
+    "sysrolepermissioncustomview": {
         "title": "角色权限关系自定义视图",
         "caption": "角色权限关系",
         "viewtype": "DECUSTOMVIEW",
         "viewmodule": "uaa",
-        "viewname": "SYS_ROLE_PERMISSIONCustomView",
+        "viewname": "SysRolePermissionCustomView",
         "viewtag": "e791be173ed0f4bbe9cce942b6edde63"
     },
     "sys_permissioneditview": {
@@ -295,12 +295,12 @@
         "viewname": "SYS_PERMISSIONEditView",
         "viewtag": "eb6498ba353f58d0af17bbd39702ccf7"
     },
-    "sys_user_roleeditview2": {
-        "title": "用户角色关系表编辑视图",
-        "caption": "用户角色关系",
+    "sysuserroleeditview2": {
+        "title": "用户",
+        "caption": "用户",
         "viewtype": "DEEDITVIEW2",
         "viewmodule": "uaa",
-        "viewname": "SYS_USER_ROLEEditView2",
+        "viewname": "SysUserRoleEditView2",
         "viewtag": "ede089b4741590173bd21b9df99c1cf0"
     },
     "sys_user_rolepickupview": {

app_web/src/locale/lang/en-US.ts

@@ -16,6 +16,7 @@ export default {
             success: "Success",
             ok: "OK",
             cancel: "Cancel",
+            save: "Save",
             codeNotExist: 'Code list does not exist',
             reqException: "Request exception",
             sysException: "System abnormality",
@@ -187,6 +188,17 @@ export default {
             quarter: "Quarter",   
             year: "Year",
         },
+        searchFrom: {
+            notConfig: {
+                loadAction: "View search form loadAction parameter is not configured",
+                loaddraftAction: "View search form loaddraftAction parameter is not configured",
+            },
+        },
+        wizardPanel: {
+            back: "Back",
+            next: "Next",
+            complete: "Complete",
+        },
     },
     entities: {
         sysauthlog: sysauthlog_en_US,

app_web/src/locale/lang/zh-CN.ts

@@ -16,6 +16,7 @@ export default {
             success: "成功",
             ok: "确认",
             cancel: "取消",
+            save: "保存",
             codeNotExist: "代码表不存在",
             reqException: "请求异常",
             sysException: "系统异常",
@@ -186,6 +187,17 @@ export default {
             quarter: "季度",   
             year: "年",
         },
+        searchFrom: {
+            notConfig: {
+                loadAction: "视图搜索表单loadAction参数未配置",
+                loaddraftAction: "视图搜索表单loaddraftAction参数未配置",
+            },
+        },
+        wizardPanel: {
+            back: "上一步",
+            next: "下一步",
+            complete: "完成",
+        },
     },
     entities: {
         sysauthlog: sysauthlog_zh_CN,

app_web/src/locale/lanres/entities/sys-app/sys-app_en_US.ts

@@ -13,8 +13,8 @@ export default {
   },
 	views: {
 		editview: {
-			caption: "应用",
-      		title: "应用编辑视图",
+			caption: "接入应用",
+      		title: "接入应用",
 		},
 		gridview: {
 			caption: "接入应用",

app_web/src/locale/lanres/entities/sys-app/sys-app_zh_CN.ts

@@ -12,8 +12,8 @@ export default {
   },
 	views: {
 		editview: {
-			caption: "应用",
-      		title: "应用编辑视图",
+			caption: "接入应用",
+      		title: "接入应用",
 		},
 		gridview: {
 			caption: "接入应用",

app_web/src/locale/lanres/entities/sys-role/sys-role_en_US.ts

@@ -13,12 +13,12 @@ export default {
       		title: "角色选择表格视图",
 		},
 		editview2: {
-			caption: "系统角色",
-      		title: "角色编辑视图",
+			caption: "角色",
+      		title: "角色",
 		},
 		editview: {
-			caption: "系统角色",
-      		title: "角色编辑视图",
+			caption: "角色",
+      		title: "角色",
 		},
 		pickupview: {
 			caption: "系统角色",

app_web/src/locale/lanres/entities/sys-role/sys-role_zh_CN.ts

@@ -12,12 +12,12 @@ export default {
       		title: "角色选择表格视图",
 		},
 		editview2: {
-			caption: "系统角色",
-      		title: "角色编辑视图",
+			caption: "角色",
+      		title: "角色",
 		},
 		editview: {
-			caption: "系统角色",
-      		title: "角色编辑视图",
+			caption: "角色",
+      		title: "角色",
 		},
 		pickupview: {
 			caption: "系统角色",

app_web/src/locale/lanres/entities/sys-user-role/sys-user-role_en_US.ts

@@ -18,8 +18,8 @@ export default {
       		title: "用户角色关系表数据重定向视图",
 		},
 		editview: {
-			caption: "用户角色关系",
-      		title: "用户角色关系表编辑视图",
+			caption: "用户",
+      		title: "用户",
 		},
 		pickupgridview: {
 			caption: "用户角色关系",
@@ -30,8 +30,8 @@ export default {
       		title: "用户角色关系表数据多项选择视图",
 		},
 		editview2: {
-			caption: "用户角色关系",
-      		title: "用户角色关系表编辑视图",
+			caption: "用户",
+      		title: "用户",
 		},
 		pickupview: {
 			caption: "用户角色关系",

app_web/src/locale/lanres/entities/sys-user-role/sys-user-role_zh_CN.ts

@@ -17,8 +17,8 @@ export default {
       		title: "用户角色关系表数据重定向视图",
 		},
 		editview: {
-			caption: "用户角色关系",
-      		title: "用户角色关系表编辑视图",
+			caption: "用户",
+      		title: "用户",
 		},
 		pickupgridview: {
 			caption: "用户角色关系",
@@ -29,8 +29,8 @@ export default {
       		title: "用户角色关系表数据多项选择视图",
 		},
 		editview2: {
-			caption: "用户角色关系",
-      		title: "用户角色关系表编辑视图",
+			caption: "用户",
+      		title: "用户",
 		},
 		pickupview: {
 			caption: "用户角色关系",

app_web/src/locale/lanres/entities/sys-user/sys-user_en_US.ts

@@ -52,8 +52,8 @@ export default {
       		title: "用户表选择表格视图",
 		},
 		editview: {
-			caption: "系统用户",
-      		title: "用户表编辑视图",
+			caption: "用户",
+      		title: "用户",
 		},
 		gridview: {
 			caption: "用户",

app_web/src/locale/lanres/entities/sys-user/sys-user_zh_CN.ts

@@ -51,8 +51,8 @@ export default {
       		title: "用户表选择表格视图",
 		},
 		editview: {
-			caption: "系统用户",
-      		title: "用户表编辑视图",
+			caption: "用户",
+      		title: "用户",
 		},
 		gridview: {
 			caption: "用户",

app_web/src/mock/viewconfig/viewconfig.ts

@@ -32,24 +32,24 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "12f53853382743f095a6af867669d8c1"
         },
         "sysappeditview": {
-            "title": "应用编辑视图",
-            "caption": "应用",
+            "title": "接入应用",
+            "caption": "接入应用",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "uaa",
             "viewname": "SysAppEditView",
             "viewtag": "137b8f036994965b8926455611848134"
         },
-        "sys_rolepickupgridview": {
+        "sysrolepickupgridview": {
             "title": "角色选择表格视图",
             "caption": "系统角色",
             "viewtype": "DEPICKUPGRIDVIEW",
             "viewmodule": "uaa",
-            "viewname": "SYS_ROLEPickupGridView",
+            "viewname": "SysRolePickupGridView",
             "viewtag": "1a3413067ee48ab30691eab9f345f517"
         },
         "sysuserroleeditview": {
-            "title": "用户角色关系表编辑视图",
-            "caption": "用户角色关系",
+            "title": "用户",
+            "caption": "用户",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "uaa",
             "viewname": "SysUserRoleEditView",
@@ -79,12 +79,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SYS_USER_ROLEPickupGridView",
             "viewtag": "320dc0d5f5dc15c74cdfe3dbb820d2ac"
         },
-        "sys_role_permissionmpickupview": {
+        "sysrolepermissionmpickupview": {
             "title": "角色权限关系表数据多项选择视图",
             "caption": "角色权限关系",
             "viewtype": "DEMPICKUPVIEW",
             "viewmodule": "uaa",
-            "viewname": "SYS_ROLE_PERMISSIONMPickupView",
+            "viewname": "SysRolePermissionMPickupView",
             "viewtag": "3e133a839b837d9e47f80e161d66a861"
         },
         "sys_permissiongridview": {
@@ -95,20 +95,20 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SYS_PERMISSIONGridView",
             "viewtag": "42f3fa04c9dc77f235207bcbe6ac3888"
         },
-        "sys_roleeditview2": {
-            "title": "角色编辑视图",
-            "caption": "系统角色",
+        "sysroleeditview2": {
+            "title": "角色",
+            "caption": "角色",
             "viewtype": "DEEDITVIEW2",
             "viewmodule": "uaa",
-            "viewname": "SYS_ROLEEditView2",
+            "viewname": "SysRoleEditView2",
             "viewtag": "4470edcdb57a14007444c0d9867e571c"
         },
-        "sys_role_permissionredirectview": {
+        "sysrolepermissionredirectview": {
             "title": "角色权限关系表数据重定向视图",
             "caption": "角色权限关系",
             "viewtype": "DEREDIRECTVIEW",
             "viewmodule": "uaa",
-            "viewname": "SYS_ROLE_PERMISSIONRedirectView",
+            "viewname": "SysRolePermissionRedirectView",
             "viewtag": "47fb02384b5797f4b095e247619515f4"
         },
         "sysrolepermissiongridview": {
@@ -127,20 +127,20 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SYS_ROLE_PERMISSIONPickupGridView",
             "viewtag": "6baae51f242438b90446176f76405183"
         },
-        "sys_role_permissionpickupview": {
+        "sysrolepermissionpickupview": {
             "title": "角色权限关系表数据选择视图",
             "caption": "角色权限关系",
             "viewtype": "DEPICKUPVIEW",
             "viewmodule": "uaa",
-            "viewname": "SYS_ROLE_PERMISSIONPickupView",
+            "viewname": "SysRolePermissionPickupView",
             "viewtag": "6cd33d562ef19ad47dd26b312b9a020e"
         },
-        "sys_roleeditview": {
-            "title": "角色编辑视图",
-            "caption": "系统角色",
+        "sysroleeditview": {
+            "title": "角色",
+            "caption": "角色",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "uaa",
-            "viewname": "SYS_ROLEEditView",
+            "viewname": "SysRoleEditView",
             "viewtag": "6f5a41631520da5e33294a1225101e66"
         },
         "sys_userredirectview": {
@@ -207,12 +207,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SYS_USERPickupGridView",
             "viewtag": "936880f60b6ef17d39d5248b5fe390b4"
         },
-        "sys_usereditview": {
-            "title": "用户表编辑视图",
-            "caption": "系统用户",
+        "sysusereditview": {
+            "title": "用户",
+            "caption": "用户",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "uaa",
-            "viewname": "SYS_USEREditView",
+            "viewname": "SysUserEditView",
             "viewtag": "9a896aa77c214ed87ab9be4fd6c6bec5"
         },
         "sys_permissionpickupgridview": {
@@ -287,12 +287,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SYS_USERPickupView",
             "viewtag": "d53cb0ce933245fae5f0623bac4fbf48"
         },
-        "sys_role_permissioncustomview": {
+        "sysrolepermissioncustomview": {
             "title": "角色权限关系自定义视图",
             "caption": "角色权限关系",
             "viewtype": "DECUSTOMVIEW",
             "viewmodule": "uaa",
-            "viewname": "SYS_ROLE_PERMISSIONCustomView",
+            "viewname": "SysRolePermissionCustomView",
             "viewtag": "e791be173ed0f4bbe9cce942b6edde63"
         },
         "sys_permissioneditview": {
@@ -303,12 +303,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SYS_PERMISSIONEditView",
             "viewtag": "eb6498ba353f58d0af17bbd39702ccf7"
         },
-        "sys_user_roleeditview2": {
-            "title": "用户角色关系表编辑视图",
-            "caption": "用户角色关系",
+        "sysuserroleeditview2": {
+            "title": "用户",
+            "caption": "用户",
             "viewtype": "DEEDITVIEW2",
             "viewmodule": "uaa",
-            "viewname": "SYS_USER_ROLEEditView2",
+            "viewname": "SysUserRoleEditView2",
             "viewtag": "ede089b4741590173bd21b9df99c1cf0"
         },
         "sys_user_rolepickupview": {

app_web/src/pages/uaa/index/page-register.ts

@@ -4,17 +4,17 @@ export const PageComponents = {
         Vue.component('sys-rolepickup-view', () => import('@pages/uaa/sys-rolepickup-view/sys-rolepickup-view.vue'));
         Vue.component('sys-app-edit-view', () => import('@pages/uaa/sys-app-edit-view/sys-app-edit-view.vue'));
         Vue.component('sys-usermpickup-view', () => import('@pages/uaa/sys-usermpickup-view/sys-usermpickup-view.vue'));
-        Vue.component('sys-role-permissioncustom-view', () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'));
+        Vue.component('sys-role-permission-custom-view', () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'));
         Vue.component('sys-userpickup-grid-view', () => import('@pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view.vue'));
-        Vue.component('sys-roleedit-view', () => import('@pages/uaa/sys-roleedit-view/sys-roleedit-view.vue'));
+        Vue.component('sys-role-edit-view', () => import('@pages/uaa/sys-role-edit-view/sys-role-edit-view.vue'));
         Vue.component('sys-user-role-edit-view', () => import('@pages/uaa/sys-user-role-edit-view/sys-user-role-edit-view.vue'));
         Vue.component('sys-rolempickup-view', () => import('@pages/uaa/sys-rolempickup-view/sys-rolempickup-view.vue'));
         Vue.component('sys-auth-log-grid-view', () => import('@pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view.vue'));
         Vue.component('sys-userpickup-view', () => import('@pages/uaa/sys-userpickup-view/sys-userpickup-view.vue'));
         Vue.component('sys-role-grid-view', () => import('@pages/uaa/sys-role-grid-view/sys-role-grid-view.vue'));
-        Vue.component('sys-useredit-view', () => import('@pages/uaa/sys-useredit-view/sys-useredit-view.vue'));
+        Vue.component('sys-user-edit-view', () => import('@pages/uaa/sys-user-edit-view/sys-user-edit-view.vue'));
         Vue.component('sys-user-rolegrid-view', () => import('@pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view.vue'));
-        Vue.component('sys-rolepickup-grid-view', () => import('@pages/uaa/sys-rolepickup-grid-view/sys-rolepickup-grid-view.vue'));
+        Vue.component('sys-role-pickup-grid-view', () => import('@pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view.vue'));
         Vue.component('sys-user-grid-view', () => import('@pages/uaa/sys-user-grid-view/sys-user-grid-view.vue'));
     }
 };
\ No newline at end of file

app_web/src/pages/uaa/index/router.ts

@@ -104,7 +104,7 @@ const router = new Router({
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'),
+                    component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
                 },
                 {
                     path: 'syspermissions/:syspermission?/sysrolepermissions/:sysrolepermission?/customview/:customview?',
@@ -119,7 +119,7 @@ const router = new Router({
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'),
+                    component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
                 },
                 {
                     path: 'sysrolepermissions/:sysrolepermission?/customview/:customview?',
@@ -133,7 +133,7 @@ const router = new Router({
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'),
+                    component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
                 },
                 {
                     path: 'sysusers/:sysuser?/pickupgridview/:pickupgridview?',
@@ -161,7 +161,7 @@ const router = new Router({
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/uaa/sys-roleedit-view/sys-roleedit-view.vue'),
+                    component: () => import('@pages/uaa/sys-role-edit-view/sys-role-edit-view.vue'),
                 },
                 {
                     path: 'sysusers/:sysuser?/sysuserroles/:sysuserrole?/editview/:editview?',
@@ -275,7 +275,7 @@ const router = new Router({
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/uaa/sys-useredit-view/sys-useredit-view.vue'),
+                    component: () => import('@pages/uaa/sys-user-edit-view/sys-user-edit-view.vue'),
                 },
                 {
                     path: 'sysusers/:sysuser?/sysuserroles/:sysuserrole?/gridview/:gridview?',
@@ -333,7 +333,7 @@ const router = new Router({
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/uaa/sys-rolepickup-grid-view/sys-rolepickup-grid-view.vue'),
+                    component: () => import('@pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view.vue'),
                 },
                 {
                     path: 'sysusers/:sysuser?/gridview/:gridview?',
@@ -362,16 +362,16 @@ const router = new Router({
                 component: () => import('@pages/uaa/sys-user-roleredirect-view/sys-user-roleredirect-view.vue'),
             },
             {
-                path: 'sys_role_permissionredirectview/:sys_role_permissionredirectview?',
+                path: 'sysrolepermissionredirectview/:sysrolepermissionredirectview?',
                 meta: {
                     caption: 'entities.sysrolepermission.views.redirectview.title',
                     info:'',
                     parameters: [
-                        { pathName: 'sys_role_permissionredirectview', parameterName: 'sys_role_permissionredirectview' },
+                        { pathName: 'sysrolepermissionredirectview', parameterName: 'sysrolepermissionredirectview' },
                     ],
                     requireAuth: true,
                 },
-                component: () => import('@pages/uaa/sys-role-permissionredirect-view/sys-role-permissionredirect-view.vue'),
+                component: () => import('@pages/uaa/sys-role-permission-redirect-view/sys-role-permission-redirect-view.vue'),
             },
             {
                 path: 'sys_userredirectview/:sys_userredirectview?',
@@ -449,7 +449,7 @@ const router = new Router({
             ],
             requireAuth: true,
         },
-        component: () => import('@pages/uaa/sys-rolepickup-grid-view/sys-rolepickup-grid-view.vue'),
+        component: () => import('@pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view.vue'),
     },
     {
         path: '/sysusers/:sysuser?/sysuserroles/:sysuserrole?/editview/:editview?',
@@ -516,7 +516,7 @@ const router = new Router({
             ],
             requireAuth: true,
         },
-        component: () => import('@pages/uaa/sys-roleedit-view/sys-roleedit-view.vue'),
+        component: () => import('@pages/uaa/sys-role-edit-view/sys-role-edit-view.vue'),
     },
     {
         path: '/sysroles/:sysrole?/pickupview/:pickupview?',
@@ -555,7 +555,7 @@ const router = new Router({
             ],
             requireAuth: true,
         },
-        component: () => import('@pages/uaa/sys-useredit-view/sys-useredit-view.vue'),
+        component: () => import('@pages/uaa/sys-user-edit-view/sys-user-edit-view.vue'),
     },
     {
         path: '/sysroles/:sysrole?/gridview/:gridview?',
@@ -634,7 +634,7 @@ const router = new Router({
             ],
             requireAuth: true,
         },
-        component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'),
+        component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
     },
     {
         path: '/syspermissions/:syspermission?/sysrolepermissions/:sysrolepermission?/customview/:customview?',
@@ -648,7 +648,7 @@ const router = new Router({
             ],
             requireAuth: true,
         },
-        component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'),
+        component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
     },
     {
         path: '/sysrolepermissions/:sysrolepermission?/customview/:customview?',
@@ -661,7 +661,7 @@ const router = new Router({
             ],
             requireAuth: true,
         },
-        component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'),
+        component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
     },
     {
         path: '/sysusers/:sysuser?/sysuserroles/:sysuserrole?/gridview/:gridview?',

app_web/src/pages/uaa/sys-role-edit-view/sys-role-edit-view.less

+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+
+.sys-role-edit-view{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

app_web/src/pages/uaa/sys-role-edit-view/sys-role-edit-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SysRoleEditViewBase from './sys-role-edit-view-base.vue';
+
+import view_form from '@widgets/sys-role/main-form/main-form.vue';
+@Component({
+    components: {
+        view_form, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class SysRoleEditView extends SysRoleEditViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/uaa/sys-role-edit-view2/sys-role-edit-view2.less

+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+
+.edit-view2 {
+    flex-direction: row !important;
+    .view-form {
+        overflow: auto;
+    }
+}
+
+.sys-role-edit-view2{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

app_web/src/pages/uaa/sys-role-edit-view2/sys-role-edit-view2.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SysRoleEditView2Base from './sys-role-edit-view2-base.vue';
+
+import view_form from '@widgets/sys-role/main-form/main-form.vue';
+import view_drbar from '@widgets/sys-role/default-drbar/default-drbar.vue';
+@Component({
+    components: {
+        view_form, 
+        view_drbar, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class SysRoleEditView2 extends SysRoleEditView2Base {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.less

+.sys-role-permission-custom-view{
+    position: relative;
+}
+
+

app_web/src/pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SysRolePermissionCustomViewBase from './sys-role-permission-custom-view-base.vue';
+
+@Component({
+    components: {
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class SysRolePermissionCustomView extends SysRolePermissionCustomViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/uaa/sys-role-permission-mpickup-view/sys-role-permission-mpickup-view.less

+.sys-role-permission-mpickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.translate-contant {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+        .translate-buttons {
+            width: 80px;
+            display: flex;
+            align-items: center;
+            text-align: center;
+            button {
+                margin-bottom: 5px;
+            }
+        }
+        .left, .right {
+            width: 300px;
+        }
+        .right {
+            border: 1px solid #e9e9e9;
+            .mpicker-select {
+                font-family: helvetica, sans-serif;
+                font-size: 16px;
+                text-align: justify; 
+                word-spacing: -3.8pt;
+                line-height: 1.6;
+                font-weight: bold;
+                word-spacing: 10px;
+                height: 100%;
+                overflow: auto;
+            }
+            .mpicker-select > div {
+                padding: 3px 10px;
+                font-size: 14px;
+                color: rgba(0, 0, 0, 0.85);
+                font-weight: initial;
+                cursor: pointer;
+                min-height: 28px;
+                border: 1px solid #e9e9e9;
+                margin: 4px 4px;
+                transition: all .3s;
+            }
+            .mpicker-select > div:hover {
+                background: #ecf6fd;
+            }
+            .mpicker-select > .select{
+                color: #108ee9;
+                background: #ecf6fd;
+            }
+        }
+        .center{
+            width: calc(100% - 380px);
+            .pickupviewpanel {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_web/src/pages/uaa/sys-role-permission-mpickup-view/sys-role-permission-mpickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SysRolePermissionMPickupViewBase from './sys-role-permission-mpickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/sys-role-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class SysRolePermissionMPickupView extends SysRolePermissionMPickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/uaa/sys-role-permission-pickup-view/sys-role-permission-pickup-view.less

+.sys-role-permission-pickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.pickupviewpanel {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_web/src/pages/uaa/sys-role-permission-pickup-view/sys-role-permission-pickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SysRolePermissionPickupViewBase from './sys-role-permission-pickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/sys-role-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class SysRolePermissionPickupView extends SysRolePermissionPickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/uaa/sys-role-permission-redirect-view/sys-role-permission-redirect-view.less

+.sys-role-permission-redirect-view{
+    position: relative;
+}
+
+
+.sys-role-permission-redirect-view{
+    display: block;
+}
\ No newline at end of file

app_web/src/pages/uaa/sys-role-permission-redirect-view/sys-role-permission-redirect-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SysRolePermissionRedirectViewBase from './sys-role-permission-redirect-view-base.vue';
+
+@Component({
+    components: {
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class SysRolePermissionRedirectView extends SysRolePermissionRedirectViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue

@@ -173,7 +173,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
      * @memberof MPickupViewpickupviewpanelBase
      */
     public view: any = {
-        viewname: 'sys-rolepickup-grid-view',
+        viewname: 'sys-role-pickup-grid-view',
         data: {},
     }