Просмотр исходного кода

调整app页面编辑按钮参数类型

lichunlei 7 месяцев назад
Родитель
Сommit
858292ed39

+ 0 - 0
Controllers/Admin/AppProjectBottom/AppProjectBottomController.cs → Controllers/Admin/AppProjectBottomController.cs


+ 3 - 2
Controllers/Admin/AppProjectPage/AppProjectPageController.cs → Controllers/Admin/AppProjectPageController.cs

@@ -6,6 +6,7 @@ using Model.Base;
 using Vo.Admin;
 using Mapster;
 using Infrastructure;
+using Dto.Admin;
 
 
 namespace Controllers.Admin
@@ -66,7 +67,7 @@ namespace Controllers.Admin
         /// <returns>添加</returns>
         [HttpPost]
         [Route("/v1/omega_source/AppProjectPage/addAppProjectPage")]
-        public IActionResult addAppProjectPage([FromBody] AppProjectPage param)
+        public IActionResult addAppProjectPage([FromBody] AddAppProjectPageDto param)
         {
             var modal = param.Adapt<AppProjectPage>().ToCreate(HttpContext);
             var response = _AppProjectPageService.InsertReturnIdentity(modal);
@@ -81,7 +82,7 @@ namespace Controllers.Admin
         /// <returns>修改</returns>
         [HttpPut]
         [Route("/v1/omega_source/AppProjectPage/updateAppProjectPage")]
-        public IActionResult updateAppProjectPage([FromBody] AppProjectPage param)
+        public IActionResult updateAppProjectPage([FromBody] AddAppProjectPageDto param)
         {
             var modal = param.Adapt<AppProjectPage>().ToCreate(HttpContext);
             var response = _AppProjectPageService.Update(modal, true);

+ 0 - 0
Controllers/Admin/AppProjectStatic/AppProjectStaticController.cs → Controllers/Admin/AppProjectStaticController.cs


+ 127 - 0
Model/Dto/Admin/AddAppProjectPageDto.cs

@@ -0,0 +1,127 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto.Admin
+{
+    /// <summary>
+    /// 添加
+    /// </summary>
+    public class AddAppProjectPageDto
+    {
+        /// <summary>
+        /// 模板更新版本
+        /// </summary>
+        public int moduleVersion { get; set; }
+
+
+        /// <summary>
+        /// 是否读取网页标题
+        /// </summary>
+        public bool webTitle { get; set; }
+
+
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 页面强制更新
+        /// </summary>
+        public bool mustUpdate { get; set; }
+
+
+        /// <summary>
+        /// 下级页面
+        /// </summary>
+        public string? gotoPages { get; set; }
+
+
+        /// <summary>
+        /// 版本ID
+        /// </summary>
+        public int versionId { get; set; }
+
+
+        /// <summary>
+        /// 右侧侧按钮
+        /// </summary>
+        public string? rightBtn { get; set; }
+
+
+        /// <summary>
+        /// 左侧按钮
+        /// </summary>
+        public string? leftBtn { get; set; }
+
+
+        /// <summary>
+        /// 手势侧滑返回
+        /// </summary>
+        public bool skidFlag { get; set; }
+
+
+        /// <summary>
+        /// 页面滚动条
+        /// </summary>
+        public bool showScrollBar { get; set; }
+
+
+        /// <summary>
+        /// 顶部标题
+        /// </summary>
+        public string? title { get; set; }
+
+
+        /// <summary>
+        /// 显示头部
+        /// </summary>
+        public bool showTitle { get; set; }
+
+
+        /// <summary>
+        /// 苹果状态栏
+        /// </summary>
+        public string? statusBarStyle { get; set; }
+
+
+        /// <summary>
+        /// 前景色
+        /// </summary>
+        public string? textColor { get; set; }
+
+
+        /// <summary>
+        /// 背景色
+        /// </summary>
+        public string? backgroudColor { get; set; }
+
+
+        /// <summary>
+        /// 页面路径
+        /// </summary>
+        public string? modulePath { get; set; }
+
+
+        /// <summary>
+        /// APP项目ID
+        /// </summary>
+        public int appId { get; set; }
+
+
+        /// <summary>
+        /// 顶部标题位置
+        /// </summary>
+        public string? titlePosition { get; set; }
+
+
+        /// <summary>
+        /// 页面文件
+        /// </summary>
+        public string? moduleFile { get; set; }
+
+    }
+}

+ 3 - 2
Model/Vo/Admin/GetAppProjectPageQueryVo.cs

@@ -1,3 +1,4 @@
+using Model;
 using Newtonsoft.Json;
 
 namespace Vo.Admin
@@ -40,13 +41,13 @@ namespace Vo.Admin
         /// <summary>
         /// 右侧侧按钮
         /// </summary>
-        public string rightBtn { get; set; }
+        public BtnItem rightBtn { get; set; }
 
 
         /// <summary>
         /// 左侧按钮
         /// </summary>
-        public string leftBtn { get; set; }
+        public BtnItem leftBtn { get; set; }
 
 
         /// <summary>

+ 8 - 0
Util/ModelVoAdapt.cs

@@ -22,6 +22,14 @@ namespace Util
 
             TypeAdapterConfig<AddDatabaseFieldDto, DatabaseField>.NewConfig()
                 .Map(dest => dest.tabId, src => 0);
+
+            TypeAdapterConfig<AddAppProjectPageDto, AppProjectPage>.NewConfig()
+                .Map(dest => dest.leftBtn, src => src.leftBtn == null
+                    ? new List<ApiParamObject>()
+                    : Newtonsoft.Json.JsonConvert.DeserializeObject<List<ApiParamObject>>(src.leftBtn))
+                .Map(dest => dest.rightBtn, src => src.rightBtn == null
+                    ? new List<ApiParamObject>()
+                    : Newtonsoft.Json.JsonConvert.DeserializeObject<List<ApiParamObject>>(src.rightBtn));
         }
 
     }