efront 4.22.18 → 4.23.0

package/coms/zimoli/menuList.js

@@ -133,9 +133,7 @@ function main() {
         if (!item.length) return;
         var menu = item.menu;
         if (!menu) {
-            var clone = template.cloneNode();
-            clone.$parentScopes = page.$parentScopes;
-            clone.$scope = page.$scope;
+            var clone =render.clone(template);
             clone.$src = src;
             clone.innerHTML = template.innerHTML;
             menu = item.menu = main(clone, item.children, active);
@@ -165,6 +163,7 @@ function main() {
         template.innerHTML = page.innerHTML;
         page.$template = template;
     }
+    var cloner = render.createCloner(template);
     var enterMenuEnabled = 0;
     onmousemove(page, function () {
         enterMenuEnabled = +new Date;
@@ -258,7 +257,7 @@ function main() {
     };
     var $scope = {
         "menu-item"(e, s) {
-            if (e && s === e.$scope) s = itemName ? s[itemName] : s.$item.value;
+            if (e && s === $scoped.get(e)) s = itemName ? s[itemName] : s.$item.value;
             var a = button(
                 menuItem(e, s, this.hasIcon)
             );
@@ -284,6 +283,7 @@ function main() {
     ItemTemplate.setAttribute("e-class", className);
     if (src.itemName) ItemTemplate.setAttribute("e-if", notHidden);
     ItemTemplate.innerHTML = menuItem.template;
+    page.src = items;
     var generator = getGenerator(page, ItemTemplate, (item) => {
         if (item.constructor !== Item) item = new Item(item);
         if (istoolbar) {
@@ -294,15 +294,15 @@ function main() {
         }
         return item;
     });
-    page.$generatorScopes.push($scope);
-    page.src = items;
+    var generatorScopes = generator.scopes;
+    generatorScopes.push($scope);
     list(page, generator, direction);
     if (!page.$renders) page.$renders = [];
     page.$renders.unshift(function () {
-        this.$scope.hasIcon = hasIcon();
+        $scope.hasIcon = hasIcon();
     });
     var getMenu = function (a) {
-        return a.$scope.$item;
+        return $scoped.get(a).$item;
     }
     page.open = function (a) {
         var amenu = getMenu(a);

package/coms/zimoli/menu_test.js

@@ -22,12 +22,13 @@ function main() {
             ]
         }]
     }], 20);
-    render(page, {
+    var scope = {
         ylist: menu,
         menus: []
-    });
+    };
+    render(page, scope);
     on("append")(page, function () {
-        page.$scope.menus = data;
+        scope.menus = data;
         page.querySelector("ylist").go(0)
     });
     return page;

package/coms/zimoli/model.js

@@ -56,9 +56,10 @@ var constructors = {
         return e;
     },
     success(e) {
+        var { field } = e;
         success(e);
         e.innerHTML = `<span ng-html="field.comment"></span>`;
-        render(e.children, e.$scope, e.$parentScopes);
+        render(e.children, { field });
         return e;
     },
     switch: swap,
@@ -147,8 +148,8 @@ var constructors = {
     },
     "repeat"(_) {
         var elem = input();
+        var { field, data } = _;
         elem.$renders = [function () {
-            var { field, data } = this.$scope;
             var { status } = this;
             var field_type = field.ref;
             var valid = this.value === data[field_type];
@@ -247,6 +248,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 => {
@@ -316,11 +320,12 @@ function setModel(ipt) {
 }
 function setBinder(elem, binder) {
     if (binder === elem.$binder) return;
-    removeFromList(elem.$renders, elem.$binder);
+    var renders = $renders.get(elem);
+    removeFromList(renders, elem.$binder);
     remove(elem.childNodes);
     if (binder instanceof Binder) {
         binder.call(elem);
-        elem.$renders.push(binder);
+        renders.push(binder);
     }
     else {
         var ipt = binder(elem);
@@ -347,11 +352,11 @@ var createOptionsMap = function (options) {
 }
 readonly_types.radio = readonly_types.select = readonly_types.swap;
 var findReaderForElement = function (type, e) {
-    var editor = render.getFromScopes(type, e.$scope, e.$parentScopes);
+    var editor = render.findKey(type, e);
     if (isFunction(editor) && (editor.isreader || !editor.isediter) && editor.isreader !== false) return editor;
 };
 var findEditerForElement = function (type, e) {
-    var editor = render.getFromScopes(type, e.$scope, e.$parentScopes);
+    var editor = render.findKey(type, e);
     if (isFunction(editor) && (editor.isediter || !editor.isreader) && editor.isediter !== false) return editor;
 };
 var markReader = function (readers) {

package/coms/zimoli/on.js

@@ -272,7 +272,7 @@ function pending(h, event) {
 }
 var remove = function (k, hk, [eventtypes, handler, context]) {
     var element = this;
-    var hs = element[hk];
+    var hs = hk.get(element);
     if (hs) {
         for (var cx = hs.length - 1; cx >= 0; cx--) {
             var [e, h, c] = hs[cx];
@@ -282,7 +282,7 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
             }
         }
         if (!hs.length && hs.h) {
-            element[hk] = null;
+            hk.delete(element);
             if (element.removeEventListener) {
                 element.removeEventListener(k, hs.h, getListenerOption(eventtypes, k));
             }
@@ -292,7 +292,7 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
 };
 var broadcast = function (k, hk, event) {
     var element = this;
-    var handlers = element[hk];
+    var handlers = hk.get(element);
     if (handlers.length > 1) handlers = handlers.slice();
     if (event.which === 1 && event.buttons === 0) {
         // firefox 无按键
@@ -341,7 +341,7 @@ var checkroot = function (element, k) {
 var append = function (k, hk, listener2, firstmost) {
     var [eventtypes, handler, context] = listener2;
     var element = this;
-    var handlers = element[hk];
+    var handlers = hk.get(element);
     for (var [e, h, c, d] of handlers) {
         if (h === handler && c === context && shallowEqual(eventtypes, e, 2)) return d.dulp = true, d;
     }
@@ -353,23 +353,29 @@ var append = function (k, hk, listener2, firstmost) {
     else handlers.push(listener2);
     return listener2[3] = remove.bind(element, k, hk, listener2);
 };
-
+var emitersMap = Object.create(null);
+var getEmiters = function (k, eventtypes) {
+    k = k + +!!eventtypes.capture;
+    k = k + +!!eventtypes.passive;
+    var m = emitersMap[k];
+    if (!m) m = emitersMap[k] = new WeakMap;
+    return m;
+}
 var on = document.efronton = function (k) {
     var on_event_path = "on" + k;
     if (handlersMap[on_event_path]) return handlersMap[on_event_path];
     var eventtypes = parseEventTypes(k);
     k = k.replace(eventtypereg, '');
-    var handler_path = "$h_" + k;
-    var hk = handler_path + +!!eventtypes.capture;
-    if (supportPassive) hk += +!!eventtypes.passive;
+    var hk = getEmiters(k, is_addEventListener_enabled && eventtypes);
     if (is_addEventListener_enabled) var addhandler = function (context, handler, firstmost = false) {
         var target = this || context;
         target = checkroot(target, k);
-        if (target[hk] instanceof Array) {
-        } else {
+        var emiters = hk.get(target);
+        if (!emiters) {
             var h = broadcast.bind(target, k, hk);
-            target[hk] = [];
-            target[hk].h = h;
+            emiters = [];
+            emiters.h = h;
+            hk.set(target, emiters);
             if (target.addEventListener)
                 target.addEventListener(k, h, getListenerOption(eventtypes, k));
             else target[on_event_path] = h;
@@ -385,8 +391,8 @@ var on = document.efronton = function (k) {
                 firstmost = true;
             }
             target = checkroot(target, k);
-            if (target[handler_path] instanceof Array) {
-            } else {
+            var emiters = hk.get(target);
+            if (!emiters) {
                 var h = function (e) {
                     if (!e) e = window.event || {};
                     if (!e.target && e.srcElement) {
@@ -411,16 +417,18 @@ var on = document.efronton = function (k) {
                     if (e.keyCode) {
                         if (e.which === undefined) e.which = e.keyCode;
                     }
-                    broadcast.call(target, k, handler_path, e);
+                    broadcast.call(target, k, emiters, e);
                     return e.returnValue;
                 };
-                target[handler_path] = target["on" + k] && target["on" + k] !== handler ? [[{}, target["on" + k]]] : [];
-                target[handler_path].h = h;
-                target["on" + k] = h;
-
+                var emiters = [];
+                emiters.h = h;
+                var h0 = target[on_event_path];
+                if (h0 && h0 !== h) emiters.push([{}, h0, target]);
+                hk.set(target, emiters);
+                target[on_event_path] = h;
             }
             var listener = [eventtypes, handler, context];
-            return append.call(target, k, handler_path, listener, firstmost);
+            return append.call(target, k, hk, listener, firstmost);
         }, addhandler = function (context, handler, firstmost) {
             return _addhandler(context, context, handler, firstmost);
         };

package/coms/zimoli/picture.js

@@ -47,13 +47,6 @@ var create = function (url, key, report_error) {
         remove(p);
     };
     image.park = function (x, y, scaled, rotate) {
-        var style = get_style(x, y, scaled, rotate);
-        var a = transition(imgpic, style, true);
-        setTimeout(function () {
-            // set_unlock();
-            // image.locked = false;
-        }, a || 0);
-
     };
     var init = function () {
         if (!imgpic) return;

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/radio.js

@@ -27,7 +27,7 @@ function main(elem = document.createElement("radio-group")) {
         }
     });
     elem.setValue = function (key) {
-        var { options } = this.$scope;
+        var { options } = $scoped.get(this);
         if (!(options instanceof Array)) return;
         var index = options.map(a => getValue(a)).indexOf(key);
         options.active = options[index];

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;
@@ -42,14 +33,14 @@ function hasLeaveStyle(o) {
 }
 
 function _onremove(node, event) {
-    if (!node || node.$mounted === false) return;
+    if (!node || $mounted.get(node) === false) return;
     var children = node.childNodes;
-    if (node.$mounted) {
+    if ($mounted.get(node)) {
         if (!event) {
             event = createEvent("remove");
         }
         dispatch(node, event);
-        node.$mounted = false;
+        $mounted.set(node, false);
     }
     if (children) for (var cx = 0, dx = children.length; cx < dx; cx++) {
         _onremove(children[cx], event);