Feat: 强制更新结构图，控制台打印结构图不包含的条目

2025-11-04 21:42:58 +08:00
parent f0c9dbfd36
commit 61dee0b127
9 changed files with 213 additions and 17 deletions
@@ -73,7 +73,11 @@ function ExportLanguageModalImpl({
      }
      // 追加结构外的剩余键，避免丢数据
      for (const p of Object.keys(flat)) {
-        if (!added.has(p)) setByPath(p, flat[p]!);
+        if (!added.has(p)) {
+          console.warn(`在结构图中未找到路径: ${p}`);
+
+          setByPath(p, flat[p]!);
+        }
      }
      try {
        return JSON.stringify(root, null, 2);
@@ -115,7 +119,7 @@ function ExportLanguageModalImpl({
    <Dialog open={open} onOpenChange={onOpenChange}>
      <DialogContent className="max-w-3xl">
        <DialogHeader>
-          <DialogTitle>导出语言 JSON</DialogTitle>
+          <DialogTitle>导出 JSON</DialogTitle>
        </DialogHeader>
        <div className="space-y-3 min-w-0">
          <div className="flex flex-wrap gap-2">
@@ -10,6 +10,7 @@ import {
  DialogHeader,
  DialogTitle,
 } from "@/components/ui/dialog";
+import { Checkbox } from "../ui/checkbox";

 type Props = {
  open: boolean;
@@ -17,6 +18,7 @@ type Props = {
  projectId: string;
  hasStructure: boolean;
  onImported: () => void | Promise<void>;
+  languages: string[];
 };

 function ImportLanguageModalImpl({
@@ -25,11 +27,13 @@ function ImportLanguageModalImpl({
  projectId,
  hasStructure,
  onImported,
+  languages,
 }: Props) {
  const [lang, setLang] = useState("");
  const [importing, setImporting] = useState(false);
  const [error, setError] = useState<string | null>(null);
  const fileRef = useRef<HTMLInputElement | null>(null);
+  const [forceOverride, setForceOverride] = useState(false);

  async function handleSubmit(e: React.FormEvent) {
    e.preventDefault();
@@ -57,14 +61,20 @@ function ImportLanguageModalImpl({
      } catch {
        throw new Error("JSON 解析失败，请检查文件内容");
      }
-      if (!hasStructure) {
+
+      // 如果没有结构或勾选强制覆盖，则根据文件重建结构
+      if (!hasStructure || forceOverride) {
        const root = buildStructureFromObject(json);
        await upsertStructure({ projectId, root });
+        console.log("构建结构成功", root);
      }
+
+      // 导入翻译（可能包含结构外的键，注意需要保留额外处理）
      const values = flattenValues(json);
      await upsertLanguageTranslations(projectId, language, values);
      setLang("");
      if (fileRef.current) fileRef.current.value = "";
+      setForceOverride(false);
      onOpenChange(false);
      await onImported();
    } catch (e) {
@@ -81,13 +91,14 @@ function ImportLanguageModalImpl({
        if (!importing) {
          onOpenChange(v);
          if (!v) setError(null);
+      if (!v) setForceOverride(false);
        }
      }}
    >
      <DialogContent>
        <DialogHeader>
          <DialogTitle>
-            {hasStructure ? "导入语言 JSON" : "导入翻译 JSON 并构建结构"}
+            {hasStructure ? "导入 JSON" : "导入 JSON 并构建结构"}
          </DialogTitle>
        </DialogHeader>
        <form onSubmit={handleSubmit} className="mt-2 space-y-3">
@@ -108,11 +119,31 @@ function ImportLanguageModalImpl({
            </label>
            <Input
              placeholder="en"
+              list="lang"
              value={lang}
              onChange={(e) => setLang(e.target.value)}
              aria-label="语言代号"
            />
+            <datalist id="lang">
+              {languages.map((lang) => (
+                <option key={lang} value={lang} />
+              ))}
+            </datalist>
          </div>
+          {hasStructure && (
+            <div>
+              <label className="inline-flex items-center gap-2 text-sm select-none">
+                <Checkbox
+                  checked={forceOverride}
+                  onCheckedChange={(checked) => setForceOverride(checked === true)}
+                />
+                强制覆盖结构
+              </label>
+              <div className="mt-1 text-xs text-orange-500">
+                勾选后将使用上传文件的结构覆盖当前项目结构，此操作不可撤销。
+              </div>
+            </div>
+          )}
          {error && (
            <div className="text-sm text-red-600" role="alert">
              {error}
@@ -125,6 +156,7 @@ function ImportLanguageModalImpl({
              onClick={() => {
                onOpenChange(false);
                setError(null);
+                setForceOverride(false);
              }}
              disabled={importing}
            >
@@ -0,0 +1,30 @@
+import * as React from "react"
+import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
+import { CheckIcon } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+function Checkbox({
+  className,
+  ...props
+}: React.ComponentProps<typeof CheckboxPrimitive.Root>) {
+  return (
+    <CheckboxPrimitive.Root
+      data-slot="checkbox"
+      className={cn(
+        "peer border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-[4px] border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
+        className
+      )}
+      {...props}
+    >
+      <CheckboxPrimitive.Indicator
+        data-slot="checkbox-indicator"
+        className="grid place-content-center text-current transition-none"
+      >
+        <CheckIcon className="size-3.5" />
+      </CheckboxPrimitive.Indicator>
+    </CheckboxPrimitive.Root>
+  )
+}
+
+export { Checkbox }
@@ -0,0 +1,38 @@
+import {
+  CircleCheckIcon,
+  InfoIcon,
+  Loader2Icon,
+  OctagonXIcon,
+  TriangleAlertIcon,
+} from "lucide-react";
+import { useTheme } from "next-themes";
+import { Toaster as Sonner, type ToasterProps } from "sonner";
+
+const Toaster = ({ ...props }: ToasterProps) => {
+  const { theme = "system" } = useTheme();
+
+  return (
+    <Sonner
+      theme={theme as ToasterProps["theme"]}
+      className="toaster group"
+      icons={{
+        success: <CircleCheckIcon className="size-4" />,
+        info: <InfoIcon className="size-4" />,
+        warning: <TriangleAlertIcon className="size-4" />,
+        error: <OctagonXIcon className="size-4" />,
+        loading: <Loader2Icon className="size-4 animate-spin" />,
+      }}
+      style={
+        {
+          "--normal-bg": "var(--popover)",
+          "--normal-text": "var(--popover-foreground)",
+          "--normal-border": "var(--border)",
+          "--border-radius": "var(--radius)",
+        } as React.CSSProperties
+      }
+      {...props}
+    />
+  );
+};
+
+export { Toaster };
@@ -5,6 +5,7 @@ import { RouterProvider } from "react-router/dom";
 import "./index.css";
 import Home from "./pages/home.tsx";
 import Editor from "./pages/editor.tsx";
+import { Toaster } from "@/components/ui/sonner";

 const router = createHashRouter([
  {
@@ -19,6 +20,7 @@ const router = createHashRouter([

 createRoot(document.getElementById("root")!).render(
  <StrictMode>
-    <RouterProvider router={router} />,
+    <RouterProvider router={router} />
+    <Toaster position="top-center" />
  </StrictMode>
 );
@@ -30,6 +30,8 @@ import {
  DropdownMenuItem,
  DropdownMenuSeparator,
 } from "@/components/ui/dropdown-menu";
+import { useClipboard } from "@/hooks/use-clipboard";
+import { toast } from "sonner";

 export default function Editor() {
  const { id: projectId } = useParams();
@@ -49,6 +51,8 @@ export default function Editor() {
  const [fullMatch, setFullMatch] = useState(false);
  const [aiModal, setAiModal] = useState<{ open: boolean; path: string } | null>(null);

+  const { copy } = useClipboard();
+
  function highlightRow(index: number) {
    const tryFindAndAnimate = (attempt = 0) => {
      const root = scrollerRootRef.current as HTMLElement | null;
@@ -138,18 +142,27 @@ export default function Editor() {

  const headerContent = useCallback(() => (
    <tr>
-      <th style={{ width: colWidth }} className="text-left px-3 py-2">翻译条目名称</th>
+      <th style={{ width: 200 }} className="text-left px-3 py-2">翻译条目名称</th>
      {languages.map((lang) => (
-        <th key={lang} style={{ width: colWidth }} className="text-left px-3 py-2 whitespace-nowrap">{lang}</th>
+        <th key={lang} style={{ width: colWidth }} className="text-left px-3 py-2">{lang}</th>
      ))}
-      <th style={{ width: "5em" }} className="text-left px-3 py-2">操作</th>
+      <th style={{ width: 80 }} className="text-left px-3 py-2">操作</th>
    </tr>
  ), [languages, colWidth]);

  const renderItemContent = useCallback((_idx: number, entry: FlatEntry) => {
+    const handleCopy = () => {
+      copy(entry.path);
+      toast.success("复制成功");
+    };
+
    return (
      <>
-        <td style={{ width: colWidth }} className="px-3 py-2 font-mono whitespace-nowrap">{entry.path}</td>
+        <td style={{ width: 200 }} className="px-3 py-2 font-mono">
+          <button type="button" className="w-full text-left min-h-8 leading-8 px-2 rounded hover:bg-accent" onClick={handleCopy} title="点击复制">
+            {entry.path}
+          </button>
+        </td>
        {languages.map((lang) => {
          const isEditing = inline.isEditingCell(entry.path, lang);
          const isSaving = inline.isSavingCell(entry.path, lang);
@@ -183,7 +196,6 @@ export default function Editor() {
          <DropdownMenu>
            <DropdownMenuTrigger asChild>
              <Button size="sm" variant="outline">
-                操作
                <MoreVertical />
              </Button>
            </DropdownMenuTrigger>
@@ -258,7 +270,7 @@ export default function Editor() {

  return (
    <div className="h-screen flex flex-col">
-      <header className="h-14 border-b px-2 md:px-4">
+      <header className="h-14 px-2 md:px-4 from-blue-400 to-cyan-400 bg-linear-to-r text-white">
        <div className="grid grid-cols-3 h-full items-center">
          <div className="flex items-center gap-2">
            <Button asChild size="icon" variant="ghost" aria-label="返回">
@@ -270,11 +282,11 @@ export default function Editor() {
          <div className="text-center font-medium truncate">
            {project?.name ?? "编辑器"}
          </div>
-          <div className="flex items-center justify-end gap-2">
+          <div className="flex items-center justify-end gap-2 text-foreground">
            {!structure ? (
              <Button onClick={() => { setImportOpen(true); }}>构建翻译结构</Button>
            ) : (
-              <Button variant="outline" onClick={() => { setImportOpen(true); }}>导入语言 JSON</Button>
+              <Button variant="outline" onClick={() => { setImportOpen(true); }}>导入 JSON</Button>
            )}
            {languages.length > 0 && (
              <Button variant="outline" onClick={() => setExportOpen(true)}>导出 JSON</Button>
@@ -300,7 +312,7 @@ export default function Editor() {
            </div>
          </div>
        ) : (
-          <div>
+          <div className="h-full flex flex-col">
            <form className="mb-3 flex items-center gap-2" onSubmit={scrollToQuery}>
              <Input placeholder="搜索翻译条目名称" value={query} onChange={(e) => setQuery(e.target.value)} />
              <Button
@@ -324,11 +336,10 @@ export default function Editor() {
                定位
              </Button>
            </form>
-            <div className="border rounded-md">
+            <div className="flex-1 border rounded-md">
              <TableVirtuoso
                ref={virtuosoRef}
                data={entries}
-                style={{ height: "60vh" }}
                fixedHeaderContent={headerContent}
                itemContent={renderItemContent}
                components={virtuosoComponents}
@@ -346,6 +357,7 @@ export default function Editor() {
        projectId={projectId ?? ""}
        hasStructure={!!structure}
        onImported={refresh}
+        languages={languages}
      />
      <ExportLanguageModal
        open={exportOpen}