优化插件功能

Src/Entities/SeeyonInterface.cs

@@ -15,6 +15,8 @@ namespace Kivii.Seeyon
         /// <returns></returns>
         object OnSubmitApplyForm<T>(Guid Kvid);
 
+        object OnSubmitApplyForm<T>(T form);
+
         /// <summary>
         /// OA申请结果调用
         /// </summary>

Src/Extension.cs

+using Kivii.Text;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static System.Collections.Generic.Dictionary<string, object>;
+
+namespace Kivii.Seeyon
+{
+    internal static class Extension
+    {
+
+        public static T ConvertTo<T>(this Dictionary<string, object> dic)
+        {
+            Dictionary<string, object> dictionary = new Dictionary<string, object>();
+            using (Enumerator enumerator = dic.GetEnumerator())
+            {
+                while (enumerator.MoveNext())
+                {
+                    KeyValuePair<string, object> current = enumerator.Current;
+                    dictionary[current.Key] = current.Value;
+                }
+            }
+            return (T)dictionary.FromObjectDictionary(typeof(T));
+        }
+    }
+}

Src/Kivii.Seeyon.Addons.V4.5.csproj

@@ -53,6 +53,7 @@
     <Compile Include="Entities\SeeyonInterface.cs" />
     <Compile Include="Entities\Request.Response.cs" />
     <Compile Include="Entities\SeeyonApply.cs" />
+    <Compile Include="Extension.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Transforms\RestfulApply.cs" />
   </ItemGroup>

Src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2023.9200")]
-[assembly: AssemblyFileVersion("5.4.2023.9200")]
+[assembly: AssemblyVersion("5.4.2023.9260")]
+[assembly: AssemblyFileVersion("5.4.2023.9260")]

Src/Transforms/RestfulApply.cs

 using Kivii.Seeyon.Entities;
+using Kivii.Text;
 using Kivii.Web;
 using System;
 using System.Collections.Generic;
@@ -8,24 +9,41 @@ using System.Threading.Tasks;
 
 namespace Kivii.Seeyon.Transforms
 {
-    //[RequiresAnyRole(SystemRoles.Everyone)]
-    //[Api(Description = "提交OA申请表单")]
-    //public class ApplyRequest2 : RestfulExecution<Apply>
-    //{
-    //    public string EntityType { get; set; }
-    //    public object Form { get; set; }
-
-    //    public override object OnExecution(IRequest req, IResponse res)
-    //    {
-    //        EntityType.ThrowIfNull("请传入业务实体EntityType");
-    //        var type = Kivii.Text.AssemblyUtils.FindType(EntityType);
+    [RequiresAnyRole(SystemRoles.Everyone)]
+    [Api(Description = "提交OA申请表单")]
+    public class ApplyRequest2 : RestfulExecutionGeneric<Apply>
+    {
+        public string FormType { get; set; }
+        public JsonObject Form { get; set; }
 
-    //        var instance = Activator.CreateInstance(type) as IEntityIsSeeyonApply;
-    //        if (instance == null) return null;
-    //        var results = instance.OnSubmitApplyForm(Form);
-    //        return results;
-    //    }
-    //}
+        public override object OnExecutionGeneric<G>(IRequest req, IResponse res)
+        {
+            FormType.ThrowIfNull("请传入业务实体FormType");
+            var type = Kivii.Text.AssemblyUtils.FindType(FormType);
+            Dictionary<string,object> form = new Dictionary<string, object>();
+            foreach (var item in Form)
+            {
+                if (item.Key == "Metadata")
+                {
+                    var metadata = JsonObject.Parse(item.Value);
+                    JsonObject metadata2 = new JsonObject();
+                    foreach (var meta in metadata)
+                    {
+                        var val = metadata[meta.Key];
+                        metadata2[meta.Key] = val;
+                    }
+                    form[item.Key] = metadata2;
+                    continue;
+                }
+                form[item.Key] = Form[item.Key];
+            }
+            var formFormat = form.ConvertTo<G>();
+            var instance = Activator.CreateInstance(type) as IEntityIsSeeyonApply;
+            if (instance == null) return null;
+            var results = instance.OnSubmitApplyForm<G>(formFormat);
+            return results;
+        }
+    }
 
     [RequiresAnyRole(SystemRoles.Everyone)]
     [Api(Description = "提交OA申请表单")]