Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions ui/src/styles/element-plus.scss
Original file line number Diff line number Diff line change
Expand Up @@ -887,8 +887,14 @@
&__input {
height: 22px;
}

.el-tag {
height: 24px !important;
align-items: center !important;
}
&__tags-text {
color: var(--el-text-color-primary);
font-size: 14px;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ function handleResourceTypeChange() {
}

function loadParagraphPage(pagination: ParamsPage) {
// TODO(图片联调):核对图片资源 id 能否复用 documentId 查询分段,以及分页结果中的 id、document_id、title、content。
return resourceApi.paragraph.getParagraphPage(knowledgeId.value, selectedDocumentId.value, pagination, {
title: paragraphSearchText.value.trim() || undefined,
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ defineExpose({ open })
<MkDialog v-model="visible" title="添加成员" @closed="resetData">
<el-form ref="formRef" :model="memberForm" :rules="formRules" label-position="top">
<el-form-item label="对话用户" prop="userIds">
<el-select v-model="memberForm.userIds" class="w-full" filterable multiple collapse-tags collapse-tags-tooltip :loading="optionsLoading" placeholder="请选择用户名或姓名">
<el-select v-model="memberForm.userIds" class="w-full" filterable multiple :loading="optionsLoading" placeholder="请选择用户名或姓名">
<el-option v-for="user in userOptions" :key="user.id" :label="user.nick_name" :value="user.id" />
</el-select>
</el-form-item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ defineExpose({ open })
remote
reserve-keyword
multiple
collapse-tags
collapse-tags-tooltip
:remote-method="handleRemoteSearch"
:loading="optionsLoading"
placeholder="请选择用户名或姓名"
Expand Down
4 changes: 3 additions & 1 deletion ui/src/views/system/identity/users/UserFromDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,9 @@ defineExpose({ open })
class="flex-1"
:label="index === 0 ? '工作空间' : ''"
:prop="`role_setting.${index}.workspace_ids`"
:rules="{ required: !isAdminRole(roleAssignment.role_id), type: 'array', min: 1, message: '请选择工作空间', trigger: 'change' }"
:rules="
isAdminRole(roleAssignment.role_id) ? [] : { required: true, type: 'array', min: 1, message: '请选择工作空间', trigger: 'change' }
"
>
<el-select
v-model="roleAssignment.workspace_ids"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ defineExpose({ open })
class="flex-1"
:label="index === 0 ? '工作空间' : ''"
:prop="`role_setting.${index}.workspace_ids`"
:rules="{ required: !isAdminRole(roleAssignment.role_id), type: 'array', min: 1, message: '请选择工作空间', trigger: 'change' }"
:rules="
isAdminRole(roleAssignment.role_id) ? [] : { required: true, type: 'array', min: 1, message: '请选择工作空间', trigger: 'change' }
"
>
<el-select
v-model="roleAssignment.workspace_ids"
Expand Down
Loading