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

优化流程中选择用户列表

Browse Source
This commit is contained in:
yubaolee 2017-06-01 00:07:01 +08:00
parent f0e0ec09ce
commit ab5adb343d
5 changed files with 83 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenAuth.App/WFProcessInstanceService.cs
View File

@ -305,6 +305,7 @@ namespace OpenAuth.App
public GridData Load(string userid, string type, int pageCurrent, int pageSize) public GridData Load(string userid, string type, int pageCurrent, int pageSize)
{ {
//todo:待办/已办/我的
var result = new GridData var result = new GridData
{ {
page = pageCurrent page = pageCurrent

30
OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowNodeForm.cshtml
View File

@ -193,36 +193,22 @@
showcheck: true, showcheck: true,
data: data, data: data,
oncheckboxclick: function (item, et, s) { oncheckboxclick: function (item, et, s) {
var $item = $("#" + item.mytype + "Div"); var $item = $("#UserDiv");
if (et == 1) { if (et == 1) {
var mytype = ""; var html = '<span id="' + item.id
var _html = ""; + '" data-value="User" class="flow-card-box label label-danger">'
var _title = ''; + item.text + '<i class="fa fa-close"></i></span>';
switch (item.mytype) {
case "Role": $item.append(html);
mytype = 'label-success';
break;
case "Post":
mytype = 'label-info';
break;
case "UserGroup":
mytype = 'label-warning';
break;
case "User":
mytype = 'label-danger';
break;
}
_html += '<span id="' + item.id + '" data-value="' + item.mytype + '" class="flow-card-box label ' + mytype + ' ">' + item.text + '<i class="fa fa-close"></i></span>';
$item.append(_html);
$item.show(); $item.show();
$(".flow-card-box").click(function () { $(".flow-card-box").click(function() {
$(this).remove(); $(this).remove();
$('#' + $(this).attr('data-value')).setNoCheckedNodes($(this).attr('id')); $('#' + $(this).attr('data-value')).setNoCheckedNodes($(this).attr('id'));
if ($item.find('.flow-card-box').length == 0) { if ($item.find('.flow-card-box').length == 0) {
$item.hide(); $item.hide();
} }
}) });
} }
else if (et == 0) { else if (et == 0) {
$item.find('#' + item.id).remove(); $item.find('#' + item.id).remove();

189
OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml
View File

@ -30,26 +30,24 @@
if (data.direction == "next") { if (data.direction == "next") {
switch (data.step) { switch (data.step) {
case 1: case 1:
if (!bindingBase()) if (!bindingBase()) {
{
return false; return false;
} }
break; break;
case 2://绑定表单 case 2://绑定表单
if (!bindingFrm()) { if (!bindingFrm()) {
dialogTop("请选择左侧表单", "error"); dialogTop("请选择左侧表单", "error");
return false; return false;
} }
var frmcotentls = frmapp.getData(); var frmcotentls = frmapp.getData();
if (!frmcotentls) { if (!frmcotentls) {
return false; return false;
} }
frmData.FrmContent = JSON.stringify(frmcotentls); frmData.FrmContent = JSON.stringify(frmcotentls);
break; break;
case 3://流程设计 case 3://流程设计
if (!bindingFlow()) if (!bindingFlow()) {
{
return false; return false;
} }
$finish.removeAttr('disabled'); $finish.removeAttr('disabled');
@ -73,15 +71,14 @@
$("#step-1").SetWebControls(data.schemeinfo); $("#step-1").SetWebControls(data.schemeinfo);
postData["SchemeVersion"] = data.schemeinfo.SchemeVersion; postData["SchemeVersion"] = data.schemeinfo.SchemeVersion;
if(data.schemeinfo.EnabledMark == 3) if (data.schemeinfo.EnabledMark == 3) {
{
flowData["SchemeVersion"] = "cg"; flowData["SchemeVersion"] = "cg";
} }
SchemeContentOld = JSON.parse(data.schemecontent.SchemeContent); SchemeContentOld = JSON.parse(data.schemecontent.SchemeContent);
$('#FormFrmTree').setNodeChecked(SchemeContentOld.Frm.FrmId); $('#FormFrmTree').setNodeChecked(SchemeContentOld.Frm.FrmId);
frmData.FrmId = SchemeContentOld.Frm.FrmId; frmData.FrmId = SchemeContentOld.Frm.FrmId;
setFrmInfo(SchemeContentOld.Frm); setFrmInfo(SchemeContentOld.Frm);
setFlowInfo(SchemeContentOld.Flow); setFlowInfo(SchemeContentOld.Flow);
} }
@ -91,8 +88,7 @@
GetTree('User'); GetTree('User');
} }
/*=========基本配置（begin）==================================================================*/ /*=========基本配置（begin）==================================================================*/
function bindingBase() function bindingBase() {
{
if (!$('#step-1').Validform()) { if (!$('#step-1').Validform()) {
return false; return false;
} }
@ -103,64 +99,11 @@
/*=========基本配置（end）====================================================================*/ /*=========基本配置（end）====================================================================*/
function GetTree(type) { function GetTree(type) {
$.SetForm({ $.SetForm({
url: "/UserManager/Get" + type + "CheckTreeJson", //url: "/UserManager/Get" + type + "CheckTreeJson",
url:"/UserManager/GetAccessedUsers",
success: function (data) { success: function (data) {
AllAuthorizeCheckData[type] = $.arrayClone(data); AllAuthorizeCheckData[type] = $.arrayClone(data);
//var item = {
// height: $(window).height() - 131,
// showcheck: true,
// //url: "../../FlowManage/FlowDesign/Get" + type + "CheckTreeJson",
// data: data,
// oncheckboxclick: function (item, et, s) {
// var $item = $("#" + item.mytype + "Div");
// if (et == 1) {
// var mytype = "";
// var _html = "";
// var _title = '';
// switch (item.mytype) {
// case "Role":
// mytype = "角色";
// break;
// case "Post":
// mytype = "岗位";
// break;
// case "UserGroup":
// mytype = "用户组";
// break;
// case "User":
// mytype = "用户";
// break;
// }
// _html += '<div id="' + item.id + '" data-value="' + item.mytype + '" class="card-box shcemeinfocheck active">';
// _html += ' <div class="card-box-img">';
// _html += ' <img src="/Content/images/UserCard03.png" />';
// _html += ' </div>';
// _html += ' <div class="card-box-content">';
// _html += ' <p>名称：' + item.text + '</p>';
// _html += ' <p>类别：' + mytype + '</p>';
// _html += ' </div><i></i>';
// _html += '</div>';
// $item.append(_html);
// $item.show();
// $(".card-box").click(function () {
// $(this).remove();
// $('#' + $(this).attr('data-value')).setNoCheckedNodes($(this).attr('id'));
// if ($item.find('.card-box-img').length == 0) {
// $item.hide();
// }
// })
// }
// else if (et == 0) {
// $item.find('#' + item.id).remove();
// if ($item.find('.card-box-img').length == 0) {
// $item.hide();
// }
// }
// }
//};
//$("#" + type).treeview(item);
} }
}); });
} }
@ -168,33 +111,28 @@
/*=========表单选择（begin）==================================================================*/ /*=========表单选择（begin）==================================================================*/
var _frmdatabase = ""; var _frmdatabase = "";
var _frmflag = false; var _frmflag = false;
function initFrmInfo() function initFrmInfo() {
{
//加载左边的树 //加载左边的树
var item = { var item = {
height: $(window).height() - 87, height: $(window).height() - 87,
url: "../../FlowManage/FormDesign/GetTreeJson", url: "../../FlowManage/FormDesign/GetTreeJson",
onnodeclick: function (item) { onnodeclick: function (item) {
if (item.Sort == "Frm") {
frmData.FrmId = item.id; frmData.FrmId = item.id;
if (SchemeContentOld != undefined && frmData.FrmId == SchemeContentOld.Frm.FrmId) { if (SchemeContentOld != undefined
setFrmInfo(SchemeContentOld.Frm); && frmData.FrmId == SchemeContentOld.Frm.FrmId) {
} setFrmInfo(SchemeContentOld.Frm);
else {
$.SetForm({
url: "../../FlowManage/FormDesign/GetFormJson",
param: { keyValue: item.id },
success: function (data) {
setFrmInfo(data);
}
});
}
} }
else { else {
$('#frmdesign').hide(); $.SetForm({
$('#frmpreview').hide(); url: "../../FlowManage/FormDesign/GetFormJson",
$('#frmDefaulting').show(); param: { keyValue: item.id },
success: function (data) {
setFrmInfo(data);
}
});
} }
} }
}; };
$("#FormFrmTree").treeview(item); $("#FormFrmTree").treeview(item);
@ -223,7 +161,7 @@
_frmflag = false; _frmflag = false;
} }
else { else {
if ( frmData.FrmName != undefined) { if (frmData.FrmName != undefined) {
$('#frmpreview').hide(); $('#frmpreview').hide();
$('#frmDefaulting').hide(); $('#frmDefaulting').hide();
$('#frmdesign').show(); $('#frmdesign').show();
@ -242,8 +180,7 @@
}); });
} }
//设置表单数据 //设置表单数据
function setFrmInfo(data) function setFrmInfo(data) {
{
$('#frmdesign').hide(); $('#frmdesign').hide();
$('#frmDefaulting').hide(); $('#frmDefaulting').hide();
$('#frmpreview').show(); $('#frmpreview').show();
@ -257,19 +194,18 @@
_frmflag = false; _frmflag = false;
$('#frmpreview').frmPreview({ $('#frmpreview').frmPreview({
tablecotent: data.FrmContent, tablecotent: data.FrmContent,
width:870 width: 870
}); });
frmapp = $('#frmdesign').frmDesign({ frmapp = $('#frmdesign').frmDesign({
Height: 480, Height: 480,
frmContent: frmData.FrmContent frmContent: frmData.FrmContent
}); });
} }
function bindingFrm() { function bindingFrm() {
if (frmData.FrmName == undefined) if (frmData.FrmName == undefined) {
{
return false; return false;
} }
return true; return true;
@ -281,15 +217,13 @@
var FlowDesignObject;// var FlowDesignObject;//
var LineId; var LineId;
var nodePramData = []; var nodePramData = [];
function initFlowInfo() function initFlowInfo() {
{
FlowDesignPanel = $('#FlowPanel').flowdesign({ FlowDesignPanel = $('#FlowPanel').flowdesign({
height: ($(window).height() - 87), height: ($(window).height() - 87),
widht: 1000, widht: 1000,
OpenNode: function (object) { OpenNode: function (object) {
FlowDesignObject = object; FlowDesignObject = object;
if (object.$nodeData[object.$focus].type == 'startround') if (object.$nodeData[object.$focus].type == 'startround') {
{
return false; return false;
} }
@ -316,8 +250,7 @@
LineId = id; LineId = id;
var _line = object.$lineData[id]; var _line = object.$lineData[id];
var _fromNode = object.$nodeData[_line.from]; var _fromNode = object.$nodeData[_line.from];
if (_fromNode.type == "shuntnode") if (_fromNode.type == "shuntnode") {
{
dialogTop("前一个节点是分流节点无法设置流转条件", "error"); dialogTop("前一个节点是分流节点无法设置流转条件", "error");
return false; return false;
} }
@ -343,24 +276,19 @@
} }
}); });
} }
function setFlowInfo(data) function setFlowInfo(data) {
{
FlowDesignPanel.loadData(data); FlowDesignPanel.loadData(data);
} }
function callBackNode(id, data, _nodePramData) function callBackNode(id, data, _nodePramData) {
{
nodePramData = _nodePramData; nodePramData = _nodePramData;
FlowDesignPanel.SetNodeEx(id, data); FlowDesignPanel.SetNodeEx(id, data);
} }
function callBackLine(id, data) function callBackLine(id, data) {
{
FlowDesignPanel.SetLineEx(id, data); FlowDesignPanel.SetLineEx(id, data);
} }
function bindingFlow() function bindingFlow() {
{
var _content = FlowDesignPanel.exportDataEx(); var _content = FlowDesignPanel.exportDataEx();
if (_content == -1) if (_content == -1) {
{
return false; return false;
} }
flowData["SchemeContent"] = JSON.stringify({ "Frm": frmData, "Flow": _content }); flowData["SchemeContent"] = JSON.stringify({ "Frm": frmData, "Flow": _content });
@ -404,7 +332,7 @@
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">流程基本信息配置</h3> <h3 class="panel-title">流程基本信息配置</h3>
</div> </div>
<div class="panel-body" > <div class="panel-body">
<table class="form"> <table class="form">
<tr> <tr>
<td class="formTitle">流程编号<font face="宋体">*</font></td> <td class="formTitle">流程编号<font face="宋体">*</font></td>
@ -458,7 +386,7 @@
<div class="step-pane" id="step-4"> <div class="step-pane" id="step-4">
<div class="drag-tip"> <div class="drag-tip">
<i class="fa fa-check-circle"></i> <i class="fa fa-check-circle"></i>
<p >设计完成,请点击保存</p> <p>设计完成,请点击保存</p>
</div> </div>
</div> </div>
</div> </div>
@ -476,16 +404,19 @@
width: 50px; width: 50px;
z-index: 1000; z-index: 1000;
} }
.standtab-pane { .standtab-pane {
width:224px; width: 224px;
border-right:1px solid #ccc; border-right: 1px solid #ccc;
float:left;
}
.SchemeAuthorizePanel {
width:828px;
float: left; float: left;
display:none;
} }
.SchemeAuthorizePanel {
width: 828px;
float: left;
display: none;
}
.card-box.active { .card-box.active {
background: url(../../Content/Images/item_close.png) right top no-repeat !important; background: url(../../Content/Images/item_close.png) right top no-repeat !important;
} }

40
OpenAuth.Mvc/Controllers/UserManagerController.cs
View File

@ -1,13 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc; using System.Web.Mvc;
using Infrastructure; using Infrastructure;
using OpenAuth.App; using OpenAuth.App;
using OpenAuth.App.ViewModel; using OpenAuth.App.ViewModel;
using OpenAuth.Domain;
using OpenAuth.Mvc.Models; using OpenAuth.Mvc.Models;
using OpenAuth.Mvc.WebCtrls.Tree;
namespace OpenAuth.Mvc.Controllers namespace OpenAuth.Mvc.Controllers
{ {
@ -66,36 +63,6 @@ namespace OpenAuth.Mvc.Controllers
#region 获取权限数据 #region 获取权限数据
/// <summary>
/// 用户列表树
/// </summary>
/// <returns>返回树形Json</returns>
[HttpGet]
public ActionResult GetUserCheckTreeJson()
{
var treeList = new List<TreeEntity>();
string companyid = "";
string departmentid = "";
foreach (UserView item in App.Load(Guid.Empty, 1, 10).rows)
{
TreeEntity tree = new TreeEntity();
tree.id = item.Id.ToString();
tree.text = item.Name;
tree.value = item.Id.ToString();
tree.isexpand = true;
tree.complete = true;
tree.hasChildren = false;
tree.parentId = "0";
tree.showcheck = true;
tree.img = "fa fa-user";
tree.Attribute = "mytype";
tree.AttributeValue = "User";
treeList.Add(tree);
}
return Content(treeList.TreeToJson());
}
/// <summary> /// <summary>
/// 获取用户可访问的账号 /// 获取用户可访问的账号
/// <para>李玉宝于2017-02-28 15:12:19</para> /// <para>李玉宝于2017-02-28 15:12:19</para>
@ -110,7 +77,12 @@ namespace OpenAuth.Mvc.Controllers
{ {
Account = user.Account, Account = user.Account,
RealName = user.Name, RealName = user.Name,
id = user.Id.ToString(),
text = user.Name,
value = user.Account,
parentId = "0",
showcheck = true,
img = "fa fa-user",
}; };
result.Add(user.Id.ToString(), item); result.Add(user.Id.ToString(), item);
} }

2
OpenAuth.Mvc/WebCtrls/Tree/TreeEntity.cs
View File

@ -1,7 +1,7 @@
namespace OpenAuth.Mvc.WebCtrls.Tree namespace OpenAuth.Mvc.WebCtrls.Tree
{ {
/// <summary> /// <summary>
/// 树实体 /// wdTree实体
/// </summary> /// </summary>
public class TreeEntity public class TreeEntity
{ {