efront 4.3.5 → 4.3.7

package/coms/basic/Speed.js

@@ -103,7 +103,7 @@ inertia.MOVING = 移动;
 inertia.SLOWING_DWON = 减速;
 inertia.REBOUNDING = 回弹;
 inertia.DOCKING = 停靠;
-var performance = window.performance;
+var performance = this.performance;
 if (!performance || !performance.now) performance = Date;
 var now = performance.now;
 if (!performance.now) performance.now = function () {

package/coms/basic/analyse.js

@@ -309,5 +309,3 @@ function main(text) {
     format();
     return result;
 }
-window.wordslike = wordslike;
-window.words = words;

package/coms/basic/i18n.js

@@ -2,7 +2,7 @@
 var languageMap = {};
 var languageIndex = 0;
 function i18n(arg) {
-    if (typeof arg === 'string') arg = arguments;
+    if (typeof arg === 'string' || !isArrayLike(arg)) arg = arguments;
     return arg[isFinite(this) ? this : languageIndex];
 };
 i18n.lang = function (type) {

package/coms/basic/isArrayLike.js

@@ -1,3 +1,4 @@
+var window = this;
 function isArrayLike(a) {
     if (a === null || a === window || typeof a !== 'object' || isNode(a)) return false;
     if (isFinite(a.length)) {

package/coms/compile/common.js

@@ -420,19 +420,6 @@ var snapExpressFoot = function (o) {
     }
     return o;
 };
-var mustBeYield = function (o) {
-    if (!o.next) return;
-    var mustyield = false;
-    if (o.next.type === STRAP && !/^(?:instanceof|in|of|from|as)$/.test(o.next.text)
-        || o.next.type === STAMP && /[!~]/.test(o.next.text)
-        || o.next.type === EXPRESS && !/^[\.\[]/.test(o.next.text)
-        || o.next.type & (VALUE | QUOTED | SCOPED)
-    ) {
-        mustyield = true;
-    }
-    return mustyield;
-
-}
 var createScoped = function (parsed, wash) {
     var used = Object.create(null); var vars = Object.create(null), lets = vars;
     var scoped = [], funcbody = scoped, argscope = scoped, thisscope = scoped;
@@ -1332,14 +1319,40 @@ var canbeTemp = function (body, strip = false) {
     if (!o) return false;
     return o.type === EXPRESS && (strip || !/[\.\[]/.test(o.text)) || o.type === VALUE || o.type === QUOTED && !o.length;
 };
-
+var pickArgument = function (o) {
+    var res = [];
+    var t = o && o.prev, p = o;
+    while (t && (t.type !== STAMP || !/^[,;]$/.test(t.text))) {
+        if (p.isprop) {
+            p = t.prev;
+            if (!p || !p.isprop) break;
+        }
+        res.push(t);
+        p = t;
+        t = t.prev;
+    }
+    while (o && (o.type !== STAMP || !/^[,;]$/.test(o.text))) {
+        res.push(o);
+        var n = o;
+        o = o.next;
+        if (o && o.isprop) {
+            if (!n.isprop) break;
+        }
+    }
+    return res;
+};
 var pickSentence = function (o) {
     if (!o) return [];
     if (o && o.type & (SPACE | COMMENT) && o.prev) o = o.prev;
     if (o && o.type === STAMP && o.prev) o = o.prev;
     if (o.type === STRAP && /^(in|instanceof|as|of)$/.test(o.text) && o.prev) o = o.prev;
     var h = snapSentenceHead(o);
-    var e = skipAssignment(h);
+    var e = h;
+    do {
+        e = skipAssignment(e);
+        if (!e || e.type !== STAMP || e.text !== ',') break;
+        e = e.next;
+    } while (e);
     var q = o.queue;
     if (q) {
         var qh = q.indexOf(h);
@@ -1375,6 +1388,7 @@ module.exports = {
     createScoped,
     createExpressList,
     snapSentenceHead,
+    pickArgument,
     pickSentence,
     snapExpressHead,
     snapExpressFoot,

package/coms/compile/common_test.js

@@ -34,3 +34,6 @@ testPickSentence(`a+b\r\n++c`, 5, "++c")
 testPickSentence(`a+b++\r\nc`, 5, "c")
 testPickSentence(`a+b++\r\nc`, 5, "c")
 testPickSentence(`a+b++\r\n+c`, 6, "a + b++\r\n+ c")
+assert(common.createString(common.pickArgument(scanner2(`a={a:1,c:d}`)[2][4])), 'c: d')
+assert(common.createString(common.pickArgument(scanner2(`a=class{a=1\r\nc=d}`)[3][4])), 'c = d')
+assert(common.createString(common.pickArgument(scanner2(`(a=1,c=d)`)[0][4])), 'c = d')

package/coms/compile/unstruct.js

@@ -1361,7 +1361,7 @@ var patchMark = '';
 module.exports = function (body, newname, ret) {
     strip = body.strip;
     var patchMark_ = patchMark;
-    patchMark = body.patchMark;
+    if (body.patchMark) patchMark = body.patchMark;
     if (ret) ret = isString(ret) ? ret : newname();
     var ret0 = ret_;
     var ret1 = null;

package/coms/reptile/cross.js

@@ -52,6 +52,11 @@ var cross = cross_.bind(function (callback, onerror) {
                 auth,
                 headers: this.headers,
             };
+            var onerror1 = function (e) {
+                xhr.readyState = 4;
+                error = e;
+                onerror(e);
+            };
             var req = this.http.request(options, function (res) {
                 var data = [];
                 xhr.status = res.statusCode;
@@ -65,16 +70,11 @@ var cross = cross_.bind(function (callback, onerror) {
                     xhr.readyState = 4;
                     callback();
                 });
-                var onerror1 = function (e) {
-                    xhr.readyState = 4;
-                    error = e;
-                    onerror(e);
-                };
-                res.on("error", onerror1);
-                res.on('timeout', onerror1);
                 this.readyState = 2;
             });
             this.readyState = 1;
+            req.on("error", onerror1);
+            req.on("timeout", onerror1);
             req.setTimeout(3000);
             if (data) req.end(data);
             else req.end();

package/coms/third-party//344/273/243/347/240/201/346/235/245/346/272/220.txt

@@ -1,7 +1,6 @@
 第三方代码来源及日期，后续版本请自行更新
 2022-12-30 https://npmjs.com/package/crypto-js
 2022-11-12 https://github.com/kazuhikoarase/qrcode-generator 逻辑有修改 qrcode.js
-2022-09-29 https://github.com/richtr/NoSleep.js
 2021-06-15 https://www.npmjs.com/package/html2canvas
 2019-08-03 https://github.com/gorhill/Javascript-Voronoi
 2017-05-17 https://github.com/dankogai/js-deflate

package/coms/zimoli/HexEditor.js

@@ -64,8 +64,8 @@ var filterKey = function (event) {
     else if (keyCode > 95 && keyCode < 106) {
         char = keyCode - 96;
     }
-    else if (keyCode > 46 && keyCode < 57) {
-        char = keyCode - 47;
+    else if (keyCode > 47 && keyCode < 58) {
+        char = keyCode - 48;
     }
     else {
         return;

package/coms/zimoli/alert.js

@@ -67,7 +67,7 @@ function alert() {
     var waitclose = function (autoclose, deltaTime) {
         if (autoclose) {
             if (autoclose === true) {
-                autoclose = text.length * 160 + deltaTime;
+                autoclose = text && text.length * 160 + deltaTime;
             } else if (autoclose < 100) {
                 autoclose = autoclose * 1000;
             }

package/coms/zimoli/data.js

@@ -104,8 +104,12 @@ function getErrorMessage(error = this) {
         if (error[a]) {
             return String(error[a]);
         }
+        a = a.charAt(0).toUpperCase() + a.slice(1);
+        if (error[a]) return String(error[a]);
+        a = a.toUpperCase();
+        if (error[a]) return String(error[a]);
     }
-    return JSON.stringify(error);
+    return Object.keys(error).map(k => `${k}: ${error[k]}`).join(',\r\n');
 }
 
 function getTranspile(url) {

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -44,6 +44,7 @@
 <div -else>
     <button @click="chooseFolder">${i18n`选择代码文件夹`}</button>
     <button @click="editCode()">${i18n`修改国际化参数`}</button>
+    <button @click="显示翻译窗口()">${i18n`翻译工具`}</button>
     <button style="float:right" -if="tableData.length" @click="exportCSV">${i18n`导出到文件`}</button>
     <hr />
     <form>
@@ -389,14 +390,21 @@
         a: button,
         async baidu() {
             var fanyi = this.fanyi;
-            var liang = this.item.liang;
+            var item = this.item;
+            if (item) {
+                var liang = item.liang;
+                var text = item.text;
+            }
+            if (!text) for (var k in fanyi) {
+                if (fanyi[k]) text = fanyi[k];
+            }
             for (var s of this.supports) {
                 if (fanyi[s.id] && fanyi[s.id].trim()) continue;
-                fanyi[s.id] = await requestBaiduFanyi(this.item.text, s.id);
+                fanyi[s.id] = await requestBaiduFanyi(text, s.id);
                 liang++;
                 render.digest();
             }
-            this.item.liang = liang;
+            if (item) item.liang = liang;
         },
         save() {
 
@@ -406,12 +414,11 @@
         }
     };
     var activedRow;
-    var showDetail = function (event) {
-        var tr = getTargetIn(tableElement.children[1], event.active, false);
+    var initDetailWindow = function () {
         if (!detailWindow) {
             detailWindow = view();
             on('submit')(detailWindow, e => e.preventDefault());
-            detailWindow.innerHTML = `<div head>${i18n`翻译: `}"<span -bind="item?.text"></span>"<drop @click="close()"></drop></div><lattice itemwidth=260 -src="s in supports" body><field style="display:inline-block;padding:0 0 6px 12px;" ><label style="padding-left:0"><span -bind="s.name"></span>(<span -bind="s.lang"></span>)</label><textarea -model="fanyi[s.id]" class='body' style="resize:none"></textarea></field></lattice><div foot><a style="float:left" @click="baidu">${i18n`一键百度`}</a></div>`;
+            detailWindow.innerHTML = `<div head><span -if=!item? >${i18n`翻译工具`} </span><template -else>${i18n`翻译: `}"<span -bind="item?.text"></span>"</template><drop @click="close()"></drop></div><lattice itemwidth=260 -src="s in supports" body><field style="display:inline-block;padding:0 0 6px 12px;" ><label style="padding-left:0"><span -bind="s.name"></span>(<span -bind="s.lang"></span>)</label><textarea -model="fanyi[s.id]" class='body' style="resize:none"></textarea></field></lattice><div foot><a style="float:left" @click="baidu">${i18n`一键百度`}</a></div>`;
             drag.on(detailWindow, detailWindow.firstElementChild);
             resize.on(detailWindow);
             css(detailWindow, `position:absolute;left:0;top:0;bottom:0;width:260px;`);
@@ -423,12 +430,21 @@
                 for (var s of supports) {
                     if (fanyi[s.id] && fanyi[s.id].trim()) count++;
                 }
-                detailScope.item.liang = count;
-                removeClass(activedRow, "actived");
-                activedRow = null;
+                if (detailScope.item) {
+                    detailScope.item.liang = count;
+                }
+                if (activedRow) {
+                    removeClass(activedRow, "actived");
+                    activedRow = null;
+                    delete detailScope.item;
+                }
             })
 
         }
+    }
+    var showDetail = function (event) {
+        initDetailWindow();
+        var tr = getTargetIn(tableElement.children[1], event.active, false);
         var item = detailScope.item = event.item;
         if (activedRow !== tr) {
             if (activedRow) removeClass(activedRow, 'actived');
@@ -445,7 +461,12 @@
         // }
         if (!item.fanyi) item.fanyi = {}, item.fanyi[supports[0].id] = item.text;
         detailScope.fanyi = item.fanyi;
-
+        if (!isMounted(detailWindow)) popup(detailWindow);
+    };
+    var 显示翻译窗口 = function () {
+        initDetailWindow();
+        delete detailScope.item;
+        detailScope.fanyi = Object.create(null);
         if (!isMounted(detailWindow)) popup(detailWindow);
     }
     var readText = async function (e) {

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

@@ -61,6 +61,7 @@
             var v = window.parseFloat(_value);
             if (s) v = -v;
             var i = Math.log2(v) | 0;
+            if (i < 0) i--;
             if (!v) i = 0;
             else v = (v * Math.pow(2, -i) - 1) * Math.pow(2, 52), i += 1023;
             return [
@@ -77,6 +78,7 @@
             var i = parseInt(v.slice(0, 3), 16) & 0x7ff;
             v = parseInt(v.slice(3), 16);
             if (i === 0 && v === 0) v = 0;
+            else if (i < 1023) v = (v + Math.pow(2, 52)) * Math.pow(2, i - 1022 - 53);
             else v = (v + Math.pow(2, 53)) * Math.pow(2, i - 1023 - 53);
             if (s) v = -v;
             _value = v;

package/docs//347/273/204/344/273/266.xht

@@ -71,7 +71,7 @@
         overflow: auto;
         width: 100%;
         height: 100%;
-        padding: 10px 20px 600px 20px;
+        padding: 10px 20px 60px 20px;
         white-space: nowrap;
         outline: none;
     }

package/package.json

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