efront 4.11.4 → 4.11.6

package/coms/zimoli/render.js

@@ -711,6 +711,11 @@ function getFromScopes(key, scope, parentScopes) {
 
 function renderRest(element, struct, replacer = element) {
     var renders = element.$renders;
+    if (element.renders) {
+        if (!renders) renders = [];
+        renders.push.apply(renders, element.renders);
+        delete element.renders;
+    }
     element.$renders = [];
     var { binds, attrs, props } = struct;
     for (var k in binds) {
@@ -802,7 +807,6 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
                     if (replacer.children && replacer.children.length) renderElement(replacer.children, replacer.$scope, replacer.$parentScopes, once);
                     renderRest(replacer, replacer.$struct);
                 }
-
                 copyAttribute(replacer, copys);
                 if (nextSibling) appendChild.before(nextSibling, replacer);
                 else if (parentNode) appendChild(parentNode, replacer);
@@ -822,9 +826,6 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     if (isNode(replacer) && replacer !== element) {
         if (!replacer.$renders) replacer.$renders = [];
         replacer.$renders.push.apply(replacer.$renders, element.$renders);
-        if (replacer.$struct && replacer.$struct !== element.$struct) {
-            element.$struct.ons.forEach(([on, key, value]) => on.call(element, replacer, key, value));
-        }
         element = replacer;
     }
     if (element.$renders.length) {

package/coms/zimoli/view.js

@@ -90,18 +90,8 @@ var init = function () {
         marginRight: -getScrollbarWidth() + "px"
     });
 };
-var isType = function (target, type) {
-    // 记得小时候，不论是苍蝇还是蚊子，飞起来都是有声音的。最近看到的一种像蚊子一样小的飞虫，喜欢像苍蝇一样趴在食物上，飞起来却听不到声音。
-    // 是我的听力下降了？还是外界太过嘈杂？还是飞虫拍打翅膀的频率超出了我的听觉范围？还是飞行可以不产生声音？
-    return target.hasAttribute(type) || hasClass(target, type);
-}
 var resize2 = function () {
-    var head, body, foot;
-    for (var c of this.children) {
-        if (isType(c, "head")) head = c;
-        else if (isType(c, "body")) body = c;
-        else if (isType(c, "foot")) foot = c;
-    }
+    var [head, body, foot] = getTypedChildren(this, ["head", "body", "foot"]);
     if (head && body) {
         var height = head.offsetHeight + head.offsetTop;
         css(head, {
@@ -121,7 +111,7 @@ var resize2 = function () {
         })
     }
     if (body) {
-        if (body.scrollHeight + body.offsetTop > this.clientHeight) {
+        if (body.scrollHeight + body.offsetTop > this.clientHeight + 1) {
             css(body, { height: fromOffset(this.clientHeight) });
         }
         else {

package/coms//350/214/250/350/217/260/tab.js

@@ -27,8 +27,9 @@ return function (forcetab) {
     }
     else if (anchorNode.nodeType === 3) {
         if (forcetab === 0) return;
-        anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + ensp(4) + anchorNode.nodeValue.slice(anchorOffset);
-        anchorOffset += 4;
+        var spaceSize = (4 - anchorOffset % 4);
+        anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + ensp(spaceSize) + anchorNode.nodeValue.slice(anchorOffset);
+        anchorOffset += spaceSize;
         selection.setBaseAndExtent(anchorNode, anchorOffset, anchorNode, anchorOffset);
     }
 };

package/coms//350/214/250/350/217/260//344/270/212/350/211/262.xht

@@ -95,5 +95,5 @@
     }
 </style>
 <script>
-    茨菰$渲染;
+    渲染;
 </script>

package/coms//350/214/250/350/217/260//347/274/226/350/276/221/346/241/206.xht

@@ -1,17 +1,36 @@
+<style>
+    & {
+        overflow: auto;
+        border: 6px solid transparent;
+        border-top: 0;
+        border-bottom: 0;
+        display: block;
+        padding: 6px 0;
+    }
+</style>
 <编辑框 e-class="上色.className" e-style="{whiteSpace:'pre'}" onkeyup="!event.isComposing&&updatecode(event)"
     onkeydown.tab="keytab(event)" onkeyup.enter="tab(false)">
 </编辑框>
 <script>
     var coder = this;
-    care(coder, function ([text, type]) {
+    var coderid = 0;
+    care(coder, async function ([text, type]) {
         try {
-            var colored = 上色.text(type, text);
-            coder.innerHTML = colored;
             coder.type = type;
+            await coder.setValue(text);
         } catch {
             if (typeof text === 'string') coder.innerHTML = 渲染.encode(text);
         }
-    })
+    });
+    coder.setValue = async function (text) {
+        var id = ++coderid;
+        var colored = await 上色.text(this.type, text);
+        if (id !== coderid) return;
+        coder.innerHTML = colored;
+    };
+    coder.getValue = function () {
+        return coder.innerText;
+    };
     var markAnchorOffset = function () {
         var { anchorNode, anchorOffset } = document.getSelection();
         if (!anchorNode || !coder) return;
@@ -111,7 +130,8 @@
         coder.scrollTop = scrollTop;
         coder.scrollLeft = scrollLeft;
     };
-    var updatecode = lazy(function (event) {
+    var updatecode = lazy(async function (event) {
+        var id = ++coderid;
         var trimreg = /[\s\u00a0\u2002\u0080]+([\}\{\;\[\]\(\)\,\>\<\+\-\*\&\^\/%!~:?])*/g;
         var innerText = coder.innerText;
         if (jstext.replace(trimreg, trimspace).trim() === innerText.replace(trimreg, trimspace).trim()) return;
@@ -119,9 +139,11 @@
         markAnchorOffset();
         var innerText = coder.innerText;
         unmarkAnchorOffset();
-        var text = 上色.text(coder.type, innerText);
+        var text = await 上色.text(coder.type, innerText);
+        if (coderid !== id) return;
         更新(text);
         unmarkAnchorOffset();
+        dispatch(coder, 'change');
         return;
     });
     var keytab = function (event) {

package/coms//350/214/250/350/217/260//350/277/275/345/212/240/345/205/211/346/240/207.js

@@ -13,7 +13,7 @@ var patchBlink = function (code, index, blink) {
             }
             return true;
         }
-        else if (c.start < index && c.end > index) {
+        else if (c.start < index && (c.end > index || c.end === undefined)) {
             if (haschildren(c)) {
                 return patchBlink(c, index, blink);
             }

package/docs//345/267/245/345/205/267//345/255/227/347/254/246/351/233/206/346/243/200/346/237/245.xht

@@ -10,7 +10,6 @@
         display: inline-block;
         position: relative;
         vertical-align: top;
-        padding-bottom: 44px;
     }
 
     field:nth-child(n+2) [textarea] {
@@ -18,16 +17,8 @@
         outline: none;
     }
 
-    label {
-        margin-top: -44px;
-        padding: 0 20px;
-    }
-
     .padding {
         border: none;
-        padding: 0 20px;
-        width: 100%;
-        display: block;
     }
 
     [textarea] {

package/package.json

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