优化 drift 功能

Author: mdddj

.idea/kotlinc.xml

@@ -72,10 +72,9 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:latest.release")
     intellijPlatform {
         intellijIdeaCommunity("2025.2.1")
-//        local("/Applications/Android Studio.app")
         bundledPlugins(bPlugins)
         //"io.flutter:88.2.0"
-        plugins("Dart:$dartVersion","io.flutter:88.2.0")
+        plugins("Dart:$dartVersion")
         pluginVerifier()
         zipSigner()
         javaCompiler()
@@ -85,7 +84,6 @@ dependencies {
         testBundledModules("intellij.libraries.ktor.client", "intellij.libraries.ktor.client.cio")
         testPlugins("Dart:$dartVersion")
         testFramework(TestFrameworkType.Platform)
-        // jewel
         bundledModule("intellij.platform.jewel.foundation")
         bundledModule("intellij.platform.jewel.ui")
         bundledModule("intellij.platform.jewel.ideLafBridge")
@@ -141,6 +139,7 @@ tasks {
 
     patchPluginXml {
         sinceBuild.set(sinceBuildVersion)
+        untilBuild.set("253.*")
         changeNotes.set(myChangeLog)
         pluginDescription.set(file("插件介绍h.md").readText().trim())
     }

.idea/workspace.xml

@@ -1,6 +1,6 @@
 kotlin.stdlib.default.dependency=false
 pluginVersion=6.9.0
-dartVersion=500.0.0
+dartVersion=502.0.0
 sinceBuildVersion=252
 kotlin.daemon.jvmargs=-Xmx5024m
 org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8

build.gradle.kts

@@ -1,6 +1,7 @@
 package icons
 
 import com.intellij.openapi.util.IconLoader
+import org.jetbrains.jewel.ui.icon.PathIconKey
 import javax.swing.Icon
 
 object MyImages {
@@ -18,4 +19,6 @@ object MyImages {
     fun load(path: String): Icon {
         return IconLoader.getIcon(path, MyImages::class.java)
     }
+
+    val wxDs = PathIconKey("images/wx.png", MyImages::class.java)
 }

gradle.properties

@@ -16,6 +16,7 @@ object Links {
     const val OPEN_IN =
         "https://mdddj.github.io/flutterx-doc/en/settings/quick-open-subdirectory/"
 
+    const val DriftDocument = "https://mdddj.github.io/flutterx-doc/en/vm/drift/"
 
     //链接
     const val LINK = "https://mdddj.github.io/flutterx-doc/en/settings/links/"

src/main/kotlin/icons/MyIcons.kt

@@ -1,16 +1,18 @@
 package shop.itbug.flutterx.window.vm
 
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Popup
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.project.Project
+import icons.MyImages
 import org.jetbrains.jewel.foundation.theme.JewelTheme
+import org.jetbrains.jewel.ui.component.Icon
 import org.jetbrains.jewel.ui.component.Link
 import org.jetbrains.jewel.ui.component.Text
 import shop.itbug.flutterx.common.dart.FlutterAppInstance
@@ -27,6 +29,7 @@ import java.net.URI
 @Composable
 fun FlutterAppsTabComponent(project: Project, body: @Composable (app: FlutterAppInstance) -> Unit) {
     var tabIndex by remember { mutableIntStateOf(0) }
+    var showRewardPopup by remember { mutableStateOf(false) }
     val flutterAppList by FlutterXVMService.getInstance(project).runningApps.collectAsState()
     val isEnableFuture = FlutterXVMService.getInstance(project).isEnableFuture.collectAsState().value
     val showRewardAction = PluginConfig.getState(project).showRewardAction
@@ -64,9 +67,27 @@ If you are running on a real device, please make sure the device is connected to
                     })
 
                     if (showRewardAction) {
-                        Link(PluginBundle.get("reward") + "(wechat)", onClick = {
-                            BrowserUtil.browse(URI.create("https://itbug.shop/static/ds.68eb4cac.jpg"))
-                        })
+                        Box {
+                            Link(PluginBundle.get("reward") + "(WeChat)", onClick = {
+                                showRewardPopup = !showRewardPopup
+                            })
+
+                            if (showRewardPopup) {
+                                Popup(onDismissRequest = { showRewardPopup = false }) {
+                                    Box(
+                                        modifier = Modifier.background(JewelTheme.globalColors.panelBackground)
+                                            .border(1.dp, JewelTheme.globalColors.borders.normal)
+                                            .padding(12.dp)
+                                    ) {
+                                        Icon(
+                                            MyImages.wxDs,
+                                            modifier = Modifier.size(200.dp),
+                                            contentDescription = "微信打赏"
+                                        )
+                                    }
+                                }
+                            }
+                        }
                     }
 
                     if (showRewardAction) {

src/main/kotlin/shop/itbug/flutterx/constance/StringConstance.kt

@@ -1,6 +1,9 @@
 package vm.drift
 
 import com.google.gson.JsonObject
+import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.project.Project
+import com.intellij.testFramework.LightVirtualFile
 
 /**
  * Drift 数据库基础信息
@@ -45,6 +48,33 @@ data class DriftQueryResult(
     val rows: List<DriftRow>
 )
 
+/**
+ * 将查询结果转换为 CSV 字符串
+ */
+fun DriftQueryResult.toCsv(): String {
+    val header = columns.joinToString(",") { "\"${it.replace("\"", "\"\"")}\"" }
+    val dataRows = rows.joinToString("\n") { row ->
+        columns.joinToString(",") { col ->
+            val value = row.data[col]?.toString() ?: ""
+            "\"${value.replace("\"", "\"\"")}\""
+        }
+    }
+    return "$header\n$dataRows"
+}
+
+
+/**
+ * 在编辑器中打开虚拟的 csv文件
+ */
+fun DriftQueryResult.openInEditor(project: Project) {
+    val csvContent = toCsv()
+    val fileName = "Query_Result_${System.currentTimeMillis()}.csv"
+    val virtualFile = LightVirtualFile(fileName, csvContent)
+    FileEditorManager.getInstance(project).openFile(virtualFile, true)
+
+}
+
+
 /**
  * Drift 支持的 SQL 类型
  */
@@ -73,7 +103,7 @@ fun parseDatabaseDescription(id: Int, dbName: String, json: JsonObject): DriftDa
         } ?: emptyList()
         DriftTable(tableName, tableType, columns)
     } ?: emptyList()
-    
+
     return DriftDatabase(id, dbName, dateTimeAsText, tables)
 }
 
@@ -95,9 +125,19 @@ enum class DriftFilterOperator(val label: String, val sql: String) {
 /**
  * 筛选条件
  */
+
 data class DriftFilter(
     val columnName: String,
     val columnType: String,
     val operator: DriftFilterOperator,
     val value: String
 )
+
+/**
+ * 排序条件
+ */
+data class DriftOrderBy(
+    val columnName: String,
+    val isAscending: Boolean = true
+)
+

src/main/kotlin/shop/itbug/flutterx/window/vm/DriftComposeComponent.kt

@@ -38,6 +38,7 @@ data class DriftState(
     val logs: List<String> = emptyList(),
     val selectedColumns: Set<String> = emptySet(),
     val filters: List<DriftFilter> = emptyList(),
+    val orderBy: List<DriftOrderBy> = emptyList(),
     val limit: Int = 100
 )
 
@@ -136,7 +137,8 @@ class DriftServices(val vmService: VmService) : CoroutineScope, VmServiceListene
             selectedTable = null,
             queryResult = null,
             selectedColumns = emptySet(),
-            filters = emptyList()
+            filters = emptyList(),
+            orderBy = emptyList()
         )
     }
 
@@ -147,7 +149,8 @@ class DriftServices(val vmService: VmService) : CoroutineScope, VmServiceListene
         _state.value = _state.value.copy(
             selectedTable = table,
             selectedColumns = table.columns.map { it.name }.toSet(),
-            filters = emptyList()
+            filters = emptyList(),
+            orderBy = emptyList()
         )
         executeSelect(table.name)
     }
@@ -185,6 +188,12 @@ class DriftServices(val vmService: VmService) : CoroutineScope, VmServiceListene
                 sql += " WHERE ${whereClauses.joinToString(" AND ")}"
             }
         }
+
+        val orderBy = _state.value.orderBy
+        if (orderBy.isNotEmpty()) {
+            val orderClauses = orderBy.joinToString(", ") { "${it.columnName} ${if (it.isAscending) "ASC" else "DESC"}" }
+            sql += " ORDER BY $orderClauses"
+        }
 
         if (limit > 0) sql += " LIMIT $limit"
 
@@ -233,6 +242,29 @@ class DriftServices(val vmService: VmService) : CoroutineScope, VmServiceListene
         applyFilters()
     }
 
+    /**
+     * 切换排序
+     */
+    fun toggleOrderBy(columnName: String) {
+        val current = _state.value.orderBy
+        val existing = current.find { it.columnName == columnName }
+        val next = when {
+            existing == null -> current + DriftOrderBy(columnName, true)
+            existing.isAscending -> current.filter { it.columnName != columnName } + DriftOrderBy(columnName, false)
+            else -> current.filter { it.columnName != columnName }
+        }
+        _state.value = _state.value.copy(orderBy = next)
+        applyFilters()
+    }
+
+    /**
+     * 清空排序
+     */
+    fun clearOrderBy() {
+        _state.value = _state.value.copy(orderBy = emptyList())
+        applyFilters()
+    }
+
     /**
      * 应用筛选并查询
      */