feat: 新增标签模块

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Discuss/DiscussCreateInputVo.cs

@@ -31,5 +31,10 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.Discuss
         /// 是否禁止评论创建功能
         /// </summary>
         public bool IsDisableCreateComment { get; set; }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public HashSet<Guid>? DiscussLables { get; set; }
     }
 }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/MyType/DiscussLableCreateInputVo.cs

@@ -3,7 +3,7 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.MyType
     /// <summary>
     /// Label输入创建对象
     /// </summary>
-    public class MyTypeCreateInputVo
+    public class DiscussLableCreateInputVo
     {
         public string Name { get; set; }
         public string? Color { get; set; }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/MyType/DiscussLableGetListInputVo.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Application.Dtos;
+
+namespace Yi.Framework.Bbs.Application.Contracts.Dtos.MyType
+{
+    public class DiscussLableGetListInputVo : PagedAndSortedResultRequestDto
+    {
+        public string? Name { get; set; }
+    }
+}

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/MyType/DiscussLableGetListOutputDto.cs

@@ -2,11 +2,10 @@ using Volo.Abp.Application.Dtos;
 
 namespace Yi.Framework.Bbs.Application.Contracts.Dtos.MyType
 {
-    public class MyTypeGetListOutputDto : EntityDto<Guid>
+    public class DiscussLableGetListOutputDto : EntityDto<Guid>
     {
         public string Name { get; set; }
         public string? Color { get; set; }
         public string? BackgroundColor { get; set; }
-        public Guid UserId { get; set; }
     }
 }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/MyType/DiscussLableOutputDto.cs

@@ -2,7 +2,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Yi.Framework.Bbs.Application.Contracts.Dtos.MyType
 {
-    public class MyTypeOutputDto : EntityDto<Guid>
+    public class DiscussLableOutputDto : EntityDto<Guid>
     {
         public string Name { get; set; }
         public string? Color { get; set; }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/MyType/DiscussLableUpdateInputVo.cs

@@ -1,10 +1,9 @@
 namespace Yi.Framework.Bbs.Application.Contracts.Dtos.MyType
 {
-    public class MyTypeUpdateInputVo
+    public class DiscussLableUpdateInputVo
     {
         public string Name { get; set; }
         public string? Color { get; set; }
         public string? BackgroundColor { get; set; }
-        public Guid UserId { get; set; }
     }
 }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/MyType/MyTypeGetListInputVo.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.Application.Dtos;
-
-namespace Yi.Framework.Bbs.Application.Contracts.Dtos.MyType
-{
-    public class MyTypeGetListInputVo : PagedAndSortedResultRequestDto
-    {
-        public string? Name { get; set; }
-        public string? Color { get; set; }
-        public string? BackgroundColor { get; set; }
-        public Guid? UserId { get; set; }
-    }
-}

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/IServices/IDiscussLableService.cs

@@ -5,7 +5,7 @@ namespace Yi.Framework.Bbs.Application.Contracts.IServices
     /// <summary>
     /// Label服务抽象
     /// </summary>
-    public interface IMyTypeService : IYiCrudAppService<MyTypeOutputDto, MyTypeGetListOutputDto, Guid, MyTypeGetListInputVo, MyTypeCreateInputVo, MyTypeUpdateInputVo>
+    public interface IDiscussLableService : IYiCrudAppService<DiscussLableOutputDto, DiscussLableGetListOutputDto, Guid, DiscussLableGetListInputVo, DiscussLableCreateInputVo, DiscussLableUpdateInputVo>
     {
 
     }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/CommentService.cs

@@ -44,7 +44,6 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
         private IDiscussService _discussService { get; set; }
         /// <summary>
         /// 获取改主题下的评论,结构为二维列表，该查询无分页
-        /// Todo: 可放入领域层
         /// </summary>
         /// <param name="discussId"></param>
         /// <param name="input"></param>
@@ -64,15 +63,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
             List<Guid> userIds = entities.Where(x => x.CreatorId != null).Select(x => x.CreatorId ?? Guid.Empty).ToList();
             var bbsUserInfoDic = (await _bbsUserManager.GetBbsUserInfoAsync(userIds)).ToDictionary(x => x.Id);
 
-
+            //------数据查询完成------,以下只是dto的简单组装
-
-
-
-            //------数据查询完成------
-
-
-
-
 
             //从根目录开始组装
             //结果初始值，第一层等于全部根节点
@@ -117,11 +108,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
             rootOutoutDto?.ForEach(x =>
             {
                 x.Children = x.Children.OrderByDescending(x => x.CreationTime).ToList();
-
             });
-
-
-
             return new PagedResultDto<CommentGetListOutputDto>(entities.Count(), rootOutoutDto);
         }
 

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussLableService.cs

@@ -0,0 +1,53 @@
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
+using Yi.Framework.Bbs.Application.Contracts.Dtos.MyType;
+using Yi.Framework.Bbs.Application.Contracts.IServices;
+using Yi.Framework.Bbs.Domain.Entities.Forum;
+using Yi.Framework.Ddd.Application;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.Bbs.Application.Services.Forum
+{
+    /// <summary>
+    /// DiscussLable服务实现
+    /// </summary>
+    public class DiscussLableService : YiCrudAppService<DiscussLableAggregateRoot, DiscussLableOutputDto,
+            DiscussLableGetListOutputDto, Guid, DiscussLableGetListInputVo, DiscussLableCreateInputVo,
+            DiscussLableUpdateInputVo>,
+        IDiscussLableService
+    {
+        private ISqlSugarRepository<DiscussLableAggregateRoot, Guid> _repository;
+
+        public DiscussLableService(ISqlSugarRepository<DiscussLableAggregateRoot, Guid> repository) : base(repository)
+        {
+            _repository = repository;
+        }
+        
+        [HttpGet("discuss-lable/all")]
+        public async Task<ListResultDto<DiscussLableGetListOutputDto>> GetAllListAsync(DiscussLableGetListInputVo input)
+        {
+            var order = input.Sorting ?? nameof(DiscussLableAggregateRoot.Name);
+            var output = await _repository._DbQueryable
+                .WhereIF(input.Name is not null, x => x.Name.Contains(input.Name))
+                .OrderBy(order)
+                .Select(x => new DiscussLableGetListOutputDto(), true)
+                .ToListAsync();
+            return  new ListResultDto<DiscussLableGetListOutputDto>(output);
+        }
+
+        public override async Task<PagedResultDto<DiscussLableGetListOutputDto>> GetListAsync(
+            DiscussLableGetListInputVo input)
+        {
+            RefAsync<int> total = 0;
+            var order = input.Sorting ?? nameof(DiscussLableAggregateRoot.Name);
+            var output = await _repository._DbQueryable
+                .WhereIF(input.Name is not null, x => x.Name.Contains(input.Name))
+                .OrderBy(order)
+                .Select(x => new DiscussLableGetListOutputDto(), true)
+                .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
+            return new PagedResultDto<DiscussLableGetListOutputDto>(total, output);
+        }
+    }
+}

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/MyTypeService.cs

@@ -1,54 +0,0 @@
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Yi.Framework.Bbs.Application.Contracts.Dtos.MyType;
-using Yi.Framework.Bbs.Application.Contracts.IServices;
-using Yi.Framework.Bbs.Domain.Entities.Forum;
-using Yi.Framework.Ddd.Application;
-using Yi.Framework.SqlSugarCore.Abstractions;
-
-namespace Yi.Framework.Bbs.Application.Services.Forum
-{
-    /// <summary>
-    /// Label服务实现
-    /// </summary>
-    public class MyTypeService : YiCrudAppService<MyTypeEntity, MyTypeOutputDto, MyTypeGetListOutputDto, Guid, MyTypeGetListInputVo, MyTypeCreateInputVo, MyTypeUpdateInputVo>,
-       IMyTypeService
-    {
-        private ISqlSugarRepository<MyTypeEntity, Guid> _repository;
-        public MyTypeService(ISqlSugarRepository<MyTypeEntity, Guid> repository, IDataFilter dataFilter) : base(repository)
-        {
-            _repository = repository;
-            _dataFilter = dataFilter;
-        }
-
-        private IDataFilter _dataFilter { get; set; }
-
-        /// <summary>
-        /// 获取当前用户的主题类型
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public Task<PagedResultDto<MyTypeGetListOutputDto>> GetListCurrentAsync(MyTypeGetListInputVo input)
-        {
-            //过滤器需要更换
-            //_dataFilter.Enable<MyTypeEntity>(x => x.UserId == CurrentUser.Id);
-
-            //_dataFilter.AddFilter<MyTypeEntity>(x => x.UserId == CurrentUser.Id);
-            return base.GetListAsync(input);
-        }
-
-        /// <summary>
-        /// 创建
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public override async Task<MyTypeOutputDto> CreateAsync(MyTypeCreateInputVo input)
-        {
-            var entity = await MapToEntityAsync(input);
-            entity.UserId = CurrentUser.Id ?? Guid.Empty;
-            entity.IsDeleted = false;
-            var outputEntity = await _repository.InsertReturnEntityAsync(entity);
-            return await MapToGetOutputDtoAsync(outputEntity);
-        }
-    }
-}

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussAggregateRoot.cs

@@ -67,6 +67,9 @@ namespace Yi.Framework.Bbs.Domain.Entities.Forum
         [SugarColumn(IsJson = true)]//使用json处理
         public List<Guid>? PermissionUserIds { get; set; }
 
+        [SugarColumn(IsJson = true)]//使用json处理
+        public HashSet<Guid>? DiscussLables{ get; set; }
+        
         /// <summary>
         /// 是否禁止评论创建功能
         /// </summary>

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussLableAggregateRoot.cs

@@ -4,17 +4,13 @@ using Volo.Abp.Domain.Entities;
 
 namespace Yi.Framework.Bbs.Domain.Entities.Forum
 {
-    [SugarTable("MyType")]
+    [SugarTable("DiscussLable")]
-    public class MyTypeEntity : Entity<Guid>, ISoftDelete
+    public class DiscussLableAggregateRoot : AggregateRoot<Guid>, ISoftDelete
     {
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
-        public override Guid Id { get; protected set; }
         public bool IsDeleted { get; set; }
 
         public string Name { get; set; }
         public string? Color { get; set; }
         public string? BackgroundColor { get; set; }
-
-        public Guid UserId { get; set; }
     }
 }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Forum/DiscussMyTypeEntity.cs

@@ -1,16 +0,0 @@
-using SqlSugar;
-using Volo.Abp.Domain.Entities;
-
-namespace Yi.Framework.Bbs.Domain.Entities.Forum
-{
-    [SugarTable("DiscussMyType")]
-    public class DiscussMyTypeEntity : Entity<Guid>
-    {
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
-        public override Guid Id { get; protected set; }
-
-        public Guid DiscussId { get; set; }
-
-        public Guid MyTypeId { get; set; }
-    }
-}

Yi.Bbs.Vue3/src/apis/discussLableApi.js

@@ -0,0 +1,9 @@
+import request from "@/config/axios/service";
+
+export function getAllList(data) {
+    return request({
+        url: "/discuss-lable/all",
+        method: "get",
+        params: data,
+    });
+}

Yi.Bbs.Vue3/src/views/EditArticle.vue

@@ -11,16 +11,20 @@
         <el-form-item label="类型：">
           <el-radio-group v-model="radio">
             <el-radio-button label="discuss" :disabled="artType !== 'discuss'"
-              >主题</el-radio-button
+            >主题
+            </el-radio-button
             >
             <el-radio-button label="article" :disabled="artType !== 'article'"
-              >文章</el-radio-button
+            >文章
+            </el-radio-button
             >
             <el-radio-button label="plate" :disabled="artType !== 'plate'"
-              >板块</el-radio-button
+            >板块
+            </el-radio-button
             >
             <el-radio-button label="orther" :disabled="artType !== 'orther'"
-              >其他</el-radio-button
+            >其他
+            </el-radio-button
             >
           </el-radio-group>
         </el-form-item>
@@ -75,19 +79,41 @@
               :show-file-list="false"
               :on-success="onSuccess"
           >
-            <el-icon  class="avatar-uploader-icon"><Plus /></el-icon>
+            <el-icon class="avatar-uploader-icon">
+              <Plus/>
+            </el-icon>
           </el-upload>
         </el-form-item>
-        <el-form-item label="标签：" prop="types">
+        <el-form-item label="分类标签：" prop="discussLable" v-if="radio == 'discuss'">
-          <el-input placeholder="请输入" v-model="editForm.types" />
+          <el-select
+              value-key="id"
+              v-model="selectLabelList"
+              multiple
+              filterable
+              remote
+              reserve-keyword
+              placeholder="请选择合适的文章标签"
+              :remote-method="remoteMethod"
+              :loading="labelLoading"
+              style="width: 435px"
+          >
+            <el-option
+                v-for="item in labelListData"
+                :key="item.value.id"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button
               @click="submit(ruleFormRef)"
               class="submit-btn"
               type="primary"
-            >提交</el-button
+          >提交
-          ></el-form-item
+          </el-button
+          >
+        </el-form-item
         >
       </el-form>
       <div class="import-content" v-show="radio == 'article'">
@@ -110,7 +136,8 @@
             :loading="importLoading"
             @click="handleImport"
             class="import-btn"
-          >导入文章</el-button
+        >导入文章
+        </el-button
         >
       </div>
     </div>
@@ -139,6 +166,10 @@ import {
   get as discussGet,
 } from "@/apis/discussApi.js";
 
+import {
+  getAllList as getLableAllList
+} from "@/apis/discussLableApi"
+
 import {
   add as articleAdd,
   update as articleUpdate,
@@ -161,6 +192,23 @@ const fileUploadUrl = `${import.meta.env.VITE_APP_BASEAPI}/file`;
 //封面的url
 const dialogImageUrl = ref("");
 
+//远程文章标签
+const labelListData = ref([]);
+const labelLoading = ref(false);
+const selectLabelList = ref([]);
+//远程下拉框查询文章标签
+const remoteMethod = async (query) => {
+  labelLoading.value = true
+  const {data} = await getLableAllList({name:query});
+  labelLoading.value = false
+  labelListData.value = data.items.map((item) => {
+    return {
+      value: item,
+      label: item.name
+    }
+  })
+}
+
 //文件上传成功后
 const onSuccess = (response) => {
   dialogImageUrl.value = response[0].id;
@@ -175,11 +223,11 @@ const getUrl=computed(()=>{
 //整个页面上的表单
 const editForm = reactive({
   title: "",
-  types: "",
   introduction: "",
   content: "",
   name: "",
   permissionUserIds: [],
+  discussLables:[]
 });
 
 //组装主题内容： 需要更新主题信息
@@ -206,10 +254,11 @@ const submit = async (formEl) => {
   if (!formEl) return;
   await formEl.validate(async (valid, fields) => {
     if (valid) {
+      discuss.discussLables=selectLabelList.value.map((item) =>item.id);
+      console.log(discuss,"discuss")
       //dicuss主题处理
       if (radio.value == "discuss") {
         discuss.title = editForm.title;
-        discuss.types = editForm.types;
         discuss.introduction = editForm.introduction;
         discuss.content = editForm.content;
         discuss.plateId = discuss.plateId ?? route.query.plateId;
@@ -301,7 +350,6 @@ const loadDiscuss = async () => {
   const res = response.data;
   editForm.content = res.content;
   editForm.title = res.title;
-  editForm.types = res.types;
   editForm.introduction = res.introduction;
   discuss.plateId = res.plateId;
   dialogImageUrl.value = res.cover;
@@ -373,16 +421,19 @@ const getFile = async (e) => {
   background-color: #fff;
   margin: 1.5rem;
   padding: 1.5rem;
+
   .import-content {
     display: flex;
     align-items: center;
     position: absolute;
     top: 1.5rem;
     right: 1.5rem;
+
     .text {
       margin-right: 10px;
     }
   }
+
   .import-btn {
     margin-left: 10px;
   }
@@ -408,6 +459,7 @@ const getFile = async (e) => {
   height: 178px;
   text-align: center;
 }
+
 .el-upload {
 }
 </style>