From 3dc4fd2288b9b350d00f67d27c6fe5272402f4e5 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 31 Dec 2020 15:20:45 +0800 Subject: [PATCH] update Former-commit-id: 72bcb5dd9030a00fe60074366b83e5837c790251 Former-commit-id: 9841cfaccc70602d19b288d5df88fdd8aec5678b --- .../Shared/EditorTemplates/Object.cshtml | 180 +-- .../TeacherExt/Controllers/HomeController.cs | 1 - .../TeacherExt/Models/EditTeacherModel.cs | 3 +- .../TeacherExt/Views/Home/_Script.cshtml | 47 +- labs/Teacher/TeacherExt/wwwroot/edit.html | 1077 +++++++++++++++++ 5 files changed, 1200 insertions(+), 108 deletions(-) create mode 100644 labs/Teacher/TeacherExt/wwwroot/edit.html diff --git a/labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml b/labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml index d29f7afe..17aad0d8 100644 --- a/labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml +++ b/labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml @@ -12,99 +12,111 @@
- @Html.AntiForgeryToken() -
-
- @Html.ValidationSummary(true, "错误:", new { @class = "text-danger col-sm-6" }, "div") -
+
+ @Html.AntiForgeryToken() +
+
+
+ @Html.ValidationSummary(true, "错误:", new { @class = "text-danger col-sm-6" }, "div") +
+
+
- @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")) - { - continue; - } - if (isHidden) - { - @Html.Hidden(prop.PropertyName) - continue; - } - if (action == "Edit") +
+ @foreach (var prop in props) { - isReadOnly = isReadOnly || metadata.Attributes.Attributes.Any(o => o.GetType() == typeof(ReadOnlyForEditAttribute)); - } - if (scope != null && scope == ControllerScopeType.Organ && prop.PropertyName == "OrganId") - { - @Html.Hidden(prop.PropertyName) - continue; - } - if (prop.HideSurroundingHtml || isDisplayOnly) - { - @Html.Hidden(prop.PropertyName) - continue; - } - var uihit = prop.DataTypeName ?? prop.TemplateHint; -
- @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = "col-sm-4 col-form-label" }) -
- @if (isReadOnly) - { -
- @Html.Hidden(prop.PropertyName) - @Html.Display(prop.PropertyName, uihit) -
- } - else - { - var checkedProp = props.FirstOrDefault(o => o.PropertyName == prop.PropertyName + "Checked"); + 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")) + { + continue; + } + if (isHidden) + { + @Html.Hidden(prop.PropertyName) + continue; + } + if (action == "Edit") + { + isReadOnly = isReadOnly || metadata.Attributes.Attributes.Any(o => o.GetType() == typeof(ReadOnlyForEditAttribute)); + } + if (scope != null && scope == ControllerScopeType.Organ && prop.PropertyName == "OrganId") + { + @Html.Hidden(prop.PropertyName) + continue; + } + if (prop.HideSurroundingHtml || isDisplayOnly) + { + @Html.Hidden(prop.PropertyName) + continue; + } + var uihit = prop.DataTypeName ?? prop.TemplateHint; +
+
+ @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = "col-sm-3 col-form-label" }) +
+ @if (isReadOnly) + { +
+ @Html.Hidden(prop.PropertyName) + @Html.Display(prop.PropertyName, uihit) +
+ } + else + { + var checkedProp = props.FirstOrDefault(o => o.PropertyName == prop.PropertyName + "Checked"); - @Html.Editor(prop.PropertyName, uihit) - @if (checkedProp != null) + @Html.Editor(prop.PropertyName, uihit) + @if (checkedProp != null) + { + @Html.CheckBox(checkedProp.PropertyName, new { disabled = "disabled" }) + } + } + @Html.ValidationMessage(prop.PropertyName, new { @class = "text-danger" }) +
+
+ @{ + if (metadata != null) + { + var attr = metadata.Attributes.Attributes.OfType().FirstOrDefault() as DescriptionAttribute; + if (attr != null && attr.Description != null) + { + @attr.Description + } + } + } +
+
+
+ } +
+ @(await Html.PartialAsync("_Ajax", Model as object)) +
+
+
+
+
+
+
+ @if (!DisableBackUrl && string.IsNullOrEmpty(BackUrl)) { - @Html.CheckBox(checkedProp.PropertyName,new { disabled= "disabled" }) + BackUrl = Url.Action("Index", null); + + 返回 + } - } - @Html.ValidationMessage(prop.PropertyName, new { @class = "text-danger" }) -
-
- @{ - if (metadata != null) + + @if (AfterSubmit) { - var attr = metadata.Attributes.Attributes.OfType().FirstOrDefault() as DescriptionAttribute; - if (attr != null && attr.Description != null) - { - @attr.Description - } + @(await Html.PartialAsync("_AfterSubmit", Model as object)) } - } +
- } -
- @(await Html.PartialAsync("_Ajax", Model as object)) -
-
-
-
- @if (!DisableBackUrl && string.IsNullOrEmpty(BackUrl)) - { - BackUrl = Url.Action("Index", null); - - 返回 - - } - - @if (AfterSubmit) - { - @(await Html.PartialAsync("_AfterSubmit", Model as object)) - } -
diff --git a/labs/Teacher/TeacherExt/Controllers/HomeController.cs b/labs/Teacher/TeacherExt/Controllers/HomeController.cs index 4a7be6e8..26d0431b 100644 --- a/labs/Teacher/TeacherExt/Controllers/HomeController.cs +++ b/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; diff --git a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs b/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs index d450a2e5..5448ad40 100644 --- a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs +++ b/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] diff --git a/labs/Teacher/TeacherExt/Views/Home/_Script.cshtml b/labs/Teacher/TeacherExt/Views/Home/_Script.cshtml index 0b88bbc8..52a930c5 100644 --- a/labs/Teacher/TeacherExt/Views/Home/_Script.cshtml +++ b/labs/Teacher/TeacherExt/Views/Home/_Script.cshtml @@ -1,50 +1,53 @@ - \ No newline at end of file diff --git a/labs/Teacher/TeacherExt/wwwroot/edit.html b/labs/Teacher/TeacherExt/wwwroot/edit.html new file mode 100644 index 00000000..cd5ad919 --- /dev/null +++ b/labs/Teacher/TeacherExt/wwwroot/edit.html @@ -0,0 +1,1077 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ +
+ +
+
+
+

+
+
+
    +
  1. 首页
    2. + +
  2. +
+
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+ +
+
+ + 测试数据 +
+ +
+
+ 是否使用已有字段：所属单位/学校 +
+
+
+
+
+ +
+ +
+
+ （1）是否使用已有字段：教师状态（2）选型项不一致 +
+
+
+
+
+ +
+ +
+
+ 使用并修改已有字段[教师姓名]为[姓名] +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 使用并修改已有字段[出生日期]为[出生年月] +
+
+
+
+
+ +
+ +
+
+ 是否保留[其他]选择项？是否按照国标设置？ +
+
+
+
+
+ +
+ +
+
+ 以 省/自治区/直辖市 + 区/县 等形式填写 +
+
+
+
+
+ +
+ +
+
+ 是否必填 +
+
+
+
+
+ +
+ +
+
+ 是否必填 +
+
+
+
+
+ +
+ +
+
+ 是否必填 +
+
+
+
+
+ +
+ +
+
+ 是否必填 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 是否必填 +
+
+
+
+
+ +
+ +
+
+ 是否必填 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 如：乡村教师职评、暂未岗位变更、新考/调入等 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 是否必填 +
+
+
+
+
+ +
+ +
+
+ excel单元格提供的选项和批注提供的不一致 +
+
+
+
+
+ +
+ +
+
+ 是否提示【以文件为准】 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 是否提示【以文件为准】 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 是否提示【填写毕业院校全称】 +
+
+
+
+
+ +
+ +
+
+ 是否提示【严格按照毕业证书填写】 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 是否提示【填写毕业院校全称】 +
+
+
+
+
+ +
+ +
+
+ 是否提示【严格按照毕业证书填写】 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 是否提示【选择项中没有则手动填写】 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 选择项中没有则手动填写 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 是否提示【选择项中没有则手动填写】 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 是否显示【填写所教学科全称】 +
+
+
+
+
+ +
+ +
+
+ 是否显示【长期病假 产假 挂职 支教 其他（请写出具体原因）】 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+ 是否提示【严格按照资格证书填写】 +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + 返回 + + +
+
+
+
+
+
+
+ +
+
+ + + +
+
+

+ 版权所有 v 1.0.0.0 +

+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file