Remove ParentCategoryId from and add Name to CreateUpdateCategoryDto

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Categories/Dtos/CategoryDto.cs

@@ -7,6 +7,8 @@ namespace EasyAbp.EShop.Products.Categories.Dtos
 {
     public class CategoryDto : FullAuditedEntityDto<Guid>
     {
+        public string Name { get; set; }
+        
         public string DisplayName { get; set; }
         
         [NotNull]

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Categories/Dtos/CreateUpdateCategoryDto.cs

@@ -6,6 +6,10 @@ namespace EasyAbp.EShop.Products.Categories.Dtos
 {
     public class CreateUpdateCategoryDto
     {
+        [Required]
+        [DisplayName("CategoryName")]
+        public string Name { get; set; }
+        
         [Required]
         [DisplayName("CategoryDisplayName")]
         public string DisplayName { get; set; }

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/cs.json

@@ -54,7 +54,7 @@
     "Menu:Category": "MenuCategory",
     "Category": "Category",
     "CategoryTenantId": "CategoryTenantId",
-    "CategoryParentCategoryId": "CategoryParentCategoryId",
+    "CategoryName": "CategoryName",
     "CategoryDisplayName": "CategoryDisplayName",
     "CategoryDescription": "CategoryDescription",
     "CategoryMediaResources": "CategoryMediaResources",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/en.json

@@ -55,7 +55,7 @@
     "Menu:Category": "MenuCategory",
     "Category": "Category",
     "CategoryTenantId": "CategoryTenantId",
-    "CategoryParentCategoryId": "CategoryParentCategoryId",
+    "CategoryName": "CategoryName",
     "CategoryDisplayName": "CategoryDisplayName",
     "CategoryDescription": "CategoryDescription",
     "CategoryMediaResources": "CategoryMediaResources",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/pl.json

@@ -54,7 +54,7 @@
     "Menu:Category": "MenuCategory",
     "Category": "Category",
     "CategoryTenantId": "CategoryTenantId",
-    "CategoryParentCategoryId": "CategoryParentCategoryId",
+    "CategoryName": "CategoryName",
     "CategoryDisplayName": "CategoryDisplayName",
     "CategoryDescription": "CategoryDescription",
     "CategoryMediaResources": "CategoryMediaResources",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/pt-BR.json

@@ -54,7 +54,7 @@
     "Menu:Category": "MenuCategory",
     "Category": "Category",
     "CategoryTenantId": "CategoryTenantId",
-    "CategoryParentCategoryId": "CategoryParentCategoryId",
+    "CategoryName": "CategoryName",
     "CategoryDisplayName": "CategoryDisplayName",
     "CategoryDescription": "CategoryDescription",
     "CategoryMediaResources": "CategoryMediaResources",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/sl.json

@@ -55,7 +55,7 @@
     "Menu:Category": "MenuCategory",
     "Category": "Category",
     "CategoryTenantId": "CategoryTenantId",
-    "CategoryParentCategoryId": "CategoryParentCategoryId",
+    "CategoryName": "CategoryName",
     "CategoryDisplayName": "CategoryDisplayName",
     "CategoryDescription": "CategoryDescription",
     "CategoryMediaResources": "CategoryMediaResources",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/tr.json

@@ -55,7 +55,7 @@
     "Menu:Category": "MenuCategory",
     "Category": "Category",
     "CategoryTenantId": "CategoryTenantId",
-    "CategoryParentCategoryId": "CategoryParentCategoryId",
+    "CategoryName": "CategoryName",
     "CategoryDisplayName": "CategoryDisplayName",
     "CategoryDescription": "CategoryDescription",
     "CategoryMediaResources": "CategoryMediaResources",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/vi.json

@@ -54,7 +54,7 @@
     "Menu:Category": "MenuCategory",
     "Category": "Category",
     "CategoryTenantId": "CategoryTenantId",
-    "CategoryParentCategoryId": "CategoryParentCategoryId",
+    "CategoryName": "CategoryName",
     "CategoryDisplayName": "CategoryDisplayName",
     "CategoryDescription": "CategoryDescription",
     "CategoryMediaResources": "CategoryMediaResources",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/zh-Hans.json

@@ -55,7 +55,7 @@
     "Menu:Category": "MenuCategory",
     "Category": "Category",
     "CategoryTenantId": "CategoryTenantId",
-    "CategoryParentCategoryId": "CategoryParentCategoryId",
+    "CategoryName": "CategoryName",
     "CategoryDisplayName": "CategoryDisplayName",
     "CategoryDescription": "CategoryDescription",
     "CategoryMediaResources": "CategoryMediaResources",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/zh-Hant.json

@@ -55,7 +55,7 @@
     "Menu:Category": "MenuCategory",
     "Category": "Category",
     "CategoryTenantId": "CategoryTenantId",
-    "CategoryParentCategoryId": "CategoryParentCategoryId",
+    "CategoryName": "CategoryName",
     "CategoryDisplayName": "CategoryDisplayName",
     "CategoryDescription": "CategoryDescription",
     "CategoryMediaResources": "CategoryMediaResources",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Categories/Category.cs

@@ -11,8 +11,9 @@ namespace EasyAbp.EShop.Products.Categories
     {
         public virtual Guid? TenantId { get; protected set; }
     
-        public virtual Guid? ParentCategoryId { get; protected set; }
-
+        [CanBeNull]
+        public virtual string Name { get; protected set; }
+        
         [CanBeNull]
         public virtual string Description { get; protected set; }
         
@@ -46,7 +47,7 @@ namespace EasyAbp.EShop.Products.Categories
         public Category(
             Guid id,
             Guid? tenantId,
-            Guid? parentCategoryId,
+            string name,
             string displayName,
             string description,
             string mediaResources,
@@ -54,7 +55,7 @@ namespace EasyAbp.EShop.Products.Categories
         ) :base(id)
         {
             TenantId = tenantId;
-            ParentCategoryId = parentCategoryId;
+            Name = name;
             DisplayName = displayName;
             Description = description;
             MediaResources = mediaResources;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/Index.cshtml

@@ -41,7 +41,7 @@
             <thead>
             <tr>
                 <th>@L["Actions"]</th>
-                <th>@L["CategoryParentCategoryId"]</th>
+                <th>@L["CategoryName"]</th>
                 <th>@L["CategoryDisplayName"]</th>
                 <th>@L["CategoryDescription"]</th>
                 <th>@L["CategoryMediaResources"]</th>

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/index.js

@@ -50,7 +50,7 @@ $(function () {
                         ]
                 }
             },
-            { data: "parentCategoryId" },
+            { data: "name" },
             { data: "displayName" },
             { data: "description" },
             { data: "mediaResources" },

samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/appsettings.json

@@ -1,6 +1,7 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=EShopSample;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=60.208.32.153;Database=fenghui01test;User Id=fenghui01test;Password=WYSytJdMORYnhTYmvf;Trusted_Connection=True;Integrated Security=false"
+
   },
   "IdentityServer": {
     "Clients": {

samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710144500_AddedNameAndRemovedParentCategoryId.cs

@@ -0,0 +1,33 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace EShopSample.Migrations
+{
+    public partial class AddedNameAndRemovedParentCategoryId : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ParentCategoryId",
+                table: "EShopProductsCategories");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Name",
+                table: "EShopProductsCategories",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Name",
+                table: "EShopProductsCategories");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ParentCategoryId",
+                table: "EShopProductsCategories",
+                type: "uniqueidentifier",
+                nullable: true);
+        }
+    }
+}

samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs

@@ -675,8 +675,8 @@ namespace EShopSample.Migrations
                     b.Property<string>("MediaResources")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<Guid?>("ParentCategoryId")
-                        .HasColumnType("uniqueidentifier");
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(max)");
 
                     b.Property<Guid?>("ParentId")
                         .HasColumnType("uniqueidentifier");