添加字段

Model/Database/AppBottomNavs.cs

@@ -171,6 +171,13 @@ namespace Model
         public string kind { get; set; }
 
 
+        /// <summary>
+        /// 是否PAG
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否PAG", ColumnName = "pag_flag")]
+        public bool pagFlag { get; set; }
+
+
 
     }
 }

Model/Database/PageUpdateInfo.cs

@@ -192,6 +192,13 @@ namespace Model
         public string kind { get; set; }
 
 
+        /// <summary>
+        /// 是否读取网页标题
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否读取网页标题", ColumnName = "web_title")]
+        public bool webTitle { get; set; }
+
+
 
     }
 }

Model/Dto/AppBottomNavsAddDto.cs

@@ -109,9 +109,16 @@ namespace Dto
         /// <summary>
         /// 分类
         /// </summary>
+        [Required(ErrorMessage = "分类不能为空")]
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 是否PAG
+        /// </summary>
+        public bool pagFlag { get; set; }
+
+
 
     }
 }

Model/Dto/AppBottomNavsUpdateDto.cs

@@ -112,6 +112,12 @@ namespace Dto
         public int id { get; set; }
 
 
+        /// <summary>
+        /// 是否PAG
+        /// </summary>
+        public bool pagFlag { get; set; }
+
+
 
     }
 }

Model/Dto/MakeAppInitDataDto.cs

@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 修改
+    /// </summary>
+    public class MakeAppInitDataDto
+    {
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string kind { get; set; }
+
+
+    }
+}

Model/Dto/PageUpdateInfoListDto.cs

@@ -10,18 +10,17 @@ namespace Dto
     public class PageUpdateInfoListDto
     {
         /// <summary>
-        /// 分类
+        /// 模板路径
         /// </summary>
-        public string? kind { get; set; }
-
-
+        public string? modulePath { get; set; }
 
-    }
 
+        /// <summary>
+        /// 顶部标题
+        /// </summary>
+        public string? title { get; set; }
 
 
-    public class MakeAppInitDataDto
-    {
         /// <summary>
         /// 分类
         /// </summary>

Model/Dto/PageUpdateInfoUpdateDto.cs

@@ -111,6 +111,7 @@ namespace Dto
         /// <summary>
         /// 右侧按钮2点击事件
         /// </summary>
+        [Required(ErrorMessage = "右侧按钮2点击事件不能为空")]
         public string? rightAction2 { get; set; }
 
 
@@ -132,6 +133,12 @@ namespace Dto
         public int id { get; set; }
 
 
+        /// <summary>
+        /// 是否读取网页标题
+        /// </summary>
+        public bool webTitle { get; set; }
+
+
 
     }
 }

Model/Vo/AppBottomNavsQueryVo.cs

@@ -7,8 +7,6 @@ namespace Vo
     /// </summary>
     public class AppBottomNavsQueryVo
     {
-        public string id { get; set; }
-
         /// <summary>
         /// 标题
         /// </summary>

Model/Vo/Client/AppPageInfoVo.cs

@@ -144,5 +144,11 @@ namespace Vo
         /// </summary>
         public string dataId { get; set; }
 
+
+        /// <summary>
+        /// 是否读取网页标题
+        /// </summary>
+        public bool webTitle { get; set; }
+
     }
 }

Model/Vo/PageUpdateInfoQueryVo.cs

@@ -133,6 +133,12 @@ namespace Vo
         public string kind { get; set; }
 
 
+        /// <summary>
+        /// 是否读取网页标题
+        /// </summary>
+        public bool webTitle { get; set; }
+
+
 
     }
 }

Services/PageUpdateInfoService.cs

@@ -32,9 +32,11 @@ namespace Services
             //开始拼装查询条件
             var predicate = Expressionable.Create<PageUpdateInfo>();
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.title), m => m.kind.Contains(parm.title));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.modulePath), m => m.kind.Contains(parm.modulePath));
             var response = Queryable()
                 .Where(predicate.ToExpression())
-                .OrderByDescending(m => m.id)
+                .OrderBy(m => m.id)
                 .ToPage<PageUpdateInfo, PageUpdateInfoListVo>(page);
             return response;
         }