efront 4.2.6 → 4.2.8

package/coms/compile/unstruct.js

@@ -1266,8 +1266,9 @@ function toqueue(body, getname, ret = false, result = []) {
             if (o.text === 'else') {
                 while (body[cx] !== o.next) cx++;
                 o = o.next;
+                var ispbr = iftop[iftop.length - 3];
+                if (!ispbr) ifpatch(result, true);
                 isbr = isbreak(o);
-                if (!isbr) ifpatch(result, true);
                 iftop.push(result.length);
                 elseif = true;
             }

package/coms/compile/unstruct_test.js

@@ -69,7 +69,7 @@ test("for(a in b)", "for (a in b)", true);
 test("for(a of b)", "for (a of b)", true);
 test("for await(a of b)", "for await (a of b)", true);
 test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; a = a.call(os); b = a.next(); return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = (true);\r\n if (!_) return [1, 0]; b = a.next(); return [-1, 0]", true);
-test("for(a=0;a<1;a++)if(a==0)continue\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (_) return [2, 0]; return [1, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);
+test("for(a=0;a<1;a++)if(a==0)continue\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; a = 1; return [1, 0];\r\n _ = a++; return [-1, 0]`, true);
 test("for(a=0;a<1;a++)if(a==0){continue} else {a=1}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (!_) return [1, 0]; return [2, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);
 test("for(a=0;a<1;a++){if(a==0){a=2;continue} else if(b) {a=1;continue} c=3}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [4, 0]; _ = a == 0; if (!_) return [1, 0]; a = 2; return [3, 0];\r\n if (!b) return [1, 0]; a = 1; return [2, 0];\r\n c = 3; return [1, 0];\r\n _ = a++; return [-3, 0]`, true);
 test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [2, 0]; _ = a; return [_, 1];\r\n _ = @; _ = a++; return [-1, 0]", true);
@@ -134,4 +134,5 @@ test("[key[1]][key[2]][key[3]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _
 test("[key[1]][key[2]]+[key[3]][key[4]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _0 = [_0]; _1 = key[4]; _ + _0[_1]');
 test("if(a)a:{break a}", "if (!a) return [2, 0]; return [1, 0];\r\n return [1, 0]", true);
 unstruct.debug = true;
-test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0; _ = (_); rgb = _ & 0xffffff", true);
+test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0; _ = (_); rgb = _ & 0xffffff", true);
+test(`if (c) a; else return true; return false`, "if (!c) return [1, 0]; a; return [2, 0];\r\n return [true, 2];\r\n return [false, 2]")

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

@@ -583,10 +583,11 @@ function 素馨(text, scopeName, compress) {
     }
     return result.rest.map(a => a.join("")).concat(result).map(a => {
         var ats = [];
-        a = a.replace(/@\{(@[^\}]*)\}\s*/g, function (_, q) {
+        a = a.replace(/\s*@\{(@[^\}]*)\}/g, function (_, q) {
+            q = q.replace(/((?:\s|\))(?:and|or))\(/g, '$1 (');
             ats.push(q);
             return ''
-        });
+        }).trim();
         if (!a) return '';
         var atk = ats.join(';');
         if (queried.key !== atk) {

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

@@ -69,4 +69,6 @@ assert(素馨(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `a>.abc-:not(a):not(b){
 
 assert(素馨(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:1;}`);
 assert(素馨(`@a:1px;@margin-x:@a+10px; a{m:-@margin-x}`), `a{m:-11px;}`);
-assert(素馨(`a{@a:1px;@margin-x:@a+10px;m:-@margin-x}`), `a{m:-11px;}`);
+assert(素馨(`a{@a:1px;@margin-x:@a+10px;m:-@margin-x}`), `a{m:-11px;}`);
+assert(素馨(`@media screen{&.a{b:1}}`,'a'), `@media screen{a.a{b:1;}}`);
+assert(素馨(`@media screen and(max-width:100px){&.a{b:1}}`,'a'), `@media screen and (max-width:100px){a.a{b:1;}}`);

package/coms/layer/glance.js

@@ -99,23 +99,20 @@ function main(mainPath, historyName = "") {
     };
     var bindClass = function () {
         if (closed) {
-            var collapse = layer.clientLeft === 0;
-            addClass(layer, 'close');
-            removeClass(layer, 'open');
-            css(layer, `margin-left:0`);
-            if (collapse) {
-                removeClass(layer, 'close open');
+            if (hasClass(layer, "open")) {
+                removeClass(layer, 'open');
+            }
+            else {
+                addClass(layer, 'close');
+            }
+        }
+        else {
+            if (hasClass(layer, 'close')) {
+                removeClass(layer, 'close');
+            }
+            else {
+                addClass(layer, 'open');
             }
-        } else {
-            addClass(layer, 'open');
-            removeClass(layer, 'close');
-            css(layer, `margin-left:${fromOffset(leftLayer.offsetWidth)}`);
-            setTimeout(function () {
-                var collapse = layer.clientLeft === 0;
-                if (!collapse) {
-                    css(layer, 'margin-left:0');
-                }
-            }, 20);
         }
     };
     var update = function (event) {

package/coms/layer/glance.less

@@ -6,7 +6,6 @@
     position: relative;
     border-radius: 3px;
     overflow: hidden;
-    border-left: @left-width solid transparent;
     box-sizing: border-box;
     overflow: visible;
     transition: border-left-width 0.2s ease-out, margin-left .2s ease-out, left .2s ease-out;
@@ -40,20 +39,24 @@
     padding: 50px 10px 20px 10px;
 }
 
-&.close {
-    border-left-width: 0 !important;
-}
+// 宽屏: 用border-left
+@media all and (min-width:961px) {
+    & {
+        border-left: @left-width solid transparent;
+    }
 
-@media all and(min-width:961px) {
-    &.open {
-        margin-left: 0 !important;
+    &.close {
+        border-left-width: 0;
     }
 }
 
-@media all and (max-width:960px) {
+// 窄屏: 用margin-left
+@media(max-width:960px) {
+    
     & {
-        border-radius: 0;
-        border-left-width: 0 !important;
         margin-left: 0;
     }
+    &.open {
+        margin-left: @left-width;
+    }
 }

package/package.json

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