diff --git a/ui/src/constants/folder.ts b/ui/src/constants/folder.ts index 2706ae32ea8..c98b7cca2ce 100644 --- a/ui/src/constants/folder.ts +++ b/ui/src/constants/folder.ts @@ -11,15 +11,15 @@ export const FOLDER_ENTRY_ID = { SHARED: 'shared', } as const -function createFolderEntries(resourceName: string) { +function createFolderEntries(sharedResourceName: string) { return { all: { get id() { return FOLDER_ENTRY_ID.ALL }, - name: `全部${resourceName}`, + name: '全部资源', }, - shared: { id: FOLDER_ENTRY_ID.SHARED, name: `共享${resourceName}` }, + shared: { id: FOLDER_ENTRY_ID.SHARED, name: `共享${sharedResourceName}` }, } } diff --git a/ui/src/views/model/components/ModelProvider.vue b/ui/src/views/model/components/ModelProvider.vue index 8f2481b281f..f0d3bbc5cb3 100644 --- a/ui/src/views/model/components/ModelProvider.vue +++ b/ui/src/views/model/components/ModelProvider.vue @@ -5,7 +5,7 @@ import { isWorkspaceResource } from '@/utils/resource-context' defineOptions({ name: 'ModelProvider' }) -const ALL_MODEL_PROVIDER: ModelProviderItem = { icon: '', name: '全部模型', provider: 'all' } +const ALL_MODEL_PROVIDER: ModelProviderItem = { icon: '', name: '全部资源', provider: 'all' } const SHARED_MODEL_PROVIDER: ModelProviderItem = { icon: '', name: '共享模型', provider: 'shared' } const LOCAL_PROVIDER_IDS = new Set([ @@ -44,7 +44,7 @@ function handleProviderSelect(provider: ModelProviderItem) { - 全部模型 + {{ ALL_MODEL_PROVIDER.name }} diff --git a/ui/src/views/model/index.vue b/ui/src/views/model/index.vue index b5fcad69f26..84f331ccc8c 100644 --- a/ui/src/views/model/index.vue +++ b/ui/src/views/model/index.vue @@ -20,7 +20,7 @@ import { } from './model-card/action-dropdown' import perm from '@/permission/index.ts' -const DEFAULT_MODEL_PROVIDER: ModelProviderItem = { icon: '', name: '全部模型', provider: 'all' } +const DEFAULT_MODEL_PROVIDER: ModelProviderItem = { icon: '', name: '全部资源', provider: 'all' } const loading = ref(false) const currentProvider = ref(DEFAULT_MODEL_PROVIDER) diff --git a/ui/src/views/system/identity/resource-authorization/index.vue b/ui/src/views/system/identity/resource-authorization/index.vue index e17ac76be24..a5e20f22c9f 100644 --- a/ui/src/views/system/identity/resource-authorization/index.vue +++ b/ui/src/views/system/identity/resource-authorization/index.vue @@ -139,8 +139,11 @@ function buildResourceTree(resourceItems: ResourcePermissionItem[]) { } }) - const defaultRoot = resourceMap.get('default') - if (defaultRoot && !defaultRoot.folder_id) return defaultRoot.children + const workspaceRoot = resourceMap.get(selectedWorkspaceId.value) + if (workspaceRoot?.resource_type === 'folder' && !workspaceRoot.folder_id) { + workspaceRoot.name = '全部资源' + return [workspaceRoot] + } return resources.filter(({ folder_id }) => !folder_id) }