Sort article, product categories #521

SeriaWei · Nov 15, 2024 · a6490c4 · a6490c4
1 parent 78e68e1
commit a6490c4
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 27 deletions.
diff --git a/Database/Update/4.2/MsSql.sql b/Database/Update/4.2/MsSql.sql
@@ -0,0 +1,5 @@
+ALTER TABLE dbo.ArticleType ADD DisplayOrder int NULL
+GO
+
+ALTER TABLE dbo.ProductCategory ADD DisplayOrder int NULL
+GO
diff --git a/src/ZKEACMS.Article/Controllers/ArticleTypeController.cs b/src/ZKEACMS.Article/Controllers/ArticleTypeController.cs
@@ -57,7 +57,7 @@ public override IActionResult Edit(ArticleType entity)
         [DefaultAuthorize(Policy = PermissionKeys.ViewArticleType)]
         public JsonResult GetArticleTypeTree()
         {
-            var allNodes = Service.Get().ToList();
+            var allNodes = Service.Get().OrderBy(m => m.DisplayOrder ?? m.ID).ToList();
             var node = new Tree<ArticleType>().Source(allNodes).ToNode(m => m.ID.ToString(), m => m.Title, m => m.ParentID.ToString(), "0");
             return Json(node);
         }
@@ -72,5 +72,12 @@ public IActionResult Select(int? selected)
             ViewBag.Selected = selected;
             return View();
         }
+
+        [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageArticleType)]
+        public JsonResult Move(int id, int parentId, int position)
+        {
+            Service.Move(id, parentId, position);
+            return Json(true);
+        }
     }
 }
diff --git a/src/ZKEACMS.Article/Service/ArticleTypeService.cs b/src/ZKEACMS.Article/Service/ArticleTypeService.cs
@@ -10,6 +10,7 @@
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq;
+using ZKEACMS.Common.Models;
 
 namespace ZKEACMS.Article.Service
 {
@@ -22,12 +23,12 @@ public ArticleTypeService(IApplicationContext applicationContext, IArticleServic
         {
             _articleService = articleService;
             _localize = localize;
-        }     
+        }
 
         public override ErrorOr<ArticleType> Add(ArticleType item)
         {
             item.ParentID = item.ParentID ?? 0;
-            if (item.Url.IsNotNullAndWhiteSpace()&& GetByUrl(item.Url) != null)
+            if (item.Url.IsNotNullAndWhiteSpace() && GetByUrl(item.Url) != null)
             {
                 return new Error("Url", _localize.Get("URL already exists"));
             }
@@ -58,10 +59,24 @@ public override void Remove(ArticleType item)
                 GetChildren(item.ID).Each(m =>
                 {
                     Remove(m);
-                });                
+                });
             }
             base.Remove(item);
         }
 
+        public void Move(int id, int parentId, int position)
+        {
+            var articleType = Get(id);
+            articleType.ParentID = parentId;
+
+            var siblings = Get().Where(m => m.ParentID == articleType.ParentID && m.ID != articleType.ID).OrderBy(m => m.DisplayOrder ?? m.ID).ToList();
+            siblings.Insert(position, articleType);
+
+            for (int i = 0; i < siblings.Count; i++)
+            {
+                siblings[i].DisplayOrder = i + 1;
+            }
+            UpdateRange(siblings.ToArray());
+        }
     }
 }
diff --git a/src/ZKEACMS.Article/Views/ArticleType/Index.cshtml b/src/ZKEACMS.Article/Views/ArticleType/Index.cshtml
@@ -4,11 +4,14 @@
 @{
     Script.Reqiured("jsTree").AtFoot();
     Style.Reqiured("jsTree").AtHead();
-    var articleTree = Html.Tree<ArticleType>().Source("GetArticleTypeTree", "ArticleType", new {module = "admin"});
+    var articleTree = Html.Tree<ArticleType>().Source("GetArticleTypeTree", "ArticleType", new {module = "admin"})
+    .CheckCallBack("checkCallBack")
+    .On(Events.MoveNode, "moveNode");
     if (Authorizer.Authorize(ZKEACMS.Article.PermissionKeys.ManageArticleType))
     {
         articleTree
         .AddPlugin(Plugins.ContextMenu)
+        .AddPlugin(Plugins.DragAndDrop)
             .AddContextMenuItem(new ContextmenuItem {Label = L("New").Text, Action = "Create", Icon = "glyphicon glyphicon-plus"})
             .AddContextMenuItem(new ContextmenuItem {Label = L("Edit").Text, Action = "Edit", Icon = "glyphicon glyphicon-edit"});
     }
@@ -41,6 +44,12 @@
         var id = node.reference.attr("id");
         window.location.href = '@Url.Action("Edit", "ArticleType", new { module = "admin"})' + '/' + id;
     }
+    function checkCallBack(operation, node, node_parent, node_position, more) {
+        return true;
+    }
+    function moveNode(node, parent) {
+        $.post("@Url.Action("Move")", { id: parent.node.id, parentId: parent.parent, position: parent.position }, function () {
 
-
+        }, "json");
+    }
 </script>
diff --git a/src/ZKEACMS.Product/Controllers/ProductCategoryController.cs b/src/ZKEACMS.Product/Controllers/ProductCategoryController.cs
@@ -63,7 +63,7 @@ public override IActionResult Delete(int id)
         [DefaultAuthorize(Policy = PermissionKeys.ViewProductCategory)]
         public JsonResult GetProductCategoryTree()
         {
-            var pages = Service.Get().ToList();
+            var pages = Service.Get().OrderBy(m => m.DisplayOrder ?? m.ID).ToList();
             var node = new Tree<ProductCategory>().Source(pages).ToNode(m => m.ID.ToString(), m => m.Title, m => m.ParentID.ToString(), "0");
             return Json(node);
         }
@@ -74,5 +74,12 @@ public IActionResult Select(int? selected)
             ViewBag.Selected = selected;
             return View();
         }
+
+        [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageProductCategory)]
+        public JsonResult Move(int id, int parentId, int position)
+        {
+            Service.Move(id, parentId, position);
+            return Json(true);
+        }
     }
 }
diff --git a/src/ZKEACMS.Product/Service/ProductCategoryService.cs b/src/ZKEACMS.Product/Service/ProductCategoryService.cs
@@ -63,5 +63,19 @@ public override void Remove(ProductCategory item)
                 base.Remove(item);
             });
         }
+
+        public void Move(int id, int parentId, int position)
+        {
+            var productCategory = Get(id);
+            productCategory.ParentID = parentId;
+            var siblings = Get().Where(m => m.ParentID == productCategory.ParentID && m.ID != productCategory.ID).OrderBy(m => m.DisplayOrder ?? m.ID).ToList();
+            siblings.Insert(position, productCategory);
+
+            for (int i = 0; i < siblings.Count; i++)
+            {
+                siblings[i].DisplayOrder = i + 1;
+            }
+            UpdateRange(siblings.ToArray());
+        }
     }
 }
diff --git a/src/ZKEACMS.Product/Views/ProductCategory/Index.cshtml b/src/ZKEACMS.Product/Views/ProductCategory/Index.cshtml
@@ -4,11 +4,14 @@
 @{
     Script.Reqiured("jsTree").AtFoot();
     Style.Reqiured("jsTree").AtHead();
-    var categoryTree = Html.Tree<ProductCategory>().Source("GetProductCategoryTree", "ProductCategory");
+    var categoryTree = Html.Tree<ProductCategory>().Source("GetProductCategoryTree", "ProductCategory")
+    .CheckCallBack("checkCallBack")
+    .On(Events.MoveNode, "moveNode");
     if (Authorizer.Authorize(ZKEACMS.Product.PermissionKeys.ManageProductCategory))
     {
         categoryTree
             .AddPlugin(Plugins.ContextMenu)
+            .AddPlugin(Plugins.DragAndDrop)
             .AddContextMenuItem(new ContextmenuItem {Label = L("New").Text, Action = "Create", Icon = "glyphicon glyphicon-plus"})
             .AddContextMenuItem(new ContextmenuItem {Label = L("Edit").Text, Action = "Edit", Icon = "glyphicon glyphicon-edit"});
     }
@@ -41,6 +44,12 @@
         var id = node.reference.attr("id");
         window.location.href = '@Url.Action("Edit")' + '/' + id;
     }
+    function checkCallBack(operation, node, node_parent, node_position, more) {
+        return true;
+    }
+    function moveNode(node, parent) {
+        $.post("@Url.Action("Move")", { id: parent.node.id, parentId: parent.parent, position: parent.position }, function () {
 
-
+        }, "json");
+    }
 </script>
diff --git a/src/ZKEACMS.WebHost/Views/Navigation/Index.cshtml b/src/ZKEACMS.WebHost/Views/Navigation/Index.cshtml
@@ -51,7 +51,7 @@
         return true;
     }
     function moveNode(node, parent) {
-        $.post("@Url.Action("MoveNav")", { id: parent.node.id, parentId: parent.parent, position: parent.position + 1, oldPosition: parent.old_position + 1 }, function () {
+        $.post("@Url.Action("MoveNav")", { id: parent.node.id, parentId: parent.parent, position: parent.position }, function () {
 
         }, "json");
     }

diff --git a/src/ZKEACMS/Article/Models/ArticleType.cs b/src/ZKEACMS/Article/Models/ArticleType.cs
@@ -22,6 +22,7 @@ public class ArticleType : EditorEntity
         public string SEOTitle { get; set; }
         public string SEOKeyWord { get; set; }
         public string SEODescription { get; set; }
+        public int? DisplayOrder { get; set; }
     }
     class ArtycleTypeMetaData : ViewMetaData<ArticleType>
     {
@@ -30,6 +31,7 @@ protected override void ViewConfigure()
         {
             ViewConfig(m => m.ID).AsHidden();
             ViewConfig(m => m.ParentID).AsHidden();
+            ViewConfig(m => m.DisplayOrder).AsHidden();
             ViewConfig(m => m.Title).AsTextBox().Order(1).MaxLength(200).Required();
             ViewConfig(m => m.Url).AsTextBox().Order(2).MaxLength(100).UrlPart().RandomText().Required();
             ViewConfig(m => m.Status).AsDropDownList().DataSource(DicKeys.RecordStatus, SourceType.Dictionary);

diff --git a/src/ZKEACMS/Article/Service/IArticleTypeService.cs b/src/ZKEACMS/Article/Service/IArticleTypeService.cs
@@ -12,5 +12,6 @@ public interface IArticleTypeService : IService<ArticleType>
     {
         IEnumerable<ArticleType> GetChildren(long id);
         ArticleType GetByUrl(string url);
+        void Move(int id, int parentId, int position);
     }
 }
diff --git a/src/ZKEACMS/Common/Service/INavigationService.cs b/src/ZKEACMS/Common/Service/INavigationService.cs
@@ -9,6 +9,6 @@ namespace ZKEACMS.Common.Service
 {
     public interface INavigationService : IService<NavigationEntity>
     {
-        void Move(string id, string parentId, int position, int oldPosition);
+        void Move(string id, string parentId, int position);
     }
 }
diff --git a/src/ZKEACMS/Common/Service/NavigationService.cs b/src/ZKEACMS/Common/Service/NavigationService.cs
@@ -81,26 +81,18 @@ public override void Remove(Expression<Func<NavigationEntity, bool>> filter)
             base.Remove(filter);
         }
 
-        public void Move(string id, string parentId, int position, int oldPosition)
+        public void Move(string id, string parentId, int position)
         {
             var nav = Get(id);
             nav.ParentId = parentId;
-            nav.DisplayOrder = position;
+            var siblings = Get().Where(m => m.ParentId == nav.ParentId && m.ID != nav.ID).OrderBy(m => m.DisplayOrder).ToList();
+            siblings.Insert(position, nav);
 
-            IEnumerable<NavigationEntity> navs = CurrentDbSet.AsTracking().Where(m => m.ParentId == nav.ParentId && m.ID != nav.ID).OrderBy(m => m.DisplayOrder);
-
-            int order = 1;
-            for (int i = 0; i < navs.Count(); i++)
+            for (int i = 0; i < siblings.Count; i++)
             {
-                var eleNav = navs.ElementAt(i);
-                if (i == position - 1)
-                {
-                    order++;
-                }
-                eleNav.DisplayOrder = order;
-                order++;
+                siblings[i].DisplayOrder = i + 1;
             }
-            Update(nav);
+            UpdateRange(siblings.ToArray());
         }
 
         private void Santize(NavigationEntity item)

diff --git a/src/ZKEACMS/Controllers/NavigationController.cs b/src/ZKEACMS/Controllers/NavigationController.cs
@@ -71,9 +71,9 @@ public JsonResult GetSelectNavTree()
         }
 
         [HttpPost, DefaultAuthorize(Policy = PermissionKeys.ManageNavigation)]
-        public JsonResult MoveNav(string id, string parentId, int position, int oldPosition)
+        public JsonResult MoveNav(string id, string parentId, int position)
         {
-            Service.Move(id, parentId, position, oldPosition);
+            Service.Move(id, parentId, position);
             return Json(true);
         }
         public IActionResult Select(string selected)

diff --git a/src/ZKEACMS/Product/Models/ProductCategory.cs b/src/ZKEACMS/Product/Models/ProductCategory.cs
@@ -22,6 +22,7 @@ public class ProductCategory : EditorEntity
         public string SEOTitle { get; set; }
         public string SEOKeyWord { get; set; }
         public string SEODescription { get; set; }
+        public int? DisplayOrder { get; set; }
     }
     class ProductCategoryMetaData : ViewMetaData<ProductCategory>
     {

diff --git a/src/ZKEACMS/Product/Service/IProductCategoryService.cs b/src/ZKEACMS/Product/Service/IProductCategoryService.cs
@@ -11,5 +11,6 @@ namespace ZKEACMS.Product.Service
     public interface IProductCategoryService : IService<ProductCategory>
     {
         ProductCategory GetByUrl(string url);
+        void Move(int id, int parentId, int position);
     }
 }