mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-14 13:25:20 +00:00
Merge branch 'main' of https://github.com/ai-friend-coming/open-webui-next
This commit is contained in:
commit
24813ee56e
1 changed files with 57 additions and 57 deletions
|
|
@ -15,7 +15,7 @@
|
|||
import { getChatById } from '$lib/apis/chats';
|
||||
import { generateTags } from '$lib/apis';
|
||||
|
||||
import {
|
||||
import {
|
||||
config,
|
||||
models,
|
||||
settings,
|
||||
|
|
@ -23,7 +23,7 @@ import {
|
|||
TTSWorker,
|
||||
user,
|
||||
userModels
|
||||
} from '$lib/stores';
|
||||
} from '$lib/stores';
|
||||
import { synthesizeOpenAISpeech } from '$lib/apis/audio';
|
||||
import { imageGenerations } from '$lib/apis/images';
|
||||
import {
|
||||
|
|
@ -155,11 +155,11 @@ import {
|
|||
let buttonsContainerElement: HTMLDivElement;
|
||||
let showDeleteConfirm = false;
|
||||
|
||||
let model = null;
|
||||
let userModel = null;
|
||||
let modelName = '';
|
||||
let model = null;
|
||||
let userModel = null;
|
||||
let modelName = '';
|
||||
|
||||
$: {
|
||||
$: {
|
||||
const platformModel = $models.find((m) => m.id === message.model);
|
||||
const credentialModel = (() => {
|
||||
// 优先使用随消息携带的 credential_id 精确匹配
|
||||
|
|
@ -174,11 +174,8 @@ $: {
|
|||
model = platformModel ?? userModel;
|
||||
|
||||
modelName =
|
||||
message.modelName ??
|
||||
model?.name ??
|
||||
(userModel?.name ?? userModel?.model_id) ??
|
||||
message.model;
|
||||
}
|
||||
message.modelName ?? model?.name ?? userModel?.name ?? userModel?.model_id ?? message.model;
|
||||
}
|
||||
|
||||
let edit = false;
|
||||
let editedContent = '';
|
||||
|
|
@ -1015,7 +1012,8 @@ $: {
|
|||
</button>
|
||||
</Tooltip>
|
||||
|
||||
{#if $user?.role === 'admin' || ($user?.permissions?.chat?.tts ?? true)}
|
||||
<!-- 朗读按钮 -->
|
||||
<!-- {#if $user?.role === 'admin' || ($user?.permissions?.chat?.tts ?? true)}
|
||||
<Tooltip content={$i18n.t('Read Aloud')} placement="bottom">
|
||||
<button
|
||||
aria-label={$i18n.t('Read Aloud')}
|
||||
|
|
@ -1097,7 +1095,7 @@ $: {
|
|||
{/if}
|
||||
</button>
|
||||
</Tooltip>
|
||||
{/if}
|
||||
{/if} -->
|
||||
|
||||
{#if $config?.features.enable_image_generation && ($user?.role === 'admin' || $user?.permissions?.features?.image_generation) && !readOnly}
|
||||
<Tooltip content={$i18n.t('Generate Image')} placement="bottom">
|
||||
|
|
@ -1211,7 +1209,8 @@ $: {
|
|||
{/if}
|
||||
|
||||
{#if !readOnly}
|
||||
{#if !$temporaryChatEnabled && ($config?.features.enable_message_rating ?? true) && ($user?.role === 'admin' || ($user?.permissions?.chat?.rate_response ?? true))}
|
||||
<!-- 点赞和踩 -->
|
||||
<!-- {#if !$temporaryChatEnabled && ($config?.features.enable_message_rating ?? true) && ($user?.role === 'admin' || ($user?.permissions?.chat?.rate_response ?? true))}
|
||||
<Tooltip content={$i18n.t('Good Response')} placement="bottom">
|
||||
<button
|
||||
aria-label={$i18n.t('Good Response')}
|
||||
|
|
@ -1287,9 +1286,10 @@ $: {
|
|||
</svg>
|
||||
</button>
|
||||
</Tooltip>
|
||||
{/if}
|
||||
{/if} -->
|
||||
|
||||
{#if isLastMessage && ($user?.role === 'admin' || ($user?.permissions?.chat?.continue_response ?? true))}
|
||||
<!-- 继续生成按钮 -->
|
||||
<!-- {#if isLastMessage && ($user?.role === 'admin' || ($user?.permissions?.chat?.continue_response ?? true))}
|
||||
<Tooltip content={$i18n.t('Continue Response')} placement="bottom">
|
||||
<button
|
||||
aria-label={$i18n.t('Continue Response')}
|
||||
|
|
@ -1324,7 +1324,7 @@ $: {
|
|||
</svg>
|
||||
</button>
|
||||
</Tooltip>
|
||||
{/if}
|
||||
{/if} -->
|
||||
|
||||
{#if $user?.role === 'admin' || ($user?.permissions?.chat?.regenerate_response ?? true)}
|
||||
{#if $settings?.regenerateMenu ?? true}
|
||||
|
|
|
|||
Loading…
Reference in a new issue