feat: resource-authorization

ui/src/layout/layout-header/SystemHeader.vue

@@ -5,16 +5,15 @@
       <LogoFull />
     </div>
 
-    <div class="flex-between w-full">
+    <div class="flex-between w-full align-center">
       <h4><el-divider class="ml-16 mr-16" direction="vertical" />{{ $t('views.system.title') }}</h4>
-      <div>
-        <TopAbout></TopAbout>
-        <span class="mr-8 lighter flex align-center"
-          ><el-divider class="ml-8 mr-8" direction="vertical" />
-          <el-button link @click="router.push({ path: '/' })">
-            <AppIcon class="mr-8" iconName="app-wordspace" style="font-size: 16px"></AppIcon>
-            {{ '返回工作空间' }}</el-button>
-        </span>
+      <div class="flex align-center mr-8">
+        <TopAbout class="mt-4"></TopAbout>
+        <el-divider class="ml-8 mr-8" direction="vertical" />
+        <el-button link @click="router.push({ path: '/' })">
+          <AppIcon class="mr-8" iconName="app-wordspace" style="font-size: 16px"></AppIcon>
+          {{ '返回工作空间' }}</el-button
+        >
       </div>
     </div>
     <Avatar></Avatar>

ui/src/layout/layout-header/top-about/index.vue

@@ -34,7 +34,7 @@
     >
       <AppIcon
         iconName="app-help"
-        class="cursor color-secondary mr-16 ml-8"
+        class="cursor color-secondary mr-8 ml-8"
         style="font-size: 20px"
         @click="toUrl(theme.themeInfo?.forumUrl)"
       ></AppIcon>

ui/src/views/system/resource-authorization/index.vue

@@ -99,7 +99,6 @@ import { hasPermission } from '@/utils/permission/index'
 import WorkspaceApi from '@/api/workspace/workspace.ts'
 import type { WorkspaceItem } from '@/api/type/workspace'
 
-const PermissionSettingRef = ref()
 const loading = ref(false)
 const rLoading = ref(false)
 const memberList = ref<any[]>([]) // 全部成员
@@ -162,8 +161,8 @@ function submitPermissions() {
           auth_type: item.isRole ? 'ROLE' : 'RESOURCE_PERMISSION_GROUP',
         }
       })
-      .reduce((pre: any, next: any) => [...pre, ...next], [])
-  })
+
+  }).reduce((pre: any, next: any) => [...pre, ...next], [])
 
   AuthorizationApi.putResourceAuthorization(
     currentWorkspaceId.value || 'default',
@@ -295,6 +294,7 @@ const getWholeTree = async (user_id: string) => {
       let folderIdMap = []
       const folderTree = cloneDeep((parentRes as unknown as any).data)
       if (Object.keys(childrenRes.data).indexOf(item.value) !== -1) {
+        item.isRole = childrenRes.data[item.value].length>0 && childrenRes.data[item.value][0].permission.ROLE
         folderIdMap = getFolderIdMap(childrenRes.data[item.value])
         dfsFolder(folderTree, folderIdMap)
         const permissionHalf = {
@@ -337,22 +337,6 @@ const getFolderIdMap = (arr: any = []) => {
     return pre
   }, {})
 }
-function ResourcePermissions(user_id: string) {
-  AuthorizationApi.getResourceAuthorization(
-    currentWorkspaceId.value || 'default',
-    user_id,
-    rLoading,
-  ).then((res) => {
-    if (!res.data || Object.keys(res.data).length > 0) {
-      settingTags.map((item: any) => {
-        if (Object.keys(res.data).indexOf(item.value) !== -1) {
-          item.data = res.data[item.value]
-          getFolderIdMap(item.data)
-        }
-      })
-    }
-  })
-}
 
 const workspaceList = ref<WorkspaceItem[]>([])
 const currentWorkspaceId = ref<string | undefined>('')
@@ -360,11 +344,9 @@ const currentWorkspace = computed(() => {
   return workspaceList.value.find((w) => w.id == currentWorkspaceId.value)
 })
 async function getWorkspaceList() {
-  if (user.isEE()) {
-    const res = await WorkspaceApi.getSystemWorkspaceList(loading)
-    workspaceList.value = res.data
-    currentWorkspaceId.value = 'default'
-  }
+  const res = await WorkspaceApi.getSystemWorkspaceList(loading)
+  workspaceList.value = res.data
+  currentWorkspaceId.value = 'default'
 }
 
 function changeWorkspace(item: WorkspaceItem) {
@@ -380,7 +362,9 @@ onMounted(() => {
       tableHeight.value = window.innerHeight - 330
     })()
   }
-  getWorkspaceList()
+  if (user.isEE()) {
+    getWorkspaceList()
+  }
   getMember()
 })
 </script>