From c617cde4c3cd60935397c26cd90dfd198f660bba Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Wed, 4 Mar 2020 17:12:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=20Task=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bootstrap.Admin/Views/Admin/Tasks.cshtml  | 194 +++++++++++-------
 src/admin/Bootstrap.Admin/wwwroot/js/tasks.js |   2 +-
 2 files changed, 126 insertions(+), 70 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Views/Admin/Tasks.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Tasks.cshtml
index 7dfc35c8..93774455 100644
--- a/src/admin/Bootstrap.Admin/Views/Admin/Tasks.cshtml
+++ b/src/admin/Bootstrap.Admin/Views/Admin/Tasks.cshtml
@@ -1,84 +1,56 @@
 @model TaskModel
 @{
     ViewBag.Title = "任务管理";
-    Layout = "_Default";
 }
 @section css {
+    <environment include="Development">
+        <link href="~/lib/bootstrap-table/bootstrap-table.css" rel="stylesheet" />
+    </environment>
+    <environment exclude="Development">
+        <link href="~/lib/bootstrap-table/bootstrap-table.min.css" rel="stylesheet" />
+    </environment>
+    <link href="~/lib/longbow-checkbox/longbow-checkbox.css" rel="stylesheet" />
     <link href="~/lib/longbow-select/longbow-select.css" rel="stylesheet" />
     <link href="~/css/tasks.css" rel="stylesheet" asp-append-version="true" />
 }
 @section javascript {
+    <environment include="Development">
+        <script src="~/lib/bootstrap-table/bootstrap-table.js"></script>
+        <script src="~/lib/bootstrap-table/extensions/export/bootstrap-table-export.js"></script>
+        <script src="~/lib/bootstrap-table/locale/bootstrap-table-zh-CN.js"></script>
+        <script src="~/lib/tablexport/tableExport.js"></script>
+        <script src="~/lib/validate/jquery.validate.js"></script>
+        <script src="~/lib/validate/localization/messages_zh.js"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="~/lib/bootstrap-table/bootstrap-table.min.js"></script>
+        <script src="~/lib/bootstrap-table/extensions/export/bootstrap-table-export.min.js"></script>
+        <script src="~/lib/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
+        <script src="~/lib/tablexport/tableExport.min.js"></script>
+        <script src="~/lib/validate/jquery.validate.min.js"></script>
+        <script src="~/lib/validate/localization/messages_zh.min.js"></script>
+    </environment>
+    <script src="~/lib/longbow-checkbox/longbow-checkbox.js"></script>
+    <script src="~/lib/longbow/longbow.dataentity.js" asp-append-version="true"></script>
+    <script src="~/lib/longbow/longbow.validate.js" asp-append-version="true"></script>
     <script src="~/lib/longbow-select/longbow-select.js"></script>
     <script src="~/js/tasks.js" asp-append-version="true"></script>
 }
-@section tableButtons {
-    <button class='pause btn btn-sm btn-warning' asp-auth="pause"><i class='fa fa-pause-circle'></i><span>暂停</span></button>
-    <button class='run btn btn-sm btn-success' asp-auth="pause"><i class='fa fa-play-circle'></i><span>运行</span></button>
-    <button class='info btn btn-sm btn-info' asp-auth="info"><i class='fa fa-info-circle'></i><span>日志</span></button>
-}
-@section modal {
-    <div class="modal-header">
-        <h5 class="modal-title" id="myModalLabel">任务编辑窗口</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    </div>
-    <div class="modal-body">
-        <div class="alert alert-danger" role="alert" asp-condition="@Model.IsDemo">
-            <span>演示系统禁止修改内置后台任务</span>
-        </div>
-        <form class="form-inline">
-            <div class="row">
-                <div class="form-group col-12">
-                    <label class="control-label" for="taskName">任务名称</label>
-                    <input type="text" class="form-control flex-sm-fill" id="taskName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
-                </div>
-                <div class="form-group col-12">
-                    <label class="control-label" for="taskCron">Cron表达式</label>
-                    <input class="form-control" data-toggle="lgbSelect" />
-                    <select data-toggle="lgbSelect" class="d-none" id="taskCron" data-default-val="*/5 * * * * *">
-                        @foreach (var task in Model.TaskTriggers)
-                        {
-                            <option value="@task.Value">@task.Key</option>
-                        }
-                    </select>
-                </div>
-                <div class="form-group col-12">
-                    <label class="control-label" for="taskContent">内置任务</label>
-                    <input class="form-control" data-toggle="lgbSelect" />
-                    <select data-toggle="lgbSelect" class="d-none" id="taskExecutor" data-default-val="Bootstrap.Admin.DefaultTaskExecutor">
-                        @foreach (var task in Model.TaskExecutors)
-                        {
-                            <option value="@task.Value">@task.Key</option>
-                        }
-                    </select>
-                </div>
-            </div>
-        </form>
-    </div>
-}
-@section customModal {
-    <div class="modal fade" id="dialogLog" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="taskModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="taskModalLabel">任务日志窗口</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                </div>
-                <div class="modal-body" style="background-color: #174482; color: #fff;">
-                    <div id="taskMsg" class="form-group" style="height: 500px; overflow: auto;">
-                        <div></div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <a class="btn"><i class="fa fa-check-square-o" style="width: 13px;"></i><span>自动滚屏</span></a>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">
-                        <i class="fa fa-times"></i>
-                        <span>关闭</span>
-                    </button>
-                </div>
-            </div>
+<div id="toolbar" class="d-none">
+    <div class="gear btn-group">
+        <button class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
+        <div class="dropdown-menu">
+            <a id="tb_add" href="#" title="新增" asp-auth="add"><i class="fa fa-plus"></i></a>
+            <a id="tb_delete" href="#" title="删除" asp-auth="del"><i class="fa fa-remove"></i></a>
+            <a id="tb_edit" href="#" title="编辑" asp-auth="edit"><i class="fa fa-pencil"></i></a>
         </div>
     </div>
-}
+    <div class="toolbar btn-group">
+        <button id="btn_add" type="button" class="btn btn-success" asp-auth="add"><i class="fa fa-plus" aria-hidden="true"></i><span>新增</span></button>
+        <button id="btn_delete" type="button" class="btn btn-danger" asp-auth="del"><i class="fa fa-remove" aria-hidden="true"></i><span>删除</span></button>
+        <button id="btn_edit" type="button" class="btn btn-primary" asp-auth="edit"><i class="fa fa-pencil" aria-hidden="true"></i><span>编辑</span></button>
+    </div>
+</div>
 <div class="card">
     <div class="card-header">任务介绍</div>
     <div class="card-body">
@@ -113,8 +85,92 @@
     </div>
     <div class="card-body">
         <div class="alert alert-danger" role="alert" asp-condition="@Model.IsDemo">
-            <span>演示系统禁止修改定时后台任务</span>
+            <span>演示系统禁止修改内置后台任务</span>
+        </div>
+        <table id='table'></table>
+    </div>
+</div>
+<div id="tableButtons" class="d-none">
+    <div class='btn-group'>
+        <button class='edit btn btn-sm btn-success' asp-auth="edit"><i class='fa fa-edit'></i><span>编辑</span></button>
+        <button class='del btn btn-sm btn-danger' asp-auth="del"><i class='fa fa-remove'></i><span>删除</span></button>
+        <button class='pause btn btn-sm btn-warning' asp-auth="pause"><i class='fa fa-pause-circle'></i><span>暂停</span></button>
+        <button class='run btn btn-sm btn-success' asp-auth="pause"><i class='fa fa-play-circle'></i><span>运行</span></button>
+        <button class='info btn btn-sm btn-info' asp-auth="info"><i class='fa fa-info-circle'></i><span>日志</span></button>
+    </div>
+</div>
+<div class="modal fade" id="dialogNew" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+        <div class="modal-content" data-toggle="LgbValidate" data-valid-button="#btnSubmit" data-valid-modal="#dialogNew">
+            <div class="modal-header">
+                <h5 class="modal-title" id="myModalLabel">任务编辑窗口</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            </div>
+            <div class="modal-body">
+                <div class="alert alert-danger" role="alert" asp-condition="@Model.IsDemo">
+                    <span>演示系统禁止修改内置后台任务</span>
+                </div>
+                <form class="form-inline">
+                    <div class="row">
+                        <div class="form-group col-12">
+                            <label class="control-label" for="taskName">任务名称</label>
+                            <input type="text" class="form-control flex-sm-fill" id="taskName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
+                        </div>
+                        <div class="form-group col-12">
+                            <label class="control-label" for="taskCron">Cron表达式</label>
+                            <input class="form-control" data-toggle="lgbSelect" />
+                            <select data-toggle="lgbSelect" class="d-none" id="taskCron" data-default-val="*/5 * * * * *">
+                                @foreach (var task in Model.TaskTriggers)
+                                {
+                                    <option value="@task.Value">@task.Key</option>
+                                }
+                            </select>
+                        </div>
+                        <div class="form-group col-12">
+                            <label class="control-label" for="taskContent">内置任务</label>
+                            <input class="form-control" data-toggle="lgbSelect" />
+                            <select data-toggle="lgbSelect" class="d-none" id="taskExecutor" data-default-val="Bootstrap.Admin.DefaultTaskExecutor">
+                                @foreach (var task in Model.TaskExecutors)
+                                {
+                                    <option value="@task.Value">@task.Key</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">
+                    <i class="fa fa-times"></i>
+                    <span>关闭</span>
+                </button>
+                <button type="button" class="btn btn-primary" id="btnSubmit">
+                    <i class="fa fa-save"></i>
+                    <span>保存</span>
+                </button>
+            </div>
+        </div>
+    </div>    
+</div>
+<div class="modal fade" id="dialogLog" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="taskModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="taskModalLabel">任务日志窗口</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            </div>
+            <div class="modal-body" style="background-color: #174482; color: #fff;">
+                <div id="taskMsg" class="form-group" style="height: 500px; overflow: auto;">
+                    <div></div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <a class="btn"><i class="fa fa-check-square-o" style="width: 13px;"></i><span>自动滚屏</span></a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">
+                    <i class="fa fa-times"></i>
+                    <span>关闭</span>
+                </button>
+            </div>
         </div>
-        <table></table>
     </div>
 </div>
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/tasks.js b/src/admin/Bootstrap.Admin/wwwroot/js/tasks.js
index 024bbc94..235da300 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/tasks.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/tasks.js
@@ -33,7 +33,7 @@
         return content;
     };
 
-    var $task = $('.card-body table').lgbTable({
+    var $task = $('#table').lgbTable({
         url: Tasks.url,
         dataBinder: {
             map: {