From 1763bd7bad7908b9c3cef4e20cda20323519e7d8 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Wed, 28 Feb 2018 17:34:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86form=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/FormApp.cs | 23 +- OpenAuth.App/OpenAuth.App.csproj | 1 - OpenAuth.App/WFFormService.cs | 59 -- .../Controllers/FormDesignController.cs | 129 ---- OpenAuth.Mvc/Controllers/FormsController.cs | 5 +- OpenAuth.Mvc/OpenAuth.Mvc.csproj | 2 +- OpenAuth.Mvc/Views/Forms/builder.cshtml | 104 +--- OpenAuth.Mvc/Views/Forms/index.cshtml | 271 ++++----- OpenAuth.Mvc/userJs/forms.js | 404 +++++++++++++ .../Domain/{WFFrmMain.cs => Form.cs} | 52 +- .../Mapping/{WFFrmMainMap.cs => FormMap.cs} | 57 +- .../OpenAuth.Repository.csproj | 4 +- OpenAuth.Repository/OpenAuthDBContext.cs | 6 +- 数据库设计关系图/OpenAuthDB.apm | 563 +++++++++--------- 数据库设计关系图/OpenAuthDB.pdm | 535 ++++++++--------- 15 files changed, 1120 insertions(+), 1095 deletions(-) delete mode 100644 OpenAuth.App/WFFormService.cs delete mode 100644 OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs create mode 100644 OpenAuth.Mvc/userJs/forms.js rename OpenAuth.Repository/Domain/{WFFrmMain.cs => Form.cs} (65%) rename OpenAuth.Repository/Mapping/{WFFrmMainMap.cs => FormMap.cs} (61%) diff --git a/OpenAuth.App/FormApp.cs b/OpenAuth.App/FormApp.cs index 2c56bb77..668e5753 100644 --- a/OpenAuth.App/FormApp.cs +++ b/OpenAuth.App/FormApp.cs @@ -1,12 +1,11 @@ -using System.Linq; -using OpenAuth.App.Request; +using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; namespace OpenAuth.App { - public class FormApp : BaseApp + public class FormApp : BaseApp
{ public RevelanceManagerApp ReleManagerApp { get; set; } @@ -15,30 +14,24 @@ namespace OpenAuth.App /// public TableData Load(QueryFormListReq request) { - var forms = UnitWork.Find(null) - .OrderBy(u => u.FrmCode) - .Skip((request.page - 1) * request.limit) - .Take(request.limit); - - + return new TableData { count = Repository.GetCount(null), - data = forms, + data = Repository.Find(request.page, request.limit,"CreateDate desc") }; } - public void Add(WFFrmMain obj) + public void Add(Form obj) { Repository.Add(obj); } - public void Update(WFFrmMain obj) + public void Update(Form obj) { - UnitWork.Update(u => u.Id == obj.Id, u => new WFFrmMain + UnitWork.Update(u => u.Id == obj.Id, u => new Form { - FrmCode = obj.FrmCode, - FrmContent = obj.FrmContent + //todo:要修改的 }); } diff --git a/OpenAuth.App/OpenAuth.App.csproj b/OpenAuth.App/OpenAuth.App.csproj index 7a3c2c94..c3544bf9 100644 --- a/OpenAuth.App/OpenAuth.App.csproj +++ b/OpenAuth.App/OpenAuth.App.csproj @@ -122,7 +122,6 @@ - diff --git a/OpenAuth.App/WFFormService.cs b/OpenAuth.App/WFFormService.cs deleted file mode 100644 index 4742303a..00000000 --- a/OpenAuth.App/WFFormService.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using OpenAuth.App.Response; -using OpenAuth.Repository.Domain; -using OpenAuth.Repository.Interface; - -namespace OpenAuth.App -{ - /// - /// 表单服务 - /// 李玉宝新增于2017-01-13 17:48:00 - /// - public class WFFormService - { - public IUnitWork _unitWork { get; set; } - - public List GetAllList() - { - return _unitWork.Find(null).ToList(); - } - - public WFFrmMain GetForm(string keyValue) - { - return _unitWork.FindSingle(u => u.Id == keyValue); - } - - public void RemoveForm(string[] keyValue) - { - _unitWork.Delete(u =>keyValue.Contains(u.Id)); - } - - public TableData Load(int pageCurrent, int pageSize) - { - var result = new TableData - { - count = _unitWork.Find(null).Count(), - data = _unitWork.Find(pageCurrent, pageSize, "ModifyDate descending", null).ToList() - }; - - - return result; - } - - public void SaveForm(string keyValue, WFFrmMain entity) - { - - if (string.IsNullOrEmpty(keyValue)) - { - _unitWork.Add(entity); - } - else - { - entity.Id = keyValue; - _unitWork.Update(u =>u.Id, entity); - } - _unitWork.Save(); - } - } -} diff --git a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs deleted file mode 100644 index fb827fc9..00000000 --- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs +++ /dev/null @@ -1,129 +0,0 @@ -using System; -using System.Linq; -using System.Web.Mvc; -using Infrastructure; -using OpenAuth.App; -using OpenAuth.App.SSO; -using OpenAuth.Mvc.Controllers; -using OpenAuth.Repository.Domain; - -namespace OpenAuth.Mvc.Areas.FlowManage.Controllers -{ - - public class FormDesignController : BaseController - { - public WFFormService WfFrmMainBll { get; set; } - - #region 视图功能 - /// - /// 管理 - /// - /// - [HttpGet] - public ActionResult Index() - { - return View(); - } - - /// - /// 预览表单 - /// - /// - [HttpGet] - public ActionResult FormPreview() - { - return View(); - } - /// - /// 创建表单 - /// - /// - [HttpGet] - public ActionResult FrmBuider() - { - return View(); - } - #endregion - - #region 获取数据 - - public string Load(int pageCurrent = 1, int pageSize = 30) - { - return JsonHelper.Instance.Serialize(WfFrmMainBll.Load(pageCurrent, pageSize)); - } - - /// - /// 设置表单 - /// - /// 主键 - /// - [HttpGet] - public ActionResult GetFormJson(string keyValue) - { - var data = WfFrmMainBll.GetForm(keyValue); - return Content(data.ToJson()); - } - - /// - /// 获取表单数据all - /// - /// - [HttpGet] - public ActionResult GetAllListJson() - { - var data = WfFrmMainBll.GetAllList(); - - var result = data.Select(u => new - { - id = u.Id.ToString(), - text = u.FrmName, - value = u.Id.ToString(), - isexpand = true, - complete = true, - hasChildren = false, - parentId = "0", - Attribute = "Sort", - AttributeValue = "Frm" - }); - return Content(result.ToJson()); - } - #endregion - - #region 提交数据 - /// - /// 删除表单模板 - /// - /// 主键值 - /// - [HttpPost] - public string RemoveForm(string[] ids) - { - WfFrmMainBll.RemoveForm(ids); - return Result.ToJson(); - } - ///// - ///// 保存用户表单（新增、修改） - ///// - ///// 主键值 - ///// 用户实体 - ///// - [HttpPost] - public string SaveForm(string keyValue, WFFrmMain userEntity) - { - try - { - var user = AuthUtil.GetCurrentUser(); - userEntity.ModifyUserId = user.User.Account; - userEntity.ModifyUserName = user.User.Name; - WfFrmMainBll.SaveForm(keyValue, userEntity); - } - catch (Exception e) - { - Result.Code = 500; - Result.Message = e.Message; - } - return Result.ToJson(); - } - #endregion - } -} diff --git a/OpenAuth.Mvc/Controllers/FormsController.cs b/OpenAuth.Mvc/Controllers/FormsController.cs index 5be4e7ab..3811989b 100644 --- a/OpenAuth.Mvc/Controllers/FormsController.cs +++ b/OpenAuth.Mvc/Controllers/FormsController.cs @@ -27,7 +27,8 @@ namespace OpenAuth.Mvc.Controllers //添加或修改 [System.Web.Mvc.HttpPost] - public string Add(WFFrmMain obj) + [ValidateInput(false)] + public string Add(Form obj) { try { @@ -44,7 +45,7 @@ namespace OpenAuth.Mvc.Controllers //添加或修改 [System.Web.Mvc.HttpPost] - public string Update(WFFrmMain obj) + public string Update(Form obj) { try { diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index fef01962..6698edb1 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -143,7 +143,6 @@ - @@ -605,6 +604,7 @@ + Designer diff --git a/OpenAuth.Mvc/Views/Forms/builder.cshtml b/OpenAuth.Mvc/Views/Forms/builder.cshtml index e6eea4a8..2091d69f 100644 --- a/OpenAuth.Mvc/Views/Forms/builder.cshtml +++ b/OpenAuth.Mvc/Views/Forms/builder.cshtml @@ -3,108 +3,10 @@ } + + + -
- - -
- - 提醒：单选框和复选框，如：{|-选项-|}两边边界是防止误删除控件，程序会把它们替换为空，请不要手动删除！ -
- -
-
- - - -
-
- -
-
- -
diff --git a/OpenAuth.Mvc/Views/Forms/index.cshtml b/OpenAuth.Mvc/Views/Forms/index.cshtml index ff9b8ce7..7f37de67 100644 --- a/OpenAuth.Mvc/Views/Forms/index.cshtml +++ b/OpenAuth.Mvc/Views/Forms/index.cshtml @@ -7,33 +7,32 @@
+
    + lay-filter="list" lay-size="sm"> - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +
    表单模板Id表单编号表单名称表单分类数据表关联表的主键是否需要建表0不建表,1建表表单内容排序码删除标记数据库Id有效备注创建时间创建用户主键创建用户修改时间修改用户主键修改用户
    表单模板Id表单名称字段个数表单中的字段数据表单替换的模板 经过处理表单原html模板未经处理的排序码删除标记数据库Id有效备注创建时间创建用户主键创建用户修改时间修改用户主键修改用户
    @@ -43,134 +42,96 @@