{{ $t('views.system.resourceAuthorization.setting.effectiveResource') }}
- {{ $t('views.system.resourceAuthorization.setting.currentOnly') }}
-{{ $t('views.system.resourceAuthorization.setting.includeAll') }}
-
+ {{ $t('views.system.resourceAuthorization.setting.effectiveResource') }}
+
+ + {{ $t('views.system.resourceAuthorization.setting.currentOnly') }} +
++ {{ $t('views.system.resourceAuthorization.setting.includeAll') }} +
+
@@ -211,14 +225,13 @@ const apiType = computed(() => {
const folderType = computed(() => {
if (route.path.includes('application')) {
return 'application'
- }
- else if (route.path.includes('knowledge')) {
+ } else if (route.path.includes('knowledge')) {
return 'knowledge'
- }
- else if (route.path.includes('tool')) {
+ } else if (route.path.includes('tool')) {
return 'tool'
+ } else {
+ return 'application'
}
- else {return 'application'}
})
const permissionPrecise = computed(() => {
@@ -228,14 +241,16 @@ const permissionPrecise = computed(() => {
// 取出文件夹id
function getAllFolderIds(data: any) {
if (!data) return []
- return [data.id,...(data.children?.flatMap((child: any) => getAllFolderIds(child)) || [])]
+ return [data.id, ...(data.children?.flatMap((child: any) => getAllFolderIds(child)) || [])]
}
const RESOURCE_PERMISSION_MAP = {
- application: PermissionConst.APPLICATION_RESOURCE_AUTHORIZATION.getWorkspacePermissionWorkspaceManageRole,
- knowledge: PermissionConst.KNOWLEDGE_RESOURCE_AUTHORIZATION.getWorkspacePermissionWorkspaceManageRole,
+ application:
+ PermissionConst.APPLICATION_RESOURCE_AUTHORIZATION.getWorkspacePermissionWorkspaceManageRole,
+ knowledge:
+ PermissionConst.KNOWLEDGE_RESOURCE_AUTHORIZATION.getWorkspacePermissionWorkspaceManageRole,
tool: PermissionConst.TOOL_RESOURCE_AUTHORIZATION.getWorkspacePermissionWorkspaceManageRole,
-}
+}
const resourceAuthorizationOfManager = computed(() => {
return RESOURCE_PERMISSION_MAP[folderType.value]
@@ -243,18 +258,16 @@ const resourceAuthorizationOfManager = computed(() => {
// 过滤没有Manage权限的文件夹ID
function filterHasPermissionFolderIds(folderIds: string[]) {
- if (hasPermission(
- [
- RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
- resourceAuthorizationOfManager.value
- ],'OR'
- )) {
+ if (
+ hasPermission(
+ [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, resourceAuthorizationOfManager.value],
+ 'OR',
+ )
+ ) {
return folderIds
+ } else {
+ return folderIds.filter((id) => permissionPrecise.value.folderManage(id))
}
- else {
- return folderIds.filter(id => permissionPrecise.value.folderManage(id))
- }
-
}
function confirmSinglePermission() {
@@ -270,7 +283,7 @@ function confirmSinglePermission() {
user_id: row.id,
permission: val,
include_children: authAllChildren.value,
- ...(folderIds.length > 0 && {folder_ids: folderIds})
+ ...(folderIds.length > 0 && { folder_ids: folderIds }),
},
]
submitPermissions(obj)
@@ -354,7 +367,7 @@ const handleSelectionChange = (val: any[]) => {
const dialogVisible = ref(false)
const singleSelectDialogVisible = ref(false)
-const pendingPermissionChange = ref<{ val: any; row: any; } | null>(null)
+const pendingPermissionChange = ref<{ val: any; row: any } | null>(null)
const radioPermission = ref('')
const authAllChildren = ref(false)
function openMulConfigureDialog() {
@@ -379,7 +392,7 @@ function submitDialog() {
user_id: item.id,
permission: radioPermission.value,
include_children: batchAuthAllChildren.value,
- ...(folderIds.length > 0 && { folder_ids: folderIds })
+ ...(folderIds.length > 0 && { folder_ids: folderIds }),
}))
submitPermissions(obj)
closeDialog()
@@ -403,7 +416,7 @@ function closeDialog() {
function permissionsHandle(val: any, row: any) {
if (props.isFolder) {
singleSelectDialogVisible.value = true
- pendingPermissionChange.value = {val, row}
+ pendingPermissionChange.value = { val, row }
return
}
const obj = [
@@ -415,7 +428,7 @@ function permissionsHandle(val: any, row: any) {
submitPermissions(obj)
}
-function submitPermissions( obj: any) {
+function submitPermissions(obj: any) {
const workspaceId = user.getWorkspaceId() || 'default'
loadSharedApi({ type: 'resourceAuthorization', systemType: apiType.value })
.putResourceAuthorization(workspaceId, targetId.value, props.type, obj, loading)
@@ -440,12 +453,13 @@ const getPermissionList = () => {
loading,
)
.then((res: any) => {
- permissionData.value = res.data.records.map((item: any) => {
- if (props.isRootFolder && item.permission === 'NOT_AUTH') {
- return {...item, permission: 'VIEW'}
- }
- return item
- }) || []
+ permissionData.value =
+ res.data.records.map((item: any) => {
+ if (props.isRootFolder && item.permission === 'NOT_AUTH') {
+ return { ...item, permission: 'VIEW' }
+ }
+ return item
+ }) || []
paginationConfig.total = res.data.total || 0
})
}
diff --git a/ui/src/views/system/resource-authorization/component/PermissionSetting.vue b/ui/src/views/system/resource-authorization/component/PermissionSetting.vue
deleted file mode 100644
index 461e5b783..000000000
--- a/ui/src/views/system/resource-authorization/component/PermissionSetting.vue
+++ /dev/null
@@ -1,288 +0,0 @@
-
-
-
+
+
+ {{ row?.name }}
@@ -157,26 +157,24 @@ const props = defineProps<{
const emit = defineEmits(['submitPermissions'])
const defaultExpandKeys = computed(() => {
- const searchName = searchForm.value.name || ''
+ const searchName = searchForm.value.name || ''
const searchPermissions = searchForm.value.permission ?? []
if (!searchName && (!searchPermissions || searchPermissions.length === 0)) {
- return (props.data?.length > 0 ? [props.data[0]?.id] : [])
- }
+ return props.data?.length > 0 ? [props.data[0]?.id] : []
+ }
const expandIds: string[] = []
// 传入过滤后的数据
const collectExpandIds = (nodes: any[]) => {
- nodes.forEach(
- node => {
- if (node.children && node.children.length > 0) {
- expandIds.push(node.id)
- collectExpandIds(node.children)
- }
- })
+ nodes.forEach((node) => {
+ if (node.children && node.children.length > 0) {
+ expandIds.push(node.id)
+ collectExpandIds(node.children)
+ }
+ })
}
collectExpandIds(filteredData.value)
return expandIds
-}
- )
+})
const permissionOptionMap = computed(() => {
return {
@@ -199,7 +197,17 @@ const getRowPermissionOptions = (row: any) => {
}
const permissionOptions = computed(() => {
- return getPermissionOptions()
+ if (
+ multipleSelection.value.some(
+ (item) => item.resource_type === 'folder' && item.folder_id == null,
+ )
+ ) {
+ return permissionOptionMap.value.rootFolder
+ } else if (multipleSelection.value.some((item) => item.resource_type === 'folder')) {
+ return permissionOptionMap.value.folder
+ } else {
+ return permissionOptionMap.value.resource
+ }
})
const permissionObj = ref({
APPLICATION: new ComplexPermission(
@@ -259,19 +267,6 @@ const search_type_change = () => {
searchForm.value = { name: '', permission: undefined }
}
-const paginationConfig = reactive({
- current_page: 1,
- page_size: 20,
- total: 0,
-})
-
-function handleSizeChange() {
- paginationConfig.current_page = 1
- if (props.getData) {
- props.getData()
- }
-}
-
const filterTreeData = () => {
const searchName = searchForm.value.name || ''
const searchPermissions = searchForm.value.permission ?? []
@@ -313,7 +308,6 @@ const filteredData = computed(() => {
return filterTreeData()
})
-
const multipleSelection = ref([])
const handleSelectionChange = (val: any[]) => {
@@ -375,7 +369,6 @@ onMounted(() => {
})
defineExpose({
- // paginationConfig,
searchForm,
searchType,
})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ui/src/views/system/resource-authorization/component/PermissionTable.vue b/ui/src/views/system/resource-authorization/component/PermissionTable.vue
index a89b52de7..7ed66c7f3 100644
--- a/ui/src/views/system/resource-authorization/component/PermissionTable.vue
+++ b/ui/src/views/system/resource-authorization/component/PermissionTable.vue
@@ -43,7 +43,7 @@
collapse-tags-tooltip
style="width: 220px"
>
-
+
-
-
-
-
- {{
- $t('views.system.resourceAuthorization.priority.label')
- }}
-
- {{ $t('views.system.resourceAuthorization.priority.role') }}
-
- {{ $t('common.custom') }}
-
-
-
-
-
- 
-
-
-
- ![]()
-
-
-
- 
-
-
-
-
- {{ row?.name }}
-
-
-
-
-
-