基于原有gooflow的改造

CodeSmith/CSharp/WebGenerate.cst

@@ -57,21 +57,6 @@ Generating Entities ...
         Stopwatch watch = Stopwatch.StartNew();
         string outputDirectory = Path.GetFullPath(directory);
 
-        if (!Directory.Exists(directory))   //根目录
-            Directory.CreateDirectory(directory);
-
-        if (!Directory.Exists(directory +"/controllers"))  //controller目录
-            Directory.CreateDirectory(directory +"/controllers");
-
-        if (!Directory.Exists(directory +"/views"))  //视图根文件夹
-            Directory.CreateDirectory(directory +"/views");
-         
-        if (!Directory.Exists(directory +"/js"))  //js根目录
-            Directory.CreateDirectory(directory +"/js");
-
-        if (!Directory.Exists(directory +"/views/"+ModuleName +"Manager"))  //视图文件夹
-            Directory.CreateDirectory(directory +"/views/"+ModuleName +"Manager");
-
         CreateControllerClass();
         CreateApplicationClass();
         CreateHtmlClass();
@@ -95,8 +80,7 @@ Generating Entities ...
 
         string rootDirectory = Path.GetFullPath(directory);
       
-        string generatedFile ="controllers" + ModuleName + "sController.cs";
-        generatedFile = Path.Combine(rootDirectory, generatedFile);
+          string generatedFile = Path.GetFullPath(directory) + "/controllers/"+  ModuleName + "sController.cs";
 
         generatedClass.ModuleName = ModuleName;
 
@@ -112,8 +96,7 @@ Generating Entities ...
 
         string rootDirectory = Path.GetFullPath(directory);
       
-        string generatedFile = ModuleName + "App.cs";
-        generatedFile = Path.Combine(rootDirectory, generatedFile);
+      string generatedFile = Path.GetFullPath(directory) + "/APP/"+  ModuleName + "App.cs";
 
         generatedClass.ModuleName = ModuleName;
 
@@ -142,7 +125,7 @@ Generating Entities ...
         JSGenerateClass generatedClass = this.Create<JSGenerateClass>();
         this.CopyPropertiesTo(generatedClass);
 
-        string generatedFile = Path.GetFullPath(directory) + "/js/"+ModuleName+"s.js";
+        string generatedFile = Path.GetFullPath(directory) + "/userJs/"+ModuleName+"s.js";
 
         generatedClass.ModuleName = ModuleName;
 

OpenAuth.App/FlowSchemeApp.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Linq;
+using OpenAuth.App.Request;
+using OpenAuth.App.Response;
+using OpenAuth.Repository.Domain;
+
+namespace OpenAuth.App
+{
+    /// <summary>
+    /// 流程设计服务
+    /// <para>李玉宝新增于2017-01-16 16:18:35</para>
+    /// </summary>
+    public class FlowSchemeApp :BaseApp<FlowScheme>
+    {
+        /// <summary>
+        /// 保存流程
+        /// </summary>
+        /// <param name="entity">表单模板实体类</param>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public int SaveForm(string keyValue, FlowScheme entity, FlowSchemeDetail modelentity)
+        {
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.SchemeVersion = DateTime.Now.ToString("yyyyMMddHHmmssffff");
+                UnitWork.Add(entity);
+
+                modelentity.SchemeId = entity.Id;
+                modelentity.SchemeVersion = entity.SchemeVersion;
+                UnitWork.Add(modelentity);
+            }
+            else
+            {
+                string schemeid = (string)(keyValue);
+                FlowSchemeDetail modelentityold =
+                    UnitWork.FindSingle<FlowSchemeDetail>(u => u.SchemeVersion == entity.SchemeVersion
+                                                                && u.SchemeId == schemeid);
+
+                if (modelentityold.SchemeContent != modelentity.SchemeContent)
+                {
+                    if (modelentity.SchemeVersion == "cg")
+                    {
+                        modelentityold.SchemeContent = modelentity.SchemeContent;
+                        modelentityold.SchemeVersion = DateTime.Now.ToString("yyyyMMddHHmmssffff");
+                        modelentity.SchemeVersion = modelentityold.SchemeVersion;
+                        UnitWork.Update(modelentityold);
+                    }
+                    else
+                    {
+                        modelentity.SchemeId = schemeid;
+                        modelentity.SchemeVersion = DateTime.Now.ToString("yyyyMMddHHmmssffff");
+                        UnitWork.Add(modelentity);
+                    }
+                }
+                else
+                {
+                    modelentity.SchemeVersion = modelentityold.SchemeVersion;
+                }
+                entity.Id = keyValue;
+                entity.SchemeVersion = modelentity.SchemeVersion;
+                UnitWork.Update(entity);
+            }
+
+            UnitWork.Save();
+            return 1;
+        }
+
+        public void RemoveForm(string[] keyValue)
+        {
+             UnitWork.Delete<FlowScheme>(u =>keyValue.Contains(u.Id));
+            UnitWork.Delete<FlowSchemeDetail>(u =>keyValue.Contains(u.SchemeId));
+        }
+
+        public FlowScheme GetEntity(string keyValue)
+        {
+            return UnitWork.FindSingle<FlowScheme>(u => u.Id == keyValue);
+        }
+
+        public FlowSchemeDetail GetSchemeEntity(string schemeinfoId, string schemeinfoSchemeVersion)
+        {
+            return UnitWork.FindSingle<FlowSchemeDetail>(u =>
+                u.SchemeId == schemeinfoId && u.SchemeVersion == schemeinfoSchemeVersion);
+        }
+
+        public void UpdateState(string keyValue, int state)
+        {
+            throw new NotImplementedException();
+        }
+
+
+        public void Add(FlowScheme flowScheme)
+        {
+            Repository.Add(flowScheme);
+        }
+
+        public void Update(FlowScheme flowScheme)
+        {
+            UnitWork.Update<FlowScheme>(u => u.Id == flowScheme.Id, u => new FlowScheme
+            {
+                //todo:要修改的
+            });
+        }
+
+        public TableData Load(QueryFlowSchemeListReq request)
+        {
+            return new TableData
+            {
+                count = Repository.GetCount(null),
+                data = Repository.Find(request.page, request.limit, "CreateDate desc")
+            };
+        }
+    }
+}

OpenAuth.App/OpenAuth.App.csproj

@@ -115,6 +115,8 @@
     <Compile Include="Request\IdPageReq.cs" />
     <Compile Include="Request\PageReq.cs" />
     <Compile Include="Request\QueryCategoriesReq.cs" />
+    <Compile Include="Request\QueryFlowInstanceListReq.cs" />
+    <Compile Include="Request\QueryFlowSchemeListReq.cs" />
     <Compile Include="Request\QueryRoleListReq.cs" />
     <Compile Include="Request\QueryFormListReq.cs" />
     <Compile Include="Request\QueryUserListReq.cs" />
@@ -122,8 +124,8 @@
     <Compile Include="RevelanceManagerApp.cs" />
     <Compile Include="SystemAuthService.cs" />
     <Compile Include="RoleApp.cs" />
-    <Compile Include="WFProcessInstanceService.cs" />
-    <Compile Include="WFSchemeService.cs" />
+    <Compile Include="FlowInstanceApp.cs" />
+    <Compile Include="FlowSchemeApp.cs" />
     <Compile Include="ModuleManagerApp.cs" />
     <Compile Include="SSO\AppInfo.cs" />
     <Compile Include="SSO\AppInfoService.cs" />

OpenAuth.App/Request/QueryFlowInstanceListReq.cs

@@ -0,0 +1,8 @@
+namespace OpenAuth.App.Request
+{
+    public class QueryFlowInstanceListReq : PageReq
+    {
+        public string type { get; set; }
+        public string userid { get; set; }
+    }
+}

OpenAuth.App/Request/QueryFlowSchemeListReq.cs

@@ -0,0 +1,7 @@
+namespace OpenAuth.App.Request
+{
+    public class QueryFlowSchemeListReq : PageReq
+    {
+        public string orgId { get; set; }
+    }
+}

OpenAuth.App/WFSchemeService.cs

@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenAuth.App.Response;
-using OpenAuth.Repository.Domain;
-using OpenAuth.Repository.Interface;
-
-namespace OpenAuth.App
-{
-    /// <summary>
-    /// 流程设计服务
-    /// <para>李玉宝新增于2017-01-16 16:18:35</para>
-    /// </summary>
-    public class WFSchemeService
-    {
-        public IUnitWork _unitWork { get; set; }
-
-        /// <summary>
-        /// 保存流程
-        /// </summary>
-        /// <param name="entity">表单模板实体类</param>
-        /// <param name="keyValue">主键</param>
-        /// <returns></returns>
-        public int SaveForm(string keyValue, WFSchemeInfo entity, WFSchemeContent modelentity)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(keyValue))
-                {
-                    entity.SchemeVersion = DateTime.Now.ToString("yyyyMMddHHmmssffff");
-                    _unitWork.Add(entity);
-
-                    modelentity.SchemeInfoId = entity.Id;
-                    modelentity.SchemeVersion = entity.SchemeVersion;
-                    _unitWork.Add(modelentity);
-                }
-                else
-                {
-                    string schemeid = (string)(keyValue);
-                    WFSchemeContent modelentityold =
-                        _unitWork.FindSingle<WFSchemeContent>(u => u.SchemeVersion == entity.SchemeVersion
-                                                                   && u.SchemeInfoId == schemeid);
-
-                    if (modelentityold.SchemeContent != modelentity.SchemeContent)
-                    {
-                        if (modelentity.SchemeVersion == "cg")
-                        {
-                            modelentityold.SchemeContent = modelentity.SchemeContent;
-                            modelentityold.SchemeVersion = DateTime.Now.ToString("yyyyMMddHHmmssffff");
-                            modelentity.SchemeVersion = modelentityold.SchemeVersion;
-                            _unitWork.Update(modelentityold);
-                        }
-                        else
-                        {
-                            modelentity.SchemeInfoId = schemeid;
-                            modelentity.SchemeVersion = DateTime.Now.ToString("yyyyMMddHHmmssffff");
-                            _unitWork.Add(modelentity);
-                        }
-                    }
-                    else
-                    {
-                        modelentity.SchemeVersion = modelentityold.SchemeVersion;
-                    }
-                    entity.Id = keyValue;
-                    entity.SchemeVersion = modelentity.SchemeVersion;
-                    _unitWork.Update(entity);
-                }
-
-                _unitWork.Save();
-                return 1;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-
-        public void RemoveForm(string[] keyValue)
-        {
-             _unitWork.Delete<WFSchemeInfo>(u =>keyValue.Contains(u.Id));
-            _unitWork.Delete<WFSchemeContent>(u =>keyValue.Contains(u.SchemeInfoId));
-        }
-
-        public WFSchemeInfo GetEntity(string keyValue)
-        {
-            return _unitWork.FindSingle<WFSchemeInfo>(u => u.Id == keyValue);
-        }
-
-        public WFSchemeContent GetSchemeEntity(string schemeinfoId, string schemeinfoSchemeVersion)
-        {
-            return _unitWork.FindSingle<WFSchemeContent>(u =>
-                u.SchemeInfoId == schemeinfoId && u.SchemeVersion == schemeinfoSchemeVersion);
-        }
-
-        public void UpdateState(string keyValue, int state)
-        {
-            throw new NotImplementedException();
-        }
-
-        public List<WFSchemeInfo> GetList()
-        {
-            return _unitWork.Find<WFSchemeInfo>(null).ToList();
-        }
-
-        public TableData Load(int pageCurrent, int pageSize)
-        {
-            var result = new TableData();
-
-            result.count = _unitWork.Find<WFSchemeInfo>(null).Count();
-            result.data = _unitWork.Find<WFSchemeInfo>(pageCurrent, pageSize, "ModifyDate descending", null).ToList();
-
-            return result;
-        }
-    }
-}

OpenAuth.Mvc/Areas/FlowManage/Controllers/FileController.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Configuration;
-using System.IO;
-using System.Web;
-using System.Web.Mvc;
-using Infrastructure;
-using OpenAuth.Mvc.Controllers;
-
-namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
-{
-    public class FileController : BaseController
-    {
-
-        [HttpPost]
-        public string Add(HttpPostedFileBase Filedata)
-        {
-            var response = new Response<string>();
-            if (Filedata != null && Filedata.ContentLength > 0 && Filedata.ContentLength < 10485760)
-            {
-                using (var binaryReader = new BinaryReader(Filedata.InputStream))
-                {
-                    var fileName = Path.GetFileName(Filedata.FileName);
-                    var data = binaryReader.ReadBytes(Filedata.ContentLength);
-                    var result = UploadFile(fileName, data, string.Empty);
-                    response.Result = result;
-                }
-            }
-            else
-            {
-                 response.Message = "文件过大";
-                 response.Code = 500;
-            }
-
-            return JsonHelper.Instance.Serialize(response);
-
-        }
-
-        private string UploadFile(string fileName, byte[] fileBuffers, string folder)
-        {
-            if (string.IsNullOrEmpty(folder))
-            {
-                folder = DateTime.Now.ToString("yyyy_MM_dd");
-            }
-
-            //判断文件是否为空
-            if (string.IsNullOrEmpty(fileName))
-            {
-                throw new Exception("文件名不能为空");
-            }
-
-            //判断文件是否为空
-            if (fileBuffers.Length < 1)
-            {
-                throw new Exception("文件不能为空");
-            }
-
-
-            var filePath =Server.MapPath("upload");
-            var uploadPath = filePath +"\\" + folder + "\\";
-            var ext = Path.GetExtension(fileName);
-            var newName = Guid.NewGuid().ToString("N") + ext;
-
-            if (!Directory.Exists(uploadPath))
-            {
-                Directory.CreateDirectory(uploadPath);
-            }
-            using (var fs = new FileStream(uploadPath + newName, FileMode.Create))
-            {
-                fs.Write(fileBuffers, 0, fileBuffers.Length);
-                fs.Close();
-                return  folder + "/" + newName;
-            }
-
-        }
-    }
-}

OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs

@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Web.Mvc;
-using System.Web.UI.WebControls;
-using Infrastructure;
-using OpenAuth.App;
-using OpenAuth.App.SSO;
-using OpenAuth.Mvc.Controllers;
-using OpenAuth.Repository.Domain;
-
-namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
-{
-
-    /// <summary>
-    /// 流程设计
-    /// <para>李玉宝新增于2017-01-12 19:41:56</para>
-    /// </summary>
-    public class FlowDesignController :BaseController
-    {
-        public WFSchemeService WfFlowInfoBll { get; set; }
-
-        #region 视图功能
-        /// <summary>
-        /// 管理
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult Index()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 预览
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult PreviewIndex()
-        {
-            return View();
-        }
-
-
-        /// <summary>
-        /// 表单
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult Form()
-        {
-            return View();
-        }
-        /// <summary>
-        /// 节点设置
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult FlowNodeForm()
-        {
-            return View();
-        }
-        /// <summary>
-        /// 连接线设置
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult FlowLineForm()
-        {
-            return View();
-        }
-        /// <summary>
-        /// 流程创建
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult FlowSchemeBuider()
-        {
-            return View();
-        }
-        #endregion
-
-        #region 获取数据
-
-        /// <summary>
-        /// 设置流程
-        /// </summary>
-        /// <param name="keyValue">主键</param>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult GetFormJson(string keyValue)
-        {
-            var schemeinfo = WfFlowInfoBll.GetEntity(keyValue);
-            var schemecontent = WfFlowInfoBll.GetSchemeEntity(schemeinfo.Id, schemeinfo.SchemeVersion);
-            var JsonData = new
-            {
-                schemeinfo = schemeinfo,
-                schemecontent = schemecontent
-            };
-            return Content(JsonData.ToJson());
-        }
-        /// <summary>
-        /// 获取工作流流程模板内容
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <param name="SchemeVersion"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult GetSchemeContentJson(string keyValue, string SchemeVersion)
-        {
-            var schemecontent = WfFlowInfoBll.GetSchemeEntity(keyValue, SchemeVersion);
-            return Content(schemecontent.ToJson());
-        }
-        #endregion
-
-        #region 提交数据
-        /// <summary>
-        /// 删除表单模板
-        /// </summary>
-        /// <param name="keyValue">主键值</param>
-        /// <returns></returns>
-        [HttpPost]
-        public string RemoveForm(string[] ids)
-        {
-            WfFlowInfoBll.RemoveForm(ids);
-            return Result.ToJson();
-        }
-        /// <summary>
-        /// 保存用户表单（新增、修改）
-        /// </summary>
-        /// <param name="keyValue">主键值</param>
-        /// <param name="userEntity">用户实体</param>
-        /// <returns></returns>
-        [HttpPost]
-        public string SaveForm(string keyValue, string InfoEntity, string ContentEntity, string shcemeAuthorizeData)
-        {
-            WFSchemeInfo entyity = InfoEntity.ToObject<WFSchemeInfo>();
-            WFSchemeContent contententity = ContentEntity.ToObject<WFSchemeContent>();
-            WfFlowInfoBll.SaveForm(keyValue, entyity, contententity);
-            return Result.ToJson();
-        }
-        /// <summary>
-        /// （启用、禁用）
-        /// </summary>
-        /// <param name="keyValue">主键值</param>
-        /// <param name="State">状态：1-启动；0-禁用</param>
-        /// <returns></returns>
-        [HttpPost]
-        
-        public ActionResult SubmitUpdateState(string keyValue, int State)
-        {
-            WfFlowInfoBll.UpdateState(keyValue, State);
-            return Content("操作成功。");
-        }
-
-        public string Load(int pageCurrent = 1, int pageSize = 30)
-        {
-            return JsonHelper.Instance.Serialize(WfFlowInfoBll.Load(pageCurrent, pageSize));
-        }
-        #endregion
-
-       
-    }
-}

OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs

@@ -1,230 +0,0 @@
-using Infrastructure;
-using OpenAuth.App;
-using OpenAuth.App.SSO;
-using OpenAuth.Mvc.Controllers;
-using System;
-using System.Web.Mvc;
-using OpenAuth.Repository.Domain;
-
-namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
-{
-    /// <summary>
-    /// 通用申请流程处理
-    /// <para>李玉宝新增于2016-09-08 19:21:59</para>
-    /// </summary>
-    public class FlowInstancesController : BaseController
-    {
-        public WFProcessInstanceService App { get; set; }
-
-        #region 视图
-
-        public ActionResult Index()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 进度查看
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult ProcessLookForm()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 审核流程
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult VerificationForm()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 创建流程实例视图
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult FlowProcessNewForm()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 流程监控
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult MonitoringIndex()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 流程指派
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult DesignationIndex()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 流程进度查看
-        /// </summary>
-        /// <returns></returns>\
-        [HttpGet]
-        public ActionResult ProcessLookFrom()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 流程指派
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult ProcessDesignate()
-        {
-            return View();
-        }
-
-        #endregion 视图
-
-        #region 提交数据
-
-        /// <summary>
-        /// 创建流程实例
-        /// </summary>
-        /// <param name="wfSchemeInfoId">流程模板信息Id</param>
-        /// <param name="frmData">表单数据</param>
-        /// <param name="type">0发起，3草稿</param>
-        /// <returns></returns>
-        [HttpPost]
-        public string CreateProcess(string wfSchemeInfoId, string wfProcessInstanceJson, string frmData)
-        {
-            WFProcessInstance wfProcessInstanceEntity = wfProcessInstanceJson.ToObject<WFProcessInstance>();
-            wfProcessInstanceEntity.Id = string.Empty;
-
-            App.CreateInstance(Guid.NewGuid().ToString(), wfSchemeInfoId, wfProcessInstanceEntity, frmData);
-
-            return Result.ToJson();
-        }
-
-        /// <summary>
-        /// 审核流程
-        /// </summary>
-        /// <param name="processId">工作流实例主键Id</param>
-        /// <param name="verificationData">审核数据</param>
-        /// <returns></returns>
-        [HttpPost]
-        public string VerificationProcess(string processId, string verificationData)
-        {
-            App.VerificationProcess(processId, verificationData);
-            return Result.ToJson();
-        }
-
-        /// <summary>
-        /// 删除申请
-        /// </summary>
-        public string Delete(string[] ids)
-        {
-            try
-            {
-                foreach (var id in ids)
-                {
-                    App.DeleteProcess(id);
-                }
-                return Result.ToJson();
-            }
-            catch (Exception e)
-            {
-                 Result.Code = 500;
-                Result.Message = e.Message;
-                return Result.ToJson();
-            }
-        }
-
-        #endregion 提交数据
-
-        #region 获取数据(公用)
-
-        /// <summary>
-        /// 获取进程模板Json
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult GetProcessSchemeJson(string keyValue)
-        {
-            var data = App.GetProcessSchemeEntity(keyValue);
-            return Content(data.ToJson());
-        }
-
-        /// <summary>
-        /// 已办流程进度查看，根据当前访问人的权限查看表单内容
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult GetProcessSchemeEntityByUserId(string keyValue)
-        {
-            var data = App.GetProcessSchemeByUserId(keyValue);
-            return Content(data.ToJson());
-        }
-
-        /// <summary>
-        /// 已办流程进度查看，根据当前节点的权限查看表单内容
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <param name="isPermission"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult GetProcessSchemeEntityByNodeId(string keyValue, string nodeId)
-        {
-            var data = App.GetProcessSchemeEntityByNodeId(keyValue, nodeId);
-            return Content(data.ToJson());
-        }
-
-        /// <summary>
-        /// 获取进程信息
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult GetProcessInfoJson(string keyValue)
-        {
-            var processInstance = App.GetProcessInstanceEntity(keyValue);
-            var processScheme = App.GetProcessSchemeEntity(processInstance.ProcessSchemeId);
-            var JsonData = new
-            {
-                processInstance = processInstance,
-                processScheme = processScheme
-            };
-            return Content(JsonData.ToJson());
-        }
-
-        /// <summary>
-        /// 获取进程实例
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult GetProcessInstanceJson(string keyValue)
-        {
-            var processInstance = App.GetProcessInstanceEntity(keyValue);
-            return Content(processInstance.ToJson());
-        }
-
-        public string Load(string type, int pageCurrent = 1, int pageSize = 30)
-        {
-            return JsonHelper.Instance.Serialize(App.Load(AuthUtil.GetCurrentUser().User.Id.ToString(), type, pageCurrent, pageSize));
-        }
-
-        #endregion 获取数据(公用)
-    }
-}

OpenAuth.Mvc/Areas/FlowManage/FlowManageAreaRegistration.cs

@@ -1,24 +0,0 @@
-using System.Web.Mvc;
-
-namespace OpenAuth.Mvc.Areas.FlowManage
-{
-    public class FlowManageAreaRegistration : AreaRegistration 
-    {
-        public override string AreaName 
-        {
-            get 
-            {
-                return "FlowManage";
-            }
-        }
-
-        public override void RegisterArea(AreaRegistrationContext context) 
-        {
-            context.MapRoute(
-                "FlowManage_default",
-                "FlowManage/{controller}/{action}/{id}",
-                new { action = "Index", id = UrlParameter.Optional }
-            );
-        }
-    }
-}

OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowLineForm.cshtml

@@ -1,207 +0,0 @@
-@{
-    ViewBag.Title = "流转条件设置";
-    Layout = "~/Views/Shared/_Form.cshtml";
-}
-<!--jqgrid表格组件start-->
-<link href="~/Content/scripts/plugins/jqgrid/jqgrid.css" rel="stylesheet" />
-<script src="~/Content/scripts/plugins/jqgrid/grid.locale-cn.js"></script>
-<script src="~/Content/scripts/plugins/jqgrid/jqgrid.min.js"></script>
-<!--表格组件end-->
-<script>
-    var frmtype, lineobject, fromnode, frmCotent, nodePramData;
-    $(function () {
-        initLoadPageData();
-        GetGrid();
-        InitControl();
-    });
-    function initLoadPageData() {
-        var _FlowDesignObject = parent.FlowDesignObject;
-        lineobject = _FlowDesignObject.$lineData[parent.LineId];
-        lineobject.id = parent.LineId;
-        fromnode = _FlowDesignObject.$nodeData[lineobject.from];
-
-        frmtype = parent.postData["FrmType"];
-        if (frmtype == 0) {
-            frmCotent = JSON.parse(top.FlowSchemeBuider.frmData["FrmContent"]);
-        }
-        else {
-            nodePramData = top.FlowSchemeBuider.nodePramData;
-        }
-        console.log(frmCotent);
-
-        
-        $("#LineName").val(lineobject.name);
-    }
-
-    //获取对象给控件赋值
-    var SetJsonData;
-    function InitControl() {
-        if (lineobject.setInfo) {
-            $("#gridTable")[0].addJSONData(lineobject.setInfo.ConditionJson);
-        }
-    }
-    //加载表格
-    function GetGrid() {
-        //显示表里面字段
-        var FieldValue = ":";
-        if (frmtype == 0) {//自定义表单
-            $.each(frmCotent, function (i, item) {
-                if (item.control_type != 'image' && item.control_type != 'upload') {
-                    FieldValue += ";" + item.control_field + ":" + item.control_label;
-                }
-            });
-        }
-        else {//系统表单
-            $.each(nodePramData, function (i, item) {
-                FieldValue += ";" + item.column + ":" + item.remark;
-            });
-        }
-        var lastsel = 0;
-        $("#gridTable").jqGrid({
-            datatype: "local",
-            height: 271,
-            autowidth: true,
-            colModel: [
-                { label: '字段ID', name: 'FieldId', index: 'FieldId', hidden: true },
-                {
-                    label: "字段名称", name: "FieldName", index: "FieldName", width: 240, sortable: false, editable: true, edittype: 'select', editoptions: {
-                        value: FieldValue
-                    }
-                },
-                { label: '比较Id', name: 'FilterId', index: 'FilterId', hidden: true },
-                {
-                    label: "比较", name: "FilterName", index: "FilterName", align: 'center', width: 80, sortable: false, editable: true, edittype: 'select', editoptions: {
-                        value: ":;Equal:等于;NotEqual:不等于;Greater:大于;GreaterThan:大于等于;Less:小于;LessThan:小于等于;Null:为空;NotNull:不为空;Like:包含;NotLike:不包含"//;LeftLike:左包含;RightLike:右包含"
-                    }
-                },
-                { label: "比较值", name: "FilterValue", index: "FilterValue", width: 300, sortable: false, editable: true },
-                {
-                    label: "逻辑", name: "Logic", index: "Logic", width: 60, sortable: false, editable: true, edittype: 'select', editoptions: {
-                        value: ":;并且:并且;或:或"
-                    }
-                }
-            ],
-            pager: "false",
-            rowNum: 300,
-            rownumbers: true,
-            shrinkToFit: false,
-            altRows: false,
-            onSelectRow: function (id) {
-                var RowData = {
-                    FieldId: $("[name='FieldName']").val(),
-                    FieldName: $("[name='FieldName']").find('option:selected').text(),
-                    FilterId: $("[name='FilterName']").val(),
-                    FilterName: $("[name='FilterName']").find('option:selected').text(),
-                    FilterValue: $("[name='FilterValue']").val(),
-                    Logic: $("[name='Logic']").val(),
-                }
-                $('#gridTable').jqGrid('restoreRow', lastsel);
-                $('#gridTable').jqGrid('editRow', id, true);
-                $('#gridTable').jqGrid('setRowData', lastsel, RowData, '');
-                lastsel = id;
-            }
-        });
-        $('#gridTable').jqGrid('restoreRow', 1);
-        $('#gridTable').jqGrid('addRowData', 1, {}, "last");
-        //表格自适应（高度、宽度）
-        $(window).resize(function () {
-            $("#gridTable").jqGrid('setGridWidth', $(window).width() - 4);
-        });
-    }
-    //增加栏位
-    var rownum = 1;
-    function btn_add() {
-        $('#gridTable').jqGrid('restoreRow', rownum+1);
-        $('#gridTable').jqGrid('addRowData', rownum+1, {}, "last");
-        rownum++;
-    }
-    //删除栏位
-    function btn_delete()
-    {
-        $('#gridTable').jqGrid('restoreRow', rownum);
-        $('#gridTable').jqGrid('delRowData', rownum);
-        rownum--;
-    }
-    //保存事件
-    function AcceptClick(callBack) {
-        var index = $("#gridTable").jqGrid('getGridParam', 'selrow');
-        var RowData = {
-            FieldId: $("[name='FieldName']").val(),
-            FieldName: $("[name='FieldName']").find('option:selected').text(),
-            FilterId: $("[name='FilterName']").val(),
-            FilterName: $("[name='FilterName']").find('option:selected').text(),
-            FilterValue: $("[name='FilterValue']").val(),
-            Logic: $("[name='Logic']").val(),
-        }
-        $('#gridTable').jqGrid('setRowData', index, RowData, '');
-        var ConditionJson = $("#gridTable").jqGrid("getRowData");
-        var ConditionValueJson = [];
-        for (var i = 0; i < ConditionJson.length; i++) {
-            if (ConditionJson[i].FieldId) {
-                var Logic = "AND";
-                if (ConditionJson[i].Logic) {
-                    Logic = ConditionJson[i].Logic == "并且" ? "AND" : "OR";
-                }
-                var tdData = {
-                    ParamName: ConditionJson[i].FieldId,
-                    Operation: ConditionJson[i].FilterId,
-                    ParamValue: ConditionJson[i].FilterValue,
-                    Logic: Logic,
-                }
-                ConditionValueJson.push(tdData);
-            }
-        }
-        var postData = {
-            LineName: $("#LineName").val(),
-            ConditionJson: ConditionJson,
-            ConditionValueJson: ConditionValueJson
-        }
-        top.FlowSchemeBuider.callBackLine(lineobject.id, postData);
-        dialogClose();
-    }
-</script>
-<form id="form1">
-    <div style="margin: 10px;">
-        <input id="LineName" type="text" class="form-control" placeholder="请输入箭头标签" style="width: 260px;display:inline-block;" />
-        <div style="float:right;">
-            <div class="btn-group">
-                <a id="btn_add" class="btn btn-default btn-sm" onclick="btn_add()"><i class="fa fa-plus"></i>&nbsp;添加栏位</a>
-                <a id="btn_delete" class="btn btn-default  btn-sm" onclick="btn_delete()"><i class="fa fa-minus"></i>&nbsp;删除栏位</a>
-            </div>
-        </div>
-    </div>
-    <div>
-        <div  style=" overflow: auto; height: 301px;">
-            <div id="seniorcondition" class="tabPanel">
-                <table id="gridTable"></table>
-            </div>
-        </div>
-    </div>
-</form>
-<style>
-    .ui-widget-content {
-        border-left: none;
-        border-bottom: none;
-    }
-    .ui-jqgrid tr.ui-row-ltr td {
-        padding: 0px;
-    }
-    .ui-widget-content .ui-state-hover {
-        background: #fff;
-    }
-    .ui-widget-content .ui-state-highlight {
-        background: #fff;
-        color: #000;
-    }
-    .unwritten {
-        display:none;
-    }
-    .ui-jqgrid tr.ui-row-ltr td {
-        border-right: 1px solid #ccc;
-    }
-    option {
-        font-family:微软雅黑,宋体,Arial,Helvetica,Verdana,sans-serif;
-        font-size:9pt;
-    }
-</style>
-

OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowNodeForm.cshtml

@@ -1,415 +0,0 @@
-@{
-    ViewBag.Title = "工作流节点设置";
-    Layout = "~/Views/Shared/_Form.cshtml";
-}
-<link href="~/Content/styles/ckbox-radio.css" rel="stylesheet" />
-<link href="~/Content/styles/flow.css" rel="stylesheet" />
-<script>
-    var node, nodelist = [], frmContentJson, frmType, NodePramData;
-    $(function () {
-        initLoadPageData();
-        initControl();
-    })
-    function initLoadPageData()
-    {
-        var _FlowDesignObject = parent.FlowDesignObject;
-        node = _FlowDesignObject.$nodeData[_FlowDesignObject.$focus];
-        node.id = _FlowDesignObject.$focus;
-        for (var i in _FlowDesignObject.$nodeData) {
-            _FlowDesignObject.$nodeData[i]["id"] = i;
-            nodelist.push(_FlowDesignObject.$nodeData[i]);
-        }
-
-            frmContentJson = JSON.parse(parent.frmData["FrmContent"]);
-            initFrmCotent(frmContentJson);
-    }
-    //初始化控件
-    function initControl() {
-        GetDesignateMemberTree();
-        $('.systemdatabase').hide();
-        if (node.type != "confluencenode")//是否会签节点
-        {
-            $('#confluencenode').hide();
-        }
-        $('#NodeName').val(node.name);
-        
-        //由谁执行
-        //var dd = $("#NodeMake").ComboBox({
-        //    data: [{ "key": 0, "value": "操作执行人员" }, { "key": 1, "value": "系统执行" }],
-        //    id: "key",
-        //    text: "value"
-        //}).ComboBoxSetValue(0);
-        //表单
-        $("#NodeFrm").ComboBox({
-            url: "../../FlowManage/FormDesign/GetAllListJson",
-            id: "value",
-            text: "text",
-            description: "==请选择==",
-            allowSearch: true
-        });
-        //驳回类型
-        $("#NodeRejectType").ComboBox({
-            data: [{ "key": 0, "value": "前一步" }, { "key": 1, "value": "第一步" }, { "key": 2, "value": "某一步" }, { "key": 3, "value": "用户指定" }, { "key": 4, "value": "不处理" }],
-            id: "key",
-            text: "value"
-        }).bind("change", function () {
-            var _value = $(this).attr('data-value');
-            var _comdata = [];
-            if (_value == 2) {
-                _comdata = nodelist;
-            }
-            //驳回到某一步
-            $("#NodeRejectStep").ComboBox({
-                data: _comdata,
-                id: "id",
-                text: "name"
-            });
-        }).ComboBoxSetValue(0);
-        //驳回到某一步
-        $("#NodeRejectStep").ComboBox({
-            description: "==请选择==",
-            allowSearch: true,
-            height: "110px",
-        });
-        //会签策略
-        $("#NodeConfluenceType").ComboBox({
-            data: [{ "key": 0, "value": "所有步骤通过" }, { "key": 1, "value": "一个步骤通过即可" }, { "key": 2, "value": "按百分比计算" }],
-            id: "key",
-            text: "value",
-            description: "==请选择==",
-        });
-        //处理者
-        $("input[name='NodeDesignateTypename']").click(function () {
-            var id = $(this).attr('id');
-            if (id == 'NodeDesignateType2') {
-                $("#Treebackground").hide();
-            } else {
-                $("#Treebackground").show();
-            }
-        }); 
-     
-
-        if (node.setInfo != undefined)
-        {
-            var _NodeCode = $('#NodeCode').val();
-            node.setInfo.NodeCode = node.setInfo.NodeCode == "" ? _NodeCode : node.setInfo.NodeCode;
-            $("#BaseInfo").SetWebControls(node.setInfo);
-            $('#NodeDataBase').trigger('change');
-            $('#NodeTable').ComboBoxSetValue(node.setInfo.NodeTable);
-            $('#NodeTable').trigger('change');
-            $('#NodePram').ComboBoxSetValue(node.setInfo.NodePram);
-
-            $("#" + node.setInfo.NodeDesignate).trigger("click");
-            if (node.setInfo.NodeDesignate == "NodeDesignateType2")
-            {
-                $("#Role").setCheckedNodes(node.setInfo.NodeDesignateData.role);
-                $("#Post").setCheckedNodes(node.setInfo.NodeDesignateData.post);
-                $("#UserGroup").setCheckedNodes(node.setInfo.NodeDesignateData.usergroup);
-                $("#User").setCheckedNodes(node.setInfo.NodeDesignateData.user);
-            }
-            $.each(node.setInfo.frmPermissionInfo, function (i, item) {
-                if (item.look) {
-                    $('#PermissionInfo').find('#frm_' + item.fieldid).attr("checked", "checked");
-                }
-                else {
-                    $('#PermissionInfo').find('#frm_' + item.fieldid).removeAttr("checked");
-                }
-                if (item.down != undefined)
-                {
-                    if (item.down) {
-                        $('#PermissionInfo').find('#frmx_' + item.fieldid).attr("checked", "checked");
-                    }
-                    else {
-                        $('#PermissionInfo').find('#frmx_' + item.fieldid).removeAttr("checked");
-                    }
-                }
-            });
-        }
-    }
-    function initLoadSysTemTable()
-    {
-        //数据库选择
-        var _NodeDb = "";
-        $("#NodeDataBase").ComboBoxTree({
-            description: "==请选择库==",
-            height: "150px",
-            url: "../../SystemManage/DataBaseLink/GetTreeJson",
-            allowSearch: true
-        }).bind("change", function () {
-            var value = $(this).attr('data-value');
-            _NodeDb = value;
-            //数据表
-            $("#NodeTable").ComboBox({
-                param: { dataBaseLinkId: value },
-                url: "../../SystemManage/DataBaseTable/GetTableListJson",
-                id: "name",
-                text: "name"
-            });
-        });
-        //数据表
-        $("#NodeTable").ComboBox({
-            description: "==请选择表==",
-            height: "140px",
-            allowSearch: true
-        }).bind("change", function () {
-            var value = $(this).attr('data-value');
-            var tablefiledJsonData = [];
-            $.ajax({
-                url: "../../SystemManage/DataBaseTable/GetTableFiledListJson",
-                data: { dataBaseLinkId: _NodeDb, tableName: value },
-                type: "GET",
-                dataType: "json",
-                async: false,
-                success: function (data) {
-                    tablefiledJsonData = data;
-                    $.each(tablefiledJsonData, function (id, item) {
-                        item.remark = item.column + "【" + item.remark + "】";
-                    });
-                    NodePramData = tablefiledJsonData;
-                    //数据表
-                    $("#NodePram").ComboBox({
-                        data: tablefiledJsonData,
-                        id: "column",
-                        text: "remark"
-                    });
-                },
-                error: function (XMLHttpRequest, textStatus, errorThrown) {
-                    dialogMsg(errorThrown, -1);
-                }
-            });
-        });
-        $("#NodePram").ComboBox({
-            description: "==请选择字段==",
-            height: "140px",
-            allowSearch: true
-        });
-    }
-
-    function GetTree(authtype) {
-        this.$authtype = authtype;
-        var data = $.arrayClone(parent.AllAuthorizeCheckData[$authtype]);
-        var item = {
-            height: 262,
-            showcheck: true,
-            data: data,
-            oncheckboxclick: function (item, et, s) {
-                var $item = $("#UserDiv");
-                if (et == 1) {
-                    var html = '<span  id="' + item.id
-                        + '" data-value="User" class="flow-card-box label label-danger">'
-                        + item.text + '<i class="fa fa-close"></i></span>';
-
-                    $item.append(html);
-                    $item.show();
-
-                    $(".flow-card-box").click(function() {
-                        $(this).remove();
-                        $('#' + $(this).attr('data-value')).setNoCheckedNodes($(this).attr('id'));
-                        if ($item.find('.flow-card-box').length == 0) {
-                            $item.hide();
-                        }
-                    });
-                }
-                else if (et == 0) {
-                    $item.find('#' + item.id).remove();
-                    if ($item.find('.flow-card-box').length == 0) {
-                        $item.hide();
-                    }
-                }
-
-            }
-        };
-        $("#" + authtype).treeview(item);
-    }
-    function GetDesignateMemberTree()
-    {
-        //GetTree('Role');
-        //GetTree('Post');
-        //GetTree('UserGroup');
-        GetTree('User');
-    }
-    function initFrmCotent(data)
-    {
-        $.each(data, function (i, item) {
-            var rowdata = '<tr><td><i class="fa fa-star"></i></td><td>' + item.control_label + '</td><td>';
-            if (item.control_type == 'image' || item.control_type == 'upload')
-            {
-                rowdata += '<div class="ckbox ckbox-color_a"><input id="frmx_' + item.control_field + '" value="'+ item.control_field +'"  type="checkbox" checked><label for="frmx_' + item.control_field + '">下载</label></div>';
-            }
-            rowdata += '<div class="ckbox ckbox-color_a"><input id="frm_' + item.control_field + '" value="'+ item.control_field +'" type="checkbox" checked><label for="frm_' + item.control_field + '">查看</label></div>';
-            rowdata += '</td></tr>';
-
-            $('#PermissionInfo').find('table').append(rowdata);
-        });
-    }
-    //保存字段设置
-    function AcceptClick() {
-        if (!$('#BaseInfo').Validform()) {
-            return false;
-        }
-        var baseinfo = $("#BaseInfo").GetWebControls();
-        baseinfo["NodeDesignate"] = $('.bottomline').find('input:checked').attr("id");
-        if (baseinfo["NodeDesignate"] == 'NodeDesignateType2') {
-            var _Designate = {};
-            _Designate["role"] = $("#Role").getCheckedAllNodes();
-            _Designate["post"] = $("#Post").getCheckedAllNodes();
-            _Designate["usergroup"] = $("#UserGroup").getCheckedAllNodes();
-            _Designate["user"] = $("#User").getCheckedAllNodes();
-            baseinfo["NodeDesignateData"] = _Designate;
-        }
-        var _PermissionInfo = [];
-        $.each($('#PermissionInfo').find('tr'),function(i,item){
-            var _ck = $(item).find('input');
-            
-            var _point = {};
-            $.each(_ck,function(j,d){
-                _point["fieldid"] = $(d).val();
-                if($(d).attr("id").indexOf("frmx_") == -1)
-                {
-                    _point["look"] = $(d)[0].checked;
-                }
-                else
-                {
-                    _point["down"] = $(d)[0].checked;
-                }
-            });
-            _PermissionInfo.push(_point);
-        });
-        baseinfo["frmPermissionInfo"] = _PermissionInfo;
-        var sqlinfo = $("#SQLInfo").GetWebControls();
-        baseinfo = $.extend(baseinfo, sqlinfo);
-        parent.callBackNode(node.id, baseinfo, NodePramData);
-    }
-</script>
-    <ul class="nav nav-tabs">
-        <li class="active"><a href="#BaseInfo" data-toggle="tab">基本配置</a></li>
-        <li><a href="#MakerInfo" data-toggle="tab">审核者</a></li>
-        <li><a href="#PermissionInfo" data-toggle="tab">权限分配</a></li>
-        @*<li><a href="#SQLInfo" data-toggle="tab">节点通过后执行SQL</a></li>*@
-    </ul>
-    <div class="tab-content">
-        <div id="BaseInfo" class="tab-pane active" style="padding-top:15px;padding-right:30px;">
-            <table class="form">
-                <tr>
-                    <td class="formTitle">节点标识</td>
-                    <td class="formValue">
-                        <input id="NodeCode" type="text" class="form-control" value="@Guid.NewGuid().ToString()" disabled isvalid="yes" checkexpession="NotNull" />
-                    </td>
-                    <td class="formTitle">节点名称<font face="宋体">*</font></td>
-                    <td class="formValue">
-                        <input id="NodeName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-                    </td>
-                </tr>
-                <tr class="systemdatabase">
-                    <td class="formTitle">绑定表名<font face="宋体">*</font></td>
-                    <td class="formValue">
-                        <div id="NodeDataBase" style="float:left;width:128px;" type="selectTree" class="ui-select" ></div>
-                        <div id="NodeTable" style="float:right;width:128px;"  type="select" class="ui-select" ></div>
-                    </td>
-                    <td class="formTitle">绑定字段<font face="宋体">*</font></td>
-                    <td class="formValue">
-                        <div id="NodePram" type="select" class="ui-select"></div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="formTitle">驳回类型<font face="宋体">*</font></td>
-                    <td class="formValue">
-                        <div id="NodeRejectType" type="select" class="ui-select" isvalid="yes" checkexpession="NotNull"></div>
-                    </td>
-                    <td class="formTitle">驳回步骤</td>
-                    <td class="formValue">
-                        <div id="NodeRejectStep" type="select" class="ui-select"></div>
-                    </td>
-                </tr>
-                <tr>
-                    @*<td class="formTitle">由谁执行<font face="宋体">*</font></td>
-                    <td class="formValue">
-                        <div id="NodeMake" type="select" class="ui-select" isvalid="yes" checkexpession="NotNull"></div>
-                    </td>*@
-                    <td class="formTitle">选项</td>
-                    <td class="formValue">
-                        <div class="ckbox ckbox-color_a"><input id="NodeIsOver" type="checkbox" /><label for="NodeIsOver">是否允许终止流程</label></div>
-                    </td>
-                    
-                </tr>
-                <tr id="confluencenode">
-                    <td class="formTitle">会签策略<font face="宋体">*</font></td>
-                    <td class="formValue">
-                        <div id="NodeConfluenceType" type="select" class="ui-select"></div>
-                    </td>
-                    <td class="formTitle">会签比例</td>
-                    <td class="formValue">
-                        <input id="NodeConfluenceRate" type="text" class="form-control" value="100" />
-                    </td>
-                </tr>
-                <tr>
-                    <th class="formTitle">
-                        备注
-                    </th>
-                    <td class="formValue" colspan="3">
-                        <textarea id="Description" class="form-control" style="height: 80px;"></textarea>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div id="MakerInfo" class="tab-pane">
-            <div class="bottomline">
-                <div class="rdio rdio-color_a"><input name="NodeDesignateTypename" id="NodeDesignateType1"  type="radio" checked /><label for="NodeDesignateType1">所有成员</label></div>
-                <div class="rdio rdio-color_a"><input name="NodeDesignateTypename" id="NodeDesignateType2"  type="radio" /><label for="NodeDesignateType2">指定成员</label></div>
-                @*<div class="rdio rdio-color_a"><input name="NodeDesignateTypename" id="NodeDesignateType3"  type="radio" /><label for="NodeDesignateType3">发起者领导</label></div>
-                <div class="rdio rdio-color_a"><input name="NodeDesignateTypename" id="NodeDesignateType4"  type="radio" /><label for="NodeDesignateType4">前一步骤领导</label></div>
-                <div class="rdio rdio-color_a"><input name="NodeDesignateTypename" id="NodeDesignateType5"  type="radio" /><label for="NodeDesignateType5">发起者部门领导</label></div>
-                <div class="rdio rdio-color_a"><input name="NodeDesignateTypename" id="NodeDesignateType6"  type="radio" /><label for="NodeDesignateType6">发起者公司领导</label></div>*@
-            </div>
-            <div id="DesignateMember" >
-                <div class="standtabborder" style="height: 262px;">
-                    <div class="standtab  standtabactived" onclick="$.standTabchange(this, 'Role')">
-                        角色
-                    </div>
-                    <div class="standtab " onclick="$.standTabchange(this, 'User')">
-                        用户
-                    </div>
-                </div>
-                <div id="Role" class="standtab-pane"></div>
-                <div id="Post" style="display: none;" class="standtab-pane"></div>
-                <div id="UserGroup" style="display: none;" class="standtab-pane"></div>
-                <div id="User" style="display: none;" class="standtab-pane"></div>
-                <div style="margin: 0px; border-right: none; border-left: none; border-bottom: none; background-color: #fff; overflow: auto; padding-bottom: 10px;height:262px;">
-                    <div id="RoleDiv" class="flow-portal-panel">
-                        <div class="flow-portal-panel-title"><i class="fa fa-paw"></i>&nbsp;&nbsp;角色</div>
-                    </div>
-                    <div id="PostDiv" class="flow-portal-panel">
-                        <div class="flow-portal-panel-title"><i class="fa fa-graduation-cap"></i>&nbsp;&nbsp;岗位</div>
-                    </div>
-                    <div id="UserGroupDiv" class="flow-portal-panel">
-                        <div class="flow-portal-panel-title"><i class="fa fa-group"></i>&nbsp;&nbsp;用户组</div>
-                    </div>
-                    <div id="UserDiv" class="flow-portal-panel">
-                        <div class="flow-portal-panel-title"><i class="fa fa-user"></i>&nbsp;&nbsp;用户</div>
-                    </div>
-                </div>
-                <div id="Treebackground" style="position: fixed; top: 87px; left: 0px; z-index: 2; width: 750px; height: 262px; background: #000; filter: alpha(opacity=10); opacity: 0.1;"></div>
-                </div>
-        </div>
-        <div id="PermissionInfo" class="tab-pane" style="overflow-y:auto;">
-            <div style="line-height:45px;padding-left:10px;color: #666; font-weight: 300;font-size: 16px;">
-                <i class="fa fa-tags"></i>&nbsp;&nbsp;表单权限配置(默认都是勾选的)
-            </div>
-            <div style="overflow-y:auto;height:261px;">
-                <table class="table flow-table-Permission"></table>
-            </div>
-        </div>
-        <div id="SQLInfo" class="tab-pane">
-            <div style="padding:10px;">
-                <div id="NodeDataBaseToSQL" style="margin-bottom:10px;" type="selectTree" class="ui-select"></div>
-                <textarea id="NodeSQL" class="form-control" placeholder="请在此处填写需要执行的SQL语句,用{0}表示流程实例的主键Id!" style="height: 240px;"></textarea>
-            </div>
-        </div>
-    </div>
-<style>
-    .standtab-pane {
-        width:224px;
-        border-right:1px solid #ccc;
-        float:left;
-    }
-</style>

OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml

@@ -1,423 +0,0 @@
-@{
-    ViewBag.Title = "流程设计器";
-    Layout = "~/Views/Shared/_FlowForm.cshtml";
-}
-<script>
-    var keyValue = request('keyValue');
-    var postData = {};//提交数据
-    var flowData = {};
-    var frmData = {};
-    var SchemeContentOld;
-    var frmapp;
-    var shcemeAuthorizeData = "";
-    var AllAuthorizeCheckData = {};
-    $(function () {
-        initialPage();
-    })
-    //初始化页面
-    function initialPage() {
-        $('#step-1 .panel-body').height($(window).height() - 228);
-        $('#Description').height($(window).height() - 385);
-        $('#DesignateMemberlist').height($(window).height() - 141);
-        $('#Treebackground').height($(window).height() - 131);
-        $('#step-2 .tab-content').height($(window).height() - 167);
-        initFrmInfo();
-        initFlowInfo();
-        //加载导向
-        $('#wizard').wizard().on('change', function (e, data) {
-            var $finish = $("#btn_finish");
-            var $next = $("#btn_next");
-            if (data.direction == "next") {
-                switch (data.step) {
-                    case 1:
-                        if (!bindingBase()) {
-                            return false;
-                        }
-                        break;
-                    case 2://绑定表单
-
-                        if (!bindingFrm()) {
-                            dialogTop("请选择左侧表单", "error");
-                            return false;
-                        }
-                        var frmcotentls = frmapp.getData();
-                        if (!frmcotentls) {
-                            return false;
-                        }
-                        frmData.FrmContent = JSON.stringify(frmcotentls);
-                        break;
-                    case 3://流程设计
-                        if (!bindingFlow()) {
-                            return false;
-                        }
-                        $finish.removeAttr('disabled');
-                        $next.attr('disabled', 'disabled');
-                        break;
-                    default:
-                        break;
-                }
-            } else {
-                $finish.attr('disabled', 'disabled');
-                $next.removeAttr('disabled');
-            }
-
-        });
-        //获取表单
-        if (!!keyValue) {
-            $.SetForm({
-                url: "../../FlowManage/FlowDesign/GetFormJson",
-                param: { keyValue: keyValue },
-                success: function (data) {
-                    $("#step-1").SetWebControls(data.schemeinfo);
-                    postData["SchemeVersion"] = data.schemeinfo.SchemeVersion;
-
-                    if (data.schemeinfo.EnabledMark == 3) {
-                        flowData["SchemeVersion"] = "cg";
-                    }
-                    SchemeContentOld = JSON.parse(data.schemecontent.SchemeContent);
-
-                    $('#FormFrmTree').setNodeChecked(SchemeContentOld.Frm.FrmId);
-                    frmData.FrmId = SchemeContentOld.Frm.FrmId;
-                    setFrmInfo(SchemeContentOld.Frm);
-
-                    setFlowInfo(SchemeContentOld.Flow);
-                }
-            });
-        }
-
-        GetTree('User');
-    }
-    /*=========基本配置（begin）==================================================================*/
-    function bindingBase() {
-        if (!$('#step-1').Validform()) {
-            return false;
-        }
-        var _postData = $("#step-1").GetWebControls(keyValue);
-        postData = $.extend(postData, _postData);
-        return true;
-    }
-    /*=========基本配置（end）====================================================================*/
-    function GetTree(type) {
-        $.SetForm({
-            //url: "/UserManager/Get" + type + "CheckTreeJson",
-            url:"/UserManager/GetAccessedUsers",
-            success: function (data) {
-                AllAuthorizeCheckData[type] = $.arrayClone(data);
-              
-            }
-        });
-    }
-
-    /*=========表单选择（begin）==================================================================*/
-    var _frmdatabase = "";
-    var _frmflag = false;
-    function initFrmInfo() {
-        //加载左边的树
-        var item = {
-            height: $(window).height() - 87,
-            url: "../../FlowManage/FormDesign/GetAllListJson",
-            onnodeclick: function (item) {
-
-                frmData.FrmId = item.id;
-                if (SchemeContentOld != undefined
-                    && frmData.FrmId == SchemeContentOld.Frm.FrmId) {
-                    setFrmInfo(SchemeContentOld.Frm);
-                }
-                else {
-                    $.SetForm({
-                        url: "../../FlowManage/FormDesign/GetFormJson",
-                        param: { keyValue: item.id },
-                        success: function (data) {
-                            setFrmInfo(data);
-                        }
-                    });
-                }
-
-            }
-        };
-        $("#FormFrmTree").treeview(item);
-
-        $(".editview").hover(function () {
-            $(this).find('.editviewtitle').show();
-        }, function (e) {
-            $(this).find('.editviewtitle').hide();
-        });
-        $('#editfrm').click(function () {
-            if (_frmflag) {
-                var frmcotentls = frmapp.getData();
-                if (!frmcotentls) {
-                    return false;
-                }
-                frmData.FrmContent = JSON.stringify(frmcotentls);
-                $('#frmdesign').hide();
-                $('#frmDefaulting').hide();
-                $('#frmpreview').show();
-
-                $('#frmpreview').frmPreview({
-                    tablecotent: frmData.FrmContent,
-                    width: 870
-                });
-                $(this).html("编辑表单");
-                _frmflag = false;
-            }
-            else {
-                if (frmData.FrmName != undefined) {
-                    $('#frmpreview').hide();
-                    $('#frmDefaulting').hide();
-                    $('#frmdesign').show();
-                    frmapp = $('#frmdesign').frmDesign({
-                        Height: $(window).height() - 179,
-                        frmContent: frmData.FrmContent
-                    });
-                    _frmflag = true;
-                    $(this).html("预览表单");
-                }
-                else {
-                    dialogTop("请选择左侧表单", "error");
-                }
-            }
-            return false;
-        });
-    }
-    //设置表单数据
-    function setFrmInfo(data) {
-        $('#frmdesign').hide();
-        $('#frmDefaulting').hide();
-        $('#frmpreview').show();
-
-        frmData.FrmDbId = data.FrmDbId;
-        frmData.FrmTable = data.FrmTable;
-        frmData.FrmName = data.FrmName;
-        frmData.FrmContent = data.FrmContent;
-        frmData.FrmTableId = data.FrmTableId;
-
-        _frmflag = false;
-        $('#frmpreview').frmPreview({
-            tablecotent: data.FrmContent,
-            width: 870
-        });
-
-
-        frmapp = $('#frmdesign').frmDesign({
-            Height: 480,
-            frmContent: frmData.FrmContent
-        });
-
-    }
-    function bindingFrm() {
-        if (frmData.FrmName == undefined) {
-            return false;
-        }
-        return true;
-    }
-    /*=========表单选择（end）====================================================================*/
-
-    /*=========流程设计（begin）==================================================================*/
-    var FlowDesignPanel;
-    var FlowDesignObject;//
-    var LineId;
-    var nodePramData = [];
-    function initFlowInfo() {
-        FlowDesignPanel = $('#FlowPanel').flowdesign({
-            height: ($(window).height() - 87),
-            widht: 1000,
-            OpenNode: function (object) {
-                FlowDesignObject = object;
-                if (object.$nodeData[object.$focus].type == 'startround') {
-                    return false;
-                }
-
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //加上边框
-                    area: ['800px', '450px'], //宽高
-                    maxmin: true, //开启最大化最小化按钮
-                    title: '节点设置【' + object.$nodeData[object.$focus].name + '】',
-                    content: '/FlowManage/FlowDesign/FlowNodeForm',
-                    btn: ['保存', '关闭'],
-                    yes: function (index, layero) {
-                        var body = layer.getChildFrame('body', index);
-                        var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                        iframeWin.AcceptClick();
-                    },
-                    cancel: function (index) {
-                        layer.close(index);
-                    }
-                });
-            },
-            OpenLine: function (id, object) {
-                FlowDesignObject = object;
-                LineId = id;
-                var _line = object.$lineData[id];
-                var _fromNode = object.$nodeData[_line.from];
-                if (_fromNode.type == "shuntnode") {
-                    dialogTop("前一个节点是分流节点无法设置流转条件", "error");
-                    return false;
-                }
-
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //加上边框
-                    area: ['800px', '450px'], //宽高
-                    maxmin: true, //开启最大化最小化按钮
-                    title: '流转条件设置',
-                    content: '/FlowManage/FlowDesign/FlowLineForm',
-                    btn: ['保存', '关闭'],
-                    yes: function (index, layero) {
-                        var body = layer.getChildFrame('body', index);
-                        var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                        iframeWin.AcceptClick();
-                    },
-                    cancel: function (index) {
-                        layer.close(index);
-                    }
-                });
-
-            }
-        });
-    }
-    function setFlowInfo(data) {
-        FlowDesignPanel.loadData(data);
-    }
-    function callBackNode(id, data, _nodePramData) {
-        nodePramData = _nodePramData;
-        FlowDesignPanel.SetNodeEx(id, data);
-    }
-    function callBackLine(id, data) {
-        FlowDesignPanel.SetLineEx(id, data);
-    }
-    function bindingFlow() {
-        var _content = FlowDesignPanel.exportDataEx();
-        if (_content == -1) {
-            return false;
-        }
-        flowData["SchemeContent"] = JSON.stringify({ "Frm": frmData, "Flow": _content });
-        return true;
-    }
-    /*=========流程设计（end）====================================================================*/
-
-    /*=========创建完成（begin）==================================================================*/
-    function finishbtn() {
-        postData["EnabledMark"] = 1;
-        var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
-        $.SaveForm({
-            url: "../../FlowManage/FlowDesign/SaveForm?keyValue=" + keyValue,
-            param: { "InfoEntity": JSON.stringify(postData), "ContentEntity": JSON.stringify(flowData), "shcemeAuthorizeData": shcemeAuthorizeData },
-            loading: "正在保存数据...",
-            success: function () {
-                parent.layer.close(index);
-            }
-        })
-    }
-    /*=========创建完成（end）====================================================================*/
-</script>
-
-<div class="widget-body">
-    <div id="wizard" class="wizard" data-target="#wizard-steps">
-        <ul class="steps">
-            <li data-target="#step-1" class="active"><span class="step">1</span>基本配置<span class="chevron"></span></li>
-            <li data-target="#step-2"><span class="step">2</span>表单选择<span class="chevron"></span></li>
-            <li data-target="#step-3"><span class="step">3</span>流程设计<span class="chevron"></span></li>
-            <li data-target="#step-4"><span class="step">4</span>创建完成<span class="chevron"></span></li>
-        </ul>
-    </div>
-    <div class="step-content wizard-step-content" id="wizard-steps">
-        <div class="step-pane wizard-step-pane active" id="step-1">
-            <div class="alert alert-danger" style="text-align: left; margin-bottom: 10px;">
-                <i class="fa fa-warning alert-dismissible" style="position: relative; top: 1px; font-size: 15px; padding-right: 5px;"></i>
-                请你创建流程信息，用于创建或修改流程！
-            </div>
-
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">流程基本信息配置</h3>
-                </div>
-                <div class="panel-body">
-                    <table class="form">
-                        <tr>
-                            <td class="formTitle">流程编号<font face="宋体">*</font></td>
-                            <td class="formValue">
-                                <input id="SchemeCode" type="text" class="form-control" placeholder="请输入流程编号" isvalid="yes" checkexpession="NotNull" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="formTitle">流程名称<font face="宋体">*</font></td>
-                            <td class="formValue">
-                                <input id="SchemeName" type="text" class="form-control" placeholder="请输入流程名称" isvalid="yes" checkexpession="NotNull" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <th class="formTitle formTitle-top">
-                                备注
-                            </th>
-                            <td class="formValue">
-                                <textarea id="Description" class="form-control"></textarea>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <div class="step-pane" id="step-2">
-            <div>
-                <div id="FormFrmTree" class="border-right" style="width: 190px; float: left;"></div>
-                <div style="width: 890px;float:right;margin-right:10px;">
-                    <div class="alert alert-danger" style="text-align: left;margin-top:10px;margin-bottom:10px;">
-                        <i class="fa fa-question-circle alert-dismissible" style="position: relative; top: 1px; font-size: 15px; padding-right: 5px;"></i>
-                        注：1、请在左侧选择需要绑定表单。2、可编辑表单(此编辑只作用与当前流程)。
-                    </div>
-
-                    <div class="tab-content editview border" style="overflow-y:auto;overflow-x:hidden;">
-                        <div class="editviewtitle" id="editfrm">
-                            编辑表单
-                        </div>
-                        <div style="width:870px;display:none;" id="frmdesign"></div>
-                        <div class="app_layout app_preview" id="frmpreview" style="display:none;"></div>
-                        <div id="frmDefaulting" style="width:300px;margin:140px auto 0px;text-align:center;font-size:100px;color:#0FA74F"><i class="fa fa-table"></i><div style="font-weight: bold; font-size: 24px; color: #0FA74F;margin-top: 0px;">表单预览</div></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="step-pane" id="step-3">
-            <div id="FlowPanel" style="margin: 0px;">
-            </div>
-        </div>
-        <div class="step-pane" id="step-4">
-            <div class="drag-tip">
-                <i class="fa fa-check-circle"></i>
-                <p>设计完成,请点击保存</p>
-            </div>
-        </div>
-    </div>
-    <div class="form-button" id="wizard-actions">
-        <a id="btn_last" disabled class="btn btn-default btn-prev">上一步</a>
-        <a id="btn_next" class="btn btn-default btn-next">下一步</a>
-        <a id="btn_finish" disabled class="btn btn-success" onclick="finishbtn();">保存</a>
-    </div>
-</div>
-<style>
-    .editviewtitle {
-        position: fixed !important;
-        top: 117px;
-        right: 11px;
-        width: 50px;
-        z-index: 1000;
-    }
-
-    .standtab-pane {
-        width: 224px;
-        border-right: 1px solid #ccc;
-        float: left;
-    }
-
-    .SchemeAuthorizePanel {
-        width: 828px;
-        float: left;
-        display: none;
-    }
-
-    .card-box.active {
-        background: url(../../Content/Images/item_close.png) right top no-repeat !important;
-    }
-</style>

OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/Index.cshtml

@@ -1,41 +0,0 @@
-@{
-    Layout = "~/Views/Shared/_Layout.cshtml";
-}
-
-<!-- #section:basics/content.breadcrumbs -->
-<div class="breadcrumbs" id="breadcrumbs">
-    <ul class="breadcrumb">
-        <li>
-            <i class="ace-icon fa fa-home home-icon"></i>
-            <a href="#">流程模版</a>
-        </li>
-        <li class="active">列表</li>
-    </ul><!-- /.breadcrumb -->
-</div>
-
-<div class="page-content">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="widget-box widget-color-blue">
-                <div class="widget-header">
-                    @Html.Action("MenuHeader", "Home", new {area=""})
-                </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>
-</div><!-- /.page-content -->
-
-<script src="~/BllScripts/grid.js"></script>
-<script src="~/BllScripts/flowDesign.js"></script>
-<script src="~/BllScripts/jqEvent.js"></script>
-

OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/PreviewIndex.cshtml

@@ -1,113 +0,0 @@
-@{
-    ViewBag.Title = "流程预览";
-    Layout = "~/Views/Shared/_FlowForm.cshtml";
-}
-<link href="~/Content/styles/flow.css" rel="stylesheet" />
-<script src="~/BllScripts/clientData.js"></script>
-<script>
-    var keyValue = request('keyValue');
-    var schemeVersion = request('schemeVersion');
-    var processSchemeId = request('processSchemeId');
-    $(function () {
-        var schemeContent;
-        var _width = $(window).width() * 0.9 - 20;
-        if (_width > 1000)
-        {
-            _width = 1000;
-        }
-        if (keyValue) {
-            $.SetForm({
-                url: "../../FlowManage/FlowDesign/GetSchemeContentJson",
-                param: { keyValue: keyValue, SchemeVersion: schemeVersion },
-                success: function (data) {
-                    schemeContent = JSON.parse(data.SchemeContent);
-                    $('#frmpreview').frmPreview({
-                        tablecotent: schemeContent.Frm.FrmContent,
-                        width: _width
-                    });
-                    $('#frmname').html(schemeContent.Frm.FrmName);
-                    console.log(schemeContent);
-                    $('#FlowPanel').flowdesign({
-                        height: $(window).height() - 18,
-                        width: $(window).width() - 20,
-                        flowcontent: schemeContent.Flow,
-                        frmData: JSON.parse(schemeContent.Frm == "" ?"[]":schemeContent.Frm.FrmContent),
-                        haveTool: false,
-                        preview:1
-                    });
-                }
-            });
-        }
-        else {
-            $.SetForm({
-                url: "../../FlowManage/FlowInstances/GetProcessSchemeJson",
-                param: { keyValue: processSchemeId },
-                success: function (data) {
-                    schemeContent = JSON.parse(JSON.parse(data.SchemeContent).SchemeContent);
-                    $('#frmpreview').frmPreview({
-                        tablecotent: schemeContent.Frm.FrmContent,
-                        width: _width,
-                    });
-                    $('#frmname').html(schemeContent.Frm.FrmName);
-                    $('#FlowPanel').flowdesign({
-                        height: $(window).height() - 18,
-                        width: $(window).width() - 20,
-                        flowcontent: schemeContent.Flow,
-                        frmData: JSON.parse(schemeContent.Frm == "" ? "[]" : schemeContent.Frm.FrmContent),
-                        haveTool: false,
-                        preview: 1
-                    });
-                }
-            });
-        }
-        //resize重设(表格、树形)宽高
-        $(window).resize(function (e) {
-            window.setTimeout(function () {
-                $('#previewpage').css("height", e.currentTarget.innerHeight-20);
-                $('#formAreas').css("width", e.currentTarget.innerWidth * 0.9-20);
-                if (schemeContent != undefined)
-                {
-                    $('#FlowPanel').flowdesign({
-                        height: e.currentTarget.innerHeight - 18,
-                        width: e.currentTarget.innerWidth - 20,
-                        flowcontent: schemeContent.Flow,
-                        haveTool: false
-                    });
-                }
-            }, 200);
-            e.stopPropagation();
-        });
-        $('#formAreas').css("width", $(window).width() * 0.9-20);
-        $('#previewpage').css("height", $(window).height()-20);
-    });
-    function flowshow()
-    {
-        $('#previewpage').hide();
-        $('#FlowPanel').show();
-    }
-    function frmshow() {
-        $('#FlowPanel').hide();
-        $('#previewpage').show();
-    }
-</script>
-<div style="position:absolute;top:0; right:100px;z-index:1000;background:rgba(0, 0, 0, 0.1);padding:10px;border-radius:0px 0px 5px 5px;">
-    <a class="btn btn-success" onclick="flowshow()">&nbsp;流程预览</a>
-    <a class="btn btn-default" onclick="frmshow()">&nbsp;表单预览</a>
-</div>
-<div class="panels">
-    <div id="previewpage" style="overflow-y:auto;background-color:#fff;display:none;border: 1px solid #ccc;">
-        <div id="formAreas" style="margin: 30px auto;max-width: 1000px;">
-            <div style="border-bottom:1px solid #ccc;text-align:center"><span id="frmname"></span></div>
-            <div class="app_layout app_preview" id="frmpreview"></div>
-        </div>
-    </div>
-    <div id="FlowPanel" style="margin: 0px;border: 1px solid #ccc;"></div>
-</div>
-<style>
-    body {
-        overflow: hidden;
-    }
-    .panels {
-        padding: 10px;
-    }
-</style>

OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/FlowProcessNewForm.cshtml

@@ -1,156 +0,0 @@
-@{
-    ViewBag.Title = "发起流程";
-    Layout = "~/Views/Shared/_FlowForm.cshtml";
-}
-<script>
-    var keyValue = request('keyValue');
-    $(function () {
-        var schemeContent;
-        $('.FlowPanelall').height($.windowHeight() - 40);
-        $('#Description').height($.windowHeight() - 280);
-        $.SetForm({
-            url: "../../FlowManage/FlowDesign/GetFormJson",
-            param: { keyValue: keyValue },
-            success: function (data) {
-                schemeContent = JSON.parse(data.schemecontent.SchemeContent);
-                $('#frmpreview').frmPreview({
-                    tablecotent: schemeContent.Frm.FrmContent
-                });
-                $('#Code').val(data.schemeinfo.SchemeName);
-            }
-        });
-    });
-    //保存为草稿
-    function btn_Roughdraft() {
-        var _postData = $("#ProcessInfo").GetWebControls();
-        _postData["EnabledMark"] = 3;
-        _postData["wfLevel"] = $('input[name="wfLevel"]:checked').val();
-        var _data = $("#frmpreview").frmGetData();
-        var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
-        $.SaveForm({
-            url: "../../FlowManage/FlowInstances/CreateProcess",
-            param: { "wfSchemeInfoId": keyValue, "frmData": JSON.stringify(_data), "wfProcessInstanceJson": JSON.stringify(_postData) },
-            loading: "正在保存数据...",
-            success: function() {
-                parent.layer.close(index);
-            }
-        })
-    }
-    //提交表单
-    function btn_Finish() {
-        if (!$('#ProcessInfo').Validform()) {
-            return false;
-        }
-        var _postData = $("#ProcessInfo").GetWebControls(keyValue);
-        _postData["EnabledMark"] = 1;
-        _postData["wfLevel"] = $('input[name="wfLevel"]:checked').val();
-        var _data = $("#frmpreview").frmGetData();
-        var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
-        $.SaveForm({
-            url: "../../FlowManage/FlowInstances/CreateProcess",
-            param: { "wfSchemeInfoId": keyValue, "frmData": JSON.stringify(_data), "wfProcessInstanceJson": JSON.stringify(_postData) },
-            loading: "正在保存数据...",
-            success: function() {
-                parent.layer.close(index);
-            }
-        })
-    }
-</script>
-<div class="FlowPanelall">
-    <div id="frmpreview" class="tab-pane app_layout app_preview active">
-    </div>
-</div>
-<div class="FlowInfoPanel" id="ProcessInfo">
-    <div style="color:#9f9f9f;padding-bottom:15px;padding-left:5px;"><i style="padding-right:5px;" class="fa fa-info-circle"></i><span>填写左侧表单和实例信息,提交创建</span></div>
-    <table class="form">
-        <tr>
-            <td class="formTitle">流程实例编号<font face="宋体">*</font></td>
-        </tr>
-        <tr>
-            <td class="formValue">
-                <input id="Code" disabled type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-            </td>
-        </tr>
-        <tr>
-            <td class="formTitle">自定义标题<font face="宋体">*</font></td>
-        </tr>
-        <tr>
-            <td class="formValue">
-                <input id="CustomName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-            </td>
-        </tr>
-        <tr>
-            <td class="formTitle">重要等级<font face="宋体">*</font></td>
-        </tr>
-        <tr>
-            <td class="formValue">
-                <div class="rdio rdio-color_c"><input name="wfLevel" id="wfLevel1" value="1" type="radio" /><label for="wfLevel1">重要</label></div>
-                <div class="rdio rdio-color_f"><input name="wfLevel" id="wfLevel2" value="2" type="radio" checked /><label for="wfLevel2">普通</label></div>
-                <div class="rdio rdio-color_a"><input name="wfLevel" id="wfLevel3" value="3" type="radio" /><label for="wfLevel3">一般</label></div>
-            </td>
-        </tr>
-        <tr>
-            <td class="formTitle">备注</td>
-        </tr>
-        <tr>
-            <td class="formValue">
-                <textarea id="Description" class="form-control" style="height: 383px;"></textarea>
-            </td>
-        </tr>
-    </table>
-    
-</div>
-<div class="form-button" >
-
-    <a id="btn_finish" class="btn btn-success" onclick="btn_Finish();">完成提交</a>
-</div>
-<style>
-    body {
-        overflow: hidden;
-    }
-    .app_preview .item_field_value {
-        width: 664px;
-    }
-
-    .app_preview .item_row {
-        background-color: #fff;
-    }
-
-    .app_layout .item_field_label {
-        background-color: #fff;
-    }
-
-    .FlowPanelall {
-        width: 800px;
-        float: left;
-        overflow-y:auto;
-    }
-
-    .FlowInfoPanel {
-        float: right;
-        width: 300px;
-        height: 659px;
-        z-index: 1000;
-        background: rgba(0,0,0,0.01);
-        padding: 10px;
-        border-left: 1px solid #ccc;
-    }
-
-    .form .formTitle {
-        text-align: left;
-        padding-left: 5px;
-    }
-
-    form .formTitle font {
-        right: auto !important;
-        margin-left: 5px;
-    }
-
-    .formValue input, .formValue textarea {
-        border-radius: 5px;
-    }
-
-    input, textarea {
-        background: #fff !important;
-    }
-</style>

OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/Index.cshtml

@@ -1,56 +0,0 @@
-@{
-    Layout = "~/Views/Shared/_Layout.cshtml";
-}
-
-<!-- #section:basics/content.breadcrumbs -->
-<div class="breadcrumbs" id="breadcrumbs">
-    <ul class="breadcrumb">
-        <li>
-            <i class="ace-icon fa fa-home home-icon"></i>
-            <a href="#">申请管理</a>
-        </li>
-        <li class="active">列表</li>
-    </ul><!-- /.breadcrumb -->
-</div>
-
-<!-- /section:basics/content.breadcrumbs -->
-<div class="page-content">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="col-md-3">
-                <div class="widget-box widget-color-blue">
-                    <div class="widget-header">
-                    </div>
-                    <div class="widget-body">
-                        <div class="widget-main">
-                            <ul id="orgtree" class="ztree" style="width: 100%"></ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-9">
-                <div class="widget-box widget-color-blue">
-                    <div class="widget-header">
-                        @Html.Action("MenuHeader", "Home", new {area=""})
-                    </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>
-    </div>
-</div><!-- /.page-content -->
-
-<script src="~/BllScripts/grid.js"></script>
-<script src="~/BllScripts/flowInstance.js"></script>
-<script src="~/BllScripts/jqEvent.js"></script>
-
-

OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/ProcessLookForm.cshtml

@@ -1,48 +0,0 @@
-@{
-    ViewBag.Title = "查看流程进度";
-    Layout = "~/Views/Shared/_FlowForm.cshtml";
-}
-<script src="~/BllScripts/clientData.js"></script>
-<script>
-    var processSchemeId = request('processSchemeId');
-    var ActivityId = request('activityId');
-    $(function () {
-        var schemeContent;
-        $.SetForm({
-            url: "../../FlowManage/FlowInstances/GetProcessSchemeJson",
-            param: { keyValue: processSchemeId },
-            success: function (data) {
-                schemeContent = JSON.parse(JSON.parse(data.SchemeContent).SchemeContent);
-                frmdata = JSON.parse(JSON.parse(data.SchemeContent).frmData);
-
-                $('#frmpreview').frmPreview({
-                    tablecotent: schemeContent.Frm.FrmContent,
-                    width:1080
-                });
-                $('#FlowPanel').flowdesign({
-                    width: $(window).width()+3,
-                    height: $(window).height()-42,
-                    flowcontent: schemeContent.Flow,
-                    haveTool: false,
-                    isprocessing: true,
-                    activityId: ActivityId,
-                    nodeData: schemeContent.Flow.nodes
-                });
-
-                $('#frmpreview').frmSetData(frmdata);
-                $('#frmpreview').find('input,select,textarea,.ui-select').attr('disabled', 'disabled');
-            }
-        });
-    });
-</script>
-<ul class="nav nav-tabs">
-    <li class="active"><a href="#FlowPanel" data-toggle="tab">流程信息</a></li>
-    <li><a href="#frmpreview" data-toggle="tab">表单信息</a></li>
-</ul>
-
-<div class="tab-content">
-    <div id="FlowPanel" class="tab-pane active">
-    </div>
-    <div id="frmpreview" class="tab-pane app_layout app_preview">
-    </div>
-</div>

OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/VerificationForm.cshtml

@@ -1,223 +0,0 @@
-@using OpenAuth.App.SSO
-@{
-    ViewBag.Title = "审核流程";
-    Layout = "~/Views/Shared/_FlowForm.cshtml";
-}
-<style>
-    body {
-        overflow: hidden;
-    }
-
-    .app_preview .item_row {
-        background-color: #fff;
-    }
-
-    .app_layout .item_field_label {
-        background-color: #fff;
-    }
-
-    .FlowPanelall {
-        width: 800px;
-        float: left;
-    }
-
-    .FlowInfoPanel {
-        float: right;
-        width: 300px;
-        height: 659px;
-        z-index: 1000;
-        background: rgba(0,0,0,0.01);
-        padding: 10px;
-        border-left: 1px solid #ccc;
-    }
-
-    .form .formTitle {
-        text-align: left;
-        padding-left: 5px;
-    }
-
-        .form .formTitle font {
-            right: auto !important;
-            margin-left: 5px;
-        }
-
-    .formValue input, .formValue textarea {
-        border-radius: 5px;
-    }
-
-    input, textarea {
-        background: #fff !important;
-    }
-</style>
-<div class="FlowPanelall">
-    <ul class="nav nav-tabs">
-        <li class="active"><a href="#frmtab" data-toggle="tab">表单信息</a></li>
-        <li><a href="#FlowPanel" data-toggle="tab">流程信息</a></li>
-    </ul>
-    <div class="tab-content">
-        <div id="frmtab" class="tab-pane active" style="overflow-y:auto;">
-            <div id="frmpreview" class="app_layout app_preview">
-            </div>
-        </div>
-        <div id="FlowPanel" class="tab-pane">
-        </div>
-    </div>
-</div>
-<div class="FlowInfoPanel" id="VerificationInfo">
-    <div style="color:#9f9f9f;padding-bottom:15px;padding-left:5px;"><i style="padding-right:5px;" class="fa fa-info-circle"></i><span>在此填写内容,提交审核</span></div>
-    <table class="form">
-        <tr>
-            <td class="formTitle">申请人员</td>
-        </tr>
-        <tr>
-            <td class="formValue">
-                <input id="Createusername" disabled type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-                <input id="Createuserid" style="display: none" />
-            </td>
-        </tr>
-        <tr>
-            <td class="formTitle">申请备注</td>
-        </tr>
-        <tr>
-            <td class="formValue">
-                <textarea id="Description" disabled class="form-control" style="height:50px;"></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td class="formTitle">审核人员<font face="宋体">*</font></td>
-        </tr>
-        <tr>
-            <td class="formValue">
-                <input id="VerificationUser" value="@AuthUtil.GetUserName()" disabled type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-            </td>
-        </tr>
-        <tr>
-            <td class="formTitle">审核结果<font face="宋体">*</font></td>
-        </tr>
-        <tr>
-            <td class="formValue">
-                <div class="rdio rdio-color_a"><input name="VerificationFinally" id="VerificationFinally1" value="1" type="radio" /><label for="VerificationFinally1">同意</label></div>
-                <div class="rdio rdio-color_f"><input name="VerificationFinally" id="VerificationFinally2" value="2" type="radio" /><label for="VerificationFinally2">不同意</label></div>
-                <div class="rdio rdio-color_c"><input name="VerificationFinally" id="VerificationFinally3" value="3" type="radio" /><label for="VerificationFinally3">驳回</label></div>
-            </td>
-        </tr>
-        <tr class="NodeRejectStep" style="display:none">
-            <td class="formTitle">驳回步骤<font face="宋体">*</font></td>
-        </tr>
-        <tr class="NodeRejectStep" style="display:none">
-            <td class="formValue">
-                <div id="NodeRejectStep" type="select" class="ui-select"></div>
-            </td>
-        </tr>
-        <tr>
-            <td class="formTitle">审核意见</td>
-        </tr>
-        <tr>
-            <td class="formValue">
-                <textarea id="VerificationOpinion" class="form-control"></textarea>
-            </td>
-        </tr>
-    </table>
-    <div style="padding:5px;">
-        <a id="btn_Submission" class="btn btn-success btn-block"><i class="fa fa-check-circle"></i>&nbsp;提交审核</a>
-    </div>
-</div>
-<script src="~/BllScripts/clientData.js"></script>
-<script>
-    var processSchemeId = request('processSchemeId');
-    var activityId = request('activityId');
-    var processInstanceId = request('processInstanceId');
-    var createusername = decodeURI(request('createusername'));
-    var createuserid = decodeURI(request('createuserid'));
-    var description = decodeURI(request('description'));
-    $(function () {
-        var schemeContent;
-        $('#Createusername').val(createusername);
-        $('#Createuserid').val(createuserid);
-        $('#Description').val(description);
-        $('#frmtab').height($.windowHeight() - 40);
-        $('#VerificationOpinion').height($.windowHeight() - 360);
-        $.SetForm({
-            url: "../../FlowManage/FlowInstances/GetProcessSchemeEntityByNodeId",
-            param: { keyValue: processSchemeId, nodeId: activityId },
-            success: function (data) {
-                schemeContent = JSON.parse(JSON.parse(data.SchemeContent).SchemeContent);
-                frmdata = JSON.parse(JSON.parse(data.SchemeContent).frmData);
-                $('#frmpreview').frmPreview({
-                    tablecotent: schemeContent.Frm.FrmContent
-                });
-                $('#FlowPanel').flowdesign({
-                    width: $(window).width() - 298,
-                    height: $(window).height() - 42,
-                    flowcontent: schemeContent.Flow,
-                    haveTool: false,
-                    isprocessing: true,
-                    activityId: activityId,
-                    nodeData: schemeContent.Flow.nodes
-                });
-                $('#frmpreview').frmSetData(frmdata);
-                $('#frmpreview').find('input,select,textarea,.ui-select').attr('disabled', 'disabled');
-
-                //驳回到某一步
-                $("#NodeRejectStep").ComboBox({
-                    data: schemeContent.Flow.nodes,
-                    id: "id",
-                    text: "name",
-                    description: "==请选择==",
-                    allowSearch: true,
-                    height: "300px",
-                });
-                var _node = "";
-                for (var i in schemeContent.Flow.nodes) {
-                    if (schemeContent.Flow.nodes[i].id == activityId) {
-                        _node = schemeContent.Flow.nodes[i];
-                        break;
-                    }
-                }
-                if (_node.setInfo != undefined && _node.setInfo.NodeRejectType == "3") {
-                    $('input[name = "VerificationFinally"]').click(function () {
-                        var _value = $(this).val();
-                        var _height = $.windowHeight() - 360;
-                        var _height1 = _height - 55;
-                        if (_value == "3") {
-                            $(".NodeRejectStep").show();
-                            $("#VerificationOpinion").height(_height1);
-                        }
-                        else {
-                            $(".NodeRejectStep").hide();
-                            $("#VerificationOpinion").height(_height);
-                        }
-                    });
-                }
-            }
-        });
-
-        $('#btn_Submission').click(function () {
-            if (!$('#VerificationInfo').Validform()) {
-                return false;
-            }
-            var _verificationFinally = $('input[name = VerificationFinally]:checked').val();
-            if (_verificationFinally == undefined) {
-                dialogTop("请选择审核结果", "error");
-                return false;
-            }
-            var _postdata = $("#VerificationInfo").GetWebControls();
-
-            delete _postdata["VerificationFinally1"];
-            delete _postdata["VerificationFinally2"];
-            delete _postdata["VerificationFinally3"];
-
-            _postdata["VerificationFinally"] = _verificationFinally;
-            var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
-            $.ConfirmAjax({
-                msg: "请确认是否要【提交审核】流程？",
-                url: "../../FlowManage/FlowInstances/VerificationProcess",
-                param: { processId: processInstanceId, verificationData: JSON.stringify(_postdata) },
-                success: function (data) {
-                    parent.layer.close(index);
-                }
-            })
-
-        });
-    });
-</script>

OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FormPreview.cshtml

@@ -1,36 +0,0 @@
-@{
-    ViewBag.Title = "表单预览";
-    Layout = "~/Views/Shared/_FlowForm.cshtml";
-}
-<script>
-    var keyValue = request('keyValue');
-    $(function () {
-        $('#formAreas').css("min-height", $(window).height() - 82);
-        $('#formAreas').css("width", $(window).width() * 0.9);
-        $('#previewpage').css("height", $(window).height()-20);
-        $.SetForm({
-            url: "../../FlowManage/FormDesign/GetFormJson",
-            param: { keyValue: keyValue },
-            success: function (data) {
-                $('#frmpreview').frmPreview({
-                    tablecotent: data.FrmContent
-                });
-                $('#frmname').html(data.FrmName);
-            }
-        });
-        //resize重设(表格、树形)宽高
-        $(window).resize(function (e) {
-            window.setTimeout(function () {
-                $('#previewpage').css("height", e.currentTarget.innerHeight-20);
-                $('#formAreas').css("min-height", e.currentTarget.innerHeight - 82).css("width", e.currentTarget.innerWidth * 0.9);
-            }, 200);
-            e.stopPropagation();
-        });
-    });
-</script>
-<div id="previewpage" style="overflow-y:auto;background-color:#fff;margin:10px;border:1px solid #ccc;">
-    <div id="formAreas" style="margin: 30px auto;max-width: 1000px;">
-        <div style="border-bottom:1px solid #ccc;text-align:center;"><span id="frmname"></span></div>
-        <div class="app_layout app_preview" id="frmpreview"></div>
-    </div>
-</div>

OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FrmBuider.cshtml

@@ -1,238 +0,0 @@
-@{
-    ViewBag.Title = "表单创建";
-    Layout = "~/Views/Shared/_FlowForm.cshtml";
-}
-<script>
-    var keyValue = request('keyValue');
-    var postData = {};//提交数据
-    var frmdatabase = "";
-    var frmapp = "";
-    $(function () {
-        initialPage();
-    })
-    //初始化页面
-    function initialPage() {
-        $('#step-1 .panel-body').height($(window).height() - 228);
-        $('#Description').height($(window).height() - 380);
-        $('#step-2 .tab-content').height($(window).height() - 87);
-        initBaseInfo();
-        //加载导向
-        $('#wizard').wizard().on('change', function (e, data) {
-            var $finish = $("#btn_finish");
-            var $next = $("#btn_next");
-            if (data.direction == "next") {
-                switch (data.step) {
-                    case 1:
-                        return bindingBase();
-                        break;
-                    case 2://绑定表单
-                        if (!bindingFrm()) {
-                            return false;
-                        }
-                        $finish.removeAttr('disabled');
-                        $next.attr('disabled', 'disabled');
-                        break;
-                    default:
-                        break;
-                }
-            } else {
-                $finish.attr('disabled', 'disabled');
-                $next.removeAttr('disabled');
-            }
-        });
-        $('input[name="isSystemTable"]').click(function () {
-            var value = $(this).val();
-            if (value == 0) {
-                $('.Systemtable').hide();
-                $('.Systemtable').find('.ui-select').removeAttr('isvalid');
-                $('.Systemtable').find('.ui-select').removeAttr('checkexpession');
-            }
-            else {
-                $('.Systemtable').show();
-                $('.Systemtable').find('.ui-select').attr('isvalid', 'yes');
-                $('.Systemtable').find('.ui-select').attr('checkexpession', 'NotNull');
-            }
-        });
-        //获取表单
-        if (!!keyValue) {
-            //获取表单
-            $.SetForm({
-                url: "../../FlowManage/FormDesign/GetFormJson",
-                param: { keyValue: keyValue },
-                success: function (data) {
-                    $("#step-1").SetWebControls(data);
-                    $('#isSystemTable' + data.isSystemTable).trigger('click');
-                    if (data.isSystemTable == 1)
-                    {
-                        $("#step-1").find("#FrmDbId").trigger("change");
-                        $("#step-1").find("#FrmTable").ComboBoxSetValue(data.FrmTable);
-                        $("#step-1").find("#FrmTable").trigger("change");
-                        $("#step-1").find("#FrmTableId").ComboBoxSetValue(data.FrmTableId);
-                    }
-                   
-                    setFrmInfo(data);
-                }
-            });
-        }
-    }
-    /*=========基本配置（begin）==================================================================*/
-    function initBaseInfo()
-    {
-        //性别
-        $("#Gender").ComboBox({
-            description: "==请选择==",
-        });
-
-    }
-    function bindingBase()
-    {
-        if (!$('#step-1').Validform()) {
-            return false;
-        }
-        var _postData = $("#step-1").GetWebControls(keyValue);
-        postData.isSystemTable = $('input[name="isSystemTable"]:checked').val();
-        postData = $.extend(postData, _postData);
-        setFrmInfo(postData);
-        return true;
-    }
-    /*=========基本配置（end）====================================================================*/
-
-    /*=========表单选择（begin）==================================================================*/
-    function setFrmInfo(data)
-    {
-        var _height = $(window).height() - 87 < 410 ? 410 : $(window).height() - 87;
-        postData.FrmContent = data.FrmContent;
-        if (data.isSystemTable == "0") {
-            frmapp = $('#frmdesign').frmDesign({
-                Height: _height,
-                frmContent: postData.FrmContent
-            });
-        }
-        else {
-            var _frmdatabase = [];
-            for (var i in frmdatabase)
-            {
-                if (frmdatabase[i].column != postData.FrmTableId)
-                {
-                    _frmdatabase.push(frmdatabase[i]);
-                }
-            }
-            frmapp = $('#frmdesign').frmDesign({
-                Height: _height,
-                tablefiledJsonData: _frmdatabase,
-                isSystemTable: postData.isSystemTable,
-                frmContent: postData.FrmContent
-            });
-        }
-    }
-    function bindingFrm() {
-        var frmcotentls = frmapp.getData();
-        if (!frmcotentls) {
-            return false;
-        }
-        postData.FrmContent = JSON.stringify(frmcotentls);
-        return true;
-    }
-    /*=========表单选择（end）====================================================================*/
-
-    /*=========创建完成（begin）==================================================================*/
-    function finishbtn() {
-        postData["EnabledMark"] = 1;
-        var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
-        $.SaveForm({
-            url: "../../FlowManage/FormDesign/SaveForm?keyValue=" + keyValue,
-            param: postData,
-            loading: "正在保存数据...",
-            success: function () {
-                parent.layer.close(index);
-            }
-        })
-    }
-    /*=========创建完成（end）====================================================================*/
-</script>
-
-<div class="widget-body">
-    <div id="wizard" class="wizard" data-target="#wizard-steps" >
-        <ul class="steps">
-            <li data-target="#step-1" class="active"><span class="step">1</span>基本配置<span class="chevron"></span></li>
-            <li data-target="#step-2"><span class="step">2</span>表单设计<span class="chevron"></span></li>
-            <li data-target="#step-4"><span class="step">3</span>创建完成<span class="chevron"></span></li>
-        </ul>
-    </div>
-    <div class="step-content wizard-step-content" id="wizard-steps">
-        <div class="step-pane wizard-step-pane active" id="step-1">
-            <div class="alert alert-danger" style="text-align: left; margin-bottom: 10px;">
-                <i class="fa fa-warning alert-dismissible" style="position: relative; top: 1px; font-size: 15px; padding-right: 5px;"></i>
-                请你填写表单信息，用于创建或修改表单！
-            </div>
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">表单基本信息配置</h3>
-                </div>
-                <div class="panel-body">
-                    <table class="form">
-                        <tr>
-                            <td class="formTitle">表单编号<font face="宋体">*</font></td>
-                            <td class="formValue">
-                                <input id="FrmCode" type="text" class="form-control" placeholder="请输入编号" isvalid="yes" checkexpession="NotNull" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="formTitle">表单名称<font face="宋体">*</font></td>
-                            <td class="formValue">
-                                <input id="FrmName" type="text" class="form-control" placeholder="请输入名称" isvalid="yes" checkexpession="NotNull" />
-                            </td>
-                        </tr>
-                        <tr style="display:none">
-                            <td class="formTitle">是否建表<font face="宋体">*</font></td>
-                            <td class="formValue">
-                                <div class="rdio rdio-color_a"><input type="radio" name="isSystemTable" id="isSystemTable0" value="0" checked /><label for="isSystemTable0">否</label></div>
-                                <div class="rdio rdio-color_c"><input type="radio" name="isSystemTable" id="isSystemTable1" value="1" /><label for="isSystemTable1">是</label></div>
-                            </td>
-                        </tr>
-                        <tr class="Systemtable" style="display:none">
-                            <td class="formTitle">数据库<font face="宋体">*</font></td>
-                            <td class="formValue">
-                                <div id="FrmDbId" type="selectTree" class="ui-select"></div>
-                            </td>
-                        </tr>
-                        <tr class="Systemtable" style="display:none">
-                            <td class="formTitle">数据表<font face="宋体">*</font></td>
-                            <td class="formValue">
-                                <div id="FrmTable" type="select" class="ui-select"></div>
-                            </td>
-                        </tr>
-                        <tr class="Systemtable" style="display:none">
-                            <td class="formTitle">绑定主键<font face="宋体">*</font></td>
-                            <td class="formValue">
-                                <div id="FrmTableId" type="select" class="ui-select"></div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <th class="formTitle formTitle-top">
-                                备注
-                            </th>
-                            <td class="formValue">
-                                <textarea id="Description" class="form-control" style="height: 180px;"></textarea>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
-        <div class="step-pane flowapp" id="step-2">
-            <div id="frmdesign"></div>
-        </div>
-        <div class="step-pane" id="step-4">
-            <div class="drag-tip">
-                <i class="fa fa-check-circle"></i>
-                <p >设计完成,请点击保存</p>
-            </div>
-        </div>
-    </div>
-    <div class="form-button" id="wizard-actions">
-        <a id="btn_last" disabled class="btn btn-default btn-prev">上一步</a>
-        <a id="btn_next" class="btn btn-default btn-next">下一步</a>
-        <a id="btn_finish" disabled class="btn btn-success" onclick="finishbtn();">保存</a>
-    </div>
-</div>

OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/Index.cshtml

@@ -1,41 +0,0 @@
-@{
-    Layout = "~/Views/Shared/_Layout.cshtml";
-}
-
-<!-- #section:basics/content.breadcrumbs -->
-<div class="breadcrumbs" id="breadcrumbs">
-    <ul class="breadcrumb">
-        <li>
-            <i class="ace-icon fa fa-home home-icon"></i>
-            <a href="#">表单设计</a>
-        </li>
-        <li class="active">列表</li>
-    </ul><!-- /.breadcrumb -->
-</div>
-
-<div class="page-content">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="widget-box widget-color-blue">
-                <div class="widget-header">
-                    @Html.Action("MenuHeader", "Home", new {area=""})
-                </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>
-</div><!-- /.page-content -->
-
-<script src="~/BllScripts/grid.js"></script>
-<script src="~/BllScripts/formDesign.js"></script>
-<script src="~/BllScripts/jqEvent.js"></script>
-

OpenAuth.Mvc/Areas/FlowManage/Views/web.config

@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="System.Web.Optimization" />
-        <add namespace="OpenAuth.Mvc" />
-        
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.webServer>
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>

OpenAuth.Mvc/Controllers/FlowInstancesController.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Web.Http;
+using System.Web.Mvc;
+using Infrastructure;
+using OpenAuth.App;
+using OpenAuth.App.Request;
+using OpenAuth.Mvc.Models;
+using OpenAuth.Repository.Domain;
+
+namespace OpenAuth.Mvc.Controllers
+{
+    public class FlowInstancesController : BaseController
+    {
+        public FlowInstanceApp App { get; set; }
+
+        //
+        [Authenticate]
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        //添加或修改
+        [System.Web.Mvc.HttpPost]
+        public string Add(FlowInstance obj)
+        {
+            try
+            {
+                App.Add(obj);
+
+            }
+            catch (Exception ex)
+            {
+                Result.Code = 500;
+                Result.Message = ex.Message;
+            }
+            return JsonHelper.Instance.Serialize(Result);
+        }
+
+        //添加或修改
+        [System.Web.Mvc.HttpPost]
+        public string Update(FlowInstance obj)
+        {
+            try
+            {
+                App.Update(obj);
+
+            }
+            catch (Exception ex)
+            {
+                Result.Code = 500;
+                Result.Message = ex.Message;
+            }
+            return JsonHelper.Instance.Serialize(Result);
+        }
+
+        /// <summary>
+        /// 加载列表
+        /// </summary>
+        public string Load([FromUri]QueryFlowInstanceListReq request)
+        {
+            return JsonHelper.Instance.Serialize(App.Load(request));
+        }
+
+        [System.Web.Mvc.HttpPost]
+        public string Delete(string[] ids)
+        {
+            try
+            {
+                App.Delete(ids);
+            }
+            catch (Exception e)
+            {
+                Result.Code = 500;
+                Result.Message = e.Message;
+            }
+
+            return JsonHelper.Instance.Serialize(Result);
+        }
+    }
+}

OpenAuth.Mvc/Controllers/FlowSchemesController.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Web.Http;
+using System.Web.Mvc;
+using Infrastructure;
+using OpenAuth.App;
+using OpenAuth.App.Request;
+using OpenAuth.Mvc.Models;
+using OpenAuth.Repository.Domain;
+
+namespace OpenAuth.Mvc.Controllers
+{
+    public class FlowSchemesController : BaseController
+    {
+        public FlowSchemeApp App { get; set; }
+
+        //
+        [Authenticate]
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        //添加或修改
+        [System.Web.Mvc.HttpPost]
+        public string Add(FlowScheme obj)
+        {
+            try
+            {
+                App.Add(obj);
+
+            }
+            catch (Exception ex)
+            {
+                Result.Code = 500;
+                Result.Message = ex.Message;
+            }
+            return JsonHelper.Instance.Serialize(Result);
+        }
+
+        //添加或修改
+        [System.Web.Mvc.HttpPost]
+        public string Update(FlowScheme obj)
+        {
+            try
+            {
+                App.Update(obj);
+
+            }
+            catch (Exception ex)
+            {
+                Result.Code = 500;
+                Result.Message = ex.Message;
+            }
+            return JsonHelper.Instance.Serialize(Result);
+        }
+
+        /// <summary>
+        /// 加载列表
+        /// </summary>
+        public string Load([FromUri]QueryFlowSchemeListReq request)
+        {
+            return JsonHelper.Instance.Serialize(App.Load(request));
+        }
+
+        [System.Web.Mvc.HttpPost]
+        public string Delete(string[] ids)
+        {
+            try
+            {
+                App.Delete(ids);
+            }
+            catch (Exception e)
+            {
+                Result.Code = 500;
+                Result.Message = e.Message;
+            }
+
+            return JsonHelper.Instance.Serialize(Result);
+        }
+    }
+}

OpenAuth.Mvc/OpenAuth.Mvc.csproj

@@ -142,13 +142,11 @@
     <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
-    <Compile Include="Areas\FlowManage\Controllers\FileController.cs" />
-    <Compile Include="Areas\FlowManage\Controllers\FlowDesignController.cs" />
-    <Compile Include="Areas\FlowManage\FlowManageAreaRegistration.cs" />
     <Compile Include="Controllers\BaseController.cs" />
     <Compile Include="Controllers\CategoriesController.cs" />
     <Compile Include="Controllers\ErrorController.cs" />
-    <Compile Include="Areas\FlowManage\Controllers\FlowInstancesController.cs" />
+    <Compile Include="Controllers\FlowInstancesController.cs" />
+    <Compile Include="Controllers\FlowSchemesController.cs" />
     <Compile Include="Controllers\FormsController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\LoginController.cs" />
@@ -207,6 +205,8 @@
     <Content Include="images\userface4.jpg" />
     <Content Include="images\userface5.jpg" />
     <Content Include="images\wechat.jpg" />
+    <Content Include="userJs\flowInstances.js" />
+    <Content Include="userJs\flowSchemes.js" />
     <Content Include="userJs\modules.js" />
     <Content Include="js\queryString.js" />
     <Content Include="userJs\orgs.js" />
@@ -578,18 +578,6 @@
     <Content Include="layui\lay\modules\upload.js" />
     <Content Include="layui\lay\modules\util.js" />
     <Content Include="js\ztree.js" />
-    <Content Include="Areas\FlowManage\Views\web.config" />
-    <Content Include="Areas\FlowManage\Views\FlowDesign\FlowLineForm.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FlowDesign\FlowNodeForm.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FlowDesign\FlowSchemeBuider.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FlowDesign\Index.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FlowInstances\ProcessLookForm.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FlowInstances\FlowProcessNewForm.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FlowDesign\PreviewIndex.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FlowInstances\VerificationForm.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FormDesign\Index.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FormDesign\FormPreview.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FormDesign\FrmBuider.cshtml" />
     <Content Include="layui\font\iconfont.eot" />
     <Content Include="layui\font\iconfont.ttf" />
     <Content Include="layui\font\iconfont.woff" />
@@ -617,7 +605,6 @@
     <Content Include="Views\Web.config" />
     <Content Include="Views\_ViewStart.cshtml" />
     <Content Include="Views\Home\Index.cshtml" />
-    <Content Include="Areas\FlowManage\Views\FlowInstances\Index.cshtml" />
     <Content Include="Views\Shared\_FlowForm.cshtml" />
     <Content Include="Views\Home\Main.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
@@ -627,11 +614,10 @@
     <Content Include="Views\RoleManager\Index.cshtml" />
     <Content Include="Views\Forms\index.cshtml" />
     <Content Include="Views\Forms\Preview.cshtml" />
+    <Content Include="Views\FlowInstances\Index.cshtml" />
+    <Content Include="Views\FlowSchemes\Index.cshtml" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Areas\FlowManage\Models\" />
-    <Folder Include="Areas\FlowManage\Views\Shared\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Content Include="packages.config">
       <SubType>Designer</SubType>

OpenAuth.Mvc/Views/FlowInstances/Index.cshtml

@@ -0,0 +1,181 @@
+@section header
+{
+    <link rel="stylesheet" href="/css/treetable.css" />
+}
+<blockquote class="layui-elem-quote news_search toolList">
+    @Html.Action("MenuHeader", "Home")
+</blockquote>
+
+<div style="display: flex;">
+    <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+    <table class="layui-table"
+           lay-data="{height: 'full-80', page:true, id:'mainList'}"
+           lay-filter="list" lay-size="sm">
+        <thead>
+            <tr>
+                <th lay-data="{checkbox:true, fixed: true}"></th>
+                <th lay-data="{field:'Id', width:150}">主键Id</th>
+                <th lay-data="{field:'InstanceSchemeId', width:150}">流程实例模板Id</th>
+                <th lay-data="{field:'Code', width:150}">实例编号</th>
+                <th lay-data="{field:'CustomName', width:150}">自定义名称</th>
+                <th lay-data="{field:'ActivityId', width:150}">当前节点ID</th>
+                <th lay-data="{field:'ActivityType', width:150}">当前节点类型（0会签节点）</th>
+                <th lay-data="{field:'ActivityName', width:150}">当前节点名称</th>
+                <th lay-data="{field:'PreviousId', width:150}">前一个ID</th>
+                <th lay-data="{field:'FrmType', width:150}">表单类型</th>
+                <th lay-data="{field:'SchemeType', width:150}">流程类型</th>
+                <th lay-data="{field:'Disabled', width:150}">有效标志</th>
+                <th lay-data="{field:'CreateDate', width:150}">创建时间</th>
+                <th lay-data="{field:'CreateUserId', width:150}">创建用户主键</th>
+                <th lay-data="{field:'CreateUserName', width:150}">创建用户</th>
+                <th lay-data="{field:'FlowLevel', width:150}">等级</th>
+                <th lay-data="{field:'Description', width:150}">实例备注</th>
+                <th lay-data="{field:'IsFinish', width:150}">是否完成</th>
+                <th lay-data="{field:'MakerList', width:150}">执行人</th>
+                <th lay-data="{fixed: 'right', width:160, align:'center', toolbar: '#barList'}"></th>
+            </tr>
+        </thead>
+    </table>
+</div>
+<script type="text/html" id="barList">
+    <a class="layui-btn layui-btn-primary layui-btn-mini" lay-event="detail">查看</a>
+</script>
+
+<!--用户添加/编辑窗口-->
+<div id="divEdit" style="display: none">
+    <form class="layui-form" action="" id="formEdit">
+        <input type="hidden" name="Id" v-model="Id" />
+        <div class="layui-form-item">
+            <label class="layui-form-label">流程实例模板Id</label>
+            <div class="layui-input-block">
+                <input type="text" name="InstanceSchemeId" v-model="InstanceSchemeId" required lay-verify="required"
+                       placeholder="流程实例模板Id" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">实例编号</label>
+            <div class="layui-input-block">
+                <input type="text" name="Code" v-model="Code" required lay-verify="required"
+                       placeholder="实例编号" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">自定义名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="CustomName" v-model="CustomName" required lay-verify="required"
+                       placeholder="自定义名称" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">当前节点ID</label>
+            <div class="layui-input-block">
+                <input type="text" name="ActivityId" v-model="ActivityId" required lay-verify="required"
+                       placeholder="当前节点ID" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">当前节点类型（0会签节点）</label>
+            <div class="layui-input-block">
+                <input type="radio" name="ActivityType" value="1" title="value1" checked>
+                <input type="radio" name="ActivityType" value="0" title="value2">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">当前节点名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="ActivityName" v-model="ActivityName" required lay-verify="required"
+                       placeholder="当前节点名称" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">前一个ID</label>
+            <div class="layui-input-block">
+                <input type="text" name="PreviousId" v-model="PreviousId" required lay-verify="required"
+                       placeholder="前一个ID" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">表单类型</label>
+            <div class="layui-input-block">
+                <input type="radio" name="FrmType" value="1" title="value1" checked>
+                <input type="radio" name="FrmType" value="0" title="value2">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">流程类型</label>
+            <div class="layui-input-block">
+                <input type="text" name="SchemeType" v-model="SchemeType" required lay-verify="required"
+                       placeholder="流程类型" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">有效标志</label>
+            <div class="layui-input-block">
+                <input type="radio" name="Disabled" value="1" title="value1" checked>
+                <input type="radio" name="Disabled" value="0" title="value2">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">创建时间</label>
+            <div class="layui-input-block">
+                <input type="text" name="CreateDate" v-model="CreateDate" required lay-verify="required"
+                       placeholder="创建时间" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">创建用户主键</label>
+            <div class="layui-input-block">
+                <input type="text" name="CreateUserId" v-model="CreateUserId" required lay-verify="required"
+                       placeholder="创建用户主键" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">创建用户</label>
+            <div class="layui-input-block">
+                <input type="text" name="CreateUserName" v-model="CreateUserName" required lay-verify="required"
+                       placeholder="创建用户" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">等级</label>
+            <div class="layui-input-block">
+                <input type="radio" name="FlowLevel" value="1" title="value1" checked>
+                <input type="radio" name="FlowLevel" value="0" title="value2">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">实例备注</label>
+            <div class="layui-input-block">
+                <input type="text" name="Description" v-model="Description" required lay-verify="required"
+                       placeholder="实例备注" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">是否完成</label>
+            <div class="layui-input-block">
+                <input type="radio" name="IsFinish" value="1" title="value1" checked>
+                <input type="radio" name="IsFinish" value="0" title="value2">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">执行人</label>
+            <div class="layui-input-block">
+                <input type="text" name="MakerList" v-model="MakerList" required lay-verify="required"
+                       placeholder="执行人" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formSubmit">立即提交</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script type="text/javascript" src="/layui/layui.js"></script>
+<script type="text/javascript" src="/userJs/flowInstances.js"></script>
+
+

OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml

@@ -0,0 +1,98 @@
+@section header
+{
+    <link rel="stylesheet" href="/css/treetable.css" />
+}
+<blockquote class="layui-elem-quote news_search toolList">
+    @Html.Action("MenuHeader", "Home")
+</blockquote>
+
+<div style="display: flex;">
+    <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+    <table class="layui-table"
+           lay-data="{height: 'full-80', page:true, id:'mainList'}"
+           lay-filter="list" lay-size="sm">
+        <thead>
+            <tr>
+                <th lay-data="{checkbox:true, fixed: true}"></th>
+                <th lay-data="{field:'Id', width:150}">主键Id</th>
+                <th lay-data="{field:'SchemeCode', width:150}">流程编号</th>
+                <th lay-data="{field:'SchemeName', width:150}">流程名称</th>
+                <th lay-data="{field:'SchemeVersion', width:150}">流程内容版本</th>
+                <th lay-data="{field:'FrmType', width:150}">表单类型</th>
+                <th lay-data="{field:'AuthorizeType', width:150}">模板权限类型0所有人,1指定成员</th>
+                <th lay-data="{field:'SortCode', width:150}">排序码</th>
+                <th lay-data="{field:'Disabled', width:150}">有效</th>
+                <th lay-data="{field:'Description', width:150}">备注</th>
+                <th lay-data="{field:'CreateDate', width:150}">创建时间</th>
+
+                <th lay-data="{fixed: 'right', width:160, align:'center', toolbar: '#barList'}"></th>
+            </tr>
+        </thead>
+    </table>
+</div>
+<script type="text/html" id="barList">
+    <a class="layui-btn layui-btn-primary layui-btn-mini" lay-event="detail">查看</a>
+</script>
+
+<!--用户添加/编辑窗口-->
+<div id="divEdit" style="display: none">
+    <form class="layui-form" action="" id="formEdit">
+        <input type="hidden" name="Id" v-model="Id" />
+        <div class="layui-form-item">
+            <label class="layui-form-label">流程编号</label>
+            <div class="layui-input-block">
+                <input type="text" name="SchemeCode" v-model="SchemeCode" required lay-verify="required"
+                       placeholder="流程编号" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">流程名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="SchemeName" v-model="SchemeName" required lay-verify="required"
+                       placeholder="流程名称" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">模板权限类型0所有人,1指定成员</label>
+            <div class="layui-input-block">
+                <input type="radio" name="AuthorizeType" value="1" title="value1" checked>
+                <input type="radio" name="AuthorizeType" value="0" title="value2">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">排序码</label>
+            <div class="layui-input-block">
+                <input type="radio" name="SortCode" value="1" title="value1" checked>
+                <input type="radio" name="SortCode" value="0" title="value2">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">有效</label>
+            <div class="layui-input-block">
+                <input type="radio" name="Disabled" value="1" title="value1" checked>
+                <input type="radio" name="Disabled" value="0" title="value2">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">备注</label>
+            <div class="layui-input-block">
+                <input type="text" name="Description" v-model="Description" required lay-verify="required"
+                       placeholder="备注" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formSubmit">立即提交</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script type="text/javascript" src="/layui/layui.js"></script>
+<script type="text/javascript" src="/userJs/flowSchemes.js"></script>
+
+

OpenAuth.Mvc/userJs/flowInstances.js

@@ -0,0 +1,156 @@
+layui.config({
+    base: "/js/"
+}).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () {
+    var form = layui.form,
+		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
+        layer = layui.layer,
+        $ = layui.jquery;
+    var table = layui.table;
+    var openauth = layui.openauth;
+    layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds");
+   
+    //主列表加载，可反复调用进行刷新
+    var config= {};  //table的参数，如搜索key，点击tree的id
+    var mainList = function (options) {
+        if (options != undefined) {
+            $.extend(config, options);
+        }
+        table.reload('mainList', {
+            url: '/FlowInstances/Load',
+            where: config
+        });
+    }
+    //左边树状机构列表
+    var ztree = function () {
+        var url = '/UserSession/GetOrgs';
+        var zTreeObj;
+        var setting = {
+            view: { selectedMulti: false },
+            data: {
+                key: {
+                    name: 'Name',
+                    title: 'Name'
+                },
+                simpleData: {
+                    enable: true,
+                    idKey: 'Id',
+                    pIdKey: 'ParentId',
+                    rootPId: 'null'
+                }
+            },
+            callback: {
+                onClick: function (event, treeId, treeNode) {
+                    mainList({ orgId: treeNode.Id });
+                }
+            }
+        };
+        var load = function () {
+            $.getJSON(url, function (json) {
+                zTreeObj = $.fn.zTree.init($("#tree"), setting);
+                var newNode = { Name: "根节点", Id: null, ParentId: "" };
+                json.push(newNode);
+                zTreeObj.addNodes(null, json);
+                mainList({ orgId: "" });
+                zTreeObj.expandAll(true);
+            });
+        };
+        load();
+        return {
+            reload: load
+        }
+    }();
+
+    //添加（编辑）对话框
+    var editDlg = function() {
+        var vm = new Vue({
+            el: "#formEdit"
+        });
+        var update = false;  //是否为更新
+        var show = function (data) {
+            var title = update ? "编辑信息" : "添加";
+            layer.open({
+                title: title,
+                area: ["500px", "400px"],
+                type: 1,
+                content: $('#divEdit'),
+                success: function() {
+                    vm.$set('$data', data);
+                },
+                end: mainList
+            });
+            var url = "/FlowInstances/Add";
+            if (update) {
+                url = "/FlowInstances/Update"; 
+            }
+            //提交数据
+            form.on('submit(formSubmit)',
+                function(data) {
+                    $.post(url,
+                        data.field,
+                        function(data) {
+                            layer.msg(data.Message);
+                        },
+                        "json");
+                    return false;
+                });
+        }
+        return {
+            add: function() { //弹出添加
+                update = false;
+                show({
+                    Id: ''
+                });
+            },
+            update: function(data) { //弹出编辑框
+                update = true;
+                show(data);
+            }
+        };
+    }();
+    
+    //监听表格内部按钮
+    table.on('tool(list)', function (obj) {
+        var data = obj.data;
+        if (obj.event === 'detail') {      //查看
+            layer.msg('ID：' + data.Id + ' 的查看操作');
+        } 
+    });
+
+
+    //监听页面主按钮操作
+    var active = {
+        btnDel: function () {      //批量删除
+            var checkStatus = table.checkStatus('mainList')
+                , data = checkStatus.data;
+            openauth.del("/FlowInstances/Delete",
+                data.map(function (e) { return e.Id; }),
+                mainList);
+        }
+        , btnAdd: function () {  //添加
+            editDlg.add();
+        }
+         , btnEdit: function () {  //编辑
+             var checkStatus = table.checkStatus('mainList')
+               , data = checkStatus.data;
+             if (data.length != 1) {
+                 layer.msg("请选择编辑的行，且同时只能编辑一行");
+                 return;
+             }
+             editDlg.update(data[0]);
+         }
+
+        , search: function () {   //搜索
+            mainList({ key: $('#key').val() });
+        }
+        , btnRefresh: function() {
+            mainList();
+        }
+    };
+
+    $('.toolList .layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
+
+    //监听页面主按钮操作 end
+})

OpenAuth.Mvc/userJs/flowSchemes.js

@@ -0,0 +1,156 @@
+layui.config({
+    base: "/js/"
+}).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () {
+    var form = layui.form,
+		//layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
+        layer = layui.layer,
+        $ = layui.jquery;
+    var table = layui.table;
+    var openauth = layui.openauth;
+    layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds");
+   
+    //主列表加载，可反复调用进行刷新
+    var config= {};  //table的参数，如搜索key，点击tree的id
+    var mainList = function (options) {
+        if (options != undefined) {
+            $.extend(config, options);
+        }
+        table.reload('mainList', {
+            url: '/FlowSchemes/Load',
+            where: config
+        });
+    }
+    //左边树状机构列表
+    var ztree = function () {
+        var url = '/UserSession/GetOrgs';
+        var zTreeObj;
+        var setting = {
+            view: { selectedMulti: false },
+            data: {
+                key: {
+                    name: 'Name',
+                    title: 'Name'
+                },
+                simpleData: {
+                    enable: true,
+                    idKey: 'Id',
+                    pIdKey: 'ParentId',
+                    rootPId: 'null'
+                }
+            },
+            callback: {
+                onClick: function (event, treeId, treeNode) {
+                    mainList({ orgId: treeNode.Id });
+                }
+            }
+        };
+        var load = function () {
+            $.getJSON(url, function (json) {
+                zTreeObj = $.fn.zTree.init($("#tree"), setting);
+                var newNode = { Name: "根节点", Id: null, ParentId: "" };
+                json.push(newNode);
+                zTreeObj.addNodes(null, json);
+                mainList({ orgId: "" });
+                zTreeObj.expandAll(true);
+            });
+        };
+        load();
+        return {
+            reload: load
+        }
+    }();
+
+    //添加（编辑）对话框
+    var editDlg = function() {
+        var vm = new Vue({
+            el: "#formEdit"
+        });
+        var update = false;  //是否为更新
+        var show = function (data) {
+            var title = update ? "编辑信息" : "添加";
+            layer.open({
+                title: title,
+                area: ["500px", "400px"],
+                type: 1,
+                content: $('#divEdit'),
+                success: function() {
+                    vm.$set('$data', data);
+                },
+                end: mainList
+            });
+            var url = "/FlowSchemes/Add";
+            if (update) {
+                url = "/FlowSchemes/Update"; 
+            }
+            //提交数据
+            form.on('submit(formSubmit)',
+                function(data) {
+                    $.post(url,
+                        data.field,
+                        function(data) {
+                            layer.msg(data.Message);
+                        },
+                        "json");
+                    return false;
+                });
+        }
+        return {
+            add: function() { //弹出添加
+                update = false;
+                show({
+                    Id: ''
+                });
+            },
+            update: function(data) { //弹出编辑框
+                update = true;
+                show(data);
+            }
+        };
+    }();
+    
+    //监听表格内部按钮
+    table.on('tool(list)', function (obj) {
+        var data = obj.data;
+        if (obj.event === 'detail') {      //查看
+            layer.msg('ID：' + data.Id + ' 的查看操作');
+        } 
+    });
+
+
+    //监听页面主按钮操作
+    var active = {
+        btnDel: function () {      //批量删除
+            var checkStatus = table.checkStatus('mainList')
+                , data = checkStatus.data;
+            openauth.del("/FlowSchemes/Delete",
+                data.map(function (e) { return e.Id; }),
+                mainList);
+        }
+        , btnAdd: function () {  //添加
+            editDlg.add();
+        }
+         , btnEdit: function () {  //编辑
+             var checkStatus = table.checkStatus('mainList')
+               , data = checkStatus.data;
+             if (data.length != 1) {
+                 layer.msg("请选择编辑的行，且同时只能编辑一行");
+                 return;
+             }
+             editDlg.update(data[0]);
+         }
+
+        , search: function () {   //搜索
+            mainList({ key: $('#key').val() });
+        }
+        , btnRefresh: function() {
+            mainList();
+        }
+    };
+
+    $('.toolList .layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
+
+    //监听页面主按钮操作 end
+})

OpenAuth.Repository/Domain/FlowInstance.cs

@@ -16,24 +16,32 @@ namespace OpenAuth.Repository.Domain
     /// <summary>
 	/// 工作流流程实例表
 	/// </summary>
-    public partial class WFProcessInstance : Entity
+    public partial class FlowInstance : Entity
     {
-        public WFProcessInstance()
+        public FlowInstance()
         {
+          this.InstanceSchemeId= string.Empty;
           this.Code= string.Empty;
           this.CustomName= string.Empty;
           this.ActivityId= string.Empty;
           this.ActivityName= string.Empty;
-          this.ProcessSchemeId= string.Empty;
           this.PreviousId= string.Empty;
+          this.FrmType= 0;
           this.SchemeType= string.Empty;
+          this.Disabled= 0;
           this.CreateDate= DateTime.Now;
           this.CreateUserId= string.Empty;
           this.CreateUserName= string.Empty;
+          this.FlowLevel= 0;
           this.Description= string.Empty;
+          this.IsFinish= 0;
           this.MakerList= string.Empty;
         }
 
+        /// <summary>
+	    /// 流程实例模板Id
+	    /// </summary>
+        public string InstanceSchemeId { get; set; }
         /// <summary>
 	    /// 实例编号
 	    /// </summary>
@@ -54,10 +62,6 @@ namespace OpenAuth.Repository.Domain
 	    /// 当前节点名称
 	    /// </summary>
         public string ActivityName { get; set; }
-        /// <summary>
-	    /// 流程实例模板Id
-	    /// </summary>
-        public string ProcessSchemeId { get; set; }
         /// <summary>
 	    /// 前一个ID
 	    /// </summary>
@@ -65,7 +69,7 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 表单类型
 	    /// </summary>
-        public int? FrmType { get; set; }
+        public int FrmType { get; set; }
         /// <summary>
 	    /// 流程类型
 	    /// </summary>
@@ -73,11 +77,11 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 有效标志
 	    /// </summary>
-        public int? EnabledMark { get; set; }
+        public int Disabled { get; set; }
         /// <summary>
 	    /// 创建时间
 	    /// </summary>
-        public System.DateTime? CreateDate { get; set; }
+        public System.DateTime CreateDate { get; set; }
         /// <summary>
 	    /// 创建用户主键
 	    /// </summary>
@@ -89,7 +93,7 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 等级
 	    /// </summary>
-        public int? WfLevel { get; set; }
+        public int FlowLevel { get; set; }
         /// <summary>
 	    /// 实例备注
 	    /// </summary>
@@ -97,30 +101,11 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 是否完成
 	    /// </summary>
-        public int? IsFinish { get; set; }
+        public int IsFinish { get; set; }
         /// <summary>
 	    /// 执行人
 	    /// </summary>
         public string MakerList { get; set; }
 
-
-        #region 扩展操作
-        /// <summary>
-        /// 新增调用
-        /// </summary>
-        public void Create()
-        {
-            this.CreateDate = DateTime.Now;
-        }
-        /// <summary>
-        /// 编辑调用
-        /// </summary>
-        /// <param name="keyValue"></param>
-        public void Modify(string keyValue)
-        {
-            this.Id = keyValue;
-        }
-        #endregion
-
     }
 }

OpenAuth.Repository/Domain/FlowInstanceOperationHistory.cs

@@ -16,11 +16,11 @@ namespace OpenAuth.Repository.Domain
     /// <summary>
 	/// 工作流实例操作记录
 	/// </summary>
-    public partial class WFProcessOperationHistory : Entity
+    public partial class FlowInstanceOperationHistory : Entity
     {
-        public WFProcessOperationHistory()
+        public FlowInstanceOperationHistory()
         {
-          this.ProcessId= string.Empty;
+          this.InstanceId= string.Empty;
           this.Content= string.Empty;
           this.CreateDate= DateTime.Now;
           this.CreateUserId= string.Empty;
@@ -30,7 +30,7 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 实例进程Id
 	    /// </summary>
-        public string ProcessId { get; set; }
+        public string InstanceId { get; set; }
         /// <summary>
 	    /// 操作内容
 	    /// </summary>
@@ -38,7 +38,7 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 创建时间
 	    /// </summary>
-        public System.DateTime? CreateDate { get; set; }
+        public System.DateTime CreateDate { get; set; }
         /// <summary>
 	    /// 创建用户主键
 	    /// </summary>

OpenAuth.Repository/Domain/FlowInstanceScheme.cs

@@ -14,15 +14,16 @@ using System.Text;
 namespace OpenAuth.Repository.Domain
 {
     /// <summary>
-	/// 工作流实例模板对应表
+	/// 工作流实例模板对应表，防止创建实例后原模板被改
 	/// </summary>
-    public partial class WFProcessScheme : Entity
+    public partial class FlowInstanceScheme : Entity
     {
-        public WFProcessScheme()
+        public FlowInstanceScheme()
         {
           this.SchemeContent= string.Empty;
-          this.SchemeInfoId= string.Empty;
+          this.SchemeId= string.Empty;
           this.SchemeVersion= string.Empty;
+          this.ProcessType= 0;
         }
 
         /// <summary>
@@ -32,7 +33,7 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 流程模板ID
 	    /// </summary>
-        public string SchemeInfoId { get; set; }
+        public string SchemeId { get; set; }
         /// <summary>
 	    /// 流程内容版本
 	    /// </summary>
@@ -40,26 +41,7 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 类型(0正常,3草稿)
 	    /// </summary>
-        public int? ProcessType { get; set; }
-
-
-        #region 扩展操作
-        /// <summary>
-        /// 新增调用
-        /// </summary>
-        public void Create()
-        {
-            this.Id = Guid.NewGuid().ToString();
-        }
-        /// <summary>
-        /// 编辑调用
-        /// </summary>
-        /// <param name="keyValue"></param>
-        public void Modify(string keyValue)
-        {
-            this.Id = keyValue;
-        }
-        #endregion
+        public int ProcessType { get; set; }
 
     }
 }

OpenAuth.Repository/Domain/FlowInstanceTransitionHistory.cs

@@ -16,24 +16,26 @@ namespace OpenAuth.Repository.Domain
     /// <summary>
 	/// 工作流实例流转历史记录
 	/// </summary>
-    public partial class WFProcessTransitionHistory : Entity
+    public partial class FlowInstanceTransitionHistory : Entity
     {
-        public WFProcessTransitionHistory()
+        public FlowInstanceTransitionHistory()
         {
-          this.ProcessId= string.Empty;
+          this.InstanceId= string.Empty;
           this.FromNodeId= string.Empty;
           this.FromNodeName= string.Empty;
           this.ToNodeId= string.Empty;
           this.ToNodeName= string.Empty;
+          this.TransitionSate= 0;
+          this.IsFinish= 0;
           this.CreateDate= DateTime.Now;
           this.CreateUserId= string.Empty;
           this.CreateUserName= string.Empty;
         }
 
         /// <summary>
-	    /// 实例进程Id
+	    /// 实例Id
 	    /// </summary>
-        public string ProcessId { get; set; }
+        public string InstanceId { get; set; }
         /// <summary>
 	    /// 开始节点Id
 	    /// </summary>
@@ -61,15 +63,15 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 转化状态
 	    /// </summary>
-        public int? TransitionSate { get; set; }
+        public int TransitionSate { get; set; }
         /// <summary>
 	    /// 是否结束
 	    /// </summary>
-        public int? IsFinish { get; set; }
+        public int IsFinish { get; set; }
         /// <summary>
 	    /// 转化时间
 	    /// </summary>
-        public System.DateTime? CreateDate { get; set; }
+        public System.DateTime CreateDate { get; set; }
         /// <summary>
 	    /// 操作人Id
 	    /// </summary>

OpenAuth.Repository/Domain/FlowScheme.cs

@@ -16,15 +16,20 @@ namespace OpenAuth.Repository.Domain
     /// <summary>
 	/// 工作流模板信息表
 	/// </summary>
-    public partial class WFSchemeInfo : Entity
+    public partial class FlowScheme : Entity
     {
-        public WFSchemeInfo()
+        public FlowScheme()
         {
           this.SchemeCode= string.Empty;
           this.SchemeName= string.Empty;
           this.SchemeType= string.Empty;
           this.SchemeVersion= string.Empty;
           this.SchemeCanUser= string.Empty;
+          this.FrmType= 0;
+          this.AuthorizeType= 0;
+          this.SortCode= 0;
+          this.DeleteMark= 0;
+          this.Disabled= 0;
           this.Description= string.Empty;
           this.CreateDate= DateTime.Now;
           this.CreateUserId= string.Empty;
@@ -57,23 +62,23 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 表单类型
 	    /// </summary>
-        public int? FrmType { get; set; }
+        public int FrmType { get; set; }
         /// <summary>
 	    /// 模板权限类型0所有人,1指定成员
 	    /// </summary>
-        public int? AuthorizeType { get; set; }
+        public int AuthorizeType { get; set; }
         /// <summary>
 	    /// 排序码
 	    /// </summary>
-        public int? SortCode { get; set; }
+        public int SortCode { get; set; }
         /// <summary>
 	    /// 删除标记
 	    /// </summary>
-        public int? DeleteMark { get; set; }
+        public int DeleteMark { get; set; }
         /// <summary>
 	    /// 有效
 	    /// </summary>
-        public int? EnabledMark { get; set; }
+        public int Disabled { get; set; }
         /// <summary>
 	    /// 备注
 	    /// </summary>
@@ -81,7 +86,7 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 创建时间
 	    /// </summary>
-        public System.DateTime? CreateDate { get; set; }
+        public System.DateTime CreateDate { get; set; }
         /// <summary>
 	    /// 创建用户主键
 	    /// </summary>

OpenAuth.Repository/Domain/FlowSchemeDetail.cs

@@ -16,11 +16,11 @@ namespace OpenAuth.Repository.Domain
     /// <summary>
 	/// 工作流模板内容表
 	/// </summary>
-    public partial class WFSchemeContent : Entity
+    public partial class FlowSchemeDetail : Entity
     {
-        public WFSchemeContent()
+        public FlowSchemeDetail()
         {
-          this.SchemeInfoId= string.Empty;
+          this.SchemeId= string.Empty;
           this.SchemeVersion= string.Empty;
           this.SchemeContent= string.Empty;
           this.CreateDate= DateTime.Now;
@@ -31,7 +31,7 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 工作流模板信息主键Id
 	    /// </summary>
-        public string SchemeInfoId { get; set; }
+        public string SchemeId { get; set; }
         /// <summary>
 	    /// 流程内容版本
 	    /// </summary>
@@ -43,7 +43,7 @@ namespace OpenAuth.Repository.Domain
         /// <summary>
 	    /// 创建时间
 	    /// </summary>
-        public System.DateTime? CreateDate { get; set; }
+        public System.DateTime CreateDate { get; set; }
         /// <summary>
 	    /// 创建用户主键
 	    /// </summary>

OpenAuth.Repository/Mapping/FlowInstanceMap.cs

@@ -12,13 +12,13 @@ using System.ComponentModel.DataAnnotations;
 
 namespace OpenAuth.Repository.Mapping
 {
-    public partial class WFProcessInstanceMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFProcessInstance>
+    public partial class FlowInstanceMap
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.FlowInstance>
     {
-        public WFProcessInstanceMap()
+        public FlowInstanceMap()
         {
             // table
-            ToTable("WF_ProcessInstance", "dbo");
+            ToTable("FlowInstance", "dbo");
 
             // keys
             HasKey(t => t.Id);
@@ -28,6 +28,10 @@ namespace OpenAuth.Repository.Mapping
                 .HasColumnName("Id")
                 .HasMaxLength(50)
                 .IsRequired();
+            Property(t => t.InstanceSchemeId)
+                .HasColumnName("InstanceSchemeId")
+                .HasMaxLength(50)
+                .IsRequired();
             Property(t => t.Code)
                 .HasColumnName("Code")
                 .HasMaxLength(200)
@@ -47,27 +51,23 @@ namespace OpenAuth.Repository.Mapping
                 .HasColumnName("ActivityName")
                 .HasMaxLength(200)
                 .IsOptional();
-            Property(t => t.ProcessSchemeId)
-                .HasColumnName("ProcessSchemeId")
-                .HasMaxLength(50)
-                .IsRequired();
             Property(t => t.PreviousId)
                 .HasColumnName("PreviousId")
                 .HasMaxLength(50)
                 .IsOptional();
             Property(t => t.FrmType)
                 .HasColumnName("FrmType")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.SchemeType)
                 .HasColumnName("SchemeType")
                 .HasMaxLength(50)
                 .IsOptional();
-            Property(t => t.EnabledMark)
-                .HasColumnName("EnabledMark")
-                .IsOptional();
+            Property(t => t.Disabled)
+                .HasColumnName("Disabled")
+                .IsRequired();
             Property(t => t.CreateDate)
                 .HasColumnName("CreateDate")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.CreateUserId)
                 .HasColumnName("CreateUserId")
                 .HasMaxLength(50)
@@ -76,16 +76,16 @@ namespace OpenAuth.Repository.Mapping
                 .HasColumnName("CreateUserName")
                 .HasMaxLength(50)
                 .IsOptional();
-            Property(t => t.WfLevel)
-                .HasColumnName("wfLevel")
-                .IsOptional();
+            Property(t => t.FlowLevel)
+                .HasColumnName("FlowLevel")
+                .IsRequired();
             Property(t => t.Description)
                 .HasColumnName("Description")
                 .HasMaxLength(200)
                 .IsOptional();
             Property(t => t.IsFinish)
-                .HasColumnName("isFinish")
-                .IsOptional();
+                .HasColumnName("IsFinish")
+                .IsRequired();
             Property(t => t.MakerList)
                 .HasColumnName("MakerList")
                 .HasMaxLength(1000)

OpenAuth.Repository/Mapping/FlowInstanceOperationHistoryMap.cs

@@ -12,13 +12,13 @@ using System.ComponentModel.DataAnnotations;
 
 namespace OpenAuth.Repository.Mapping
 {
-    public partial class WFProcessOperationHistoryMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFProcessOperationHistory>
+    public partial class FlowInstanceOperationHistoryMap
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.FlowInstanceOperationHistory>
     {
-        public WFProcessOperationHistoryMap()
+        public FlowInstanceOperationHistoryMap()
         {
             // table
-            ToTable("WF_ProcessOperationHistory", "dbo");
+            ToTable("FlowInstanceOperationHistory", "dbo");
 
             // keys
             HasKey(t => t.Id);
@@ -28,8 +28,8 @@ namespace OpenAuth.Repository.Mapping
                 .HasColumnName("Id")
                 .HasMaxLength(50)
                 .IsRequired();
-            Property(t => t.ProcessId)
-                .HasColumnName("ProcessId")
+            Property(t => t.InstanceId)
+                .HasColumnName("InstanceId")
                 .HasMaxLength(50)
                 .IsRequired();
             Property(t => t.Content)
@@ -38,7 +38,7 @@ namespace OpenAuth.Repository.Mapping
                 .IsOptional();
             Property(t => t.CreateDate)
                 .HasColumnName("CreateDate")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.CreateUserId)
                 .HasColumnName("CreateUserId")
                 .HasMaxLength(50)

OpenAuth.Repository/Mapping/FlowInstanceSchemeMap.cs

@@ -12,13 +12,13 @@ using System.ComponentModel.DataAnnotations;
 
 namespace OpenAuth.Repository.Mapping
 {
-    public partial class WFProcessSchemeMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFProcessScheme>
+    public partial class FlowInstanceSchemeMap
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.FlowInstanceScheme>
     {
-        public WFProcessSchemeMap()
+        public FlowInstanceSchemeMap()
         {
             // table
-            ToTable("WF_ProcessScheme", "dbo");
+            ToTable("FlowInstanceScheme", "dbo");
 
             // keys
             HasKey(t => t.Id);
@@ -31,8 +31,8 @@ namespace OpenAuth.Repository.Mapping
             Property(t => t.SchemeContent)
                 .HasColumnName("SchemeContent")
                 .IsOptional();
-            Property(t => t.SchemeInfoId)
-                .HasColumnName("SchemeInfoId")
+            Property(t => t.SchemeId)
+                .HasColumnName("SchemeId")
                 .HasMaxLength(50)
                 .IsRequired();
             Property(t => t.SchemeVersion)
@@ -41,7 +41,7 @@ namespace OpenAuth.Repository.Mapping
                 .IsOptional();
             Property(t => t.ProcessType)
                 .HasColumnName("ProcessType")
-                .IsOptional();
+                .IsRequired();
 
             // Relationships
         }

OpenAuth.Repository/Mapping/FlowInstanceTransitionHistoryMap.cs

@@ -12,13 +12,13 @@ using System.ComponentModel.DataAnnotations;
 
 namespace OpenAuth.Repository.Mapping
 {
-    public partial class WFProcessTransitionHistoryMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFProcessTransitionHistory>
+    public partial class FlowInstanceTransitionHistoryMap
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.FlowInstanceTransitionHistory>
     {
-        public WFProcessTransitionHistoryMap()
+        public FlowInstanceTransitionHistoryMap()
         {
             // table
-            ToTable("WF_ProcessTransitionHistory", "dbo");
+            ToTable("FlowInstanceTransitionHistory", "dbo");
 
             // keys
             HasKey(t => t.Id);
@@ -28,41 +28,41 @@ namespace OpenAuth.Repository.Mapping
                 .HasColumnName("Id")
                 .HasMaxLength(50)
                 .IsRequired();
-            Property(t => t.ProcessId)
-                .HasColumnName("ProcessId")
+            Property(t => t.InstanceId)
+                .HasColumnName("InstanceId")
                 .HasMaxLength(50)
                 .IsRequired();
             Property(t => t.FromNodeId)
-                .HasColumnName("fromNodeId")
+                .HasColumnName("FromNodeId")
                 .HasMaxLength(50)
                 .IsOptional();
             Property(t => t.FromNodeType)
-                .HasColumnName("fromNodeType")
+                .HasColumnName("FromNodeType")
                 .IsOptional();
             Property(t => t.FromNodeName)
-                .HasColumnName("fromNodeName")
+                .HasColumnName("FromNodeName")
                 .HasMaxLength(200)
                 .IsOptional();
             Property(t => t.ToNodeId)
-                .HasColumnName("toNodeId")
+                .HasColumnName("ToNodeId")
                 .HasMaxLength(50)
                 .IsOptional();
             Property(t => t.ToNodeType)
-                .HasColumnName("toNodeType")
+                .HasColumnName("ToNodeType")
                 .IsOptional();
             Property(t => t.ToNodeName)
-                .HasColumnName("toNodeName")
+                .HasColumnName("ToNodeName")
                 .HasMaxLength(200)
                 .IsOptional();
             Property(t => t.TransitionSate)
                 .HasColumnName("TransitionSate")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.IsFinish)
-                .HasColumnName("isFinish")
-                .IsOptional();
+                .HasColumnName("IsFinish")
+                .IsRequired();
             Property(t => t.CreateDate)
                 .HasColumnName("CreateDate")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.CreateUserId)
                 .HasColumnName("CreateUserId")
                 .HasMaxLength(50)

OpenAuth.Repository/Mapping/FlowSchemeDetailMap.cs

@@ -12,13 +12,13 @@ using System.ComponentModel.DataAnnotations;
 
 namespace OpenAuth.Repository.Mapping
 {
-    public partial class WFSchemeContentMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFSchemeContent>
+    public partial class FlowSchemeDetailMap
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.FlowSchemeDetail>
     {
-        public WFSchemeContentMap()
+        public FlowSchemeDetailMap()
         {
             // table
-            ToTable("WF_SchemeContent", "dbo");
+            ToTable("FlowSchemeDetail", "dbo");
 
             // keys
             HasKey(t => t.Id);
@@ -28,8 +28,8 @@ namespace OpenAuth.Repository.Mapping
                 .HasColumnName("Id")
                 .HasMaxLength(50)
                 .IsRequired();
-            Property(t => t.SchemeInfoId)
-                .HasColumnName("SchemeInfoId")
+            Property(t => t.SchemeId)
+                .HasColumnName("SchemeId")
                 .HasMaxLength(50)
                 .IsRequired();
             Property(t => t.SchemeVersion)
@@ -41,7 +41,7 @@ namespace OpenAuth.Repository.Mapping
                 .IsOptional();
             Property(t => t.CreateDate)
                 .HasColumnName("CreateDate")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.CreateUserId)
                 .HasColumnName("CreateUserId")
                 .HasMaxLength(50)

OpenAuth.Repository/Mapping/FlowSchemeMap.cs

@@ -12,13 +12,13 @@ using System.ComponentModel.DataAnnotations;
 
 namespace OpenAuth.Repository.Mapping
 {
-    public partial class WFSchemeInfoMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFSchemeInfo>
+    public partial class FlowSchemeMap
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.FlowScheme>
     {
-        public WFSchemeInfoMap()
+        public FlowSchemeMap()
         {
             // table
-            ToTable("WF_SchemeInfo", "dbo");
+            ToTable("FlowScheme", "dbo");
 
             // keys
             HasKey(t => t.Id);
@@ -49,26 +49,26 @@ namespace OpenAuth.Repository.Mapping
                 .IsOptional();
             Property(t => t.FrmType)
                 .HasColumnName("FrmType")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.AuthorizeType)
                 .HasColumnName("AuthorizeType")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.SortCode)
                 .HasColumnName("SortCode")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.DeleteMark)
                 .HasColumnName("DeleteMark")
-                .IsOptional();
-            Property(t => t.EnabledMark)
-                .HasColumnName("EnabledMark")
-                .IsOptional();
+                .IsRequired();
+            Property(t => t.Disabled)
+                .HasColumnName("Disabled")
+                .IsRequired();
             Property(t => t.Description)
                 .HasColumnName("Description")
                 .HasMaxLength(200)
                 .IsOptional();
             Property(t => t.CreateDate)
                 .HasColumnName("CreateDate")
-                .IsOptional();
+                .IsRequired();
             Property(t => t.CreateUserId)
                 .HasColumnName("CreateUserId")
                 .HasMaxLength(50)

OpenAuth.Repository/OpenAuth.Repository.csproj

@@ -60,6 +60,12 @@
     <Compile Include="Domain\Category.cs" />
     <Compile Include="Domain\CategoryType.cs" />
     <Compile Include="Core\Entity.cs" />
+    <Compile Include="Domain\FlowInstance.cs" />
+    <Compile Include="Domain\FlowInstanceOperationHistory.cs" />
+    <Compile Include="Domain\FlowInstanceScheme.cs" />
+    <Compile Include="Domain\FlowInstanceTransitionHistory.cs" />
+    <Compile Include="Domain\FlowScheme.cs" />
+    <Compile Include="Domain\FlowSchemeDetail.cs" />
     <Compile Include="Domain\Form.cs" />
     <Compile Include="Domain\Module.cs" />
     <Compile Include="Domain\ModuleElement.cs" />
@@ -70,23 +76,17 @@
     <Compile Include="Domain\Stock.cs" />
     <Compile Include="Domain\User.cs" />
     <Compile Include="Domain\UserExt.cs" />
-    <Compile Include="Domain\WFProcessInstance.cs" />
-    <Compile Include="Domain\WFProcessOperationHistory.cs" />
-    <Compile Include="Domain\WFProcessScheme.cs" />
-    <Compile Include="Domain\WFProcessTransitionHistory.cs" />
-    <Compile Include="Domain\WFSchemeContent.cs" />
-    <Compile Include="Domain\WFSchemeInfo.cs" />
     <Compile Include="Interface\IRepository.cs" />
     <Compile Include="Interface\IUnitWork.cs" />
     <Compile Include="Mapping\ApplicationMap.cs" />
     <Compile Include="Mapping\CategoryTypeMap.cs" />
+    <Compile Include="Mapping\FlowInstanceMap.cs" />
+    <Compile Include="Mapping\FlowInstanceOperationHistoryMap.cs" />
+    <Compile Include="Mapping\FlowInstanceSchemeMap.cs" />
+    <Compile Include="Mapping\FlowInstanceTransitionHistoryMap.cs" />
+    <Compile Include="Mapping\FlowSchemeDetailMap.cs" />
+    <Compile Include="Mapping\FlowSchemeMap.cs" />
     <Compile Include="Mapping\FormMap.cs" />
-    <Compile Include="Mapping\WFProcessInstanceMap.cs" />
-    <Compile Include="Mapping\WFProcessOperationHistoryMap.cs" />
-    <Compile Include="Mapping\WFProcessSchemeMap.cs" />
-    <Compile Include="Mapping\WFProcessTransitionHistoryMap.cs" />
-    <Compile Include="Mapping\WFSchemeContentMap.cs" />
-    <Compile Include="Mapping\WFSchemeInfoMap.cs" />
     <Compile Include="UnitWork.cs" />
     <Compile Include="BaseRepository.cs" />
     <Compile Include="Mapping\CategoryMap.cs" />

OpenAuth.Repository/OpenAuthDBContext.cs

@@ -41,12 +41,12 @@ namespace OpenAuth.Repository
 
         public System.Data.Entity.DbSet<Form> Forms { get; set; }
 
-        public System.Data.Entity.DbSet<WFProcessInstance> WFProcessInstances { get; set; }
-        public System.Data.Entity.DbSet<WFProcessOperationHistory> WFProcessOperationHistories { get; set; }
-        public System.Data.Entity.DbSet<WFProcessScheme> WFProcessSchemes { get; set; }
-        public System.Data.Entity.DbSet<WFProcessTransitionHistory> WFProcessTransitionHistories { get; set; }
-        public System.Data.Entity.DbSet<WFSchemeContent> WFSchemeContents { get; set; }
-        public System.Data.Entity.DbSet<WFSchemeInfo> WFSchemeInfos { get; set; }
+        public System.Data.Entity.DbSet<FlowInstance> FlowInstances { get; set; }
+        public System.Data.Entity.DbSet<FlowInstanceOperationHistory> FlowInstanceOperationHistories { get; set; }
+        public System.Data.Entity.DbSet<FlowInstanceScheme> FlowInstanceSchemes { get; set; }
+        public System.Data.Entity.DbSet<FlowInstanceTransitionHistory> FlowInstanceTransitionHistories { get; set; }
+        public System.Data.Entity.DbSet<FlowScheme> FlowSchemes { get; set; }
+        public System.Data.Entity.DbSet<FlowSchemeDetail> FlowSchemeDetails { get; set; }
 
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
@@ -62,12 +62,12 @@ namespace OpenAuth.Repository
             modelBuilder.Configurations.Add(new StockMap());
             modelBuilder.Configurations.Add(new UserMap());
             modelBuilder.Configurations.Add(new FormMap());
-            modelBuilder.Configurations.Add(new WFProcessInstanceMap());
-            modelBuilder.Configurations.Add(new WFProcessOperationHistoryMap());
-            modelBuilder.Configurations.Add(new WFProcessSchemeMap());
-            modelBuilder.Configurations.Add(new WFProcessTransitionHistoryMap());
-            modelBuilder.Configurations.Add(new WFSchemeContentMap());
-            modelBuilder.Configurations.Add(new WFSchemeInfoMap());
+            modelBuilder.Configurations.Add(new FlowInstanceMap());
+            modelBuilder.Configurations.Add(new FlowInstanceOperationHistoryMap());
+            modelBuilder.Configurations.Add(new FlowInstanceSchemeMap());
+            modelBuilder.Configurations.Add(new FlowInstanceTransitionHistoryMap());
+            modelBuilder.Configurations.Add(new FlowSchemeMap());
+            modelBuilder.Configurations.Add(new FlowSchemeDetailMap());
 
         }
     }

OpenAuth.UnitTest/TestWorkflow.cs

@@ -9,18 +9,13 @@ namespace OpenAuth.UnitTest
     [TestClass]
     public class TestWorkflow :TestBase
     {
-        private WFSchemeService _app;
-        private WFProcessInstanceService _runApp;
+        private FlowSchemeApp _app;
+        private FlowInstanceApp _runApp;
 
         public TestWorkflow()
         {
-            _app = AutofacExt.GetFromFac<WFSchemeService>();
-            _runApp = AutofacExt.GetFromFac<WFProcessInstanceService>();
-        }
-        [TestMethod]
-        public void AddForm()
-        {
-            var datas = _app.GetList();
+            _app = AutofacExt.GetFromFac<FlowSchemeApp>();
+            _runApp = AutofacExt.GetFromFac<FlowInstanceApp>();
         }
 
         /// <summary>
@@ -33,7 +28,7 @@ namespace OpenAuth.UnitTest
             string name = "请假" + DateTime.Now.ToString("yy-mm-dd_HH_mm_ss");
             string str ="{\"Code\":\"请病假\",\"CustomName\":\""+name+"\",\"wfLevel1\":\"1\",\"wfLevel2\":\"2\",\"wfLevel3\":\"3\",\"Description\":\"&nbsp;\",\"EnabledMark\":1,\"wfLevel\":\"2\"}";
             string frmData ="{\"4fcd4c6f-eb6b-6a6d-eb4e-7948763c5bba\":\"\",\"88061dda-642e-bcdb-909b-cea2bbe5ad69\":\"&nbsp;\"}";
-            _runApp.CreateInstance(string.Empty, (string)("5f0ca3df-390a-4bd7-aecb-5304bf2d191c"), str.ToObject<WFProcessInstance>(), frmData);
+            _runApp.CreateInstance(string.Empty, (string)("5f0ca3df-390a-4bd7-aecb-5304bf2d191c"), str.ToObject<FlowInstance>(), frmData);
         }
 
     }

数据库设计关系图/OpenAuthDB.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{54F96D9D-A534-4ADF-ADAD-ACFE3C42BC44}" Label="" LastModificationDate="1519704458" Name="OpenAuthDB" Objects="362" Symbols="25" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.6.1.5066"?>
+<?PowerDesigner AppLocale="UTF16" ID="{54F96D9D-A534-4ADF-ADAD-ACFE3C42BC44}" Label="" LastModificationDate="1520672245" Name="OpenAuthDB" Objects="358" Symbols="25" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.6.1.5066"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +12,7 @@
 <a:Code>OpenAuthDB</a:Code>
 <a:CreationDate>1430102287</a:CreationDate>
 <a:Creator>yubaolee</a:Creator>
-<a:ModificationDate>1511955755</a:ModificationDate>
+<a:ModificationDate>1520672245</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:History>ORG {9C5FE510-8BFA-4205-BF00-FC94E77A24A2}
 DAT 1430102318
@@ -215,7 +215,7 @@ GenScriptPrev=Yes
 GenArchiveModel=Yes
 GenUseSync=No
 GenSyncChoice=0
-GenSyncArch=D:\Project\OpenAuth.Net\数据库设计关系图\OpenAuthDB.apm
+GenSyncArch=C:\MyProject\OpenAuth.Net\数据库设计关系图\OpenAuthDB.apm
 GenSyncRmg=0
 
 [FolderOptions\Physical Objects\Database Generation\Format]
@@ -3967,7 +3967,7 @@ PhysOpts=
 
 [ModelOptions\Default Opts\FRMESOB&lt;&lt;WorkloadGroup&gt;&gt;]
 PhysOpts=</a:ModelOptionsText>
-<a:RepositoryFilename>F:\MyProject\OpenAuth.Net\数据库设计关系图\OpenAuthDB.pdm</a:RepositoryFilename>
+<a:RepositoryFilename>C:\MyProject\OpenAuth.Net\数据库设计关系图\OpenAuthDB.pdm</a:RepositoryFilename>
 <c:GenerationOrigins>
 <o:Shortcut Id="o3">
 <a:ObjectID>9401CEBA-B163-4ADB-AECF-03CE78C0FFF3</a:ObjectID>
@@ -4654,7 +4654,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o14">
 <a:CreationDate>1511952169</a:CreationDate>
 <a:ModificationDate>1511952385</a:ModificationDate>
-<a:Rect>((53029,-44836), (57529,-36699))</a:Rect>
+<a:Rect>((52917,-44836), (57641,-36699))</a:Rect>
 <a:ListOfPoints>((55279,-36699),(55279,-44836))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -5398,8 +5398,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o37">
 <a:CreationDate>1504793917</a:CreationDate>
 <a:ModificationDate>1505973450</a:ModificationDate>
-<a:Rect>((-28939,18390), (-3588,20126))</a:Rect>
-<a:ListOfPoints>((-3988,19071),(-22754,19071),(-22754,19501),(-28539,19501))</a:ListOfPoints>
+<a:Rect>((-28939,18390), (-5362,20126))</a:Rect>
+<a:ListOfPoints>((-5762,19071),(-22754,19071),(-22754,19501),(-28539,19501))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:ShadowStyle>3</a:ShadowStyle>
@@ -5422,9 +5422,9 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 </o:ReferenceSymbol>
 <o:ReferenceSymbol Id="o41">
 <a:CreationDate>1504793917</a:CreationDate>
-<a:ModificationDate>1504794406</a:ModificationDate>
-<a:Rect>((-10365,21467), (15318,25668))</a:Rect>
-<a:ListOfPoints>((14918,24772),(-4553,24772),(-4553,21867))</a:ListOfPoints>
+<a:ModificationDate>1520667914</a:ModificationDate>
+<a:Rect>((5251,20642), (16875,22163))</a:Rect>
+<a:ListOfPoints>((14918,21267),(6758,21267))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:ShadowStyle>3</a:ShadowStyle>
@@ -5447,8 +5447,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o44">
 <a:CreationDate>1504793917</a:CreationDate>
 <a:ModificationDate>1504794406</a:ModificationDate>
-<a:Rect>((6862,12701), (18486,14222))</a:Rect>
-<a:ListOfPoints>((14722,13326),(10176,13326))</a:ListOfPoints>
+<a:Rect>((5153,12701), (16777,14222))</a:Rect>
+<a:ListOfPoints>((14722,13326),(6758,13326))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:ShadowStyle>3</a:ShadowStyle>
@@ -5570,9 +5570,10 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o38">
 <a:CreationDate>1504793917</a:CreationDate>
-<a:ModificationDate>1504801532</a:ModificationDate>
+<a:ModificationDate>1520667920</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-19282,4619), (10176,21867))</a:Rect>
+<a:Rect>((-19280,4619), (6758,21867))</a:Rect>
+<a:AutoAdjustToText>0</a:AutoAdjustToText>
 <a:ShadowStyle>3</a:ShadowStyle>
 <a:LineColor>12615680</a:LineColor>
 <a:LineWidth>1</a:LineWidth>
@@ -5589,6 +5590,7 @@ Keys 0 新宋体,8,N
 Indexes 0 新宋体,8,N
 Triggers 0 新宋体,8,N
 LABL 0 新宋体,8,N</a:FontList>
+<a:ManuallyResized>1</a:ManuallyResized>
 <c:Object>
 <o:Table Ref="o52"/>
 </c:Object>
@@ -6486,7 +6488,7 @@ Drop=No</a:Settings>
 <a:Code>PrimaryKey</a:Code>
 <a:CreationDate>1504799542</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1511955952</a:ModificationDate>
+<a:ModificationDate>1520667890</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>主键</a:Comment>
 <a:DefaultValue>newid()</a:DefaultValue>
@@ -8545,10 +8547,10 @@ Drop=No</a:Settings>
 <o:Column Id="o154">
 <a:ObjectID>F289723B-B207-406A-A6C6-61B74DA6C4B4</a:ObjectID>
 <a:Name>删除标记</a:Name>
-<a:Code>Delete</a:Code>
+<a:Code>DeleteMark</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1519704375</a:ModificationDate>
+<a:ModificationDate>1520667232</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>删除标记</a:Comment>
 <a:DefaultValue>0</a:DefaultValue>
@@ -8569,12 +8571,13 @@ Drop=No</a:Settings>
 <o:Column Id="o156">
 <a:ObjectID>70E1629A-47CE-41CC-AF2F-3AFB457E75D4</a:ObjectID>
 <a:Name>有效</a:Name>
-<a:Code>Enabled</a:Code>
+<a:Code>Disabled</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1519704375</a:ModificationDate>
+<a:ModificationDate>1520666617</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>有效</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
@@ -8711,10 +8714,10 @@ Drop=No</a:Settings>
 <o:Table Id="o49">
 <a:ObjectID>6E94C4B7-A8A1-4240-BBD0-0A5A170389BB</a:ObjectID>
 <a:Name>工作流模板信息表</a:Name>
-<a:Code>WF_SchemeInfo</a:Code>
+<a:Code>FlowScheme</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504799705</a:ModificationDate>
+<a:ModificationDate>1520667664</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>工作流模板信息表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -8801,10 +8804,12 @@ Drop=No</a:Settings>
 <a:Code>FrmType</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520666782</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>表单类型</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o174">
 <a:ObjectID>27352E05-6B50-42E2-8CDB-D0325885E6F5</a:ObjectID>
@@ -8812,10 +8817,12 @@ Drop=No</a:Settings>
 <a:Code>AuthorizeType</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520666782</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>模板权限类型0所有人,1指定成员</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o175">
 <a:ObjectID>E238A983-7509-4A3C-B07B-FEBC8A7B8414</a:ObjectID>
@@ -8823,10 +8830,12 @@ Drop=No</a:Settings>
 <a:Code>SortCode</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520666782</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>排序码</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o176">
 <a:ObjectID>02763158-A58C-489C-92CF-3EE0CDDB4D15</a:ObjectID>
@@ -8834,21 +8843,25 @@ Drop=No</a:Settings>
 <a:Code>DeleteMark</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520666782</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>删除标记</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o177">
 <a:ObjectID>CE12EBF2-DD4B-410D-A09D-6DC90C5894AE</a:ObjectID>
 <a:Name>有效</a:Name>
-<a:Code>EnabledMark</a:Code>
+<a:Code>Disabled</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520666756</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>有效</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o178">
 <a:ObjectID>D1F30426-A20F-4F68-8BA3-271E9B4095C1</a:ObjectID>
@@ -8868,10 +8881,12 @@ Drop=No</a:Settings>
 <a:Code>CreateDate</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798129</a:ModificationDate>
+<a:ModificationDate>1520666756</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>创建时间</a:Comment>
+<a:DefaultValue>getdate()</a:DefaultValue>
 <a:DataType>datetime</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o180">
 <a:ObjectID>76565A5D-20CD-4C19-AAC8-CAB0EE869478</a:ObjectID>
@@ -8879,11 +8894,15 @@ Drop=No</a:Settings>
 <a:Code>CreateUserId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798103</a:ModificationDate>
+<a:ModificationDate>1520667463</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>创建用户主键</a:Comment>
+<a:DefaultValue>newid()</a:DefaultValue>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
+<c:Domain>
+<o:PhysicalDomain Ref="o60"/>
+</c:Domain>
 </o:Column>
 <o:Column Id="o181">
 <a:ObjectID>2DC5E2EF-4216-497E-AD0D-2580F16027B0</a:ObjectID>
@@ -8914,11 +8933,15 @@ Drop=No</a:Settings>
 <a:Code>ModifyUserId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798103</a:ModificationDate>
+<a:ModificationDate>1520667468</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>修改用户主键</a:Comment>
+<a:DefaultValue>newid()</a:DefaultValue>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
+<c:Domain>
+<o:PhysicalDomain Ref="o60"/>
+</c:Domain>
 </o:Column>
 <o:Column Id="o184">
 <a:ObjectID>86F0B6C8-1FB1-44B0-B789-803622F8650C</a:ObjectID>
@@ -8950,11 +8973,11 @@ Drop=No</a:Settings>
 <c:Indexes>
 <o:Index Id="o186">
 <a:ObjectID>D56566D5-30B2-4BCE-B2F6-30D6636EFB4D</a:ObjectID>
-<a:Name>WF_SchemeInfo_PK</a:Name>
-<a:Code>WF_SchemeInfo_PK</a:Code>
+<a:Name>FlowScheme_PK</a:Name>
+<a:Code>FlowScheme_PK</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504793917</a:ModificationDate>
+<a:ModificationDate>1520668070</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Unique>1</a:Unique>
 <c:LinkedObject>
@@ -8981,10 +9004,10 @@ Drop=No</a:Settings>
 <o:Table Id="o50">
 <a:ObjectID>AD103B2B-D02F-42A9-8DA0-CB44140C294A</a:ObjectID>
 <a:Name>工作流模板内容表</a:Name>
-<a:Code>WF_SchemeContent</a:Code>
+<a:Code>FlowSchemeDetail</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504799379</a:ModificationDate>
+<a:ModificationDate>1520668059</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>工作流模板内容表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -9009,10 +9032,10 @@ Drop=No</a:Settings>
 <o:Column Id="o189">
 <a:ObjectID>B3C5EDBE-869A-4661-BA3F-1E4F4ABDC5D1</a:ObjectID>
 <a:Name>工作流模板信息主键Id</a:Name>
-<a:Code>SchemeInfoId</a:Code>
+<a:Code>SchemeId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1511955755</a:ModificationDate>
+<a:ModificationDate>1520668938</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>工作流模板信息主键Id</a:Comment>
 <a:DefaultValue>newid()</a:DefaultValue>
@@ -9053,10 +9076,12 @@ Drop=No</a:Settings>
 <a:Code>CreateDate</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798129</a:ModificationDate>
+<a:ModificationDate>1520666817</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>创建时间</a:Comment>
+<a:DefaultValue>getdate()</a:DefaultValue>
 <a:DataType>datetime</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o193">
 <a:ObjectID>E590D144-BED4-41DC-8AEF-44DCFAF56A72</a:ObjectID>
@@ -9064,11 +9089,14 @@ Drop=No</a:Settings>
 <a:Code>CreateUserId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798103</a:ModificationDate>
+<a:ModificationDate>1520667448</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>创建用户主键</a:Comment>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
+<c:Domain>
+<o:PhysicalDomain Ref="o60"/>
+</c:Domain>
 </o:Column>
 <o:Column Id="o194">
 <a:ObjectID>0D61F1F9-5D80-40C3-B7A3-5A0A4F96E675</a:ObjectID>
@@ -9100,11 +9128,11 @@ Drop=No</a:Settings>
 <c:Indexes>
 <o:Index Id="o196">
 <a:ObjectID>6344066F-A6D9-43E7-B8BF-609D5EA778CD</a:ObjectID>
-<a:Name>WF_SchemeContent_PK</a:Name>
-<a:Code>WF_SchemeContent_PK</a:Code>
+<a:Name>FlowSchemeDetail_PK</a:Name>
+<a:Code>FlowSchemeDetail_PK</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504793917</a:ModificationDate>
+<a:ModificationDate>1520668083</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Unique>1</a:Unique>
 <c:LinkedObject>
@@ -9155,12 +9183,12 @@ Drop=No</a:Settings>
 <o:Table Id="o51">
 <a:ObjectID>EFC04A8A-B3CE-48F4-99E2-75B47584A766</a:ObjectID>
 <a:Name>工作流实例模板对应表</a:Name>
-<a:Code>WF_ProcessScheme</a:Code>
+<a:Code>FlowInstanceScheme</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504799383</a:ModificationDate>
+<a:ModificationDate>1520667654</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>工作流实例模板对应表</a:Comment>
+<a:Comment>工作流实例模板对应表，防止创建实例后原模板被改</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
 <o:Column Id="o200">
@@ -9169,7 +9197,7 @@ Drop=No</a:Settings>
 <a:Code>Id</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1511955755</a:ModificationDate>
+<a:ModificationDate>1520667961</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>主键Id</a:Comment>
 <a:DefaultValue>newid()</a:DefaultValue>
@@ -9194,10 +9222,10 @@ Drop=No</a:Settings>
 <o:Column Id="o202">
 <a:ObjectID>BA95C41B-6371-4F01-B25C-85EC94DABF77</a:ObjectID>
 <a:Name>流程模板ID</a:Name>
-<a:Code>SchemeInfoId</a:Code>
+<a:Code>SchemeId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1511955755</a:ModificationDate>
+<a:ModificationDate>1520672432</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>流程模板ID</a:Comment>
 <a:DefaultValue>newid()</a:DefaultValue>
@@ -9226,10 +9254,12 @@ Drop=No</a:Settings>
 <a:Code>ProcessType</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520667088</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>类型(0正常,3草稿)</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 </c:Columns>
 <c:Keys>
@@ -9239,7 +9269,7 @@ Drop=No</a:Settings>
 <a:Code>Id</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504793917</a:ModificationDate>
+<a:ModificationDate>1520667961</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Key.Columns>
 <o:Column Ref="o200"/>
@@ -9249,11 +9279,11 @@ Drop=No</a:Settings>
 <c:Indexes>
 <o:Index Id="o206">
 <a:ObjectID>9DA839F2-03E2-46E3-B98F-56657B64588D</a:ObjectID>
-<a:Name>WF_ProcessScheme_PK</a:Name>
-<a:Code>WF_ProcessScheme_PK</a:Code>
+<a:Name>FlowInstanceScheme_PK</a:Name>
+<a:Code>FlowInstanceScheme_PK</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504793917</a:ModificationDate>
+<a:ModificationDate>1520667989</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Unique>1</a:Unique>
 <c:LinkedObject>
@@ -9261,10 +9291,10 @@ Drop=No</a:Settings>
 </c:LinkedObject>
 <c:IndexColumns>
 <o:IndexColumn Id="o207">
-<a:ObjectID>6E9A194A-22FD-4C1D-B8AD-00AF2C5C619B</a:ObjectID>
-<a:CreationDate>1504793917</a:CreationDate>
+<a:ObjectID>13E9C0BC-42FA-4CA6-9161-E93E81BDE64D</a:ObjectID>
+<a:CreationDate>1520667942</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504793917</a:ModificationDate>
+<a:ModificationDate>1520667961</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Column>
 <o:Column Ref="o200"/>
@@ -9280,10 +9310,10 @@ Drop=No</a:Settings>
 <o:Table Id="o52">
 <a:ObjectID>806B541D-1B79-40A7-99C8-5E549C918975</a:ObjectID>
 <a:Name>工作流流程实例表</a:Name>
-<a:Code>WF_ProcessInstance</a:Code>
+<a:Code>FlowInstance</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504801451</a:ModificationDate>
+<a:ModificationDate>1520668265</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>工作流流程实例表</a:Comment>
 <a:TotalSavingCurrency/>
@@ -9312,6 +9342,24 @@ Drop=No</a:Settings>
 </c:Domain>
 </o:Column>
 <o:Column Id="o209">
+<a:ObjectID>6C3174F2-8C36-4AEB-9235-0F953D0B7536</a:ObjectID>
+<a:Name>流程实例模板Id</a:Name>
+<a:Code>InstanceSchemeId</a:Code>
+<a:CreationDate>1504793917</a:CreationDate>
+<a:Creator>Administrator</a:Creator>
+<a:ModificationDate>1520667807</a:ModificationDate>
+<a:Modifier>Administrator</a:Modifier>
+<a:Comment>流程实例模板Id</a:Comment>
+<a:DefaultValue>newid()</a:DefaultValue>
+<a:DataType>varchar(50)</a:DataType>
+<a:Length>50</a:Length>
+<a:Column.Mandatory>1</a:Column.Mandatory>
+<a:AutoMigrated>1</a:AutoMigrated>
+<c:Domain>
+<o:PhysicalDomain Ref="o60"/>
+</c:Domain>
+</o:Column>
+<o:Column Id="o210">
 <a:ObjectID>E98CB59F-CAF9-4449-A01F-A9F255390846</a:ObjectID>
 <a:Name>实例编号</a:Name>
 <a:Code>Code</a:Code>
@@ -9323,7 +9371,7 @@ Drop=No</a:Settings>
 <a:DataType>varchar(200)</a:DataType>
 <a:Length>200</a:Length>
 </o:Column>
-<o:Column Id="o210">
+<o:Column Id="o211">
 <a:ObjectID>C613C381-A6AC-4DEB-B517-76EB7D425CAA</a:ObjectID>
 <a:Name>自定义名称</a:Name>
 <a:Code>CustomName</a:Code>
@@ -9335,19 +9383,22 @@ Drop=No</a:Settings>
 <a:DataType>varchar(200)</a:DataType>
 <a:Length>200</a:Length>
 </o:Column>
-<o:Column Id="o211">
+<o:Column Id="o212">
 <a:ObjectID>9AE38E11-84C4-401F-97E0-D755CA06AB09</a:ObjectID>
 <a:Name>当前节点ID</a:Name>
 <a:Code>ActivityId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798103</a:ModificationDate>
+<a:ModificationDate>1520667017</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>当前节点ID</a:Comment>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
+<c:Domain>
+<o:PhysicalDomain Ref="o60"/>
+</c:Domain>
 </o:Column>
-<o:Column Id="o212">
+<o:Column Id="o213">
 <a:ObjectID>C5FBE742-1619-4297-8FF5-8DB478FFD5A5</a:ObjectID>
 <a:Name>当前节点类型</a:Name>
 <a:Code>ActivityType</a:Code>
@@ -9358,7 +9409,7 @@ Drop=No</a:Settings>
 <a:Comment>当前节点类型（0会签节点）</a:Comment>
 <a:DataType>int</a:DataType>
 </o:Column>
-<o:Column Id="o213">
+<o:Column Id="o214">
 <a:ObjectID>D9D5FBA8-5B4A-4299-8C4B-E5BF92C94431</a:ObjectID>
 <a:Name>当前节点名称</a:Name>
 <a:Code>ActivityName</a:Code>
@@ -9370,24 +9421,6 @@ Drop=No</a:Settings>
 <a:DataType>varchar(200)</a:DataType>
 <a:Length>200</a:Length>
 </o:Column>
-<o:Column Id="o214">
-<a:ObjectID>6C3174F2-8C36-4AEB-9235-0F953D0B7536</a:ObjectID>
-<a:Name>流程实例模板Id</a:Name>
-<a:Code>ProcessSchemeId</a:Code>
-<a:CreationDate>1504793917</a:CreationDate>
-<a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1511955755</a:ModificationDate>
-<a:Modifier>Administrator</a:Modifier>
-<a:Comment>流程实例模板Id</a:Comment>
-<a:DefaultValue>newid()</a:DefaultValue>
-<a:DataType>varchar(50)</a:DataType>
-<a:Length>50</a:Length>
-<a:Column.Mandatory>1</a:Column.Mandatory>
-<a:AutoMigrated>1</a:AutoMigrated>
-<c:Domain>
-<o:PhysicalDomain Ref="o60"/>
-</c:Domain>
-</o:Column>
 <o:Column Id="o215">
 <a:ObjectID>DBAC9ACD-A160-49E3-BA18-34ACA955CC43</a:ObjectID>
 <a:Name>前一个ID</a:Name>
@@ -9409,9 +9442,11 @@ Drop=No</a:Settings>
 <a:Code>FrmType</a:Code>
 <a:CreationDate>1504801424</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504801451</a:ModificationDate>
+<a:ModificationDate>1520667609</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o217">
 <a:ObjectID>F969B35E-77F6-4658-834C-AB61B18A1B0B</a:ObjectID>
@@ -9428,13 +9463,15 @@ Drop=No</a:Settings>
 <o:Column Id="o218">
 <a:ObjectID>06748220-8AED-4D9D-B1BB-11CC17633057</a:ObjectID>
 <a:Name>有效标志（0暂停,1正常运行,3草稿）</a:Name>
-<a:Code>EnabledMark</a:Code>
+<a:Code>Disabled</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520667609</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>有效标志</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o219">
 <a:ObjectID>13E11AE5-26B8-444A-9210-AC46929DE9BA</a:ObjectID>
@@ -9442,10 +9479,12 @@ Drop=No</a:Settings>
 <a:Code>CreateDate</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798129</a:ModificationDate>
+<a:ModificationDate>1520666991</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>创建时间</a:Comment>
+<a:DefaultValue>getdate()</a:DefaultValue>
 <a:DataType>datetime</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o220">
 <a:ObjectID>11066BC1-6BBB-4A41-AD07-9B47EF4E2B35</a:ObjectID>
@@ -9453,10 +9492,9 @@ Drop=No</a:Settings>
 <a:Code>CreateUserId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1511955952</a:ModificationDate>
+<a:ModificationDate>1520667171</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>创建用户主键</a:Comment>
-<a:DefaultValue>newid()</a:DefaultValue>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 <c:Domain>
@@ -9478,13 +9516,15 @@ Drop=No</a:Settings>
 <o:Column Id="o222">
 <a:ObjectID>3B6D943B-675D-4216-AF4F-E6B92EF6D791</a:ObjectID>
 <a:Name>等级</a:Name>
-<a:Code>wfLevel</a:Code>
+<a:Code>FlowLevel</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520667807</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>等级</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o223">
 <a:ObjectID>F45676E2-9A52-4630-BCCF-60D48F4C2B56</a:ObjectID>
@@ -9501,13 +9541,15 @@ Drop=No</a:Settings>
 <o:Column Id="o224">
 <a:ObjectID>BCAC5426-B9D9-410F-8F34-38405BF65C51</a:ObjectID>
 <a:Name>是否完成(0运行中,1运行结束,2被召回,3不同意,4表示被驳回)</a:Name>
-<a:Code>isFinish</a:Code>
+<a:Code>IsFinish</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520667807</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>是否完成</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o225">
 <a:ObjectID>93828232-E3F3-4E75-9088-9554278FEF35</a:ObjectID>
@@ -9539,11 +9581,11 @@ Drop=No</a:Settings>
 <c:Indexes>
 <o:Index Id="o227">
 <a:ObjectID>1925AD3C-50D1-4A4E-8EBE-201B4DAADA05</a:ObjectID>
-<a:Name>WF_ProcessInstance_PK</a:Name>
-<a:Code>WF_ProcessInstance_PK</a:Code>
+<a:Name>FlowInstance_PK</a:Name>
+<a:Code>FlowInstance_PK</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504793917</a:ModificationDate>
+<a:ModificationDate>1520668005</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Unique>1</a:Unique>
 <c:LinkedObject>
@@ -9581,7 +9623,7 @@ Drop=No</a:Settings>
 <a:ModificationDate>1504793917</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <c:Column>
-<o:Column Ref="o214"/>
+<o:Column Ref="o209"/>
 </c:Column>
 </o:IndexColumn>
 </c:IndexColumns>
@@ -9594,10 +9636,10 @@ Drop=No</a:Settings>
 <o:Table Id="o53">
 <a:ObjectID>F3EB533C-87D3-4BF1-A09D-7C7585903A0C</a:ObjectID>
 <a:Name>工作流实例流转历史记录</a:Name>
-<a:Code>WF_ProcessTransitionHistory</a:Code>
+<a:Code>FlowInstanceTransitionHistory</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504799387</a:ModificationDate>
+<a:ModificationDate>1520667693</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>工作流实例流转历史记录</a:Comment>
 <a:TotalSavingCurrency/>
@@ -9621,14 +9663,13 @@ Drop=No</a:Settings>
 </o:Column>
 <o:Column Id="o232">
 <a:ObjectID>7C5A0D67-CCDC-4AC6-A24E-5D66AB0853FC</a:ObjectID>
-<a:Name>实例进程Id</a:Name>
-<a:Code>ProcessId</a:Code>
+<a:Name>实例Id</a:Name>
+<a:Code>InstanceId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1511955755</a:ModificationDate>
+<a:ModificationDate>1520668927</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>实例进程Id</a:Comment>
-<a:DefaultValue>newid()</a:DefaultValue>
+<a:Comment>实例Id</a:Comment>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -9640,22 +9681,25 @@ Drop=No</a:Settings>
 <o:Column Id="o233">
 <a:ObjectID>743F4559-979B-47C5-8ACF-75241BAA47D7</a:ObjectID>
 <a:Name>开始节点Id</a:Name>
-<a:Code>fromNodeId</a:Code>
+<a:Code>FromNodeId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798103</a:ModificationDate>
+<a:ModificationDate>1520667870</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>开始节点Id</a:Comment>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
+<c:Domain>
+<o:PhysicalDomain Ref="o60"/>
+</c:Domain>
 </o:Column>
 <o:Column Id="o234">
 <a:ObjectID>8F5CD3F1-6EE0-44AB-82AA-745BA5B3283C</a:ObjectID>
 <a:Name>开始节点类型</a:Name>
-<a:Code>fromNodeType</a:Code>
+<a:Code>FromNodeType</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520667870</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>开始节点类型</a:Comment>
 <a:DataType>int</a:DataType>
@@ -9663,10 +9707,10 @@ Drop=No</a:Settings>
 <o:Column Id="o235">
 <a:ObjectID>01335D64-4088-4AC7-B52B-B8E24E0D3783</a:ObjectID>
 <a:Name>开始节点名称</a:Name>
-<a:Code>fromNodeName</a:Code>
+<a:Code>FromNodeName</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798105</a:ModificationDate>
+<a:ModificationDate>1520667870</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>开始节点名称</a:Comment>
 <a:DataType>varchar(200)</a:DataType>
@@ -9675,22 +9719,25 @@ Drop=No</a:Settings>
 <o:Column Id="o236">
 <a:ObjectID>F6B2AB11-B4DC-4DCA-8BA0-45F67A3CB869</a:ObjectID>
 <a:Name>结束节点Id</a:Name>
-<a:Code>toNodeId</a:Code>
+<a:Code>ToNodeId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798103</a:ModificationDate>
+<a:ModificationDate>1520667870</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>结束节点Id</a:Comment>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
+<c:Domain>
+<o:PhysicalDomain Ref="o60"/>
+</c:Domain>
 </o:Column>
 <o:Column Id="o237">
 <a:ObjectID>D1AE7CD3-4DF7-4121-B218-693CC95E6DA0</a:ObjectID>
 <a:Name>结束节点类型</a:Name>
-<a:Code>toNodeType</a:Code>
+<a:Code>ToNodeType</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520667870</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>结束节点类型</a:Comment>
 <a:DataType>int</a:DataType>
@@ -9698,10 +9745,10 @@ Drop=No</a:Settings>
 <o:Column Id="o238">
 <a:ObjectID>526569E2-B056-4C0A-ABE7-2D48FC09C6DD</a:ObjectID>
 <a:Name>结束节点名称</a:Name>
-<a:Code>toNodeName</a:Code>
+<a:Code>ToNodeName</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798105</a:ModificationDate>
+<a:ModificationDate>1520667870</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>结束节点名称</a:Comment>
 <a:DataType>varchar(200)</a:DataType>
@@ -9713,21 +9760,25 @@ Drop=No</a:Settings>
 <a:Code>TransitionSate</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520666893</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>转化状态</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o240">
 <a:ObjectID>86A42378-0EB9-4946-914D-C44837F36FD2</a:ObjectID>
 <a:Name>是否结束</a:Name>
-<a:Code>isFinish</a:Code>
+<a:Code>IsFinish</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798127</a:ModificationDate>
+<a:ModificationDate>1520667870</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>是否结束</a:Comment>
+<a:DefaultValue>0</a:DefaultValue>
 <a:DataType>int</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o241">
 <a:ObjectID>020FBF1C-A9B3-45D2-A5E7-352CAE6EB5B2</a:ObjectID>
@@ -9735,10 +9786,12 @@ Drop=No</a:Settings>
 <a:Code>CreateDate</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798129</a:ModificationDate>
+<a:ModificationDate>1520667890</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>转化时间</a:Comment>
+<a:DefaultValue>getdate()</a:DefaultValue>
 <a:DataType>datetime</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o242">
 <a:ObjectID>C41BA484-8C23-4409-94C5-37A681A4B751</a:ObjectID>
@@ -9746,11 +9799,14 @@ Drop=No</a:Settings>
 <a:Code>CreateUserId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798103</a:ModificationDate>
+<a:ModificationDate>1520667890</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>操作人Id</a:Comment>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
+<c:Domain>
+<o:PhysicalDomain Ref="o60"/>
+</c:Domain>
 </o:Column>
 <o:Column Id="o243">
 <a:ObjectID>484B225D-4A49-4E25-994B-20CBD86EFAB3</a:ObjectID>
@@ -9782,11 +9838,11 @@ Drop=No</a:Settings>
 <c:Indexes>
 <o:Index Id="o245">
 <a:ObjectID>12BCD2CF-67EA-42C4-ACDB-AA613F210133</a:ObjectID>
-<a:Name>WF_ProcessTransitionHistory_PK</a:Name>
-<a:Code>WF_ProcessTransitionHistory_PK</a:Code>
+<a:Name>FlowInstanceTransitionHistory_PK</a:Name>
+<a:Code>FlowInstanceTransitionHistory_PK</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504793917</a:ModificationDate>
+<a:ModificationDate>1520668042</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Unique>1</a:Unique>
 <c:LinkedObject>
@@ -9837,10 +9893,10 @@ Drop=No</a:Settings>
 <o:Table Id="o54">
 <a:ObjectID>08CC0E81-7942-4AA3-B076-7FAE23F02687</a:ObjectID>
 <a:Name>工作流实例操作记录</a:Name>
-<a:Code>WF_ProcessOperationHistory</a:Code>
+<a:Code>FlowInstanceOperationHistory</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504799391</a:ModificationDate>
+<a:ModificationDate>1520667683</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>工作流实例操作记录</a:Comment>
 <a:TotalSavingCurrency/>
@@ -9865,13 +9921,12 @@ Drop=No</a:Settings>
 <o:Column Id="o250">
 <a:ObjectID>AC4E6E69-039E-4AFB-BA69-51EAB41557CE</a:ObjectID>
 <a:Name>实例进程Id</a:Name>
-<a:Code>ProcessId</a:Code>
+<a:Code>InstanceId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1511955755</a:ModificationDate>
+<a:ModificationDate>1520672179</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>实例进程Id</a:Comment>
-<a:DefaultValue>newid()</a:DefaultValue>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -9898,10 +9953,12 @@ Drop=No</a:Settings>
 <a:Code>CreateDate</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798129</a:ModificationDate>
+<a:ModificationDate>1520666939</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>创建时间</a:Comment>
+<a:DefaultValue>getdate()</a:DefaultValue>
 <a:DataType>datetime</a:DataType>
+<a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
 <o:Column Id="o253">
 <a:ObjectID>5FFFCB89-400D-4F2F-9CF3-727051E2E6D3</a:ObjectID>
@@ -9909,11 +9966,15 @@ Drop=No</a:Settings>
 <a:Code>CreateUserId</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504798103</a:ModificationDate>
+<a:ModificationDate>1520666950</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>创建用户主键</a:Comment>
+<a:DefaultValue>newid()</a:DefaultValue>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
+<c:Domain>
+<o:PhysicalDomain Ref="o60"/>
+</c:Domain>
 </o:Column>
 <o:Column Id="o254">
 <a:ObjectID>01E8EC4C-BE39-4437-8733-63A77161290F</a:ObjectID>
@@ -9945,11 +10006,11 @@ Drop=No</a:Settings>
 <c:Indexes>
 <o:Index Id="o256">
 <a:ObjectID>F110B6FA-890F-46C0-A830-B030E5409F7E</a:ObjectID>
-<a:Name>WF_ProcessOperationHistory_PK</a:Name>
-<a:Code>WF_ProcessOperationHistory_PK</a:Code>
+<a:Name>FlowInstanceOperationHistory_PK</a:Name>
+<a:Code>FlowInstanceOperationHistory_PK</a:Code>
 <a:CreationDate>1504793917</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1504793917</a:ModificationDate>
+<a:ModificationDate>1520668027</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Unique>1</a:Unique>
 <c:LinkedObject>
@@ -10824,7 +10885,7 @@ Drop=No</a:Settings>
 <o:Column Ref="o200"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o214"/>
+<o:Column Ref="o209"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>