修改字段编辑接口bug

Controllers/Admin/DatabaseFieldController.cs

@@ -18,16 +18,14 @@ namespace Controllers.Admin
     // [ApiExplorerSettings(GroupName = "DatabaseField")]
     public class DatabaseFieldController : BaseController
     {
-        /// <summary>
-        /// api分组接口
-        /// </summary>
         private readonly IDatabaseFieldService _DatabaseFieldService;
+        private readonly IDatabaseFieldTabsService _DatabaseFieldTabsService;
 
 
-        public DatabaseFieldController(IDatabaseFieldService DatabaseFieldService)
+        public DatabaseFieldController(IDatabaseFieldService DatabaseFieldService, IDatabaseFieldTabsService DatabaseFieldTabsService)
         {
             _DatabaseFieldService = DatabaseFieldService;
-
+            _DatabaseFieldTabsService = DatabaseFieldTabsService;
         }
 
           /// <param name="page">分页参数</param>
@@ -67,9 +65,10 @@ namespace Controllers.Admin
         /// <returns>添加</returns>
         [HttpPost]
         [Route("/v1/omega_source/DatabaseField/addDatabaseField")]
-        public IActionResult addDatabaseField([FromBody] DatabaseField param)
+        public IActionResult addDatabaseField([FromBody] AddDatabaseFieldDto param)
         {
             var modal = param.Adapt<DatabaseField>().ToCreate(HttpContext);
+            modal.tabId = _DatabaseFieldTabsService.AddDatabaseFieldTabs(param.tabId, param.tableId);
             var response = _DatabaseFieldService.InsertReturnIdentity(modal);
             return SUCCESS(response);
         }
@@ -82,9 +81,10 @@ namespace Controllers.Admin
         /// <returns>修改</returns>
         [HttpPut]
         [Route("/v1/omega_source/DatabaseField/updateDatabaseField")]
-        public IActionResult updateDatabaseField([FromBody] DatabaseField param)
+        public IActionResult updateDatabaseField([FromBody] AddDatabaseFieldDto param)
         {
             var modal = param.Adapt<DatabaseField>().ToCreate(HttpContext);
+            modal.tabId = _DatabaseFieldTabsService.AddDatabaseFieldTabs(param.tabId, param.tableId);
             var response = _DatabaseFieldService.Update(modal, true);
             return SUCCESS(response);
         }

Model/Database/DatabaseField.cs

@@ -241,6 +241,13 @@ namespace Model
         public int linkFieldId { get; set; }
 
 
+        /// <summary>
+        /// 关联数据源ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "关联数据源ID", ColumnName = "api_id")]
+        public int apiId { get; set; }
+
+
 
     }
 }

Model/Dto/Admin/AddDatabaseFieldDto.cs

@@ -0,0 +1,179 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using LitJson;
+using Model;
+using Model.Base;
+using static System.Runtime.InteropServices.JavaScript.JSType;
+
+namespace Dto.Admin
+{
+    /// <summary>
+    /// 添加
+    /// </summary>
+    public class AddDatabaseFieldDto
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 数据库
+        /// </summary>
+        public int databaseId { get; set; }
+
+
+        /// <summary>
+        /// 数据表
+        /// </summary>
+        public int tableId { get; set; }
+
+
+        /// <summary>
+        /// 选项卡
+        /// </summary>
+        public string tabId { get; set; }
+
+
+        /// <summary>
+        /// 字段标题
+        /// </summary>
+        public string? fieldTitle { get; set; }
+
+
+        /// <summary>
+        /// 字段名
+        /// </summary>
+        public string? fieldName { get; set; }
+
+
+        /// <summary>
+        /// 字段类型
+        /// </summary>
+        public string? fieldType { get; set; }
+
+
+        /// <summary>
+        /// 字段长度
+        /// </summary>
+        public string? fieldLength { get; set; }
+
+
+        /// <summary>
+        /// 字段默认值
+        /// </summary>
+        public string? fieldDefaultValue { get; set; }
+
+
+        /// <summary>
+        /// 字段说明
+        /// </summary>
+        public string? fieldDetail { get; set; }
+
+
+        /// <summary>
+        /// 编辑类型
+        /// </summary>
+        public string? editType { get; set; }
+
+
+        /// <summary>
+        /// 验证属性
+        /// </summary>
+        public string? validateAttribute { get; set; }
+
+
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public bool primaryKey { get; set; }
+
+
+        /// <summary>
+        /// 自动增长
+        /// </summary>
+        public bool autoIncrement { get; set; }
+
+
+        /// <summary>
+        /// 分表字段
+        /// </summary>
+        public bool splitFlag { get; set; }
+
+
+        /// <summary>
+        /// 列表显示
+        /// </summary>
+        public bool showList { get; set; }
+
+
+        /// <summary>
+        /// 查询条件
+        /// </summary>
+        public bool showQuery { get; set; }
+
+
+        /// <summary>
+        /// 是否编辑
+        /// </summary>
+        public bool showEdit { get; set; }
+
+
+        /// <summary>
+        /// 检查重复
+        /// </summary>
+        public bool checkRepeat { get; set; }
+
+
+        /// <summary>
+        /// 导出标记
+        /// </summary>
+        public bool exportFlag { get; set; }
+
+
+        /// <summary>
+        /// 导入标记
+        /// </summary>
+        public bool importFlag { get; set; }
+
+
+        /// <summary>
+        /// 列表编辑
+        /// </summary>
+        public bool listEditFlag { get; set; }
+
+
+        /// <summary>
+        /// 列表编辑提示文字
+        /// </summary>
+        public string? listEditPlaceholder { get; set; }
+
+
+        /// <summary>
+        /// 统计条件字段
+        /// </summary>
+        public bool statCondition { get; set; }
+
+
+        /// <summary>
+        /// 统计数据字段
+        /// </summary>
+        public bool statData { get; set; }
+
+
+        /// <summary>
+        /// 关联数据表
+        /// </summary>
+        public int linkTableId { get; set; }
+
+
+        /// <summary>
+        /// 关联数据字段
+        /// </summary>
+        public int linkFieldId { get; set; }
+
+
+
+    }
+}

Services/DatabaseFieldTabsService.cs

@@ -36,6 +36,20 @@ namespace Services
         }
 
 
+        public int AddDatabaseFieldTabs(string tabName, int tableId)
+        {
+            var item = GetFirst(m => m.tableId == tableId && m.tabName == tabName);
+            if(item == null)
+            {
+                return InsertReturnIdentity(new DatabaseFieldTabs()
+                {
+                    tabName = tabName
+                });
+            }
+            return item.id;
+        }
+
+
 
     }
 }

Services/IService/IDatabaseFieldTabsService.cs

@@ -18,5 +18,9 @@ namespace Services
 
 
 
+        int AddDatabaseFieldTabs(string tabName, int tableId);
+
+
+
     }
 }

Util/ModelVoAdapt.cs

@@ -19,6 +19,9 @@ namespace Util
                 .Map(dest => dest.apiParam, src => src.apiParam == null
                     ? new List<ApiParamObject>()
                     : Newtonsoft.Json.JsonConvert.DeserializeObject<List<ApiParamObject>>(src.apiParam));
+
+            TypeAdapterConfig<AddDatabaseFieldDto, DatabaseField>.NewConfig()
+                .Map(dest => dest.tabId, src => 0);
         }
 
     }