1.1.0.10

Former-commit-id: 9084ee3ae7e0f8ad0c6c7617acbcf85b8d16979f
Former-commit-id: 32734b77aa4e2f85b1cf2bf88bd47192bbc301ef

projects/Infrastructure/Views/Shared/Search.cshtml

@@ -4,31 +4,46 @@
 @foreach (var prop in ViewData.ModelMetadata.Properties.Where(pm => pm.ShowForEdit))
 {
     var uihit = prop.TemplateHint ?? prop.DataTypeName;
-    var name="query."+prop.PropertyName;
+    var name = "query." + prop.PropertyName;
-	if (prop.PropertyName == "Id" || prop.PropertyName == "DisplayOrder" || uihit == "ImageUrl"||uihit=="MultiSelectList")
+    if (prop.PropertyName == "Id" || prop.PropertyName == "DisplayOrder" || uihit == "ImageUrl" || uihit == "MultiSelectList")
     {
         continue;
     }
     else
     {
-    <div class="col-12 col-sm-6 col-md-4 col-lg-3">
+<div class="col-12 col-sm-6 col-md-4 col-lg-3">
     <div class="form-group row">
-            <label class="col-sm-3 col-form-label" for="@prop.PropertyName" data-ui="@uihit">@prop.GetDisplayName():</label>
+        <label class="col-sm-3 col-form-label" for="@prop.PropertyName" data-ui="@uihit @prop.UnderlyingOrModelType">@prop.GetDisplayName():</label>
         <div class="col-sm-9">
-				@if (prop.ModelType == typeof(string)){
+            @if (prop.ModelType == typeof(string) ||
+            prop.UnderlyingOrModelType == typeof(Int32) ||
+            prop.UnderlyingOrModelType == typeof(Int64)||
+            prop.UnderlyingOrModelType == typeof(System.Single)||
+            prop.UnderlyingOrModelType == typeof(System.Double)||
+            prop.UnderlyingOrModelType == typeof(System.Decimal))
+                    {
             @Html.TextBox(prop.PropertyName, null, new { name=name,@class = inputClass })
             }
-                else if(prop.UnderlyingOrModelType == typeof(bool))
+            else if(prop.IsNullableValueType&&prop.UnderlyingOrModelType == typeof(bool))
             {
             var items=new List<SelectListItem>(){new SelectListItem{ Value="true",Text="是"},new SelectListItem{Value="false",Text="否"}};
             var list = new SelectList(items, "Value", "Text");
             @Html.DropDownList(prop.PropertyName, list,"请选择", new { @class = inputClass })
             }
-                else{
+            else if(prop.IsNullableValueType&&prop.IsEnum)
+            {
+            var items=Enum.GetValues(prop.UnderlyingOrModelType).Cast<Enum>()
+            .Select(o => new SelectListItem { Value = o.GetValue().ToString(), Text = o.GetDisplayName() })
+            .ToList();
+            var list = new SelectList(items, "Value", "Text");
+            @Html.DropDownList(prop.PropertyName, list,"请选择", new { @class = inputClass })
+            }
+            else
+            {
             @Html.Editor(prop.PropertyName, prop.DataTypeName ?? prop.TemplateHint, prop.AdditionalValues)
             }
         </div>
     </div>
-    </div>
+</div>
-    }
+}
 }

projects/Platform/Platform.csproj

@@ -4,7 +4,7 @@
 		<SatelliteResourceLanguages>Zh-CN</SatelliteResourceLanguages>
 		<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
 		<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
-		<Version>1.1.0.9</Version>
+		<Version>1.1.0.10</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Hangfire.AspNetCore" Version="1.7.18" />