root/gpustack-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: press enter to submit chat message

Browse Source
This commit is contained in:
jialin
2025-03-09 21:31:58 +08:00
parent a2ef9d781d
commit ab6e98aae2
17 changed files with 76 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/audio-player/index.less
+1
View File
@@ -75,6 +75,7 @@
}
.file-name {
margin-bottom: 6px;
line-height: 20px;
height: 20px;
display: flex;
src/components/icon-font/index.tsx
+1 -1
View File
@@ -2,7 +2,7 @@ import { createFromIconfontCN } from '@ant-design/icons';
// import './iconfont/iconfont.js';
const IconFont = createFromIconfontCN({
scriptUrl: '//at.alicdn.com/t/c/font_4613488_d7ffxju7lc6.js'
scriptUrl: '//at.alicdn.com/t/c/font_4613488_yikpvmcl8ag.js'
});
export default IconFont;
src/components/image-editor/index.less
+1 -1
View File
@@ -18,7 +18,7 @@
}
.overlay-canvas:hover {
cursor: 'none !important';
cursor: none !important;
}
.upload-mask {
src/components/image-editor/index.tsx
+7 -6
View File
@@ -27,6 +27,7 @@ type Stroke = Point[];
type CanvasImageEditorProps = {
ref?: any;
loading: boolean;
imageSrc: string;
disabled?: boolean;
imguid: string | number;
@@ -48,6 +49,7 @@ const COLOR = 'rgba(0, 0, 255, 0.3)';
const CanvasImageEditor: React.FC<CanvasImageEditorProps> = forwardRef(
(
{
loading,
imageSrc,
disabled: isDisabled,
imageStatus,
@@ -597,7 +599,7 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = forwardRef(
canvas!.height = img.height;
// fit the image to the container
autoScale.current = autoScale.current || 1;
autoScale.current = 1;
updateCanvasSize();
clearCanvas();
@@ -735,12 +737,10 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = forwardRef(
const mouseX = event.clientX - rect.left;
const mouseY = event.clientY - rect.top;
setCanvasTransformOrigin(event);
updateZoom(scaleChange, mouseX, mouseY);
overlayCanvasRef.current!.style.transform = `scale(${autoScale.current})`;
canvasRef.current!.style.transform = `scale(${autoScale.current})`;
setCanvasTransformOrigin(event);
updateZoom(scaleChange, mouseX, mouseY);
};
const updateCursorPosOnZoom = (e: any) => {
@@ -757,6 +757,7 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = forwardRef(
};
const handleFitView = () => {
resetCanvas();
autoScale.current = baseScale.current;
translatePos.current = { x: 0, y: 0 };
setTransform();
@@ -908,7 +909,7 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = forwardRef(
onClick={handleFitView}
size="middle"
type="text"
disabled={isDisabled}
disabled={loading}
>
<ExpandOutlined className="font-size-14" />
</Button>
src/config/hotkeys.ts
+5 -1
View File
@@ -6,7 +6,11 @@ const KeybindingsMap = {
CLEAR: ['Alt+Ctrl+K', 'Alt+Meta+K'],
RIGHT: ['Ctrl+RIGHT', 'Meta+RIGHT'],
SAVE: ['Ctrl+S', 'Meta+S'],
SUBMIT: ['Ctrl+Enter', 'Meta+Enter'],
SUBMIT: ['Enter', 'Enter'],
ENTER: ['Enter', 'Enter'],
SHIFT: ['Shift', 'Shift'],
CTRL: ['Ctrl', 'Meta'],
OPTION: ['Alt', 'Option'],
SAVEAS: ['Alt+Ctrl+S', 'Alt+Meta+S'],
OPEN: ['Alt+Ctrl+O', 'Alt+Meta+O'],
UNDO: ['Ctrl+Z', 'Meta+Z'],
src/constants/external-links.ts
+3 -1
View File
@@ -3,7 +3,9 @@ const externalLinks = {
github: 'https://github.com/gpustack/gpustack',
discord: 'https://discord.gg/VXYJzuaqwD',
site: 'https://gpustack.ai/',
release: 'https://github.com/gpustack/gpustack/releases'
release: 'https://github.com/gpustack/gpustack/releases',
reportIssue: 'https://github.com/gpustack/gpustack/issues/new/choose',
faq: 'https://github.com/gpustack/gpustack/wiki/FAQ'
};
export default externalLinks;
src/layouts/rightRender.tsx
+9 -2
View File
@@ -1,5 +1,6 @@
// @ts-nocheck
import avatarImg from '@/assets/images/avatar.png';
import IconFont from '@/components/icon-font';
import externalLinks from '@/constants/external-links';
import langConfigMap from '@/locales/lang-config-map';
import {
@@ -79,8 +80,14 @@ export const getRightRenderContent = (opts: {
{
key: 'github',
icon: <GithubOutlined />,
label: 'GitHub',
url: externalLinks.github
label: intl.formatMessage({ id: 'common.issue.report' }),
url: externalLinks.reportIssue
},
{
key: 'faq',
icon: <IconFont type="icon-fankuifaqs"></IconFont>,
label: intl.formatMessage({ id: 'common.button.faq' }),
url: externalLinks.faq
},
{
key: 'Discord',
src/locales/en-US/common.ts
+2 -1
View File
@@ -228,5 +228,6 @@ export default {
'common.options.none': 'None',
'common.options.auto': 'Auto',
'common.search.empty': 'No matching results found.',
'common.button.downloadLog': 'Download Log'
'common.button.downloadLog': 'Download Log',
'common.button.faq': 'FAQ'
};
src/locales/ru-RU/common.ts
+2 -1
View File
@@ -226,5 +226,6 @@ export default {
'common.options.none': 'Нет',
'common.options.auto': 'Авто',
'common.search.empty': 'Ничего не найдено',
'common.button.downloadLog': 'Скачать логи'
'common.button.downloadLog': 'Скачать логи',
'common.button.faq': 'TODO: Translate key "common.button.faq"'
};
src/locales/zh-CN/common.ts
+2 -1
View File
@@ -221,5 +221,6 @@ export default {
'common.options.none': '无',
'common.options.auto': '自动',
'common.search.empty': '未找到匹配结果',
'common.button.downloadLog': '下载日志'
'common.button.downloadLog': '下载日志',
'common.button.faq': '常见问题'
};
src/pages/playground/components/audio-input.tsx
+1 -1
View File
@@ -238,7 +238,7 @@ const AudioInput: React.FC<AudioInputProps> = (props) => {
const generateFileNameByTime = (type?: string) => {
const format = getAudioFormat(type);
return `recording-${dayjs().format('YYYY-MM-DD-HH_mm_ss')}${format.suffix}`;
return `Recording-${dayjs().format('YYYY-MM-DD-HH_mm_ss')}${format.suffix}`;
};
// start recording
const StartRecording = async () => {
src/pages/playground/components/ground-embedding.tsx
+11 -14
View File
@@ -3,7 +3,6 @@ import ScatterChart from '@/components/echarts/scatter';
import HighlightCode from '@/components/highlight-code';
import IconFont from '@/components/icon-font';
import SealInputNumber from '@/components/seal-form/input-number';
import HotKeys, { KeyMap } from '@/config/hotkeys';
import useOverlayScroller from '@/hooks/use-overlay-scroller';
import useRequestToken from '@/hooks/use-request-token';
import {
@@ -29,7 +28,6 @@ import {
useRef,
useState
} from 'react';
import { useHotkeys } from 'react-hotkeys-hook';
import { EMBEDDING_API, handleEmbedding } from '../apis';
import { LLM_METAKEYS } from '../hooks/config';
import { useInitLLmMeta } from '../hooks/use-init-meta';
@@ -447,17 +445,17 @@ const GroundEmbedding: React.FC<MessageProps> = forwardRef((props, ref) => {
[]
);
useHotkeys(
HotKeys.SUBMIT,
(e: any) => {
e.preventDefault();
handleSendMessage();
},
{
enabled: !loading,
preventDefault: true
}
);
// useHotkeys(
// HotKeys.SUBMIT,
// (e: any) => {
// e.preventDefault();
// handleSendMessage();
// },
// {
// enabled: !loading,
// preventDefault: true
// }
// );
useEffect(() => {
if (scroller.current) {
@@ -526,7 +524,6 @@ const GroundEmbedding: React.FC<MessageProps> = forwardRef((props, ref) => {
<Tooltip
title={
<span>
[{KeyMap.SUBMIT.textKeybinding}]{' '}
{intl.formatMessage({ id: 'common.button.submit' })}
</span>
}
src/pages/playground/components/ground-reranker.tsx
+11 -14
View File
@@ -1,6 +1,5 @@
import AlertInfo from '@/components/alert-info';
import SealInputNumber from '@/components/seal-form/input-number';
import HotKeys, { KeyMap } from '@/config/hotkeys';
import useOverlayScroller from '@/hooks/use-overlay-scroller';
import useRequestToken from '@/hooks/use-request-token';
import {
@@ -23,7 +22,6 @@ import {
useRef,
useState
} from 'react';
import { useHotkeys } from 'react-hotkeys-hook';
import { rerankerQuery } from '../apis';
import { ParamsSchema } from '../config/types';
import { LLM_METAKEYS } from '../hooks/config';
@@ -439,17 +437,17 @@ const GroundReranker: React.FC<MessageProps> = forwardRef((props, ref) => {
}
}, []);
useHotkeys(
HotKeys.SUBMIT,
(e: any) => {
e.preventDefault();
handleSearch(queryValue);
},
{
enabled: !loading,
preventDefault: true
}
);
// useHotkeys(
// HotKeys.SUBMIT,
// (e: any) => {
// e.preventDefault();
// handleSearch(queryValue);
// },
// {
// enabled: !loading,
// preventDefault: true
// }
// );
useEffect(() => {
if (scroller.current) {
@@ -483,7 +481,6 @@ const GroundReranker: React.FC<MessageProps> = forwardRef((props, ref) => {
<Tooltip
title={
<span>
[{KeyMap.SUBMIT.textKeybinding}]{' '}
{intl.formatMessage({ id: 'common.button.submit' })}
</span>
}
src/pages/playground/components/ground-tts.tsx
-2
View File
@@ -5,7 +5,6 @@ import SealSelect from '@/components/seal-form/seal-select';
import SpeechContent from '@/components/speech-content';
import routeCachekey from '@/config/route-cachekey';
import useOverlayScroller from '@/hooks/use-overlay-scroller';
import { SendOutlined } from '@ant-design/icons';
import { getLocale, useIntl, useSearchParams } from '@umijs/max';
import { Form, Spin } from 'antd';
import classNames from 'classnames';
@@ -392,7 +391,6 @@ const GroundTTS: React.FC<MessageProps> = forwardRef((props, ref) => {
onInputChange={handleInputChange}
clearAll={handleClear}
shouldResetMessage={false}
submitIcon={<SendOutlined></SendOutlined>}
/>
</div>
</div>
src/pages/playground/components/image-edit.tsx
+1
View File
@@ -314,6 +314,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
imguid={activeImgUid}
imageStatus={imageStatus}
imageSrc={image}
loading={loading}
disabled={loading || !imageStatus.isOriginal}
onSave={handleOnSave}
clearUploadMask={handleClearUploadMask}
src/pages/playground/components/message-input.tsx
+14 -15
View File
@@ -1,6 +1,6 @@
import IconFont from '@/components/icon-font';
import HotKeys, { KeyMap } from '@/config/hotkeys';
import { ClearOutlined, SendOutlined, SwapOutlined } from '@ant-design/icons';
import { ClearOutlined, EnterOutlined, SwapOutlined } from '@ant-design/icons';
import { useIntl } from '@umijs/max';
import { Button, Checkbox, Divider, Input, Tooltip } from 'antd';
import _ from 'lodash';
@@ -279,6 +279,16 @@ const MessageInput: React.FC<MessageInputProps> = forwardRef(
}
};
const handleOnKeydown = (e: any) => {
if (e.key === KeyMap.ENTER.keybinding) {
if (e.shiftKey) {
return;
}
e.preventDefault();
handleSendMessage();
}
};
const handleDeleteLastImage = useCallback(() => {
if (message.imgs && message.imgs?.length > 0) {
const newImgList = [...(message.imgs || [])];
@@ -293,19 +303,6 @@ const MessageInput: React.FC<MessageInputProps> = forwardRef(
handleInputChange: handleInputChange
}));
useHotkeys(
HotKeys.SUBMIT,
(e: any) => {
console.log('submit message', loading);
e.preventDefault();
handleSendMessage();
},
{
enabled: !loading && !isDisabled,
enableOnFormTags: focused,
preventDefault: true
}
);
useHotkeys(
HotKeys.ADD,
(e: any) => {
@@ -428,7 +425,7 @@ const MessageInput: React.FC<MessageInputProps> = forwardRef(
disabled={isDisabled}
>
{submitIcon ?? (
<SendOutlined rotate={0} className="font-size-14" />
<EnterOutlined rotate={0} className="font-size-14" />
)}
</Button>
</Tooltip>
@@ -461,6 +458,7 @@ const MessageInput: React.FC<MessageInputProps> = forwardRef(
minRows: defaultSize.minRows,
maxRows: defaultSize.maxRows
}}
onKeyDown={handleOnKeydown}
onChange={handleInputChange}
value={message.content}
size="large"
@@ -476,6 +474,7 @@ const MessageInput: React.FC<MessageInputProps> = forwardRef(
minRows: defaultSize.minRows,
maxRows: defaultSize.maxRows
}}
onKeyDown={handleOnKeydown}
onChange={handleInputChange}
value={message.content}
size="large"
src/pages/playground/hooks/use-init-meta.ts
+5 -4
View File
@@ -69,10 +69,11 @@ export const useInitLLmMeta = (
const { initialize: innitializeParams } = useOverlayScroller();
const defaultModel = useMemo(() => {
return (
searchParams.get('model') ||
(isChat ? model ?? modelList?.[0]?.value : model)
);
if (isChat) {
return searchParams.get('model') || model || modelList?.[0]?.value;
}
// use for multiple chat
return model;
}, [model, modelList, isChat]);
const extractLLMMeta = (meta: any) => {
const towKeys = new Set(precisionTwoKeys);