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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { cloneDeep } from 'lodash'
import type { FormInstance } from 'element-plus'
import { KNOWLEDGE_SEARCH_MODE } from '@/api/enums'
import { KNOWLEDGE_SEARCH_MODE_OPTIONS } from '@/constants/knowledge'
import { createSettings, DEFAULT_DESIGNATED_ANSWER, DEFAULT_PROBLEM_OPTIMIZATION_PROMPT, type ApplicationSettings } from '../settings'
import { createSettings, DEFAULT_DESIGNATED_ANSWER, type ApplicationSettings } from '../settings'

defineOptions({ name: 'ButtonKnowledgeSetting' })

Expand Down Expand Up @@ -131,13 +131,11 @@ function resetData() {
/>
</el-form-item>
<el-form-item label="问题优化"><el-switch v-model="formData.problem_optimization" size="small" /></el-form-item>
<el-form-item v-if="formData.problem_optimization" label="提示词">
<el-input
<el-form-item v-if="formData.problem_optimization" label="用户提示词" prop="problem_optimization_prompt">
<MdEditorMagnify
placeholder="用户提示词,可以引用系统中变量,如{{开始.question}}"
v-model="formData.problem_optimization_prompt"
type="textarea"
maxlength="2048"
:rows="5"
:placeholder="DEFAULT_PROBLEM_OPTIMIZATION_PROMPT"
title="用户提示词"
/>
</el-form-item>
</el-form>
Expand Down
1 change: 1 addition & 0 deletions ui/src/views/application-detail/setting/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export interface ApplicationSettings extends ApplicationFormPayload {
prologue: string
model_setting: ModelSetting
knowledge_setting: KnowledgeSetting
problem_optimization_prompt: string
knowledge_id_list: string[]
application_ids: string[]
tool_ids: string[]
Expand Down
11 changes: 10 additions & 1 deletion ui/src/views/system/identity/roles/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { computed, onMounted, ref, useTemplateRef } from 'vue'
import { computed, onMounted, ref, useTemplateRef, watch } from 'vue'
import RoleApi from '@/api/admin/system/role'
import type { RoleItem, RoleType, RoleTypeGroup } from '@/api/types'
import { ROLE_TYPE_LABELS } from '@/constants'
Expand Down Expand Up @@ -32,6 +32,15 @@ const filteredRoleGroups = computed(() => {
.filter((group) => group.role_list.length > 0)
})

// 搜索或列表刷新后展开命中分组,避免匹配角色被折叠隐藏。
watch(filteredRoleGroups, (groups) => {
if (!filterText.value.trim()) return

groups.forEach(({ role_type }) => {
expandedRoleTypes.value[role_type] = true
})
})

function loadRoles(selectedRoleId?: string) {
loadingRoles.value = true
return RoleApi.getRoleList()
Expand Down
Loading