update

Former-commit-id: 72bcb5dd9030a00fe60074366b83e5837c790251
Former-commit-id: 9841cfaccc70602d19b288d5df88fdd8aec5678b

labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml

@@ -12,19 +12,24 @@
 <div class="card card-info">
     <form action="@url" method="post" class="form-horizontal">
         <div class="card-body">
+            <div class="row">
                 @Html.AntiForgeryToken()
+                <div class="col-sm-6">
                     <div class="form-group row">
-                <div class="col-sm-2 col-form-label"></div>
+                        <div class="col-sm-4 col-form-label"></div>
                         @Html.ValidationSummary(true, "错误:", new { @class = "text-danger col-sm-6" }, "div")
                         <div class="col-sm-4"></div>
                     </div>
+                </div>
+            </div>
+            <div class="row">
                 @foreach (var prop in props)
                 {
                     var metadata = prop as Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelMetadata;
                     var isReadOnly = metadata.Attributes.Attributes.Any(o => o.GetType() == typeof(ReadOnlyAttribute));
                     var isDisplayOnly = metadata.Attributes.Attributes.Any(o => o.GetType() == typeof(DisplayOnlyAttribute));
                     var isHidden = metadata.Attributes.Attributes.Any(o => o.GetType() == typeof(HiddenInputAttribute));
-                if(prop.PropertyName.EndsWith("Checked"))
+                    if (prop.PropertyName.EndsWith("Checked"))
                     {
                         continue;
                     }
@@ -48,8 +53,9 @@
                         continue;
                     }
                     var uihit = prop.DataTypeName ?? prop.TemplateHint;
+                    <div class="col-sm-6">
                         <div class="form-group row @prop.ModelType.Name @uihit">
-                    @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = "col-sm-4 col-form-label" })
+                            @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = "col-sm-3 col-form-label" })
                             <div class="col-sm-4">
                                 @if (isReadOnly)
                                 {
@@ -65,12 +71,12 @@
                                     @Html.Editor(prop.PropertyName, uihit)
                                     @if (checkedProp != null)
                                     {
-                                @Html.CheckBox(checkedProp.PropertyName,new { disabled= "disabled" })
+                                        @Html.CheckBox(checkedProp.PropertyName, new { disabled = "disabled" })
                                     }
                                 }
                                 @Html.ValidationMessage(prop.PropertyName, new { @class = "text-danger" })
                             </div>
-                    <div class="col-sm-4">
+                            <div class="col-sm-3">
                                 @{
                                     if (metadata != null)
                                     {
@@ -83,13 +89,17 @@
                                 }
                             </div>
                         </div>
+                    </div>
                 }
                 <div id="ajax">
                     @(await Html.PartialAsync("_Ajax", Model as object))
                 </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
                     <div class="form-group row">
-                <div class="col-sm-4"> </div>
+                        <div class="col-sm-3"> </div>
-                <div class="col-sm-8">
+                        <div class="col-sm-9">
                             @if (!DisableBackUrl && string.IsNullOrEmpty(BackUrl))
                             {
                                 BackUrl = Url.Action("Index", null);
@@ -107,5 +117,7 @@
                         </div>
                     </div>
                 </div>
+            </div>
+        </div>
     </form>
 </div>

labs/Teacher/TeacherExt/Controllers/HomeController.cs

@@ -9,7 +9,6 @@ using Microsoft.Extensions.Logging;
 using System;
 using System.Globalization;
 using System.Linq;
-using System.Text.RegularExpressions;
 using TeacherExt.Entities;
 using TeacherExt.Models;
 

labs/Teacher/TeacherExt/Models/EditTeacherModel.cs

@@ -520,7 +520,8 @@ namespace TeacherExt.Models
 
         [SkipSearch, SkipList]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 560, Name = "现家庭详细地址（街道-门牌号）")]
+        [Header("现家庭详细地址（街道-门牌号）")]
+        [Display(Order = 560, Name = "详细地址（街道-门牌号）")]
         public string CurrentAddressStreat { get; set; }
 
         [SkipSearch, SkipList]

labs/Teacher/TeacherExt/Views/Home/_Script.cshtml

@@ -1,50 +1,53 @@
-<script>
+@{ 
-    $("[data-my-group='JobAsMaxTitle1']").parents('.form-group').hide();
+    var cls = "col-sm-6";
-    $("[data-my-group='JobAsMaxTitle2']").parents('.form-group').hide();
+}
+<script>
+    $("[data-my-group='JobAsMaxTitle1']").parents('.@cls').hide();
+    $("[data-my-group='JobAsMaxTitle2']").parents('.@cls').hide();
     $('#IsJobAsMaxTitle').change(function () {
         if ($(this).val() === "true") {
-            $("[data-my-group='JobAsMaxTitle2']").parents('.form-group').hide();
+            $("[data-my-group='JobAsMaxTitle2']").parents('.@cls').hide();
-            $("[data-my-group='JobAsMaxTitle1']").parents('.form-group').show();
+            $("[data-my-group='JobAsMaxTitle1']").parents('.@cls').show();
         }
         else {
-            $("[data-my-group='JobAsMaxTitle1']").parents('.form-group').hide();
+            $("[data-my-group='JobAsMaxTitle1']").parents('.@cls').hide();
-            $("[data-my-group='JobAsMaxTitle2']").parents('.form-group').show();
+            $("[data-my-group='JobAsMaxTitle2']").parents('.@cls').show();
         }
     });
     //
-    $("#EducationGradeDate").parents('.form-group').hide();
+    $("#EducationGradeDate").parents('.@cls').hide();
     $('#EducationGrade').change(function () {
         if ($(this).val()) {
-            $("#EducationGradeDate").parents('.form-group').show();
+            $("#EducationGradeDate").parents('.@cls').show();
         }
         else {
-            $("#EducationGradeDate").val('').parents('.form-group').hide();
+            $("#EducationGradeDate").val('').parents('.@cls').hide();
         }
     });
     //
-    $("[data-my-group='HasPosition1']").parents('.form-group').hide();
+    $("[data-my-group='HasPosition1']").parents('.@cls').hide();
-    $("[data-my-group='HasPosition2']").parents('.form-group').hide();
+    $("[data-my-group='HasPosition2']").parents('.@cls').hide();
     $('#HasPosition').change(function () {
         if ($(this).val() === "true") {
-            $("[data-my-group='HasPosition2']").parents('.form-group').hide();
+            $("[data-my-group='HasPosition2']").parents('.@cls').hide();
-            $("[data-my-group='HasPosition1']").parents('.form-group').show();
+            $("[data-my-group='HasPosition1']").parents('.@cls').show();
         }
         else {
-            $("[data-my-group='HasPosition1']").parents('.form-group').hide();
+            $("[data-my-group='HasPosition1']").parents('.@cls').hide();
-            $("[data-my-group='HasPosition2']").parents('.form-group').show();
+            $("[data-my-group='HasPosition2']").parents('.@cls').show();
         }
     });
     //
-    $("[data-my-group='HasPosition11']").parents('.form-group').hide();
+    $("[data-my-group='HasPosition11']").parents('.@cls').hide();
-    $("[data-my-group='HasPosition12']").parents('.form-group').hide();
+    $("[data-my-group='HasPosition12']").parents('.@cls').hide();
     $('#IsMiddleLevel').change(function () {
         if ($(this).val() === "true") {
-            $("[data-my-group='HasPosition12']").parents('.form-group').hide();
+            $("[data-my-group='HasPosition12']").parents('.@cls').hide();
-            $("[data-my-group='HasPosition11']").parents('.form-group').show();
+            $("[data-my-group='HasPosition11']").parents('.@cls').show();
         }
         else {
-            $("[data-my-group='HasPosition11']").parents('.form-group').hide();
+            $("[data-my-group='HasPosition11']").parents('.@cls').hide();
-            $("[data-my-group='HasPosition12']").parents('.form-group').show();
+            $("[data-my-group='HasPosition12']").parents('.@cls').show();
         }
     });
 </script>