diff --git a/frontend/src/api/workspace.ts b/frontend/src/api/workspace.ts index 729d57c9..b1e8c3ec 100644 --- a/frontend/src/api/workspace.ts +++ b/frontend/src/api/workspace.ts @@ -14,3 +14,4 @@ export const workspaceUwsDelete = (data: any) => request.delete('/system/workspa export const workspaceDelete = (data: any) => request.delete('/system/workspace', { data }) export const workspaceList = () => request.get('/system/workspace') export const workspaceDetail = (id: any) => request.get(`/system/workspace/${id}`) +export const uwsOption = (params: any) => request.get('system/workspace/uws/option', { params }) diff --git a/frontend/src/assets/permission/icon_custom-tools_colorful.png b/frontend/src/assets/permission/icon_custom-tools_colorful.png new file mode 100644 index 00000000..41b09345 Binary files /dev/null and b/frontend/src/assets/permission/icon_custom-tools_colorful.png differ diff --git a/frontend/src/assets/svg/icon_down_outlined.svg b/frontend/src/assets/svg/icon_down_outlined.svg index 67b56222..45f6cdd8 100644 --- a/frontend/src/assets/svg/icon_down_outlined.svg +++ b/frontend/src/assets/svg/icon_down_outlined.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/src/assets/svg/icon_member_outlined.svg b/frontend/src/assets/svg/icon_member_outlined.svg new file mode 100644 index 00000000..331f793e --- /dev/null +++ b/frontend/src/assets/svg/icon_member_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/assets/svg/icon_setting_filled.svg b/frontend/src/assets/svg/icon_setting_filled.svg new file mode 100644 index 00000000..621a03c7 --- /dev/null +++ b/frontend/src/assets/svg/icon_setting_filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/components/layout/Menu.vue b/frontend/src/components/layout/Menu.vue index d2b1032b..62be7dad 100644 --- a/frontend/src/components/layout/Menu.vue +++ b/frontend/src/components/layout/Menu.vue @@ -25,13 +25,16 @@ const routerList = computed(() => { if (showSysmenu.value) { return router.getRoutes().filter((route) => route.path.includes('/system') && !route.redirect) } + return router.getRoutes().filter((route) => { return ( !route.path.includes('canvas') && + !route.path.includes('member') && + !route.path.includes('permission') && !route.path.includes('preview') && route.path !== '/login' && !route.path.includes('/system') && - !route.redirect && + (route.path.includes('set') || !route.redirect) && route.path !== '/:pathMatch(.*)*' && !route.path.includes('dsTable') ) @@ -45,17 +48,28 @@ const routerList = computed(() => { -
{{ activeName }} {{ t('ds.form.support_version') }}:  2012+ diff --git a/frontend/src/views/system/member/index.vue b/frontend/src/views/system/member/index.vue new file mode 100644 index 00000000..c70ba998 --- /dev/null +++ b/frontend/src/views/system/member/index.vue @@ -0,0 +1,490 @@ + + + + + + diff --git a/frontend/src/views/system/permission/Card.vue b/frontend/src/views/system/permission/Card.vue new file mode 100644 index 00000000..7c32b983 --- /dev/null +++ b/frontend/src/views/system/permission/Card.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/frontend/src/views/system/permission/index.vue b/frontend/src/views/system/permission/index.vue new file mode 100644 index 00000000..224fdb02 --- /dev/null +++ b/frontend/src/views/system/permission/index.vue @@ -0,0 +1,579 @@ + + + + + + + diff --git a/frontend/src/views/system/user/User.vue b/frontend/src/views/system/user/User.vue index 6478cab2..e22d4769 100644 --- a/frontend/src/views/system/user/User.vue +++ b/frontend/src/views/system/user/User.vue @@ -165,8 +165,7 @@ :title="dialogTitle" destroy-on-close size="600px" - modle-class="sqlbot-drawer" - @close="onFormClose" + :before-close="onFormClose" >