lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-07-16 16:50:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复删除流程模版，列表分页问题，添加模版预览功能

Browse Source
This commit is contained in:
yubaolee 2017-01-24 16:04:17 +08:00
parent 4bd51b0264
commit f0f32036f9
15 changed files with 91 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenAuth.App/WFProcessInstanceService.cs
View File

@ -333,21 +333,22 @@ namespace OpenAuth.App
page = pageCurrent page = pageCurrent
}; };
var cnt = _unitWork.Find<WFProcessInstance>(u => u.CreateUserId == userid).Count();
if (type == "inbox") //待办事项 if (type == "inbox") //待办事项
{ {
result.total = _unitWork.Find<WFProcessInstance>(u => u.CreateUserId == userid).Count(); result.total = cnt%pageSize == 0? cnt/pageSize : cnt/pageSize + 1;
result.rows = _unitWork.Find<WFProcessInstance>(pageCurrent, pageSize, "CreateDate descending", null).ToList(); result.rows = _unitWork.Find<WFProcessInstance>(pageCurrent, pageSize, "CreateDate descending", null).ToList();
} }
else if (type == "outbox") //已办事项 else if (type == "outbox") //已办事项
{ {
result.total = _unitWork.Find<WFProcessInstance>(u => u.CreateUserId == userid).Count(); result.total = cnt % pageSize == 0 ? cnt / pageSize : cnt / pageSize + 1;
result.rows = _unitWork.Find<WFProcessInstance>(pageCurrent, pageSize, "CreateDate descending", null).ToList(); result.rows = _unitWork.Find<WFProcessInstance>(pageCurrent, pageSize, "CreateDate descending", null).ToList();
} }
else //我的流程 else //我的流程
{ {
result.total = _unitWork.Find<WFProcessInstance>(u => u.CreateUserId == userid).Count(); result.total = cnt % pageSize == 0 ? cnt / pageSize : cnt / pageSize + 1;
result.rows = _unitWork.Find<WFProcessInstance>(pageCurrent, pageSize, "CreateDate descending", null).ToList(); result.rows = _unitWork.Find<WFProcessInstance>(pageCurrent, pageSize, "CreateDate descending", null).ToList();
} }

12
OpenAuth.App/WFSchemeService.cs
View File

@ -2,9 +2,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenAuth.App.ViewModel; using OpenAuth.App.ViewModel;
using OpenAuth.Domain;
using OpenAuth.Domain.Interface; using OpenAuth.Domain.Interface;
namespace OpenAuth.Domain.Service namespace OpenAuth.App
{ {
/// <summary> /// <summary>
/// 流程设计服务 /// 流程设计服务
@ -79,10 +80,10 @@ namespace OpenAuth.Domain.Service
} }
} }
public void RemoveForm(Guid keyValue) public void RemoveForm(Guid[] keyValue)
{ {
_unitWork.Delete<WFSchemeInfo>(u => u.Id == keyValue); _unitWork.Delete<WFSchemeInfo>(u =>keyValue.Contains(u.Id));
_unitWork.Delete<WFSchemeContent>(u =>u.SchemeInfoId == keyValue); _unitWork.Delete<WFSchemeContent>(u =>keyValue.Contains(u.SchemeInfoId));
} }
public WFSchemeInfo GetEntity(Guid keyValue) public WFSchemeInfo GetEntity(Guid keyValue)
@ -113,7 +114,8 @@ namespace OpenAuth.Domain.Service
page = pageCurrent page = pageCurrent
}; };
result.total = _unitWork.Find<WFSchemeInfo>(null).Count(); int cnt = _unitWork.Find<WFSchemeInfo>(null).Count();
result.total = cnt%pageSize ==0?cnt/pageSize:cnt/pageSize+1;
result.rows = _unitWork.Find<WFSchemeInfo>(pageCurrent, pageSize, "ModifyDate descending", null).ToList(); result.rows = _unitWork.Find<WFSchemeInfo>(pageCurrent, pageSize, "ModifyDate descending", null).ToList();
return result; return result;

4
OpenAuth.Domain/Service/WFFormService.cs
View File

@ -28,9 +28,9 @@ namespace OpenAuth.Domain.Service
return _unitWork.FindSingle<WFFrmMain>(u => u.Id == keyValue); return _unitWork.FindSingle<WFFrmMain>(u => u.Id == keyValue);
} }
public void RemoveForm(Guid keyValue) public void RemoveForm(Guid[] keyValue)
{ {
_unitWork.Delete<WFFrmMain>(u =>u.Id == keyValue); _unitWork.Delete<WFFrmMain>(u =>keyValue.Contains(u.Id));
} }
} }
} }

27
OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs
View File

@ -9,6 +9,7 @@ using OpenAuth.App;
using OpenAuth.App.SSO; using OpenAuth.App.SSO;
using OpenAuth.Domain; using OpenAuth.Domain;
using OpenAuth.Domain.Service; using OpenAuth.Domain.Service;
using OpenAuth.Mvc.Controllers;
namespace OpenAuth.Mvc.Areas.FlowManage.Controllers namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
{ {
@ -17,7 +18,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
/// 流程设计 /// 流程设计
/// <para>李玉宝新增于2017-01-12 19:41:56</para> /// <para>李玉宝新增于2017-01-12 19:41:56</para>
/// </summary> /// </summary>
public class FlowDesignController :Controller public class FlowDesignController :BaseController
{ {
private WFSchemeService wfFlowInfoBLL; private WFSchemeService wfFlowInfoBLL;
private UserManagerApp userBLL; private UserManagerApp userBLL;
@ -38,6 +39,18 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
{ {
return View(); return View();
} }
/// <summary>
/// 预览
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult PreviewIndex()
{
return View();
}
/// <summary> /// <summary>
/// 表单 /// 表单
/// </summary> /// </summary>
@ -116,11 +129,10 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
/// <param name="keyValue">主键值</param> /// <param name="keyValue">主键值</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[ValidateAntiForgeryToken] public string RemoveForm(Guid[] ids)
public ActionResult RemoveForm(Guid keyValue)
{ {
wfFlowInfoBLL.RemoveForm(keyValue); wfFlowInfoBLL.RemoveForm(ids);
return Content("删除成功。"); return Result.ToJson();
} }
/// <summary> /// <summary>
/// 保存用户表单（新增、修改） /// 保存用户表单（新增、修改）
@ -129,13 +141,12 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
/// <param name="userEntity">用户实体</param> /// <param name="userEntity">用户实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[ValidateAntiForgeryToken] public string SaveForm(string keyValue, string InfoEntity, string ContentEntity, string shcemeAuthorizeData)
public ActionResult SaveForm(string keyValue, string InfoEntity, string ContentEntity, string shcemeAuthorizeData)
{ {
WFSchemeInfo entyity = InfoEntity.ToObject<WFSchemeInfo>(); WFSchemeInfo entyity = InfoEntity.ToObject<WFSchemeInfo>();
WFSchemeContent contententity = ContentEntity.ToObject<WFSchemeContent>(); WFSchemeContent contententity = ContentEntity.ToObject<WFSchemeContent>();
wfFlowInfoBLL.SaveForm(keyValue, entyity, contententity); wfFlowInfoBLL.SaveForm(keyValue, entyity, contententity);
return Content("操作成功。"); return Result.ToJson();
} }
/// <summary> /// <summary>
/// （启用、禁用） /// （启用、禁用）

16
OpenAuth.Mvc/Areas/FlowManage/Controllers/CommonAppliesController.cs → OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs
View File

@ -11,10 +11,10 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
/// 通用申请流程处理 /// 通用申请流程处理
/// <para>李玉宝新增于2016-09-08 19:21:59</para> /// <para>李玉宝新增于2016-09-08 19:21:59</para>
/// </summary> /// </summary>
public class CommonAppliesController : Controller public class FlowInstancesController : BaseController
{ {
private WFProcessInstanceService _app; private WFProcessInstanceService _app;
public CommonAppliesController() public FlowInstancesController()
{ {
_app = AutofacExt.GetFromFac<WFProcessInstanceService>(); _app = AutofacExt.GetFromFac<WFProcessInstanceService>();
} }
@ -56,17 +56,17 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
{ {
foreach (var id in ids) foreach (var id in ids)
{ {
_app.DeleteProcess(id); _app.DeleteProcess(id);
} }
return Result.ToJson();
} }
catch (Exception ex) catch (Exception e)
{ {
Result.Status = false;
throw; Result.Message = e.Message;
return Result.ToJson();
} }
return string.Empty;
} }

10
OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowLaunchController.cs
View File

@ -31,15 +31,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
{ {
return View(); return View();
} }
/// <summary>
/// 预览
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult PreviewIndex()
{
return View();
}
/// <summary> /// <summary>
/// 创建流程实例视图 /// 创建流程实例视图
/// </summary> /// </summary>

24
OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs
View File

@ -1,24 +1,21 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.UI.WebControls;
using Infrastructure; using Infrastructure;
using LeaRun.Util.WebControl; using LeaRun.Util.WebControl;
using OpenAuth.App;
using OpenAuth.Domain;
using OpenAuth.Domain.Service; using OpenAuth.Domain.Service;
using OpenAuth.Mvc.Controllers;
namespace OpenAuth.Mvc.Areas.FlowManage.Controllers namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
{ {
public class FormDesignController : Controller public class FormDesignController : BaseController
{ {
private WFFormService wfFrmMainBLL; private readonly WFFormService _wfFrmMainBll;
public FormDesignController() public FormDesignController()
{ {
wfFrmMainBLL = AutofacExt.GetFromFac<WFFormService>(); _wfFrmMainBll = AutofacExt.GetFromFac<WFFormService>();
} }
#region 视图功能 #region 视图功能
@ -70,7 +67,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet] [HttpGet]
public ActionResult GetTreeJson() public ActionResult GetTreeJson()
{ {
var data = wfFrmMainBLL.GetAllList(); var data = _wfFrmMainBll.GetAllList();
var treeList = new List<TreeEntity>(); var treeList = new List<TreeEntity>();
foreach (var item in data) foreach (var item in data)
{ {
@ -97,7 +94,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet] [HttpGet]
public ActionResult GetFormJson(Guid keyValue) public ActionResult GetFormJson(Guid keyValue)
{ {
var data = wfFrmMainBLL.GetForm(keyValue); var data = _wfFrmMainBll.GetForm(keyValue);
return Content(data.ToJson()); return Content(data.ToJson());
} }
@ -108,7 +105,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet] [HttpGet]
public ActionResult GetAllListJson() public ActionResult GetAllListJson()
{ {
var data = wfFrmMainBLL.GetAllList(); var data = _wfFrmMainBll.GetAllList();
return Content(data.ToJson()); return Content(data.ToJson());
} }
#endregion #endregion
@ -117,13 +114,12 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
/// <summary> /// <summary>
/// 删除表单模板 /// 删除表单模板
/// </summary> /// </summary>
/// <param name="keyValue">主键值</param> /// <param name="ids">主键值</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[ValidateAntiForgeryToken] public ActionResult RemoveForm(Guid[] ids)
public ActionResult RemoveForm(Guid keyValue)
{ {
wfFrmMainBLL.RemoveForm(keyValue); _wfFrmMainBll.RemoveForm(ids);
return Content("删除成功。"); return Content("删除成功。");
} }
///// <summary> ///// <summary>

34
OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/Index.cshtml
View File

@ -7,39 +7,25 @@
<ul class="breadcrumb"> <ul class="breadcrumb">
<li> <li>
<i class="ace-icon fa fa-home home-icon"></i> <i class="ace-icon fa fa-home home-icon"></i>
<a href="#">申请管理</a> <a href="#">流程模版</a>
</li> </li>
<li class="active">列表</li> <li class="active">列表</li>
</ul><!-- /.breadcrumb --> </ul><!-- /.breadcrumb -->
</div> </div>
<!-- /section:basics/content.breadcrumbs -->
<div class="page-content"> <div class="page-content">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"> <div class="widget-box widget-color-blue">
<div class="widget-box widget-color-blue"> <div class="widget-header">
<div class="widget-header"> @Html.Action("MenuHeader", "Home", new {area=""})
</div>
<div class="widget-body">
<div class="widget-main">
<ul id="orgtree" class="ztree" style="width: 100%"></ul>
</div>
</div>
</div> </div>
</div> <div class="widget-body gridwidth">
<div class="col-md-9"> <div class="widget-main">
<div class="widget-box widget-color-blue"> <div class="row">
<div class="widget-header"> <div class="col-md-12 ">
@Html.Action("MenuHeader", "Home", new {area=""}) <table id="maingrid"></table>
</div> <div id="grid-pager"></div>
<div class="widget-body gridwidth">
<div class="widget-main">
<div class="row">
<div class="col-md-12 ">
<table id="maingrid"></table>
<div id="grid-pager"></div>
</div>
</div> </div>
</div> </div>
</div> </div>

0
OpenAuth.Mvc/Areas/FlowManage/Views/FlowLaunch/PreviewIndex.cshtml → OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/PreviewIndex.cshtml
View File

2
OpenAuth.Mvc/Areas/FlowManage/Views/CommonApplies/Index.cshtml → OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/Index.cshtml
View File

@ -50,7 +50,7 @@
</div><!-- /.page-content --> </div><!-- /.page-content -->
<script src="~/BllScripts/grid.js"></script> <script src="~/BllScripts/grid.js"></script>
<script src="~/BllScripts/commonApply.js"></script> <script src="~/BllScripts/flowInstance.js"></script>
<script src="~/BllScripts/jqEvent.js"></script> <script src="~/BllScripts/jqEvent.js"></script>

0
OpenAuth.Mvc/Areas/FlowManage/Views/CommonApplies/ProcessLookForm.cshtml → OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/ProcessLookForm.cshtml
View File

21
OpenAuth.Mvc/BllScripts/flowDesign.js
View File

@ -62,7 +62,7 @@ var list = new MainGrid();
//删除 //删除
function del() { function del() {
list.del("Code", "/WorkflowSchemas/Del", function () { list.del("Id", "/FlowManage/FlowDesign/RemoveForm", function () {
list.reload(); list.reload();
}); });
} }
@ -99,6 +99,25 @@ function add() {
}); });
} }
//预览
function preview() {
var selected = list.getSelectedObj();
if (selected == null) {
return;
}
layer.open({
type: 2,
skin: 'layui-layer-rim', //加上边框
area: ['1200px', '700px'], //宽高
maxmin: true, //开启最大化最小化按钮
content: '/FlowManage/FlowDesign/PreviewIndex?keyValue=' + selected.Id + "&schemeVersion=" + selected.SchemeVersion,
end: function () {
list.reload();
}
});
}
//创建新实例 //创建新实例
function addInstance() { function addInstance() {

6
OpenAuth.Mvc/BllScripts/commonApply.js → OpenAuth.Mvc/BllScripts/flowInstance.js
View File

@ -41,7 +41,7 @@ var selectScheme = function(val) {
//grid列表模块 //grid列表模块
function MainGrid() { function MainGrid() {
var url = "/CommonApplies/Load?type="; var url = "/FlowInstances/Load?type=";
var selectedId = "me"; //ztree选中的模块 var selectedId = "me"; //ztree选中的模块
this.maingrid = $("#maingrid") this.maingrid = $("#maingrid")
.jqGrid({ .jqGrid({
@ -129,7 +129,7 @@ var vm = new Vue({
//删除 //删除
function del() { function del() {
list.del("Id", list.del("Id",
"/CommonApplies/Delete", "/FlowInstances/Delete",
function() { function() {
list.reload(); list.reload();
ztree.reload(); ztree.reload();
@ -158,7 +158,7 @@ function detail() {
title: selected.Name, title: selected.Name,
skin: "layui-layer-rim", //加上边框 skin: "layui-layer-rim", //加上边框
area: ["800px", "600px"], //宽高 area: ["800px", "600px"], //宽高
content: "/FlowManage/CommonApplies/ProcessLookForm?processSchemeId=" + selected.ProcessSchemeId + "&activityId="+selected.ActivityId, content: "/FlowManage/FlowInstances/ProcessLookForm?processSchemeId=" + selected.ProcessSchemeId + "&activityId="+selected.ActivityId,
maxmin: true, //开启最大化最小化按钮 maxmin: true, //开启最大化最小化按钮
end: function() { end: function() {
list.reload(); list.reload();

2
OpenAuth.Mvc/BllScripts/processDetail.js
View File

@ -37,7 +37,7 @@ wfdesignerRedraw();
$(function () { $(function () {
$(".workflowcmd") $(".workflowcmd")
.on("click", function () { //执行命令 .on("click", function () { //执行命令
$.post("/CommonApplies/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() , $.post("/FlowInstances/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() ,
function (data) { function (data) {
if (data.Status) { if (data.Status) {
location.reload(); location.reload();

10
OpenAuth.Mvc/OpenAuth.Mvc.csproj
View File

@ -151,7 +151,7 @@
<Compile Include="Controllers\BaseController.cs" /> <Compile Include="Controllers\BaseController.cs" />
<Compile Include="Controllers\CategoryManagerController.cs" /> <Compile Include="Controllers\CategoryManagerController.cs" />
<Compile Include="Controllers\ErrorController.cs" /> <Compile Include="Controllers\ErrorController.cs" />
<Compile Include="Areas\FlowManage\Controllers\CommonAppliesController.cs" /> <Compile Include="Areas\FlowManage\Controllers\FlowInstancesController.cs" />
<Compile Include="Controllers\HomeController.cs" /> <Compile Include="Controllers\HomeController.cs" />
<Compile Include="Controllers\LoginController.cs" /> <Compile Include="Controllers\LoginController.cs" />
<Compile Include="Controllers\ModuleElementManagerController.cs" /> <Compile Include="Controllers\ModuleElementManagerController.cs" />
@ -192,7 +192,7 @@
<Content Include="BllScripts\queryString.js" /> <Content Include="BllScripts\queryString.js" />
<Content Include="BllScripts\resourceManager.js" /> <Content Include="BllScripts\resourceManager.js" />
<Content Include="BllScripts\roleManager.js" /> <Content Include="BllScripts\roleManager.js" />
<Content Include="BllScripts\commonApply.js" /> <Content Include="BllScripts\flowInstance.js" />
<Content Include="BllScripts\flowDesign.js" /> <Content Include="BllScripts\flowDesign.js" />
<Content Include="BllScripts\stockManager.js" /> <Content Include="BllScripts\stockManager.js" />
<Content Include="BllScripts\usermanager.js" /> <Content Include="BllScripts\usermanager.js" />
@ -1467,10 +1467,10 @@
<Content Include="Areas\FlowManage\Views\FlowMyProcess\Index.cshtml" /> <Content Include="Areas\FlowManage\Views\FlowMyProcess\Index.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowMyProcess\ProcessAgainNewForm.cshtml" /> <Content Include="Areas\FlowManage\Views\FlowMyProcess\ProcessAgainNewForm.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowMyProcess\ProcessLookForm.cshtml" /> <Content Include="Areas\FlowManage\Views\FlowMyProcess\ProcessLookForm.cshtml" />
<Content Include="Areas\FlowManage\Views\CommonApplies\ProcessLookForm.cshtml" /> <Content Include="Areas\FlowManage\Views\FlowInstances\ProcessLookForm.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowLaunch\FlowProcessNewForm.cshtml" /> <Content Include="Areas\FlowManage\Views\FlowLaunch\FlowProcessNewForm.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowLaunch\Index.cshtml" /> <Content Include="Areas\FlowManage\Views\FlowLaunch\Index.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowLaunch\PreviewIndex.cshtml" /> <Content Include="Areas\FlowManage\Views\FlowDesign\PreviewIndex.cshtml" />
<None Include="Properties\PublishProfiles\default.pubxml" /> <None Include="Properties\PublishProfiles\default.pubxml" />
<None Include="Views\Error\NoAccess.cshtml" /> <None Include="Views\Error\NoAccess.cshtml" />
<Content Include="Views\Home\git.cshtml" /> <Content Include="Views\Home\git.cshtml" />
@ -1491,7 +1491,7 @@
<Content Include="Views\ResourceManager\AssignRes.cshtml" /> <Content Include="Views\ResourceManager\AssignRes.cshtml" />
<Content Include="Views\StockManager\Index.cshtml" /> <Content Include="Views\StockManager\Index.cshtml" />
<Content Include="Views\Shared\_Layout.cshtml" /> <Content Include="Views\Shared\_Layout.cshtml" />
<Content Include="Areas\FlowManage\Views\CommonApplies\Index.cshtml" /> <Content Include="Areas\FlowManage\Views\FlowInstances\Index.cshtml" />
<Content Include="Views\Home\Navbar.cshtml" /> <Content Include="Views\Home\Navbar.cshtml" />
<Content Include="Views\Shared\Blank.cshtml" /> <Content Include="Views\Shared\Blank.cshtml" />
<Content Include="Views\Shared\_LayoutNoHeader.cshtml" /> <Content Include="Views\Shared\_LayoutNoHeader.cshtml" />