支持Long，Double，主键字符串的推测。

Author: Nukepayload2

Entities/EntityInferContext.vb

@@ -50,16 +50,32 @@ Public Class EntityInferContext
                                            Where tp.PropertyBasicInformation.Name = basicInformation.Name
                                            Into FirstOrDefault
                             If initExpr IsNot Nothing Then
-                                initExpr.InitialValue = initExpr.InitialValue.Replace("""", "")
-                                If initExpr.InitialValue.Contains(",") Then
-                                    initExpr.PropertyBasicInformation.IsQueryable = True
-                                ElseIf ClassIndex.ContainsKey(initExpr.InitialValue) Then
-                                    initExpr.PropertyBasicInformation.TypeNameOverride = ClassIndex(initExpr.InitialValue)
+                                Dim init = initExpr.InitialValue
+                                If init.StartsWith("""") AndAlso init.EndsWith("""") Then
+                                    initExpr.InitialValue = init.Substring(1, init.Length - 2)
+                                    If initExpr.InitialValue.Contains(",") Then
+                                        initExpr.PropertyBasicInformation.IsQueryable = True
+                                    ElseIf ClassIndex.ContainsKey(initExpr.InitialValue) Then
+                                        Dim refCls = ClassIndex(initExpr.InitialValue)
+                                        If refCls Is cls Then
+                                            initExpr.InitialValue = init
+                                            initExpr.PropertyBasicInformation.TypeNameOverride = Nothing
+                                        Else
+                                            initExpr.PropertyBasicInformation.TypeNameOverride = refCls
+                                        End If
+                                    End If
+                                Else
+                                    initExpr.InitialValue = $"{NamespaceBuilder.Name}Context.{initExpr.PropertyBasicInformation.RuntimeTypeName}.Find({init})"
                                 End If
                             End If
                         End If
                         '删除多余的属性定义
                         curProperties.Remove(curKey)
+                    Else
+                        If prop.Value.IsPrimaryKey Then
+                            Dim baseProp = prop.Value
+                            cls.BasePropertyInitialization.Add(New VBPropertyAssignmentDeclaration(baseProp.BasicInformation, SurroundInitExpr(cls.Name, "String")))
+                        End If
                     End If
                 Next
             Else
@@ -270,8 +286,16 @@ Public Class EntityInferContext
                 Return """" + initValue + """"
             Case "Guid"
                 Return $"New {typeName}(""{initValue}"")"
-            Case "Percentage"
-                Return $"Percentage.Parse(""{initValue}"")"
+            Case "Percentage", "BigInteger"
+                Return $"{typeName}.Parse(""{initValue}"")"
+            Case "Single"
+                Return initValue & "F"
+            Case "Long"
+                Return initValue & "L"
+            Case "ULong"
+                Return initValue & "UL"
+            Case "Decimal"
+                Return initValue & "D"
             Case Else
                 Return initValue
         End Select

Entities/VBNamespaceBuilder.vb

@@ -1,14 +1,14 @@
 Imports System.Text
 
 Public Class VBNamespaceBuilder
-    Dim name As String
+    Public Property Name As String
     Sub New(sb As IndentStringBuilder, name$)
         Me.sb = sb
-        Me.name = name
+        Me.Name = name
     End Sub
 
     Public Sub BeginBlock()
-        sb.IndentAppend("Namespace ").AppendLine(name).IncreaseIndent()
+        sb.IndentAppend("Namespace ").AppendLine(Name).IncreaseIndent()
     End Sub
 
     Friend sb As IndentStringBuilder

Help/HelpDataProvider.vb

@@ -163,26 +163,25 @@ Public Class HelpDataProvider
             Dim spa = rig.Split(","c)
             Dim sp = spa.First.Trim
             If sp.IsInteger Then
-                For Each tp In spa
+                For Each tp In spa.Skip(1)
                     If Not tp.Trim.IsInteger Then Return "IEnumerable(Of String)"
                 Next
-                Return "IEnumerable(Of Integer)"
+                Return $"IEnumerable(Of {FilterIntegerTypes(sp)})"
             ElseIf sp.IsFraction Then
-
-                For Each tp In spa
+                For Each tp In spa.Skip(1)
                     If Not tp.Trim.IsFraction Then Return "IEnumerable(Of String)"
                 Next
-                Return "IEnumerable(Of Single)"
+                Return $"IEnumerable(Of {FilterFractionTypes(sp)})"
             ElseIf sp.Replace("%", "").IsInteger Then
                 Return "IEnumerable(Of Percentage)"
             Else
                 Return "IEnumerable(Of String)"
             End If
         Else
             If rig.IsInteger Then
-                Return "Integer"
+                Return FilterIntegerTypes(rig)
             ElseIf rig.IsFraction Then
-                Return "Single"
+                Return FilterFractionTypes(rig)
             ElseIf {"true", "false", "yes", "no"}.Contains(rig.ToLowerInvariant) Then
                 Return "Boolean"
             ElseIf rig.Replace("%", "").IsInteger Then
@@ -195,4 +194,31 @@ Public Class HelpDataProvider
         End If
     End Function
 
+    Private Shared Function FilterFractionTypes(rig As String) As String
+        Dim sng = 0F, dbl = 0#, dec = 0D
+        If Single.TryParse(rig, sng) AndAlso Double.TryParse(rig, dbl) AndAlso Decimal.TryParse(rig, dec) Then
+            Dim sdbl = dbl.ToString
+            If sdbl = sng.ToString Then
+                Return "Single"
+            ElseIf dec.ToString = sdbl Then
+                Return "Double"
+            Else
+                Return "Decimal"
+            End If
+        Else
+            Return "String"
+        End If
+    End Function
+
+    Private Shared Function FilterIntegerTypes(rig As String) As String
+        If Integer.TryParse(rig, 0) Then
+            Return "Integer"
+        ElseIf Long.TryParse(rig, 0) Then
+            Return "Long"
+        ElseIf ULong.TryParse(rig, 0) Then
+            Return "ULong"
+        Else
+            Return "String"
+        End If
+    End Function
 End Class