efront 4.35.0 → 4.35.2

package/coms/compile/autoeval.js

@@ -276,7 +276,9 @@ function solve(body, ox, dx) {
             if (cache.length && p <= cache[cache.length - 1]) {
                 var p1 = p;
                 var pt1 = pt;
+                var p2 = p;
                 while (p1 <= cache[cache.length - 1]) {
+                    p2 = p1;
                     p1 = cache.pop();
                     pt1 = cache.pop();
                     bx = cache.pop();
@@ -285,7 +287,7 @@ function solve(body, ox, dx) {
                     if (p === p1 && p > powermap[">>>"]) cache.push(bx, pt1, p1);
                     continue;
                 }
-                var cx1 = make(body, bx, cx, p1 === p ? pt1 : null);
+                var cx1 = make(body, bx, cx, p === p2 ? pt1 : null);
                 if (cx1 !== cx) {
                     dx -= cx - cx1;
                     cx = cx1;
@@ -321,7 +323,7 @@ function solve(body, ox, dx) {
     if (cache.length) {
         var bx = cache[0];
         var pt = cache[1];
-        if (cx - bx >= 2) {
+        if (cx - bx >= 2 && cache[2] <= p) {
             cx = make(body, bx, cx, cache[1]);
         }
     }

package/coms/compile/autoeval_test.js

@@ -82,4 +82,7 @@ tc("hwb(120 0 0)", "#0f0");
 tc("hwb(120turn 0 0)", "#f00");
 tc("calc(10 / 20)", "0.5");
 tc("calc(10 / 20)", "0.5");
+tc("Math.log(f) / Math.LN2 / 10 | 0", "Math.log(f) * 0.14426950408889633 | 0");
+tc("Math.log(f) / Math.LN2 / 10 * 10 | 0", "Math.log(f) * 1.4426950408889634 | 0");
+tc("Math.log(f) / Math.LN2 / 10 ** 2 | 0", "Math.log(f) * 0.014426950408889633 | 0");
 // tf(path.join(__dirname, "../zimoli/spacechar_test.js"))

package/coms/pivot/login.xht

@@ -43,7 +43,7 @@
 <i18n-chooser></i18n-chooser>
 <script>
 
-    var hosts = data.getItem("hosts");
+    var hosts = data.getInstance("hosts");
     if (!hosts.length) hosts.push({ key: location.host, name: location.host });
     function main(host) {
         var fields = refilm`

package/package.json

@@ -1,24 +1,24 @@
-{
-  "name": "efront",
-  "version": "4.35.0",
-  "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
-  "main": "./coms/efront",
-  "directories": {
-    "test": "test"
-  },
-  "bin": {
-    "efront": "tools/run-efront.bat"
-  },
-  "scripts": {
-    "prepack": "node tools/build-efront.js --node --no-target&node public/efront build 文件系统.html"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/yunxu1019/efront.git"
-  },
-  "keywords": [
-    "efront"
-  ],
-  "author": "yunxu1019",
-  "license": "MIT"
-}
+{
+    "name": "efront",
+    "version": "4.35.2",
+    "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
+    "main": "public/efront.js",
+    "directories": {
+        "test": "test"
+    },
+    "bin": {
+        "efront": "public/efront.js"
+    },
+    "scripts": {
+        "prepack": "node tools/build-efront.js --node --no-target&node public/efront build 文件系统.html"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/yunxu1019/efront.git"
+    },
+    "keywords": [
+        "efront"
+    ],
+    "author": "yunxu1019",
+    "license": "MIT"
+}