efront 4.3.4 → 4.3.6

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,9 @@
+- zh-CN: 服务异常
+  en:    Service exception
+
+- zh-CN: 自动识别环境并启动测试环境服务器
+  en:    Automatically recognize the environment and start the testing environment server
+
 - zh-CN: 返回
   en:    back
 
@@ -56,7 +62,7 @@
   en:    "The server is busy, please try again later!"
 
 - zh-CN: 重试
-  en:    retry 
+  en:    retry
 
 - zh-CN: $1秒后再试
   en:    Try again in $1 second

package/coms/basic/assert.js

@@ -1,6 +1,9 @@
 var mark = require("./mark");
+var gray = console.format('<gray>;</gray>').split(';');
+var green = console.format('<green>;</green>').split(';');
+var crack = console.format('<red2>;</red2>').split(';');
 var dump = function (a, msg) {
-    if (a instanceof Object) console.error('对象的属性不符合'), console.log(msg ? msg + " " : "  ", a);
+    if (a instanceof Object) console.error('属性错误'), console.log(msg ? msg + " " : "  {\r\n", Object.keys(a).map(k => `  ${k}${gray.join(':')}\r\n      ${a[k]}`).join('\r\n') + "\r\n }");
     else if (msg) console.log(msg + ":", a);
     else console.log(a);
 };
@@ -38,9 +41,12 @@ var assert = function (result, expect, log = dump) {
         };
         return function (error) {
             if (error instanceof Object) {
-                errors[k] = Object.keys(error).map(k => `${k} >> ${error[k]}`).join("\r\n");
+                Object.keys(error).forEach(y => {
+                    var e = y;
+                    errors[`${gray.join('[')}${green.join(k)}${gray.join("]->")}` + e] = error[y];
+                })
             } else {
-                errors[k] = error;
+                errors[gray.join("[") + crack.join(k) + gray.join("]")] = error;
             }
         };
     };

package/coms/basic/parseYML.js

@@ -78,7 +78,7 @@ var scan = function (text) {
                 continue;
             }
             data += row.slice(0, index + +!!jsonlikes.length);
-            row = row.slice(index + 1)
+            row = row.slice(index + 1);
             if (!row) push();
             else unshift(spacesize, row);
             rowtype = 0;
@@ -110,6 +110,7 @@ var scan = function (text) {
             continue;
         }
         if (/^["']/.test(row)) {
+            if (data) push();
             rowtype = row[0];
             if (jsonlikes.length) {
                 data += row[0];
@@ -192,7 +193,8 @@ var scan = function (text) {
             continue;
         }
         else {
-            var match = /^([\s\S]+)?\:(|\s+[\s\S]*)$/.exec(row);
+            var match = /^([\s\S]*?)\:(|\s+[\s\S]*)$/.exec(row);
+            if (data && !match) match = /^()\:([\s\S]*)$/.exec(row);
             if (match) {
                 if (data && !!match[1] || prop && span >= spacesize) push();
                 if (prop) {

package/coms/basic/parseYML_test.js

@@ -3,46 +3,74 @@ var path = require("path");
 var fullpath = path.join(__dirname, "../../.github/workflows/npmpublish.yml");
 var text = fs.readFileSync(fullpath).toString();
 var parseYML = require("./parseYML");
-var text = [
-    `true`,
-    `- true`,
-    ` true true`,
-    ` a: true `,
-    `false`,
-    `null`,
-    `a`,
-    `"a"`,
-    `'a'`,
-    `[0,12]`,
-    `[0,12,a,b]`,
-    `[0,12,a,b,"c","d"]`,
-    `{}`,
-    `{a: b}`,
-    `{"a":b}`,
-    `{"a":[b,c,d]}`,
-    `{"a":[b,{a},[c],[{}],c,d]}`,
-    `{"a":{a: b},c: {},d: [c],e: [{j}]}`,
-    `{"a":"[b,c,d]"}`,
-    `{"a":false}`,
-    `{"a":13e1}`,
-    `{"a":1.21}`,
-    `{"a":0x1a}`,
-    `{"a":null}`,
-    `{"a":true}`,
-    `{"a":-12e71}`,
-    `{"a":-12e+71}`,
-    `{"a":-12}`,
-    `{"a":-12.0}`,
-    `{"a":-12.e-61}`,
-    `{"a":+12.e-61}`,
-    `{"a":12.e-61}`,
-    `{"a":"[b,c,\r\n\\"d]"}`,
-` - zh-CN: "跳过了缺少参数的请求:$1 $2 $3\\r\\n缺少参数：$4"
-    en:    "Skipped request with missing parameters: $1 $2 $3"`,
-    text
-];
-var test = function (text) {
-    var data = parseYML(text);
-    console.log(data);
-};
-text.forEach(test);
+var test = function (source, expect) {
+    var result = parseYML(source);
+    var same = assert(result, expect);
+    if (!same) console.log(result);
+}
+test('true', true);
+test('- true', [true]);
+test('true true', "true true");
+test('a: true', { a: true });
+test('false', false);
+test('null', null);
+test('a', "a");
+test('"a"', "a");
+test(`'a'`, "a");
+test("[0,12]", [0, 12]);
+test("[0,12,a,b]", [0, 12, 'a', 'b']);
+test("[0,12,a,b,'c','d']", [0, 12, 'a', 'b', 'c', 'd']);
+test(`[0,12,a,b,"c","d"]`, [0, 12, 'a', 'b', "c", "d"]);
+test(`{}`, {});
+test(`{a: b}`, { a: 'b' });
+test(`{"a":b}`, { a: 'b' });
+test(`{a:[b,c,d]}`, { a: ['b', 'c', 'd'] });
+test(`{a:[b,{a},[c],[{}],c,d]}`, { a: ['b', { a: null }, ["c"], [{}], "c", 'd'] });
+test(`{"a":{a: b},c:{},d:[c],e:[{j}]}`, { a: { a: 'b' }, c: {}, d: ["c"], e: [{ j: null }] });
+test(`{"a":"[b,c,d]"}`, { a: "[b,c,d]" });
+test(`{"a":false}`, { a: false });
+test(`{"a":13e1}`, { a: 13e1 });
+test(`{"a":13e+1}`, { a: 13e1 });
+test(`{"a":13e-1}`, { a: 13e-1 });
+test(`{"a":1.21}`, { a: 1.21 });
+test(`{"a":-1.21}`, { a: -1.21 });
+test(`{"a":0x1a}`, { a: 0x1a });
+test(`{"a":null}`, { a: null });
+test(`{"a":true}`, { a: true });
+test(`{"a":-12e71}`, { a: -12e71 });
+test(`{"a":12e+71}`, { a: 12e+71 });
+test(`12e+71`, 12e+71);
+test(`-12e+71`, -12e+71);
+test(`-12e-71`, -12e-71);
+test(`-12.0`, -12.0);
+test(`-12.e-61`, -12.e-61);
+test(`+12.e-61`, 12.e-61);
+test(`12.e-61`, 12.e-61);
+test(`{"a":"[b,c,\r\n\\"d]"}`, { a: "[b,c,\r\n\"d]" });
+test(`
+ - zh-CN: "跳过了缺少参数的请求:$1 $2 $3\\r\\n缺少参数：$4"
+   en:    "Skipped request with missing parameters: $1 $2 $3"`,
+    [{
+        "zh-CN": "跳过了缺少参数的请求:$1 $2 $3\r\n缺少参数：$4",
+        "en": "Skipped request with missing parameters: $1 $2 $3"
+    }]);
+test(`
+- zh-CN: 未没找到匹配的资源：$1
+  en:    "No matching resources found: $1"
+`, [{
+    "zh-CN": "未没找到匹配的资源：$1",
+    "en": "No matching resources found: $1"
+}]);
+test(`- a:: b`, [{ "a:": "b" }]);
+test(`- a::b`, ["a::b"]);
+test(`a::b`, "a::b");
+test(`a:":b`, `a:":b`);
+test(`a:": b`, { 'a:"': "b" });
+test(`a: :b`, { "a": ":b" });
+test(`a:: b`, { "a:": "b" });
+test(`"a:": b`, { "a:": "b" });
+test(`"a:":b`, { "a:": "b" });
+test(`
+c: d
+"a:": b
+`, { c: "d", "a:": "b" });

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/downLevel.js

@@ -1535,6 +1535,7 @@ var down = function (scoped) {
     var inAsync = scoped.async;
     var inAster = scoped.yield;
     var funcMark = [, "aster_", "async_", "asyncAster_"][inAsync << 1 | inAster];
+    if (funcMark) funcMark = patchMark + funcMark;
     if (funcMark) rootenvs[funcMark] = true;
     var vars = Object.assign(Object.create(null), scoped.vars);
     var envs = Object.assign(Object.create(null), scoped.envs);
@@ -1720,7 +1721,7 @@ var down = function (scoped) {
         if (funcMark) {
             var argname = _letname("_");
             unstruct.debug = downLevel.debug;
-            var body = scanner2(`return ${patchMark + funcMark}()`);
+            var body = scanner2(`return ${funcMark}()`);
             var code = unawait(scoped.body, _getname, argname);
             code.forEach(function (c) {
                 revar(c);

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/layer/glance.js

@@ -40,7 +40,7 @@ var dragview = function (dragview) {
             page.style.transition = '';
             if (moving && moving !== -1) {
                 var left = freeOffset(page.style.left || 0);
-                if (moving.deltaX < 0 && left > offsetWidth * 0.3 || moving.deltaX > 0 && left > offsetWidth * 0.7 || !moving.deltaX && left > offsetWidth >> 1) {
+                if (moving.deltaX < 0 && left > calcPixel(14) || moving.deltaX > 0 && left > calcPixel(14) || !moving.deltaX && left > offsetWidth >> 1) {
                     page.style.left = 0;
                     dragview.toRight();
                 } else {

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/grid.js

@@ -547,9 +547,9 @@ var grid_prototype = {
             } else {
                 var _div = point.target;
                 if (!_div) {
-                    point.target = _div = document.createElement('cell');
+                    // point.target = _div = document.createElement('cell');
                 }
-                if (_div.parentNode !== grid) appendChild(grid, _div);
+                if (_div && _div.parentNode !== grid) appendChild(grid, _div);
                 var current_value;
                 if (current_d === "x") {
                     if (next_point) {
@@ -563,15 +563,17 @@ var grid_prototype = {
                     point.top = current_t;
                     point.bottom = current_b;
                     if (point.origin !== point.value || current_t && current_t.origin !== current_t.value) {
-                        if (getComputedStyle(_div).position === 'absolute') {
-                            css(_div, {
-                                left: point.value / grid.width * 100 + "%",
-                                top: current_t ? current_t.value / grid.height * 100 + "%" : 0,
-                                width: current_value / grid.width * 100 + "%",
-                                height: (current_h / grid.height || 0) * 100 + "%"
-                            });
-                        } else {
-                            setRelativeDiv(_div, current_value, current_h, point.value, current_t ? current_t.value : 0);
+                        if (_div) {
+                            if (getComputedStyle(_div).position === 'absolute') {
+                                css(_div, {
+                                    left: point.value / grid.width * 100 + "%",
+                                    top: current_t ? current_t.value / grid.height * 100 + "%" : 0,
+                                    width: current_value / grid.width * 100 + "%",
+                                    height: (current_h / grid.height || 0) * 100 + "%"
+                                });
+                            } else {
+                                setRelativeDiv(_div, current_value, current_h, point.value, current_t ? current_t.value : 0);
+                            }
                         }
                         point.width = current_value / grid.width;
                         point.height = current_h / grid.height;
@@ -588,15 +590,17 @@ var grid_prototype = {
                     point.left = current_l;
                     point.right = current_r;
                     if (point.origin !== point.value || current_l && current_l.origin !== current_l.value) {
-                        if (getComputedStyle(_div).position === 'absolute') {
-                            css(_div, {
-                                left: current_l ? current_l.value / grid.width * 100 + "%" : 0,
-                                top: point.value / grid.height * 100 + "%",
-                                width: (current_w / grid.width || 0) * 100 + "%",
-                                height: current_value / grid.height * 100 + "%"
-                            });
-                        } else {
-                            setRelativeDiv(_div, current_w, current_value, current_l ? current_l.value : 0, point.value);
+                        if (_div) {
+                            if (getComputedStyle(_div).position === 'absolute') {
+                                css(_div, {
+                                    left: current_l ? current_l.value / grid.width * 100 + "%" : 0,
+                                    top: point.value / grid.height * 100 + "%",
+                                    width: (current_w / grid.width || 0) * 100 + "%",
+                                    height: current_value / grid.height * 100 + "%"
+                                });
+                            } else {
+                                setRelativeDiv(_div, current_w, current_value, current_l ? current_l.value : 0, point.value);
+                            }
                         }
                         point.width = current_w / grid.width;
                         point.height = current_value / grid.height;
@@ -733,7 +737,14 @@ var createBoundsFromComputed = function (grid) {
 };
 var createPointsWithChildren = function () {
     var grid = this;
-    if (!grid.children.length) return;
+    var children = [];
+    for (var c of grid.children) {
+        var s = getComputedStyle(c);
+        if (s.display === 'none' || /^(fixed|absolute)$/i.test(s.position)) continue;
+        children.push(c);
+    }
+    if (children.length < 2 || grid.adapted) return;
+    grid.adapted = true;
     var getRange = function (e) {
         var range = [0, 0, Infinity, Infinity];
         var computed = getComputedStyle(e);
@@ -747,7 +758,7 @@ var createPointsWithChildren = function () {
         range[3] = Math.floor(range[3]);
         return range;
     };
-    var elements = Array.apply(null, grid.children).map(a => [a,
+    var elements = children.map(a => [a,
         +Math.max(0, a.offsetLeft * grid.width / grid.clientWidth).toFixed(0),
         +(Math.min(a.offsetLeft + a.offsetWidth, grid.clientWidth) * grid.width / grid.clientWidth).toFixed(0),
         +Math.max(0, a.offsetTop * grid.height / grid.clientHeight).toFixed(0),
@@ -764,6 +775,7 @@ var createPointsWithChildren = function () {
 function main(elem) {
     if (isElement(elem)) {
         elem = grid.call(elem);
+        elem.adapt = createPointsWithChildren;
         care(elem, elem.setData);
         care(elem, elem.reshape);
     } else {

package/coms/zimoli/menu.less

@@ -154,7 +154,12 @@ body:active & {
         padding-bottom: 6px;
         line-height: 20px;
         font-size: 14px;
-
+        border-radius: 0;
+/*
+狗物业弄了电子门禁还嫌不够，连人行道也弄个一人一杆。
+住在这里就像住在监狱，随时都可能被限制人身自由。
+狗日的共产党还和狗物业尿到一个壶里。
+*/
         >b {
             font-weight: normal;
         }

package/docs/main.xht

@@ -42,11 +42,14 @@
         content: "样";
     }
 
-    :root>menu {
+    :root>menu[inline] {
+        height: 100%;
+    }
+
+    :root>menu[inline] {
         margin: 0;
         width: var(--leftwidth);
         margin-left: -var(--leftwidth);
-        height: 100%;
         display: inline-block;
         min-width: 200px;
         max-width: 600px;
@@ -84,11 +87,80 @@
         color: #79a;
         margin-left: 12px;
     }
+
+    open {
+        display: none;
+    }
+
+    @media screen and (max-width:599px) {
+        form {
+            width: 100% !important;
+            height: 100% !important;
+            z-index: 0 !important;
+        }
+
+        :root>open:after {
+            content: "≡";
+        }
+
+        :root>open {
+
+            display: block;
+            position: absolute;
+            height: 42px;
+            width: 42px;
+            line-height: 42px;
+            text-align: center;
+            color: #fff;
+            background: #1e282c;
+            font-family: 'Times New Roman', Times, serif;
+            font-size: 26px;
+            z-index: 2147483647 !important;
+            right: 20px;
+            bottom: 20px;
+            border-radius: 50%;
+        }
+
+        :root>menu {
+
+            position: absolute;
+            z-index: -1;
+
+            &[open] {
+                left: 0 !important;
+                right: 0 !important;
+                top: 0 !important;
+                bottom: 0 !important;
+                width: 100% !important;
+                height: 100% !important;
+                margin: 0 !important;
+                z-index: 3;
+
+                ~open {
+                    background-color: #fff;
+                    color: #1e282c;
+
+                    &:after {
+                        content: "⨉";
+                        vertical-align: top;
+                        font-size: 18px;
+                    }
+                }
+            }
+
+        }
+
+        :root {
+            padding: 0px !important;
+        }
+    }
 </style>
-<menu #mulu inline -src="m in menus" @active="openMenu(m)">
+
+<menu #mulu open@="menued" inline -src="m in menus" @active="openMenu(m)">
     <div2></div2>
 </menu>
 <div1 #content></div1>
+<open #switch @click="switchMenu()" insert></open>
 <script>
     var menus = [
         {
@@ -130,12 +202,12 @@
                 }
             }
         ]);
-    })
+    });
     var initVersionInfo = async function () {
         var xhr = await cross("get", "version");
         var version = xhr.response.split(",");
         menus[0].name += ` <v>${version[0]}</v>`;
-    }
+    };
     var initCommandsDocs = async function () {
         var helps = await init("docs$helps");
         var m = {
@@ -204,7 +276,7 @@
         scope.menus = route.update(menus);
         zimoli();
         render.refresh();
-    }
+    };
     var scope = {
         menus,
         div2(elem, scope) {
@@ -214,11 +286,17 @@
         },
         grid,
         menu,
+        menued: false,
+        switchMenu() {
+            scope.menued = !scope.menued;
+        },
         openMenu(m) {
             this.menus.open(m);
+            if (!m.children) this.menued = false;
         }
     };
     var page = document.createElement('grid');
+    page.adapted = screen.width < 720 && -1;
     page.innerHTML = template;
     if (window.require) {
         var title = document.createElement('titlebar');
@@ -239,11 +317,23 @@
     on("mounted")(page, initMenus);
     s.bindTarget(scope.content);
     page.with = s;
+    resizingList.set(page, function () {
+        if (page.adapted === true) return;
+        if (calcPixel(page.offsetWidth) < 720) return;
+        page.adapted = false;
+        page.adapt();
+    });
     bind("render")(page, function () {
         requestAnimationFrame(function () {
             s.reshape();
         })
     });
+    drag.on(scope.switch);
+    css(scope.switch, data.getInstance('switch-position'));
+    on('dragend')(scope.switch, function () {
+        var s = this.style;
+        data.setInstance('switch-position', { left: s.left, top: s.top, marginLeft: s.marginLeft, marginTop: s.marginTop }, true);
+    })
     function main() {
         return page;
     }

package/docs/mark.xht

@@ -1,18 +1,19 @@
 <style>
-    :scope {
-        line-height: 1.8;
-        display: block;
-        font-family: Times, "宋体", sans-serif;
-
-        @media screen and (max-width:830px) {
+    @media screen and (max-width: 830px) {
+        :scope {
             padding: 20px 40px;
         }
+    }
 
-        @media screen and (min-width:1160px) {
+    @media screen and (min-width: 1160px) {
+        :scope {
             margin: 20px auto;
         }
+    }
+
+    @media screen and (min-width: 830px) {
+        :scope {
 
-        @media screen and (min-width:830px) {
             max-width: 890px;
             border: 1px solid #000;
             padding: 60px 80px;
@@ -20,6 +21,12 @@
         }
     }
 
+    :scope {
+        line-height: 1.8;
+        display: block;
+        font-family: Times, "宋体", sans-serif;
+    }
+
     code {
         width: 100%;
     }

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

@@ -89,7 +89,7 @@
             fields: [
                 { name: i18n`提示`, readonly: true, key: 'apply_info', type: 'text' },
                 { name: i18n`appid及密钥申请地址`, readonly: true, key: 'apply_url', type: 'anchor' },
-                { name: i18n`appid`, key: 'appid', type: 'input' },
+                { name: `appid`, key: 'appid', type: 'input' },
                 { name: i18n`密钥`, key: 'sign', type: "input" },
                 { name: i18n`目标语言`, type: 'checkbox', options: supports }
             ], data: {

package/package.json

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