efront 3.20.8 → 3.20.13

package/coms/basic/cross_.js

@@ -29,7 +29,12 @@ function isChildPath(relative, path) {
 }
 
 var getCrossUrl = function (domain, headers, encrypt) {
-    if (notCross(domain, !!encrypt)) return domain;
+    if (notCross(domain, encrypt)) return domain;
+    var basehost = parseURL(base).host || parseURL(location_href).host;
+    if (parseURL(domain).host === basehost) {
+        if (!encrypt) return domain;
+        domain = domain.replace(domainReg, "/$3$4");
+    }
     var originDomain = getDomainPath(domain);
     var _cookies = getCookies(originDomain);
     var _headers = {};
@@ -102,7 +107,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     };
     if (/^jsonp/i.test(method)) {
         var cb = method.split('\-')[1] || 'callback';
-        setTimeout(function () {
+        Promise.resolve().then(function () {
             if (!isEmpty(jsondata) && isEmpty(datas)) {
                 datas = serialize(jsondata);
             }
@@ -112,6 +117,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         });
         var xhr = jsonp(url, {
             [cb](a) {
+                removeFromList(requests, this);
                 onload({ status: 200, response: JSON.stringify(a), toString: toResponse });
             }
         });
@@ -280,9 +286,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
             else send.call(xhr);
             digest();
         };
-
-        setTimeout(fire, 0);
-
+        Promise.resolve().then(fire);
     }
     var setRequestHeader = xhr.setRequestHeader;
     var realHeaders = Object.create(null);
@@ -335,7 +339,7 @@ function addDirect(a) {
 function notCross(domain, encrypt) {
     if (!location_href || !base || !/^https?\:\/\/|^s?\/\//.test(domain)) return true;
     if (location_href === domain.slice(0, location_href.length) ||
-        domain.replace(domainReg, '$2') === base.replace(domainReg, '$2')) return !encrypt;
+        domain.replace(domainReg, '$2') === base.replace(domainReg, '$2') || /^\/[^\/]/.test(domain)) return !encrypt;
     for (var cx = 0, dx = cors_hosts.length; cx < dx; cx++) {
         var host = cors_hosts[cx];
         if (host instanceof RegExp) {

package/coms/basic/lazy.js

@@ -2,7 +2,7 @@
 // 2.如果time小于0，传入的函数会立即执行，并忽略-time内的连续调用，time时间后触发最后一次调用
 // 如果time传false或0 使用requestAnimationFrame代替setTimeout按第1步执行
 // 如果time传null或undefined或NaN使用requestAnimationFrame代替setTimeout按第2步执行
-function lazy(run, time = false) {
+function lazy(run, time) {
     var wait = +time ? setTimeout : requestAnimationFrame;
     var ing, args, that;
     var hire = function () {
@@ -49,11 +49,14 @@ function lazy(run, time = false) {
         if (time >= 0) {
             ing = wait(fire, +time);
         }
-        else {
+        else if (time < 0) {
             ing = run.apply(that, args);
             if (ing instanceof Promise) ing.then(hire, hire);
             else ing = wait(fire, -time);
         }
+        else {
+            ing = true; wait(fire);
+        }
     };
 }
 module.exports = lazy;

package/coms/zimoli/autofocus.js

@@ -0,0 +1,20 @@
+function autofocus(e) {
+    if (!e.renders) e.renders = [];
+    var savedElement;
+    e.renders.push(function () {
+        var parent = rootElements[rootElements.length - 1] || document.body;
+        if (savedElement === parent) {
+            if (this !== parent || getTargetIn(parent, document.activeElement)) return;
+        }
+        savedElement = parent;
+        if (/^(input|textarea)$/i.test(this.tagName) || /^true$/.test(this.contentEditable)) {
+            if (getTargetIn(parent, this)) {
+                this.focus();
+            }
+        }
+        else if (parent === this) {
+            var e = this.querySelector("input,textarea,[contenteditable]");
+            if (e) e.focus();
+        }
+    });
+}

package/coms/zimoli/bind.js

@@ -5,12 +5,11 @@ function bind(eventName, bindTo = window) {
             if (off) off();
             off = on(eventName).call(bindTo, target, eventListener);
         };
-        if (isMounted(target)) mount();
-        var off1 = on("append")(target, mount);
+        var off1 = onmounted(target, mount);
         var off2 = on("remove")(target, function () {
             if (off) off();
             off = null;
         });
-        return function () { off1(); off2(); };
+        return function () { off1(); off2(); if (off) off(); };
     }
 }

package/coms/zimoli/cross.js

@@ -17,9 +17,9 @@ if (cookiesData) {
     }
 }
 
-var digest = lazy(function () {
+var digest = function () {
     dispatch('render', window);
-}, 0);
+};
 
 var cross = cross_.bind(function (callback, onerror) {
     var xhr = new XMLHttpRequest;

package/coms/zimoli/onmounted.js

@@ -9,5 +9,5 @@ function onmounted(target, handle) {
     if (isMounted(target)) {
         handle.call(target);
     }
-    on("mounted")(target, handle);
+    return on("mounted")(target, handle);
 }

package/coms/zimoli/popup.js

@@ -99,8 +99,7 @@ var popup_path = function (path = "", parameters, target) {
         element.$reload = fullfill;
         if (!target && target !== false && parameters !== false) {
             element.style.opacity = 0;
-            if (element.parentNode) move.bindPosition(element, [.5, .5]), element.style.opacity = 1;
-            else once('append')(element, function () {
+            oncemount(element, function () {
                 move.bindPosition(element, [.5, .5]);
                 element.style.opacity = 1;
             });

package/coms/zimoli/render.js

@@ -573,6 +573,7 @@ var createEmiter = function (on) {
             getter1 = createGetter(search, false);
         }
         on(key)(this, function (e) {
+            digest();
             if (parsedSrc) {
                 var target = e.currentTarget || e.target;
                 var scopes = target && target.$parentScopes;
@@ -601,7 +602,6 @@ var createEmiter = function (on) {
                 res = getter0.call(this, e);
             }
             if (res && isFunction(res.then)) res.then(digest, digest);
-            digest();
             return res;
         });
     };

package/coms/zimoli/resize.js

@@ -135,39 +135,36 @@ function resize(elem, initialEvent) {
 }
 moveupon(window, handle);
 
+var offmousemove;
+var resizeh = lazy(function () {
+    // 用于刷新自定义的scrollbar/lattice/gallery组件
+    var elem = this;
+    var resized = false;
+    if (elem.scrollWidth > elem.clientWidth) {
+        css(elem, { width: elem.offsetWidth });
+        resized = true;
+    }
+    if (elem.scrollHeight > elem.clientHeight) {
+        css(elem, { height: elem.offsetHeight });
+        resized = true;
+    }
+    if (resized) dispatch(elem, 'resize'), resizingList.hit(elem);
+});
 
 resize.on = function (elem, dragHandle) {
     if (elem) {
         elem.dragHandle = dragHandle;
     }
     onmounted(elem, function () {
-        var off = onmousemove(window, getResizer);
-        onremove(elem, off);
-    });
-    var computed = getComputedStyle(elem);
-    var resizeh = function () {
-        var elem = this;
-        var resized = false;
-        if (elem.scrollWidth > elem.clientWidth) {
-            css(elem, { width: elem.offsetWidth });
-            resized = true;
+        if (!offmousemove) offmousemove = onmousemove(window, getResizer);
+        if (!~resizingElements.indexOf(elem)) {
+            resizingElements.push(elem);
         }
-        if (elem.scrollHeight > elem.clientHeight) {
-            css(elem, { height: elem.offsetHeight });
-            resized = true;
-        }
-        if (resized) dispatch(elem, 'resize'), resizingList.hit(elem);
-        if (unbind && parseInt(computed.height) && parseInt(computed.width)) {
-            unbind();
-            unbind = null;
-        };
-    }
-    if (!parseInt(computed.height) || !parseInt(computed.width)) var unbind = bind('render')(elem, resizeh);
-    if (!~resizingElements.indexOf(elem)) {
-        resizingElements.push(elem);
-        once('remove')(elem, function () {
-            var index = resizingElements.indexOf(this);
-            if (~index) resizingElements.splice(index, 1);
-        });
-    }
+        bind('render')(elem, resizeh);
+    });
+    on('remove')(elem, function () {
+        var index = resizingElements.indexOf(this);
+        if (~index) resizingElements.splice(index, 1);
+        if (!resizingElements.length && offmousemove) offmousemove(), offmousemove = null;
+    });
 };

package/coms/zimoli/script.js

@@ -67,7 +67,7 @@ function script(url, judger) {
         return promise.catch(f);
     };
     script.src = url;
-    setTimeout(function () {
+    Promise.resolve().then(function () {
         if (!script.parentNode) {
             if (judger) {
                 var res = seek(window, judger);

package/coms/zimoli/scrollbar.js

@@ -144,8 +144,8 @@ var scrollbary = function () {
     function bindTarget(_container, followResize = _container) {
         var _scrollbar = this;
         _container.with = _scrollbar;
-        onappend(_container, _scrollbar.reshape);
         _scrollbar.target = _container;
+        onmounted(_container, _scrollbar.reshape);
         on("scroll")(_container, function () {
             var top = getTargetTop(_container);
             _scrollbar.scrollTo(top);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.20.8",
+    "version": "3.20.13",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {