feat(workspace): 全局 Feature 序号 + 创建对话框优化

MarkShawn2020 · claude · MarkShawn2020 · commit 8961b1be2bdd · 2025-12-27T22:02:39.000+07:00
- Feature seq 改为跨项目全局递增 - 后端原子处理 seq，加载时自动迁移 - 展开的 tab group 均显示新增按钮 - CreateFeatureDialog 显示只读 ID - Title 默认空，placeholder 显示序号，Tab 键补全 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
diff --git a/src-tauri/src/workspace_store.rs b/src-tauri/src/workspace_store.rs
@@ -116,6 +116,9 @@ pub struct WorkspaceProject {
 pub struct WorkspaceData {
     pub projects: Vec<WorkspaceProject>,
     pub active_project_id: Option<String>,
+    /// Global feature counter across all projects
+    #[serde(default)]
+    pub feature_counter: Option<u32>,
 }
 
 /// Load workspace data from disk
@@ -128,7 +131,21 @@ pub fn load_workspace() -> Result<WorkspaceData, String> {
 
     let content = fs::read_to_string(&path).map_err(|e| format!("Failed to read workspace: {}", e))?;
 
-    serde_json::from_str(&content).map_err(|e| format!("Failed to parse workspace: {}", e))
+    let mut data: WorkspaceData = serde_json::from_str(&content).map_err(|e| format!("Failed to parse workspace: {}", e))?;
+
+    // Migrate: initialize global feature_counter from max seq if not set
+    if data.feature_counter.is_none() {
+        let max_seq = data.projects.iter()
+            .flat_map(|p| p.features.iter())
+            .map(|f| f.seq)
+            .max()
+            .unwrap_or(0);
+        if max_seq > 0 {
+            data.feature_counter = Some(max_seq);
+        }
+    }
+
+    Ok(data)
 }
 
 /// Save workspace data to disk
@@ -231,6 +248,10 @@ pub fn set_active_project(id: &str) -> Result<(), String> {
 pub fn create_feature(project_id: &str, name: String, description: Option<String>) -> Result<Feature, String> {
     let mut data = load_workspace()?;
 
+    // Increment global feature counter
+    let seq = data.feature_counter.unwrap_or(0) + 1;
+    data.feature_counter = Some(seq);
+
     let project = data
         .projects
         .iter_mut()
@@ -239,7 +260,7 @@ pub fn create_feature(project_id: &str, name: String, description: Option<String
 
     let feature = Feature {
         id: uuid::Uuid::new_v4().to_string(),
-        seq: 0, // Will be set by frontend using feature_counter
+        seq,
         name,
         description,
         status: FeatureStatus::Pending,
diff --git a/src/components/GlobalHeader/CreateFeatureDialog.tsx b/src/components/GlobalHeader/CreateFeatureDialog.tsx
@@ -14,39 +14,51 @@ import { MarkdownRenderer } from "@/components/MarkdownRenderer";
 interface CreateFeatureDialogProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
-  defaultName: string;
+  seq: number;
   onSubmit: (name: string, description: string) => void;
 }
 
 export function CreateFeatureDialog({
   open,
   onOpenChange,
-  defaultName,
+  seq,
   onSubmit,
 }: CreateFeatureDialogProps) {
-  const [name, setName] = useState(defaultName);
+  const placeholder = `#${seq}`;
+  const [name, setName] = useState("");
   const [description, setDescription] = useState("");
   const [showPreview, setShowPreview] = useState(false);
   const nameInputRef = useRef<HTMLInputElement>(null);
 
   useEffect(() => {
     if (open) {
-      setName(defaultName);
+      setName("");
       setDescription("");
       setShowPreview(false);
       // Focus name input when dialog opens
       setTimeout(() => nameInputRef.current?.focus(), 100);
     }
-  }, [open, defaultName]);
+  }, [open]);
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault();
-    const trimmedName = name.trim();
-    if (!trimmedName) return;
-    onSubmit(trimmedName, description.trim());
+    // Use placeholder if name is empty
+    const finalName = name.trim() || placeholder;
+    onSubmit(finalName, description.trim());
     onOpenChange(false);
   };
 
+  const handleNameKeyDown = (e: React.KeyboardEvent) => {
+    // Tab to accept placeholder
+    if (e.key === "Tab" && !name) {
+      e.preventDefault();
+      setName(placeholder);
+    }
+    if (e.key === "Enter" && e.metaKey) {
+      handleSubmit(e);
+    }
+  };
+
   const handleKeyDown = (e: React.KeyboardEvent) => {
     if (e.key === "Enter" && e.metaKey) {
       handleSubmit(e);
@@ -61,16 +73,24 @@ export function CreateFeatureDialog({
         </DialogHeader>
 
         <form onSubmit={handleSubmit} className="flex flex-col gap-4 flex-1 min-h-0">
-          <div className="space-y-2">
-            <Label htmlFor="feature-name">Title</Label>
-            <Input
-              ref={nameInputRef}
-              id="feature-name"
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              placeholder="Feature title"
-              onKeyDown={handleKeyDown}
-            />
+          <div className="flex gap-4">
+            <div className="space-y-2 w-20 flex-shrink-0">
+              <Label>ID</Label>
+              <div className="h-9 px-3 flex items-center text-sm text-muted-foreground bg-muted rounded-md">
+                #{seq}
+              </div>
+            </div>
+            <div className="space-y-2 flex-1">
+              <Label htmlFor="feature-name">Title</Label>
+              <Input
+                ref={nameInputRef}
+                id="feature-name"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                placeholder={placeholder}
+                onKeyDown={handleNameKeyDown}
+              />
+            </div>
           </div>
 
           <div className="flex-1 min-h-0 flex flex-col space-y-2">
@@ -137,7 +157,7 @@ Any additional context..."
             <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
               Cancel
             </Button>
-            <Button type="submit" disabled={!name.trim()}>
+            <Button type="submit">
               Create
             </Button>
           </DialogFooter>
diff --git a/src/components/GlobalHeader/FeatureTabGroup.tsx b/src/components/GlobalHeader/FeatureTabGroup.tsx
@@ -37,7 +37,7 @@ export function FeatureTabGroup({
   const [, setView] = useAtom(viewAtom);
   const [hasLogo, setHasLogo] = useState(true); // Default true to hide name initially
   const [showCreateDialog, setShowCreateDialog] = useState(false);
-  const [defaultFeatureName, setDefaultFeatureName] = useState("");
+  const [nextSeq, setNextSeq] = useState(0);
 
   useEffect(() => {
     invoke<string | null>("get_project_logo", { projectPath: project.path })
@@ -139,8 +139,8 @@ export function FeatureTabGroup({
     e?.stopPropagation();
     if (!workspace) return;
 
-    const counter = (project.feature_counter ?? 0) + 1;
-    setDefaultFeatureName(`#${counter}`);
+    // Use global counter
+    setNextSeq((workspace.feature_counter ?? 0) + 1);
     setShowCreateDialog(true);
   };
 
@@ -149,9 +149,8 @@ export function FeatureTabGroup({
 
     setView({ type: "workspace" });
 
-    const counter = (project.feature_counter ?? 0) + 1;
-
     try {
+      // Backend handles seq and feature_counter atomically (global)
       const feature = await invoke<Feature>("workspace_create_feature", {
         projectId: project.id,
         name,
@@ -162,9 +161,8 @@ export function FeatureTabGroup({
         p.id === project.id
           ? {
               ...p,
-              features: [...p.features, { ...feature, seq: counter, description: description || undefined }],
+              features: [...p.features, feature],
               active_feature_id: feature.id,
-              feature_counter: counter,
               view_mode: "features" as const,
             }
           : p
@@ -174,6 +172,7 @@ export function FeatureTabGroup({
         ...workspace,
         projects: newProjects,
         active_project_id: project.id,
+        feature_counter: feature.seq,
       };
 
       setWorkspace(newWorkspace);
@@ -277,7 +276,7 @@ export function FeatureTabGroup({
         <CreateFeatureDialog
           open={showCreateDialog}
           onOpenChange={setShowCreateDialog}
-          defaultName={defaultFeatureName}
+          seq={nextSeq}
           onSubmit={handleCreateFeature}
         />
       </>
@@ -332,17 +331,15 @@ export function FeatureTabGroup({
             </SortableContext>
           )}
 
-          {/* Add button - only show for active project */}
-          {isActiveProject && (
-            <button
-              onClick={handleAddFeature}
-              onPointerDown={(e) => e.stopPropagation()}
-              className="p-1 text-muted-foreground hover:text-ink hover:bg-card-alt rounded transition-colors"
-              title="New Feature"
-            >
-              <PlusIcon className="w-3.5 h-3.5" />
-            </button>
-          )}
+          {/* Add button */}
+          <button
+            onClick={handleAddFeature}
+            onPointerDown={(e) => e.stopPropagation()}
+            className="p-1 text-muted-foreground hover:text-ink hover:bg-card-alt rounded transition-colors"
+            title="New Feature"
+          >
+            <PlusIcon className="w-3.5 h-3.5" />
+          </button>
         </div>
 
         {/* Separator between project groups */}
@@ -351,7 +348,7 @@ export function FeatureTabGroup({
       <CreateFeatureDialog
         open={showCreateDialog}
         onOpenChange={setShowCreateDialog}
-        defaultName={defaultFeatureName}
+        seq={nextSeq}
         onSubmit={handleCreateFeature}
       />
     </>
diff --git a/src/views/Workspace/WorkspaceView.tsx b/src/views/Workspace/WorkspaceView.tsx
@@ -130,10 +130,12 @@ export function WorkspaceView() {
       : activeProject;
     if (!targetProject) return;
 
-    const counter = (targetProject.feature_counter ?? 0) + 1;
+    // Generate name based on global counter (backend will assign actual seq)
+    const counter = (workspace.feature_counter ?? 0) + 1;
     const name = `#${counter}`;
 
     try {
+      // Backend handles seq and feature_counter atomically (global)
       const feature = await invoke<Feature>("workspace_create_feature", {
         projectId: targetProject.id,
         name,
@@ -143,18 +145,18 @@ export function WorkspaceView() {
         p.id === targetProject.id
           ? {
               ...p,
-              features: [...p.features, { ...feature, seq: counter }],
+              features: [...p.features, feature],
               active_feature_id: feature.id,
-              feature_counter: counter,
             }
           : p
       );
       saveWorkspace({
         ...workspace,
         projects: newProjects,
         active_project_id: targetProject.id,
+        feature_counter: feature.seq,
       });
-      return { featureId: feature.id, featureName: name };
+      return { featureId: feature.id, featureName: feature.name };
     } catch (err) {
       console.error("Failed to create feature:", err);
       return undefined;
diff --git a/src/views/Workspace/types.ts b/src/views/Workspace/types.ts
@@ -66,4 +66,6 @@ export interface WorkspaceProject {
 export interface WorkspaceData {
   projects: WorkspaceProject[];
   active_project_id?: string;
+  /** Global feature counter across all projects */
+  feature_counter?: number;
 }

Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,6 @@ export interface WorkspaceProject {`
`66`	`66`	`export interface WorkspaceData {`
`67`	`67`	`projects: WorkspaceProject[];`
`68`	`68`	`active_project_id?: string;`
	`69`	`+ /** Global feature counter across all projects */`
	`70`	`+ feature_counter?: number;`
`69`	`71`	`}`