去掉flowdetail

OpenAuth.App/FlowInstanceApp.cs

@@ -312,12 +312,11 @@ namespace OpenAuth.App
             try
             {
                 FlowScheme FlowScheme = UnitWork.FindSingle<FlowScheme>(u => u.Id == schemeInfoId);
-                FlowSchemeDetail FlowSchemeDetail = UnitWork.FindSingle<FlowSchemeDetail>(u =>
+               
-                u.SchemeId == schemeInfoId && u.SchemeVersion == FlowScheme.SchemeVersion);
 
                 WF_RuntimeInitModel wfRuntimeInitModel = new WF_RuntimeInitModel()
                 {
-                    schemeContent = FlowSchemeDetail.SchemeContent,
+                    schemeContent = FlowScheme.SchemeContent,
                     currentNodeId = "",
                     frmData = frmData,
                     processId = processId
@@ -352,14 +351,13 @@ namespace OpenAuth.App
                 #region ʵÀýÄ£°å
                 var data = new
                 {
-                    SchemeContent = FlowSchemeDetail.SchemeContent,
+                    SchemeContent = FlowScheme.SchemeContent,
                     frmData = frmData
                 };
                 FlowInstanceScheme FlowInstanceScheme = new FlowInstanceScheme
                 {
                     SchemeId = schemeInfoId,
                     SchemeVersion = FlowScheme.SchemeVersion,
-                    ProcessType = 1,//1Õýʽ£¬0²Ý¸å
                     SchemeContent = data.ToJson().ToString()
                 };
                 #endregion

OpenAuth.App/FlowSchemeApp.cs

@@ -12,75 +12,14 @@ namespace OpenAuth.App
     /// </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)
         {

OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml

@@ -89,7 +89,7 @@
                         <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"
+                                <input type="text" name="Description" v-model="Description"
                                        placeholder="备注" autocomplete="off" class="layui-input">
                             </div>
                         </div>

OpenAuth.Mvc/userJs/flowSchemes.js

@@ -67,14 +67,11 @@
     }();
 
     /*=========流程设计（begin）======================*/
-    var flowData = {};
-    var frmData = {};
-    var nodePramData = [];
     var flowDesignPanel = $('#flowPanel').flowdesign({
         height: 500,
         widht: 700,
         OpenNode: function (object) {
-            FlowDesignObject = object;
+            FlowDesignObject = object;  //为NodeInfo窗口提供调用
 
             if (object.$nodeData[object.$focus].type == 'startround') {
                 return false;
@@ -104,18 +101,6 @@
             return;
         }
     });
-    function setFlowInfo(data) {
-        flowDesignPanel.loadData(data);
-    }
-
-    function bindingFlow() {
-        var _content = flowDesignPanel.exportDataEx();
-        if (_content == -1) {
-            return false;
-        }
-        flowData["SchemeContent"] = JSON.stringify({ "Frm": frmData, "Flow": _content });
-        return true;
-    }
     /*=========流程设计（end）=====================*/
 
     //添加（编辑）对话框
@@ -133,6 +118,9 @@
                 content: $('#divEdit'),
                 success: function() {
                     vm.$set('$data', data);
+                    if (update) {
+                        flowDesignPanel.loadData(JSON.parse(data.SchemeContent));
+                    }
                 },
                 end: mainList
             });
@@ -143,7 +131,12 @@
             //提交数据
             form.on('submit(formSubmit)',
                 function (data) {
-                    $.exentd(data.field, flowData);
+                    var content = flowDesignPanel.exportDataEx();
+                    var schemecontent = {
+                        SchemeContent: JSON.stringify(content)
+                    }
+
+                    $.extend(data.field,schemecontent);
                     $.post(url,
                         data.field,
                         function(data) {

OpenAuth.Mvc/userJs/nodeInfo.js

@@ -127,8 +127,6 @@ layui.config({
             }
         };
         $.extend(result, vm.$data);
-
-        console.log(JSON.stringify(result));
         return result;
     }
 

OpenAuth.Repository/Domain/FlowInstanceScheme.cs

@@ -23,7 +23,9 @@ namespace OpenAuth.Repository.Domain
           this.SchemeContent= string.Empty;
           this.SchemeId= string.Empty;
           this.SchemeVersion= string.Empty;
-          this.ProcessType= 0;
+          this.CreateDate= DateTime.Now;
+          this.CreateUserId= string.Empty;
+          this.CreateUserName= string.Empty;
         }
 
         /// <summary>
@@ -39,9 +41,17 @@ namespace OpenAuth.Repository.Domain
 	    /// </summary>
         public string SchemeVersion { get; set; }
         /// <summary>
-	    /// 类型(0正常,3草稿)
+	    /// 创建时间
 	    /// </summary>
-        public int ProcessType { get; set; }
+        public System.DateTime CreateDate { get; set; }
+        /// <summary>
+	    /// 创建用户主键
+	    /// </summary>
+        public string CreateUserId { get; set; }
+        /// <summary>
+	    /// 创建用户
+	    /// </summary>
+        public string CreateUserName { get; set; }
 
     }
 }

OpenAuth.Repository/Domain/FlowScheme.cs

@@ -25,6 +25,8 @@ namespace OpenAuth.Repository.Domain
           this.SchemeType= string.Empty;
           this.SchemeVersion= string.Empty;
           this.SchemeCanUser= string.Empty;
+          this.SchemeContent= string.Empty;
+          this.FrmId= string.Empty;
           this.FrmType= 0;
           this.AuthorizeType= 0;
           this.SortCode= 0;
@@ -59,12 +61,20 @@ namespace OpenAuth.Repository.Domain
 	    /// 流程模板使用者
 	    /// </summary>
         public string SchemeCanUser { get; set; }
+        /// <summary>
+	    /// 流程内容
+	    /// </summary>
+        public string SchemeContent { get; set; }
+        /// <summary>
+	    /// 表单ID
+	    /// </summary>
+        public string FrmId { get; set; }
         /// <summary>
 	    /// 表单类型
 	    /// </summary>
         public int FrmType { get; set; }
         /// <summary>
-	    /// 模板权限类型0所有人,1指定成员
+	    /// 模板权限类型：0完全公开,1指定部门/人员
 	    /// </summary>
         public int AuthorizeType { get; set; }
         /// <summary>

OpenAuth.Repository/Domain/FlowSchemeDetail.cs

@@ -1,57 +0,0 @@
-//------------------------------------------------------------------------------
-// <autogenerated>
-//     This code was generated by a CodeSmith Template.
-//
-//     DO NOT MODIFY contents of this file. Changes to this
-//     file will be lost if the code is regenerated.
-//     Author:Yubao Li
-// </autogenerated>
-//------------------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenAuth.Repository.Domain
-{
-    /// <summary>
-	/// 工作流模板内容表
-	/// </summary>
-    public partial class FlowSchemeDetail : Entity
-    {
-        public FlowSchemeDetail()
-        {
-          this.SchemeId= string.Empty;
-          this.SchemeVersion= string.Empty;
-          this.SchemeContent= string.Empty;
-          this.CreateDate= DateTime.Now;
-          this.CreateUserId= string.Empty;
-          this.CreateUserName= string.Empty;
-        }
-
-        /// <summary>
-	    /// 工作流模板信息主键Id
-	    /// </summary>
-        public string SchemeId { get; set; }
-        /// <summary>
-	    /// 流程内容版本
-	    /// </summary>
-        public string SchemeVersion { get; set; }
-        /// <summary>
-	    /// 流程内容
-	    /// </summary>
-        public string SchemeContent { get; set; }
-        /// <summary>
-	    /// 创建时间
-	    /// </summary>
-        public System.DateTime CreateDate { get; set; }
-        /// <summary>
-	    /// 创建用户主键
-	    /// </summary>
-        public string CreateUserId { get; set; }
-        /// <summary>
-	    /// 创建用户
-	    /// </summary>
-        public string CreateUserName { get; set; }
-
-    }
-}

OpenAuth.Repository/Mapping/FlowInstanceSchemeMap.cs

@@ -39,9 +39,17 @@ namespace OpenAuth.Repository.Mapping
                 .HasColumnName("SchemeVersion")
                 .HasMaxLength(50)
                 .IsOptional();
-            Property(t => t.ProcessType)
+            Property(t => t.CreateDate)
-                .HasColumnName("ProcessType")
+                .HasColumnName("CreateDate")
                 .IsRequired();
+            Property(t => t.CreateUserId)
+                .HasColumnName("CreateUserId")
+                .HasMaxLength(50)
+                .IsOptional();
+            Property(t => t.CreateUserName)
+                .HasColumnName("CreateUserName")
+                .HasMaxLength(50)
+                .IsOptional();
 
             // Relationships
         }

OpenAuth.Repository/Mapping/FlowSchemeDetailMap.cs

@@ -1,57 +0,0 @@
-//------------------------------------------------------------------------------
-// <autogenerated>
-//     This code was generated by a CodeSmith Template.
-//
-//     DO NOT MODIFY contents of this file. Changes to this
-//     file will be lost if the code is regenerated.
-// </autogenerated>
-//------------------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace OpenAuth.Repository.Mapping
-{
-    public partial class FlowSchemeDetailMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.FlowSchemeDetail>
-    {
-        public FlowSchemeDetailMap()
-        {
-            // table
-            ToTable("FlowSchemeDetail", "dbo");
-
-            // keys
-            HasKey(t => t.Id);
-
-            // Properties
-            Property(t => t.Id)
-                .HasColumnName("Id")
-                .HasMaxLength(50)
-                .IsRequired();
-            Property(t => t.SchemeId)
-                .HasColumnName("SchemeId")
-                .HasMaxLength(50)
-                .IsRequired();
-            Property(t => t.SchemeVersion)
-                .HasColumnName("SchemeVersion")
-                .HasMaxLength(50)
-                .IsOptional();
-            Property(t => t.SchemeContent)
-                .HasColumnName("SchemeContent")
-                .IsOptional();
-            Property(t => t.CreateDate)
-                .HasColumnName("CreateDate")
-                .IsRequired();
-            Property(t => t.CreateUserId)
-                .HasColumnName("CreateUserId")
-                .HasMaxLength(50)
-                .IsOptional();
-            Property(t => t.CreateUserName)
-                .HasColumnName("CreateUserName")
-                .HasMaxLength(50)
-                .IsOptional();
-
-            // Relationships
-        }
-    }
-}

OpenAuth.Repository/Mapping/FlowSchemeMap.cs

@@ -47,6 +47,13 @@ namespace OpenAuth.Repository.Mapping
             Property(t => t.SchemeCanUser)
                 .HasColumnName("SchemeCanUser")
                 .IsOptional();
+            Property(t => t.SchemeContent)
+                .HasColumnName("SchemeContent")
+                .IsOptional();
+            Property(t => t.FrmId)
+                .HasColumnName("FrmId")
+                .HasMaxLength(50)
+                .IsOptional();
             Property(t => t.FrmType)
                 .HasColumnName("FrmType")
                 .IsRequired();

OpenAuth.Repository/OpenAuth.Repository.csproj

@@ -65,7 +65,6 @@
     <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" />
@@ -84,7 +83,6 @@
     <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="UnitWork.cs" />

OpenAuth.Repository/OpenAuthDBContext.cs

@@ -46,7 +46,6 @@ namespace OpenAuth.Repository
         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)
         {
@@ -67,7 +66,6 @@ namespace OpenAuth.Repository
             modelBuilder.Configurations.Add(new FlowInstanceSchemeMap());
             modelBuilder.Configurations.Add(new FlowInstanceTransitionHistoryMap());
             modelBuilder.Configurations.Add(new FlowSchemeMap());
-            modelBuilder.Configurations.Add(new FlowSchemeDetailMap());
 
         }
     }