efront 4.22.19 → 4.23.3

package/coms/zimoli/data.js

@@ -0,0 +1,16 @@
+basic$data.setReporter(
+    alert
+    // <!-- 
+    && function (error, type) {
+        basic$data.setReporter(alert);
+        alert(error, type);
+        console.info(i18n`已使用默认的报错工具，您可以使用 ${"data.setReporter(error_reporter,error_finder)"} 替换! 本信息在仅在开发环境显示。`);
+    }
+    // -->
+);
+basic$data.setEnvs(cross, on, onmounted);
+var updateLoadingCount = function () {
+    basic$data.loading_count = cross.requests.length;
+};
+on('render')(window, updateLoadingCount, true);
+return basic$data;

package/coms/zimoli/field.js

@@ -53,13 +53,13 @@ var reshape = function () {
 };
 var checkValue = function () {
     if (!(this.src instanceof Array)) return;
-    var { field, data } = this.$scope;
+    var scope = $scoped.get(this);
+    var { field, data } = scope;
     if (!field || !data) return;
     var v = data[field.key];
     if (!this.checked) if (v === this.oldValue || isEmpty(this.oldValue) && isEmpty(v)) return;
     this.checked = false;
     this.setAttribute("dirty", '');
-    var scope = this.$scope;
     var error = valid(field, data);
     if (error) {
         this.setAttribute("error", error);
@@ -120,7 +120,7 @@ function main(elem) {
         if (head) addClass(head, "head");
         if (body) addClass(body, "body");
         if (foot) addClass(foot, "foot");
-        elem.$renders.push(reshape);
+        elem.$renders = [reshape];
     }
     return elem;
 }

package/coms/zimoli/gallery_test.js

@@ -2,13 +2,14 @@ function main() {
     var items = new Array(100).fill(0).map((_, i) => ({ color: color.random(), name: "item " + (i + 1), height: Math.random() * 100 + 60 }));
     var layer = div();
     layer.innerHTML = template;
-    renderWithDefaults(layer, {
+    var scope = {
         gallery,
         data: []
-    });
+    };
+    renderWithDefaults(layer, scope);
     layer.querySelector("gallery").go(0);
     onappend(layer, function () {
-        layer.$scope.data = items;
+        scope.data = items;
     });
     return layer;
 }

package/coms/zimoli/getArgsChildren.js

@@ -12,7 +12,7 @@ var getArgsChildren = function (args, from = 1) {
             else ith = null;
         }
     }
-    else if (transition === false) {
+    else if (transition === false || transition === true || !isHandled(obj)) {
         children = [].concat(obj);
     }
     else {

package/coms/zimoli/getChanged.js

@@ -0,0 +1,8 @@
+function getChanged(current_props, previous_props) {
+    var changed = [];
+    keys(previous_props, current_props).forEach(function (key) {
+        if (key.charAt(0) === "$") return;
+        if (!isSame(current_props[key], previous_props[key])) changed.push(key);
+    });
+    return changed;
+}

package/coms/zimoli/getGenerator.js

@@ -1,13 +1,13 @@
+var renderIds = render.stepId;
 /**
  * @param {Element} template
  */
-var cloneChildNodes = function (template) {
+var cloneChildNodes = function (template, structs, ids) {
     var cloned = template.cloneNode(true);
     var cNodes = cloned.childNodes;
-    var tNodes = template.childNodes;
     for (var cx = 0, dx = cNodes.length; cx < dx; cx++) {
-        cNodes[cx].$struct = tNodes[cx].$struct;
-        cNodes[cx].$renderid = tNodes[cx].$renderid;
+        $structed.set(cNodes[cx], structs[cx]);
+        renderIds.set(cNodes[cx], ids[cx]);
     }
     return cNodes;
 }
@@ -23,12 +23,12 @@ var setitem = function (i, v) {
     if (isFunction(src.set)) return src.set(i);
     else return src[i] = v;
 }
-var createScope = function (container, index, com) {
+var createScope = function (container, index, com, wrap) {
     var parsedSrc = container.$src;
     var wraped = undefined;
     var origin = com;
-    if (container.$wrapItem) {
-        com = container.$wrapItem(com);
+    if (wrap) {
+        com = wrap(com);
     }
     if (com.constructor === Item) {
         wraped = com;
@@ -60,30 +60,31 @@ var createScope = function (container, index, com) {
     newScope.$origin = origin;
     return newScope;
 }
-var update = function (scope, index) {
+var update = function (scope, index, wrap) {
     var item = getitem.call(this, index);
     if (!isHandled(item) || item === scope.$origin) return;
-    var newScope = createScope(this, index, item);
+    var newScope = createScope(this, index, item, wrap);
     extend(scope, newScope);
 }
-
+var generatorScopes = new WeakMap;
+var generators = new WeakMap;
+var wrapItem1 = a => new Item(a);
 /**
  * @param {Element} container
  * @param {Element|string} tagName;
  */
 var getGenerator = function (container, tagName = 'item', wrapItem = false) {
     if (!container) return;
-    var scopes = container.$parentScopes || [];
-    if (container.$scope) scopes = scopes.concat(container.$scope);
-    container.$generatorScopes = scopes;
-    if (container.$generator) return container.$generator;
+    var generator = generators.get(container);
+    if (wrapItem) {
+        wrapItem = isFunction(wrapItem) ? wrapItem : wrapItem1;
+    }
+    if (generator) return generator;
+    var scopes = render.getScopes(container) || [];
     var template = document.createElement(container.tagName);
     var tagTemplate = isElement(tagName);
     var templates = [];
     var hasAfter = false;
-    if (wrapItem) {
-        container.$wrapItem = isFunction(wrapItem) ? wrapItem : Item;
-    }
     for (let a of container.childNodes) {
         if (a.nodeType === 1 && a.hasAttribute('insert')) {
             if (!templates.length) a.$isbefore = true;
@@ -111,19 +112,21 @@ var getGenerator = function (container, tagName = 'item', wrapItem = false) {
 
     appendChild(template, templates);
     render.struct(templates);
+    var ids, structs;
     if (tagTemplate) {
-        render.struct(tagName);
+        var tt = $structed.get(tagName);
         var template0 = templates[0];
-        template0.$struct = render.mergeStruct(tagName.$struct, template0.$struct);
-        template0.$renderid = tagName.$renderid;
+        tt = render.mergeStruct(tt, $structed.get(template0));
+        $structed.set(template0, tt);
+        renderIds.set(template0, renderIds.get(tagName));
     }
-    if (templates.length) container.$template = template;
+
     /**
      * @param {number} index;
      * @param {Object} com;
      * @param {Element} element;
      */
-    return container.$generator = function (index, com, element) {
+    generator = function (index, com, element) {
         if (com === undefined) {
             com = getitem.call(container, index);
         }
@@ -133,17 +136,22 @@ var getGenerator = function (container, tagName = 'item', wrapItem = false) {
             element = document.createElement(tagName);
         }
         else {
-            var childNodes = cloneChildNodes(template);
+            var childNodes = cloneChildNodes(template, structs, ids);
             element = childNodes[0];
             if (childNodes.length > 1) element.with = Array.prototype.slice.call(childNodes, 1);
         }
-        var scopes = container.$generatorScopes;
-        var newScope = createScope(container, index, com);
-        element.$scope = newScope;
-        element.$parentScopes = scopes;
-        element.$renders = [update.bind(container, newScope, index)];
+        var newScope = createScope(container, index, com, wrapItem);
+        element.$renders = [update.bind(container, newScope, index, wrapItem)];
         var newItem = render(element, newScope, scopes, false);
         if (element.with) newItem.with = render(element.with, newScope, scopes, false);
         return newItem;
     };
+    if (templates.length) {
+        generator.$template = template;
+        ids = Array.prototype.map.call(templates, a => renderIds.get(a));
+        structs = Array.prototype.map.call(templates, a => $structed.get(a));
+    }
+    generators.set(container, generator);
+    generator.scopes = scopes;
+    return generator;
 };

package/coms/zimoli/grid.js

@@ -290,7 +290,7 @@ function grid(breakpoints) {
     }
     extend(grid, grid_prototype);
     if (!breakpoints) {
-        if (grid.clientHeight || grid.$mounted) {
+        if (grid.clientHeight || $mounted.get(grid)) {
             createPointsWithChildren.call(grid);
         } else {
             on("append")(grid, createPointsWithChildren);
@@ -456,7 +456,7 @@ var grid_prototype = {
         run(this.breakpoints);
     },
     reshape() {
-        if (this.$mounted || this.offsetWidth || this.offsetHeight) {
+        if (this.offsetWidth || this.offsetHeight || $mounted.get(this)) {
             this._reshape();
         } else {
             once("append")(this, this._reshape);

package/coms/zimoli/isMounted.js

@@ -1,9 +1,12 @@
 function isMounted(parent) {
-    if ("$mounted" in parent) return parent.$mounted;
+    var m = $mounted.get(parent);
+    if (m !== undefined) return m;
     var temp = parent;
     while (temp && temp !== document.documentElement) {
-        if ("$mounted" in temp) {
-            return parent.$mounted = temp.$mounted;
+        if ($mounted.has(temp)) {
+            var m = $mounted.get(temp);
+            $mounted.set(parent, m);
+            return m;
         }
         temp = temp.parentNode;
     }

package/coms/zimoli/lattice.js

@@ -29,9 +29,7 @@ function lattice(element, minWidth, _maxWidth, layers) {
         _box.group = boxCount;
         if (savedCount === boxCount) return;
         _box.clean();
-        [].forEach.call(_box.children, function (c) {
-            build(c);
-        });
+        [].forEach.call(_box.children, build);
         return true;
     };
     if (layers) {
@@ -105,7 +103,7 @@ function main() {
             initMinWidth(arg);
         }
     });
-    if (element && element.$scope) {
+    if (element && element.$src) {
         layers = null;
     }
     return lattice(element, minWidth || 240, maxWidth, layers);

package/coms/zimoli/maps.js

@@ -185,8 +185,7 @@ function maps(config = {}) {
         canvas.map.refresh();
         canvas._default = canvas.map.defaultImage();
     };
-    if (canvas.$mounted) reshape();
-    else once("append")(canvas, reshape);
+    once("append")(canvas, reshape);
     bind('resize')(canvas, reshape);
 
     return canvas;

package/coms/zimoli/menu.js

@@ -197,6 +197,7 @@ function main() {
                         while (i < s.length) {
                             src0.push.apply(src0, s.slice(i, i += 1000));
                         }
+                        elem.src = src0;
                     });
                     menuList(elem, src0, emit, direction);
                 }

package/coms/zimoli/menuItem.js

@@ -2,10 +2,11 @@ var preventDefault = function (e) { e.preventDefault() };
 function main(elem, scope, hasIcon) {
     var item = elem || document.createElement('menu-item');
     item.innerHTML = menuItem;
-    if (isObject(scope) && scope !== item.$scope) {
+    var ms = $scoped.get(item);
+    if (isObject(scope) && scope !== ms) {
     }
-    else if (item.$scope) {
-        var scope = item.$scope;
+    else if (ms) {
+        var scope = ms;
     }
     var menu = scope;
     if (menu.menu || menu.$item) menu = menu.menu || menu.$item;

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);
@@ -258,7 +256,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 +282,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 +293,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];
@@ -304,12 +305,15 @@ var getOptionsFrom = function () {
     var { data, field } = this;
     return data[field.options_from];
 };
-function setModel(ipt) {
+function setModel(renders, ipt) {
     var elem = this;
     if (isHandled(ipt)) {
         if (isNode(ipt)) {
             var model = new Model(getScopeValue, setScopeValue, ipt);
-            model.hook(elem, elem.field.option_to ? copyOptionData : true);
+            var binder = model.hook(elem, elem.field.option_to ? copyOptionData : true);
+            removeFromList(renders, elem.$binder);
+            renders.push(binder);
+            elem.$binder = binder;
             if (elem !== ipt) appendChild(elem, ipt);
         }
         else {
@@ -319,18 +323,19 @@ 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);
         if (ipt && isFunction(ipt.then)) {
-            ipt.then(setModel.bind(elem));
+            ipt.then(setModel.bind(elem, renders));
         }
-        else setModel.call(elem, ipt);
+        else setModel.call(elem, renders, ipt);
         binder = null;
     }
     elem.$binder = binder;
@@ -350,11 +355,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

@@ -270,19 +270,24 @@ function pending(h, event) {
     }
     return h;
 }
+var changes = new WeakMap;
 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];
             if (h === handler && shallowEqual(e, eventtypes, 2) && c === context) {
                 hs.splice(cx, 1);
-                if (k === changes_key) element.$needchanges--;
+                if (k === changes_key) {
+                    var i = changes.get(element) - 1;
+                    if (i > 0) changes.set(element, i);
+                    else changes.delete(element), $watches.delete(element);
+                };
             }
         }
         if (!hs.length && hs.h) {
-            element[hk] = null;
+            hk.delete(element);
             if (element.removeEventListener) {
                 element.removeEventListener(k, hs.h, getListenerOption(eventtypes, k));
             }
@@ -292,7 +297,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,35 +346,44 @@ 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;
     }
     if (k === changes_key) {
-        if (!element.$needchanges) element.$needchanges = 0;
-        element.$needchanges++;
+        var i = changes.get(element) || 0;
+        changes.set(element, i + 1);
+        if (i === 0) {
+            if (!$watches.has(element)) $watches.set(element, {});
+        }
     }
     if (firstmost) handlers.unshift(listener2);
     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 +399,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 +425,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, hk, 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

@@ -27,20 +27,20 @@ var popup = function (path) {
     throw new Error(i18n`参数异常:${path}`);
 };
 var onAppendUp = function () {
-    var upwith = this.$upwith;
+    var upwith = $upwith.get(this);
     if (isArray(upwith) && upwith.indexOf(this) < 0) {
         upwith.push(this);
     }
 };
 var onRemoveUp = function () {
-    var upwith = this.$upwith;
+    var upwith = $upwith.get(this);
     if (isArray(upwith)) {
         removeFromList(upwith, this);
     }
 };
 var setUpwith = function (page, upwith) {
     if (!isArray(upwith)) return;
-    page.$upwith = upwith;
+    $upwith.set(page, upwith);
     on('append')(page, onAppendUp);
     on('remove')(page, onRemoveUp);
 };
@@ -365,7 +365,7 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
 };
 var _as_xextra = arriswise(_as_yextra, arguments);
 var popup_as_single = function (element, z) {
-    if (!isMounted(element)) css(element, `z-index:${Number.isFinite(z) ? z : zIndex()};`);
+    if (!isMounted(element)) css(element, `z-index:${isFinit(z) ? z : zIndex()};`);
     global(element, false);
 };
 var popup_to_point = function (element, [x, y]) {
@@ -427,7 +427,7 @@ popup.upwith = function (collects) {
 };
 var global = function (element, issingle) {
     once("remove")(element, cleanup);
-    var upwith = element.$upwith || rootElements;
+    var upwith = $upwith.get(element) || rootElements;
     if (upwith.indexOf(element) < 0) upwith.push(element);
     if (isMounted(element)) return;
     popup.global &&

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

@@ -33,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);