efront 4.22.18 → 4.22.19

package/coms/zimoli/appendChild.js

@@ -19,12 +19,9 @@ function _onappend(node, append = createEvent("append"), mount = createEvent("mo
     }
     dispatch(node, mount);
 }
+
 function appendChild(parent, obj, transition) {
-    if (transition === false) {
-        var children = [].concat(obj);
-    } else {
-        var children = isArrayLike(obj) ? slice.call(obj, 0) : slice.call(arguments, 1);
-    }
+    var children = getArgsChildren(arguments);
     if (parent.appendChild) {
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var o = release(children[cx]);
@@ -43,11 +40,7 @@ function appendChild(parent, obj, transition) {
 function insertBefore(alreadyMounted, obj, transition) {
     var parent = alreadyMounted && alreadyMounted.parentNode;
     if (!parent || !parent.insertBefore) return;
-    if (transition === false) {
-        var children = [].concat(obj);
-    } else {
-        var children = isArray(obj) ? slice.call(obj, 0) : slice.call(arguments, 1);
-    }
+    var children = getArgsChildren(arguments);
     for (var cx = 0, dx = children.length; cx < dx; cx++) {
         var o = release(children[cx]);
         if (!o) continue;
@@ -60,21 +53,20 @@ function insertBefore(alreadyMounted, obj, transition) {
         }
     }
 }
+
 function insertAfter(alreadyMounted, obj, transition) {
     var parent = alreadyMounted && alreadyMounted.parentNode;
     if (!parent || !parent.insertBefore) return;
-    if (transition === false) {
-        var children = [].concat(obj);
-    } else {
-        var children = isArray(obj) ? slice.call(obj, 0) : slice.call(arguments, 1);
-    }
-    children = children.reverse();
+    var nextSibling = alreadyMounted.nextSibling;
+    var children = getArgsChildren(arguments);
+    transition = transition !== false;
+    if (!nextSibling) return appendChild(parent, children, transition);
     for (var cx = 0, dx = children.length; cx < dx; cx++) {
         var o = release(children[cx]);
         if (!o) continue;
         if (o.removeTimer) clearTimeout(o.removeTimer);
-        parent.insertBefore(o, alreadyMounted.nextSibling);
-        o.with && insertBefore(alreadyMounted.nextSibling, o.with, transition);
+        parent.insertBefore(o, nextSibling);
+        o.with && insertBefore(nextSibling, o.with, transition);
         if (isMounted(parent)) _onappend(o);
         if (hasEnterStyle(o) && transition !== false) {
             isFunction(appendChild.transition) && appendChild.transition(o);

package/coms/zimoli/getArgsChildren.js

@@ -0,0 +1,22 @@
+var getArgsChildren = function (args, from = 1) {
+    var obj = args[from];
+    if (isArray(obj) && !obj.with) return obj;
+    var transition = args[from + 1];
+    var children;
+    if (isArrayLike(obj)) {
+        children = Array.apply(null, obj);
+        var ith = obj.with;
+        while (ith) {
+            if (isNode(ith)) children.push(ith), ith = null;
+            else if (isArray(ith)) children.push.apply(children, ith), ith = ith.with;
+            else ith = null;
+        }
+    }
+    else if (transition === false) {
+        children = [].concat(obj);
+    }
+    else {
+        children = Array.prototype.slice.call(args, from);
+    }
+    return children;
+}

package/coms/zimoli/model.js

@@ -247,6 +247,9 @@ var setContent = function (value) {
         if (this.field.type === 'html') this.innerHTML = value;
         else this.innerText = value;
     }
+    else {
+        remove(this.childNodes);
+    }
 };
 var Binder = render.Binder, Model = render.Model;
 Object.keys(readonly_types).forEach(k => {

package/coms/zimoli/popup.js

@@ -26,7 +26,26 @@ var popup = function (path) {
     }
     throw new Error(i18n`参数异常:${path}`);
 };
+var onAppendUp = function () {
+    var upwith = this.$upwith;
+    if (isArray(upwith) && upwith.indexOf(this) < 0) {
+        upwith.push(this);
+    }
+};
+var onRemoveUp = function () {
+    var upwith = this.$upwith;
+    if (isArray(upwith)) {
+        removeFromList(upwith, this);
+    }
+};
+var setUpwith = function (page, upwith) {
+    if (!isArray(upwith)) return;
+    page.$upwith = upwith;
+    on('append')(page, onAppendUp);
+    on('remove')(page, onRemoveUp);
+};
 var popup_path = function (path = "", parameters, target) {
+    var upwith_ = upwith;
     if (!popup.go || !popup.prepare) throw new Error(i18n`当前环境无法使用`);
     // 3 has mask has view control
     var element;
@@ -86,6 +105,7 @@ var popup_path = function (path = "", parameters, target) {
         remove(element && element.$mask);
         element = popup.create(path, parameters);
         if (!element) return;
+        setUpwith(element, upwith_);
         load();
         element.$reload = fullfill;
         if (target == null && parameters !== false) {
@@ -106,8 +126,9 @@ var popup_path = function (path = "", parameters, target) {
         }, fullfill
     };
 };
-
+var upwith = null;
 var popup_view = function (element, target, style) {
+    setUpwith(element, upwith);
     if (isNode(target)) {
         if (target.$mask) {
             popup_with_mask(element, target);
@@ -395,9 +416,19 @@ var popup_fixup = function (element, x, y) {
 var popup_to_event = function (element, { clientX, clientY }) {
     popup_fixup(element, clientX, clientY);
 };
+
+popup.upwith = function (collects) {
+    return function () {
+        upwith = collects;
+        var res = popup.apply(this, arguments);
+        upwith = null;
+        return res;
+    }
+};
 var global = function (element, issingle) {
     once("remove")(element, cleanup);
-    rootElements.push(element);
+    var upwith = element.$upwith || rootElements;
+    if (upwith.indexOf(element) < 0) upwith.push(element);
     if (isMounted(element)) return;
     popup.global &&
         issingle !== false ? popup.global(element, true) : appendChild(document.body, element);

package/coms/zimoli/remove.js

@@ -1,15 +1,6 @@
-function remove() {
-    var [node, transition] = arguments;
+function remove(node, transition) {
     if (!node) return;
-    if (isNode(node)) {
-        if (transition !== false) {
-            var args = arguments;
-        } else {
-            var args = [node];
-        }
-    } else {
-        var args = node;
-    }
+    var args = getArgsChildren(arguments, 0);
     for (var cx = args.length - 1; cx >= 0; cx--) {
         node = args[cx];
         if (!node) continue;

package/coms/zimoli/zimoli.js

@@ -317,6 +317,7 @@ function prepare(pgpath, ok) {
         //只能在page上使用
         _pageback_listener = handler;
     };
+    state.upwith = popup.upwith(_with_elements);
     state.titlebar = function () {
         var realTitleBar = titlebar.apply(null, arguments);
         if (!realTitleBar.parentNode) _with_elements.push(realTitleBar);
@@ -388,8 +389,12 @@ function create(pagepath, args, from, needroles) {
     var _page = pg.call(state, args, from);
     if (undefined === args || null === args) args = {};
     if (_page) {
-        if (_with_length) _page.with = _with_elements.concat(_page.with || []);
-        _with_elements.splice(_with_length, _with_elements.length - _with_length);
+        var page_with = _with_elements.splice(_with_length, _with_elements.length - _with_length);
+        if (_page.with && _page.with !== _with_elements) {
+            page_with = page_with.concat(_page.with);
+            _with_elements.with = page_with;
+        }
+        _page.with = _with_elements;
         if (args.initialStyle) _page.initialStyle = args.initialStyle;
         if (args.holdupStyle) _page.holdupStyle = args.holdupStyle;
         if (_page.initialStyle && !_page.holdupStyle) {
@@ -671,7 +676,8 @@ function addGlobal(element, name = null, isBack) {
             if (isBack) appendChild.insert(body, element);
             else appendChild(body, element);
         }
-        rootElements.push(element);
+        var upwith = element.$upwith || rootElements;
+        if (upwith.indexOf(element) < 0) upwith.push(element);
     }
     if (hasLock) fixurl(), fixLock = false;
 }

package/package.json

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