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
12 changes: 5 additions & 7 deletions ui/src/components/mk-edit-avatar/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ onBeforeUnmount(() => fileReader?.abort())
</button>
</template>

<div v-click-outside="closeOutside" class="text-N900" @keydown.esc.stop="close" @click.stop>
<div v-click-outside="closeOutside" class="p-4" @keydown.esc.stop="close" @click.stop>
<div class="mb-1">Logo 设置<span class="ml-0.5 text-danger">*</span></div>
<el-radio-group v-model="logoMode" :disabled="reading" class="mb-2">
<el-radio value="default">默认 Logo</el-radio>
Expand All @@ -142,16 +142,14 @@ onBeforeUnmount(() => fileReader?.abort())
<img v-if="draftIcon" :src="draftIcon" alt="自定义头像预览" class="h-full w-full object-contain" />
<MkIcon v-else :icon="Plus" :size="28" />
</button>
<p class="mt-1 text-N600">支持 JPG、PNG、GIF,文件大小不超过 10MB</p>
<p class="text-N600">支持 JPG、PNG、GIF,文件大小不超过 10MB</p>
</div>

<div class="mt-4 flex justify-end gap-3">
<div class="mt-4 text-right">
<!-- 取消头像修改 -->
<el-button class="min-w-20" @click="close">取消</el-button>
<el-button plain @click="close">取消</el-button>
<!-- 确认头像修改 -->
<el-button class="ml-0! min-w-20" type="primary" :loading="reading" :disabled="logoMode === 'custom' && !draftIcon" @click="confirm">
确定
</el-button>
<el-button type="primary" :loading="reading" @click="confirm"> 确定 </el-button>
</div>
</div>
</el-popover>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ const previewLogo = computed(() => portalSetting.logo)
<el-card shadow="never">
<div class="space-y-4">
<h4>访问设置</h4>
<!-- 门户公开访问链接 -->
<div>
<div class="flex-between mb-2 gap-2">
<span>门户公开访问链接</span>
Expand All @@ -109,6 +110,7 @@ const previewLogo = computed(() => portalSetting.logo)
</template>
</el-input>
</div>
<!-- 智能体后端 API 访问 -->
<div>
<div class="flex-between mb-2 gap-2">
<span>智能体后端 API 访问</span>
Expand All @@ -123,6 +125,7 @@ const previewLogo = computed(() => portalSetting.logo)
</template>
</el-input>
</div>
<!-- 知识库后端 API 检索 -->
<div>
<div class="flex-between mb-2 gap-2">
<span>知识库后端 API 检索</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,10 @@ function handleClosePortalEdit() {
<MkDialog v-model="editVisible" title="编辑" @closed="handleClosePortalEdit">
<el-form ref="portalFormRef" :model="portalForm" :rules="portalRules" label-position="top" @submit.prevent>
<el-form-item label="名称" prop="name">
<!-- <MkEditAvatar v-model="portalForm.logo" :default-icon="defaultLogo" :size="48" :editable="!saving" @change="handleLogoChange" /> -->
<el-input v-model="portalForm.name" maxlength="64" show-word-limit :disabled="saving" placeholder="请输入门户名称" />
<div class="flex-align-center w-full gap-3">
<!-- <MkEditAvatar v-model="portalForm.logo" :default-icon="defaultLogo" :size="32" @change="handleLogoChange" /> -->
<el-input v-model="portalForm.name" maxlength="64" show-word-limit :disabled="saving" placeholder="请输入门户名称" />
</div>
</el-form-item>
</el-form>
<template #footer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,12 @@ const corsAddressPlaceholder =
'请输入允许的跨域地址,开启后不输入跨域地址则不限制。\n跨域地址一行一个,如:\nhttp://127.0.0.1:5678\nhttps://dataease.io'

function handleOpenCorsSetting() {
handleClosed()
corsAddressDraft.value = allowedOrigins.value.join('\n')
corsVisible.value = true
}

function handleSaveCorsSetting() {
allowedOrigins.value = corsAddressDraft.value
.split(/\r?\n/)
.map((address) => address.trim())
.filter(Boolean)
MsgSuccess('已应用到当前页面')
// TODO
corsVisible.value = false
}

Expand All @@ -33,11 +28,11 @@ function handleClosed() {

<template>
<!-- 配置跨域地址 -->
<el-button text type="primary" title="跨域设置" :disabled="disabled" @click="handleOpenCorsSetting">
<el-button text type="primary" title="跨域设置" @click="handleOpenCorsSetting">
<MkIcon name="icon_setting" />
</el-button>
<MkDialog v-model="corsVisible" title="跨域设置" @closed="handleClosed">
<el-input v-model="corsAddressDraft" type="textarea" :rows="8" :placeholder="corsAddressPlaceholder" :disabled="disabled" />
<el-input v-model="corsAddressDraft" type="textarea" :rows="8" :placeholder="corsAddressPlaceholder" />
<template #footer>
<!-- 取消跨域设置 -->
<el-button plain @click="corsVisible = false">取消</el-button>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/workflow/tool/debug/ResultDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { MsgError } from '@/utils/message'
import { ConversationStream } from '@/conversation-panel/core/stream'
import { aggregators } from '@/conversation-panel/core/aggregators'
import ContentList from '@/conversation-panel/components/content-list/index.vue'
import ExecutionDetailContent from '@/workflow-canvas/details/index.vue'
import ExecutionDetailContent from '@/workflow-canvas/execution-details/index.vue'
import { WorkflowMode } from '@/workflow-canvas/types'

defineOptions({ name: 'ToolWorkflowDebugResultDrawer' })
Expand Down
Loading