feat: 数据视图与报表自定义SQL数据集增加辅助SQL生成(表/视图/存储过程浏览)+SQL测试(参数绑定/前100行/单表中文注释)+字段中文对照自动生成(字段=中文注释)+共享组件复用

Co-Authored-By: Claude Code <noreply@anthropic.com>

Author: pythonHuang

Juggle.Api/Controllers/Api/DataViewController.cs

@@ -16,10 +16,11 @@ public class DataViewController : ControllerBase
 {
     private readonly JuggleDbContext _db;
     private readonly ReportExecutionService _reportExec;
+    private readonly DataSourceService _dsService;
 
-    public DataViewController(JuggleDbContext db, ReportExecutionService reportExec)
+    public DataViewController(JuggleDbContext db, ReportExecutionService reportExec, DataSourceService dsService)
     {
-        _db = db; _reportExec = reportExec;
+        _db = db; _reportExec = reportExec; _dsService = dsService;
     }
 
     [HttpPost("page")]
@@ -49,7 +50,8 @@ public async Task<ApiResult> Update([FromBody] DataViewEntity entity)
         if (dv == null) return ApiResult.Fail("数据视图不存在");
         dv.Name = entity.Name; dv.GroupName = entity.GroupName;
         dv.DataSourceId = entity.DataSourceId; dv.Sql = entity.Sql;
-        dv.Parameters = entity.Parameters; dv.Remark = entity.Remark;
+        dv.Parameters = entity.Parameters; dv.ColumnMapping = entity.ColumnMapping;
+        dv.Remark = entity.Remark;
         dv.Status = entity.Status;
         dv.UpdatedAt = DateTime.Now.ToString("o");
         await _db.SaveChangesAsync();
@@ -96,6 +98,67 @@ public async Task<ApiResult> Preview([FromBody] DataViewPreviewRequest req)
         }
         catch (Exception ex) { return ApiResult.Fail(ex.Message); }
     }
+
+    /// <summary>
+    /// 单独测试 SQL（与数据库节点类似）：参数绑定执行，返回前 100 行预览；
+    /// 单表查询时列附带中文注释。
+    /// </summary>
+    [HttpPost("test-sql")]
+    public async Task<ApiResult> TestSql([FromBody] DataViewTestSqlRequest req)
+    {
+        try
+        {
+            var (dt, total) = await _reportExec.ExecuteQueryLimitedAsync(req.DataSourceId, req.Sql ?? "", req.Params, 100);
+
+            var colNames = dt.Columns.Cast<System.Data.DataColumn>().Select(c => c.ColumnName).ToList();
+            var columns = new List<DbResultColumn>();
+
+            // 单表查询（无 JOIN 且能解析出表名）时附带中文注释
+            var tableMatch = System.Text.RegularExpressions.Regex.Match(req.Sql ?? "", @"\bfrom\s+([A-Za-z0-9_\.]+)", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+            var hasJoin = System.Text.RegularExpressions.Regex.IsMatch(req.Sql ?? "", @"\bjoin\b", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+            if (tableMatch.Success && !hasJoin)
+            {
+                try
+                {
+                    var ds = await _db.DataSources.FindAsync(req.DataSourceId);
+                    if (ds?.DsName != null)
+                    {
+                        var meta = await _dsService.GetColumnsAsync(ds.DsName, tableMatch.Groups[1].Value);
+                        var commentMap = meta.ToDictionary(c => c.Name, c => c.Comment, StringComparer.OrdinalIgnoreCase);
+                        foreach (var name in colNames)
+                            columns.Add(new DbResultColumn
+                            {
+                                Name    = name,
+                                Comment = commentMap.TryGetValue(name, out var comment) ? comment : ""
+                            });
+                        return BuildTestResult(columns, dt, total);
+                    }
+                }
+                catch { /* 注释获取失败不影响测试结果 */ }
+            }
+
+            foreach (var name in colNames)
+                columns.Add(new DbResultColumn { Name = name });
+            return BuildTestResult(columns, dt, total);
+        }
+        catch (Exception ex)
+        {
+            return ApiResult.Fail(ex.Message);
+        }
+    }
+
+    private static ApiResult BuildTestResult(List<DbResultColumn> columns, System.Data.DataTable dt, int total)
+    {
+        var rows = new List<Dictionary<string, object?>>();
+        foreach (System.Data.DataRow row in dt.Rows)
+        {
+            var dict = new Dictionary<string, object?>();
+            foreach (System.Data.DataColumn col in dt.Columns)
+                dict[col.ColumnName] = row[col];
+            rows.Add(dict);
+        }
+        return ApiResult.Success(new { columns, rows, rowCount = total, truncated = total > 100 });
+    }
 }
 
 public class DataViewPreviewRequest
@@ -105,3 +168,10 @@ public class DataViewPreviewRequest
     public string? Sql { get; set; }
     public Dictionary<string, object?>? Params { get; set; }
 }
+
+public class DataViewTestSqlRequest
+{
+    public long DataSourceId { get; set; }
+    public string? Sql { get; set; }
+    public Dictionary<string, object?>? Params { get; set; }
+}

Juggle.Api/Program.cs

@@ -244,6 +244,8 @@ await ctx.Response.WriteAsync(
         // 报表模块表
         try { db.Database.ExecuteSqlRaw("CREATE TABLE IF NOT EXISTS t_data_view(id INTEGER PRIMARY KEY AUTOINCREMENT, group_name TEXT, name TEXT, data_source_id INTEGER, sql TEXT, parameters TEXT, remark TEXT, status INTEGER DEFAULT 1, created_at TEXT, created_by INTEGER, updated_at TEXT, updated_by INTEGER, tenant_id INTEGER, deleted INTEGER DEFAULT 0);"); } catch { }
         try { db.Database.ExecuteSqlRaw("CREATE TABLE IF NOT EXISTS t_report(id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, group_name TEXT, source_type TEXT, source_ref TEXT, custom_sql TEXT, params_config TEXT, layout_json TEXT, status INTEGER DEFAULT 1, created_at TEXT, created_by INTEGER, updated_at TEXT, updated_by INTEGER, tenant_id INTEGER, deleted INTEGER DEFAULT 0);"); } catch { }
+        // 数据视图字段中文对照
+        try { db.Database.ExecuteSqlRaw("ALTER TABLE t_data_view ADD COLUMN column_mapping TEXT DEFAULT NULL;"); } catch { }
         // 补建参数位置字段
         try { db.Database.ExecuteSqlRaw("ALTER TABLE t_parameter ADD COLUMN param_position TEXT DEFAULT NULL;"); } catch { }
     }

Juggle.Application/Services/Impl/ReportExecutionService.cs

@@ -18,6 +18,13 @@ public class ReportExecutionService
 
     /// <summary>执行数据源的SQL查询返回DataTable</summary>
     public async Task<DataTable> ExecuteQuery(long dataSourceId, string sql, Dictionary<string, object?>? parameters = null)
+        => (await ExecuteQueryInternal(dataSourceId, sql, parameters, 0)).Table;
+
+    /// <summary>执行查询并限制返回行数（SQL 测试用），通过 Total 返回总行数</summary>
+    public async Task<(DataTable Table, int Total)> ExecuteQueryLimitedAsync(long dataSourceId, string sql, Dictionary<string, object?>? parameters, int maxRows)
+        => await ExecuteQueryInternal(dataSourceId, sql, parameters, maxRows);
+
+    private async Task<(DataTable Table, int Total)> ExecuteQueryInternal(long dataSourceId, string sql, Dictionary<string, object?>? parameters, int maxRows)
     {
         ValidateSql(sql);
         var ds = await _db.DataSources.FindAsync(dataSourceId)
@@ -34,8 +41,25 @@ public async Task<DataTable> ExecuteQuery(long dataSourceId, string sql, Diction
 
         var dt = new DataTable();
         using var reader = cmd.ExecuteReader();
-        dt.Load(reader);
-        return dt;
+        if (maxRows <= 0)
+        {
+            dt.Load(reader);
+            return (dt, dt.Rows.Count);
+        }
+
+        // 受限读取：统计总行数，只保留前 maxRows 行
+        for (int i = 0; i < reader.FieldCount; i++)
+            dt.Columns.Add(reader.GetName(i), reader.GetFieldType(i) ?? typeof(object));
+        var values = new object[reader.FieldCount];
+        var total = 0;
+        while (reader.Read())
+        {
+            total++;
+            if (dt.Rows.Count >= maxRows) continue;
+            reader.GetValues(values);
+            dt.Rows.Add(values.Select(v => v == DBNull.Value ? (object?)null : v).ToArray());
+        }
+        return (dt, total);
     }
 
     /// <summary>SQL 安全校验：禁止写操作关键字</summary>

Juggle.Domain/Entities/DataViewEntity.cs

@@ -7,6 +7,10 @@ public class DataViewEntity : BaseEntity
     public long DataSourceId { get; set; }
     public string? Sql { get; set; }
     public string? Parameters { get; set; } // JSON: [{name,type,default,label}]
+
+    /// <summary>SQL 字段中文对照（多行文本，每行一条：字段=中文注释）</summary>
+    public string? ColumnMapping { get; set; }
+
     public string? Remark { get; set; }
     public int Status { get; set; } = 1;
 }

Juggle.Infrastructure/Persistence/JuggleDbContext.cs

@@ -104,6 +104,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             e.Property(p => p.DataSourceId).HasColumnName("data_source_id");
             e.Property(p => p.Sql).HasColumnName("sql");
             e.Property(p => p.Parameters).HasColumnName("parameters");
+            e.Property(p => p.ColumnMapping).HasColumnName("column_mapping");
             e.Property(p => p.Remark).HasColumnName("remark");
             e.Property(p => p.Status).HasColumnName("status");
         });

JuggleNet6.Frontend/src/components/DbObjectBrowser.vue

@@ -0,0 +1,207 @@
+<template>
+  <el-dialog :model-value="visible" @update:model-value="onVisibleChange" title="🗄 数据库对象（辅助生成 SQL）" width="1000px" append-to-body>
+    <div style="display:flex;gap:10px">
+      <div style="flex:1;min-width:0">
+        <el-radio-group v-model="tab" size="small" @change="onTabChange">
+          <el-radio-button value="tables">表 ({{ tables.length }})</el-radio-button>
+          <el-radio-button value="views">视图 ({{ views.length }})</el-radio-button>
+          <el-radio-button value="procedures">存储过程 ({{ procedures.length }})</el-radio-button>
+        </el-radio-group>
+        <el-input v-model="search" placeholder="搜索名称" size="small" clearable style="margin:8px 0" />
+        <div class="db-object-list" v-loading="loading">
+          <div v-for="obj in filteredObjects" :key="obj.name" class="db-object-item"
+            :class="{ active: selectedObject === obj.name }" @click="selectObject(obj.name)">
+            <span class="db-object-name">{{ obj.name }}</span>
+            <el-button size="small" link type="primary" @click.stop="generateFromObject(obj)">生成SQL</el-button>
+          </div>
+          <el-empty v-if="!loading && filteredObjects.length === 0" description="暂无对象" :image-size="40" />
+        </div>
+      </div>
+      <div style="width:480px;flex-shrink:0">
+        <div class="prop-section-title" style="margin-top:0">
+          {{ tab === 'procedures' ? '参数列表' : '字段列表' }}
+          <span v-if="selectedObject" style="font-size:11px;color:#909399;font-weight:normal;margin-left:6px">{{ selectedObject }}</span>
+          <el-button v-if="tab === 'procedures'" size="small" icon="VideoPlay" type="primary" link @click="generateCallFromSelected" style="margin-left:auto">生成调用语句</el-button>
+        </div>
+
+        <!-- 表：字段名称/中文注释/类型/默认值/是否必填 -->
+        <el-table v-if="tab === 'tables'" :data="columns" size="small" border max-height="380" v-loading="panelLoading">
+          <el-table-column prop="name" label="字段名称" min-width="120" show-overflow-tooltip />
+          <el-table-column prop="comment" label="中文注释" min-width="110" show-overflow-tooltip>
+            <template #default="{ row }"><span style="color:#606266">{{ row.comment || '—' }}</span></template>
+          </el-table-column>
+          <el-table-column prop="dataType" label="类型" width="110" show-overflow-tooltip />
+          <el-table-column prop="defaultValue" label="默认值" width="90" show-overflow-tooltip>
+            <template #default="{ row }"><span style="color:#909399">{{ row.defaultValue ?? '—' }}</span></template>
+          </el-table-column>
+          <el-table-column label="必填" width="60" align="center">
+            <template #default="{ row }"><el-tag size="small" :type="row.isNullable === false ? 'danger' : 'info'">{{ row.isNullable === false ? '是' : '否' }}</el-tag></template>
+          </el-table-column>
+        </el-table>
+
+        <!-- 视图：字段名称/中文注释/类型 -->
+        <el-table v-else-if="tab === 'views'" :data="columns" size="small" border max-height="380" v-loading="panelLoading">
+          <el-table-column prop="name" label="字段名称" min-width="140" show-overflow-tooltip />
+          <el-table-column prop="comment" label="中文注释" min-width="140" show-overflow-tooltip>
+            <template #default="{ row }"><span style="color:#606266">{{ row.comment || '—' }}</span></template>
+          </el-table-column>
+          <el-table-column prop="dataType" label="类型" width="130" show-overflow-tooltip />
+        </el-table>
+
+        <!-- 存储过程：参数列表（当前值可编辑） -->
+        <el-table v-else :data="procParams" size="small" border max-height="380" v-loading="panelLoading">
+          <el-table-column prop="name" label="参数名" min-width="110" show-overflow-tooltip />
+          <el-table-column prop="dataType" label="参数类型" width="100" show-overflow-tooltip />
+          <el-table-column prop="mode" label="模式" width="70" align="center">
+            <template #default="{ row }"><el-tag size="small" :type="(row.mode || 'IN').toUpperCase().includes('OUT') ? 'warning' : 'primary'">{{ row.mode || 'IN' }}</el-tag></template>
+          </el-table-column>
+          <el-table-column prop="defaultValue" label="默认值" width="80" show-overflow-tooltip>
+            <template #default="{ row }"><span style="color:#909399">{{ row.defaultValue ?? '—' }}</span></template>
+          </el-table-column>
+          <el-table-column label="当前值" min-width="140">
+            <template #default="{ row }">
+              <el-input v-model="row.currentValue" size="small" placeholder="如: 1 或 '张三'" :disabled="(row.mode || '').toUpperCase().includes('OUT')" />
+            </template>
+          </el-table-column>
+        </el-table>
+        <div v-if="tab === 'procedures'" class="ch-note" style="margin-top:6px">
+          当前值填实参值（字符串请带引号），留空生成 NULL；OUT/INOUT 参数不参与调用。
+        </div>
+        <el-empty v-if="tab !== 'procedures' && !panelLoading && columns.length === 0"
+          description="点击左侧表/视图查看字段" :image-size="40" />
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import request from '../utils/request'
+
+const props = defineProps<{
+  visible: boolean
+  dataSourceName: string
+  dataSourceType: string
+}>()
+const emit = defineEmits<{ (e: 'update:visible', v: boolean): void; (e: 'generated', sql: string): void }>()
+
+function onVisibleChange(v: boolean) { emit('update:visible', v) }
+
+const tab = ref('tables')
+const search = ref('')
+const loading = ref(false)
+const panelLoading = ref(false)
+const tables = ref<any[]>([])
+const views = ref<any[]>([])
+const procedures = ref<any[]>([])
+const selectedObject = ref('')
+const columns = ref<any[]>([])
+const procParams = ref<any[]>([])
+
+const filteredObjects = computed(() => {
+  const list = tab.value === 'tables' ? tables.value : tab.value === 'views' ? views.value : procedures.value
+  const kw = search.value.trim().toLowerCase()
+  return kw ? list.filter((o: any) => (o.name || '').toLowerCase().includes(kw)) : list
+})
+
+watch(() => props.visible, async v => {
+  if (!v) return
+  tab.value = 'tables'
+  search.value = ''
+  selectedObject.value = ''
+  columns.value = []
+  procParams.value = []
+  tables.value = []; views.value = []; procedures.value = []
+  loading.value = true
+  try {
+    const res: any = await request.post('/system/datasource/metadata', { dataSourceName: props.dataSourceName })
+    tables.value = res.data?.tables || []
+    views.value = res.data?.views || []
+    procedures.value = res.data?.procedures || []
+  } catch { /* 拦截器已提示 */ } finally { loading.value = false }
+})
+
+function onTabChange() {
+  selectedObject.value = ''
+  columns.value = []
+  procParams.value = []
+}
+
+async function selectObject(name: string) {
+  selectedObject.value = name
+  if (tab.value === 'procedures') { await loadProcParams(name); return }
+  await loadColumns(name)
+}
+
+async function loadColumns(name: string) {
+  panelLoading.value = true
+  columns.value = []
+  try {
+    const res: any = await request.post('/system/datasource/columns', {
+      dataSourceName: props.dataSourceName, tableName: name
+    })
+    columns.value = res.data || []
+  } catch { columns.value = [] } finally { panelLoading.value = false }
+}
+
+async function loadProcParams(name: string) {
+  panelLoading.value = true
+  procParams.value = []
+  try {
+    const res: any = await request.post('/system/datasource/procedure-params', {
+      dataSourceName: props.dataSourceName, procName: name
+    })
+    procParams.value = (res.data || []).map((p: any) => ({ ...p, currentValue: p.defaultValue || '' }))
+  } catch { procParams.value = [] } finally { panelLoading.value = false }
+}
+
+function generateCallFromSelected() {
+  const proc = procedures.value.find((p: any) => p.name === selectedObject.value)
+  if (!proc) { ElMessage.warning('请先在左侧选择存储过程'); return }
+  generateFromObject(proc)
+}
+
+async function generateFromObject(obj: any) {
+  selectedObject.value = obj.name
+  const dsType = (props.dataSourceType || 'mysql').toLowerCase()
+  let sql = ''
+  if (tab.value === 'procedures') {
+    if (!procParams.value.length) await loadProcParams(obj.name)
+    const args = procParams.value
+      .filter((p: any) => !(p.mode || '').toUpperCase().includes('OUT'))
+      .map((p: any) => formatCallArg(p.currentValue))
+    sql = dsType === 'sqlserver' || dsType === 'mssql' ? `EXEC ${obj.name} ${args.join(', ')}`
+      : dsType === 'oracle' || dsType === 'dm' ? `BEGIN ${obj.name}(${args.join(', ')}); END;`
+      : `CALL ${obj.name}(${args.join(', ')})`
+  } else {
+    await loadColumns(obj.name)
+    const cols = columns.value.length ? columns.value.map((c: any) => c.name).join(', ') : '*'
+    const from = `FROM ${obj.name}`
+    if (dsType === 'sqlserver' || dsType === 'mssql') sql = `SELECT TOP 100 ${cols}\n${from}`
+    else if (dsType === 'oracle' || dsType === 'dm') sql = `SELECT ${cols}\n${from}\nWHERE ROWNUM <= 100`
+    else sql = `SELECT ${cols}\n${from}\nLIMIT 100`
+  }
+  emit('generated', sql)
+  emit('update:visible', false)
+  ElMessage.success('已生成 SQL')
+}
+
+function formatCallArg(v: string): string {
+  const val = (v || '').trim()
+  if (!val) return 'NULL'
+  if (/^-?\d+(\.\d+)?$/.test(val) || val.toUpperCase() === 'NULL') return val
+  return "'" + val.replace(/'/g, "''") + "'"
+}
+</script>
+
+<style scoped>
+.db-object-list { max-height: 400px; overflow-y: auto; border: 1px solid #e4e7ed; border-radius: 6px; }
+.db-object-item { display: flex; align-items: center; justify-content: space-between; padding: 6px 10px; cursor: pointer; border-bottom: 1px solid #f0f2f5; }
+.db-object-item:last-child { border-bottom: none; }
+.db-object-item:hover { background: #f5f7fa; }
+.db-object-item.active { background: #ecf5ff; }
+.db-object-name { font-size: 13px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.ch-note { color: #909399; font-size: 12px; }
+.prop-section-title { font-weight: 600; margin: 12px 0 4px; color: #303133; display: flex; align-items: center; }
+</style>