efront 4.20.0 → 4.20.2

package/coms/compile/Javascript.js

@@ -357,7 +357,7 @@ var detectLabel = function (o) {
             if (!queue.isargl && last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
                 // label
                 var lp = last.prev;
-                if (!lp || lp.type !== STRAP || lp.isend) {
+                if (!lp || lp.type !== STRAP || !lp.transive || lp.isend) {
                     last.type = LABEL;
                     last.text += ":";
                     last.end = end;

package/coms/compile/common.js

@@ -1137,7 +1137,7 @@ var getDeclared = function (o, kind, queue) {
                 o = f.next;
                 break;
             default:
-                console.log(createString(pickSentence(queue)), o.text, o.type);
+                console.log(createString(pickSentence(o.queue)), o.text, o.type);
                 throw new Error(i18n`代码结构异常`);
         }
         if (!o) break;

package/coms/compile/downLevel_test.js

@@ -440,9 +440,9 @@ function () {
 if (!a) return [1, 0]; return [2, 0]
 },
 function () {
-_1 = getRequestProtocol(url); _0 = _1 + "//", location = _0 + location; return [1, 0]
+_0 = getRequestProtocol(url), _0 = _0 + "//", location = _0 + location; return [1, 0]
 })
-var _0, _1 }`);
+var _0 }`);
 assert(downLevel("var{a}=await b"), `return async_(
 function () {
 _0 = b; return [_0, 1]

package/coms/compile/unstruct.js

@@ -863,6 +863,7 @@ var ternary = function (body, getname, ret) {
             var punc = eq.text.slice(0, eq.text.length - 1);
             var bdtmp = [...ass.map(cloneNode), { type: STAMP, text: punc }, ...asn];
             relink(bdtmp);
+            eqused++;
             var explist2 = _express(bdtmp, getnextname, true);
             if (isSimpleAssign) {
                 [asn, an = cloneNode(ass)] = popexp(explist2);

package/coms/compile/unstruct_test.js

@@ -163,6 +163,9 @@ test("var res = null, krc;", `res = null; krc`)
 test("res = null, krc;", `res = null; krc`)
 test(`while (a && b);`, '_ = a; if (!_) return [1, 0]; _ = b;\r\n if (!_) return [1, 0]; return [-1, 0]', true);
 test(`while (a < b);`, '_ = a < b; if (!_) return [1, 0]; return [0, 0]', true);
-unstruct.debug = true; r++;
 test(`if (a() > a+b);`, '_ = a(), _0 = a + b, _ = _ > _0; if (!_) return [1, 0]; return [1, 0]', true);
 test(`index > start && result.length < pageSize`, '_ = index > start; if (!_) return [1, 0]; _ = result.length, _ < pageSize', true);
+unstruct.debug = true; r++;
+test(`menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = str__v_; _1 = version[0]; _2 = str__v_1; _0 = [_0, _1, _2]; _0 = _0[str_join](""); _1 = _[str_name], _1 = _1 + _0; _[str_name] = _1`);
+test(`a.b.c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = str__v_; _1 = version[0]; _2 = str__v_1; _0 = [_0, _1, _2]; _0 = _0[str_join](""); _1 = _[str_name], _1 = _1 + _0; _[str_name] = _1; _2 = a.b.c, _2 = _2 + _1; a.b.c = _2`);
+test(`menus[0].c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = menus[0]; _1 = str__v_; _2 = version[0]; _3 = str__v_1; _1 = [_1, _2, _3]; _1 = _1[str_join](""); _2 = _0[str_name], _2 = _2 + _1; _0[str_name] = _2; _3 = _.c, _3 = _3 + _2; _.c = _3`);

package/coms/compile//347/264/240/351/246/250.js

@@ -463,8 +463,15 @@ var Method = function () {
     if (!this.base) this.base = base;
     vlist.push(valueMap);
     var argDefaults = this.args.defaults;
+    var ipd = 0;
     this.args.forEach((k, i) => {
-        var a = arguments[i];
+        var p = i + ipd;
+        if (/^\.\.\.@/i.test(k)) {
+            var a = Array.prototype.slice.call(arguments, p, i + arguments.length - this.args.length + 1);
+            ipd += a.length - 1;
+            k = k.slice(3);
+        }
+        else var a = arguments[p];
         if (a === undefined || a === null) a = seprateFunc(calcvars(argDefaults[k])).map(evalproc).join('');
         valueMap[k] = a;
     });
@@ -497,17 +504,18 @@ var killneg = function (v, n) {
             v = n + v;
         }
     }
+    else if (n === '...');
     else if (n) v = n + v;
     return v;
 };
 var calcvars = function (v) {
     var decode = /^['"`]/.test(v) ? strings.decode : a => a;
-    return v.replace(/(^\-)?(@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\})/g, function (_, n, m) {
+    return v.replace(/(^\-|\.\.\.)?(@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\})/g, function (_, n, m) {
         var value = getFromScopeList(m, vlist, m);
         value = decode(value);
         value = killneg(value, n);
         return value;
-    }).replace(/(^|\s|[\]\)\(\[\+\*\/,;]|^\-)(?:var\s*\(([\s\S]*?)\)|(--\S+))/g, function (m, q, a, b) {
+    }).replace(/(^|\s|[\]\)\(\[\+\*\/,;]|\-|\.\.\.)(?:var\s*\(([\s\S]*?)\)|(--\S+))/g, function (m, q, a, b) {
         var v = getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
         v = killneg(v, q);
         return v;
@@ -564,7 +572,7 @@ var eval2 = function (props) {
             var [, name, args] = match;
             args = createArgMap(args);
             p.args = args;
-            p.reg = new RegExp(args.join("|") + /|@\{[^\}@]+\}/.source, 'g');
+            p.reg = new RegExp(args.map(a => /(?:\.\.\.)?/.source + a.replace(/^\.\.\./, '')).join("|") + /|@\{[^\}@]+\}/.source, 'g');
             if (!methods[name]) methods[name] = [];
             var argDefaults = args.defaults;
             Object.keys(argDefaults).forEach(k => {

package/coms/compile//347/264/240/351/246/250_test.js

@@ -87,7 +87,10 @@ assert(素馨(`a{a:extract(2 3,2)}`), `a{a:3;}`);
 assert(素馨(`value: range(10px, 30px, 10);`, '', true), `value:10px 20px 30px;`);
 assert(素馨(`value: range(4);`, '', true), `value:1 2 3 4;`);
 assert(素馨(`@a:-1;b{a:-@a}`, '', true), `b{a:1;}`);
+assert(素馨(`@b(@c,...@d,@e){each(@d,(@a){a:@a})};@b(1,2,3,4,5,3,4)`, '', true), `a:2;a:3;a:4;a:5;a:3;`);
 assert(素馨(`--mwidth:0px;--bwidth:2px;--qwidth: var(--mwidth)+var(--bwidth);width:--qwidth`, '', true), `width:2px;`);
+assert(素馨(`a{--a:1px;padding:var(--a) -var(--a);}`, '', true), `a{padding:1px -1px;}`);
+assert(素馨(`a{@a:1px;padding:@a -@a;}`, '', true), `a{padding:1px -1px;}`);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].text, '-0.2em');
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].isdigit, true);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].text, ".3em");

package/coms/explorer/fileitem.html

@@ -1,8 +1,9 @@
-<fileitem type_="d.type" @mouseenter="startMarquee(sp)" @mouseleave="stopMarquee(sp)" @touchstart="startMarquee(sp)"
-    @touchend="stopMarquee(sp)">
+<fileitem type_="d.type" ext+ @mouseenter="startMarquee(sp)" @mouseleave="stopMarquee(sp)"
+    @touchstart="startMarquee(sp)" @touchend="stopMarquee(sp)">
     <template -src="d.isfolder?icons.folder:icons.file"></template>
-    <span #sp ng-text=d.name></span>
-    <p -if="d.pending" keep >
+    <span #sp name ng-text=d.name></span>
+    <p -if="d.pending" keep>
         <r -style="{width:(d.percent*100).toFixed(4)+'%'}"></r>
     </p>
+    <span ext? -if="!d.isfolder"></span>
 </fileitem>

package/coms/explorer/fileitem.js

@@ -8,6 +8,7 @@ class Fileitem {
 var e = Fileitem.prototype;
 e.startMarquee = function (sp) {
     if (sp.scrollWidth <= sp.clientWidth) return;
+    clearInterval(sp.mq);
     sp.mq = setInterval(function () {
         clearInterval(sp.mq);
         sp.mq = setInterval(function () {
@@ -17,7 +18,7 @@ e.startMarquee = function (sp) {
         }, 16);
     }, 400);
     sp.setAttribute("marquee", '');
-    sp.scrollLeft = sp.clientWidth;
+    sp.scrollLeft = sp.clientWidth - parseFloat(getComputedStyle(sp).paddingLeft);
 };
 e.stopMarquee = function (sp) {
     clearInterval(sp.mq);
@@ -29,6 +30,9 @@ function fileitem(elem) {
     elem.innerHTML = template;
     var e = elem.children[0];
     e.$scope = new Fileitem;
+    var ext = /\.([^\.]+)$/.exec(elem.$scope.d.name);
+    if (ext) e.$scope.ext = ext[1];
+    else e.$scope.ext = '';
     extend(e.$scope, elem.$scope);
     return e;
 }

package/coms/explorer/fileitem.less

@@ -1,22 +1,76 @@
 & {
     position: relative;
     display: block;
-    padding: 10px 20px 10px 44px;
+    padding: 10px 0 10px 52px;
     white-space: nowrap;
     line-height: 28px;
     background: #fff9;
 }
+
+&[type=folder] {
+    >svg {
+        transform: scale(.9);
+    }
+}
+
 &[cut] {
     opacity: .4;
 }
 
+&>[ext] {
+    display: block;
+    position: absolute;
+    left: 2px;
+    bottom: 11px;
+    width: 46px;
+    text-align: center;
+    font-size: 12px;
+    line-height: 12px;
+    text-transform: uppercase;
+    background-color: #fff;
+    border: 1.2px solid;
+}
+
+@ext(...@name, @color) {
+    each(@name, (@n) {
+            &[ext=@n] {
+                >[ext] {
+                    color: #fff;
+                    border-color: transparent;
+                    background: @color;
+                }
+            }
+        });
+}
+
+@ext(mp3, flac, wma, wav, midi, aac, #2ac);
+@ext(krc, lrc, grc, qrc, #2ca);
+@ext(mp4, avi, wmv, mov, rmvb, rm, flv, #a32);
+@ext(jpg, svg, jpeg, png, bmp, dib, gif, webp, jfif, tiff, dng, #84c);
+@ext(js, mjs, cjs, jsx, #db9);
+@ext(bat, cmd, sh, #6ad);
+@ext(tmp, log, #bbb);
+@ext(exe, scr, com, #666);
+@ext(dll, sys, a, lib, #999);
+@ext(rar, jar, tar, zip, 7z, war, apk, tgz, xz, #666);
+@ext(ts, tsx, #9cc);
+@ext(java, c, go, rs, s, asm, h, ini, cpp, hpp, m, #9ab);
+@ext(less, #9bd);
+@ext(css, #9db);
+@ext(html, #bc9);
+@ext(ico, #b9c);
+@ext(xht, vue, #bb9);
+@ext(jsp, asp, php, #adc);
+@ext(yml, json, #ca9);
+@ext(md, rtf, gsp, doc, docx, #66a);
+
 
 >svg {
-    width: 28px;
-    height: 28px;
+    width: 52px;
+    height: 52px;
     display: inline-block;
     vertical-align: top;
-    margin: 0 6px 0 -34px;
+    margin: -12px 0 -12px -52px;
 }
 
 >span {
@@ -27,7 +81,12 @@
     text-overflow: ellipsis;
     display: inline-block;
     vertical-align: top;
+}
 
+>[name] {
+    padding-left: 10px;
+    margin-left: -10px;
+    box-sizing: content-box;
 }
 
 &:not([dragclone]) [marquee] {
@@ -49,14 +108,16 @@
     left: 6px;
     margin-left: 6px;
 }
-p{
+
+p {
     display: block;
     margin: 0;
     position: relative;
     height: 4px;
     background: #29c2;
     border-radius: 2px;
-    >r{
+
+    >r {
         height: 100%;
         display: block;
         background: #29c;

package/coms/zimoli/popup.js

@@ -338,7 +338,7 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
 };
 var _as_xextra = arriswise(_as_yextra, arguments);
 var popup_as_single = function (element) {
-    css(element, `z-index:${zIndex()};`);
+    if (!isMounted(element)) css(element, `z-index:${zIndex()};`);
     global(element, false);
 };
 var popup_to_point = function (element, [x, y]) {
@@ -392,6 +392,7 @@ var popup_to_event = function (element, { clientX, clientY }) {
 var global = function (element, issingle) {
     once("remove")(element, cleanup);
     rootElements.push(element);
+    if (isMounted(element)) return;
     popup.global &&
         issingle !== false ? popup.global(element, true) : appendChild(document.body, element);
 };

package/coms/zimoli/render.js

@@ -1059,7 +1059,7 @@ function createStructure(element, useExists) {
         else if (/[_@\:\.&\?\*\+\#]$/.test(name)) {
             var key = name.slice(0, name.length - 1);
             if (value) attr1[key] = value;
-            else {
+            else a: {
                 key = 驼峰化(name.slice(0, name.length - 1));
                 switch (name.charAt(name.length - 1)) {
                     case "?":
@@ -1075,8 +1075,8 @@ function createStructure(element, useExists) {
                         binds.src = key;
                         break;
                     case "+":
-                        binds[key] = key;
-                        break;
+                        attr1[key] = key;
+                        break a;
                     case "#":
                         ids.push(key);
                         break;

package/coms/zimoli/view.js

@@ -107,7 +107,7 @@ var resize2 = function () {
             marginBottom: fromOffset(-height),
         })
         css(body, {
-            paddingTop: fromOffset(height - body.clientTop)
+            paddingTop: fromOffset(height - body.clientTop - body.offsetTop)
         });
     }
     a: if (foot && body) {
@@ -115,12 +115,12 @@ var resize2 = function () {
         if (foot.$height === height) break a;
         foot.$height = height;
         changed = true;
-        css(body, {
-            paddingBottom: fromOffset(height)
-        });
         css(foot, {
             marginTop: fromOffset(-height)
         })
+        css(body, {
+            paddingBottom: fromOffset(body.clientTop + body.clientHeight + body.offsetTop - foot.offsetTop)
+        });
     }
 };
 function view(element) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.20.0",
+    "version": "4.20.2",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {