Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js

@@ -17,7 +17,7 @@ const stateOptions = [
   { value: 5, label: "已扣减" },
   { value: 6, label: "已提交扣减" },
 ];
-const state = { title: "状态", type: "string", input: "select", options: stateOptions };
+const state = { title: "状态", type: "number", input: "select", options: stateOptions };
 const state2 = Object.assign(Object.assign({}, state), { options: stateOptions.filter((a) => parseInt(a.value) > 0) });
 const state3 = Object.assign(Object.assign({}, state), { options: stateOptions.filter((a) => parseInt(a.value) > 3) });
 

code/src/Shared/Win.Sfs.Shared/Filter/FilterExtensions.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text.Json;
@@ -77,6 +78,7 @@ namespace Win.Sfs.Shared.Filter
                 //var constant = Expression.Constant(filterCondition.Value);//创建常数
 
                 ConstantExpression constant = null;
+
                 if (filterCondition.Action != EnumFilterAction.In && filterCondition.Action != EnumFilterAction.NotIn)
                 {
                     constant = CreateConstantExpression(member.Type, filterCondition.Value);
@@ -150,12 +152,13 @@ namespace Win.Sfs.Shared.Filter
                 if (propertyType.IsGenericType &&
                     propertyType.GetGenericTypeDefinition() == typeof(Nullable<>))
                 {
-                    var objValue = Convert.ChangeType(value, propertyType.GetGenericArguments()[0]);
-                    constant = Expression.Constant(objValue);
+                    var type = propertyType.GetGenericArguments()[0];
+                    var objValue = type.IsEnum ? (Enum)Enum.Parse(type, value, true) : Convert.ChangeType(value, type);
+                    constant = Expression.Constant(new NullableConverter(propertyType).ConvertFrom(objValue));
                 }
                 else if (propertyType.IsEnum)
                 {
-                    var enumValue = (Enum)Enum.Parse(propertyType, value, true);
+                    var enumValue = (Enum?)Enum.Parse(propertyType, value, true);
                     constant = Expression.Constant(enumValue);
                 }
                 else
@@ -174,7 +177,11 @@ namespace Win.Sfs.Shared.Filter
 
             return constant;
         }
-
+        public static T? CreateNullable<T>(this T item) where T : struct
+        {
+            T? v = (T?)(new NullableConverter(typeof(T?))).ConvertFrom(item);
+            return v;
+        }
         private static Expression<Func<T, bool>> GetExpressionLikeMethod<T>(string methodName,
             FilterCondition filterCondition)
         {