0.1.08 文件树视图修复
This commit is contained in:
@@ -44,7 +44,7 @@ export function FileTree({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="space-y-0.5"
|
className="w-full min-w-0 max-w-full space-y-0.5 overflow-x-hidden"
|
||||||
onDragOver={(event) => {
|
onDragOver={(event) => {
|
||||||
if (!onDropFiles) return;
|
if (!onDropFiles) return;
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
@@ -77,7 +77,7 @@ export function FileTree({
|
|||||||
const draggable =
|
const draggable =
|
||||||
row.kind === "doc" || (row.kind === "asset" && isRealFileAsset(row.asset));
|
row.kind === "doc" || (row.kind === "asset" && isRealFileAsset(row.asset));
|
||||||
const baseClass =
|
const baseClass =
|
||||||
"flex select-none items-center gap-2 rounded-md px-2 py-1.5 text-sm text-gray-700 hover:bg-[#f5f7fb]";
|
"flex w-full min-w-0 max-w-full select-none items-center gap-2 rounded-md px-2 py-1.5 text-sm text-gray-700 hover:bg-[#f5f7fb]";
|
||||||
const activeClass =
|
const activeClass =
|
||||||
row.kind === "index"
|
row.kind === "index"
|
||||||
? "text-[#2563eb] font-medium"
|
? "text-[#2563eb] font-medium"
|
||||||
@@ -156,6 +156,7 @@ export function FileTree({
|
|||||||
|
|
||||||
if (onDropFiles && event.dataTransfer.files?.length) {
|
if (onDropFiles && event.dataTransfer.files?.length) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
onDropFiles(row.docId, event.dataTransfer.files);
|
onDropFiles(row.docId, event.dataTransfer.files);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
@@ -185,7 +186,7 @@ export function FileTree({
|
|||||||
<span className="h-5 w-5" />
|
<span className="h-5 w-5" />
|
||||||
)}
|
)}
|
||||||
<Folder className="h-4 w-4 text-[#2563eb]" />
|
<Folder className="h-4 w-4 text-[#2563eb]" />
|
||||||
<span className="flex-1 truncate text-left">{label}</span>
|
<span className="min-w-0 flex-1 truncate text-left">{label}</span>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
aria-label="新建子页面"
|
aria-label="新建子页面"
|
||||||
@@ -202,13 +203,13 @@ export function FileTree({
|
|||||||
<>
|
<>
|
||||||
<span className="h-4 w-4" />
|
<span className="h-4 w-4" />
|
||||||
<FileText className="h-4 w-4 text-gray-500" />
|
<FileText className="h-4 w-4 text-gray-500" />
|
||||||
<span className="flex-1 truncate text-left">{label}</span>
|
<span className="min-w-0 flex-1 truncate text-left">{label}</span>
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<span className="h-4 w-4" />
|
<span className="h-4 w-4" />
|
||||||
<Paperclip className="h-4 w-4 text-gray-500" />
|
<Paperclip className="h-4 w-4 text-gray-500" />
|
||||||
<span className="flex-1 truncate text-left">{label}</span>
|
<span className="min-w-0 flex-1 truncate text-left">{label}</span>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ import { PrivateTree } from "@/components/sidebar/private-tree";
|
|||||||
import { buildSidebarSectionsFromTree, flattenDocumentTree } from "@/lib/sidebar-tree";
|
import { buildSidebarSectionsFromTree, flattenDocumentTree } from "@/lib/sidebar-tree";
|
||||||
import { supabaseBrowser } from "@/lib/supabase/client";
|
import { supabaseBrowser } from "@/lib/supabase/client";
|
||||||
import { useSearchPaletteStore } from "@/store/search-palette";
|
import { useSearchPaletteStore } from "@/store/search-palette";
|
||||||
|
import { useEditorBridgeStore } from "@/store/editor-bridge";
|
||||||
import { FileTree } from "@/components/sidebar/file-tree";
|
import { FileTree } from "@/components/sidebar/file-tree";
|
||||||
import { buildVisibleRows } from "@/lib/file-tree/rows";
|
import { buildVisibleRows } from "@/lib/file-tree/rows";
|
||||||
import type { FileTreeSelectionState } from "@/lib/file-tree/selection";
|
import type { FileTreeSelectionState } from "@/lib/file-tree/selection";
|
||||||
@@ -100,6 +101,7 @@ export function Sidebar({ initialData }: SidebarProps) {
|
|||||||
const segments = useSelectedLayoutSegments();
|
const segments = useSelectedLayoutSegments();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const activeId = segments?.[1] ?? "";
|
const activeId = segments?.[1] ?? "";
|
||||||
|
const editorBridge = useEditorBridgeStore((state) => state.bridge);
|
||||||
|
|
||||||
const [tree, setTree] = useState<DocumentNode[]>(() => buildDocumentTree(sidebarData.documents));
|
const [tree, setTree] = useState<DocumentNode[]>(() => buildDocumentTree(sidebarData.documents));
|
||||||
const [filter, setFilter] = useState("");
|
const [filter, setFilter] = useState("");
|
||||||
@@ -979,6 +981,10 @@ export function Sidebar({ initialData }: SidebarProps) {
|
|||||||
const payload = (await resp.json()) as { asset?: MediaAsset };
|
const payload = (await resp.json()) as { asset?: MediaAsset };
|
||||||
if (payload.asset?.id) {
|
if (payload.asset?.id) {
|
||||||
emitAssetsChanged(inferredTargetDocId, payload.asset);
|
emitAssetsChanged(inferredTargetDocId, payload.asset);
|
||||||
|
// 拖拽文件进文件树:如果落点就是当前打开的页面,则把文件也插入到主编辑区
|
||||||
|
if (inferredTargetDocId === activeId) {
|
||||||
|
editorBridge?.insertMediaAsset?.(payload.asset);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
errors.push(`${file.name}: 返回数据缺少 asset`);
|
errors.push(`${file.name}: 返回数据缺少 asset`);
|
||||||
}
|
}
|
||||||
@@ -1003,6 +1009,7 @@ export function Sidebar({ initialData }: SidebarProps) {
|
|||||||
},
|
},
|
||||||
[
|
[
|
||||||
activeId,
|
activeId,
|
||||||
|
editorBridge,
|
||||||
fileTreeRowById,
|
fileTreeRowById,
|
||||||
fileTreeSelection.focusedRowId,
|
fileTreeSelection.focusedRowId,
|
||||||
sidebarData.activeWorkspaceId,
|
sidebarData.activeWorkspaceId,
|
||||||
@@ -1326,7 +1333,7 @@ export function Sidebar({ initialData }: SidebarProps) {
|
|||||||
}, [workspaceMenuOpen]);
|
}, [workspaceMenuOpen]);
|
||||||
|
|
||||||
const sidebarBody = (
|
const sidebarBody = (
|
||||||
<div className="flex h-full flex-col">
|
<div className="flex h-full min-w-0 flex-col">
|
||||||
<div className="border-b border-[#f1f1f1] p-3">
|
<div className="border-b border-[#f1f1f1] p-3">
|
||||||
<div className="text-xs text-gray-400">当前工作空间</div>
|
<div className="text-xs text-gray-400">当前工作空间</div>
|
||||||
<div className="mt-1 flex items-center justify-between">
|
<div className="mt-1 flex items-center justify-between">
|
||||||
@@ -1387,8 +1394,8 @@ export function Sidebar({ initialData }: SidebarProps) {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex-1 overflow-hidden">
|
<div className="flex-1 min-w-0 overflow-hidden">
|
||||||
<div className="flex h-full flex-col overflow-y-auto">
|
<div className="flex h-full min-w-0 flex-col overflow-y-auto overflow-x-hidden">
|
||||||
<div className="border-b border-[#f1f1f1] p-3">
|
<div className="border-b border-[#f1f1f1] p-3">
|
||||||
<div className="flex items-center gap-2 text-sm text-gray-500">
|
<div className="flex items-center gap-2 text-sm text-gray-500">
|
||||||
<Library className="h-4 w-4" />
|
<Library className="h-4 w-4" />
|
||||||
@@ -1491,7 +1498,7 @@ export function Sidebar({ initialData }: SidebarProps) {
|
|||||||
<div
|
<div
|
||||||
ref={fileTreeContainerRef}
|
ref={fileTreeContainerRef}
|
||||||
data-testid="file-tree-container"
|
data-testid="file-tree-container"
|
||||||
className="h-full rounded-md border border-[#eff2f6] bg-white"
|
className="h-full w-full min-w-0 overflow-x-hidden rounded-md border border-[#eff2f6] bg-white"
|
||||||
>
|
>
|
||||||
<FileTree
|
<FileTree
|
||||||
rows={fileTreeRows}
|
rows={fileTreeRows}
|
||||||
@@ -1536,8 +1543,10 @@ export function Sidebar({ initialData }: SidebarProps) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<aside className="hidden h-full md:flex" style={{ width }}>
|
<aside className="hidden h-full min-w-0 overflow-hidden md:flex" style={{ width }}>
|
||||||
<div className="flex h-full flex-1 flex-col border-r border-[#e9edf5] bg-white">{sidebarBody}</div>
|
<div className="flex h-full min-w-0 flex-1 flex-col overflow-hidden border-r border-[#e9edf5] bg-white">
|
||||||
|
{sidebarBody}
|
||||||
|
</div>
|
||||||
<div className="w-1 cursor-col-resize bg-transparent" onMouseDown={handleResizeStart} />
|
<div className="w-1 cursor-col-resize bg-transparent" onMouseDown={handleResizeStart} />
|
||||||
</aside>
|
</aside>
|
||||||
<Drawer open={open} onOpenChange={setOpen}>
|
<Drawer open={open} onOpenChange={setOpen}>
|
||||||
|
|||||||
Reference in New Issue
Block a user