From e496aa59f48ac59a995464a5e6501efcb073d8a5 Mon Sep 17 00:00:00 2001
From: Jasery <jaserydev@163.com>
Date: Fri, 31 Oct 2025 17:20:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(types):=20=E5=B0=86=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=A7=BB=E5=8A=A8=E5=88=B0=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E7=9A=84types=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将原本分散在多个文件中的TreeNode和Template类型定义集中到src/types模块中，并更新所有相关引用
修改tsconfig配置以包含新的types目录
优化IPCs中模板处理逻辑，改进文件复制和路径处理
---
 src/main/IPCs.ts                              | 31 ++++++++++++-------
 src/renderer/components/DirectoryDialog.vue   |  2 +-
 src/renderer/components/FileDialog.vue        | 10 ++----
 src/renderer/components/TemplateCard.vue      |  2 +-
 src/renderer/screens/CreateTemplateScreen.vue |  3 +-
 src/renderer/screens/TemplateListScreen.vue   |  4 +--
 src/renderer/store/template.ts                | 20 +-----------
 src/types/index.ts                            | 18 +++++++++++
 tsconfig.json                                 |  2 +-
 tsconfig.node.json                            |  1 +
 10 files changed, 49 insertions(+), 44 deletions(-)
 create mode 100644 src/types/index.ts

diff --git a/src/main/IPCs.ts b/src/main/IPCs.ts
index 70f8fa4..f2a28e4 100644
--- a/src/main/IPCs.ts
+++ b/src/main/IPCs.ts
@@ -6,9 +6,11 @@ import {
   readFileSync,
   existsSync,
   ensureDirSync,
-  copyFileSync
+  copyFileSync,
+  readdirSync
 } from 'fs-extra'
 import { autoUpdater } from 'electron-updater'
+import { Template, TreeNode } from '../types'
 
 /*
  * IPC Communications
@@ -182,7 +184,7 @@ export default class IPCs {
           const userDataPath = join(Constants.APP_DATA_PATH, 'data')
           const filePath = join(userDataPath, 'templates.json')
 
-          let templates = []
+          let templates: Template[] = []
           if (existsSync(filePath)) {
             const templatesData = readFileSync(filePath, 'utf-8')
             templates = JSON.parse(templatesData)
@@ -203,11 +205,14 @@ export default class IPCs {
             ensureDirSync(baseDirPath)
 
             // Helper function to traverse the tree and collect all nodes
-            const collectAllNodes = (nodes, allNodes = []) => {
+            const collectAllNodes = (nodes: TreeNode[], allNodes: TreeNode[] = [], parent?: TreeNode) => {
               for (const node of nodes) {
-                allNodes.push(node);
+                allNodes.push({
+                  ...node,
+                  path: join(parent?.path || '', node.path)
+                });
                 if (node.children) {
-                  collectAllNodes(node.children, allNodes);
+                  collectAllNodes(node.children, allNodes, node);
                 }
               }
               return allNodes;
@@ -227,13 +232,17 @@ export default class IPCs {
                   const fileDir = dirname(nodePath);
                   ensureDirSync(fileDir);
 
-                  if (node.sourceFilePath) {
-                    // Copy from source file
-                    const sourceContent = readFileSync(node.sourceFilePath);
-                    writeFileSync(nodePath, sourceContent);
-                  } else if (node.content) {
+                  if (node.sourceType === 'file') {
+                    copyFileSync(node.sourcePath, nodePath);
+                  } else {
                     // Write content directly
-                    writeFileSync(nodePath, node.content, 'utf-8');
+                    const files = readdirSync(node.sourcePath, { withFileTypes: true })
+                    for (const file of files) {
+                      if (file.isFile() && file.name.startsWith(baseDirName)) {
+                        const filePath = join(node.sourcePath, file.name);
+                        copyFileSync(filePath, nodePath);
+                      }
+                    }
                   }
                 }
               }
diff --git a/src/renderer/components/DirectoryDialog.vue b/src/renderer/components/DirectoryDialog.vue
index 6bdd79a..a6e49a0 100644
--- a/src/renderer/components/DirectoryDialog.vue
+++ b/src/renderer/components/DirectoryDialog.vue
@@ -39,7 +39,7 @@
 
 <script setup lang="ts">
 import { ref, watch, nextTick } from 'vue'
-import { TreeNode } from '@/renderer/store/template'
+import { TreeNode } from '@/types'
 
 interface Props {
   modelValue: boolean
diff --git a/src/renderer/components/FileDialog.vue b/src/renderer/components/FileDialog.vue
index f5d4696..f49f904 100644
--- a/src/renderer/components/FileDialog.vue
+++ b/src/renderer/components/FileDialog.vue
@@ -26,7 +26,6 @@
             label="选择文件"
             placeholder="点击输入框选择文件"
             readonly
-            :rules="[fileSelectionRule]"
             :append-inner-icon="'mdi-file'"
             density="comfortable"
             class="mt-4"
@@ -39,7 +38,6 @@
             label="选择文件夹"
             placeholder="点击输入框选择文件夹"
             readonly
-            :rules="[fileSelectionRule]"
             :append-inner-icon="'mdi-folder'"
             density="comfortable"
             class="mt-4"
@@ -81,7 +79,7 @@
 
 <script setup lang="ts">
 import { ref, watch, nextTick } from 'vue'
-import { TreeNode } from '@/renderer/store/template'
+import { TreeNode } from '@/types'
 
 interface Props {
   modelValue: boolean
@@ -135,11 +133,7 @@ watch(isVisible, (newValue) => {
 const requiredRule = (fieldName: string) => (v: string | null | undefined) =>
   !!v || `${fieldName}为必填项`
 
-// File selection validation rule
-const fileSelectionRule = () => {
-  if (isEditMode.value) return true // 编辑模式下不需要验证
-  return !!selectedFilePath.value || !!selectedFolderPath.value || '请选择文件或文件夹'
-}
+
 
 // Methods
 const autoFocusInput = async () => {
diff --git a/src/renderer/components/TemplateCard.vue b/src/renderer/components/TemplateCard.vue
index 4955aca..3f29025 100644
--- a/src/renderer/components/TemplateCard.vue
+++ b/src/renderer/components/TemplateCard.vue
@@ -59,7 +59,7 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import { Template, TreeNode } from '@/renderer/store/template'
+import { Template, TreeNode } from '@/types'
 
 interface Props {
   template: Template
diff --git a/src/renderer/screens/CreateTemplateScreen.vue b/src/renderer/screens/CreateTemplateScreen.vue
index e45f793..638aae3 100644
--- a/src/renderer/screens/CreateTemplateScreen.vue
+++ b/src/renderer/screens/CreateTemplateScreen.vue
@@ -146,7 +146,8 @@
 </template>
 
 <script setup lang="ts">
-import { useTemplateStore, TreeNode } from '@/renderer/store/template'
+import { useTemplateStore } from '@/renderer/store/template'
+import { TreeNode } from '@/types'
 import { useSnackbarStore } from '@/renderer/store/snackbar'
 import TemplateTree from '@/renderer/components/TemplateTree.vue'
 import DirectoryDialog from '@/renderer/components/DirectoryDialog.vue'
diff --git a/src/renderer/screens/TemplateListScreen.vue b/src/renderer/screens/TemplateListScreen.vue
index 07e5471..37796a6 100644
--- a/src/renderer/screens/TemplateListScreen.vue
+++ b/src/renderer/screens/TemplateListScreen.vue
@@ -89,8 +89,8 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
-import { useTemplateStore, TreeNode } from '@/renderer/store/template'
-import { Template } from '@/renderer/store/template'
+import { useTemplateStore } from '@/renderer/store/template'
+import { TreeNode, Template } from '@/types'
 import TemplateTree from '@/renderer/components/TemplateTree.vue'
 import TemplateCard from '@/renderer/components/TemplateCard.vue'
 import { ConfirmDialogService } from '@/renderer/utils/confirm-dialog-service'
diff --git a/src/renderer/store/template.ts b/src/renderer/store/template.ts
index 35c2ff3..7bfaa2d 100644
--- a/src/renderer/store/template.ts
+++ b/src/renderer/store/template.ts
@@ -1,24 +1,6 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
-
-// 定义树状结构的节点
-export interface TreeNode {
-  id: string
-  name: string
-  path: string // 完整路径
-  type: 'directory' | 'file'
-  children?: TreeNode[]
-  sourcePath?: string
-  sourceType?: 'file' | 'folder' // 记录选择的是文件还是文件夹
-}
-
-export interface Template {
-  id: string
-  name: string
-  description: string
-  // 使用树状结构存储
-  treeStructure: TreeNode[]
-}
+import { TreeNode, Template } from '@/types'
 
 export const useTemplateStore = defineStore('template', () => {
   const templates = ref<Template[]>([])
diff --git a/src/types/index.ts b/src/types/index.ts
new file mode 100644
index 0000000..a1f49d7
--- /dev/null
+++ b/src/types/index.ts
@@ -0,0 +1,18 @@
+// 定义树状结构的节点
+export interface TreeNode {
+  id: string
+  name: string
+  path: string // 完整路径
+  type: 'directory' | 'file'
+  children?: TreeNode[]
+  sourcePath?: string
+  sourceType?: 'file' | 'folder' // 记录选择的是文件还是文件夹
+}
+
+export interface Template {
+  id: string
+  name: string
+  description: string
+  // 使用树状结构存储
+  treeStructure: TreeNode[]
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 8d5b148..f6c948b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,7 +19,7 @@
     },
     "lib": ["esnext", "dom"]
   },
-  "include": ["src/*.ts", "src/*.d.ts", "src/renderer", "src/renderer/auto-imports.d.ts"],
+  "include": ["src/*.ts", "src/*.d.ts", "src/renderer", "src/renderer/auto-imports.d.ts", "src/types"],
   "references": [
     {
       "path": "./tsconfig.node.json"
diff --git a/tsconfig.node.json b/tsconfig.node.json
index e519ecd..b813579 100644
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -12,6 +12,7 @@
   "include": [
     "src/main",
     "src/preload",
+    "src/types",
     "package.json",
     "eslint.config.ts",
     "vite.config.mts",