efront 3.26.4 → 3.26.6

package/coms/basic/Speed.js

@@ -102,6 +102,7 @@ class Speed extends Array {
     cache = [];
     stamp = 0;
     deltat = 0;
+    accelerate = .1;
     static now() {
         return performance.now ? performance.now() : Date.now();
     }
@@ -143,22 +144,23 @@ class Speed extends Array {
         var ratio;
         if (this.stamp) ratio = now - this.stamp;
         else ratio = deltat;
-        if (ratio > 160) ratio = 1e-3;
+        if (ratio > 160) ratio = 1e-7;
         if (this.deltat) {
             if (deltat > this.deltat * 10) {
-                ratio = 1e-3;
+                ratio = 1e-7;
             }
         }
         this.deltat = deltat;
         this.stamp = now;
         var sum = 0;
         for (var v of values) sum += v * v;
-        v = Math.sqrt(sum) * ratio;
-        if (v > 1) {
-            v = Math.sqrt(v * (v - .996)) / v;
+        v = Math.sqrt(sum);
+        var a = this.accelerate * Math.atan(v + 1);
+        if (v > a + 1e-14) {
+            v = Math.sqrt(v * (v - a)) / v;
         }
         else {
-            v = .9;
+            v = 1e-9;
         }
         var r = ratio * v;
         for (var cx = 0, dx = values.length; cx < dx; cx++) {

package/coms/basic/isArrayLike.js

@@ -0,0 +1,10 @@
+function isArrayLike(a) {
+    if (a === null || typeof a !== 'object' || isNode(a)) return false;
+    if (isFinite(a.length)) {
+        if (a.length > 0) {
+            return a.length - 1 in a;
+        }
+        return true;
+    }
+    return false;
+}

package/coms/basic/loader.js

@@ -323,16 +323,18 @@ var loadModule = function (name, then, prebuilds = {}) {
     }
 };
 var toRem = text => pixelDecoder && typeof text === 'string' ? text.replace(/(\:\s*)?\b((?:\d*\.)?\d+)px(\s*\))?/ig, (m, h, d, quote) => (h || "") + (d !== '1' ? h && quote ? renderPixelRatio * d + "pt" : pixelDecoder(d) : renderPixelRatio > 1 ? ".78pt" : 0.78 / devicePixelRatio + "pt") + (quote || "")) : text;
-if (document.head) {
-    var efrontsign = document.head.lastElementChild.attributes[0];
-    if (efrontsign && /^compiledinfo\-/.test(efrontsign.name)) efrontsign = efrontsign.name.slice(efrontsign.name.indexOf('-') + 1);
-    else efrontsign = '';
-}
-else if (document.getElementsByTagName) {
-    document.head = document.getElementsByTagName("head")[0];
-    efrontsign = /\<script\s+compiledinfo\-(\S*?)\s*\=/i.exec(document.head.lastChild.outerHTML);
-    if (efrontsign) efrontsign = efrontsign[1];
-    else efrontsign = '';
+if (document) {
+    if (document.head) {
+        var efrontsign = document.head.lastElementChild.attributes[0];
+        if (efrontsign && /^compiledinfo\-/.test(efrontsign.name)) efrontsign = efrontsign.name.slice(efrontsign.name.indexOf('-') + 1);
+        else efrontsign = '';
+    }
+    else if (document.getElementsByTagName) {
+        document.head = document.getElementsByTagName("head")[0];
+        efrontsign = /\<script\s+compiledinfo\-(\S*?)\s*\=/i.exec(document.head.lastChild.outerHTML);
+        if (efrontsign) efrontsign = efrontsign[1];
+        else efrontsign = '';
+    }
 }
 var uncode = function (text) {
     var ratio = 1;
@@ -597,10 +599,11 @@ var init = function (name, then, prebuilds) {
     var crack = function (error) {
         if (res.resolved || res.errored) return;
         var ed = errored[name];
-        console.error(`加载${name}失败，${ed && ed.length ? `${ed.join(', ')} 等${ed.length}个模块` : "没有其他模块"}受到影响`);
         res.errored = true;
         res.error = error;
         res.fire();
+        console.error(`加载${name}失败，${ed && ed.length ? `${ed.join(', ')} 等${ed.length}个模块` : "没有其他模块"}受到影响`);
+        if (window.document) throw error;
     };
     loadModule(name, function (error) {
         if (hasOwnProperty.call(modules, name)) {
@@ -860,18 +863,19 @@ var requires_count = 3;
 var hook = function (requires_count) {
     if (requires_count !== 0) return;
     "alert confirm innerWidth innerHeight close prompt".split(/\s+/).map(removeGlobalProperty);
-    initPixelDecoder();
     modules.Promise = Promise;
     modules.hook_time = +new Date;
-    if (!efrontPath) efrontPath = document.body.getAttribute("main-path") || document.body.getAttribute("path") || document.body.getAttribute("main") || "zimoli";
-    if (modules.hook_time - efront_time < (isProduction ? 30 : 5) && document.querySelector && devicePixelRatio > 1 && /Linux/.test(navigator.platform) && navigator.maxTouchPoints > 0) {
-        let ratio = +(1000000 / devicePixelRatio + .5 | 0) / 1000000;
-        document.querySelector("meta[name=viewport]").setAttribute("content", `width=device-width,target-densitydpi=device-dpi,user-scalable=no,initial-scale=1,maximum-scale=${ratio}`);
-        renderPixelRatio *= devicePixelRatio;
-        modules.renderPixelRatio = renderPixelRatio;
-        devicePixelRatio = modules.devicePixelRatio = 1;
+    if (document) {
+        initPixelDecoder();
+        if (modules.hook_time - efront_time < (isProduction ? 30 : 5) && document.querySelector && devicePixelRatio > 1 && /Linux/.test(navigator.platform) && navigator.maxTouchPoints > 0) {
+            let ratio = +(1000000 / devicePixelRatio + .5 | 0) / 1000000;
+            document.querySelector("meta[name=viewport]").setAttribute("content", `width=device-width,target-densitydpi=device-dpi,user-scalable=no,initial-scale=1,maximum-scale=${ratio}`);
+            renderPixelRatio *= devicePixelRatio;
+            modules.renderPixelRatio = renderPixelRatio;
+            devicePixelRatio = modules.devicePixelRatio = 1;
+        }
+        if (!efrontPath) efrontPath = document.body.getAttribute("main-path") || document.body.getAttribute("path") || document.body.getAttribute("main") || "zimoli";
     }
-
     init(efrontPath, function (zimoli) {
         if (zimoli instanceof Function) zimoli();
     });
@@ -881,7 +885,7 @@ var initIfNotDefined = function (defined, path, onload) {
     else hook(--requires_count);
 };
 
-loadResponseTreeFromStorage();
+if(document) loadResponseTreeFromStorage();
 initIfNotDefined([].map, "[]map", map => map);
 initIfNotDefined(Promise, "Promise", promise => Promise = promise);
 if (!isProduction) window.modules = modules;
@@ -889,5 +893,5 @@ var onload = function () {
     window.onload = null;
     hook(--requires_count);
 };
-if (document.body) onload();
+if (!document || document.body) onload();
 else window.onload = onload;

package/coms/basic/parseURL.js

@@ -17,11 +17,30 @@
 // │                                              href                                              │
 // └────────────────────────────────────────────────────────────────────────────────────────────────┘
 
-// -------/// ---------------1---------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6-----------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10/8/--12----////
-var reg = /^([^\:\/\\\?#\[]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[\@\/\\\?#\.]*[^\d\@\:\/\\\?#\.]+|\.[^\/\\@\:\?\#]+?))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?)(#[\s\S]*)?$/;
-function parseURL(url) {
+// -------/// ---------------1---------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6-----------------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10/8/--12----////
+var reg = /^([^\:\/\\\?#\[]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[\@\/\\\?#\.]*[^\d\@\:\/\\\?#\.]+|(?:\.[^\/\\@\:\?\#\.]+)+))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?)(#[\s\S]*)?$/;
+var hrefDescriptor = {
+    get() {
+        var href = '';
+        if (this.protocol) href += this.protocol;
+        if (this.auth) href += "//" + this.auth + "@" + this.host;
+        else if (this.host) href += "//" + this.host;
+        if (this.path) href += this.path;
+        if (this.hash) href += this.hash;
+        return href;
+    },
+    set(href) {
+        Object.assign(this, parseURL(href));
+    }
+};
+function parse(url) {
     if (url === undefined || url === null) url = '';
     var [__, protocol, auth, username, password, host, hostname, port, path, pathname, search, query, hash] = reg.exec(url);
-    return { protocol, auth, username, password, host, hostname, port, path, pathname, search, query, hash, href: __ };
+    return { protocol, auth, username, password, host, hostname, port, path, pathname, search, query, hash };
+}
+function parseURL(url) {
+    var obj = parse(url);
+    Object.defineProperty(obj, "href", hrefDescriptor);
+    return obj;
 }
 module.exports = parseURL;

package/coms/basic/parseURL_test.js

@@ -12,6 +12,10 @@ test('http://yunxu1019@live.cn@github.com/?a', 'username', 'yunxu1019@live.cn')
 test('localhost', 'host', 'localhost')
 test('localhost:80', 'port', '80')
 test('localhost:80/', 'port', '80')
+test('magnet:?xt=::', 'search', '?xt=::')
+test('magnet:?xt=::', 'protocol', 'magnet:')
+test('magnet:?xt=::', 'host', '')
+test('magnet:?xt=::', 'pathname', undefined)
 test('efront.cc', 'host', 'efront.cc')
 test('127.0.0.1', 'host', '127.0.0.1')
 test(':80', 'port', '80')
@@ -25,6 +29,9 @@ test('c:a:b@a80', 'auth', 'a:b')
 test('c:d:a:b@a80', 'password', 'a:b')
 test('localhost:', 'protocol', 'localhost:')
 test('localhost:80', 'hostname', 'localhost')
+test('efront.cc', 'hostname', 'efront.cc')
+test('efront.', 'hostname', undefined)
+test('efront.', 'pathname', "efront.")
 test('http//:80', 'hostname', 'http')
 test('http//:80', 'pathname', '//:80')
 test('//h:80', 'host', 'h:80')

package/coms/zimoli/appendChild.js

@@ -25,7 +25,7 @@ function appendChild(parent, obj, transition) {
     if (transition === false) {
         var children = [].concat(obj);
     } else {
-        var children = isArray(obj) ? slice.call(obj, 0) : slice.call(arguments, 1);
+        var children = isArrayLike(obj) ? slice.call(obj, 0) : slice.call(arguments, 1);
     }
     if (parent.appendChild) {
         for (var cx = 0, dx = children.length; cx < dx; cx++) {

package/coms/zimoli/container.js

@@ -1,5 +1,8 @@
 var change = function (data) {
-    zimoli.go(data, this.params, this);
+    if (isNode(data)) {
+        zimoli.global(data, this);
+    }
+    else zimoli.go(data, this.params, this);
 };
 var gosrc = function () {
     var { src } = this;

package/coms/zimoli/data.js

@@ -660,11 +660,45 @@ function responseCrash(e, data) {
     }
     error_report(e, e.status < 500 ? 'warn' : 'error');
 }
-var getData = function () { return this.data };
+var toDataString = function () { return isEmpty(this.data) ? '' : this.data };
 var updateLoadingCount = function () {
     data.loading_count = cross.requests.length;
 };
 on('render')(window, updateLoadingCount, true);
+var bubApply = function (f, args) {
+    if (args.length === 1) {
+        var [instanceMap] = args;
+        for (var k in instanceMap) {
+            f(k, instanceMap[k]);
+        }
+    }
+    else if (args.length === 2) {
+        var [instanceId, callback] = args;
+        f(instanceId, callback);
+    }
+};
+
+var bindInstance = function (instanceId, callback) {
+    if (!instanceListenerMap[instanceId]) {
+        instanceListenerMap[instanceId] = [];
+    }
+    var listeners = instanceListenerMap[instanceId];
+    if (!~listeners.indexOf(callback)) {
+        listeners.push(callback);
+    }
+    if (hasItem(instanceId)) callback(getItem(instanceId));
+};
+var unbindInstance = function (instanceId, callback) {
+    if (!instanceListenerMap[instanceId]) return;
+    if (!callback) {
+        delete instanceListenerMap[instanceId];
+        return;
+    }
+    removeFromList(instanceListenerMap[instanceId], callback);
+    if (!instanceListenerMap[instanceId].length) {
+        delete instanceListenerMap[instanceId];
+    }
+};
 var data = {
     decodeStructure,
     encodeStructure,
@@ -1052,31 +1086,37 @@ var data = {
         }
         return this.setInstance(instanceId, instance, rememberWithStorage);
     },
-    bindInstance(instanceId, callback) {
-        if (!instanceListenerMap[instanceId]) {
-            instanceListenerMap[instanceId] = [];
+    /**
+     * bindInstance(instanceId, callback);
+     * bindInstance(instanceMap);
+     * bindInstance(page, instanceId, callback);
+     * bindInstance(page, instanceMap);
+     */
+    bindInstance() {
+        var [page] = arguments;
+        if (isNode(page)) {
+            var restargs = Array.prototype.slice.call(arguments, 1);
+            onmounted(page, function () {
+                bubApply(bindInstance, restargs);
+            });
+            on("remove")(page, function () {
+                bubApply(unbindInstance, restargs);
+            });
         }
-        var listeners = instanceListenerMap[instanceId];
-        if (!~listeners.indexOf(callback)) {
-            listeners.push(callback);
+        else {
+            bubApply(bindInstance, arguments);
         }
-        if (hasItem(instanceId)) callback(getItem(instanceId));
     },
-    unbindInstance(instanceId, callback) {
-        if (!instanceListenerMap[instanceId]) return;
-        if (!callback) {
-            delete instanceListenerMap[instanceId];
-            return;
-        }
-        removeFromList(instanceListenerMap[instanceId], callback);
-        if (!instanceListenerMap[instanceId].length) {
-            delete instanceListenerMap[instanceId];
-        }
+    /**
+     * 仅用于解除没有与DOM节点绑定的事件
+     */
+    unbindInstance() {
+        bubApply(unbindInstance, arguments);
     },
     rebuildInstance(instance, data, old = instance) {
         if (instance === data) return;
         if (!isObject(instance)) throw new Error("只支持object类型的数据！");
-        if (!isObject(data)) data = { data }, data.toString = data.valueOf = getData;
+        if (!isObject(data)) data = { data }, data.toString = data.valueOf = toDataString;
         if (instance instanceof Array) instance.splice(0, instance.length);
         var sample = new LoadingArray;
         Object.keys(old).forEach(function (k) {

package/coms/zimoli/getGenerator.js

@@ -1,5 +1,19 @@
 
 var _slider = createElement(div);
+/**
+ * @param {Element} template
+ */
+var cloneChildNodes = function (template) {
+    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;
+    }
+    return cNodes;
+}
+
 /**
  * @param {Element} container
  * @param {Element|string} tagName;
@@ -26,6 +40,7 @@ var getGenerator = function (container, tagName = 'item') {
         container.paddingCount = paddingCount;
     }
     appendChild(template, templates);
+    render.struct(templates);
     if (templates.length) container.$template = template;
     container.insertBefore = _slider.insertBefore;
     container.appendChild = _slider.appendChild;
@@ -47,9 +62,9 @@ var getGenerator = function (container, tagName = 'item') {
             needSetAttr = false;
         }
         else {
-            var template1 = template.cloneNode(true);
-            element = template1.childNodes[0];
-            if (template1.childNodes.length > 1) element.with = [].concat.apply([], template1.childNodes).slice(1);
+            var childNodes = cloneChildNodes(template);
+            element = childNodes[0];
+            if (childNodes.length > 1) element.with = Array.prototype.slice.call(childNodes, 1);
         }
         if (needSetAttr) {
             for (var a of tagName.attributes) {
@@ -59,12 +74,7 @@ var getGenerator = function (container, tagName = 'item') {
         var scopes = container.$generatorScopes;
         var parsedSrc = container.$src;
         if (parsedSrc) {
-            var { keyName, itemName, indexName } = parsedSrc;
-            var newScope = {
-                [keyName || '$key']: index,
-                [itemName || '$item']: com,
-                [indexName || '$index']: index
-            };
+            var newScope = parsedSrc.createScope(com, index, index);
             var newItem = render(element, newScope, scopes, false);
             if (element.with) newItem.with = render(element.with, newScope, scopes, false);
         } else {

package/coms/zimoli/list.js

@@ -612,24 +612,24 @@ function list() {
             }
         }
     }
-    var bindSrc = null;
+    var bindSrc = isNode(container) && "$src" in container;
     if (container instanceof Array) {
         generator = getGeneratorFromArray(container);
         bindSrc = container;
         container = div();
     } else if (container && !generator) {
-        if ("$src" in container) {
+        if (bindSrc) {
             generator = getGenerator(container);
-            care(container, function () {
-                var index = container.index();
-                container.clean();
-                container.go(index || 0);
-            });
             bindSrc = true;
         } else {
             generator = function () { }
         }
     }
+    if (bindSrc === true) care(container, function () {
+        var index = container.index();
+        container.clean();
+        container.go(index || 0);
+    });
 
     if (!$Y) {
         if (container) {
@@ -648,8 +648,12 @@ function list() {
         container.go(container.index() || 0);
     }
     list.clean = function () {
-        var children = (container || list).children;
-        children = [].concat.apply([], children).filter(c => c.nodeType === 1 && isFinite(c.index));
+        var children = (container || list).childNodes;
+        children = Array.prototype.filter.call(children, c => {
+            if (isFinite(c.index)) return true;
+            if (c.nodeType === 1 && c.$comment && isFinite(c.$comment.index)) return true;
+            return false;
+        });
         remove(children);
     };
 

package/coms/zimoli/menu.js

@@ -196,7 +196,6 @@ function main(elem, mode) {
                 };
                 if ("$src" in elem) {
                     var src0 = [];
-                    menuList(elem, src0, emit, direction);
                     care(elem, function (src) {
                         bindGlobalkey(elem, src.keymap, emit);
                         src0.splice(0, src0.length);
@@ -212,8 +211,8 @@ function main(elem, mode) {
                         while (i < s.length) {
                             src0.push.apply(src0, s.slice(i, i += 1000));
                         }
-                        elem.go(0);
                     });
+                    menuList(elem, src0, emit, direction);
                 }
                 else {
                     var nodes = getArrayNodes(elem);

package/coms/zimoli/move.js

@@ -9,7 +9,7 @@ function getMarginLeft(offsetLeft, offsetWidth, innerWidth) {
     // marginLeft*offsetWidth-marginLeft*innerWidth=offsetLeft*offsetWidth
     // marginLeft(offsetWidth-innerWidth)=offsetLeft*offsetWidth
     // marginLeft=offsetLeft*offsetWidth/(offsetWidth-innerWidth)
-    if (offsetWidth === +innerWidth) return -offsetWidth / 2;
+    if (offsetWidth === +innerWidth || Math.abs(offsetLeft) > Math.abs(offsetWidth - innerWidth)) return -offsetWidth / 2;
     return offsetLeft * offsetWidth / (offsetWidth - innerWidth);
 }
 

package/coms/zimoli/popup.js

@@ -175,12 +175,12 @@ var isypop = function (target) {
     if (!target) return false;
     var { offsetParent, nextSibling, previousSibling } = target;
     if (
-        nextSibling && nextSibling.tagName === target.tagName
+        nextSibling
         && (
             nextSibling.offsetLeft - target.offsetLeft >= target.offsetWidth / 2
             || target.offsetLeft - nextSibling.offsetLeft >= nextSibling.offsetWidth / 2
         )
-        || previousSibling && previousSibling.tagName === target.tagName
+        || previousSibling
         && (
             previousSibling.offsetLeft - target.offsetLeft >= target.offsetWidth / 2
             || target.offsetLeft - previousSibling.offsetLeft >= previousSibling.offsetWidth / 2