Merge branch 'master' of https://github.com/LiRenTech/project-graph

Author: Littlefean

.fitten/rules/project_background.md

@@ -0,0 +1,24 @@
+# Project Graph 背景信息
+
+## 项目概述
+
+Project Graph 是一个图形化思维桌面工具和知识管理系统，支持节点连接、图形渲染和自动布局等功能。
+
+## 技术架构
+
+- 前端：React + TypeScript
+- 后端：Tauri (Rust)
+- 构建工具：Vite + pnpm (monorepo)
+
+## 核心功能模块
+
+1. **图形渲染引擎**：基于Canvas 2D的实体渲染系统
+2. **控制服务**：鼠标/键盘交互控制、快捷键管理
+3. **数据服务**：文件加载、自动保存、协作引擎
+4. **反馈系统**：视觉特效和声音反馈
+
+## 开发辅助
+
+- 项目采用严格的代码规范和类型检查
+- 包含完善的文档系统(docs/)和测试用例
+- 支持插件系统扩展功能

.fitten/rules/开发注意.md

@@ -0,0 +1,5 @@
+# 开发注意
+
+开发mac适配windows快捷键部分时，不能用control键，用command键。
+UI上增加内容时，要使用i18n翻译适配英文和繁体中文。
+如果要增加rust侧的函数，一定要保证函数的健壮性，不能让他抛出错误

app/package.json

@@ -17,7 +17,9 @@
   },
   "dependencies": {
     "@generouted/react-router": "^1.19.9",
+    "@headlessui/react": "^2.2.4",
     "@marsidev/react-turnstile": "^1.1.0",
+    "@msgpack/msgpack": "^3.1.2",
     "@octokit/rest": "^21.0.2",
     "@tauri-apps/api": "^2.1.1",
     "@tauri-apps/plugin-cli": "~2.2.0",
@@ -29,6 +31,7 @@
     "@tauri-apps/plugin-shell": "2.2.0",
     "@tauri-apps/plugin-store": "^2.2.0",
     "@tauri-apps/plugin-updater": "~2",
+    "@tauri-apps/plugin-window-state": ">=2",
     "bcrypt": "^5.1.1",
     "decimal.js": "^10.5.0",
     "driver.js": "^1.3.1",

app/src-tauri/Cargo.lock

@@ -30,3 +30,4 @@ tauri-plugin-process = "2"
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-cli = "2"
 tauri-plugin-updater = "2"
+tauri-plugin-window-state = "2"

app/src-tauri/Cargo.toml

@@ -2,5 +2,5 @@
   "identifier": "desktop-capability",
   "platforms": ["macOS", "windows", "linux"],
   "windows": ["main"],
-  "permissions": ["cli:default", "updater:default"]
+  "permissions": ["cli:default", "updater:default", "window-state:default"]
 }

app/src-tauri/capabilities/desktop.json

@@ -6,8 +6,6 @@ use base64::engine::general_purpose;
 use base64::Engine;
 
 use tauri::Manager;
-use tauri::Runtime;
-use tauri::Url;
 
 #[derive(Debug, Serialize, Deserialize)]
 struct FolderEntry {
@@ -17,14 +15,13 @@ struct FolderEntry {
     #[serde(skip_serializing_if = "Option::is_none")]
     children: Option<Vec<FolderEntry>>,
 }
-#[cfg(desktop)]
-use tauri_plugin_updater::UpdaterExt;
 
 /// 递归读取文件夹结构，返回嵌套的文件夹结构
 #[tauri::command]
 fn read_folder_structure(path: String) -> FolderEntry {
     let path_buf = std::path::PathBuf::from(&path);
-    let name = path_buf.file_name()
+    let name = path_buf
+        .file_name()
         .and_then(|n| n.to_str())
         .unwrap_or("")
         .to_string();
@@ -36,7 +33,7 @@ fn read_folder_structure(path: String) -> FolderEntry {
                 let path = entry.path();
                 let child_name = entry.file_name().to_string_lossy().to_string();
                 let path_str = path.to_string_lossy().to_string();
-                
+
                 if path.is_file() {
                     children.push(FolderEntry {
                         name: child_name,
@@ -50,7 +47,7 @@ fn read_folder_structure(path: String) -> FolderEntry {
             }
         }
     }
-    
+
     FolderEntry {
         name,
         is_file: false,
@@ -88,20 +85,23 @@ fn read_folder(path: String) -> Vec<String> {
 /// 如果文件夹不存在，返回空列表
 /// fileExts: 要读取的文件扩展名列表，例如：[".txt", ".md"]
 #[tauri::command]
-fn read_folder_recursive(path: String, fileExts: Vec<String>) -> Vec<String> {
+fn read_folder_recursive(path: String, file_exts: Vec<String>) -> Vec<String> {
     let mut files = Vec::new();
     if let Ok(entries) = std::fs::read_dir(path) {
         for entry in entries {
             if let Ok(entry) = entry {
                 let path = entry.path();
                 if path.is_file() {
                     if let Some(file_name) = path.to_str() {
-                        if fileExts.iter().any(|ext| file_name.ends_with(ext)) {
+                        if file_exts.iter().any(|ext| file_name.ends_with(ext)) {
                             files.push(file_name.to_string());
                         }
                     }
                 } else if path.is_dir() {
-                    let mut sub_files = read_folder_recursive(path.to_str().unwrap().to_string(), fileExts.clone());
+                    let mut sub_files = read_folder_recursive(
+                        path.to_str().unwrap().to_string(),
+                        file_exts.clone(),
+                    );
                     files.append(&mut sub_files);
                 }
             }
@@ -110,15 +110,13 @@ fn read_folder_recursive(path: String, fileExts: Vec<String>) -> Vec<String> {
     files
 }
 
-
 /// 删除文件
 #[tauri::command]
 fn delete_file(path: String) -> Result<(), String> {
     std::fs::remove_file(path).map_err(|e| e.to_string())?;
     Ok(())
 }
 
-
 /// 读取文件，返回字符串
 #[tauri::command]
 fn read_text_file(path: String) -> String {
@@ -180,26 +178,6 @@ fn exit(code: i32) {
     std::process::exit(code);
 }
 
-#[cfg(desktop)]
-#[tauri::command]
-async fn set_update_channel<R: Runtime>(
-    app: tauri::AppHandle<R>,
-    channel: String,
-) -> Result<(), tauri_plugin_updater::Error> {
-    println!("Setting update channel to {}", channel);
-    app.updater_builder()
-        .endpoints(vec![Url::parse(
-            format!(
-            "https://github.com/LiRenTech/project-graph/releases/{channel}/download/latest.json"
-        )
-            .as_str(),
-        )?])?
-        .build()?
-        .check()
-        .await?;
-    Ok(())
-}
-
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     // 在 Linux 上禁用 DMA-BUF 渲染器
@@ -226,6 +204,8 @@ pub fn run() {
             {
                 app.handle().plugin(tauri_plugin_cli::init())?;
                 app.handle().plugin(tauri_plugin_process::init())?;
+                app.handle()
+                    .plugin(tauri_plugin_window_state::Builder::new().build())?;
                 app.handle()
                     .plugin(tauri_plugin_updater::Builder::new().build())?;
             }
@@ -244,9 +224,7 @@ pub fn run() {
             write_file_base64,
             write_stdout,
             write_stderr,
-            exit,
-            #[cfg(desktop)]
-            set_update_channel
+            exit
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

app/src-tauri/src/lib.rs

@@ -1,7 +1,7 @@
-import { Line } from "./Line";
 import { Renderer } from "../../render/canvas2d/renderer";
 import { Camera } from "../../stage/Camera";
 import { Vector } from "../Vector";
+import { Line } from "./Line";
 import { Shape } from "./Shape";
 
 export class Rectangle extends Shape {
@@ -382,6 +382,10 @@ export class Rectangle extends Shape {
     }
   }
 
+  public translate(offset: Vector): Rectangle {
+    return new Rectangle(this.location.add(offset), this.size);
+  }
+
   public transformWorld2View(): Rectangle {
     return new Rectangle(
       Renderer.transformWorld2View(this.location),

app/src/core/dataStruct/shape/Rectangle.tsx

@@ -90,9 +90,17 @@ export namespace InputElement {
         document.body.removeEventListener("mousedown", onOutsideClick);
         removeElement();
       });
+      let isComposing = false;
+      inputElement.addEventListener("compositionstart", () => {
+        isComposing = true;
+      });
+      inputElement.addEventListener("compositionend", () => {
+        isComposing = false;
+      });
+
       inputElement.addEventListener("keydown", (event) => {
         event.stopPropagation();
-        if (event.key === "Enter") {
+        if (event.key === "Enter" && !isComposing) {
           resolve(inputElement.value);
           onChange(inputElement.value);
           document.body.removeEventListener("mousedown", onOutsideClick);
@@ -197,7 +205,19 @@ export namespace InputElement {
         document.body.removeEventListener("mousedown", onOutsideClick);
         removeElement();
       });
+      let isComposing = false;
+      textareaElement.addEventListener("compositionstart", () => {
+        isComposing = true;
+      });
+      textareaElement.addEventListener("compositionend", () => {
+        // 防止此事件早于enter键按下触发（Mac的bug）
+        setTimeout(() => {
+          isComposing = false;
+        }, 100);
+      });
+
       textareaElement.addEventListener("keydown", (event) => {
+        console.log(event.key, "keydown");
         event.stopPropagation();
         if (event.key === "Tab") {
           // 防止tab切换到其他按钮
@@ -238,17 +258,20 @@ export namespace InputElement {
 
         if (event.key === "Enter") {
           event.preventDefault();
-          const enterKeyDetail = getEnterKey(event);
-          if (textNodeExitEditMode === enterKeyDetail) {
-            // 用户想退出编辑
-            exitEditMode();
-            addSuccessEffect();
-          } else if (textNodeContentLineBreak === enterKeyDetail) {
-            // 用户想换行
-            breakLine();
-          } else {
-            // 用户可能记错了快捷键
-            addFailEffect();
+          // 使用event.isComposing和自定义isComposing双重检查
+          if (!(event.isComposing || isComposing)) {
+            const enterKeyDetail = getEnterKey(event);
+            if (textNodeExitEditMode === enterKeyDetail) {
+              // 用户想退出编辑
+              exitEditMode();
+              addSuccessEffect();
+            } else if (textNodeContentLineBreak === enterKeyDetail) {
+              // 用户想换行
+              breakLine();
+            } else {
+              // 用户可能记错了快捷键
+              addFailEffect();
+            }
           }
         }
       });

app/src/core/render/domElement/inputElement.tsx

@@ -0,0 +1,64 @@
+import { atom, useAtomValue } from "jotai";
+import { store } from "../../state";
+import { Rectangle } from "../dataStruct/shape/Rectangle";
+import { Vector } from "../dataStruct/Vector";
+
+export namespace SubWindow {
+  export enum IdEnum {}
+  export interface Window {
+    /**
+     * 唯一的id，不能重复，如果创建了已经存在的id，会聚焦到已存在的窗口
+     * 可以是负数，可以不连续
+     */
+    id: number;
+    title: string;
+    children: React.ReactNode;
+    rect: Rectangle;
+    maximized: boolean;
+    minimized: boolean;
+    opacity: number;
+    focused: boolean;
+    zIndex: number;
+  }
+  const subWindowsAtom = atom<Window[]>([]);
+  export const use = () => useAtomValue(subWindowsAtom);
+  function getMaxZIndex() {
+    return store.get(subWindowsAtom).reduce((maxZIndex, window) => Math.max(maxZIndex, window.zIndex), 0);
+  }
+  export function create(options: Partial<Window>): Window {
+    if (options.id && store.get(subWindowsAtom).some((window) => window.id === options.id)) {
+      // 如果已经存在的id，聚焦到已存在的窗口
+      focus(options.id);
+      return store.get(subWindowsAtom).find((window) => window.id === options.id)!;
+    }
+    const win: Window = {
+      id: store.get(subWindowsAtom).reduce((maxId, window) => Math.max(maxId, window.id), 0) + 1,
+      title: "",
+      children: <></>,
+      rect: new Rectangle(Vector.getZero(), Vector.same(100)),
+      maximized: false,
+      minimized: false,
+      opacity: 1,
+      focused: false,
+      zIndex: getMaxZIndex() + 1,
+      ...options,
+    };
+    store.set(subWindowsAtom, [...store.get(subWindowsAtom), win]);
+    return win;
+  }
+  export function update(id: number, options: Partial<Omit<Window, "id">>) {
+    store.set(
+      subWindowsAtom,
+      store.get(subWindowsAtom).map((window) => (window.id === id ? { ...window, ...options } : window)),
+    );
+  }
+  export function close(id: number) {
+    store.set(
+      subWindowsAtom,
+      store.get(subWindowsAtom).filter((window) => window.id !== id),
+    );
+  }
+  export function focus(id: number) {
+    update(id, { focused: true, zIndex: getMaxZIndex() + 1 });
+  }
+}