浏览代码

Implmented EntityForm to BaseEntityForm for Avalonia App

frogsoftware 1 周之前
父节点
当前提交
9aaaa5d789

+ 2 - 2
PRS.Avalonia/PRS.Avalonia/Components/FormsEditor/DigitalFormsHostViewModel.cs

@@ -17,7 +17,7 @@ namespace PRS.Avalonia.DigitalForms;
 public class DigitalFormCacheModel<TParent, TParentLink, TForm> : ISerializeBinary
     where TParent : Entity, IRemotable, IPersistent, new()
     where TParentLink : EntityLink<TParent>, new()
-    where TForm : EntityForm<TParent, TParentLink, TForm>, IRemotable, IPersistent, IDigitalFormInstance<TParentLink>, new()
+    where TForm : BaseEntityForm<TParent, TParentLink, TForm>, IRemotable, IPersistent, IDigitalFormInstance<TParentLink>, new()
 {
     public TParent Parent { get; set; }
 
@@ -56,7 +56,7 @@ public partial class DigitalFormsHostViewModel<TModel, TShell, TParent, TParentL
     where TShell : DigitalFormInstanceShell<TModel, TParent, TParentLink, TForm>, new()
     where TParent : Entity, IRemotable, IPersistent, new()
     where TParentLink : EntityLink<TParent>, new()
-    where TForm : EntityForm<TParent, TParentLink, TForm>, IRemotable, IPersistent, IDigitalFormInstance<TParentLink>, new()
+    where TForm : BaseEntityForm<TParent, TParentLink, TForm>, IRemotable, IPersistent, IDigitalFormInstance<TParentLink>, new()
 {
     public override string Title => Form?.Description ?? "View Form";
 

+ 1 - 1
PRS.Avalonia/PRS.Avalonia/Components/FormsList/FormsList.axaml.cs

@@ -209,7 +209,7 @@ public partial class FormsList : UserControl
     }
 
     public static async Task<DigitalFormShell?> SelectForm<TForm, TParent, TLink>(DigitalFormModel formModel)
-        where TForm : EntityForm<TParent, TLink, TForm>
+        where TForm : BaseEntityForm<TParent, TLink, TForm>
         where TParent : Entity, new()
         where TLink : EntityLink<TParent>, new()
     {

+ 1 - 1
PRS.Avalonia/PRS.Avalonia/Repositories/DigitalFormInstance/DigitalFormInstanceShell.cs

@@ -9,7 +9,7 @@ public abstract class DigitalFormInstanceShell<TModel, TParent, TParentLink, TFo
     where TModel : ICoreRepository
     where TParent : Entity
     where TParentLink : BaseObject, IEntityLink<TParent>, new()
-    where TForm : EntityForm<TParent, TParentLink, TForm>, new()
+    where TForm : BaseEntityForm<TParent, TParentLink, TForm>, new()
 
 {
     public string Number

+ 2 - 2
PRS.DigitalKey/PRS.DigitalKey.Android/PRS.DigitalKey.Android.csproj

@@ -17,8 +17,8 @@
     </PropertyGroup>
     
     <ItemGroup>
-        <PackageReference Include="Avalonia.Android" Version="11.2.2" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.2" />
+        <PackageReference Include="Avalonia.Android" Version="11.3.3" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.3" />
         <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.14" />
     </ItemGroup>
 

+ 2 - 2
PRS.DigitalKey/Prs.DigitalKey.Desktop/Prs.DigitalKey.Desktop.csproj

@@ -25,8 +25,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
-      <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.2" />
+      <PackageReference Include="Avalonia.Desktop" Version="11.3.3" />
+      <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.3" />
     </ItemGroup>
     
 </Project>