增加方法

Author: linzhijun

csharp/ToolGood.Algorithm.WebAssembly/Program.cs

@@ -1,6 +1,8 @@
 namespace ToolGood.Algorithm.WebAssembly
 {
     using Microsoft.JSInterop;
+    using System.Reflection.Metadata;
+    using System.Text.Json;
     using ToolGood.Algorithm;
     using ToolGood.Algorithm.Enums;
 
@@ -101,8 +103,82 @@ public static string TryEvaluateDateTime(string exp, DateTime def, string data =
             }
             return ae.TryEvaluate(exp, def).ToString("yyyy-MM-dd HH:mm:ss");
         }
+        [JSInvokable]
+
+        public static String GetSimplifiedFormula(String formula, string data = null, string option = null)
+        {
+            AlgorithmEngine ae;
+            if (option == null) {
+                ae = new AlgorithmEngine();
+            } else {
+                var ops = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object>>(option);
+                ae = new AlgorithmEngine(bool.Parse(ops["IgnoreCase"].ToString()));
+                ae.UseExcelIndex = bool.Parse(ops["UseExcelIndex"].ToString());
+                ae.UseTempDict = bool.Parse(ops["UseTempDict"].ToString());
+                ae.UseLocalTime = bool.Parse(ops["UseLocalTime"].ToString());
+                ae.DistanceUnit = (DistanceUnitType)(int.Parse(ops["DistanceUnit"].ToString()));
+                ae.AreaUnit = (AreaUnitType)(int.Parse(ops["AreaUnit"].ToString()));
+                ae.VolumeUnit = (VolumeUnitType)(int.Parse(ops["VolumeUnit"].ToString()));
+                ae.MassUnit = (MassUnitType)(int.Parse(ops["MassUnit"].ToString()));
+            }
+            if (data != null) {
+                ae.AddParameterFromJson(data);
+            }
+            return ae.GetSimplifiedFormula(formula);
+        }
+
+
+        [JSInvokable]
+        public static string EvaluateFormula(string exp,string splitChars, string data = null, string option = null)
+        {
+            AlgorithmEngine ae;
+            if (option == null) {
+                ae = new AlgorithmEngine();
+            } else {
+                var ops = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object>>(option);
+                ae = new AlgorithmEngine(bool.Parse(ops["IgnoreCase"].ToString()));
+                ae.UseExcelIndex = bool.Parse(ops["UseExcelIndex"].ToString());
+                ae.UseTempDict = bool.Parse(ops["UseTempDict"].ToString());
+                ae.UseLocalTime = bool.Parse(ops["UseLocalTime"].ToString());
+                ae.DistanceUnit = (DistanceUnitType)(int.Parse(ops["DistanceUnit"].ToString()));
+                ae.AreaUnit = (AreaUnitType)(int.Parse(ops["AreaUnit"].ToString()));
+                ae.VolumeUnit = (VolumeUnitType)(int.Parse(ops["VolumeUnit"].ToString()));
+                ae.MassUnit = (MassUnitType)(int.Parse(ops["MassUnit"].ToString()));
+            }
+            if (data != null) {
+                ae.AddParameterFromJson(data);
+            }
+            return ae.EvaluateFormula(exp, splitChars.ToCharArray());
+        }
+
+        [JSInvokable]
+        public static bool IsKeywords(string parameter)
+        {
+            return AlgorithmEngineHelper.IsKeywords(parameter);
+        }
+
+        [JSInvokable]
+        public static string GetDiyNames(String exp)
+        {
+            return JsonSerializer.Serialize(AlgorithmEngineHelper.GetDiyNames(exp));
+        }
 
 
+        [JSInvokable]
+        public static string UnitConversion(decimal src, string oldSrcUnit, string oldTarUnit, string name = null)
+        {
+            Dictionary<string,object> dic = new Dictionary<string,object>();
+            try {
+                var r = AlgorithmEngineHelper.UnitConversion(src, oldSrcUnit, oldTarUnit, name);
+                dic["code"] = 0;
+                dic["result"] = r;
+
+            } catch (Exception ex) {
+                dic["code"] = 1;
+                dic["error"] = ex.Message;
+            }
+            return JsonSerializer.Serialize(dic);
+        }
 
     }
 }

csharp/ToolGood.Algorithm2.WebTest/wwwroot/ToolGood.Algorithm.js

@@ -24,8 +24,17 @@ AlgorithmEngine = class {
         if (typeof def == "number") { return this.TryEvaluateNumber(exp, def, data); }
         if (typeof def == "boolean") { return this.TryEvaluateBool(exp, def, data); }
         if (typeof def == "object" && def instanceof Date) { return this.TryEvaluateDateTime(exp, def, data); }
-
         return this.TryEvaluateString(exp, def, data);
     }
 
-};
+    GetSimplifiedFormula = function (exp, data) { return DotNet.invokeMethod('ToolGood.Algorithm.WebAssembly', 'GetSimplifiedFormula', exp, data, JSON.stringify(this)); }
+    EvaluateFormula = function (exp, splitChars, data) { return DotNet.invokeMethod('ToolGood.Algorithm.WebAssembly', 'EvaluateFormula', exp, splitChars, data, JSON.stringify(this)); }
+};
+AlgorithmEngineHelper = new class {
+    IsKeywords = function (parameter) { return DotNet.invokeMethod('ToolGood.Algorithm.WebAssembly', 'IsKeywords', parameter); }
+    GetDiyNames = function (exp) { return JSON.parse(DotNet.invokeMethod('ToolGood.Algorithm.WebAssembly', 'GetDiyNames', exp)); }
+    UnitConversion = function (src, oldSrcUnit, oldTarUnit, name) { return JSON.parse(DotNet.invokeMethod('ToolGood.Algorithm.WebAssembly', 'UnitConversion', src, oldSrcUnit, oldTarUnit, name)); }
+
+}();
+
+

csharp/ToolGood.Algorithm2.WebTest/wwwroot/_framework/ToolGood.Algorithm.WebAssembly.pdb.gz

@@ -1,7 +1,7 @@
 {
   "mainAssemblyName": "ToolGood.Algorithm.WebAssembly",
   "resources": {
-    "hash": "sha256-+6jR/+4mhj6IYlEaRHA5fixqeML72rqIBxlvRpfZsaY=",
+    "hash": "sha256-g87qVupByI7CTUkn65Ezj+hOSRTQO9xWsmux9TimU+A=",
     "jsModuleNative": {
       "dotnet.native.8.0.4.rkw194kvb3.js": "sha256-ju0+XWE0ihz554eKEj0HQ8Opa61xpbUIaX5/MNo8we4="
     },
@@ -209,12 +209,12 @@
       "mscorlib.wasm": "sha256-VCfYgt1mcjITabSTosCDVZ+68ea3Z7kakTFaLNLG+18=",
       "netstandard.wasm": "sha256-YOZxxR9PM3Dltcijfb0Q4FD39DkWZbZ1e2ScbZDvWJ4=",
       "System.Private.CoreLib.wasm": "sha256-NrT1QkAzVU//2wgK9vXdq77lCGvLJ4IOZ+Aegesyanc=",
-      "ToolGood.Algorithm.wasm": "sha256-CfDWYV2K9/n7chBK3fwN31VUi/kT+gZKG7Ty+dq2pEE=",
-      "ToolGood.Algorithm.WebAssembly.wasm": "sha256-EWod2UabayYFT5UPii9TsFu2sh90lVC5jGtM4YeD2cY="
+      "ToolGood.Algorithm.wasm": "sha256-3xkLwHcQuLsJ/6SsJlfTeeACZecAHO3d8L2sgij1Hn8=",
+      "ToolGood.Algorithm.WebAssembly.wasm": "sha256-cbPrVyJ6kMQH7BTEL0t/HVc42pKEmNEvA5B7i3Xhy+Y="
     },
     "pdb": {
-      "ToolGood.Algorithm.pdb": "sha256-/RAmiQrZkOcWJewe8uXuncwBeEMEMeTBXOkpw6WwB8M=",
-      "ToolGood.Algorithm.WebAssembly.pdb": "sha256-0DIQ1pqepWsS/etk568iKUnz03OVB4IW8Av9gG+wLQk="
+      "ToolGood.Algorithm.pdb": "sha256-C+rmcQ+rfFAFFJI1p9v5Obd4yp0YPYN6i3SJZNVHVgY=",
+      "ToolGood.Algorithm.WebAssembly.pdb": "sha256-6mIKqNTrfOMcFQ68Hs74SZ8MSwXolbBckIX1H8B2+NE="
     }
   },
   "cacheBootResources": true,