修改

Author: linzhijun

csharp/ToolGood.Algorithm.WebAssembly/Program.cs

@@ -80,7 +80,7 @@ public static bool TryEvaluateBool(string exp, bool def, string data = null, str
         }
 
         [JSInvokable]
-        public static DateTime TryEvaluateDateTime(string exp, DateTime def, string data = null, string option = null)
+        public static string TryEvaluateDateTime(string exp, DateTime def, string data = null, string option = null)
         {
             AlgorithmEngine ae;
             if (option == null) {
@@ -99,7 +99,7 @@ public static DateTime TryEvaluateDateTime(string exp, DateTime def, string data
             if (data != null) {
                 ae.AddParameterFromJson(data);
             }
-            return ae.TryEvaluate(exp, def);
+            return ae.TryEvaluate(exp, def).ToString("yyyy-MM-dd HH:mm:ss");
         }
 
 

csharp/ToolGood.Algorithm2.WebTest/Pages/Test.cshtml

@@ -50,9 +50,9 @@
 
 
             var e = engine.TryEvaluate("e", 0.0);
-            assert.equal(Math.E, e, 11);
+            assert.equal(Math.round(Math.E, 10), Math.round(e, 10));
             e = engine.TryEvaluate("pi", 0.0);
-            assert.equal(Math.PI, e, 11);
+            assert.equal(Math.round(Math.PI, 10), Math.round(e, 10));
 
             var b = engine.TryEvaluate("true", false);
             assert.equal(true, b);
@@ -66,9 +66,9 @@
             assert.equal(2, b1);
 
             var b2 = engine.TryEvaluate("pi*4", 0.0);
-            assert.equal(Math.PI * 4, b2, 10);
+            assert.equal(Math.round(Math.PI * 4, 10), Math.round(b2, 10));
             b2 = engine.TryEvaluate("e*4", 0.0);
-            assert.equal(Math.E * 4, b2, 10);
+            assert.equal(Math.round(Math.E * 4, 10), Math.round(b2, 10));
 
             var s = engine.TryEvaluate("'aa'&'bb'", "");
             assert.equal("aabb", s);
@@ -86,9 +86,10 @@
             assert.equal(2, r);;
 
             var dt = engine.TryEvaluate("'2016-1-1'+1", new Date());
-            assert.equal(new Date("2016-1-2"), dt);
+            assert.equal("2016-01-02 00:00:00", dt);
             dt = engine.TryEvaluate("'2016-1-1'+9*'1:0'", new Date());
-            assert.equal(new Date("2016-1-1 9:0"), dt);;
+            assert.equal("2016-01-01 09:00:00", dt);
+
 
             var value = engine.TryEvaluate("1 > (-2)", false);
             assert.equal(value, true);

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

@@ -1,7 +1,7 @@
 {
   "mainAssemblyName": "ToolGood.Algorithm.WebAssembly",
   "resources": {
-    "hash": "sha256-rnRmRrfkasTXs0ufkFvB4PW1GM+8htymKTN3PhAZvlo=",
+    "hash": "sha256-+6jR/+4mhj6IYlEaRHA5fixqeML72rqIBxlvRpfZsaY=",
     "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-bC/eP0ZrFQ2n8TIzFlE2Fy7Wf5be+mkv2OOPtwRSgrg=",
-      "ToolGood.Algorithm.WebAssembly.wasm": "sha256-sYil+QMGlnnyzX4T22sDpkc75/ygx4HeMlUr3m8SyB0="
+      "ToolGood.Algorithm.wasm": "sha256-CfDWYV2K9/n7chBK3fwN31VUi/kT+gZKG7Ty+dq2pEE=",
+      "ToolGood.Algorithm.WebAssembly.wasm": "sha256-EWod2UabayYFT5UPii9TsFu2sh90lVC5jGtM4YeD2cY="
     },
     "pdb": {
-      "ToolGood.Algorithm.pdb": "sha256-h7jLgt9uwB47aBSX0cZOxGImlmzGk6aO1qlnpdr7fZc=",
-      "ToolGood.Algorithm.WebAssembly.pdb": "sha256-jQA2DLoTcuJJkR2XJIxWtZosTy3xqD68Ecajdc9DavM="
+      "ToolGood.Algorithm.pdb": "sha256-/RAmiQrZkOcWJewe8uXuncwBeEMEMeTBXOkpw6WwB8M=",
+      "ToolGood.Algorithm.WebAssembly.pdb": "sha256-0DIQ1pqepWsS/etk568iKUnz03OVB4IW8Av9gG+wLQk="
     }
   },
   "cacheBootResources": true,