- 软件地址: https://github.com/027xiguapi/pear-rec + {t('setting.address')}: https://github.com/027xiguapi/pear-rec
); diff --git a/packages/web/src/components/setting/shortcutSetting.tsx b/packages/web/src/components/setting/shortcutSetting.tsx new file mode 100644 index 00000000..7c5a805d --- /dev/null +++ b/packages/web/src/components/setting/shortcutSetting.tsx @@ -0,0 +1,37 @@ +import React, { useEffect, useRef, useState } from 'react'; +import { useTranslation } from 'react-i18next'; +import { Switch, Form, Input } from 'antd'; +import { useSettingApi } from '../../api/setting'; + +const ShortcutSetting = (props) => { + const settingApi = useSettingApi(); + const { t, i18n } = useTranslation(); + const [form] = Form.useForm(); + const { user, setting } = props; + + return ( +
+
+
+ );
+};
+
+export default ShortcutSetting;
diff --git a/packages/web/src/components/setting/userSetting.tsx b/packages/web/src/components/setting/userSetting.tsx
index 8693a447..6c320dc2 100644
--- a/packages/web/src/components/setting/userSetting.tsx
+++ b/packages/web/src/components/setting/userSetting.tsx
@@ -1,19 +1,24 @@
import React, { useEffect, useRef, useState } from 'react';
-import { Card } from 'antd';
+import { Button, Modal } from 'antd';
import dayjs from 'dayjs';
+import { useTranslation } from 'react-i18next';
+import { useSettingApi } from '../../api/setting';
+import { Local } from '../../util/storage';
const logo = './imgs/icons/png/512x512.png';
-const { Meta } = Card;
+const settingApi = useSettingApi();
+
const UserSetting = (props) => {
- const { user } = props;
+ const { t, i18n } = useTranslation();
+ const { user, setting } = props;
const [uuid, setUuid] = useState('');
const [createdTime, setCreatedTime] = useState('');
useEffect(() => {
- user.id && getUser();
+ user.id && setUser();
}, [user]);
- async function getUser() {
+ async function setUser() {
setUuid(user.uuid);
setCreatedTime(user.createdAt);
}
@@ -22,11 +27,33 @@ const UserSetting = (props) => {
return dayjs(time).format('YYYY-MM-DD hh:mm:ss');
}
+ function handleResetClick() {
+ Modal.confirm({
+ title: '提示',
+ content: `是否重置设置？`,
+ okText: t('modal.ok'),
+ cancelText: t('modal.cancel'),
+ onOk() {
+ Local.set('i18n', 'zh');
+ i18n.changeLanguage('zh');
+ setting.id && settingApi.resetSetting(setting.id);
+ window.electronAPI?.sendSeSetLanguage('zh');
+ },
+ });
+ }
+
return (
-
);
};
diff --git a/packages/web/src/i18n/locales/de-DE.json b/packages/web/src/i18n/locales/de-DE.json
index 102858d7..1a927c4e 100644
--- a/packages/web/src/i18n/locales/de-DE.json
+++ b/packages/web/src/i18n/locales/de-DE.json
@@ -63,6 +63,10 @@
"setting": {
"userSetting": "Nutzereinstellungen",
"basicSetting": "Basiseinstellungen",
+ "serverSetting": "server",
+ "shortcutSetting": "shortcut",
+ "address": "web address",
+ "openFilePath": "open folder",
"language": "Sprache",
"filePath": "Dateipfad",
"openAtLogin": "Bei Anmeldung öffnen",
@@ -70,4 +74,4 @@
"close": "schließen",
"download": "Download"
}
-}
+}
\ No newline at end of file
diff --git a/packages/web/src/i18n/locales/en-US.json b/packages/web/src/i18n/locales/en-US.json
index a75704c6..fab02af9 100644
--- a/packages/web/src/i18n/locales/en-US.json
+++ b/packages/web/src/i18n/locales/en-US.json
@@ -66,8 +66,13 @@
"emptyBtn": "open video"
},
"setting": {
- "userSetting": "userSetting",
- "basicSetting": "basicSetting",
+ "userSetting": "user",
+ "basicSetting": "basic",
+ "serverSetting": "server",
+ "shortcutSetting": "shortcut",
+ "address": "web address",
+ "openFilePath": "open folder",
+ "reset": "reset",
"language": "language",
"filePath": "filePath",
"openAtLogin": "openAtLogin",
@@ -77,4 +82,4 @@
"openServer": "open server",
"serverPath": "server path"
}
-}
+}
\ No newline at end of file
diff --git a/packages/web/src/i18n/locales/zh-CN.json b/packages/web/src/i18n/locales/zh-CN.json
index 88ec0c89..bbc1bf50 100644
--- a/packages/web/src/i18n/locales/zh-CN.json
+++ b/packages/web/src/i18n/locales/zh-CN.json
@@ -68,6 +68,11 @@
"setting": {
"userSetting": "账户设置",
"basicSetting": "通用设置",
+ "serverSetting": "服务设置",
+ "shortcutSetting": "快捷键",
+ "address": "软件地址",
+ "openFilePath": "打开下载文件夹",
+ "reset": "重置",
"language": "语言",
"filePath": "保存地址",
"openAtLogin": "开机自启动",
@@ -77,4 +82,4 @@
"openServer": "打开服务",
"serverPath": "服务地址"
}
-}
+}
\ No newline at end of file
diff --git a/packages/web/src/pages/recorderFullScreen/index.tsx b/packages/web/src/pages/recorderFullScreen/index.tsx
index 93ea243c..09f38076 100644
--- a/packages/web/src/pages/recorderFullScreen/index.tsx
+++ b/packages/web/src/pages/recorderFullScreen/index.tsx
@@ -212,20 +212,16 @@ const RecorderScreen = () => {
}
function handleShotScreen() {
- if (window.electronAPI) {
- window.electronAPI.sendRsShotScreen();
- } else {
- const canvas = document.createElement('canvas');
- canvas.width = window.innerWidth;
- canvas.height = window.innerHeight;
- const context = canvas.getContext('2d');
- context.drawImage(videoRef.current, 0, 0, canvas.width, canvas.height);
- const url = canvas.toDataURL('image/png');
- const link = document.createElement('a');
- link.href = url;
- link.download = `pear-rec_${+new Date()}.png`;
- link.click();
- }
+ const canvas = document.createElement('canvas');
+ canvas.width = window.innerWidth;
+ canvas.height = window.innerHeight;
+ const context = canvas.getContext('2d');
+ context.drawImage(videoRef.current, 0, 0, canvas.width, canvas.height);
+ const url = canvas.toDataURL('image/png');
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = `pear-rec_${+new Date()}.png`;
+ link.click();
}
function handleTogglePause() {
@@ -313,4 +309,3 @@ const RecorderScreen = () => {
};
ininitApp(RecorderScreen);
-export default RecorderScreen;
diff --git a/packages/web/src/pages/setting/index.module.scss b/packages/web/src/pages/setting/index.module.scss
index 2775286d..92980a48 100644
--- a/packages/web/src/pages/setting/index.module.scss
+++ b/packages/web/src/pages/setting/index.module.scss
@@ -5,6 +5,14 @@
border-radius: 8px;
width: 540px;
:global {
+ .userSetting {
+ .logo img {
+ width: 120px;
+ }
+ .resetBtn {
+ margin-left: 40px;
+ }
+ }
.tip {
padding: 10px 0;
color: red;
@@ -16,6 +24,11 @@
.serverPathInput {
width: 300px;
}
+ .shortcutSetting {
+ .ant-input {
+ width: 260px;
+ }
+ }
}
}
diff --git a/packages/web/src/pages/setting/index.tsx b/packages/web/src/pages/setting/index.tsx
index e38d82fe..aec65f6f 100644
--- a/packages/web/src/pages/setting/index.tsx
+++ b/packages/web/src/pages/setting/index.tsx
@@ -1,85 +1,88 @@
-import React, { useEffect, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Tabs } from "antd";
-import UserSetting from "../../components/setting/userSetting";
-import BasicSetting from "../../components/setting/basicSetting";
-import ServerSetting from "../../components/setting/serverSetting";
-import ininitApp from "../../pages/main";
-import { useUserApi } from "../../api/user";
-import { useSettingApi } from "../../api/setting";
-import { Local } from "../../util/storage";
-import styles from "./index.module.scss";
+import React, { useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Tabs } from 'antd';
+import UserSetting from '../../components/setting/userSetting';
+import BasicSetting from '../../components/setting/basicSetting';
+import ServerSetting from '../../components/setting/serverSetting';
+import ShortcutSetting from '../../components/setting/shortcutSetting';
+import ininitApp from '../../pages/main';
+import { useUserApi } from '../../api/user';
+import { useSettingApi } from '../../api/setting';
+import { Local } from '../../util/storage';
+import styles from './index.module.scss';
const Setting = () => {
- const userApi = useUserApi();
- const settingApi = useSettingApi();
- const { t } = useTranslation();
- const [setting, setSetting] = useState({} as any);
- const [user, setUser] = useState(Local.get("user") || ({} as any));
+ const userApi = useUserApi();
+ const settingApi = useSettingApi();
+ const { t } = useTranslation();
+ const [setting, setSetting] = useState({} as any);
+ const [user, setUser] = useState(Local.get('user') || ({} as any));
- useEffect(() => {
- if (user.id) {
- getSetting(user.id);
- } else {
- window.isOffline || getCurrentUser();
- }
- }, [user]);
+ useEffect(() => {
+ if (user.id) {
+ getSetting(user.id);
+ } else {
+ window.isOffline || getCurrentUser();
+ }
+ }, [user]);
- const items = [
- {
- key: "userSetting",
- label: t("setting.userSetting"),
- children: UserSetting,
- },
- {
- key: "basicSetting",
- label: t("setting.basicSetting"),
- children: BasicSetting,
- forceRender: true,
- },
- {
- key: "serverSetting",
- label: "服务设置",
- children: ServerSetting,
- forceRender: true,
- },
- ];
+ const items = [
+ {
+ key: 'userSetting',
+ label: t('setting.userSetting'),
+ children: UserSetting,
+ },
+ {
+ key: 'basicSetting',
+ label: t('setting.basicSetting'),
+ children: BasicSetting,
+ forceRender: true,
+ },
+ {
+ key: 'serverSetting',
+ label: t('setting.serverSetting'),
+ children: ServerSetting,
+ forceRender: true,
+ },
+ {
+ key: 'shortcutSetting',
+ label: t('setting.shortcutSetting'),
+ children: ShortcutSetting,
+ forceRender: true,
+ },
+ ];
- async function getCurrentUser() {
- const res = (await userApi.getCurrentUser()) as any;
- if (res.code == 0) {
- const user = res.data;
- setUser(user);
- Local.set("user", user);
- }
- }
+ async function getCurrentUser() {
+ const res = (await userApi.getCurrentUser()) as any;
+ if (res.code == 0) {
+ const user = res.data;
+ setUser(user);
+ Local.set('user', user);
+ }
+ }
- async function getSetting(userId) {
- const res = (await settingApi.getSetting(userId)) as any;
- if (res.code == 0) {
- setSetting(res.data || {});
- }
- }
+ async function getSetting(userId) {
+ const res = (await settingApi.getSetting(userId)) as any;
+ if (res.code == 0) {
+ setSetting(res.data || {});
+ }
+ }
- return (
-
+ 
+
+
+
{uuid}
+{formatTime(createdTime)}
+ +
- {
- return {
- label: tab.label,
- key: tab.key,
- children:
- );
+ return (
+
+ {
+ return {
+ label: tab.label,
+ key: tab.key,
+ children:
+ );
};
ininitApp(Setting);