Merge pull request #68 from sjjian/dev_0_6_0

sjjian · web-flow · commit d080e3792fa9 · 2026-02-10T08:56:31.000+08:00
Dev 0 6 0
diff --git a/client/lib/screens/sessions/ai_chat/input_user.dart b/client/lib/screens/sessions/ai_chat/input_user.dart
@@ -333,6 +333,7 @@ class _ModelSelectorWidgetState extends ConsumerState<ModelSelectorWidget> {
             },
           ),
       ],
+      header: OverlayMenuHeader(height: 10, child: SizedBox()), // 顶部空间
       footer: OverlayMenuFooter(
         height: 36,
         child: Padding(
diff --git a/client/lib/screens/sessions/session_operation_bar.dart b/client/lib/screens/sessions/session_operation_bar.dart
@@ -9,10 +9,12 @@ import 'package:client/services/sessions/session_sql_result.dart';
 import 'package:client/services/sessions/session_conn.dart';
 import 'package:client/services/sessions/sessions.dart';
 import 'package:client/widgets/const.dart';
+import 'package:client/widgets/menu.dart';
 import 'package:client/widgets/dialog.dart';
 import 'package:client/widgets/button.dart';
 import 'package:client/widgets/divider.dart';
 import 'package:client/widgets/loading.dart';
+import 'package:client/widgets/tooltip.dart';
 import 'package:flutter/material.dart';
 import 'package:sql_parser/parser.dart';
 import 'package:hugeicons/hugeicons.dart';
@@ -293,78 +295,161 @@ class SchemaBar extends ConsumerStatefulWidget {
 
 class _SchemaBarState extends ConsumerState<SchemaBar> {
   bool isEnter = false;
+  List<String>? _schemas;
+  late final TextEditingController _schemaSearchController;
+
+  @override
+  void initState() {
+    super.initState();
+    _schemaSearchController = TextEditingController();
+  }
+
+  @override
+  void dispose() {
+    _schemaSearchController.dispose();
+    super.dispose();
+  }
+
+  @override
+  void didUpdateWidget(covariant SchemaBar oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.instanceId != widget.instanceId) {
+      _schemas = null;
+      _schemaSearchController.clear();
+    }
+  }
+
+  void _onSchemaSearchChanged() {
+    setState(() {});
+  }
+
+  List<String> _filteredSchemas(List<String> schemas, String searchText) {
+    if (searchText.isEmpty) return schemas;
+    return schemas.where((s) => s.toLowerCase().contains(searchText.toLowerCase())).toList();
+  }
+
+  Future<void> _fetchSchemas() async {
+    if (widget.disable || widget.instanceId == null) return;
+    if (_schemas != null) return;
+    final schemas = await ref.read(instancesServicesProvider.notifier).getSchemas(widget.instanceId!);
+    if (mounted) {
+      setState(() => _schemas = schemas);
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
     final color = (isEnter && !widget.disable)
         ? Theme.of(context).colorScheme.primary // schema 鼠标移入的颜色
         : Theme.of(context).colorScheme.onSurface;
-    return Padding(
+
+    final schemaBarContent = Padding(
       padding: const EdgeInsets.symmetric(horizontal: 5),
       child: MouseRegion(
-        onEnter: (_) {
-          setState(() {
-            isEnter = true;
-          });
-        },
-        onExit: (_) {
-          setState(() {
-            isEnter = false;
-          });
-        },
-        child: GestureDetector(
-          onTapUp: (detail) async {
-            if (widget.disable) {
-              return;
-            }
-            final position = detail.globalPosition;
-            final RenderBox overlay = Overlay.of(context).context.findRenderObject() as RenderBox;
-            final overlayPos = overlay.localToGlobal(Offset.zero);
-
-            List<String>? schemas = await ref.read(instancesServicesProvider.notifier).getSchemas(widget.instanceId!);
-
-            // todo
-            showMenu(
-                context: context,
-                position: RelativeRect.fromLTRB(
-                  position.dx - overlayPos.dx,
-                  position.dy - overlayPos.dy,
-                  position.dx - overlayPos.dx,
-                  position.dy - overlayPos.dy,
-                ),
-                items: schemas.map((schema) {
-                  return PopupMenuItem<String>(
-                      height: 30,
-                      onTap: () async {
-                        await ref.read(sessionConnsServicesProvider.notifier).setCurrentSchema(widget.connId!, schema);
-                      },
-                      child: Text(schema, overflow: TextOverflow.ellipsis));
-                }).toList());
-          },
+        onEnter: (_) => setState(() => isEnter = true),
+        onExit: (_) => setState(() => isEnter = false),
+        child: Listener(
+          onPointerDown: (_) => _fetchSchemas(),
           child: Container(
-              padding: const EdgeInsets.fromLTRB(0, kSpacingTiny, 0, kSpacingTiny),
-              child: Row(
-                children: [
-                  HugeIcon(
-                    icon: HugeIcons.strokeRoundedDatabase,
-                    color: color,
-                    size: kIconSizeSmall,
+            padding: const EdgeInsets.fromLTRB(0, kSpacingTiny, 0, kSpacingTiny),
+            child: Row(
+              children: [
+                HugeIcon(
+                  icon: HugeIcons.strokeRoundedDatabase,
+                  color: color,
+                  size: kIconSizeSmall,
+                ),
+                Container(
+                  padding: const EdgeInsets.only(left: kSpacingTiny),
+                  width: 120,
+                  child: Align(
+                    alignment: Alignment.centerLeft,
+                    child: Text(
+                      widget.currentSchema ?? "",
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(color: color),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+
+    final filteredSchemas = _schemas == null ? null : _filteredSchemas(_schemas!, _schemaSearchController.text);
+
+    final tabs = filteredSchemas == null
+        ? [
+            OverlayMenuItem(
+              height: 36,
+              child: const Center(child: Loading.medium()),
+            ),
+          ]
+        : filteredSchemas.map((schema) {
+            final isSelected = schema == widget.currentSchema;
+            final color = isSelected ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onSurface;
+            return OverlayMenuItem(
+              height: 30,
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: kSpacingSmall),
+                child: Align(
+                  alignment: Alignment.centerLeft,
+                  child: Row(
+                    children: [
+                      HugeIcon(
+                        icon: HugeIcons.strokeRoundedDatabase,
+                        color: color,
+                        size: kIconSizeSmall,
+                      ),
+                      const SizedBox(width: kSpacingTiny),
+                      Expanded(
+                        child: TooltipText(text: schema, style: TextStyle(color: color)),
+                      ),
+                    ],
                   ),
-                  Container(
-                      padding: const EdgeInsets.only(left: kSpacingTiny),
-                      width: 120,
-                      child: Align(
-                          alignment: Alignment.centerLeft,
-                          child: Text(
-                            widget.currentSchema ?? "",
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(color: color),
-                          ))),
-                ],
-              )),
+                ),
+              ),
+              onTabSelected: () async {
+                await ref.read(sessionConnsServicesProvider.notifier).setCurrentSchema(widget.connId!, schema);
+              },
+            );
+          }).toList();
+
+    if (widget.disable) {
+      return schemaBarContent;
+    }
+
+    final header = OverlayMenuHeader(
+      height: 36,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(kSpacingSmall, kSpacingTiny, kSpacingSmall, kSpacingTiny),
+        child: SearchBarTheme(
+          data: SearchBarThemeData(
+            textStyle: WidgetStatePropertyAll(Theme.of(context).textTheme.bodySmall),
+            backgroundColor: WidgetStatePropertyAll(Theme.of(context).colorScheme.surfaceContainer),
+            elevation: const WidgetStatePropertyAll(0),
+            constraints: const BoxConstraints(minHeight: 24),
+          ),
+          child: SearchBar(
+            controller: _schemaSearchController,
+            onChanged: (_) => _onSchemaSearchChanged(),
+            trailing: const [Icon(Icons.search, size: kIconSizeSmall)],
+          ),
         ),
       ),
     );
+
+    return OverlayMenu(
+      spacing: kSpacingTiny,
+      maxHeight: 300,
+      maxWidth: 300,
+      tabs: tabs,
+      header: header,
+      footer: OverlayMenuFooter(height: kSpacingSmall, child: SizedBox()),
+      child: schemaBarContent,
+    );
   }
 }
 
diff --git a/client/lib/services/ai/tool.dart b/client/lib/services/ai/tool.dart
@@ -19,16 +19,23 @@ class QueryTool extends AITool {
   String get name => 'execute_query';
 
   @override
-  String get description =>
-      '在当前选中的数据库连接上执行 SQL 查询。输入 SQL 语句，返回查询结果（包括列信息和数据行）。只能执行 SELECT 查询，不能执行 INSERT、UPDATE、DELETE 等修改数据的操作。';
+  String get description => '''
+Execute a SQL query on the currently selected database connection.
+
+Accepts a SQL statement and returns the query result (including column metadata and rows).
+
+Only SELECT queries are allowed; do not use this tool for INSERT, UPDATE, DELETE, or other data-modifying operations.
+
+The result will include at most the first 100 rows.
+''';
 
   @override
   Map<String, dynamic> get inputJsonSchema => {
         'type': 'object',
         'properties': {
           'query': {
             'type': 'string',
-            'description': '要执行的 SQL 查询语句，例如：SELECT * FROM users LIMIT 10',
+            'description': 'The SQL query string to execute, for example: SELECT * FROM users LIMIT 10',
           },
         },
         'required': ['query'],
diff --git a/client/lib/widgets/menu.dart b/client/lib/widgets/menu.dart
@@ -73,7 +73,7 @@ class _OverlayMenuState extends State<OverlayMenu> {
         borderRadius: BorderRadius.circular(12),
         boxShadow: [
           BoxShadow(
-            color: Theme.of(context).colorScheme.surfaceContainerHigh,
+            color: Theme.of(context).colorScheme.surfaceContainerHighest,
             blurRadius: 10,
             offset: const Offset(0, 2),
           ),
diff --git a/pkg/db_driver/lib/src/db_driver_mysql.dart b/pkg/db_driver/lib/src/db_driver_mysql.dart
@@ -332,7 +332,7 @@ ORDER BY
 
   @override
   Future<void> setCurrentSchema(String schema) async {
-    await query("USE $schema");
+    await query("USE `$schema`");
     final currentSchema = await getCurrentSchema();
     onSchemaChanged(currentSchema!);
   }
diff --git a/pkg/db_driver/lib/src/db_driver_pg.dart b/pkg/db_driver/lib/src/db_driver_pg.dart
@@ -307,7 +307,9 @@ ORDER BY
 
   @override
   Future<void> setCurrentSchema(String schema) async {
-    await query("SET search_path TO $schema");
+    // 使用字符串字面量设置 search_path，避免空格等字符导致语法错误
+    final escaped = schema.replaceAll("'", "''");
+    await query("SET search_path TO '$escaped'");
     final currentSchema = await getCurrentSchema();
     onSchemaChanged(currentSchema!);
     return;

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ ORDER BY`
`332`	`332`
`333`	`333`	`@override`
`334`	`334`	`Future<void> setCurrentSchema(String schema) async {`
`335`		`- await query("USE $schema");`
	`335`	+ await query("USE `$schema`");
`336`	`336`	`final currentSchema = await getCurrentSchema();`
`337`	`337`	`onSchemaChanged(currentSchema!);`
`338`	`338`	`}`