From de7af2f6500991cdd5b1b24957ffc8ed3f68b645 Mon Sep 17 00:00:00 2001
From: Jasery <jaserydev@163.com>
Date: Tue, 28 Oct 2025 13:46:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=88=B6=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E8=B7=9F=E8=B8=AA=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=9B=AE=E5=BD=95=E5=92=8C=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/TemplateTree.vue      |  45 ++++++-
 src/renderer/screens/CreateTemplateScreen.vue | 122 +++++++++++++++---
 2 files changed, 146 insertions(+), 21 deletions(-)

diff --git a/src/renderer/components/TemplateTree.vue b/src/renderer/components/TemplateTree.vue
index a68f480..189c569 100644
--- a/src/renderer/components/TemplateTree.vue
+++ b/src/renderer/components/TemplateTree.vue
@@ -14,6 +14,7 @@
       activatable
       open-on-click
       :return-object="false"
+      :hoverable="true"
     >
       <template #prepend="{ item }">
         <v-icon
@@ -202,12 +203,14 @@ const emit = defineEmits([
   cursor: pointer;
 }
 
+/* Tree node styling */
 :deep(.v-treeview-node__root),
 :deep(.v-treeview-node__children .v-treeview-node__root) {
   padding: 4px;
   margin: 2px 0;
   border-radius: 4px;
   transition: background-color 0.2s;
+  position: relative;
 }
 
 :deep(.v-treeview-node__root:hover),
@@ -215,7 +218,47 @@ const emit = defineEmits([
   background-color: rgba(0, 0, 0, 0.04);
 }
 
+/* Indentation guides to show hierarchy */
 :deep(.v-treeview-node__level) {
-  margin-right: 4px;
+  margin-right: 8px;
+  position: relative;
+}
+
+/* Vertical connector lines */
+:deep(.v-treeview-node) {
+  position: relative;
+}
+
+/* Add connector lines */
+:deep(.v-treeview-node::before) {
+  content: '';
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 12px;
+  width: 1px;
+  background: rgba(0, 0, 0, 0.12);
+  z-index: 1;
+}
+
+/* Horizontal connector lines for children */
+:deep(.v-treeview-node__children) {
+  position: relative;
+}
+
+:deep(.v-treeview-node__children::before) {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: -16px;
+  width: 16px;
+  height: 1px;
+  background: rgba(0, 0, 0, 0.12);
+}
+
+/* Hide connector for root level */
+:deep(.v-treeview > .v-treeview-node > .v-treeview-node__root::before),
+:deep(.v-treeview > .v-treeview-node > .v-treeview-node__children::before) {
+  display: none;
 }
 </style>
diff --git a/src/renderer/screens/CreateTemplateScreen.vue b/src/renderer/screens/CreateTemplateScreen.vue
index 13a4063..6aee554 100644
--- a/src/renderer/screens/CreateTemplateScreen.vue
+++ b/src/renderer/screens/CreateTemplateScreen.vue
@@ -336,6 +336,7 @@ const newDirectoryPath = ref('')
 const newFilePath = ref('')
 const editingFile = ref<{ path: string; content: string } | null>(null)
 const editingFileContent = ref('')
+const parentDirectoryForNewItems = ref<string | null>(null) // Track parent context
 
 // Tree state
 const expandedNodes = ref<string[]>([])
@@ -356,28 +357,84 @@ const files = ref<{ path: string; content: string }[]>([])
 // Computed
 const isEditMode = computed(() => !!route.params.id)
 const treeItems = computed<TreeItem[]>(() => {
-  const items: TreeItem[] = []
+  // Create root structure
+  const root: TreeItem = {
+    id: 'root',
+    name: 'root',
+    type: 'directory',
+    children: []
+  }
 
-  // Add directories
+  // Process each directory
   directories.value.forEach((dir) => {
-    items.push({
-      id: `dir-${dir.path}`,
-      name: dir.path,
-      type: 'directory',
-      children: []
-    })
+    const pathParts = dir.path.split('/').filter(part => part !== '') // Split path and remove empty parts
+    let currentLevel = root.children || []
+
+    // Navigate/create the directory structure
+    for (let i = 0; i < pathParts.length; i++) {
+      const part = pathParts[i]
+      const isLastPart = i === pathParts.length - 1
+      
+      // Check if this part already exists in the current level
+      let existingItem = currentLevel.find(item => item.name === part)
+      
+      if (!existingItem) {
+        // Create new directory item
+        const newDir: TreeItem = {
+          id: `dir-${part}-${Date.now()}-${Math.random()}`, // Unique ID
+          name: part,
+          type: 'directory',
+          children: []
+        }
+        currentLevel.push(newDir)
+        existingItem = newDir
+      }
+      
+      // Move to the next level if not the last part
+      if (!isLastPart && existingItem.children) {
+        currentLevel = existingItem.children
+      }
+    }
   })
 
-  // Add files
+  // Process each file and add to the appropriate directory
   files.value.forEach((file) => {
-    items.push({
-      id: `file-${file.path}`,
-      name: file.path,
+    const pathParts = file.path.split('/').filter(part => part !== '')
+    const fileName = pathParts.pop() // Get the last part as filename
+    
+    if (!fileName) return // Skip if no filename
+    
+    let currentLevel = root.children || []
+    
+    // Navigate to the appropriate directory for the file
+    for (let i = 0; i < pathParts.length; i++) {
+      const part = pathParts[i]
+      const dirItem = currentLevel.find(item => item.name === part && item.type === 'directory')
+      
+      if (dirItem && dirItem.children) {
+        currentLevel = dirItem.children
+      } else {
+        // If the directory doesn't exist, create it
+        const newDir: TreeItem = {
+          id: `dir-${part}-${Date.now()}-${Math.random()}`,
+          name: part,
+          type: 'directory',
+          children: []
+        }
+        currentLevel.push(newDir)
+        currentLevel = newDir.children || []
+      }
+    }
+    
+    // Add the file to the current level
+    currentLevel.push({
+      id: `file-${fileName}-${Date.now()}-${Math.random()}`,
+      name: fileName,
       type: 'file'
     })
   })
 
-  return items
+  return root.children || []
 })
 
 // Validation rules
@@ -459,21 +516,24 @@ const addRootFile = () => {
 const addDirectory = (parentItem: TreeItem | null = null) => {
   showContextMenuVar.value = false
   currentContextItem.value = parentItem
-  newDirectoryPath.value = parentItem ? `${parentItem.name}/` : ''
+  parentDirectoryForNewItems.value = parentItem ? parentItem.name : null // Store parent context
+  newDirectoryPath.value = '' // Don't pre-fill the path
   showDirectoryDialog.value = true
   autoFocusDirectoryInput()
 }
 
 const addFile = (parentItem: TreeItem | null = null) => {
   showContextMenuVar.value = false
-  newFilePath.value = parentItem ? `${parentItem.name}/` : ''
+  parentDirectoryForNewItems.value = parentItem ? parentItem.name : null // Store parent context
+  newFilePath.value = '' // Don't pre-fill the path
   showFileDialog.value = true
   autoFocusFileInput()
 }
 
 const addNewItemToCurrentDirectory = (directoryItem: TreeItem) => {
   currentContextItem.value = directoryItem
-  newDirectoryPath.value = directoryItem ? `${directoryItem.name}/` : ''
+  parentDirectoryForNewItems.value = directoryItem.name // Store parent context
+  newDirectoryPath.value = '' // Don't pre-fill the path
   showDirectoryDialog.value = true
   autoFocusDirectoryInput()
 }
@@ -481,9 +541,19 @@ const addNewItemToCurrentDirectory = (directoryItem: TreeItem) => {
 const confirmAddDirectory = () => {
   if (!newDirectoryPath.value.trim()) return
 
+  // Construct the full path if there's a parent directory
+  let fullPath = newDirectoryPath.value
+  if (parentDirectoryForNewItems.value) {
+    // Make sure parent directory ends with a slash before appending
+    const parentPath = parentDirectoryForNewItems.value.endsWith('/') 
+      ? parentDirectoryForNewItems.value 
+      : parentDirectoryForNewItems.value + '/'
+    fullPath = parentPath + newDirectoryPath.value
+  }
+
   // Check for duplicates
   const exists = directories.value.some(
-    (d) => d.path === newDirectoryPath.value
+    (d) => d.path === fullPath
   )
   if (exists) {
     showSnackbar('该目录路径已存在！')
@@ -491,26 +561,37 @@ const confirmAddDirectory = () => {
   }
 
   directories.value.push({
-    path: newDirectoryPath.value
+    path: fullPath
   })
 
   showDirectoryDialog.value = false
   newDirectoryPath.value = ''
+  parentDirectoryForNewItems.value = null // Clear parent context after creation
   currentContextItem.value = null
 }
 
 const confirmAddFile = () => {
   if (!newFilePath.value.trim()) return
 
+  // Construct the full path if there's a parent directory
+  let fullPath = newFilePath.value
+  if (parentDirectoryForNewItems.value) {
+    // Make sure parent directory ends with a slash before appending
+    const parentPath = parentDirectoryForNewItems.value.endsWith('/') 
+      ? parentDirectoryForNewItems.value 
+      : parentDirectoryForNewItems.value + '/'
+    fullPath = parentPath + newFilePath.value
+  }
+
   // Check for duplicates
-  const exists = files.value.some((f) => f.path === newFilePath.value)
+  const exists = files.value.some((f) => f.path === fullPath)
   if (exists) {
     showSnackbar('该文件路径已存在！')
     return
   }
 
   const newFile = {
-    path: newFilePath.value,
+    path: fullPath,
     content: ''
   }
 
@@ -521,6 +602,7 @@ const confirmAddFile = () => {
 
   showFileDialog.value = false
   newFilePath.value = ''
+  parentDirectoryForNewItems.value = null // Clear parent context after creation
   currentContextItem.value = null
 }