feat: System resource authorization function

Author: wangdan-fit2cloud

ui/src/api/system/resource-authorization.ts

@@ -1,8 +1,7 @@
-import { Permission } from '@/utils/permission/type'
 import { Result } from '@/request/Result'
 import { get, put, post, del } from '@/request/index'
-import type { pageRequest } from '@/api/type/common'
 import type { Ref } from 'vue'
+import type { pageRequest } from '@/api/type/common'
 const prefix = '/workspace'
 
 /**
@@ -13,11 +12,13 @@ const getResourceAuthorization: (
   workspace_id: string,
   user_id: string,
   resource: string,
+  page: pageRequest,
+  params?: any,
   loading?: Ref<boolean>,
-) => Promise<Result<any>> = (workspace_id, user_id, resource, loading) => {
+) => Promise<Result<any>> = (workspace_id, user_id, resource, page, params, loading) => {
   return get(
-    `${prefix}/${workspace_id}/user_resource_permission/user/${user_id}/resource/${resource}`,
-    undefined,
+    `${prefix}/${workspace_id}/user_resource_permission/user/${user_id}/resource/${resource}/${page.current_page}/${page.page_size}`,
+    params,
     loading,
   )
 }
@@ -26,18 +27,12 @@ const getResourceAuthorization: (
  * 修改成员权限
  * @param 参数 member_id
  * @param 参数 {
-          "team_resource_permission_list": [
-            {
-              "auth_target_type": "KNOWLEDGE",
-              "target_id": "string",
-              "auth_type": "ROLE",
-              "permission": {
-                "VIEW": true,
-                "MANAGE": true,
-                "ROLE": true
-              }
-            }
-          ]
+     [
+      {
+        "target_id": "string",
+        "permission": "NOT_AUTH"
+      }
+    ]
         }
  */
 const putResourceAuthorization: (

ui/src/components/ai-chat/index.vue

@@ -22,7 +22,8 @@
               :type="type" :send-message="sendMessage" :chat-management="ChatManagement"
               :executionIsRightPanel="props.executionIsRightPanel"
               @open-execution-detail="emit('openExecutionDetail', chatList[index])"
-              @openParagraph="emit('openParagraph', chatList[index])" @openParagraphDocument="
+              @openParagraph="emit('openParagraph', chatList[index])"
+              @openParagraphDocument="
                 (val: any) => emit('openParagraphDocument', chatList[index], val)
               "></AnswerContent>
           </template>

ui/src/enums/system.ts

@@ -2,6 +2,7 @@ export enum AuthorizationEnum {
   MANAGE = 'MANAGE',
   VIEW = 'VIEW',
   ROLE = 'ROLE',
+  NOT_AUTH = 'NOT_AUTH',
   KNOWLEDGE = 'KNOWLEDGE',
   APPLICATION = 'APPLICATION',
   MODEL = 'MODEL',

ui/src/locales/lang/en-US/views/system.ts

@@ -109,18 +109,20 @@ export default {
     enableSSL: 'Enable SSL (if the SMTP port is 465, you usually need to enable SSL)',
     enableTLS: 'Enable TLS (if the SMTP port is 587, you usually need to enable TLS)',
   },
+
   resourceAuthorization: {
     title: 'Resource Authorization',
     member: 'Member',
     permissionSetting: 'Permission Setting',
     setting: {
       management: 'management',
+      managementDesc: 'Can delete or modify this resource',
       check: 'check',
-      authorization: 'authorization',
-    },
-    priority: {
-      label: 'Resource permission priority',
-      role: 'Role',
+      checkDesc: 'Can only view the resource',
+      role: 'User Role',
+      roleDesc: 'Authorize users based on their roles to access this resource',
+      notAuthorized: 'Not Authorized',
+      configure: 'Configure Permission',
     },
   },
   resource_management: {

ui/src/locales/lang/zh-CN/views/system.ts

@@ -1,3 +1,5 @@
+import role from './role'
+
 export default {
   title: '系统管理',
   subTitle: '系统设置',
@@ -115,12 +117,13 @@ export default {
     permissionSetting: '资源权限配置',
     setting: {
       management: '管理',
+      managementDesc: '可对该资源进行删改操作',
       check: '查看',
-      authorization: '授权',
-    },
-    priority: {
-      label: '资源权限优先级',
-      role: '按角色',
+      checkDesc: '仅能查看使用该资源',
+      role: '按用户角色',
+      roleDesc: '根据用户角色中的权限授权用户对该资源的操作权限',
+      notAuthorized: '不授权',
+      configure: '配置权限',
     },
   },
   resource_management: {

ui/src/locales/lang/zh-Hant/views/system.ts

@@ -109,18 +109,20 @@ export default {
     enableSSL: '啟用 SSL（如果 SMTP 端口是 465，通常需要啟用 SSL）',
     enableTLS: '啟用 TLS（如果 SMTP 端口是 587，通常需要啟用 TLS）',
   },
+
   resourceAuthorization: {
-    title: '資源授权',
+    title: '資源授權',
     member: '成員',
-    permissionSetting: '資源权限配置',
+    permissionSetting: '資源權限配置',
     setting: {
       management: '管理',
+      managementDesc: '可對該資源進行刪改操作',
       check: '查看',
-      authorization: '授权',
-    },
-    priority: {
-      label: '資源权限优先级',
-      role: '按角色',
+      checkDesc: '僅能查看使用該資源',
+      role: '按用戶角色',
+      roleDesc: '根據用戶角色中的權限授權用戶對該資源的操作權限',
+      notAuthorized: '不授權',
+      configure: '配置權限',
     },
   },
   resource_management: {

ui/src/views/chat-log/index.vue

@@ -359,12 +359,12 @@ const nextChatRecord = () => {
   }
 }
 const pre_disable = computed(() => {
-  let index = tableIndexMap.value[currentChatId.value] - 1
+  const index = tableIndexMap.value[currentChatId.value] - 1
   return index < 0 && paginationConfig.current_page <= 1
 })
 
 const next_disable = computed(() => {
-  let index = tableIndexMap.value[currentChatId.value] + 1
+  const index = tableIndexMap.value[currentChatId.value] + 1
   return (
     index >= tableData.value.length &&
     index + (paginationConfig.current_page - 1) * paginationConfig.page_size >=

ui/src/views/document/index.vue

@@ -51,10 +51,11 @@
                   >{{ $t('views.document.generateQuestion.title') }}
                 </el-button>
                 <el-button
-                  @click="openknowledgeDialog()"
+                  @click="openBatchEditDocument"
                   :disabled="multipleSelection.length === 0"
-                  v-if="permissionPrecise.doc_migrate(id)"
-                  >{{ $t('views.document.setting.migration') }}
+                  v-if="permissionPrecise.doc_edit(id)"
+                >
+                  {{ $t('common.setting') }}
                 </el-button>
                 <el-dropdown v-if="MoreFilledPermission0(id)">
                   <el-button class="ml-12 mr-12">
@@ -63,11 +64,11 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item
-                        @click="openBatchEditDocument"
+                        @click="openknowledgeDialog()"
                         :disabled="multipleSelection.length === 0"
-                        v-if="permissionPrecise.doc_edit(id)"
+                        v-if="permissionPrecise.doc_migrate(id)"
                       >
-                        {{ $t('common.setting') }}
+                        {{ $t('views.document.setting.migration') }}
                       </el-dropdown-item>
                       <el-dropdown-item
                         divided
@@ -434,16 +435,12 @@
                             "
                             @click="cancelTask(row, TaskType.GENERATE_PROBLEM)"
                           >
-                            <AppIcon
-                              iconName="app-generate-question"
-                              class="color-secondary"
-                            ></AppIcon>
+                            <el-icon class="color-secondary"><Close /></el-icon>
                             {{ $t('views.document.setting.cancelGenerateQuestion') }}
                           </el-dropdown-item>
                           <el-dropdown-item
-                            v-else
                             @click="openGenerateDialog(row)"
-                            v-if="permissionPrecise.doc_generate(id)"
+                            v-else-if="permissionPrecise.doc_generate(id)"
                           >
                             <AppIcon
                               iconName="app-generate-question"
@@ -494,18 +491,6 @@
                   </span>
                 </template>
                 <template v-if="knowledgeDetail?.type === 1 || knowledgeDetail?.type === 2">
-                  <el-tooltip
-                    effect="dark"
-                    :content="$t('views.knowledge.setting.sync')"
-                    placement="top"
-                    v-if="permissionPrecise.sync(id)"
-                  >
-                    <span class="mr-4">
-                      <el-button type="primary" text @click.stop="syncDocument(row)">
-                        <AppIcon iconName="app-sync"></AppIcon>
-                      </el-button>
-                    </span>
-                  </el-tooltip>
                   <el-tooltip
                     effect="dark"
                     :content="$t('views.document.setting.cancelVectorization')"
@@ -538,6 +523,18 @@
                       </el-button>
                     </span>
                   </el-tooltip>
+                  <el-tooltip
+                    effect="dark"
+                    :content="$t('common.setting')"
+                    placement="top"
+                    v-if="permissionPrecise.doc_edit(id)"
+                  >
+                    <span class="mr-4">
+                      <el-button type="primary" text @click.stop="settingDoc(row)">
+                        <AppIcon iconName="app-setting"></AppIcon>
+                      </el-button>
+                    </span>
+                  </el-tooltip>
                   <span @click.stop>
                     <el-dropdown trigger="click" v-if="MoreFilledPermission2(id)">
                       <el-button text type="primary">
@@ -546,11 +543,11 @@
                       <template #dropdown>
                         <el-dropdown-menu>
                           <el-dropdown-item
-                            @click="settingDoc(row)"
-                            v-if="permissionPrecise.doc_edit(id)"
+                            @click="syncDocument(row)"
+                            v-if="permissionPrecise.sync(id)"
                           >
-                            <AppIcon iconName="app-setting"></AppIcon>
-                            {{ $t('common.setting') }}</el-dropdown-item
+                            <AppIcon iconName="app-sync" class="color-secondary"></AppIcon>
+                            {{ $t('views.knowledge.setting.sync') }}</el-dropdown-item
                           >
                           <el-dropdown-item
                             v-if="
@@ -561,43 +558,45 @@
                             "
                             @click="cancelTask(row, TaskType.GENERATE_PROBLEM)"
                           >
-                            <AppIcon iconName="app-generate-question"></AppIcon>
+                            <el-icon class="color-secondary"><Close /></el-icon>
                             {{ $t('views.document.setting.cancelGenerateQuestion') }}
                           </el-dropdown-item>
                           <el-dropdown-item
-                            v-else
                             @click="openGenerateDialog(row)"
-                            v-if="permissionPrecise.doc_generate(id)"
+                            v-else-if="permissionPrecise.doc_generate(id)"
                           >
-                            <AppIcon iconName="app-generate-question"></AppIcon>
+                            <AppIcon
+                              iconName="app-generate-question"
+                              class="color-secondary"
+                            ></AppIcon>
                             {{ $t('views.document.generateQuestion.title') }}
                           </el-dropdown-item>
                           <el-dropdown-item
                             @click="openknowledgeDialog(row)"
                             v-if="permissionPrecise.doc_migrate(id)"
                           >
-                            <AppIcon iconName="app-migrate"></AppIcon>
+                            <AppIcon iconName="app-migrate" class="color-secondary"></AppIcon>
                             {{ $t('views.document.setting.migration') }}
                           </el-dropdown-item>
                           <el-dropdown-item
                             @click="exportDocument(row)"
                             v-if="permissionPrecise.doc_export(id)"
                           >
-                            <AppIcon iconName="app-export"></AppIcon>
+                            <AppIcon iconName="app-export" class="color-secondary"></AppIcon>
                             {{ $t('views.document.setting.export') }} Excel
                           </el-dropdown-item>
                           <el-dropdown-item
                             @click="exportDocumentZip(row)"
                             v-if="permissionPrecise.doc_export(id)"
                           >
-                            <AppIcon iconName="app-export"></AppIcon>
+                            <AppIcon iconName="app-export" class="color-secondary"></AppIcon>
                             {{ $t('views.document.setting.export') }} Zip
                           </el-dropdown-item>
                           <el-dropdown-item
                             @click.stop="deleteDocument(row)"
                             v-if="permissionPrecise.doc_delete(id)"
                           >
-                            <AppIcon iconName="app-delete"></AppIcon>
+                            <AppIcon iconName="app-delete" class="color-secondary"></AppIcon>
                             {{ $t('common.delete') }}
                           </el-dropdown-item>
                         </el-dropdown-menu>
@@ -712,7 +711,7 @@ const permissionPrecise = computed(() => {
 
 const MoreFilledPermission0 = (id: string) => {
   return (
-    permissionPrecise.value.doc_edit(id) ||
+    permissionPrecise.value.doc_migrate(id) ||
     (knowledgeDetail?.value.type === 1 && permissionPrecise.value.doc_sync(id)) ||
     (knowledgeDetail?.value.type === 2 && permissionPrecise.value.doc_sync(id)) ||
     permissionPrecise.value.doc_delete(id)
@@ -731,7 +730,7 @@ const MoreFilledPermission1 = (id: string) => {
 
 const MoreFilledPermission2 = (id: string) => {
   return (
-    permissionPrecise.value.doc_edit(id) ||
+    permissionPrecise.value.sync(id) ||
     permissionPrecise.value.doc_generate(id) ||
     permissionPrecise.value.doc_migrate(id) ||
     permissionPrecise.value.doc_export(id) ||

ui/src/views/knowledge/component/BaseForm.vue

@@ -47,11 +47,10 @@ import { groupBy } from 'lodash'
 import type { knowledgeData } from '@/api/type/knowledge'
 import { t } from '@/locales'
 import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
-import modelResourceApi from '@/api/system-resource-management/model'
 const props = defineProps<{
   data?: {
-    type: Object
-    default: () => {}
+    type: object
+    default: () => null
   }
   apiType: 'systemShare' | 'workspace' | 'systemManage'
 }>()