Merge pull request #17 from FxRayHughes/master

feat(development): 重构模块选择界面并添加新功能

Author: EmptyIrony

src/main/kotlin/org/tabooproject/development/ProjectBuilder.kt

@@ -9,6 +9,7 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider
 import com.intellij.openapi.util.ThrowableComputable
+import org.tabooproject.development.step.BasicConfigurationStep
 import org.tabooproject.development.step.ConfigurationPropertiesStep
 import org.tabooproject.development.step.OptionalPropertiesStep
 import org.tabooproject.development.util.Assets
@@ -55,14 +56,19 @@ class ProjectBuilder : AbstractNewProjectWizardBuilder() {
     }
 
     override fun createWizardSteps(wizardContext: WizardContext, modulesProvider: ModulesProvider): Array<ModuleWizardStep> {
-        return arrayOf(ConfigurationPropertiesStep(wizardContext), OptionalPropertiesStep())
+        return arrayOf(
+            BasicConfigurationStep(wizardContext),
+            ConfigurationPropertiesStep(wizardContext), 
+            OptionalPropertiesStep()
+        )
     }
 
     override fun cleanup() {
         // 在清理前保存当前配置为默认设置
         saveCurrentConfigurationAsDefaults()
 
         super.cleanup()
+        BasicConfigurationStep.refreshTemporaryData()
         ConfigurationPropertiesStep.refreshTemporaryData()
         OptionalPropertiesStep.refreshTemporaryData()
     }

src/main/kotlin/org/tabooproject/development/Utils.kt

@@ -81,17 +81,30 @@ private inline fun <reified T : PsiElement> PsiElement.findParent(
 }
 
 fun readFromUrl(url: String): String? {
-    val client = createOkHttpClientWithSystemProxy {
-        connectTimeout(10, TimeUnit.SECONDS)
-        readTimeout(10, TimeUnit.SECONDS)
-    }
+    return try {
+        val client = createOkHttpClientWithSystemProxy {
+            connectTimeout(30, TimeUnit.SECONDS)  // 增加超时时间
+            readTimeout(30, TimeUnit.SECONDS)
+            writeTimeout(30, TimeUnit.SECONDS)
+            // 添加重试机制
+            retryOnConnectionFailure(true)
+        }
 
-    val response = client
-        .newCall(getRequest(url))
-        .execute()
-        .takeIf { it.isSuccessful } ?: throw IOException("Failed to get $url")
+        val response = client
+            .newCall(getRequest(url))
+            .execute()
 
-    return response.body?.string()
+        if (!response.isSuccessful) {
+            throw IOException("HTTP ${response.code}: ${response.message} for URL: $url")
+        }
+
+        response.body?.string()
+    } catch (e: Exception) {
+        // 记录详细错误信息但不抛出异常，让调用方决定如何处理
+        println("Network request failed for $url: ${e.message}")
+        e.printStackTrace()
+        null
+    }
 }
 
 fun PsiClass.getContainingPackageName(): String? {

src/main/kotlin/org/tabooproject/development/component/CheckModuleList.kt

@@ -4,6 +4,7 @@ import com.intellij.openapi.Disposable
 import com.intellij.packageDependencies.ui.TreeModel
 import com.intellij.ui.*
 import com.intellij.ui.CheckboxTree.CheckboxTreeCellRenderer
+import com.intellij.util.ui.JBUI
 import org.tabooproject.development.step.ConfigurationPropertiesStep
 import org.tabooproject.development.step.Module
 import javax.swing.JScrollPane
@@ -38,35 +39,63 @@ class CheckModuleList : JScrollPane(), Disposable {
                 if (value.userObject is Module) {
                     val module = value.userObject as Module
 
+                    // 模块名称 - 使用更突出的颜色和字体
                     textRenderer.append(
                         ColoredText.singleFragment(
                             module.name, SimpleTextAttributes(
                                 SimpleTextAttributes.STYLE_BOLD,
-                                JBColor.BLACK
+                                if (selected) JBColor.WHITE else JBColor(0x2D5AA0, 0x4A9EFF) // 蓝色主题
                             )
                         )
                     )
 
-                    textRenderer.append("   ")
+                    // 添加合适的间距
+                    textRenderer.append("  ")
 
+                    // 模块描述 - 使用更柔和的灰色
+                    val description = module.desc?.let { 
+                        if (it.length > 50) "${it.take(50)}..." else it 
+                    } ?: "No description"
+                    
                     textRenderer.append(
                         ColoredText.singleFragment(
-                            module.desc ?: module.name, SimpleTextAttributes(
-                                SimpleTextAttributes.STYLE_PLAIN,
-                                JBColor.GRAY
+                            description, SimpleTextAttributes(
+                                SimpleTextAttributes.STYLE_ITALIC,
+                                if (selected) JBColor.LIGHT_GRAY else JBColor.GRAY
                             )
                         )
                     )
                 }
             } else if (value is DefaultMutableTreeNode) {
-                textRenderer.append(value.userObject.toString())
+                // 分类标题 - 使用更突出的样式
+                textRenderer.append(
+                    ColoredText.singleFragment(
+                        value.userObject.toString(), SimpleTextAttributes(
+                            SimpleTextAttributes.STYLE_BOLD,
+                            if (selected) JBColor.WHITE else JBColor(0x1A472A, 0x5FB865) // 绿色分类标题
+                        )
+                    )
+                )
             }
         }
     }, root)
 
     init {
         checkBoxList.model = treeNode
         checkBoxList.isFocusable = false
+        
+        // 设置树的行高和样式
+        checkBoxList.rowHeight = 24  // 增加行高让内容更易读
+        checkBoxList.isRootVisible = false  // 隐藏根节点
+        checkBoxList.showsRootHandles = true  // 显示展开/折叠句柄
+        
+        // 默认展开所有分类节点
+        javax.swing.SwingUtilities.invokeLater {
+            for (i in 0 until checkBoxList.rowCount) {
+                checkBoxList.expandRow(i)
+            }
+        }
+        
         checkBoxList.addCheckboxTreeListener(object : CheckboxTreeListener {
             override fun nodeStateChanged(node: CheckedTreeNode) {
                 if (node.userObject !is Module) return
@@ -79,9 +108,35 @@ class CheckModuleList : JScrollPane(), Disposable {
                 onModuleSelectionChanged?.invoke(export())
             }
         })
+        
+        // 添加双击监听器用于展开/收起分类节点
+        checkBoxList.addMouseListener(object : java.awt.event.MouseAdapter() {
+            override fun mouseClicked(e: java.awt.event.MouseEvent?) {
+                if (e?.clickCount == 2) {
+                    val path = checkBoxList.getPathForLocation(e.x, e.y)
+                    if (path != null) {
+                        val node = path.lastPathComponent
+                        if (node is DefaultMutableTreeNode && node.userObject !is Module) {
+                            // 这是一个分类节点，切换展开/收起状态
+                            if (checkBoxList.isExpanded(path)) {
+                                checkBoxList.collapsePath(path)
+                            } else {
+                                checkBoxList.expandPath(path)
+                            }
+                        }
+                    }
+                }
+            }
+        })
+        
         setFocusable(false)
         autoscrolls = true
         setViewportView(checkBoxList)
+        
+        // 设置滚动条样式
+        verticalScrollBarPolicy = VERTICAL_SCROLLBAR_AS_NEEDED
+        horizontalScrollBarPolicy = HORIZONTAL_SCROLLBAR_AS_NEEDED
+        border = JBUI.Borders.empty()
 
         updateUI()
     }
@@ -90,36 +145,69 @@ class CheckModuleList : JScrollPane(), Disposable {
      * 设置模块数据
      */
     fun setModules(modules: Map<String, List<Module>>) {
+        println("CheckModuleList.setModules 被调用，收到 ${modules.size} 个分类")
+        modules.forEach { (category, moduleList) ->
+            println("  分类 '$category': ${moduleList.size} 个模块")
+        }
+        
         root.removeAllChildren()
-        modules.map {
-            DefaultMutableTreeNode(it.key).apply {
-                it.value.forEach {
-                    add(CheckedTreeNode(it).apply {
-                        isChecked = false
-                        isFocusable = false
-                    })
-                }
+        
+        // 按分类名称排序，确保一致的显示顺序
+        val sortedModules = modules.toSortedMap()
+        
+        sortedModules.forEach { (categoryName, moduleList) ->
+            val categoryNode = DefaultMutableTreeNode(categoryName).apply {
                 isFocusable = false
             }
-        }.forEach {
-            root.add(it)
+            
+            // 按模块名称排序
+            moduleList.sortedBy { it.name }.forEach { module ->
+                val moduleNode = CheckedTreeNode(module).apply {
+                    isChecked = false
+                    isFocusable = false
+                }
+                categoryNode.add(moduleNode)
+            }
+            
+            root.add(categoryNode)
         }
 
+        // 强制重新构建树模型
+        treeNode?.reload()
         updateUI()
+        
+        // 在EDT中展开所有分类节点以提供更好的用户体验
+        javax.swing.SwingUtilities.invokeLater {
+            for (i in 0 until checkBoxList.rowCount) {
+                checkBoxList.expandRow(i)
+            }
+            println("CheckModuleList 展开了 ${checkBoxList.rowCount} 行")
+        }
     }
 
     /**
      * 批量设置模块选中状态
      */
     fun setSelectedModules(moduleIds: List<String>) {
-        // 先清除所有选择
+        println("CheckModuleList.setSelectedModules: 设置选中模块 ${moduleIds}")
+        
+        // 先清空ConfigurationPropertiesStep中的模块列表
+        ConfigurationPropertiesStep.property.modules.clear()
+        
+        // 清除所有选择
         clearAllSelections(root)
 
         // 然后设置指定的模块为选中
         moduleIds.forEach { moduleId ->
             findAndSetModuleSelection(root, moduleId, true)
         }
+        
+        // 强制刷新UI
         treeNode?.reload()
+        checkBoxList.repaint()
+        checkBoxList.updateUI()
+        
+        println("CheckModuleList.setSelectedModules: 完成后实际选中模块数量 ${export().size}")
 
         // 通知选择变更
         onModuleSelectionChanged?.invoke(export())
@@ -157,12 +245,40 @@ class CheckModuleList : JScrollPane(), Disposable {
      */
     private fun clearAllSelections(node: CheckedTreeNode) {
         node.isChecked = false
+        // 递归处理所有子节点
         for (i in 0 until node.childCount) {
-            val child = node.getChildAt(i) as? CheckedTreeNode ?: continue
-            clearAllSelections(child)
+            val child = node.getChildAt(i) as? DefaultMutableTreeNode ?: continue
+            // 如果是分类节点，继续递归处理其模块节点
+            for (j in 0 until child.childCount) {
+                val moduleNode = child.getChildAt(j) as? CheckedTreeNode ?: continue
+                moduleNode.isChecked = false
+                // 从配置中移除该模块
+                if (moduleNode.userObject is Module) {
+                    ConfigurationPropertiesStep.property.modules.remove(moduleNode.userObject as Module)
+                }
+            }
         }
     }
 
+    /**
+     * 取消选中单个模块
+     */
+    fun unselectModule(moduleId: String) {
+        println("CheckModuleList.unselectModule: 取消选中模块 ${moduleId}")
+        
+        // 查找并取消选中指定模块
+        findAndSetModuleSelection(root, moduleId, false)
+        
+        // 刷新UI
+        treeNode?.reload()
+        checkBoxList.repaint()
+        
+        println("CheckModuleList.unselectModule: 完成后实际选中模块数量 ${export().size}")
+        
+        // 通知选择变更
+        onModuleSelectionChanged?.invoke(export())
+    }
+
     /**
      * 导出当前选中的模块
      */

src/main/kotlin/org/tabooproject/development/component/CheckModulePanel.kt

@@ -39,26 +39,63 @@ class CheckModulePanel(
         Disposer.register(this, displayModuleList as Disposable)
 
         layout = BorderLayout()
-        preferredSize = Dimension(600, 400)
+        preferredSize = Dimension(800, 480) // 增加高度，充分利用空间
 
-        val leftPanel = JPanel(BorderLayout()).apply {
-            border = JBUI.Borders.empty(10)
-            add(checkModuleScrollPane, BorderLayout.CENTER)
+        // 创建美观的边框和标题
+        val leftPanel = panel {
+            group("Available Modules", indent = false) {
+                row {
+                    scrollCell(checkModuleList)
+                        .apply {
+                            component.preferredSize = Dimension(380, 410) // 增加高度
+                        }
+                }
+            }
+        }.apply {
+            border = JBUI.Borders.empty(10, 10, 5, 5)
         }
 
-        val rightPanel = JPanel(BorderLayout()).apply {
-            border = JBUI.Borders.empty(10)
-            add(displayModuleScrollPane, BorderLayout.CENTER)
+        val rightPanel = panel {
+            group("Selected Modules", indent = false) {
+                row {
+                    scrollCell(displayModuleList)
+                        .apply {
+                            component.preferredSize = Dimension(350, 410) // 增加高度与左侧对齐
+                        }
+                }
+            }
+        }.apply {
+            border = JBUI.Borders.empty(10, 5, 5, 10)
         }
 
-        add(leftPanel, BorderLayout.WEST)
-        add(rightPanel, BorderLayout.EAST)
+        add(leftPanel, BorderLayout.CENTER)  // 左侧占据主要空间
+        add(rightPanel, BorderLayout.EAST)   // 右侧固定宽度
 
         // 设置模块选择回调，连接到外部回调
         checkModuleList.onModuleSelectionChanged = { modules ->
             displayModuleList.setModules(modules)
             onModuleSelectionChanged?.invoke(modules)
         }
+        
+        // 设置右侧列表的点击取消选中回调
+        displayModuleList.onModuleRemoved = { module ->
+            println("DisplayModuleList: 尝试移除模块 ${module.name} (${module.id})")
+            // 在左侧树中取消选中该模块，不重新设置整个列表
+            checkModuleList.unselectModule(module.id)
+        }
+        
+        // 优化滚动条设置
+        checkModuleScrollPane.apply {
+            verticalScrollBarPolicy = JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED
+            horizontalScrollBarPolicy = JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED
+            border = JBUI.Borders.empty()
+        }
+        
+        displayModuleScrollPane.apply {
+            verticalScrollBarPolicy = JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED  
+            horizontalScrollBarPolicy = JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED
+            border = JBUI.Borders.empty()
+        }
     }
 
     /**