efront 4.11.6 → 4.12.0

package/apps/pivot/task/invoke.html

@@ -8,7 +8,7 @@
         <field -repeat="f in fields" -src="[f,data]"></field>
     </div>
     <div class="left">
-        <pre -text="task.code"></pre>
+        <jscode -value="task.code" type="js"></jscode>
     </div>
     <div class="right" :class="{error:error}">
         <pre -text="output"></pre>

package/apps/pivot/task/invoke.js

@@ -16,6 +16,7 @@ function main(a) {
         task: a,
         output: '',
         error: false,
+        jscode: 茨菰$编辑框,
         async run() {
             var id = ++taskid;
             this.output = "正在执行..";

package/apps/pivot/task/invoke.less

@@ -2,16 +2,19 @@
     position: absolute;
     width: 800px;
 }
->[body]{
-    border-top: 50px solid transparent;
-    border-bottom: 50px solid transparent;
-}
+
+
 >[body]>div {
     display: inline-block;
     vertical-align: top;
     overflow: auto;
     font-size: 12px;
 
+    >jscode,
+    >pre {
+        height: 100%;
+    }
+
     &.top {
         left: 0;
         top: 0;

package/coms/compile/unstruct.js

@@ -403,7 +403,7 @@ var patchstep = function (r, nextindex, h) {
             x = rescan`if (${name}) return [${nextindex}, 0]`;
         }
         else if (o === RD) {
-            x = rescan`if (${name}!= null) return [${nextindex}, 0]`;
+            x = rescan`if (${name}!=null) return [${nextindex}, 0]`;
         }
         else continue;
         changed = true;
@@ -941,6 +941,13 @@ var _express = function (body, getname, ret) {
         q.name = cloneNode(body);
         return [q];
     }
+    if (isFunctionOnly(body)) {
+        result = [body];
+        return result;
+    }
+    else {
+        result = [];
+    }
     var result = [];
     var q = [];
     var bx = 0;
@@ -949,6 +956,7 @@ var _express = function (body, getname, ret) {
     var nameindex = 0;
     var maxindex = 0;
     var hasor = false;
+    var xorcount = 0;
     var getdeepname = function (deep = 0) {
         return getname(maxindex + deep);
     };
@@ -1007,12 +1015,20 @@ var _express = function (body, getname, ret) {
             q.name = cloneNode(name);
             if (isor) {
                 if (o.text === '||') {
+                    if (xorcount) {
+                        result.push(..._invoke(q, getdeepname));
+                        result[result.length - 1].ret_ = true;
+                        q = [];
+                        q.name = cloneNode(name);
+                    }
                     q.push(RE);
                 }
                 else if (o.text === '&&') {
                     q.push(RZ);
+                    xorcount++;
                 }
                 else if (o.text === '??') {
+                    xorcount++;
                     q.push(RD);
                 }
                 hasor = true;
@@ -1065,12 +1081,9 @@ var _express = function (body, getname, ret) {
         }
     }
     if (needname) q.name = [{ text: getname(nameindex), type: EXPRESS }];
-    relink(q);
-    if (isFunctionOnly(q, 2)) {
-        result = [q];
-    }
-    else {
-        result = _invoke(q, getdeepname);
+    if (q.length) {
+        relink(q);
+        result.push(..._invoke(q, getdeepname));
     }
     if (hasor) result[result.length - 1].ret_ = true;
     return result;

package/coms/compile/unstruct_test.js

@@ -158,4 +158,5 @@ unstruct.debug = true; r++;
 r++// test("if(a)else {}",'')
 test("if(a){if(b){c}d}else{e}", `if (!a) return [2, 0]; if (!b) return [1, 0]; c; return [1, 0];\r\n d; return [2, 0];\r\n e; return [1, 0]`)
 test("if(a){if(b){c}else{d}}else{e}", `if (!a) return [3, 0]; if (!b) return [1, 0]; c; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n e; return [1, 0]`)
+test("if(a&&b||c){d}", `_ = a; if (!_) return [1, 0]; _ = b;\r\n if (_) return [1, 0]; _ = c;\r\n if (!_) return [1, 0]; d; return [1, 0]`, true);
 test("if(a)switch(b){case c:d;break;} else{h}", `if (!a) return [3, 0]; if (b === c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n h; return [1, 0]`)