update

Former-commit-id: d66520adb41660d5763d8e9179138002ad961591
Former-commit-id: 12d1aa5780fe7693caa103265a18df33f83b0255

labs/Teacher/TeacherExt/Controllers/HomeController.cs

@@ -383,8 +383,7 @@ namespace TeacherExt.Controllers
         {
             var style = this.CreateStyle(sheet);
 
-            CreateHader(sheet, model);
+            var headers = CreateHader(sheet, model);
-            return;
             var list = this.Query(model)
                 .ToList()
                 .Select(o =>
@@ -409,6 +408,8 @@ namespace TeacherExt.Controllers
                 rowIndex = i + 4;
                 colIndex = -1;
                 var row = sheet.CreateRow(rowIndex);
+                teacher.DisplayOrder = rowNumber;
+                
                 row.Order(00).CreateCell(++colIndex).SetStyle(style).SetType(CellType.Numeric).SetCellValue(rowNumber);
                // this.IsExport(teacher);
                 row.Order(01).CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(teacher.Organ);
@@ -573,7 +574,7 @@ namespace TeacherExt.Controllers
             var colIndex = 0;
             foreach (var item in headers)
             {
-                if (model.Headers.Contains(item.Header))
+                if (!model.Headers.Any()||model.Headers.Contains(item.Header))
                 {
                     result.Add(item.Header);
                     int i = 0;

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

@@ -65,22 +65,23 @@
                     </div>
                     <div class="row">
                         <div class="col-12">
-                            <table>
+                            <div class="row table">
-                                <tr>
+                                <div class="col-sm-3"><label class="th"><input type="checkbox" class="select_all" />全选</label></div>
-                                    <th><label><input type="checkbox" class="select_all" />全选</label></th>
+                                @{
-                                    @{
+                                    var list = typeof(EditTeacherModel).GetProperties()
-                                        var list = typeof(EditTeacherModel).GetProperties()
+                                        .Select(o => o.GetCustomAttribute<ExcelHeaderAttribute>())
-                                            .Select(o => o.GetCustomAttribute<ExcelHeaderAttribute>())
+                                        .Where(o => o != null)
-                                            .Where(o=>o!=null)
+                                        .ToList();
-                                            .ToList();
+                                    foreach (var item in list)
-                                        foreach (var item in list)
+                                    {
-                                        {
+                                        var display = item.Headers.Last().Key.Replace("\r\n", "");
-                                            var raw = Model.Headers.Contains(item.Header) ? "checked=\"checked\"" : "";
+                                        var raw = Model.Headers.Contains(item.Header) ? "checked=\"checked\"" : "";
-                                            <td><label><input type="checkbox" name="headers" value="@item.Header" @Html.Raw(raw) />@item.Headers.Last().Key</label></td>
+                                        <div class="col-sm-3">
-                                        }
+                                            <label title="@display" class="td" style="width:100%;white-space:nowrap;text-overflow:ellipsis;overflow: hidden;word-break: break-all;"><input type="checkbox" name="headers" value="@item.Header" @Html.Raw(raw) />@display</label>
+                                        </div>
                                     }
-                                </tr>
+                                }
-                            </table>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -182,6 +183,47 @@
     </style>
 }
 @section scripts{
+<script>
+    $(function () {
+        $(function () {
+            $('.th :checkbox').change(function () {
+                if ($(this).is(':checked')) {
+                    $(this).parents('.table').find(':checkbox').not(':checked').prop("checked", true);
+                }
+                else {
+                    $(this).parents('.table').find(':checkbox').filter(':checked').prop("checked", false);
+                }
+            });
+            $('.td :checkbox').change(function () {
+                var parent = $(this).parents('.table').find('.th :checkbox');
+                var children = $(this).parents('.table').find('.td :checkbox');
+                if ($(this).is(':checked')) {
+                    if (parent.not(':checked')) {
+                        if (children.not(':checked').length === 0) {
+                            parent.prop("indeterminate", false);
+                            parent.prop("checked", true);
+                        }
+                        else {
+                            parent.prop("indeterminate", true);
+                        }
+                    }
+                }
+                else {
+                    if (parent.prop("checked") || parent.prop("indeterminate")) {
+                        if (children.filter(':checked').length === 0) {
+                            parent.prop("indeterminate", false);
+                            parent.prop("checked", false);
+                        }
+                        else {
+                            parent.prop("indeterminate", true);
+                        }
+                    }
+                }
+            });
+        });
+    });
+
+</script>
     <script>
         $('[data-action]').click(function () {
             $(this).parents('form').attr('action', $(this).attr('data-action'));