efront 4.22.13 → 4.22.14

package/coms/zimoli/appendChild.js

@@ -110,6 +110,7 @@ var wrapTargetMethod = function (target, methodName) {
     };
     newMethod.wrapped = true;
 };
+appendChild.dispatch = _onappend;
 appendChild.wrapTarget = function (target) {
     wrapTargetMethod(target, 'insertBefore');
     wrapTargetMethod(target, 'appendChild');

package/coms/zimoli/list.js

@@ -51,7 +51,7 @@ function ylist(container, generator, $Y) {
         }
         return null;
     };
-    var isSticky = child => isNode(child) && /^(sticky|fixed|absolute)$/.test(getComputedStyle(child).position);
+    var isSticky = child => isElement(child) && /^(sticky|fixed|absolute)$/.test(getComputedStyle(child).position);
     var getFirstVisibleElement = function (deltaY) {
         var children = list.childNodes;
         var { scrollTop } = list;
@@ -60,8 +60,9 @@ function ylist(container, generator, $Y) {
         if (deltaY) scrollTop += deltaY;
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var child = children[cx];
-            if (!isFinite(child.index) || child.index === null || isSticky(child)) continue;
+            if (!isFinite(child.index) || child.index === null) continue;
             var c = getNodeTarget(child);
+            if (isSticky(c)) continue;
             if (c.offsetTop + c.offsetHeight >= scrollTop + 1) return deltaY === 0 ? child : c;
         }
         return null;
@@ -108,8 +109,9 @@ function ylist(container, generator, $Y) {
         var children = list.children;
         for (var cx = children.length - 1; cx >= 0; cx--) {
             var child = children[cx];
-            if (!isFinite(child.index) || isSticky(child)) continue;
+            if (!isFinite(child.index)) continue;
             var c = getNodeTarget(child);
+            if (isSticky(c)) continue;
             if (c.offsetTop + 1 <= scrollTop + list.clientHeight - paddingBottom) {
                 return deltaY === 0 ? child : c;
             }

package/coms/zimoli/render.js

@@ -60,11 +60,10 @@ var renderidClosed = 0;
 var addRenderElement = function () {
     var element = this;
     if (!isNode(element)) return;
-    if (element.$renderid !== 9) {
-        // 只渲染一次
+    buildFirst(element);
+    if (element.$renderid > 10) {
         renderElements[element.$renderid] = element;
     }
-    buildFirst(element);
 };
 var removeRenderElement = function () {
     var element = this;
@@ -337,11 +336,6 @@ var createRepeat = function (search, id = 0) {
     initialComment(comment);
     return comment;
 };
-var initIfs = function (ifs) {
-    for (var s of ifs) {
-        initialComment(s[0]);
-    }
-};
 
 var ifget = function () {
     var elements = this.$elements;
@@ -384,6 +378,7 @@ var createIf = function (search, id = 0) {
     var comment = elements[0] = createComment.call(element, [new Binder2(ifget, ifset)], 'if', search);
     comment.$id = id;
     comment.$elements = elements;
+    initialComment(comment);
     return comment;
 };
 var parseIfWithRepeat = function (ifExpression, repeatExpression) {
@@ -495,7 +490,7 @@ var structures = {
         if (cx < 0) {
             throw new Error(i18n`else/elseif前缺少同级if！`);
         }
-        if (cx + 1 < if_top.length) initIfs(if_top.splice(cx + 1, if_top.length - cx - 1));
+        if (cx + 1 < if_top.length) if_top.splice(cx + 1, if_top.length - cx - 1);
         var top = if_top[cx];
         if (search) var getter = createGetter(this, search);
         var comment = createComment.call(this, undefined, search ? 'elseif' : 'else', search);
@@ -838,7 +833,7 @@ function renderProp(elem, props) {
     }
 }
 
-function renderBinds(element, binds, init) {
+function renderBinds(element, binds) {
     var bind = binders._;
     for (var k in binds) {
         if (directives.hasOwnProperty(k)) continue;
@@ -886,7 +881,7 @@ function renderArray(children, scope, parentScopes, once) {
             children[cx] = renderElement(children[cx], scope, parentScopes, once);
         }
         if (if_top_length < if_top.length) {
-            initIfs(if_top.splice(if_top_length, if_top.length - if_top_length));
+            if_top.splice(if_top_length, if_top.length - if_top_length);
         }
     };
     return children;
@@ -915,7 +910,6 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
                 throw new Error(i18n`父作用域链的长度必须相等着`);
             }
         }
-        element.$parentScopes = parentScopes || [];
         var s = createStructure(element);
         element.$struct = s;
         mountElementIds(element, s.ids);
@@ -923,14 +917,16 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         element.$eval = $eval;
     }
     element.$scope = scope;
+    element.$parentScopes = parentScopes || [];
     if (element.$renderid <= -1) element = renderStructure(element);
     if (!element) return;
     if (element.$renderid < 0 || element.nodeType !== 1) {
         return element;
     }
     var isFirstRender = !element.$renderid;
-
     if (isFirstRender) {
+        var lockid = renderlock.length;
+        renderlock[lockid] = null;
         element.$renderid = 1;
         var parentNode = element.parentNode;
         if (parentNode) {
@@ -960,7 +956,6 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
                     if (!replacer.$scope) replacer.$scope = scope;
                     if (!replacer.$parentScopes) replacer.$parentScopes = parentScopes;
                     createStructure(replacer);
-                    renderArray(getChildren(replacer), replacer.$scope, replacer.$parentScopes, once);
                     renderRest(replacer, replacer.$struct);
                 }
                 copyAttribute(replacer, copys);
@@ -973,9 +968,6 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
                 }
             }
         }
-    }
-    if (!replacer || element === replacer) renderArray(getChildren(element), scope, parentScopes, once);
-    if (isFirstRender) {
         renderRest(element, $struct, replacer);
         if (isNode(replacer) && replacer !== element) {
             if (!replacer.$renders) replacer.$renders = [];
@@ -984,9 +976,11 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         }
         if (element.$digest || element.$renders.length) {
             element.$ready = true;
-            renderlock.push(element);
+            renderlock[lockid] = element;
         }
+        else if (renderlock.length === lockid) renderlock.pop();
     }
+    renderArray(getChildren(element), element.$scope || scope, element.$parentScopes || parentScopes, once);
     return element;
 }
 var deepcontexts = [];
@@ -1228,40 +1222,45 @@ function createStructure(element, useExists) {
     element.$eval = $eval;
     return element.$struct = new Struct(ons, types, copys, binds, attr1, props, ids, once);
 }
-function renderUnlock() {
-    var locked = renderlock.reverse();
+function unlock(element) {
+    if (!element) return;
+    if (element.$renderid !== 9) {
+        element.$renderid = ++renderidOffset;
+        on("append")(element, addRenderElement);
+        onremove(element, removeRenderElement);
+        if (element.nodeType === 8);
+        else if (eagermount) buildFirst(element);
+    }
+    else {
+        buildFirst(element);
+    }
+}
+function renderUnlock(element) {
+    var locked = renderlock;
     renderlock = null;
-    locked.forEach(element => {
-        if (element.$renderid !== 9) {
-            element.$renderid = ++renderidOffset;
-            on("append")(element, addRenderElement);
-            onremove(element, removeRenderElement);
-            if (isMounted(element) || element.nodeType === 8);
-            else if (eagermount) buildFirst(element);
-        }
-        else {
-            buildFirst(element);
-        }
-    });
+    locked.forEach(unlock);
     eagermount = false;
+    var parentNode = element.parentNode;
+    if (parentNode && isMounted(parentNode)) appendChild.dispatch(element);
 }
-function renderLock() {
+function renderLock(element) {
     if (!renderlock) {
         renderlock = [];
+        element.$mounted = false;
         return true;
     }
     return false;
 }
 var eagermount = false, renderlock = null;
 function render(element, scope, parentScopes, lazy = true) {
-    var haslock = renderLock();
+    var haslock = renderLock(element);
     var if_top_length = if_top.length;
     if (isFinite(scope) && arguments.length === 2) lazy = scope, scope = undefined;
     else if (isFinite(parentScopes) && arguments.length === 3) lazy = parentScopes, parentScopes = undefined;
     var renderonce = lazy === 0;
     if (haslock) eagermount = !+lazy;
     var e = renderElement(element, scope, parentScopes, renderonce);
-    if (if_top_length < if_top.length) initIfs(if_top.splice(if_top_length, if_top.length - if_top_length));
+    if (if_top_length < if_top.length) if_top.splice(if_top_length, if_top.length - if_top_length);
     if (haslock) renderUnlock(element);
     if (haslock) callDigest();
     return e;

package/package.json

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