From e9890b771a9ce21f0e7d5d7f333b0222490b25d1 Mon Sep 17 00:00:00 2001 From: hogan Date: Tue, 22 Jan 2019 18:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85=E5=90=8E=E5=8F=B0js=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E7=BC=96=E5=86=99=E6=96=87=E6=A1=A3=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=88=97=E8=A1=A8=E3=80=81=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controllers/DocumentController.cs | 12 + .../Admin/Views/Document/DocContent.cshtml | 100 ++---- .../Document/DocContentEditModule.cshtml | 61 ++++ .../Areas/Admin/Views/Document/Index.cshtml | 27 +- .../FreeSql.Site.UI/wwwroot/js/common.js | 4 +- .../wwwroot/layui/css/layui.css | 4 +- .../wwwroot/layui/css/layui.mobile.css | 2 +- .../wwwroot/layui/css/modules/code.css | 2 +- .../css/modules/laydate/default/laydate.css | 2 +- .../layui/css/modules/layer/default/layer.css | 2 +- .../wwwroot/layui/font/iconfont.eot | Bin 37712 -> 40844 bytes .../wwwroot/layui/font/iconfont.svg | 310 ++++++++++-------- .../wwwroot/layui/font/iconfont.ttf | Bin 37536 -> 40668 bytes .../wwwroot/layui/font/iconfont.woff | Bin 24684 -> 26744 bytes .../wwwroot/layui/lay/modules/carousel.js | 2 +- .../wwwroot/layui/lay/modules/code.js | 2 +- .../wwwroot/layui/lay/modules/colorpicker.js | 2 + .../wwwroot/layui/lay/modules/element.js | 4 +- .../wwwroot/layui/lay/modules/flow.js | 2 +- .../wwwroot/layui/lay/modules/form.js | 4 +- .../wwwroot/layui/lay/modules/jquery.js | 2 +- .../wwwroot/layui/lay/modules/laydate.js | 4 +- .../wwwroot/layui/lay/modules/layedit.js | 4 +- .../wwwroot/layui/lay/modules/layer.js | 4 +- .../wwwroot/layui/lay/modules/laypage.js | 4 +- .../wwwroot/layui/lay/modules/laytpl.js | 2 +- .../wwwroot/layui/lay/modules/mobile.js | 2 +- .../wwwroot/layui/lay/modules/rate.js | 2 + .../wwwroot/layui/lay/modules/slider.js | 2 + .../wwwroot/layui/lay/modules/table.js | 4 +- .../wwwroot/layui/lay/modules/tree.js | 2 +- .../wwwroot/layui/lay/modules/upload.js | 4 +- .../wwwroot/layui/lay/modules/util.js | 4 +- .../wwwroot/layui/layui.all.js | 6 +- .../FreeSql.Site.UI/wwwroot/layui/layui.js | 4 +- 35 files changed, 331 insertions(+), 261 deletions(-) create mode 100644 Examples/website/FreeSql.Site.UI/Areas/Admin/Views/Document/DocContentEditModule.cshtml create mode 100644 Examples/website/FreeSql.Site.UI/wwwroot/layui/lay/modules/colorpicker.js create mode 100644 Examples/website/FreeSql.Site.UI/wwwroot/layui/lay/modules/rate.js create mode 100644 Examples/website/FreeSql.Site.UI/wwwroot/layui/lay/modules/slider.js diff --git a/Examples/website/FreeSql.Site.UI/Areas/Admin/Controllers/DocumentController.cs b/Examples/website/FreeSql.Site.UI/Areas/Admin/Controllers/DocumentController.cs index ca0acd43..74919875 100644 --- a/Examples/website/FreeSql.Site.UI/Areas/Admin/Controllers/DocumentController.cs +++ b/Examples/website/FreeSql.Site.UI/Areas/Admin/Controllers/DocumentController.cs @@ -12,6 +12,7 @@ using FreeSql.Site.UI.Common; using FreeSql.Site.UI.Controllers; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Rendering; namespace FreeSql.Site.UI.Areas.Admin.Controllers { @@ -80,6 +81,17 @@ namespace FreeSql.Site.UI.Areas.Admin.Controllers }); } + public ActionResult DocContentEditModule(string id) + { + ViewBag.DocumentTypeList = DocumentTypeDAL.Query(w => w.Status == 1).Select(s => new SelectListItem { Text = s.TypeName, Value = s.ID.ToString() }).ToList(); + DocumentContent model = new DocumentContent(); + if (!string.IsNullOrEmpty(id)) + { + model = DocumentContentDAL.GetByOne(w => w.ID == 1); + } + return View(model); + } + // POST: Documents/Create [HttpPost] //[ValidateAntiForgeryToken] diff --git a/Examples/website/FreeSql.Site.UI/Areas/Admin/Views/Document/DocContent.cshtml b/Examples/website/FreeSql.Site.UI/Areas/Admin/Views/Document/DocContent.cshtml index 203cb73e..16fb90a6 100644 --- a/Examples/website/FreeSql.Site.UI/Areas/Admin/Views/Document/DocContent.cshtml +++ b/Examples/website/FreeSql.Site.UI/Areas/Admin/Views/Document/DocContent.cshtml @@ -6,68 +6,10 @@ -
+ +
+ +