From 25ab9739a02704f97e2e896ee546cf79515821f2 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Mon, 6 Feb 2017 23:17:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91=E8=A1=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/WFFormService.cs | 16 +- .../Controllers/FormDesignController.cs | 27 +- .../Views/FormDesign/FormPreview.cshtml | 36 +++ .../Views/FormDesign/FrmBuider.cshtml | 259 ++++++++++++++++++ OpenAuth.Mvc/BllScripts/formDesign.js | 4 +- OpenAuth.Mvc/OpenAuth.Mvc.csproj | 2 + OpenAuth.Mvc/Views/Shared/_Layout.cshtml | 7 +- .../Models/Mapping/WFFrmMainMap.cs | 1 - 8 files changed, 336 insertions(+), 16 deletions(-) create mode 100644 OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FormPreview.cshtml create mode 100644 OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FrmBuider.cshtml diff --git a/OpenAuth.App/WFFormService.cs b/OpenAuth.App/WFFormService.cs index 483e64e1..cc9487f4 100644 --- a/OpenAuth.App/WFFormService.cs +++ b/OpenAuth.App/WFFormService.cs @@ -36,7 +36,7 @@ namespace OpenAuth.App } public GridData Load(int pageCurrent, int pageSize) - { + { var result = new GridData { page = pageCurrent @@ -48,5 +48,19 @@ namespace OpenAuth.App return result; } + + public void SaveForm(string keyValue, WFFrmMain entity) + { + + if (string.IsNullOrEmpty(keyValue)) + { + _unitWork.Add(entity); + } + else + { + _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 index 6ff202e8..b367966a 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs +++ b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs @@ -4,6 +4,8 @@ using System.Web.Mvc; using Infrastructure; using LeaRun.Util.WebControl; using OpenAuth.App; +using OpenAuth.App.SSO; +using OpenAuth.Domain; using OpenAuth.Domain.Service; using OpenAuth.Mvc.Controllers; @@ -134,14 +136,23 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers ///// 主键值 ///// 用户实体 ///// - //[HttpPost] - //[ValidateAntiForgeryToken] - //[AjaxOnly] - //public ActionResult SaveForm(string keyValue, WFFrmMainEntity userEntity) - //{ - // wfFrmMainBLL.SaveForm(keyValue, userEntity); - // return Success("操作成功。"); - //} + [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.Status = false; + Result.Message = e.Message; + } + return Result.ToJson(); + } ///// ///// （启用、禁用） ///// diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FormPreview.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FormPreview.cshtml new file mode 100644 index 00000000..e2474332 --- /dev/null +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FormPreview.cshtml @@ -0,0 +1,36 @@ +@{ + ViewBag.Title = "表单预览"; + Layout = "~/Views/Shared/_FlowForm.cshtml"; +} + +
+
+
+
+
+
\ No newline at end of file diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FrmBuider.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FrmBuider.cshtml new file mode 100644 index 00000000..b0bfbf3d --- /dev/null +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FrmBuider.cshtml @@ -0,0 +1,259 @@ +@{ + ViewBag.Title = "表单创建"; + Layout = "~/Views/Shared/_FlowForm.cshtml"; +} + + +
+
+
    +
  • 1基本配置
    • +
  • 2表单设计
    • +
  • 3创建完成
    • +
+
+
+
+
+ + 请你填写表单信息，用于创建或修改表单！ +
+
+
+

表单基本信息配置

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
表单编号* + +
表单名称* + +
是否建表* +
+
+
+ 备注 + + +
+
+
+
+
+
+
+
+
+ +

设计完成,请点击保存

+
+
+
+ +
diff --git a/OpenAuth.Mvc/BllScripts/formDesign.js b/OpenAuth.Mvc/BllScripts/formDesign.js index 9ed1ad07..98b3bba4 100644 --- a/OpenAuth.Mvc/BllScripts/formDesign.js +++ b/OpenAuth.Mvc/BllScripts/formDesign.js @@ -79,7 +79,7 @@ function edit() { skin: 'layui-layer-rim', //加上边框 area: ['1200px', '700px'], //宽高 maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FormDesign/FlowFrmBuider?keyValue=' + selected.Id + content: '/FlowManage/FormDesign/FrmBuider?keyValue=' + selected.Id }); } @@ -91,7 +91,7 @@ function add() { skin: 'layui-layer-rim', //加上边框 area: ['1200px', '700px'], //宽高 maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FormDesign/FlowFrmBuider', + content: '/FlowManage/FormDesign/FrmBuider', end: function() { list.reload(); } diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index a17e70b5..277a3a93 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -1169,6 +1169,8 @@ + + diff --git a/OpenAuth.Mvc/Views/Shared/_Layout.cshtml b/OpenAuth.Mvc/Views/Shared/_Layout.cshtml index 2a3e833b..b53cff74 100644 --- a/OpenAuth.Mvc/Views/Shared/_Layout.cshtml +++ b/OpenAuth.Mvc/Views/Shared/_Layout.cshtml @@ -32,8 +32,7 @@ - - + @@ -45,8 +44,8 @@ - - + + diff --git a/OpenAuth.Repository/Models/Mapping/WFFrmMainMap.cs b/OpenAuth.Repository/Models/Mapping/WFFrmMainMap.cs index dc755a4f..0a087f6d 100644 --- a/OpenAuth.Repository/Models/Mapping/WFFrmMainMap.cs +++ b/OpenAuth.Repository/Models/Mapping/WFFrmMainMap.cs @@ -53,7 +53,6 @@ namespace OpenAuth.Repository.Models.Mapping .IsOptional(); Property(t => t.FrmContent) .HasColumnName("FrmContent") - .HasMaxLength(16) .IsOptional(); Property(t => t.SortCode) .HasColumnName("SortCode")