-
-
{t('正在加载文件内容...', 'Loading file content...')}
+
+ {t('正在加载文件内容...', 'Loading file content...')}
);
}
if (needsRawFetch && rawError) {
return (
-
-
-
{rawError}
-
+ {rawError}
+ {
setRawContent(null);
setRetryTick(tick => tick + 1);
}}
- className="inline-flex items-center gap-2 rounded-lg bg-brand-indigo px-3 py-2 text-sm font-medium text-white transition-colors hover:bg-brand-indigo/90"
+ className="inline-flex items-center gap-2 rounded-lg bg-primary px-3 py-2 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90"
>
+
);
}
return (
-
-
+
+
{content || ''}
@@ -131,14 +132,33 @@ export const GistDetailModal: React.FC = ({ gist, isOpen,
const updateGist = useAppStore(state => state.updateGist);
const { toast } = useDialog();
const [activeFilename, setActiveFilename] = useState('');
+ const [loadedContents, setLoadedContents] = useState>({});
+ const previousGistIdRef = useRef(null);
const t = (zh: string, en: string) => language === 'zh' ? zh : en;
const files = useMemo(() => Object.values(gist?.files || {}), [gist]);
const activeFile = files.find(file => file.filename === activeFilename) || files[0];
+ const loadedContentKey = gist && activeFile
+ ? `${gist.id}:${activeFile.filename}:${activeFile.raw_url ?? ''}`
+ : null;
+ const loadedActiveContent = loadedContentKey ? loadedContents[loadedContentKey] : undefined;
+ const hasLoadedActiveContent = Boolean(loadedContentKey && Object.prototype.hasOwnProperty.call(loadedContents, loadedContentKey));
+ const effectiveActiveFile = activeFile && hasLoadedActiveContent
+ ? { ...activeFile, content: loadedActiveContent, truncated: false }
+ : activeFile;
+ const requiresLoadedContent = Boolean(activeFile && !hasLoadedActiveContent && (
+ activeFile.truncated || (!activeFile.content && activeFile.raw_url)
+ ));
+ const canCopyActiveFile = Boolean(effectiveActiveFile) && !requiresLoadedContent;
+ const activeCopyContent = effectiveActiveFile
+ ? effectiveActiveFile.content ?? ''
+ : '';
// 截断文件按需拉取到的 raw 内容回写 store，避免每次重开弹窗都重新请求。
- const handleContentLoaded = (filename: string, content: string) => {
+ const handleContentLoaded = (filename: string, content: string, rawUrl?: string) => {
if (!gist) return;
+ const cacheKey = `${gist.id}:${filename}:${rawUrl ?? ''}`;
+ setLoadedContents(previous => ({ ...previous, [cacheKey]: content }));
const state = useAppStore.getState();
const latest =
state.gists.find(item => item.id === gist.id) ||
@@ -147,18 +167,29 @@ export const GistDetailModal: React.FC = ({ gist, isOpen,
gist;
const targetFile = latest.files?.[filename];
- if (!targetFile || (targetFile.content && !targetFile.truncated)) return;
+ if (!targetFile || (rawUrl && targetFile.raw_url && targetFile.raw_url !== rawUrl)) return;
+ if (targetFile.content && !targetFile.truncated) return;
updateGist({
...latest,
- files: {
- ...latest.files,
- [filename]: { ...targetFile, content },
- },
+ files: {
+ ...latest.files,
+ [filename]: { ...targetFile, content, truncated: false },
+ },
});
};
useEffect(() => {
- setActiveFilename(files[0]?.filename || '');
+ const gistChanged = previousGistIdRef.current !== gist?.id;
+ previousGistIdRef.current = gist?.id ?? null;
+ setActiveFilename((currentFilename) => {
+ if (gistChanged) return files[0]?.filename || '';
+ return currentFilename && files.some((file) => file.filename === currentFilename)
+ ? currentFilename
+ : files[0]?.filename || '';
+ });
+ if (gistChanged) {
+ setLoadedContents({});
+ }
}, [gist?.id, files]);
const handleCopy = async (text: string, message: string) => {
@@ -170,29 +201,29 @@ export const GistDetailModal: React.FC = ({ gist, isOpen,
return (
-
+
-
+
{gist.owner?.login || t('未知创建者', 'Unknown owner')}
·
{t('更新于', 'Updated')} {new Date(gist.updated_at).toLocaleString()}
·
{gist.public ? t('公开', 'Public') : t('私有', 'Secret')}
-
-
+ handleCopy(gist.html_url, t('链接已复制', 'Link copied'))}
- className="inline-flex items-center gap-2 rounded-lg border border-black/[0.06] bg-white px-3 py-2 text-sm text-gray-700 transition-colors hover:bg-light-surface dark:border-white/[0.04] dark:bg-white/[0.04] dark:text-text-secondary dark:hover:bg-white/[0.08]"
+ className="inline-flex items-center gap-2 rounded-lg border border-border bg-card px-3 py-2 text-sm text-muted-foreground transition-colors hover:bg-muted dark:border-border dark:bg-muted/40 dark:text-muted-foreground dark:hover:bg-accent"
>
+
= ({ gist, isOpen,
{gist.ai_summary && (
-
+
{gist.ai_summary}
)}
{files.map(file => (
- setActiveFilename(file.filename)}
- className={`rounded-lg border px-3 py-1.5 text-sm transition-colors ${
+ className={`min-w-0 max-w-full break-all rounded-lg border px-3 py-1.5 text-left text-sm transition-colors ${
activeFile?.filename === file.filename
- ? 'border-brand-indigo bg-brand-indigo text-white'
- : 'border-black/[0.06] bg-white text-gray-700 hover:bg-light-surface dark:border-white/[0.04] dark:bg-white/[0.04] dark:text-text-secondary dark:hover:bg-white/[0.08]'
+ ? 'border-primary bg-primary text-primary-foreground'
+ : 'border-border bg-card text-muted-foreground hover:bg-muted dark:border-border dark:bg-muted/40 dark:text-muted-foreground dark:hover:bg-accent'
}`}
>
{file.filename}
-
+
))}
{activeFile ? (
-
+
-
{activeFile.filename}
-
+
{activeFile.filename}
+
{activeFile.language || inferGistCodeLanguage(activeFile.filename)} · {activeFile.size.toLocaleString()} bytes
{activeFile.truncated ? ` · ${t('内容已截断', 'Content truncated')}` : ''}
-
handleCopy(activeFile.content || '', t('文件内容已复制', 'File copied'))}
- className="inline-flex items-center gap-2 rounded-lg border border-black/[0.06] bg-white px-3 py-2 text-sm text-gray-700 transition-colors hover:bg-light-surface dark:border-white/[0.04] dark:bg-white/[0.04] dark:text-text-secondary dark:hover:bg-white/[0.08]"
+ disabled={!canCopyActiveFile}
+ onClick={() => handleCopy(activeCopyContent, t('文件内容已复制', 'File copied'))}
+ className="inline-flex items-center gap-2 rounded-lg border border-border bg-card px-3 py-2 text-sm text-muted-foreground transition-colors hover:bg-muted dark:border-border dark:bg-muted/40 dark:text-muted-foreground dark:hover:bg-accent"
>
+
-
+
) : (
-
+
{t('没有文件', 'No files')}
)}
diff --git a/src/components/GistEditorModal.tsx b/src/components/GistEditorModal.tsx
index a352319b..6c8b109c 100644
--- a/src/components/GistEditorModal.tsx
+++ b/src/components/GistEditorModal.tsx
@@ -1,3 +1,7 @@
+import { Textarea } from './ui/textarea';
+import { Input } from './ui/input';
+import { Button } from './ui/button';
+import { Checkbox } from './ui/checkbox';
import React, { useEffect, useMemo, useState } from 'react';
import { Plus, Trash2 } from 'lucide-react';
import { Modal } from './Modal';
@@ -121,71 +125,74 @@ export const GistEditorModal: React.FC
= ({ gist, isOpen,
>
-
+
{t('描述', 'Description')}
-
{!gist && (
-
-
+
+ setIsPublic(checked === true)} />
+
+ {t('公开 Gist', 'Public gist')}
+
+
)}
-
{t('文件', 'Files')}
+
{t('文件', 'Files')}
{hasDuplicateFilenames && (
{t('文件名不能重复', 'Filenames must be unique')}
)}
-
setFiles(prev => [...prev, createEmptyFile()])}
- className="inline-flex items-center gap-2 rounded-lg border border-black/[0.06] bg-white px-3 py-2 text-sm text-gray-700 transition-colors hover:bg-light-surface dark:border-white/[0.04] dark:bg-white/[0.04] dark:text-text-secondary dark:hover:bg-white/[0.08]"
+ className="inline-flex items-center gap-2 rounded-lg border border-border bg-card px-3 py-2 text-sm text-muted-foreground transition-colors hover:bg-muted dark:border-border dark:bg-muted/40 dark:text-muted-foreground dark:hover:bg-accent"
>
+
{visibleFiles.map((file, index) => (
-