v3.4.6

workflow/Tnb.WorkFlow.Entitys/Model/FlowHandleModel.cs

@@ -86,6 +86,11 @@ public class FlowHandleModel : PageInputBase
     /// </summary>
     public string taskId { get; set; }
 
+    /// <summary>
+    /// 任务id.
+    /// </summary>
+    public string id { get; set; }
+
     /// <summary>
     /// false 变更 true 复活.
     /// </summary>
@@ -100,4 +105,14 @@ public class FlowHandleModel : PageInputBase
     /// 驳回节点.
     /// </summary>
     public string rejectStep { get; set; }
+
+    /// <summary>
+    /// true 全部 flase 主流程.
+    /// </summary>
+    public bool suspend { get; set; }
+
+    /// <summary>
+    /// 驳回类型.
+    /// </summary>
+    public string rejectType { get; set; }
 }

workflow/Tnb.WorkFlow.Entitys/Model/FlowTaskModel.cs

@@ -124,4 +124,9 @@ public class FlowTaskModel
     /// 标识.
     /// </summary>
     public int? enabledMark { get; set; }
+
+    /// <summary>
+    /// 是否挂起.
+    /// </summary>
+    public bool suspend { get; set; }
 }

workflow/Tnb.WorkFlow.Entitys/Model/FlowTemplateModel.cs

@@ -1,29 +0,0 @@
-using JNPF.DependencyInjection;
-using Newtonsoft.Json.Linq;
-
-namespace JNPF.WorkFlow.Entitys.Model;
-
-[SuppressSniffer]
-public class FlowTemplateModel
-{
-  /// <summary>
-  /// id.
-  /// </summary>
-  public string id { get; set; } = "";
-
-  /// <summary>
-  /// 流程id.
-  /// </summary>
-  public string flowId { get; set; } = "";
-
-  /// <summary>
-  /// 流程名称.
-  /// </summary>
-  public string fullName { get; set; } = "";
-
-  /// <summary>
-  /// 子节点.
-  /// </summary>
-  public FlowTemplateJsonModel? flowTemplateJson { get; set; }
-
-}

workflow/Tnb.WorkFlow.Entitys/Model/Item/ConditionsItem.cs

@@ -45,6 +45,11 @@ public class ConditionsItem
     /// </summary>
     public string? jnpfKey { get; set; }
 
+    /// <summary>
+    /// 控件类型.
+    /// </summary>
+    public string? fieldValueJnpfKey { get; set; }
+
     /// <summary>
     /// 条件类型 1：字段 3:聚合函数匹配.
     /// </summary>

workflow/Tnb.WorkFlow.Entitys/Model/PortalWaitListModel.cs

@@ -59,4 +59,9 @@ public class PortalWaitListModel
     /// 类型.
     /// </summary>
     public int? type { get; set; }
-}
+
+    /// <summary>
+    /// 委托发起人.
+    /// </summary>
+    public string? delegateUser { get; set; }
+}

workflow/Tnb.WorkFlow.Entitys/Model/Properties/ApproversProperties.cs

@@ -95,7 +95,7 @@ public class ApproversProperties
     /// <summary>
     /// 打印id.
     /// </summary>
-    public string? printId { get; set; }
+    public List<string> printId { get; set; } = new List<string>();
 
     /// <summary>
     /// 表单字段审核方式的类型(1-用户 2-部门).
@@ -150,6 +150,11 @@ public class ApproversProperties
     /// </summary>
     public List<AssignItem>? assignList { get; set; }
 
+    /// <summary>
+    /// 是否抄送发起人.
+    /// </summary>
+    public bool isInitiatorCopy { get; set; }
+
     #region 人员
 
     /// <summary>

workflow/Tnb.WorkFlow.Entitys/Model/Properties/StartProperties.cs

@@ -69,7 +69,7 @@ public class StartProperties
     /// <summary>
     /// 打印id.
     /// </summary>
-    public string? printId { get; set; }
+    public List<string> printId { get; set; } = new List<string>();
 
     /// <summary>
     /// 是否评论.