feat: 市场收藏功能-收藏/取消收藏市场条目(租户级t_market_favorite表),列表显示收藏星标,支持只看收藏过滤,市场条目与收藏表接入多租户全局过滤器

Author: pythonHuang

Juggle.Api/Controllers/Api/MarketController.cs

@@ -192,20 +192,60 @@ public async Task<ApiResult> ImportFile([FromBody] MarketImportFileRequest req)
         }
     }
 
-    /// <summary>市场列表（平台级条目 + 我的条目），可按类型筛选</summary>
+    /// <summary>市场列表（平台级条目 + 我的条目），可按类型筛选，favorite=1 只看收藏</summary>
     [HttpGet("list")]
-    public async Task<ApiResult> List([FromQuery] string? type)
+    public async Task<ApiResult> List([FromQuery] string? type, [FromQuery] int favorite = 0)
     {
+        var tid = _tenant.TenantId;
         var query = _db.MarketItems.Where(m => m.Deleted == 0 && m.Enabled == 1);
         if (!string.IsNullOrWhiteSpace(type)) query = query.Where(m => m.ItemType == type);
+
+        var favIds = (await _db.MarketFavorites
+            .Where(f => f.Deleted == 0 && f.TenantId == tid)
+            .Select(f => f.MarketItemId)
+            .ToListAsync()).ToHashSet();
+        if (favorite == 1)
+            query = query.Where(m => favIds.Contains(m.Id));
+
         var items = await query.OrderByDescending(m => m.DownloadCount).ThenByDescending(m => m.Id).ToListAsync();
         return ApiResult.Success(items.Select(m => new
         {
             m.Id, m.ItemType, m.ItemName, m.Description, m.GroupName, m.DownloadCount,
-            m.MarketItemId, m.Icon, m.Author, m.Version, m.UpdatedAt, m.ContentJson
+            m.MarketItemId, m.Icon, m.Author, m.Version, m.UpdatedAt, m.ContentJson,
+            favorited = favIds.Contains(m.Id)
         }));
     }
 
+    /// <summary>收藏市场条目（幂等）。</summary>
+    [HttpPost("favorite/{id}")]
+    public async Task<ApiResult> Favorite(long id)
+    {
+        var tid = _tenant.TenantId;
+        var exists = await _db.MarketFavorites.AnyAsync(f => f.MarketItemId == id && f.TenantId == tid && f.Deleted == 0);
+        if (exists) return ApiResult.Success(true);
+        _db.MarketFavorites.Add(new MarketFavoriteEntity
+        {
+            MarketItemId = id,
+            TenantId = tid,
+            CreatedBy = tid,
+            CreatedAt = DateTime.Now.ToString("o")
+        });
+        await _db.SaveChangesAsync();
+        return ApiResult.Success(true);
+    }
+
+    /// <summary>取消收藏市场条目。</summary>
+    [HttpPost("unfavorite/{id}")]
+    public async Task<ApiResult> Unfavorite(long id)
+    {
+        var tid = _tenant.TenantId;
+        var fav = await _db.MarketFavorites.FirstOrDefaultAsync(f => f.MarketItemId == id && f.TenantId == tid && f.Deleted == 0);
+        if (fav == null) return ApiResult.Success(false);
+        fav.Deleted = 1;
+        await _db.SaveChangesAsync();
+        return ApiResult.Success(false);
+    }
+
     /// <summary>我发布的市场条目（管理/下架）</summary>
     [HttpGet("my-list")]
     public async Task<ApiResult> MyList([FromQuery] string? type)

Juggle.Api/Program.cs

@@ -267,6 +267,8 @@ await ctx.Response.WriteAsync(
         try { db.Database.ExecuteSqlRaw("ALTER TABLE t_market_item ADD COLUMN icon TEXT DEFAULT NULL;"); } catch { }
         try { db.Database.ExecuteSqlRaw("ALTER TABLE t_market_item ADD COLUMN author TEXT DEFAULT NULL;"); } catch { }
         try { db.Database.ExecuteSqlRaw("ALTER TABLE t_market_item ADD COLUMN version TEXT DEFAULT NULL;"); } catch { }
+        // 市场收藏表
+        try { db.Database.ExecuteSqlRaw("CREATE TABLE IF NOT EXISTS t_market_favorite(id INTEGER PRIMARY KEY AUTOINCREMENT, market_item_id INTEGER, created_at TEXT, created_by INTEGER, updated_at TEXT, updated_by INTEGER, tenant_id INTEGER, deleted INTEGER DEFAULT 0);"); } catch { }
         // AI 供应商能力字段
         try { db.Database.ExecuteSqlRaw("ALTER TABLE t_ai_provider ADD COLUMN capabilities TEXT DEFAULT NULL;"); } catch { }
         // 知识库 4 表

Juggle.Domain/Entities/MarketFavoriteEntity.cs

@@ -0,0 +1,10 @@
+namespace Juggle.Domain.Entities;
+
+/// <summary>
+/// 市场收藏：租户对市场条目的收藏记录（支持过滤是否收藏）。
+/// </summary>
+public class MarketFavoriteEntity : BaseEntity
+{
+    /// <summary>市场条目 ID（t_market_item.id）</summary>
+    public long MarketItemId { get; set; }
+}

Juggle.Infrastructure/Persistence/JuggleDbContext.cs

@@ -68,6 +68,7 @@ public JuggleDbContext(DbContextOptions<JuggleDbContext> options, ICurrentTenant
     public DbSet<RedisConfigEntity> RedisConfigs { get; set; } = null!;
     public DbSet<SkillEntity> Skills { get; set; } = null!;
     public DbSet<MarketItemEntity> MarketItems { get; set; } = null!;
+    public DbSet<MarketFavoriteEntity> MarketFavorites { get; set; } = null!;
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
@@ -271,6 +272,17 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             e.Property(p => p.Author).HasColumnName("author");
             e.Property(p => p.Version).HasColumnName("version");
         });
+        modelBuilder.Entity<MarketFavoriteEntity>().ToTable("t_market_favorite");
+        modelBuilder.Entity<MarketFavoriteEntity>(e => {
+            e.Property(p => p.Id).HasColumnName("id");
+            e.Property(p => p.Deleted).HasColumnName("deleted");
+            e.Property(p => p.CreatedAt).HasColumnName("created_at");
+            e.Property(p => p.CreatedBy).HasColumnName("created_by");
+            e.Property(p => p.UpdatedAt).HasColumnName("updated_at");
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by");
+            e.Property(p => p.TenantId).HasColumnName("tenant_id");
+            e.Property(p => p.MarketItemId).HasColumnName("market_item_id");
+        });
         modelBuilder.Entity<AlertRuleEntity>().ToTable("t_alert_rule");
         modelBuilder.Entity<AlertRecordEntity>().ToTable("t_alert_record");
         modelBuilder.Entity<DataViewEntity>().ToTable("t_data_view");
@@ -811,5 +823,9 @@ void AddTenantIdCol<T>() where T : BaseEntity
         modelBuilder.Entity<SuiteEntity>().HasQueryFilter(e => CurrentTenantId == null || e.TenantId == null || e.TenantId == CurrentTenantId);
         modelBuilder.Entity<ApiEntity>().HasQueryFilter(e => CurrentTenantId == null || e.TenantId == null || e.TenantId == CurrentTenantId);
         modelBuilder.Entity<ParameterEntity>().HasQueryFilter(e => CurrentTenantId == null || e.TenantId == null || e.TenantId == CurrentTenantId);
+
+        // 市场条目/收藏：平台级共享 + 租户级收藏
+        modelBuilder.Entity<MarketItemEntity>().HasQueryFilter(e => CurrentTenantId == null || e.TenantId == null || e.TenantId == CurrentTenantId);
+        modelBuilder.Entity<MarketFavoriteEntity>().HasQueryFilter(e => CurrentTenantId == null || e.TenantId == CurrentTenantId);
     }
 }

JuggleNet6.Frontend/src/views/market/MarketList.vue

@@ -15,7 +15,10 @@
         <el-tab-pane label="Skills 市场" name="skill" />
         <el-tab-pane label="报表市场" name="report" />
       </el-tabs>
-      <el-input v-model="keyword" placeholder="搜索名称/描述" size="small" style="width:220px;margin-bottom:12px" clearable />
+      <div style="display:flex;gap:16px;align-items:center;margin-bottom:12px">
+        <el-input v-model="keyword" placeholder="搜索名称/描述" size="small" style="width:220px" clearable />
+        <el-checkbox v-model="onlyFavorite" size="small" @change="loadData">⭐ 只看收藏</el-checkbox>
+      </div>
       <el-table :data="filteredList" v-loading="loading">
         <el-table-column label="名称" width="240" show-overflow-tooltip>
           <template #default="{ row }"><span style="margin-right:4px">{{ row.icon || '📦' }}</span>{{ row.itemName }}</template>
@@ -26,6 +29,13 @@
         <el-table-column prop="updatedAt" label="更新日期" width="110" />
         <el-table-column prop="description" label="描述" min-width="220" show-overflow-tooltip />
         <el-table-column prop="downloadCount" label="下载" width="70" align="center" />
+        <el-table-column label="收藏" width="70" align="center">
+          <template #default="{ row }">
+            <el-button size="small" link :loading="favoritingId === row.id" @click="toggleFavorite(row)">
+              <span :style="`font-size:16px;color:${row.favorited ? '#f7ba2a' : '#c0c4cc'}`">{{ row.favorited ? '★' : '☆' }}</span>
+            </el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="140" fixed="right">
           <template #default="{ row }">
             <el-button size="small" type="primary" link :loading="importingId === row.id" @click="doImport(row)">直接应用</el-button>
@@ -87,8 +97,10 @@ import request from '../../utils/request'
 const loading = ref(false)
 const activeTab = ref('api')
 const keyword = ref('')
+const onlyFavorite = ref(false)
 const tableData = ref<any[]>([])
 const importingId = ref<number | null>(null)
+const favoritingId = ref<number | null>(null)
 
 // ====== 发现官方市场 ======
 const discoverVisible = ref(false)
@@ -116,11 +128,25 @@ onMounted(loadData)
 async function loadData() {
   loading.value = true
   try {
-    const res: any = await request.get('/market/list', { params: { type: activeTab.value } })
+    const res: any = await request.get('/market/list', { params: { type: activeTab.value, favorite: onlyFavorite.value ? 1 : 0 } })
     tableData.value = res.data || []
   } finally { loading.value = false }
 }
 
+async function toggleFavorite(row: any) {
+  favoritingId.value = row.id
+  try {
+    const res: any = await request.post(row.favorited ? `/market/unfavorite/${row.id}` : `/market/favorite/${row.id}`)
+    row.favorited = res.data
+    if (onlyFavorite.value && !row.favorited) {
+      tableData.value = tableData.value.filter((r: any) => r.id !== row.id)
+    }
+    ElMessage.success(row.favorited ? '已收藏' : '已取消收藏')
+  } catch (e: any) {
+    ElMessage.error(e?.message || '操作失败')
+  } finally { favoritingId.value = null }
+}
+
 async function doImport(row: any) {
   importingId.value = row.id
   try {