mirror of
https://github.com/FranP-code/ChatGPT.git
synced 2025-10-13 00:13:25 +00:00
Merge branch 'main' into dev
This commit is contained in:
@@ -87,6 +87,7 @@
|
|||||||
|
|
||||||
- 跨平台: `macOS` `Linux` `Windows`
|
- 跨平台: `macOS` `Linux` `Windows`
|
||||||
- 导出 ChatGPT 聊天记录 (支持 PNG, PDF 和生成分享链接)
|
- 导出 ChatGPT 聊天记录 (支持 PNG, PDF 和生成分享链接)
|
||||||
|
- 主窗口和系统托盘支持自定义 URL,将任意网站包装成一个桌面应用
|
||||||
- 应用自动升级通知
|
- 应用自动升级通知
|
||||||
- 丰富的快捷键
|
- 丰富的快捷键
|
||||||
- 系统托盘悬浮窗
|
- 系统托盘悬浮窗
|
||||||
@@ -129,6 +130,7 @@
|
|||||||
|
|
||||||
- `[.chatgpt]` - 应用配置根路径
|
- `[.chatgpt]` - 应用配置根路径
|
||||||
- `chat.conf.json` - 应用喜好配置
|
- `chat.conf.json` - 应用喜好配置
|
||||||
|
- `chat.awesome.json` - 自定义 URL 列表,类似于浏览器书签。可以将任意 URL 作为主窗口或托盘窗口 (**Control Conter -> Awesome**)
|
||||||
- `chat.model.json` - ChatGPT 输入提示,通过斜杠命令来快速完成输入,主要包含三部分:
|
- `chat.model.json` - ChatGPT 输入提示,通过斜杠命令来快速完成输入,主要包含三部分:
|
||||||
- `user_custom` - 需要手动录入 (**Control Conter -> Language Model -> User Custom**)
|
- `user_custom` - 需要手动录入 (**Control Conter -> Language Model -> User Custom**)
|
||||||
- `sync_prompts` - 从 [f/awesome-chatgpt-prompts](https://github.com/f/awesome-chatgpt-prompts) 同步数据 (**Control Conter -> Language Model -> Sync Prompts**)
|
- `sync_prompts` - 从 [f/awesome-chatgpt-prompts](https://github.com/f/awesome-chatgpt-prompts) 同步数据 (**Control Conter -> Language Model -> Sync Prompts**)
|
||||||
|
|||||||
@@ -90,6 +90,7 @@ You can look at **[awesome-chatgpt-prompts](https://github.com/f/awesome-chatgpt
|
|||||||
|
|
||||||
- Multi-platform: `macOS` `Linux` `Windows`
|
- Multi-platform: `macOS` `Linux` `Windows`
|
||||||
- Export ChatGPT history (PNG, PDF and Markdown)
|
- Export ChatGPT history (PNG, PDF and Markdown)
|
||||||
|
- The main window and system tray support custom URLs to wrap any website into a desktop application
|
||||||
- Automatic application upgrade notification
|
- Automatic application upgrade notification
|
||||||
- Common shortcut keys
|
- Common shortcut keys
|
||||||
- System tray hover window
|
- System tray hover window
|
||||||
@@ -132,6 +133,7 @@ You can look at **[awesome-chatgpt-prompts](https://github.com/f/awesome-chatgpt
|
|||||||
|
|
||||||
- `[.chatgpt]` - application configuration root folder
|
- `[.chatgpt]` - application configuration root folder
|
||||||
- `chat.conf.json` - preferences configuration
|
- `chat.conf.json` - preferences configuration
|
||||||
|
- `chat.awesome.json` - Custom URL lists, similar to browser bookmarks. Any URL can be used as the main window or tray window (**Control Conter -> Awesome**)
|
||||||
- `chat.model.json` - prompts configuration,contains three parts:
|
- `chat.model.json` - prompts configuration,contains three parts:
|
||||||
- `user_custom` - Requires manual data entry (**Control Conter -> Language Model -> User Custom**)
|
- `user_custom` - Requires manual data entry (**Control Conter -> Language Model -> User Custom**)
|
||||||
- `sync_prompts` - Synchronizing data from [f/awesome-chatgpt-prompts](https://github.com/f/awesome-chatgpt-prompts) (**Control Conter -> Language Model -> Sync Prompts**)
|
- `sync_prompts` - Synchronizing data from [f/awesome-chatgpt-prompts](https://github.com/f/awesome-chatgpt-prompts) (**Control Conter -> Language Model -> Sync Prompts**)
|
||||||
|
|||||||
2
src/view/model/UserCustom/index.tsx
vendored
2
src/view/model/UserCustom/index.tsx
vendored
@@ -12,7 +12,7 @@ import { chatRoot, fmtDate } from '@/utils';
|
|||||||
import { modelColumns } from './config';
|
import { modelColumns } from './config';
|
||||||
import UserCustomForm from './Form';
|
import UserCustomForm from './Form';
|
||||||
|
|
||||||
export default function LanguageModel() {
|
export default function UserCustom() {
|
||||||
const { rowSelection, selectedRowIDs } = useTableRowSelection();
|
const { rowSelection, selectedRowIDs } = useTableRowSelection();
|
||||||
const [isVisible, setVisible] = useState(false);
|
const [isVisible, setVisible] = useState(false);
|
||||||
const [jsonPath, setJsonPath] = useState('');
|
const [jsonPath, setJsonPath] = useState('');
|
||||||
|
|||||||
1
src/view/notes/config.tsx
vendored
1
src/view/notes/config.tsx
vendored
@@ -67,6 +67,5 @@ const RenderPath = ({ row }: any) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const getPath = async (row: any) => {
|
export const getPath = async (row: any) => {
|
||||||
const isImg = ['png'].includes(row?.ext);
|
|
||||||
return (await path.join(await chatRoot(), 'notes', row.id)) + `.${row.ext}`;
|
return (await path.join(await chatRoot(), 'notes', row.id)) + `.${row.ext}`;
|
||||||
};
|
};
|
||||||
|
|||||||
2
src/view/settings/MainWindow.tsx
vendored
2
src/view/settings/MainWindow.tsx
vendored
@@ -30,7 +30,7 @@ const PopupSearchLabel = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function General() {
|
export default function MainWindow() {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Form.Item label={<PopupSearchLabel />} name="popup_search" valuePropName="checked">
|
<Form.Item label={<PopupSearchLabel />} name="popup_search" valuePropName="checked">
|
||||||
|
|||||||
2
src/view/settings/TrayWindow.tsx
vendored
2
src/view/settings/TrayWindow.tsx
vendored
@@ -17,7 +17,7 @@ const UALabel = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function General() {
|
export default function TrayWindow() {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Form.Item label="Enable SystemTray" name="tray" valuePropName="checked">
|
<Form.Item label="Enable SystemTray" name="tray" valuePropName="checked">
|
||||||
|
|||||||
Reference in New Issue
Block a user