wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 72bcb5dd9030a00fe60074366b83e5837c790251
Former-commit-id: 9841cfaccc70602d19b288d5df88fdd8aec5678b
1.0
wanggang 5 years ago
parent f728a29fa5
commit 3dc4fd2288
5 changed files with 1200 additions and 108 deletions
Show Stats Download Patch File Download Diff File

22
labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml
Unescape View File

@ -12,12 +12,17 @@
<div class="card card-info"> <div class="card card-info">
<form action="@url" method="post" class="form-horizontal"> <form action="@url" method="post" class="form-horizontal">
<div class="card-body"> <div class="card-body">
<div class="row">
@Html.AntiForgeryToken() @Html.AntiForgeryToken()
<div class="col-sm-6">
<div class="form-group row"> <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") @Html.ValidationSummary(true, "错误:", new { @class = "text-danger col-sm-6" }, "div")
<div class="col-sm-4"></div> <div class="col-sm-4"></div>
</div> </div>
</div>
</div>
<div class="row">
@foreach (var prop in props) @foreach (var prop in props)
{ {
var metadata = prop as Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelMetadata; var metadata = prop as Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelMetadata;
@ -48,8 +53,9 @@
continue; continue;
} }
var uihit = prop.DataTypeName ?? prop.TemplateHint; var uihit = prop.DataTypeName ?? prop.TemplateHint;
<div class="col-sm-6">
<div class="form-group row @prop.ModelType.Name @uihit"> <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"> <div class="col-sm-4">
@if (isReadOnly) @if (isReadOnly)
{ {
@ -70,7 +76,7 @@
} }
@Html.ValidationMessage(prop.PropertyName, new { @class = "text-danger" }) @Html.ValidationMessage(prop.PropertyName, new { @class = "text-danger" })
</div> </div>
<div class="col-sm-4"> <div class="col-sm-3">
@{ @{
if (metadata != null) if (metadata != null)
{ {
@ -83,13 +89,17 @@
} }
</div> </div>
</div> </div>
</div>
} }
<div id="ajax"> <div id="ajax">
@(await Html.PartialAsync("_Ajax", Model as object)) @(await Html.PartialAsync("_Ajax", Model as object))
</div> </div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group row"> <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)) @if (!DisableBackUrl && string.IsNullOrEmpty(BackUrl))
{ {
BackUrl = Url.Action("Index", null); BackUrl = Url.Action("Index", null);
@ -107,5 +117,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</form> </form>
</div> </div>

1
labs/Teacher/TeacherExt/Controllers/HomeController.cs
Unescape View File

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

3
labs/Teacher/TeacherExt/Models/EditTeacherModel.cs
Unescape View File

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

47
labs/Teacher/TeacherExt/Views/Home/_Script.cshtml
Unescape View File

@ -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 () { $('#IsJobAsMaxTitle').change(function () {
if ($(this).val() === "true") { 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 { 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 () { $('#EducationGrade').change(function () {
if ($(this).val()) { if ($(this).val()) {
$("#EducationGradeDate").parents('.form-group').show(); $("#EducationGradeDate").parents('.@cls').show();
} }
else { 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 () { $('#HasPosition').change(function () {
if ($(this).val() === "true") { 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 { 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 () { $('#IsMiddleLevel').change(function () {
if ($(this).val() === "true") { 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 { 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> </script>

1077
labs/Teacher/TeacherExt/wwwroot/edit.html
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save