fix

Author: linzhijun

csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.cs

@@ -487,10 +487,10 @@ public override Operand Calculate(AlgorithmEngine work)
             var args1 = func1.Calculate(work); if (args1.IsError) { return args1; }
             var args2 = func2.Calculate(work); if (args2.IsError) { return args2; }
 
-            if (args1.IsNull) {
-                if (args2.IsNull) return args1;
+            if (args1.Type == OperandType.NULL) {
+                if (args2.Type == OperandType.NULL) return args1;
                 return args2.ToText("Function '{0}' parameter {1} is error!", "&", 2);
-            } else if (args2.IsNull) {
+            } else if (args2.Type == OperandType.NULL) {
                 return args1.ToText("Function '{0}' parameter {1} is error!", "&", 1);
             }
             if (args1.Type != OperandType.TEXT) { args1 = args1.ToText("Function '{0}' parameter {1} is error!", "&", 1); if (args1.IsError) { return args1; } }

csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.flow.cs

@@ -110,11 +110,11 @@ public override Operand Calculate(AlgorithmEngine work)
         {
             var args1 = func1.Calculate(work);
             if (func2 != null) {
-                if (args1.IsNull) { return func2.Calculate(work); }
+                if (args1.Type == OperandType.NULL) { return func2.Calculate(work); }
                 if (args1.Type == OperandType.TEXT && args1.TextValue == null) { return func2.Calculate(work); }
                 return args1;
             }
-            if (args1.IsNull) { return Operand.True; }
+            if (args1.Type == OperandType.NULL) { return Operand.True; }
             if (args1.Type == OperandType.TEXT && args1.TextValue == null) { return Operand.True; }
             return Operand.False;
         }
@@ -134,11 +134,11 @@ public override Operand Calculate(AlgorithmEngine work)
         {
             var args1 = func1.Calculate(work);
             if (func2 != null) {
-                if (args1.IsNull || args1.IsError) { return func2.Calculate(work); }
+                if (args1.Type == OperandType.NULL || args1.IsError) { return func2.Calculate(work); }
                 if (args1.Type == OperandType.TEXT && args1.TextValue == null) { return func2.Calculate(work); }
                 return args1;
             }
-            if (args1.IsNull || args1.IsError) { return Operand.True; }
+            if (args1.Type == OperandType.NULL || args1.IsError) { return Operand.True; }
             if (args1.Type == OperandType.TEXT && args1.TextValue == null) { return Operand.True; }
             return Operand.False;
         }
@@ -252,7 +252,7 @@ public Function_ISNULLOREMPTY(FunctionBase func1) : base(func1)
         public override Operand Calculate(AlgorithmEngine work)
         {
             var args1 = func1.Calculate(work);
-            if (args1.IsNull) { return Operand.True; }
+            if (args1.Type == OperandType.NULL) { return Operand.True; }
             if (args1.Type != OperandType.TEXT) { args1 = args1.ToText("Function '{0}' parameter {1} is error!", "IsNullOrEmpty", 1); if (args1.IsError) { return args1; } }
             return Operand.Create(string.IsNullOrEmpty(args1.TextValue));
         }
@@ -271,7 +271,7 @@ public Function_ISNULLORWHITESPACE(FunctionBase func1) : base(func1)
         public override Operand Calculate(AlgorithmEngine work)
         {
             var args1 = func1.Calculate(work);
-            if (args1.IsNull) { return Operand.True; }
+            if (args1.Type == OperandType.NULL) { return Operand.True; }
             if (args1.Type != OperandType.TEXT) { args1 = args1.ToText("Function '{0}' parameter {1} is error!", "IsNullOrWhiteSpace", 1); if (args1.IsError) { return args1; } }
             return Operand.Create(string.IsNullOrWhiteSpace(args1.TextValue));
         }

csharp/ToolGood.Algorithm/Operand.cs

@@ -45,11 +45,6 @@ public abstract class Operand
         /// </summary>
         public static readonly Operand Zero = Operand.Create(0);
 
-        /// <summary>
-        /// 是否为空
-        /// </summary>
-        public virtual bool IsNull => false;
-
         /// <summary>
         /// 是否出错
         /// </summary>
@@ -65,11 +60,6 @@ public abstract class Operand
         /// </summary>
         public abstract OperandType Type { get; }
 
-        /// <summary>
-        /// 值
-        /// </summary>
-        public virtual object Value => throw new NotImplementedException();
-
         /// <summary>
         /// 数字值
         /// </summary>
@@ -619,8 +609,6 @@ internal abstract class Operand<T> : Operand
     {
         protected T _value { get; private set; }
 
-        public override object Value => _value;
-
         public Operand(T obj)
         {
             _value = obj;
@@ -879,7 +867,6 @@ public OperandError(string msg)
     internal sealed class OperandNull : Operand
     {
         public override OperandType Type => OperandType.NULL;
-        public override bool IsNull => true;
         public override string ToString() { return "null"; }
     }
 
@@ -974,5 +961,6 @@ public OperandKeyValue(KeyValue obj) : base(obj)
         }
 
         public override OperandType Type => OperandType.ARRARYJSON;
+        public KeyValue Value => _value;
     }
 }