Skip to content

fix: folder resource name #7521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fit2cloudwxx merged 1 commit into from
Oct 28, 2026
Merged

fix: folder resource name #7521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ui/src/constants/folder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}` },
}
}

Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/model/components/ModelProvider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down Expand Up @@ -44,7 +44,7 @@ function handleProviderSelect(provider: ModelProviderItem) {

<MkListItem :active="modelValue.provider === ALL_MODEL_PROVIDER.provider" @click="handleProviderSelect(ALL_MODEL_PROVIDER)">
<MkIcon :name="modelValue.provider === ALL_MODEL_PROVIDER.provider ? 'icon_card_filled' : 'icon_card_outlined'" :size="18" class="mr-2" />
<span>全部模型</span>
<span>{{ ALL_MODEL_PROVIDER.name }}</span>
</MkListItem>
</div>

Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/model/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ModelProviderItem>(DEFAULT_MODEL_PROVIDER)
Expand Down
7 changes: 5 additions & 2 deletions ui/src/views/system/identity/resource-authorization/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Loading