Skip to content

fix: system user group #7493

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 27, 2026
Merged

fix: system user group #7493

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
4 changes: 2 additions & 2 deletions ui/src/components/business/workspace-dropdown/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ const emit = defineEmits<{ select: [option: WorkspaceItem] }>()
>
<template #default="{ text }">
<!-- 切换工作空间 -->
<el-button text class="flex-align-center max-w-50 gap-1 rounded-md px-2! py-[7px]! text-N900!">
<el-button text class="flex-align-center gap-1 rounded-md px-2! py-[7px]! text-N900!">
<MkIcon name="icon_moments-categories_outlined" class="mr-1 shrink-0" />
<span class="min-w-0 flex-1 truncate" :title="text">{{ text }}</span>
<span class="min-w-0 flex-1 truncate max-w-50" :title="text">{{ text }}</span>
<MkIcon :icon="CaretBottom" :size="14" class="ml-1 text-N600!" />
</el-button>
</template>
Expand Down
5 changes: 3 additions & 2 deletions ui/src/views/home/components/ranking/RankingDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ onMounted(() => loadRanking())
<MkDrawer v-model="visible" title="排行榜详情" size="1000">
<el-tabs v-model="activeKind" @tab-change="handleTabChange">
<el-tab-pane name="tokens" label="Tokens 消耗 · Top 智能体" />
<el-tab-pane name="questions" label="提问次数 · Top 智能体" />
<el-tab-pane name="questions" label="对话次数 · Top 智能体" />
<el-tab-pane name="userTokens" label="Tokens 消耗 · Top 用户" />
</el-tabs>
<div class="my-4 flex-between">
Expand All @@ -108,8 +108,9 @@ onMounted(() => loadRanking())
? `mk-rank-${(pagination.currentPage - 1) * pagination.pageSize + $index + 1}`
: 'text-N600'
"
>{{ (pagination.currentPage - 1) * pagination.pageSize + $index + 1 }}</span
>
{{ (pagination.currentPage - 1) * pagination.pageSize + $index + 1 }}
</span>
</template>
</el-table-column>
<el-table-column v-if="activeKind === 'userTokens'" label="用户" min-width="140" show-overflow-tooltip>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/system/chat-management/user-groups/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function handleGroupSelect(group: ListItem) {

/* 删除用户组 */
function deleteGroup(group: ListItem) {
MsgConfirm(`确定删除用户组“${group.name}”吗？`, '删除后，组内成员不会被删除。')
MsgConfirm(`是否删除用户组：${group.name}？`, '删除后，成员将被移除该用户组，请谨慎操作。')
.then(() => {
groupsLoading.value = true
return ChatGroupsApi.deleteChatUserGroup(group.id).then(() => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/system/identity/groups/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function handleGroupSaved(group: SystemUserGroup) {

/* 删除用户组 */
function deleteGroup(group: SystemUserGroup) {
MsgConfirm(`确定删除用户组"${group.name}"吗？`, '删除后，组内成员不会被删除。')
MsgConfirm(`是否删除用户组：${group.name}？`, '删除后，成员将被移除该用户组，通过该用户组继承的资源权限将被回收，请谨慎操作！')
.then(() => {
return UserGroupsApi.deleteSystemUserGroup(selectedWorkspaceId.value, group.id).then(() => {
MsgSuccess('删除成功')
Expand Down
Loading