Compare commits
1 Commits
main
...
ec383596db
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec383596db |
@@ -18,18 +18,16 @@
|
||||
"dependencies": {
|
||||
"@heroui/react": "2.8.3",
|
||||
"@heroui/theme": "2.4.21",
|
||||
"@mujian/js-sdk": "0.0.6-beta.88",
|
||||
"@mujian/js-sdk": "0.0.6-beta.mjv.68",
|
||||
"@tailwindcss/vite": "4.1.12",
|
||||
"ahooks": "3.9.5",
|
||||
"axios": "1.11.0",
|
||||
"dayjs": "1.11.18",
|
||||
"i18next": "^25.8.4",
|
||||
"lodash-es": "4.17.21",
|
||||
"lucide-react": "^0.546.0",
|
||||
"motion": "12.23.12",
|
||||
"react": "19.1.1",
|
||||
"react-dom": "19.1.1",
|
||||
"react-i18next": "^16.5.4",
|
||||
"react-icons": "5.5.0",
|
||||
"react-markdown": "10.1.0",
|
||||
"react-router": "7.8.2",
|
||||
|
||||
115
pnpm-lock.yaml
generated
115
pnpm-lock.yaml
generated
@@ -15,8 +15,8 @@ importers:
|
||||
specifier: 2.4.21
|
||||
version: 2.4.21(tailwindcss@4.1.12)
|
||||
'@mujian/js-sdk':
|
||||
specifier: 0.0.6-beta.88
|
||||
version: 0.0.6-beta.88(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
|
||||
specifier: 0.0.6-beta.mjv.68
|
||||
version: 0.0.6-beta.mjv.68(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
|
||||
'@tailwindcss/vite':
|
||||
specifier: 4.1.12
|
||||
version: 4.1.12(vite@7.1.2(@types/node@22.13.9)(jiti@2.5.1)(lightningcss@1.30.1))
|
||||
@@ -29,9 +29,6 @@ importers:
|
||||
dayjs:
|
||||
specifier: 1.11.18
|
||||
version: 1.11.18
|
||||
i18next:
|
||||
specifier: ^25.8.4
|
||||
version: 25.8.4(typescript@5.8.3)
|
||||
lodash-es:
|
||||
specifier: 4.17.21
|
||||
version: 4.17.21
|
||||
@@ -47,9 +44,6 @@ importers:
|
||||
react-dom:
|
||||
specifier: 19.1.1
|
||||
version: 19.1.1(react@19.1.1)
|
||||
react-i18next:
|
||||
specifier: ^16.5.4
|
||||
version: 16.5.4(i18next@25.8.4(typescript@5.8.3))(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(typescript@5.8.3)
|
||||
react-icons:
|
||||
specifier: 5.5.0
|
||||
version: 5.5.0(react@19.1.1)
|
||||
@@ -67,7 +61,7 @@ importers:
|
||||
version: 1.0.7(tailwindcss@4.1.12)
|
||||
zustand:
|
||||
specifier: 5.0.8
|
||||
version: 5.0.8(@types/react@19.1.10)(immer@11.1.8)(react@19.1.1)(use-sync-external-store@1.6.0(react@19.1.1))
|
||||
version: 5.0.8(@types/react@19.1.10)(react@19.1.1)(use-sync-external-store@1.5.0(react@19.1.1))
|
||||
devDependencies:
|
||||
'@biomejs/biome':
|
||||
specifier: ^2.3.10
|
||||
@@ -181,10 +175,6 @@ packages:
|
||||
resolution: {integrity: sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==}
|
||||
engines: {node: '>=6.9.0'}
|
||||
|
||||
'@babel/runtime@7.28.6':
|
||||
resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==}
|
||||
engines: {node: '>=6.9.0'}
|
||||
|
||||
'@babel/template@7.27.2':
|
||||
resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==}
|
||||
engines: {node: '>=6.9.0'}
|
||||
@@ -1006,8 +996,8 @@ packages:
|
||||
'@jridgewell/trace-mapping@0.3.30':
|
||||
resolution: {integrity: sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==}
|
||||
|
||||
'@mujian/js-sdk@0.0.6-beta.88':
|
||||
resolution: {integrity: sha512-i7LqTQd+wyz4RGMZrLjnDrK7wHUzJz7idPXM87IiJtBLin+hZD7z5tLol3mFlLg5QTGwARBSjflpLHaPxD6jKA==}
|
||||
'@mujian/js-sdk@0.0.6-beta.mjv.68':
|
||||
resolution: {integrity: sha512-bsuev++lvRmS+fD36XljHIw6DnUTFzVrqV69IXKMTb7Vr8W70qQ1rMrn9gN8Lva996JZrXKQ39f3jFrRo1o53g==}
|
||||
peerDependencies:
|
||||
react: ~19.1.1
|
||||
react-dom: ~19.1.1
|
||||
@@ -1887,8 +1877,8 @@ packages:
|
||||
devlop@1.1.0:
|
||||
resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
|
||||
|
||||
dompurify@3.4.2:
|
||||
resolution: {integrity: sha512-lHeS9SA/IKeIFFyYciHBr2n0v1VMPlSj843HdLOwjb2OxNwdq9Xykxqhk+FE42MzAdHvInbAolSE4mhahPpjXA==}
|
||||
dompurify@3.3.1:
|
||||
resolution: {integrity: sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==}
|
||||
|
||||
dunder-proto@1.0.1:
|
||||
resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
|
||||
@@ -2021,23 +2011,9 @@ packages:
|
||||
hast-util-whitespace@3.0.0:
|
||||
resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
|
||||
|
||||
html-parse-stringify@3.0.1:
|
||||
resolution: {integrity: sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==}
|
||||
|
||||
html-url-attributes@3.0.1:
|
||||
resolution: {integrity: sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==}
|
||||
|
||||
i18next@25.8.4:
|
||||
resolution: {integrity: sha512-a9A0MnUjKvzjEN/26ZY1okpra9kA8MEwzYEz1BNm+IyxUKPRH6ihf0p7vj8YvULwZHKHl3zkJ6KOt4hewxBecQ==}
|
||||
peerDependencies:
|
||||
typescript: ^5
|
||||
peerDependenciesMeta:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
immer@11.1.8:
|
||||
resolution: {integrity: sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA==}
|
||||
|
||||
inline-style-parser@0.2.4:
|
||||
resolution: {integrity: sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==}
|
||||
|
||||
@@ -2351,22 +2327,6 @@ packages:
|
||||
react-fast-compare@3.2.2:
|
||||
resolution: {integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==}
|
||||
|
||||
react-i18next@16.5.4:
|
||||
resolution: {integrity: sha512-6yj+dcfMncEC21QPhOTsW8mOSO+pzFmT6uvU7XXdvM/Cp38zJkmTeMeKmTrmCMD5ToT79FmiE/mRWiYWcJYW4g==}
|
||||
peerDependencies:
|
||||
i18next: '>= 25.6.2'
|
||||
react: '>= 16.8.0'
|
||||
react-dom: '*'
|
||||
react-native: '*'
|
||||
typescript: ^5
|
||||
peerDependenciesMeta:
|
||||
react-dom:
|
||||
optional: true
|
||||
react-native:
|
||||
optional: true
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
react-icons@5.5.0:
|
||||
resolution: {integrity: sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==}
|
||||
peerDependencies:
|
||||
@@ -2562,13 +2522,8 @@ packages:
|
||||
peerDependencies:
|
||||
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
|
||||
|
||||
use-sync-external-store@1.6.0:
|
||||
resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
|
||||
peerDependencies:
|
||||
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
|
||||
|
||||
uuid@13.0.2:
|
||||
resolution: {integrity: sha512-vzi9uRZ926x4XV73S/4qQaTwPXM2JBj6/6lI/byHH1jOpCzb0zDbfytgA9LcN/hzb2l7WQSQnxITOVx5un/wGw==}
|
||||
uuid@13.0.0:
|
||||
resolution: {integrity: sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==}
|
||||
hasBin: true
|
||||
|
||||
vfile-message@4.0.3:
|
||||
@@ -2637,10 +2592,6 @@ packages:
|
||||
yaml:
|
||||
optional: true
|
||||
|
||||
void-elements@3.1.0:
|
||||
resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
|
||||
engines: {node: '>=0.10.0'}
|
||||
|
||||
yallist@3.1.1:
|
||||
resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
|
||||
|
||||
@@ -2769,8 +2720,6 @@ snapshots:
|
||||
|
||||
'@babel/runtime@7.28.3': {}
|
||||
|
||||
'@babel/runtime@7.28.6': {}
|
||||
|
||||
'@babel/template@7.27.2':
|
||||
dependencies:
|
||||
'@babel/code-frame': 7.27.1
|
||||
@@ -3993,18 +3942,16 @@ snapshots:
|
||||
'@jridgewell/resolve-uri': 3.1.2
|
||||
'@jridgewell/sourcemap-codec': 1.5.5
|
||||
|
||||
'@mujian/js-sdk@0.0.6-beta.88(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
|
||||
'@mujian/js-sdk@0.0.6-beta.mjv.68(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
|
||||
dependencies:
|
||||
'@adobe/css-tools': 4.4.4
|
||||
ahooks: 3.9.5(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
|
||||
dompurify: 3.4.2
|
||||
immer: 11.1.8
|
||||
lodash-es: 4.17.21
|
||||
dompurify: 3.3.1
|
||||
postmate: 1.5.2
|
||||
react: 19.1.1
|
||||
react-dom: 19.1.1(react@19.1.1)
|
||||
showdown: 2.1.0
|
||||
uuid: 13.0.2
|
||||
uuid: 13.0.0
|
||||
virtua: 0.45.3(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
|
||||
transitivePeerDependencies:
|
||||
- solid-js
|
||||
@@ -5176,7 +5123,7 @@ snapshots:
|
||||
dependencies:
|
||||
dequal: 2.0.3
|
||||
|
||||
dompurify@3.4.2:
|
||||
dompurify@3.3.1:
|
||||
optionalDependencies:
|
||||
'@types/trusted-types': 2.0.7
|
||||
|
||||
@@ -5333,20 +5280,8 @@ snapshots:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
|
||||
html-parse-stringify@3.0.1:
|
||||
dependencies:
|
||||
void-elements: 3.1.0
|
||||
|
||||
html-url-attributes@3.0.1: {}
|
||||
|
||||
i18next@25.8.4(typescript@5.8.3):
|
||||
dependencies:
|
||||
'@babel/runtime': 7.28.6
|
||||
optionalDependencies:
|
||||
typescript: 5.8.3
|
||||
|
||||
immer@11.1.8: {}
|
||||
|
||||
inline-style-parser@0.2.4: {}
|
||||
|
||||
input-otp@1.4.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
|
||||
@@ -5742,17 +5677,6 @@ snapshots:
|
||||
|
||||
react-fast-compare@3.2.2: {}
|
||||
|
||||
react-i18next@16.5.4(i18next@25.8.4(typescript@5.8.3))(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(typescript@5.8.3):
|
||||
dependencies:
|
||||
'@babel/runtime': 7.28.6
|
||||
html-parse-stringify: 3.0.1
|
||||
i18next: 25.8.4(typescript@5.8.3)
|
||||
react: 19.1.1
|
||||
use-sync-external-store: 1.6.0(react@19.1.1)
|
||||
optionalDependencies:
|
||||
react-dom: 19.1.1(react@19.1.1)
|
||||
typescript: 5.8.3
|
||||
|
||||
react-icons@5.5.0(react@19.1.1):
|
||||
dependencies:
|
||||
react: 19.1.1
|
||||
@@ -5980,11 +5904,7 @@ snapshots:
|
||||
dependencies:
|
||||
react: 19.1.1
|
||||
|
||||
use-sync-external-store@1.6.0(react@19.1.1):
|
||||
dependencies:
|
||||
react: 19.1.1
|
||||
|
||||
uuid@13.0.2: {}
|
||||
uuid@13.0.0: {}
|
||||
|
||||
vfile-message@4.0.3:
|
||||
dependencies:
|
||||
@@ -6015,17 +5935,14 @@ snapshots:
|
||||
jiti: 2.5.1
|
||||
lightningcss: 1.30.1
|
||||
|
||||
void-elements@3.1.0: {}
|
||||
|
||||
yallist@3.1.1: {}
|
||||
|
||||
yallist@5.0.0: {}
|
||||
|
||||
zustand@5.0.8(@types/react@19.1.10)(immer@11.1.8)(react@19.1.1)(use-sync-external-store@1.6.0(react@19.1.1)):
|
||||
zustand@5.0.8(@types/react@19.1.10)(react@19.1.1)(use-sync-external-store@1.5.0(react@19.1.1)):
|
||||
optionalDependencies:
|
||||
'@types/react': 19.1.10
|
||||
immer: 11.1.8
|
||||
react: 19.1.1
|
||||
use-sync-external-store: 1.6.0(react@19.1.1)
|
||||
use-sync-external-store: 1.5.0(react@19.1.1)
|
||||
|
||||
zwitch@2.0.4: {}
|
||||
|
||||
35
src/i18n.ts
35
src/i18n.ts
@@ -1,35 +0,0 @@
|
||||
import i18n from 'i18next';
|
||||
import { initReactI18next } from 'react-i18next';
|
||||
|
||||
import enUs from './locales/en-us.json';
|
||||
import zhCn from './locales/zh-cn.json';
|
||||
|
||||
const resources = {
|
||||
'en-US': { translation: enUs },
|
||||
'zh-CN': { translation: zhCn },
|
||||
};
|
||||
|
||||
const defaultLng = (() => {
|
||||
const paramsLang = new URLSearchParams(window.location.search).get('lang');
|
||||
const browserLang = navigator.language.toLowerCase();
|
||||
if (paramsLang) {
|
||||
const langSection = paramsLang.toLowerCase().replace('_', '-').split('-');
|
||||
const normalized = langSection[0] + '-' + langSection[1].toUpperCase();
|
||||
return normalized;
|
||||
}
|
||||
if (browserLang.startsWith('zh')) return 'zh-CN';
|
||||
return 'en-US';
|
||||
})();
|
||||
|
||||
i18n.use(initReactI18next).init({
|
||||
resources,
|
||||
lng: defaultLng,
|
||||
fallbackLng: 'zh-CN',
|
||||
nonExplicitSupportedLngs: true,
|
||||
load: 'currentOnly',
|
||||
interpolation: {
|
||||
escapeValue: false,
|
||||
},
|
||||
});
|
||||
|
||||
export default i18n;
|
||||
@@ -1,18 +0,0 @@
|
||||
{
|
||||
"edit": "Edit",
|
||||
"copy": "Copy",
|
||||
"refresh": "Refresh",
|
||||
"continue": "Continue",
|
||||
"delete": "Delete",
|
||||
"save": "Save",
|
||||
"cancel": "Cancel",
|
||||
"copySuccess": "Copy Success",
|
||||
"copyFailed": "Copy Failed, Please Try Again.",
|
||||
"generating": "Generating...",
|
||||
"sendWithEnter": "Send with Enter",
|
||||
"newMessageExists": "New Message Exists, Cannot Switch Opening Message",
|
||||
"assertionFailed": "Assertion Failed: No Opening Message, Cannot Switch Opening Message",
|
||||
"unknownError": "Oops, Something Went Wrong, Please Refresh the Page and Try Again~",
|
||||
"saveFailed": "Last Save Message Failed, Please Refresh the Page and Try Again",
|
||||
"error": "Error, Please Refresh the Page and Try Again"
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
{
|
||||
"edit": "编辑",
|
||||
"copy": "复制",
|
||||
"refresh": "重说",
|
||||
"continue": "继续",
|
||||
"delete": "删除",
|
||||
"save": "保存",
|
||||
"cancel": "取消",
|
||||
"copySuccess": "复制成功",
|
||||
"copyFailed": "复制失败,请重试。",
|
||||
"generating": "正在生成...",
|
||||
"sendWithEnter": "按 Enter 发送",
|
||||
"newMessageExists": "已有新消息,不允许切换开场白",
|
||||
"assertionFailed": "断言失败:没有开场消息,无法切换开场白",
|
||||
"unknownError": "哎呀,发生了未知错误,刷新页面再试试吧~",
|
||||
"saveFailed": "最近一次保存消息失败,请刷新页面后重试",
|
||||
"error": "出错啦,请刷新页面后重试"
|
||||
}
|
||||
@@ -4,7 +4,6 @@ import '@/styles/global.css';
|
||||
import { MujianProvider } from '@mujian/js-sdk/react';
|
||||
import { ReactRouterProvider } from './providers/RouterProvider.tsx';
|
||||
import '@mujian/js-sdk/react.css';
|
||||
import './i18n';
|
||||
|
||||
createRoot(document.getElementById('root')!).render(
|
||||
<MujianProvider>
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Button, ButtonGroup, cn } from '@heroui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { mjChatCls } from '@/utils/cls';
|
||||
|
||||
export type EditActionsProps = {
|
||||
@@ -15,7 +14,6 @@ export const EditActions = ({
|
||||
onSaveEdit,
|
||||
onCancelEdit,
|
||||
}: EditActionsProps) => {
|
||||
const { t } = useTranslation();
|
||||
if (!isEditing) return null;
|
||||
|
||||
return (
|
||||
@@ -45,7 +43,7 @@ export const EditActions = ({
|
||||
size="sm"
|
||||
onPress={onSaveEdit}
|
||||
>
|
||||
{t('save')}
|
||||
保存
|
||||
</Button>
|
||||
<Button
|
||||
className={mjChatCls(
|
||||
@@ -55,7 +53,7 @@ export const EditActions = ({
|
||||
size="sm"
|
||||
onPress={onCancelEdit}
|
||||
>
|
||||
{t('cancel')}
|
||||
取消
|
||||
</Button>
|
||||
</ButtonGroup>
|
||||
</div>
|
||||
|
||||
@@ -33,7 +33,7 @@ export type LastMessageActionsProps = {
|
||||
};
|
||||
|
||||
export const MessageActions = ({
|
||||
message,
|
||||
// message,
|
||||
isUser,
|
||||
isLastMsg,
|
||||
isFirstMsg,
|
||||
@@ -64,7 +64,7 @@ export const MessageActions = ({
|
||||
<div
|
||||
className={mjChatCls(
|
||||
['msg-actions-wrapper'],
|
||||
cn('flex justify-between row-start-2 col-start-1 col-end-4 flex-wrap'),
|
||||
cn('flex justify-between row-start-2 col-start-1 col-end-4'),
|
||||
)}
|
||||
role="presentation"
|
||||
onClick={onMessageTextClick} /* Stop propagation */
|
||||
@@ -76,95 +76,77 @@ export const MessageActions = ({
|
||||
)}
|
||||
>
|
||||
{!isFirstMsg && (
|
||||
<div className="flex gap-2">
|
||||
<Dropdown
|
||||
placement="top-start"
|
||||
className={mjChatCls(['msg-actions-dropdown'], 'dark')}
|
||||
size="sm"
|
||||
>
|
||||
<DropdownTrigger>
|
||||
<Button
|
||||
variant="light"
|
||||
size="sm"
|
||||
className={mjChatCls(
|
||||
['msg-actions-dropdown-button'],
|
||||
'bg-white/15 text-default min-w-10',
|
||||
)}
|
||||
>
|
||||
<Ellipsis
|
||||
size={14}
|
||||
className={mjChatCls(['msg-actions-dropdown-button-icon'])}
|
||||
/>
|
||||
</Button>
|
||||
</DropdownTrigger>
|
||||
<DropdownMenu
|
||||
items={dropdownItems}
|
||||
<Dropdown
|
||||
placement="top-start"
|
||||
className={mjChatCls(['msg-actions-dropdown'], 'dark')}
|
||||
size="sm"
|
||||
>
|
||||
<DropdownTrigger>
|
||||
<Button
|
||||
variant="light"
|
||||
size="sm"
|
||||
className={mjChatCls(
|
||||
['msg-actions-dropdown-menu'],
|
||||
'text-white',
|
||||
['msg-actions-dropdown-button'],
|
||||
'bg-white/15 text-default min-w-10',
|
||||
)}
|
||||
>
|
||||
{(item) => (
|
||||
<DropdownItem
|
||||
key={item.key}
|
||||
color={item.color}
|
||||
className={mjChatCls(
|
||||
<Ellipsis
|
||||
size={14}
|
||||
className={mjChatCls(['msg-actions-dropdown-button-icon'])}
|
||||
/>
|
||||
</Button>
|
||||
</DropdownTrigger>
|
||||
<DropdownMenu
|
||||
items={dropdownItems}
|
||||
className={mjChatCls(['msg-actions-dropdown-menu'], 'text-white')}
|
||||
// disabledKeys={
|
||||
// message.id.startsWith('not_saved')
|
||||
// ? ['edit', 'regenerate', 'continue']
|
||||
// : []
|
||||
// }
|
||||
>
|
||||
{(item) => (
|
||||
<DropdownItem
|
||||
key={item.key}
|
||||
color={item.color}
|
||||
className={mjChatCls(
|
||||
[
|
||||
'msg-actions-dropdown-menu-item',
|
||||
`msg-actions-dropdown-menu-item-${item.key}`,
|
||||
],
|
||||
item.className || '',
|
||||
)}
|
||||
onPress={item.onPress}
|
||||
isDisabled={item.disabled}
|
||||
classNames={{
|
||||
wrapper: mjChatCls(
|
||||
[
|
||||
'msg-actions-dropdown-menu-item',
|
||||
`msg-actions-dropdown-menu-item-${item.key}`,
|
||||
'msg-actions-dropdown-menu-item-wrapper',
|
||||
`msg-actions-dropdown-menu-item-${item.key}-wrapper`,
|
||||
],
|
||||
item.className || '',
|
||||
)}
|
||||
onPress={item.onPress}
|
||||
isDisabled={item.disabled}
|
||||
classNames={{
|
||||
wrapper: mjChatCls(
|
||||
[
|
||||
'msg-actions-dropdown-menu-item-wrapper',
|
||||
`msg-actions-dropdown-menu-item-${item.key}-wrapper`,
|
||||
],
|
||||
item.className || '',
|
||||
),
|
||||
base: mjChatCls(
|
||||
[
|
||||
'msg-actions-dropdown-menu-item-base',
|
||||
`msg-actions-dropdown-menu-item-${item.key}-base`,
|
||||
],
|
||||
item.className || '',
|
||||
),
|
||||
title: mjChatCls(
|
||||
[
|
||||
'msg-actions-dropdown-menu-item-title',
|
||||
`msg-actions-dropdown-menu-item-${item.key}-title`,
|
||||
],
|
||||
item.className || '',
|
||||
),
|
||||
}}
|
||||
>
|
||||
{item.label}
|
||||
</DropdownItem>
|
||||
)}
|
||||
</DropdownMenu>
|
||||
</Dropdown>
|
||||
{message.flags.emptyResponse &&
|
||||
message.flags.saved &&
|
||||
!message.flags.contentFilter &&
|
||||
isLastMsg && (
|
||||
<Button
|
||||
variant="light"
|
||||
size="sm"
|
||||
className={mjChatCls(
|
||||
['msg-actions-dropdown-button'],
|
||||
'bg-white/15 text-default min-w-10',
|
||||
)}
|
||||
onPress={() => {
|
||||
onRegenerate?.();
|
||||
),
|
||||
base: mjChatCls(
|
||||
[
|
||||
'msg-actions-dropdown-menu-item-base',
|
||||
`msg-actions-dropdown-menu-item-${item.key}-base`,
|
||||
],
|
||||
item.className || '',
|
||||
),
|
||||
title: mjChatCls(
|
||||
[
|
||||
'msg-actions-dropdown-menu-item-title',
|
||||
`msg-actions-dropdown-menu-item-${item.key}-title`,
|
||||
],
|
||||
item.className || '',
|
||||
),
|
||||
}}
|
||||
>
|
||||
重试
|
||||
</Button>
|
||||
{item.label}
|
||||
</DropdownItem>
|
||||
)}
|
||||
</div>
|
||||
</DropdownMenu>
|
||||
</Dropdown>
|
||||
)}
|
||||
</div>
|
||||
<div className={mjChatCls(['swipe-action-container'], 'flex items-end')}>
|
||||
@@ -217,26 +199,6 @@ export const MessageActions = ({
|
||||
</ButtonGroup>
|
||||
)}
|
||||
</div>
|
||||
{message.flags.contentFilter && isLastMsg && (
|
||||
<div className="w-full flex items-center">
|
||||
<div className="opacity-30 min-h-4 ml-0 text-white text-sm">
|
||||
检测到截断,是否需要重新生成?
|
||||
</div>
|
||||
<Button
|
||||
variant="light"
|
||||
size="sm"
|
||||
className={mjChatCls(
|
||||
['msg-actions-dropdown-button'],
|
||||
'bg-white/15 text-default min-w-8 h-6 px-0',
|
||||
)}
|
||||
onPress={() => {
|
||||
onRegenerate?.();
|
||||
}}
|
||||
>
|
||||
是
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { useContext } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { PanicContext } from '../../PanicContext';
|
||||
|
||||
export type DropdownItem = {
|
||||
@@ -35,30 +34,30 @@ export const useMessageActions = ({
|
||||
onDelete,
|
||||
}: UseDropdownItemsProps): DropdownItem[] => {
|
||||
const { panicked } = useContext(PanicContext);
|
||||
const { t } = useTranslation();
|
||||
|
||||
const dropdownItems: DropdownItem[] = [
|
||||
{
|
||||
key: 'edit',
|
||||
label: t('edit'),
|
||||
label: '编辑',
|
||||
onPress: onEditButtonClick,
|
||||
disabled: panicked,
|
||||
},
|
||||
{
|
||||
key: 'copy',
|
||||
label: t('copy'),
|
||||
label: '复制',
|
||||
onPress: onCopyClick,
|
||||
},
|
||||
...(isLastMsg
|
||||
? [
|
||||
{
|
||||
key: 'regenerate',
|
||||
label: t('refresh'),
|
||||
label: '重说',
|
||||
onPress: async () => await onRegenerate?.(),
|
||||
disabled: panicked,
|
||||
},
|
||||
{
|
||||
key: 'continue',
|
||||
label: t('continue'),
|
||||
label: '继续',
|
||||
onPress: async () => await onContinue?.(),
|
||||
disabled: panicked,
|
||||
},
|
||||
@@ -66,7 +65,7 @@ export const useMessageActions = ({
|
||||
: []),
|
||||
{
|
||||
key: 'delete',
|
||||
label: t('delete'),
|
||||
label: '删除',
|
||||
onPress: onDelete,
|
||||
color: 'danger',
|
||||
className: 'text-danger',
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { addToast, cn } from '@heroui/react';
|
||||
import { type Message as BaseMessage, useMujian } from '@mujian/js-sdk/react';
|
||||
import React, { type MouseEventHandler } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { mjChatCls } from '@/utils/cls';
|
||||
import { EditActions } from './components/EditActions';
|
||||
import { MessageActions } from './components/MessageActions';
|
||||
@@ -84,11 +83,10 @@ export const MessageItem = React.memo((props: MessageItemProps) => {
|
||||
swipes = [],
|
||||
activeSwipeId,
|
||||
|
||||
// mjv,
|
||||
mjv,
|
||||
|
||||
// sendAt,
|
||||
} = message;
|
||||
const { t } = useTranslation();
|
||||
const isUser = role === 'user';
|
||||
|
||||
const messageRef = React.useRef<HTMLDivElement>(null); // 使用 useRef 获取当前组件的引用
|
||||
@@ -125,13 +123,13 @@ export const MessageItem = React.memo((props: MessageItemProps) => {
|
||||
await mujian.utils.clipboard.writeText(originalMessage.content);
|
||||
addToast({
|
||||
color: 'success',
|
||||
description: t('copySuccess'),
|
||||
description: '复制成功',
|
||||
timeout: 2000,
|
||||
});
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
addToast({
|
||||
description: t('copyFailed'),
|
||||
description: '复制失败,请重试。',
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -187,7 +185,7 @@ export const MessageItem = React.memo((props: MessageItemProps) => {
|
||||
// 按ctrl点击时打印ID
|
||||
if (event.ctrlKey) {
|
||||
event.preventDefault();
|
||||
console.log('Official Chat Message ID:', id, message);
|
||||
console.log('Official Chat Message ID:', id, mjv);
|
||||
}
|
||||
}}
|
||||
>
|
||||
|
||||
@@ -60,7 +60,7 @@ export const MessageList = React.memo(
|
||||
prevDataLength.current === data.length &&
|
||||
prevLastMsgId.current !== lastMessage?.id;
|
||||
if (shouldRecoverScroll) {
|
||||
vl.scrollTo(vl.scrollOffset + 9999);
|
||||
vl.scrollTo(vl.scrollOffset);
|
||||
}
|
||||
|
||||
prevDataLength.current = data.length;
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import { Button, Textarea } from '@heroui/react';
|
||||
import { CircleStopIcon, SendIcon } from 'lucide-react';
|
||||
import { useContext } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { mjChatCls } from '@/utils/cls';
|
||||
import { useContext } from 'react';
|
||||
import { PanicContext } from './PanicContext';
|
||||
|
||||
interface Props {
|
||||
@@ -32,7 +31,7 @@ export const MsgSend = ({
|
||||
onChange,
|
||||
}: Props) => {
|
||||
const { panicked } = useContext(PanicContext);
|
||||
const { t } = useTranslation();
|
||||
|
||||
const isEmptyInput = value.trim().length === 0;
|
||||
|
||||
const handleSend = () => {
|
||||
@@ -115,7 +114,7 @@ export const MsgSend = ({
|
||||
maxLength={50000}
|
||||
maxRows={4}
|
||||
minRows={1}
|
||||
placeholder={running ? t('generating') : t('sendWithEnter')}
|
||||
placeholder={running ? '正在生成...' : '按 Enter 发送'}
|
||||
radius="lg"
|
||||
size="lg"
|
||||
value={value}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Alert, ScrollShadow, Spinner, ToastProvider } from '@heroui/react';
|
||||
import { useChat, useMjEngine, useMujian } from '@mujian/js-sdk/react';
|
||||
import { useCallback, useEffect, useMemo } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useChat, useMujian } from '@mujian/js-sdk/react';
|
||||
import type { PersonaInfo, ProjectInfo } from '@mujian/js-sdk/types';
|
||||
import * as _ from 'lodash-es';
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { useGlobalStore } from '@/store/global';
|
||||
import { mjChatCls } from '@/utils/cls';
|
||||
import { MessageList } from './MessageList';
|
||||
@@ -9,10 +10,103 @@ import { MsgSend } from './MsgSend';
|
||||
import { PanicContext } from './PanicContext';
|
||||
import { QuickReply } from './QuickReply';
|
||||
|
||||
let $mj_ai_chat_complete: ((message: string) => Promise<void>) | undefined;
|
||||
let $mj_ai_chat_project: ProjectInfo | undefined;
|
||||
let $mj_ai_chat_settings_persona: PersonaInfo | undefined;
|
||||
let $mj_ai_chat_setFirstMesIndex:
|
||||
| ((index: number) => Promise<void>)
|
||||
| undefined;
|
||||
let $mj_ai_chat_mjv_get:
|
||||
| ((messageId: string, swipeId: number, path: string) => unknown)
|
||||
| undefined;
|
||||
let $mj_ai_chat_mjv_getAll:
|
||||
| ((messageId: string, swipeId: number) => unknown)
|
||||
| undefined;
|
||||
|
||||
// 扩展Window接口以包含chat对象
|
||||
declare global {
|
||||
interface MjEngineAiChat {
|
||||
complete?: (message: string) => Promise<void>;
|
||||
project?: ProjectInfo;
|
||||
settings: {
|
||||
persona?: PersonaInfo;
|
||||
};
|
||||
/**
|
||||
* @param index 下标从1开始
|
||||
*/
|
||||
setFirstMesIndex?: (index: number) => Promise<void>;
|
||||
}
|
||||
|
||||
interface MjEngineAi {
|
||||
chat: MjEngineAiChat;
|
||||
}
|
||||
|
||||
interface MjEngine {
|
||||
ai: MjEngineAi;
|
||||
}
|
||||
|
||||
interface Window {
|
||||
$mj_engine: MjEngine & {
|
||||
bind: (extra: { messageId: string; swipeId: number }) => MjEngine & {
|
||||
ai: {
|
||||
chat: {
|
||||
mjv: {
|
||||
get: (path: string) => unknown;
|
||||
getAll: () => unknown;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
const $mj_engine: MjEngine = {
|
||||
ai: {
|
||||
chat: {
|
||||
get complete() {
|
||||
return $mj_ai_chat_complete;
|
||||
},
|
||||
get project() {
|
||||
return $mj_ai_chat_project;
|
||||
},
|
||||
settings: {
|
||||
get persona() {
|
||||
return $mj_ai_chat_settings_persona;
|
||||
},
|
||||
},
|
||||
get setFirstMesIndex() {
|
||||
return $mj_ai_chat_setFirstMesIndex;
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
window.$mj_engine = {
|
||||
...$mj_engine,
|
||||
bind({ messageId, swipeId }) {
|
||||
return {
|
||||
ai: {
|
||||
chat: {
|
||||
...$mj_engine.ai.chat,
|
||||
mjv: {
|
||||
get(path) {
|
||||
return $mj_ai_chat_mjv_get?.(messageId, swipeId, path);
|
||||
},
|
||||
getAll() {
|
||||
return $mj_ai_chat_mjv_getAll?.(messageId, swipeId) ?? {};
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
},
|
||||
};
|
||||
|
||||
export const Chat = () => {
|
||||
const { init, projectInfo, activePersona } = useGlobalStore();
|
||||
const mujian = useMujian();
|
||||
const { t } = useTranslation();
|
||||
const [inputValue, setInputValue] = useState('');
|
||||
const {
|
||||
messages,
|
||||
status,
|
||||
@@ -25,8 +119,6 @@ export const Chat = () => {
|
||||
editMessage,
|
||||
setSwipe,
|
||||
loadMoreMessage,
|
||||
input: inputValue,
|
||||
setInput: setInputValue,
|
||||
} = useChat({
|
||||
onError: (e) => {
|
||||
console.error(e);
|
||||
@@ -34,6 +126,11 @@ export const Chat = () => {
|
||||
pageSize: 20,
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
$mj_ai_chat_project = projectInfo ?? undefined;
|
||||
$mj_ai_chat_settings_persona = activePersona ?? undefined;
|
||||
}, [projectInfo, activePersona]);
|
||||
|
||||
// 自定义删除消息函数
|
||||
const handleDeleteMessage = async (messageId: string) => {
|
||||
// 找到要删除的消息
|
||||
@@ -93,13 +190,35 @@ export const Chat = () => {
|
||||
[append, projectInfo, activePersona],
|
||||
);
|
||||
|
||||
useMjEngine({
|
||||
projectInfo: projectInfo ?? undefined,
|
||||
activePersona: activePersona ?? undefined,
|
||||
onSend,
|
||||
messages,
|
||||
setSwipe,
|
||||
});
|
||||
// 将chat对象挂载到window上
|
||||
useEffect(() => {
|
||||
$mj_ai_chat_complete = async (message) => {
|
||||
await onSend(message);
|
||||
};
|
||||
$mj_ai_chat_setFirstMesIndex = async (oneBasedIndex) => {
|
||||
if (messages.length > 1) {
|
||||
throw new Error('已有新消息,不允许切换开场白');
|
||||
}
|
||||
if (messages.length === 0) {
|
||||
throw new Error('断言失败:没有开场消息,无法切换开场白');
|
||||
}
|
||||
const zeroBasedIndex = Math.floor(oneBasedIndex) - 1;
|
||||
const swipeLength = messages[0].swipes.length;
|
||||
if (zeroBasedIndex < 0 || zeroBasedIndex >= swipeLength) {
|
||||
return;
|
||||
}
|
||||
setSwipe(messages[0].id, zeroBasedIndex);
|
||||
};
|
||||
$mj_ai_chat_mjv_getAll = (messageId, swipeId) =>
|
||||
messages.find((m) => m.id === messageId)?.swipeInfo[swipeId]?.mjv?.value;
|
||||
$mj_ai_chat_mjv_get = (messageId, swipeId, path) => {
|
||||
const mjv = $mj_ai_chat_mjv_getAll?.(messageId, swipeId);
|
||||
if (!mjv) {
|
||||
return;
|
||||
}
|
||||
return _.get(mjv, path);
|
||||
};
|
||||
}, [onSend, messages, setSwipe]);
|
||||
|
||||
const handleInputChange = (value: string) => {
|
||||
setInputValue(value);
|
||||
@@ -113,6 +232,15 @@ export const Chat = () => {
|
||||
);
|
||||
}
|
||||
|
||||
const errorMessage =
|
||||
Boolean(error) &&
|
||||
(typeof error === 'object' &&
|
||||
error &&
|
||||
'message' in error &&
|
||||
typeof error.message === 'string'
|
||||
? error.message
|
||||
: '哎呀,发生了未知错误,刷新页面再试试吧~');
|
||||
|
||||
const toastStyle = `
|
||||
.toast-region {
|
||||
margin-top: ${paddingTop}px;
|
||||
@@ -122,20 +250,9 @@ export const Chat = () => {
|
||||
status !== 'streaming' &&
|
||||
messages.some((m) => m.id.startsWith('not_saved'));
|
||||
|
||||
const errorMessage = [
|
||||
Boolean(error) &&
|
||||
(typeof error === 'object' &&
|
||||
error &&
|
||||
'message' in error &&
|
||||
typeof error.message === 'string'
|
||||
? error.message
|
||||
: t('unknownError')),
|
||||
saveFailed ? t('saveFailed') : '',
|
||||
].filter(Boolean);
|
||||
|
||||
return (
|
||||
<PanicContext.Provider
|
||||
value={{ panicked: saveFailed || Boolean(errorMessage.length) }}
|
||||
value={{ panicked: saveFailed || Boolean(errorMessage) }}
|
||||
>
|
||||
<div className={mjChatCls(['container'], 'size-full relative')}>
|
||||
<style> {toastStyle} </style>
|
||||
@@ -156,7 +273,7 @@ export const Chat = () => {
|
||||
)}
|
||||
style={{
|
||||
backgroundImage: projectInfo
|
||||
? `url(${projectInfo.backgroundImageUrl || projectInfo.coverImageUrl})`
|
||||
? `url(${projectInfo.coverImageUrl})`
|
||||
: undefined,
|
||||
}}
|
||||
/>
|
||||
@@ -189,7 +306,19 @@ export const Chat = () => {
|
||||
onRegenerate={regenerate}
|
||||
onNeedMore={loadMoreMessage}
|
||||
/>
|
||||
{errorMessage.length > 0 && (
|
||||
{saveFailed && (
|
||||
<Alert
|
||||
hideIcon
|
||||
title="最近一次保存消息失败,请刷新页面后重试"
|
||||
className="opacity-30"
|
||||
classNames={{
|
||||
mainWrapper: 'min-h-4 ml-0 text-white',
|
||||
}}
|
||||
color="default"
|
||||
variant="bordered"
|
||||
/>
|
||||
)}
|
||||
{errorMessage && (
|
||||
<Alert
|
||||
hideIcon
|
||||
className={mjChatCls(['error-message'], 'mt-2 mb-6')}
|
||||
@@ -201,14 +330,8 @@ export const Chat = () => {
|
||||
description: 'opacity-80 text-xs',
|
||||
}}
|
||||
color="danger"
|
||||
title={t('error')}
|
||||
description={
|
||||
<>
|
||||
{errorMessage.map((m) => (
|
||||
<div>{m}</div>
|
||||
))}
|
||||
</>
|
||||
}
|
||||
title="出错啦,请刷新页面后重试"
|
||||
description={errorMessage}
|
||||
variant="bordered"
|
||||
/>
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user