efront 4.0.35 → 4.0.38

package/coms/compile/scanner2.js

@@ -181,7 +181,7 @@ class Code extends Array {
 var avoidMap = null;
 var typeMap = Object.create(null);
 function scan(text, type = "js", lastIndex = 0) {
-    if (isFinite(type)) lastIndex = +type, type = arguments[1];
+    if (isFinite(type)) lastIndex = +type, type = arguments[2] || type;
     var program = typeMap[type];
     if (!program) switch (type) {
         case "html":

package/coms/compile/unstruct.js

@@ -1,4 +1,4 @@
-var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, isEval, createString, skipAssignment, skipSentenceQueue, isHalfSentence, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
+var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, canbeTemp: _canbeTemp, isEval, createString, skipAssignment, skipSentenceQueue, isHalfSentence, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
 var scanner2 = require("./scanner2");
 var RE = { type: STRAP, text: "@re" };// if (_) return
 var RZ = { type: STRAP, text: "@rz" };// if (!_) return
@@ -871,24 +871,6 @@ var canbeOnce = function (body) {
     }
     return true;
 };
-var canbeTemp = function (body) {
-    var cx = 0, dx = body.length - 1;
-    while (cx < dx) {
-        if (body[cx].type & (SPACE | COMMENT)) {
-            cx++;
-            continue;
-        }
-        if (body[dx].type & (SPACE | COMMENT)) {
-            dx--;
-            continue;
-        }
-        break;
-    }
-    if (body[cx] !== body[dx]) return false;
-    var o = body[cx];
-    if (!o) return false;
-    return o.type === EXPRESS && (strip || !/[\.\[]/.test(o.text)) || o.type === VALUE || o.type === QUOTED && !o.length;
-};
 var _express = function (body, getname, ret) {
     if (canbeTemp(body)) {
         var q = [];
@@ -1316,6 +1298,9 @@ function toqueue(body, getname, ret = false, result = []) {
 }
 var ret_ = '';
 var strip = false;
+var canbeTemp = function (body) {
+    return _canbeTemp(body, strip);
+};
 module.exports = function (body, newname, ret) {
     strip = body.strip;
     if (ret) ret = isString(ret) ? ret : newname();

package/coms/zimoli/zimoli.js

@@ -58,7 +58,7 @@ if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
             if (currentHash && currentHash === targetHash) return;
             var targetHashIndex = targetHash.indexOf("#" + current_history);
             if (targetHashIndex < 0) return;
-            var targetpath = targetHash.slice(targetHashIndex + current_history.length + 1);
+            var targetpath = targetHash.slice(targetHashIndex + current_history.replace(/\/$/, '').length + 1);
             targetpath = decodeURI(targetpath);
             go(targetpath);
             return;

package/docs/main.xht

@@ -111,7 +111,8 @@
             closed: true,
             children: [
                 { name: i18n`字符集检查`, path: "/工具/字符集检查" },
-                { name: i18n`国际化`, path: "/工具/国际化" }
+                { name: i18n`国际化`, path: "/工具/国际化" },
+                { name: i18n`数值换算`, path: "/工具/数值换算" },
             ]
         }
     ];

package/docs//345/267/245/345/205/267//346/225/260/345/200/274/346/215/242/347/256/227.xht

@@ -0,0 +1,45 @@
+<style></style>
+<div>
+    <field -repeat="f in formats" -src="[f,value]"></field>
+</div>
+<script>
+    var _value = 0;
+    var parseFloat = (a, b) => new BigNumber(a, b);
+    var value = {
+        get 十进制() {
+            return _value;
+        },
+        set 十进制(v) {
+            _value = parseFloat(v)
+        },
+        get 十六进制() {
+            return _value.toString(16);
+        },
+        set 十六进制(v) {
+            _value = parseFloat(v, 16);
+        },
+        get 二进制() {
+            return _value.toString(2);
+        },
+        set 二进制(v) {
+            _value = parseFloat(v, 2);
+        },
+        get 八进制() {
+            return _value.toString(8)
+        },
+        set 八进制(v) {
+            _value = parseFloat(v, 8)
+        },
+        get 三十六进制() {
+            return _value.toString(36);
+        },
+        set 三十六进制(v) {
+            _value = parseFloat(v, 36);
+        },
+
+    };
+    var formats = Object.getOwnPropertyNames(value).map(k => {
+        return { name: k, key: k };
+    });
+
+</script>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.35",
+    "version": "4.0.38",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {