修改 添加返回json值

Author: toolgood

ToolGood.Algorithm/AlgorithmEngine.csharp.cs

@@ -88,6 +88,17 @@ private Operand F_Json(List<Operand> arg)
             return new Operand(OperandType.JSON, json);
         }
 
+        /// <summary>
+        /// json格式 返回值
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        protected Operand JsonOperand(string text)
+        {
+            var json = JsonMapper.ToObject(text);
+            return new Operand(OperandType.JSON, json);
+        }
+
 
         private Operand F_P(List<Operand> arg)
         {

ToolGood.Algorithm/ToolGood.Algorithm.csproj

@@ -2,32 +2,30 @@
 
   <PropertyGroup>
     <Description>ToolGood.Algorithm支持四则运算、Excel函数，并支持自定义参数。</Description>
-    <Copyright>Copyright 2017-2018 ToolGood</Copyright>
+    <Copyright>Copyright 2017-2020 ToolGood</Copyright>
     <AssemblyTitle>ToolGood.Algorithm</AssemblyTitle>
     <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>ToolGood</Authors>
-    <TargetFrameworks>net40;net45;netstandard2.0;</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard2.0;netstandard2.1;</TargetFrameworks>
     <AssemblyName>ToolGood.Algorithm</AssemblyName>
     <AssemblyOriginatorKeyFile>ToolGood.Algorithm.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>ToolGood.Algorithm</PackageId>
     <PackageTags>algorithm;excel</PackageTags>
     <PackageProjectUrl>https://github.com/toolgood/ToolGood.Algorithm</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/toolgood/ToolGood.Algorithm/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/toolgood/ToolGood.Algorithm</RepositoryUrl>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dotnet</PackageTargetFallback>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(PackageTargetFallback);dotnet</PackageTargetFallback>
     <AutoUnifyAssemblyReferences Condition="'$(TargetFramework)' == 'net40'">false</AutoUnifyAssemblyReferences>
     <RootNamespace>ToolGood.Algorithm</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <FileVersion>1.3.3.4</FileVersion>
-    <Version>1.3.3.4</Version>
+    <Version>1.3.3.5</Version>
     <PackageReleaseNotes></PackageReleaseNotes>
     <Product>ToolGood.Algorithm</Product>
-    <AssemblyVersion>1.3.3.4</AssemblyVersion>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
@@ -42,6 +40,13 @@
     <Reference Include="System.Web" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
   </PropertyGroup>
@@ -61,7 +66,10 @@
     <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
         <DocumentationFile>bin\Release\netstandard2.0\ToolGood.Algorithm.xml</DocumentationFile>
     </PropertyGroup>
-    
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
+    <DocumentationFile>bin\Release\netstandard2.1\ToolGood.Algorithm.xml</DocumentationFile>
+  </PropertyGroup>
+  
     <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net40|AnyCPU'">
         <DocumentationFile>bin\Debug\net40\ToolGood.Algorithm.xml</DocumentationFile>
     </PropertyGroup>
@@ -71,7 +79,9 @@
     <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
         <DocumentationFile>bin\Debug\netstandard2.0\ToolGood.Algorithm.xml</DocumentationFile>
     </PropertyGroup>
- 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.1|AnyCPU'">
+    <DocumentationFile>bin\Debug\netstandard2.1\ToolGood.Algorithm.xml</DocumentationFile>
+  </PropertyGroup>
 
 
 </Project>

ToolGood.Algorithm/_base/Operand.cs

@@ -86,7 +86,7 @@ public Operand(List<Operand> value)
 
         internal Operand(string opd)
         {
-            if (opd==null) {
+            if (opd == null) {
                 this.Type = OperandType.STRING;
                 this.Value = opd;
             }
@@ -148,6 +148,11 @@ public double NumberValue {
                 if (Type == OperandType.BOOLEAN) {
                     return (bool)Value ? 1 : 0;
                 }
+                if (Value is string) {
+                    if (double.TryParse(Value.ToString(), out double d)) {
+                        return d;
+                    }
+                }
                 return (double)Value;
             }
         }
@@ -189,7 +194,7 @@ public List<Operand> GetValueList()
             if (Value is List<Operand>) {
                 var ls = Value as List<Operand>;
                 foreach (var item in ls) {
-                     if (item.Type == OperandType.ARRARY) {
+                    if (item.Type == OperandType.ARRARY) {
                         list.AddRange(item.GetValueList());
                     } else {
                         list.Add(item);