efront 4.22.18 → 4.23.0

package/coms/frame/list.js

@@ -6,7 +6,7 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
             return;
         }
         var callback = function () {
-            page.$scope.load();
+            page_scope.load();
         };
         if (isFunction(edit_ref)) {
             var p = await edit_ref({ fields, data: o, callback });
@@ -54,12 +54,12 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
                     return;
                 }
                 await remove(o);
-                page.$scope.load();
+                page_scope.load();
             }
         }
     ];
     if (options0) options = options.concat(options0);
-    renderWithDefaults(page, {
+    var page_scope = {
         title,
         load() {
             this.data = load();
@@ -74,9 +74,10 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
         async add() {
             await edit();
         },
-    });
+    }
+    renderWithDefaults(page, page_scope);
     on("append")(page, function () {
-        page.$scope.load();
+        page_scope.load();
     });
     return page;
 }

package/coms/kugou/bindScroll.js

@@ -53,6 +53,5 @@ function bindScroll(titlebar, page) {
         setOpacity(label, 1 - (titlebar.offsetHeight - topHeight) / (offsetHeight - topHeight));
         return {};
     };
-    if (!page.$renders) page.$renders = [];
     page.onscroll = refresh;
 }

package/coms/kugou/buildScroll.js

@@ -3,7 +3,7 @@ function Main(dataid, datapath, titleid) {
     var page = createVboxWithState(state);
     page.initialStyle = 'margin-left:100%';
     page.innerHTML = buildScroll;
-    render(page, {
+    var pgscope = {
         list: lattice,
         song,
         padding,
@@ -20,7 +20,8 @@ function Main(dataid, datapath, titleid) {
         config: {},
         player: kugou$player,
         datas: []
-    });
+    };
+    render(page, pgscope);
     bindScroll(_titlebar, page);
     var loadedId, requested = false;
     function main(params) {
@@ -31,8 +32,8 @@ function Main(dataid, datapath, titleid) {
             var ranklist = data.from(dataid, {
                 id
             }, parseSongsList);
-            page.$scope.config = params;
-            page.$scope.datas = ranklist;
+            pgscope.config = params;
+            pgscope.datas = ranklist;
             if (titleid) {
                 data.from(titleid, {
                     id

package/coms/kugou/krc.js

@@ -120,7 +120,7 @@ function createLRC(lrc) {
                     setClass(krcList, index);
                 }
             }
-            if (ele && firstChild && firstChild.$mounted) {
+            if (ele && firstChild && isMounted(firstChild)) {
                 var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
                 css(firstChild, `margin-top:${marginTop | 0}px;`);
             }
@@ -166,7 +166,7 @@ function createKRC(krc) {
             var current_row_word = current_words[current_row_index];
             var ele = krcList[index];
             var firstChild = krcList[0];
-            if (ele && firstChild && firstChild.$mounted) {
+            if (ele && firstChild && isMounted(firstChild)) {
                 var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
                 if (index > 0) {
                     if (markerLabel.parentNode !== ele) {

package/coms/kugou/player.js

@@ -87,7 +87,7 @@ var oncanplay = on("canplay"), ondataloaded = on("loadeddata");
 on("keydown")(window, function (event) {
     var { target } = event;
     if (/^(input|select|textarea)$/i.test(target.tagName)) return;
-    var $scope = player.$scope;
+    var $scope = $scoped.get(player);
     if (!$scope.audio && !kugou$musicList.getActived()) return;
     switch (event.keyCode || event.which) {
         case 32:
@@ -418,7 +418,7 @@ var createControls = function () {
     moveupon(player, {
         end() {
             var currentHeight = calcPixel(this.offsetHeight), windowHeight = calcPixel(window.innerHeight);
-            var $scope = this.$scope;
+            var $scope = $scoped.get(this);
             var { deltaTop } = this;
             removeClass(this, "dragging");
             if (deltaTop) {

package/coms/kugou/song.js

@@ -1,5 +1,5 @@
 function dplay() {
-    this.firstChild.$scope.play();
+    $scoped.get(this.firstChild).play();
 }
 function main(elem) {
     elem = elem || document.createElement("song");

package/coms/layer/leftCenter.js

@@ -38,12 +38,12 @@ function setCurrentPage(page) {
     var currentLayer = getCurrentLayer();
     if (page !== leftPage) {
         if (currentLayer !== leftLayer) {
-            if (!leftPage.$mounted) appendChild(leftLayer, leftPage);
+            if (!isMounted(leftPage)) appendChild(leftLayer, leftPage);
         } else {
             remove(leftPage, false);
         }
         if (page.parentNode !== currentLayer) appendChild(currentLayer, page, false);
-    } else if (!leftPage.$mounted) {
+    } else if (!isMounted(leftPage)) {
         appendChild(leftLayer, leftPage, false);
     }
 }
@@ -54,16 +54,16 @@ function main(_leftPage) {
 layer.layer = function (child, old) {
     remove(old);
     if (child === leftPage) {
-        if (!leftPage.$mounted) appendChild(leftLayer, child);
+        if (!isMounted(leftPage)) appendChild(leftLayer, child);
     } else if (child) {
         var currentLayer = getCurrentLayer();
         appendChild(currentLayer, child);
         if (currentLayer === leftLayer) {
             if (arguments.length > 1) remove(leftPage);
-        } else if (!leftPage.$mounted) {
+        } else if (!isMounted(leftPage)) {
             appendChild(leftLayer, leftPage);
         }
     } else {
-        if (!leftPage.$mounted) appendChild(leftLayer, leftPage);
+        if (!isMounted(leftPage)) appendChild(leftLayer, leftPage);
     }
 };

package/coms/pivot/checkGeo.js

@@ -20,7 +20,6 @@ return async function (a) {
     var m = /(\d+\.){3}\d+$/.exec(ip);
     ip = m ? m[0] : ip;
     var res = await data.from("ipcn", { ip });
-    console.log(res)
     if (!res.address && !res.data) res = await baidu(ip);
     var msg = '加载错误';
     if (res.message && !res.data && !res.content && !res.address) {

package/coms/zimoli/$eval.js

@@ -0,0 +1 @@
+render.eval;

package/coms/zimoli/$mounted.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$parented.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$renders.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$scoped.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/$structed.js

@@ -0,0 +1 @@
+new WeakMap;

package/coms/zimoli/HexEditor.js

@@ -1,5 +1,5 @@
 var toHex = lazy(function (event) {
-    var data = this.$scope.data;
+    var data = $scoped.get(this).data;
     data.splice(0, data.length);
     this.innerText.replace(/[a-f\d]{2}/g, function (a) {
         a = parseInt(a, 16);

package/coms/zimoli/appendChild.js

@@ -9,9 +9,9 @@ function hasEnterStyle(e) {
 }
 
 function _onappend(node, append = createEvent("append"), mount = createEvent("mounted")) {
-    if (node.$mounted) return;
+    if ($mounted.get(node)) return;
     if (node.nodeType !== 1 && node.nodeType !== 8) return;
-    node.$mounted = true;
+    $mounted.set(node, true);
     dispatch(node, append);
     var children = Array.apply(null, node.childNodes);
     for (var c of children) {
@@ -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/autodragchildren_test.js

@@ -11,7 +11,7 @@ function main() {
         xsrc: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
     })
     autodragchildren(xList, xList, function (src, dst) {
-        var xsrc = xList.$scope.xsrc;
+        var xsrc = $scoped.get(xList).xsrc;
         var src = src.target.index || 0;
         var dst = xList.children[dst].index || 0;
         var [e] = xsrc.splice(src, 1);

package/coms/zimoli/checkbox.js

@@ -46,7 +46,7 @@ function main(elem = document.createElement("checkbox-group")) {
         value.checked = checked;
     };
     elem.setValue = function (value) {
-        var { options } = this.$scope;
+        var { options } = $scoped.get(this);
         buildValue(value, options);
     };
     return elem;

package/coms/zimoli/container.js

@@ -2,8 +2,9 @@ var change = async function (src) {
     if (src !== this.$src) return;
     if (!src) remove(this.with);
     else if (isNode(src)) {
-        if (isElement(src) && this.$struct.copys) {
-            for (var c of this.$struct.copys) {
+        var struct = $structed.get(this);
+        if (isElement(src) && struct.copys) {
+            for (var c of struct.copys) {
                 if (c.name === 'class') {
                     addClass(src, c.value);
                 }
@@ -35,7 +36,7 @@ var onparams = function (params) {
 };
 function container(element) {
     var comment = document.createComment('container');
-    comment.$struct = element.$struct;
+    $structed.set(comment, $structed.get(element));
     care(comment, gosrc);
     if (element.hasAttribute && element.hasAttribute('src')) {
         var src = element.getAttribute('src');

package/coms/zimoli/createItemTarget.js

@@ -1,13 +1,17 @@
+
 function createItemTarget(item, target) {
     var $scope = {};
     var { itemName, indexName, keyName } = this.$src;
     if (itemName) $scope[itemName] = item;
     else $scope.$item = item;
-    if (target && target.$scope) {
-        if (indexName) $scope[indexName] = target.$scope[indexName];
-        if (keyName) $scope[keyName] = target.$scope[keyName];
-        $scope.$index = target.$scope.$index;
-        $scope.$key = target.$scope.$key;
+    var element = document.createComment('active');
+    var tscope = target && $scoped.get(target);
+    if (tscope) {
+        if (indexName) $scope[indexName] = tscope[indexName];
+        if (keyName) $scope[keyName] = tscope[keyName];
+        $scope.$index = tscope.$index;
+        $scope.$key = tscope.$key;
     }
-    return { $scope };
+    $scoped.set(element, $scope);
+    return element;
 }

package/coms/zimoli/cross.js

@@ -7,7 +7,7 @@ var location_href = parseURL(location.href);
 location_href = `${location_href.protocol}//${location_href.host}/`;
 cross_.setLocation(location_href);
 
-var cookieItemsInSessionStorageKey = "--zimoli-coms-cross";
+var cookieItemsInSessionStorageKey = "紫茉莉:得特呢勒";
 var cookiesData = sessionStorage.getItem(cookieItemsInSessionStorageKey);
 if (cookiesData) {
     try {

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

@@ -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 || transition === true || !isHandled(obj)) {
+        children = [].concat(obj);
+    }
+    else {
+        children = Array.prototype.slice.call(args, from);
+    }
+    return children;
+}

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;