From 0f9c5fa96623d144d41c3cd2beb62f349b9168c0 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 21 Jul 2020 17:02:16 +0800
Subject: [PATCH] update

Former-commit-id: b931c1232a5c462765897c316f5de98752c3f2eb
Former-commit-id: 37d818ed138ff5ca9260355ced6513cdffbcd9e2
---
 .../Shared/DisplayTemplates/Object.cshtml     | 11 ++++++--
 .../Views/Shared/EditorTemplates/Input.cshtml | 26 +++++--------------
 .../Views/Shared/_Index_Row.cshtml            | 11 +++++++-
 projects/WebMVC/appsettings.Development.json  |  2 +-
 .../wwwroot/router/shared/edit/boolean.html   |  2 +-
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/projects/Infrastructure/Views/Shared/DisplayTemplates/Object.cshtml b/projects/Infrastructure/Views/Shared/DisplayTemplates/Object.cshtml
index c25e3abd..ab744cb9 100644
--- a/projects/Infrastructure/Views/Shared/DisplayTemplates/Object.cshtml
+++ b/projects/Infrastructure/Views/Shared/DisplayTemplates/Object.cshtml
@@ -4,11 +4,18 @@
             @foreach (var prop in ViewData.ModelMetadata.Properties.Where(pm => pm.ShowForEdit && !pm.HideSurroundingHtml))
             {
                 var uihit = prop.DataTypeName ?? prop.TemplateHint;
-                <div class="form-group row">
+                <div class="form-group row" title="@uihit">
                     @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = "col-sm-2 col-form-label" })
                     <div class="col-sm-8">
                         <div class="form-control form-control-display">
-                            @Html.Display(prop.PropertyName, prop.DataTypeName ?? prop.TemplateHint)
+                            @if (prop.UnderlyingOrModelType == typeof(bool))
+                            {
+                                @Html.CheckBox(prop.PropertyName, new { disabled = "disabled", style = "width:20px;height:20px;margin:2px 0;" })
+                            }
+                            else
+                            {
+                                @Html.Display(prop.PropertyName, uihit)
+                            }
                         </div>
                     </div>
                 </div>
diff --git a/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml b/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml
index bb66c06d..9c8bced7 100644
--- a/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml
+++ b/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml
@@ -6,7 +6,7 @@
 @foreach (var prop in ViewData.ModelMetadata.Properties.Where(pm => pm.ShowForEdit))
 {
     var metadata = prop as Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelMetadata;
-    object propValue = Model == null ? (prop.ModelType.IsValueType ? Activator.CreateInstance(prop.ModelType) : null) : null;
+    object propValue = Model == null ? (prop.ModelType.IsValueType ? Activator.CreateInstance(prop.ModelType) : null) : ViewData.ModelMetadata.ModelType.GetProperty(prop.PropertyName).GetValue(ViewData.Model);
     if (prop.HideSurroundingHtml)
     {
         @Html.Hidden(prop.PropertyName)
@@ -18,25 +18,13 @@
         var htmlClass = "col-sm-2 col-form-label";
         htmlClass += isRequired ? " required" : "";
         <div class="form-group row">
-            @if (prop.ModelType != typeof(bool))
-            {
-                @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = htmlClass })
-            }
-            else
-            {
-                <div class="col-sm-2"></div>
-            }
+            @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = htmlClass })
             <div class="col-sm-8">
                 @if (metadata.Attributes.Attributes.Any(o => o.GetType() == typeof(System.ComponentModel.ReadOnlyAttribute)))
                 {
-
                     <div class="form-control form-control-display">
                         @Html.Hidden(prop.PropertyName)
                         @Html.Display(prop.PropertyName, prop.DataTypeName ?? prop.TemplateHint)
-                        @if (prop.ModelType == typeof(bool))
-                        {
-                            @Html.Label(prop.PropertyName, prop.DisplayName + "：", new { @class = "form-check-label" })
-                        }
                     </div>
                 }
                 else if (!string.IsNullOrEmpty(uihit) && !(uihit == "EmailAddress" || uihit == "PhoneNumber"))
@@ -60,15 +48,13 @@
                             @Html.TextBox(prop.PropertyName, null, new { @class = inputClass })
                         }
                     }
-                    else if (prop.ModelType == typeof(bool))
+                    else if (prop.ModelType == typeof(bool) || prop.UnderlyingOrModelType == typeof(bool))
                     {
-                        <div class="form-group">
-                            <div class="form-check">
-                                @Html.CheckBox(prop.PropertyName, new { @class = "form-check-input" })
-                                @Html.Label(prop.PropertyName, prop.DisplayName, new { @class = "form-check-label" })
-                            </div>
+                        <div style="padding:9px 0;">
+                            @Html.CheckBox(prop.PropertyName, new { style = "width:20px;height:20px;" })
                         </div>
                     }
+
                     else
                     {
                         @Html.TextBox(prop.PropertyName, null, new { @class = inputClass })
diff --git a/projects/Infrastructure/Views/Shared/_Index_Row.cshtml b/projects/Infrastructure/Views/Shared/_Index_Row.cshtml
index 8c290e24..50454838 100644
--- a/projects/Infrastructure/Views/Shared/_Index_Row.cshtml
+++ b/projects/Infrastructure/Views/Shared/_Index_Row.cshtml
@@ -2,6 +2,15 @@
     foreach (var prop in props)
     {
         var templateName = prop.DataTypeName ?? prop.TemplateHint ?? (prop.ModelType == typeof(string) ? typeof(string).Name : null);
-        <td style="max-width:10em;" data-ext="@templateName">@Html.Display(prop.PropertyName, templateName)</td>
+        <td style="max-width:10em;" data-ext="@templateName">
+            @if (prop.UnderlyingOrModelType == typeof(bool))
+            {
+                @Html.CheckBox(prop.PropertyName, new { disabled = "disabled", style = "width:20px;height:20px;margin:2px 0;" })
+            }
+            else
+            {
+                @Html.Display(prop.PropertyName, templateName)
+            }
+        </td>
     }
 }
\ No newline at end of file
diff --git a/projects/WebMVC/appsettings.Development.json b/projects/WebMVC/appsettings.Development.json
index 8983e0fc..45fe774a 100644
--- a/projects/WebMVC/appsettings.Development.json
+++ b/projects/WebMVC/appsettings.Development.json
@@ -6,4 +6,4 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/boolean.html b/projects/WebMVC/wwwroot/router/shared/edit/boolean.html
index 087b58cb..e4b8f332 100644
--- a/projects/WebMVC/wwwroot/router/shared/edit/boolean.html
+++ b/projects/WebMVC/wwwroot/router/shared/edit/boolean.html
@@ -1,7 +1,7 @@
 <template>
     <div v-if="nullable">
         <select class="form-control" :id="name" :name="currentName" v-model="currentValue">
-            <option :value="null">全部</option>
+            <option :value="null">选择</option>
             <option value="true">是</option>
             <option value="false">否</option>
         </select>