Revert "开始修改使select兼容json和html两种方式"

This reverts commit c0ed737c44 [formerly 8dc4e1562b84d7ba68848af46508440ca9bb7d2a].


Former-commit-id: ca0ae74875ed3bbddb22eafe38961594cb03563f

projects/Infrastructure/Views/Shared/DisplayTemplates/MultiSelectList.cshtml

@@ -1,8 +1,8 @@
-@model List<SelectListItem>
+@model List<Guid>
 @if (Model != null && Model.Count > 0)
 {
-    foreach (var item in Model)
+    foreach (var id in Model)
     {
-        <a href="javascript:;" class="btn btn-default btn-xs">@item.Text</a>
+        <a href="javascript:;" class="btn btn-default btn-xs">@ViewData.Get(id)</a>
     }
 }

projects/IoT.Shared/Application/Models/Users/EditUserModel.cs

@@ -1,5 +1,5 @@
 using Infrastructure.Application;
-using Microsoft.AspNetCore.Mvc.Rendering;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
@@ -18,6 +18,6 @@ namespace Application.Models
 
         [DataType("MultiSelectList")]
         [Display(Name = "角色")]
-        public List<SelectListItem> Roles { get; set; } = new List<SelectListItem>();
+        public List<Guid> Roles { get; set; } = new List<Guid>();
     }
 }

projects/IoT.Shared/Areas/Admin/Controlls/Users/UserController.cs

@@ -6,9 +6,7 @@ using Infrastructure.Extensions;
 using Infrastructure.Web.Mvc;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
-using System;
 using System.Linq;
 
 namespace IoT.Shared.Areas.Admin.Controllers
@@ -32,29 +30,33 @@ namespace IoT.Shared.Areas.Admin.Controllers
 
         public override void ToDisplayModel(User entity, EditUserModel model)
         {
-            model.Roles = entity.UserRoles.Select(o => new SelectListItem { Value = o.RoleId.ToString(), Text = o.Role.Name }).ToList();
+            model.Roles = entity.UserRoles.Select(o => o.RoleId).ToList();
-            //entity.UserRoles.ForEach(o => ViewData.Add(o.RoleId, o.Role.Name));
+            entity.UserRoles.ForEach(o => ViewData.Add(o.RoleId, o.Role.Name));
         }
 
         public override void ToEditModel(User entity, EditUserModel model)
         {
-            this.ViewData.MultiSelectList(o => model.Roles, () => this._ajax.GetRoleMultiSelectList(model.Roles.Select(o => Guid.Parse(o.Value))));
+            if (entity != null)
+            {
+                model.Roles = entity.UserRoles.Select(o => o.RoleId).ToList();
+            }
+            this.ViewData.MultiSelectList(o => model.Roles, () => this._ajax.GetRoleMultiSelectList(model.Roles));
         }
 
         public override void ToEntity(EditUserModel model, User entity)
         {
-            foreach (var roleId in entity.UserRoles.Select(o => o.RoleId).ToList())
+            foreach (var id in entity.UserRoles.Select(o => o.RoleId).ToList())
             {
-                if (!model.Roles.Any(o => o.Value == roleId.ToString()))
+                if (!model.Roles.Any(o => o == id))
                 {
-                    entity.UserRoles.RemoveAll(o => o.RoleId == roleId);
+                    entity.UserRoles.RemoveAll(o => o.RoleId == id);
                 }
             }
-            foreach (var role in model.Roles)
+            foreach (var id in model.Roles)
             {
-                if (!entity.UserRoles.Any(o => o.RoleId.ToString() == role.Value))
+                if (!entity.UserRoles.Any(o => o.RoleId == id))
                 {
-                    entity.UserRoles.Add(new UserRole { RoleId = Guid.Parse(role.Value) });
+                    entity.UserRoles.Add(new UserRole { RoleId = id });
                 }
             }
         }