Skip to content

Commit f0dcacf

Browse files
committed
fix: Dropitem permission
1 parent e23d413 commit f0dcacf

File tree

10 files changed

+33
-8
lines changed

10 files changed

+33
-8
lines changed

ui/src/permission/application/system-manage.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,14 @@ const systemManage = {
3838
'OR'
3939
),
4040
folderDelete: () => false,
41-
auth: () => false,
41+
auth: () =>
42+
hasPermission(
43+
[
44+
RoleConst.ADMIN,
45+
PermissionConst.RESOURCE_APPLICATION_AUTH
46+
],
47+
'OR'
48+
),
4249
overview_embed: () =>
4350
hasPermission(
4451
[

ui/src/permission/knowledge/system-manage.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,12 @@ const systemManage = {
153153
chat_user_edit: () =>false,
154154

155155

156-
auth: () => false,
156+
auth: () =>
157+
hasPermission([
158+
RoleConst.ADMIN,
159+
PermissionConst.RESOURCE_KNOWLEDGE_AUTH
160+
],'OR'
161+
),
157162
folderCreate: () => false,
158163
folderEdit: () => false,
159164
folderDelete: () => false,

ui/src/permission/model/system-manage.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ const systemManage = {
2020
delete: () =>
2121
hasPermission([RoleConst.ADMIN, PermissionConst.RESOURCE_MODEL_DELETE], 'OR'),
2222

23-
auth: () => false,
23+
auth: () =>
24+
hasPermission([RoleConst.ADMIN, PermissionConst.RESOURCE_MODEL_AUTH], 'OR'),
2425
folderCreate: () => false,
2526
folderEdit: () => false,
2627
folderDelete: () => false,

ui/src/permission/tool/system-manage.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,14 @@ const systemManage = {
5757
'OR',
5858
),
5959

60-
auth: () => false,
60+
auth: () =>
61+
hasPermission(
62+
[
63+
RoleConst.ADMIN,
64+
PermissionConst.RESOURCE_TOOL_AUTH,
65+
],
66+
'OR',
67+
),
6168
folderCreate: () => false,
6269
folderEdit: () => false,
6370
folderDelete: () => false,

ui/src/utils/permission/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ const PermissionConst = {
281281

282282
RESOURCE_MODEL_AUTH: new Permission('SYSTEM_RESOURCE_MODEL:READ+AUTH'),
283283
RESOURCE_APPLICATION_AUTH: new Permission('SYSTEM_RESOURCE_APPLICATION:READ+AUTH'),
284-
RESOURCE_KNOWLEDGE_AUTH: new Permission('SYSTEM_RESOURCE_AUTH:READ+AUTH'),
284+
RESOURCE_KNOWLEDGE_AUTH: new Permission('SYSTEM_RESOURCE_KNOWLEDGE:READ+AUTH'),
285285
RESOURCE_TOOL_AUTH: new Permission('SYSTEM_RESOURCE_TOOL:READ+AUTH'),
286286

287287
APPEARANCE_SETTINGS_READ: new Permission('APPEARANCE_SETTINGS:READ'),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ const MoreFilledPermission = (item: any) => {
401401
permissionPrecise.value.generate(item.id) ||
402402
(permissionPrecise.value.edit(item.id) && apiType.value) === 'workspace' ||
403403
permissionPrecise.value.export(item.id) ||
404+
permissionPrecise.value.auth(item.id) ||
404405
permissionPrecise.value.delete(item.id) ||
405406
isSystemShare.value
406407
)

ui/src/views/model/component/ModelCard.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,10 @@ const permissionPrecise = computed(() => {
167167
168168
const MoreFilledPermission = (id: any) => {
169169
return (
170-
permissionPrecise.value.modify(id) || permissionPrecise.value.delete(id) || isSystemShare.value
170+
permissionPrecise.value.modify(id) ||
171+
permissionPrecise.value.delete(id) ||
172+
permissionPrecise.value.auth(id) ||
173+
isSystemShare.value
171174
)
172175
}
173176

ui/src/views/system-resource-management/ModelResourceIndex.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ const paginationConfig = reactive({
298298
299299
// sync generete edit export delete
300300
const MoreFilledPermission = () => {
301-
return permissionPrecise.value.delete() || permissionPrecise.value.auth()
301+
return permissionPrecise.value.delete() || permissionPrecise.value.modify()
302302
}
303303
304304
const ResourceAuthorizationDrawerRef = ref()

ui/src/views/system-resource-management/ToolResourceIndex.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
<AppIcon iconName="app-export" class="color-secondary"></AppIcon>
290290
{{ $t('common.export') }}
291291
</el-dropdown-item>
292-
<el-dropdown-item v-if="row.tool_type === 'MCP'" @click.stop="showMcpConfig(row)">
292+
<el-dropdown-item v-if="row.tool_type === 'MCP' && permissionPrecise.edit()" @click.stop="showMcpConfig(row)">
293293
<AppIcon iconName="app-operate-log" class="color-secondary"></AppIcon>
294294
{{ $t('views.tool.mcpConfig') }}
295295
</el-dropdown-item>

ui/src/views/tool/component/ToolListContainer.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ const MoreFieldPermission = (id: any) => {
386386
permissionPrecise.value.edit(id) ||
387387
permissionPrecise.value.export(id) ||
388388
permissionPrecise.value.delete(id) ||
389+
permissionPrecise.value.auth(id) ||
389390
isSystemShare.value
390391
)
391392
}

0 commit comments

Comments
 (0)