efront 4.11.6 → 4.11.8

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]`)

package/coms/zimoli/field.less

@@ -3,12 +3,13 @@
     box-shadow: none !important;
     display: block;
     line-height: 22px;
-    border-bottom: 1px;
+    padding: 8px 0;
+    border-bottom: 1px solid #0001;
 }
 
 >.head,
 >.foot {
-    padding: 10px 16px;
+    padding: 2px 16px;
     vertical-align: top;
     display: inline-block;
     position: absolute;
@@ -24,6 +25,12 @@ model {
 }
 
 >.head {
+    font-weight: 600;
+    font-family: "宋体";
+
+    &:after {
+        content: ":";
+    }
 
     .image {
         margin: 10px 0;
@@ -35,10 +42,10 @@ model {
         margin: 10px 0;
     }
 
+    min-height: 30px;
     vertical-align: top;
-    padding: 10px 20px;
+    padding: 2px 16px;
     height: 100%;
-    border-bottom: 1px solid #0001;
     display: inline-block;
     width: 100%;
     text-align: left;

package/coms/zimoli/render.js

@@ -543,7 +543,7 @@ var directives = {
         var parsedSrc = this.$src;
         return src2.call(this, parsedSrc && /[\{\[\s]/.test(src) ? parsedSrc.srcName : src);
     },
-    model(search, target) {
+    model(search, target, change) {
         var getter = createGetter(this, search);
         var oldValue;
         var getstr = target.getValue instanceof Function ? "this.getValue()" : "";
@@ -561,12 +561,12 @@ var directives = {
             oldValue = value;
             this[key] = value;
         };
-        if (/^input$/i.test(target.tagName) && /^checkbox$/i.test(target.type) || /^checkbox$/i.test(target.tagName)) {
-            this.$renders.push(setter || setter2.bind(target, 'checked'));
-            var change = getstr || "this.checked";
-        } else if (("value" in target || target.getValue instanceof Function) && target.setValue instanceof Function) {
+        if (("value" in target || target.getValue instanceof Function) && target.setValue instanceof Function) {
             this.$renders.push(setter);
             var change = getstr || "this.value";
+        } else if (/^input$/i.test(target.tagName) && /^checkbox$/i.test(target.type) || /^checkbox$/i.test(target.tagName)) {
+            this.$renders.push(setter || setter2.bind(target, 'checked'));
+            var change = getstr || "this.checked";
         } else if (/^(select|input|textarea)$/i.test(target.tagName) || "value" in target) {
             this.$renders.push(setter || setter2.bind(target, 'value'));
             var change = getstr || "this.value";
@@ -580,6 +580,7 @@ var directives = {
             });
             var change = getstr || "'value' in this?this.value:this.innerHTML";
         }
+        if (change === false) return;
         setter2 = null;
         var changeme = $$eval.bind(this, search + "=" + change, getScopeList(this));
         var onchange = function () {
@@ -593,6 +594,9 @@ var directives = {
         };
         eventsBinders.forEach(on => on(target, onchange, true));
     },
+    value(search, target) {
+        directives.model.call(this, search, target, false);
+    },
 
 };
 // property binder
@@ -993,7 +997,7 @@ function createStructure(element, useExists) {
         }
         // ng-html,ng-src,ng-text,ng-model,ng-style,ng-class,...
         var key = name.replace(/^(ng|v|[^\_\:\.]*?)\-|^[\:\_\.]|^v\-bind\:/i, "").toLowerCase();
-        if (directives.hasOwnProperty(key) || /^([\_\:\.]|v\-bind\:)/.test(name)) {
+        if (key.length !== name.length && directives.hasOwnProperty(key) || /^([\_\:\.]|v\-bind\:)/.test(name)) {
             if (value) binds[key] = value;
             element.removeAttribute(name);
         }

package/coms/zimoli/view.js

@@ -92,8 +92,12 @@ var init = function () {
 };
 var resize2 = function () {
     var [head, body, foot] = getTypedChildren(this, ["head", "body", "foot"]);
-    if (head && body) {
+    var changed = false;
+    a: if (head && body) {
         var height = head.offsetHeight + head.offsetTop;
+        if (head.$height === height) break a;
+        head.$height = height;
+        changed = true;
         css(head, {
             marginBottom: fromOffset(-height),
         })
@@ -101,8 +105,11 @@ var resize2 = function () {
             paddingTop: fromOffset(height - body.clientTop)
         });
     }
-    if (foot && body) {
+    a: if (foot && body) {
         var height = foot.offsetHeight;
+        if (foot.$height === height) break a;
+        foot.$height = height;
+        changed = true;
         css(body, {
             paddingBottom: fromOffset(height)
         });
@@ -110,13 +117,11 @@ var resize2 = function () {
             marginTop: fromOffset(-height)
         })
     }
-    if (body) {
+    if (changed) {
+        css(body, { height: '' });
         if (body.scrollHeight + body.offsetTop > this.clientHeight + 1) {
             css(body, { height: fromOffset(this.clientHeight) });
         }
-        else {
-            css(body, { height: '' });
-        }
     }
 };
 function view(element) {

package/coms//350/214/250/350/217/260//346/270/262/346/237/223.js

@@ -9,7 +9,7 @@ var rows = function (type, text) {
         console.log(text)
         return [];
     }
-    type = type.toLowerCase();
+    type = String(type).toLowerCase();
     if (type in 语言) {
         var c = 语言[type](text);
         标签化(c, encode);

package/package.json

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