diff --git a/ui/src/router/modules/1application.ts b/ui/src/router/modules/1application.ts index a412019f1..92b25035d 100644 --- a/ui/src/router/modules/1application.ts +++ b/ui/src/router/modules/1application.ts @@ -1,4 +1,3 @@ -import { ComplexPermission } from '@/utils/permission/type' const applicationRouter = { path: '/application', diff --git a/ui/src/views/application-overview/index.vue b/ui/src/views/application-overview/index.vue index 61f76a4ce..ee3589deb 100644 --- a/ui/src/views/application-overview/index.vue +++ b/ui/src/views/application-overview/index.vue @@ -54,6 +54,7 @@ :before-change="() => changeState(accessToken.is_active)" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.APPLICATION_EDIT.getWorkspacePermission, ]" /> @@ -99,6 +100,7 @@ @click="openDialog" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.APPLICATION_OVERVIEW_EMBEDDED.getWorkspacePermission, ]" > @@ -110,6 +112,7 @@ @click="openLimitDialog" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.APPLICATION_OVERVIEW_ACCESS.getWorkspacePermission, ]" > @@ -121,6 +124,7 @@ @click="openDisplaySettingDialog" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.APPLICATION_OVERVIEW_DISPLAY.getWorkspacePermission, ]" > @@ -167,6 +171,7 @@ @click="openAPIKeyDialog" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.APPLICATION_OVERVIEW_API_KEY.getWorkspacePermission, ]" > diff --git a/ui/src/views/application/ApplicationSetting.vue b/ui/src/views/application/ApplicationSetting.vue index 8adc5291c..0772bcc56 100644 --- a/ui/src/views/application/ApplicationSetting.vue +++ b/ui/src/views/application/ApplicationSetting.vue @@ -5,7 +5,9 @@ {{ $t('common.setting') }} {{ $t('views.application.buttons.publish') }} diff --git a/ui/src/views/application/index.vue b/ui/src/views/application/index.vue index 7b5734ca2..3e198fd96 100644 --- a/ui/src/views/application/index.vue +++ b/ui/src/views/application/index.vue @@ -49,6 +49,7 @@ class="ml-8" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.APPLICATION_EDIT.getWorkspacePermission, ]" > @@ -236,6 +237,7 @@ hasPermission( [ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.APPLICATION_EDIT.getWorkspacePermission, ], 'OR', @@ -252,6 +254,7 @@ hasPermission( [ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.APPLICATION_EXPORT.getWorkspacePermission, ], 'OR', @@ -269,6 +272,7 @@ hasPermission( [ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.APPLICATION_DELETE.getWorkspacePermission, ], 'OR', diff --git a/ui/src/views/chat-log/index.vue b/ui/src/views/chat-log/index.vue index df414e8aa..994fe7d5f 100644 --- a/ui/src/views/chat-log/index.vue +++ b/ui/src/views/chat-log/index.vue @@ -39,17 +39,23 @@ />
{{$t('views.chatLog.buttons.clearStrategy')}} {{ $t('common.export') }} {{ $t('views.chatLog.addToKnowledge') }}
diff --git a/ui/src/views/document/index.vue b/ui/src/views/document/index.vue index a10cf1330..8305eb927 100644 --- a/ui/src/views/document/index.vue +++ b/ui/src/views/document/index.vue @@ -14,7 +14,8 @@ " v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, - PermissionConst.KNOWLEDGE_DOCUMENT_CREATE.getWorkspacePermission, + RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_DOCUMENT_CREATE.getKnowledgeWorkspaceResourcePermission(id), ]" >{{ $t('views.document.uploadDocument') }} @@ -23,8 +24,8 @@ type="primary" @click="importDoc" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, - PermissionConst.KNOWLEDGE_DOCUMENT_CREATE.getWorkspacePermission, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_DOCUMENT_CREATE.getKnowledgeWorkspaceResourcePermission(id), ]" >{{ $t('views.document.importDocument') }} @@ -43,7 +44,7 @@ @click="batchRefresh" :disabled="multipleSelection.length === 0" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission, ]" >{{ $t('views.knowledge.setting.vectorization') }} @@ -52,7 +53,7 @@ @click="openGenerateDialog()" :disabled="multipleSelection.length === 0" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_GENERATE.getWorkspacePermission, ]" >{{ $t('views.document.generateQuestion.title') }} @@ -61,7 +62,7 @@ @click="openknowledgeDialog()" :disabled="multipleSelection.length === 0" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_MIGRATE.getWorkspacePermission, ]" >{{ $t('views.document.setting.migration') }} @@ -77,7 +78,9 @@ {{ $t('common.setting') }} @@ -86,7 +89,9 @@ @click="syncMulDocument" :disabled="multipleSelection.length === 0" v-if="knowledgeDetail.type === 1 && - hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_DOCUMENT_SYNC.getWorkspacePermission],'OR')" + hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_DOCUMENT_SYNC.getWorkspacePermission],'OR')" >{{ $t('views.document.syncDocument') }} @@ -398,7 +403,7 @@ @click.stop="refreshDocument(row)" :title="$t('views.knowledge.setting.vectorization')" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission, ]" > @@ -412,7 +417,7 @@ @click.stop="settingDoc(row)" :title="$t('common.setting')" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_EDIT.getWorkspacePermission, ]" > @@ -425,7 +430,7 @@ text type="primary" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_EDIT.getWorkspacePermission, ]" > @@ -438,7 +443,9 @@ ([State.STARTED, State.PENDING] as Array).includes( getTaskState(row.status, TaskType.GENERATE_PROBLEM), )&& - hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_PROBLEM_CREATE.getWorkspacePermission],'OR') + hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_PROBLEM_CREATE.getWorkspacePermission],'OR') " @click="cancelTask(row, TaskType.GENERATE_PROBLEM)" > @@ -446,31 +453,41 @@ {{ $t('views.document.setting.cancelGenerateQuestion') }} {{ $t('views.document.generateQuestion.title') }} {{ $t('views.document.setting.migration') }} {{ $t('views.document.setting.export') }} Excel {{ $t('views.document.setting.export') }} Zip {{ $t('common.delete') }} @@ -487,7 +504,7 @@ @click.stop="syncDocument(row)" :title="$t('views.knowledge.setting.sync')" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_SYNC.getWorkspacePermission, ]" > @@ -506,7 +523,7 @@ @click.stop="cancelTask(row, TaskType.EMBEDDING)" :title="$t('views.document.setting.cancelVectorization')" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission, ]" > @@ -520,7 +537,7 @@ @click.stop="refreshDocument(row)" :title="$t('views.knowledge.setting.vectorization')" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission, ]" > @@ -534,7 +551,7 @@ text type="primary" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_EDIT.getWorkspacePermission, ]" > @@ -591,7 +608,7 @@ :disabled="multipleSelection.length === 0" @click="cancelTaskHandle(1)" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission, ]" > @@ -601,7 +618,7 @@ :disabled="multipleSelection.length === 0" @click="cancelTaskHandle(2)" v-hasPermission="[ - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole, PermissionConst.KNOWLEDGE_DOCUMENT_GENERATE.getWorkspacePermission, ]" > diff --git a/ui/src/views/knowledge/index.vue b/ui/src/views/knowledge/index.vue index 9dbd65565..b27bcd7af 100644 --- a/ui/src/views/knowledge/index.vue +++ b/ui/src/views/knowledge/index.vue @@ -239,7 +239,9 @@ icon="Refresh" @click.stop="syncKnowledge(item)" v-if="item.type === 1 && - hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_SYNC.getWorkspacePermission],'OR')" + hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_SYNC.getKnowledgeWorkspaceResourcePermission(item.id)],'OR')" >{{ $t('views.knowledge.setting.sync') }} {{ $t('common.delete') }} diff --git a/ui/src/views/model/index.vue b/ui/src/views/model/index.vue index ab2742b95..8e8b4f8f4 100644 --- a/ui/src/views/model/index.vue +++ b/ui/src/views/model/index.vue @@ -56,7 +56,9 @@ {{ $t('views.model.addModel') }} diff --git a/ui/src/views/problem/index.vue b/ui/src/views/problem/index.vue index 05cabe54e..bc53f1cbb 100644 --- a/ui/src/views/problem/index.vue +++ b/ui/src/views/problem/index.vue @@ -7,15 +7,21 @@
+ v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_PROBLEM_CREATE.getWorkspacePermission]"> {{ $t('views.problem.createProblem') }} + v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_PROBLEM_RELATE.getWorkspacePermission]"> {{ $t('views.problem.relateParagraph.title') }} + v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_PROBLEM_DELETE.getWorkspacePermission]"> {{ $t('views.problem.setting.batchDelete') }}
@@ -103,7 +109,9 @@ placement="top" > + v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_PROBLEM_RELATE.getWorkspacePermission]"> @@ -111,7 +119,9 @@ + v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, + PermissionConst.KNOWLEDGE_PROBLEM_DELETE.getWorkspacePermission]"> diff --git a/ui/src/views/shared/model-shared/component/ModelCard.vue b/ui/src/views/shared/model-shared/component/ModelCard.vue index 8e4a905f0..a8881348c 100644 --- a/ui/src/views/shared/model-shared/component/ModelCard.vue +++ b/ui/src/views/shared/model-shared/component/ModelCard.vue @@ -78,6 +78,7 @@ @click.stop="openEditModel" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.MODEL_EDIT.getWorkspacePermission, ]" > @@ -99,6 +100,7 @@ @click.stop="openParamSetting" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.MODEL_EDIT.getWorkspacePermission, ]" > @@ -112,6 +114,7 @@ @click.stop="deleteModel" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.MODEL_DELETE.getWorkspacePermission, ]" > diff --git a/ui/src/views/system-chat-user/user-manage/index.vue b/ui/src/views/system-chat-user/user-manage/index.vue index 3039e1743..83edd64cf 100644 --- a/ui/src/views/system-chat-user/user-manage/index.vue +++ b/ui/src/views/system-chat-user/user-manage/index.vue @@ -14,7 +14,7 @@
{{ t('views.userManage.createUser') }} @@ -23,13 +23,13 @@ {{ $t('views.chatUser.syncUsers') }} {{ $t('views.chatUser.setUserGroups') }} {{ $t('common.delete') }} @@ -116,7 +116,7 @@ @@ -128,7 +128,7 @@ @@ -139,7 +139,7 @@ diff --git a/ui/src/views/tool/ToolFormDrawer.vue b/ui/src/views/tool/ToolFormDrawer.vue index 76be01704..1b20f0e04 100644 --- a/ui/src/views/tool/ToolFormDrawer.vue +++ b/ui/src/views/tool/ToolFormDrawer.vue @@ -80,7 +80,9 @@ {{ $t('common.param.initParam') }} @@ -164,7 +166,9 @@ @@ -245,10 +249,14 @@
{{ $t('common.cancel') }} {{ $t('common.debug') }} {{ isEdit ? $t('common.save') : $t('common.create') }} @@ -200,6 +201,7 @@ class="mr-4" v-hasPermission="[ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.TOOL_EDIT.getWorkspacePermission, ]" /> @@ -218,6 +220,7 @@ hasPermission( [ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.TOOL_EDIT.getWorkspacePermission, ], 'OR', @@ -238,6 +241,7 @@ hasPermission( [ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.TOOL_EXPORT.getWorkspacePermission, ], 'OR', @@ -262,6 +266,7 @@ hasPermission( [ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.TOOL_EXPORT.getWorkspacePermission, ], 'OR', @@ -278,6 +283,7 @@ hasPermission( [ RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, + RoleConst.USER.getWorkspaceRole, PermissionConst.TOOL_DELETE.getWorkspacePermission, ], 'OR',