efront 3.19.0 → 3.19.1

package/coms/zimoli/drag.js

@@ -146,5 +146,4 @@ drag.on = function (target, actionTarget = target.dragTarget) {
     on("drop")(actionTarget || target, setZIndex);
     onmousedown(target, _mousedrag);
     ontouchstart(target, _touchdrag);
-    move.bindPosition(actionTarget || target);
 };

package/coms/zimoli/move.js

@@ -152,30 +152,12 @@ var fixPosition = move.fixPosition = function (target) {
 };
 move.coordIn = coordIn;
 move.trimCoord = trimCoord;
-var resizingTargets = [];
-on('resize')(window, function () {
-    resizingTargets.forEach(fixPosition);
-});
-var off;
-var resizeTarget = function () {
-    var target = this;
-    var index = resizingTargets.indexOf(target);
-    if (index < 0) index = resizingTargets.push(target);
-    return index;
+var fixTarget = function () {
+    fixPosition(this);
 };
-var removeResize = function () {
-    removeFromList(resizingTargets, this);
-};
-
 move.bindPosition = function (target, position) {
-    if (position) {
+    oncemount(target, function () {
         setPosition(target, position);
-    }
-    var index = resizingTargets.indexOf(target);
-    if (index >= 0) return;
-    on("append")(target, resizeTarget);
-    on("remove")(target, removeResize);
-    if (isMounted(target)) {
-        resizeTarget.call(target);
-    }
+    });
+    on("resize")(target, fixTarget);
 }

package/coms/zimoli/oncemount.js

@@ -3,5 +3,5 @@ function oncemount(target, handle) {
         handle.call(target);
         return;
     }
-    once("append")(target, handle);
+    once("mounted")(target, handle);
 }

package/coms/zimoli/render.js

@@ -213,27 +213,40 @@ var createRepeat = function (search, id = 0) {
         once("append")(this, initialComment.bind(this, renders, "repeat", expression));
     }
 };
+var comment = function (elements) {
+    for (var cx = elements.length - 2; cx > 1; cx -= 2) {
+        var e = elements[cx];
+        if (e.previousSibling === this) var c = this;
+        else {
+            var c = document.createComment('else' + (cx < elements.length - 2 ? "if .." : ''));
+            e.parentNode.insertBefore(c, e);
+        }
+        elements.splice(cx, 0, c);
+        remove(e);
+    }
+};
+var initIf = function (ifs) {
+    for (var s of ifs) {
+        comment(s);
+        if (s.parent) {
+            initialComment.call(s[0], s.renders, "if", s.comment);
+        } else {
+            once("append")(s[0], initialComment.bind(s[0], s.renders, "if", s.comment));
+        }
+    }
+};
 var createIf = function (search, id = 0) {
     // 懒渲染
     var getter = createGetter(search).bind(this);
     var element = this;
-    var p = element;
-    if (p.parentNode) {
-        p = p.parentNode;
-        for (var cx = 0, dx = if_top.length; cx < dx; cx++) {
-            if (if_top[cx].parent === p) {
-                break;
-            }
-        }
-    }
-    cx++;
-    if (cx > 0) if_top.splice(cx, if_top.length - cx);
     var elements = [element, getter];
     if_top.push(elements);
     var savedValue;
-    var renders = [function () {
+    elements.parent = this.parentNode;
+    elements.comment = search[1];
+    elements.renders = [function () {
         var shouldMount = -1;
-        for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
+        for (var cx = 0, dx = elements.length; cx < dx; cx += 3) {
             var getter = elements[cx + 1];
             if (!getter || getter()) {
                 shouldMount = cx;
@@ -242,10 +255,10 @@ var createIf = function (search, id = 0) {
         }
         if (savedValue === shouldMount) return;
         savedValue = shouldMount;
-        for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
+        for (var cx = 0, dx = elements.length; cx < dx; cx += 3) {
             var element = elements[cx];
             if (cx === shouldMount) {
-                appendChild.before(this, element);
+                appendChild.after(cx > 0 ? elements[cx - 1] : this, element);
                 if (element.renderid < 0) {
                     element.renderid = id;
                     elements[cx] = render(element, this.$scope, this.$parentScopes);
@@ -257,12 +270,6 @@ var createIf = function (search, id = 0) {
         }
 
     }];
-    if (this.parentNode) {
-        elements.parent = this.parentNode;
-        initialComment.call(this, renders, "if", search[1]);
-    } else {
-        once("append")(this, initialComment.bind(this, renders, "if", search[1]));
-    }
 };
 var parseIfWithRepeat = function (ifExpression, repeatExpression) {
     var repeater = parseRepeat(repeatExpression);
@@ -356,15 +363,18 @@ var structures = {
         createIf.call(this, search);
     },
     "else"(search) {
-        var top = if_top[if_top.length - 1];
-        if (!top || top.parent !== this.parentNode) {
+        for (var cx = if_top.length - 1; cx >= 0; cx--) {
+            if (if_top[cx].parent === this.parentNode) break;
+        }
+        if (cx < 0) {
             throw new Error("else/elseif前缺少同级if！");
         }
+        initIf(if_top.splice(cx + 1, if_top.length - cx - 1));
+        var top = if_top[cx];
         if (search && search[1]) {
             var getter = createGetter(search).bind(this);
         }
         top.push(this, getter);
-        remove(this);
     },
     repeat(search) {
         createRepeat.call(this, search);
@@ -853,7 +863,7 @@ function render(element, scope, parentScopes, lazy = true) {
         renderlock = false;
         eagermount = false;
     }
-    if (if_top_length < if_top.length) if_top.splice(if_top_length, if_top.length - if_top_length);
+    if (if_top_length < if_top.length) initIf(if_top.splice(if_top_length, if_top.length - if_top_length));
     return e;
 }
 var digest = lazy(refresh, -{});

package/coms/zimoli/resize.js

@@ -121,11 +121,8 @@ var handle = {
             }
         });
         var rect = dragging.rect;
-        move.call(rect, isFinite(style.left) ? style.left : rect.offsetLeft, isFinite(style.top) ? style.top : rect.offsetTop);
-        delete style.left;
-        delete style.top;
-        Object.keys(style).forEach(k => style[k] = fromOffset(style[k]));
         css(dragging.rect, style);
+        move.call(rect, isFinite(style.left) ? style.left : rect.offsetLeft, isFinite(style.top) ? style.top : rect.offsetTop);
         dispatch(dragging.rect, 'resize');
         resizingList.forEach(a => {
             if (getTargetIn(dragging.rect, a)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.19.0",
+    "version": "3.19.1",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {