Skip to content

Commit 1db63cc

Browse files
zhanweizhang7zhanweizhang7
committed
fix: Common user permission
1 parent 0c8a808 commit 1db63cc

File tree

14 files changed

+132
-55
lines changed

14 files changed

+132
-55
lines changed

‎ui/src/router/modules/1application.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { ComplexPermission } from '@/utils/permission/type'
21

32
const applicationRouter = {
43
path: '/application',

‎ui/src/views/application-overview/index.vue‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
:before-change="() => changeState(accessToken.is_active)"
5555
v-hasPermission="[
5656
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
57+
RoleConst.USER.getWorkspaceRole,
5758
PermissionConst.APPLICATION_EDIT.getWorkspacePermission,
5859
]"
5960
/>
@@ -99,6 +100,7 @@
99100
@click="openDialog"
100101
v-hasPermission="[
101102
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
103+
RoleConst.USER.getWorkspaceRole,
102104
PermissionConst.APPLICATION_OVERVIEW_EMBEDDED.getWorkspacePermission,
103105
]"
104106
>
@@ -110,6 +112,7 @@
110112
@click="openLimitDialog"
111113
v-hasPermission="[
112114
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
115+
RoleConst.USER.getWorkspaceRole,
113116
PermissionConst.APPLICATION_OVERVIEW_ACCESS.getWorkspacePermission,
114117
]"
115118
>
@@ -121,6 +124,7 @@
121124
@click="openDisplaySettingDialog"
122125
v-hasPermission="[
123126
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
127+
RoleConst.USER.getWorkspaceRole,
124128
PermissionConst.APPLICATION_OVERVIEW_DISPLAY.getWorkspacePermission,
125129
]"
126130
>
@@ -167,6 +171,7 @@
167171
@click="openAPIKeyDialog"
168172
v-hasPermission="[
169173
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
174+
RoleConst.USER.getWorkspaceRole,
170175
PermissionConst.APPLICATION_OVERVIEW_API_KEY.getWorkspacePermission,
171176
]"
172177
>

‎ui/src/views/application/ApplicationSetting.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
{{ $t('common.setting') }}
66
</h3>
77
<el-button type="primary" @click="submit(applicationFormRef)" :disabled="loading"
8-
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.APPLICATION_OVERVIEW_PUBLIC.getWorkspacePermission]"
8+
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
9+
RoleConst.USER.getWorkspaceRole,
10+
PermissionConst.APPLICATION_OVERVIEW_PUBLIC.getWorkspacePermission]"
911
>
1012
{{ $t('views.application.buttons.publish') }}
1113
</el-button>

‎ui/src/views/application/index.vue‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
class="ml-8"
5050
v-hasPermission="[
5151
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
52+
RoleConst.USER.getWorkspaceRole,
5253
PermissionConst.APPLICATION_EDIT.getWorkspacePermission,
5354
]"
5455
>
@@ -236,6 +237,7 @@
236237
hasPermission(
237238
[
238239
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
240+
RoleConst.USER.getWorkspaceRole,
239241
PermissionConst.APPLICATION_EDIT.getWorkspacePermission,
240242
],
241243
'OR',
@@ -252,6 +254,7 @@
252254
hasPermission(
253255
[
254256
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
257+
RoleConst.USER.getWorkspaceRole,
255258
PermissionConst.APPLICATION_EXPORT.getWorkspacePermission,
256259
],
257260
'OR',
@@ -269,6 +272,7 @@
269272
hasPermission(
270273
[
271274
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
275+
RoleConst.USER.getWorkspaceRole,
272276
PermissionConst.APPLICATION_DELETE.getWorkspacePermission,
273277
],
274278
'OR',

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,23 @@
3939
/>
4040
<div style="display: flex; align-items: center" class="float-right">
4141
<el-button @click="dialogVisible = true"
42-
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.APPLICATION_CHAT_LOG_POLICY.getWorkspacePermission]"
42+
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
43+
RoleConst.USER.getWorkspaceRole,
44+
PermissionConst.APPLICATION_CHAT_LOG_POLICY.getWorkspacePermission]"
4345
>
4446
{{$t('views.chatLog.buttons.clearStrategy')}}
4547
</el-button>
4648
<el-button @click="exportLog"
47-
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.APPLICATION_CHAT_LOG_EXPORT.getWorkspacePermission]"
49+
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
50+
RoleConst.USER.getWorkspaceRole,
51+
PermissionConst.APPLICATION_CHAT_LOG_EXPORT.getWorkspacePermission]"
4852
>
4953
{{ $t('common.export') }}
5054
</el-button>
5155
<el-button @click="openDocumentDialog" :disabled="multipleSelection.length === 0"
52-
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.APPLICATION_CHAT_LOG_EXPORT.getWorkspacePermission]"
56+
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
57+
RoleConst.USER.getWorkspaceRole,
58+
PermissionConst.APPLICATION_CHAT_LOG_EXPORT.getWorkspacePermission]"
5359
>{{ $t('views.chatLog.addToKnowledge') }}
5460
</el-button>
5561
</div>

‎ui/src/views/document/index.vue‎

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"
1515
v-hasPermission="[
1616
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
17-
PermissionConst.KNOWLEDGE_DOCUMENT_CREATE.getWorkspacePermission,
17+
RoleConst.USER.getWorkspaceRole,
18+
PermissionConst.KNOWLEDGE_DOCUMENT_CREATE.getKnowledgeWorkspaceResourcePermission(id),
1819
]"
1920
>{{ $t('views.document.uploadDocument') }}
2021
</el-button>
@@ -23,8 +24,8 @@
2324
type="primary"
2425
@click="importDoc"
2526
v-hasPermission="[
26-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
27-
PermissionConst.KNOWLEDGE_DOCUMENT_CREATE.getWorkspacePermission,
27+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
28+
PermissionConst.KNOWLEDGE_DOCUMENT_CREATE.getKnowledgeWorkspaceResourcePermission(id),
2829
]"
2930
>{{ $t('views.document.importDocument') }}
3031
</el-button>
@@ -43,7 +44,7 @@
4344
@click="batchRefresh"
4445
:disabled="multipleSelection.length === 0"
4546
v-hasPermission="[
46-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
47+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
4748
PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission,
4849
]"
4950
>{{ $t('views.knowledge.setting.vectorization') }}
@@ -52,7 +53,7 @@
5253
@click="openGenerateDialog()"
5354
:disabled="multipleSelection.length === 0"
5455
v-hasPermission="[
55-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
56+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
5657
PermissionConst.KNOWLEDGE_DOCUMENT_GENERATE.getWorkspacePermission,
5758
]"
5859
>{{ $t('views.document.generateQuestion.title') }}
@@ -61,7 +62,7 @@
6162
@click="openknowledgeDialog()"
6263
:disabled="multipleSelection.length === 0"
6364
v-hasPermission="[
64-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
65+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
6566
PermissionConst.KNOWLEDGE_DOCUMENT_MIGRATE.getWorkspacePermission,
6667
]"
6768
>{{ $t('views.document.setting.migration') }}
@@ -77,7 +78,9 @@
7778
<el-dropdown-item
7879
@click="openBatchEditDocument"
7980
:disabled="multipleSelection.length === 0"
80-
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_DOCUMENT_EDIT.getWorkspacePermission],'OR')"
81+
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
82+
RoleConst.USER.getWorkspaceRole,
83+
PermissionConst.KNOWLEDGE_DOCUMENT_EDIT.getWorkspacePermission],'OR')"
8184
>
8285
{{ $t('common.setting') }}
8386
</el-dropdown-item>
@@ -86,7 +89,9 @@
8689
@click="syncMulDocument"
8790
:disabled="multipleSelection.length === 0"
8891
v-if="knowledgeDetail.type === 1 &&
89-
hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_DOCUMENT_SYNC.getWorkspacePermission],'OR')"
92+
hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
93+
RoleConst.USER.getWorkspaceRole,
94+
PermissionConst.KNOWLEDGE_DOCUMENT_SYNC.getWorkspacePermission],'OR')"
9095
>{{ $t('views.document.syncDocument') }}
9196
</el-dropdown-item>
9297
<el-dropdown-item
@@ -384,7 +389,7 @@
384389
@click.stop="cancelTask(row, TaskType.EMBEDDING)"
385390
:title="$t('views.document.setting.cancelVectorization')"
386391
v-hasPermission="[
387-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
392+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
388393
PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission,
389394
]"
390395
>
@@ -398,7 +403,7 @@
398403
@click.stop="refreshDocument(row)"
399404
:title="$t('views.knowledge.setting.vectorization')"
400405
v-hasPermission="[
401-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
406+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
402407
PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission,
403408
]"
404409
>
@@ -412,7 +417,7 @@
412417
@click.stop="settingDoc(row)"
413418
:title="$t('common.setting')"
414419
v-hasPermission="[
415-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
420+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
416421
PermissionConst.KNOWLEDGE_DOCUMENT_EDIT.getWorkspacePermission,
417422
]"
418423
>
@@ -425,7 +430,7 @@
425430
text
426431
type="primary"
427432
v-hasPermission="[
428-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
433+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
429434
PermissionConst.KNOWLEDGE_DOCUMENT_EDIT.getWorkspacePermission,
430435
]"
431436
>
@@ -438,39 +443,51 @@
438443
([State.STARTED, State.PENDING] as Array<string>).includes(
439444
getTaskState(row.status, TaskType.GENERATE_PROBLEM),
440445
)&&
441-
hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_PROBLEM_CREATE.getWorkspacePermission],'OR')
446+
hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
447+
RoleConst.USER.getWorkspaceRole,
448+
PermissionConst.KNOWLEDGE_PROBLEM_CREATE.getWorkspacePermission],'OR')
442449
"
443450
@click="cancelTask(row, TaskType.GENERATE_PROBLEM)"
444451
>
445452
<el-icon><Connection /></el-icon>
446453
{{ $t('views.document.setting.cancelGenerateQuestion') }}
447454
</el-dropdown-item>
448455
<el-dropdown-item v-else @click="openGenerateDialog(row)"
449-
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_PROBLEM_CREATE.getWorkspacePermission],'OR')"
456+
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
457+
RoleConst.USER.getWorkspaceRole,
458+
PermissionConst.KNOWLEDGE_PROBLEM_CREATE.getWorkspacePermission],'OR')"
450459
>
451460
<el-icon><Connection /></el-icon>
452461
{{ $t('views.document.generateQuestion.title') }}
453462
</el-dropdown-item>
454463
<el-dropdown-item @click="openknowledgeDialog(row)"
455-
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_DOCUMENT_MIGRATE.getWorkspacePermission],'OR')"
464+
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
465+
RoleConst.USER.getWorkspaceRole,
466+
PermissionConst.KNOWLEDGE_DOCUMENT_MIGRATE.getWorkspacePermission],'OR')"
456467
>
457468
<AppIcon iconName="app-migrate"></AppIcon>
458469
{{ $t('views.document.setting.migration') }}
459470
</el-dropdown-item>
460471
<el-dropdown-item @click="exportDocument(row)"
461-
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_DOCUMENT_EXPORT.getWorkspacePermission],'OR')"
472+
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
473+
RoleConst.USER.getWorkspaceRole,
474+
PermissionConst.KNOWLEDGE_DOCUMENT_EXPORT.getWorkspacePermission],'OR')"
462475
>
463476
<AppIcon iconName="app-export"></AppIcon>
464477
{{ $t('views.document.setting.export') }} Excel
465478
</el-dropdown-item>
466479
<el-dropdown-item @click="exportDocumentZip(row)"
467-
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_DOCUMENT_EXPORT.getWorkspacePermission],'OR')"
480+
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
481+
RoleConst.USER.getWorkspaceRole,
482+
PermissionConst.KNOWLEDGE_DOCUMENT_EXPORT.getWorkspacePermission],'OR')"
468483
>
469484
<AppIcon iconName="app-export"></AppIcon>
470485
{{ $t('views.document.setting.export') }} Zip
471486
</el-dropdown-item>
472487
<el-dropdown-item icon="Delete" @click.stop="deleteDocument(row)"
473-
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_DOCUMENT_DELETE.getWorkspacePermission],'OR')"
488+
v-if="hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
489+
RoleConst.USER.getWorkspaceRole,
490+
PermissionConst.KNOWLEDGE_DOCUMENT_DELETE.getWorkspacePermission],'OR')"
474491
>
475492
{{ $t('common.delete') }}</el-dropdown-item
476493
>
@@ -487,7 +504,7 @@
487504
@click.stop="syncDocument(row)"
488505
:title="$t('views.knowledge.setting.sync')"
489506
v-hasPermission="[
490-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
507+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
491508
PermissionConst.KNOWLEDGE_SYNC.getWorkspacePermission,
492509
]"
493510
>
@@ -506,7 +523,7 @@
506523
@click.stop="cancelTask(row, TaskType.EMBEDDING)"
507524
:title="$t('views.document.setting.cancelVectorization')"
508525
v-hasPermission="[
509-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
526+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
510527
PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission,
511528
]"
512529
>
@@ -520,7 +537,7 @@
520537
@click.stop="refreshDocument(row)"
521538
:title="$t('views.knowledge.setting.vectorization')"
522539
v-hasPermission="[
523-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
540+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
524541
PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission,
525542
]"
526543
>
@@ -534,7 +551,7 @@
534551
text
535552
type="primary"
536553
v-hasPermission="[
537-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
554+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
538555
PermissionConst.KNOWLEDGE_DOCUMENT_EDIT.getWorkspacePermission,
539556
]"
540557
>
@@ -591,7 +608,7 @@
591608
:disabled="multipleSelection.length === 0"
592609
@click="cancelTaskHandle(1)"
593610
v-hasPermission="[
594-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
611+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
595612
PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission,
596613
]"
597614
>
@@ -601,7 +618,7 @@
601618
:disabled="multipleSelection.length === 0"
602619
@click="cancelTaskHandle(2)"
603620
v-hasPermission="[
604-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
621+
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,RoleConst.USER.getWorkspaceRole,
605622
PermissionConst.KNOWLEDGE_DOCUMENT_GENERATE.getWorkspacePermission,
606623
]"
607624
>

0 commit comments

Comments
 (0)