efront 3.9.10 → 3.9.16

package/coms/zimoli/cross.js

@@ -1,5 +1,8 @@
 var FormData = this.FormData;
-var cookiesMap = {};
+var { cookiesMap, getCookies, addCookie } = cookie;
+var saveCookie = lazy(function () {
+    sessionStorage.setItem(cookieItemsInSessionStorageKey, JSON.stringify(cookiesMap));
+}, 20);
 //               /////  1   ////////// 2 /////// 3 ////    4  //
 var domainReg = /^(?:(https?)\:)?\/\/(.*?)(?:\/(.*?))?([\?#].*)?$/i;
 var base = domainReg.test(location.href) ? '/' : "http://efront.cc/";
@@ -33,71 +36,6 @@ function getRequestProtocol(url) {
     }
     return "http:";
 }
-function getCookies(domainPath) {
-    var cookieObject = {};
-    var splited = domainPath.split("/");
-    var domain = splited[0];
-    do {
-        var copy = splited.slice(0);
-        do {
-            domainPath = copy.join("/");
-            var cookie = cookiesMap[domainPath];
-            if (cookie) {
-                for (var k in cookie) {
-                    if (!cookieObject[k]) {
-                        cookieObject[k] = cookie[k];
-                    }
-                }
-            }
-            copy.pop();
-        } while (copy.length);
-        domain = domain.replace(/^.*?(\.|$)/, "");
-        splited[0] = domain;
-    } while (domain.length);
-    return serialize(cookieObject, ";");
-}
-function addCookie(cookie, originDomain = "") {
-    if (cookie) {
-        clearTimeout(addCookie.save_timer);
-        addCookie.save_timer = setTimeout(function () {
-            sessionStorage.setItem(cookieItemsInSessionStorageKey, JSON.stringify(cookiesMap));
-        }, 20);
-        cookie.replace(/(^|;|,)\s*(expires)=(\w*),([^=]*)(;|$)/ig, "$1$2=$3.$4$5")
-            .split(/,\s*/).map(function (cookie) {
-                var cookieObject = {};
-                var result = cookie.split(/;\s*/);
-                result.slice(1).map(function (kev) {
-                    var kvs = /^(.+?)\=(.+?)$/.exec(kev);
-                    if (kvs) {
-                        var [, k, v] = kvs;
-                        cookieObject[k.toLowerCase()] = v;
-                    }
-                });
-                var { path, domain } = cookieObject;
-                if (!domain) {
-                    domain = originDomain.replace(/[^\/]+$/, "");
-                }
-                if (/^\./.test(domain)) {
-                    domain = domain.replace(/^\.+/, "");
-                }
-                var destPath;
-                if (/^\//.test(path)) {
-                    destPath = domain.replace(/\/.*$/, "") + path;
-                } else {
-                    destPath = domain;
-                }
-                destPath = destPath.replace(/\/+$/, "");
-                if (originDomain.indexOf(destPath) >= 0) {
-                    var cookieMap = parseKV(result[0], ";");
-                    if (!cookiesMap[destPath]) {
-                        cookiesMap[destPath] = cookieMap;
-                    } else {
-                        extend(cookiesMap[destPath], cookieMap);
-                    }
-                }
-            });
-    }
-}
 function isChildPath(relative, path) {
     return relative.replace(/^(.*\/)[^\/]*$/, path);
 }
@@ -154,13 +92,19 @@ function cross(method, url, headers) {
         xhr.onerror = function (e) {
             onerror(e);
         };
+        xhr.abort = function () {
+            removeFromList(requests, this);
+            remove(this);
+        };
     } else {
         var nocross = notCross(url);
         var xhr = new XMLHttpRequest;
         var abort = xhr.abort;
         xhr.abort = function () {
             xhr.onreadystatechange = null;
+            removeFromList(requests, this);
             abort.call(this);
+            clearTimeout(sendtimer);
         };
 
         xhr.onreadystatechange = function () {
@@ -168,6 +112,7 @@ function cross(method, url, headers) {
                 if (xhr.getResponseHeader && !nocross) {
                     var cookie = xhr.getResponseHeader("efront-cookie");
                     addCookie(cookie, originDomain);
+                    saveCookie();
                 }
                 switch (xhr.status) {
                     case 0:
@@ -217,8 +162,7 @@ function cross(method, url, headers) {
             onerrors.push(oh);
             flush();
         };
-        setTimeout(function () {
-            digest();
+        var fire = function () {
             var isform = /^f/i.test(method);
             if (isform) {
                 if (method === 'form') method = 'post';
@@ -248,10 +192,13 @@ function cross(method, url, headers) {
             }
             Object.keys(realHeaders).forEach(key => setRequestHeader.call(xhr, key, realHeaders[key]));
             send.call(xhr, datas);
-        }, 0);
+            digest();
+        };
+        var sendtimer = setTimeout(fire, 0);
     }
     var loaded, errored;
     var onload = function (xhr) {
+        removeFromList(requests, xhr);
         if (xhr.decoder) {
             xhr = xhr.decoder(xhr);
         }
@@ -259,11 +206,19 @@ function cross(method, url, headers) {
         flush();
         digest();
     };
-    var onerror = function (xhr) {
-        errored = xhr;
+    var onerror1 = function (e) {
+        removeFromList(requests, e);
+        errored = e || "未知错误！";
         flush();
         digest();
     };
+    var onerror = async function (e) {
+        for (var r of reforms) {
+            var r = await reform(r, { method, url, status: xhr.status, headers: _headers }, fire, onerror1, e);
+            if (r === false) return;
+        }
+        onerror1(e);
+    };
     var flush = function () {
         var then = xhr.then;
         delete xhr.then;
@@ -317,9 +272,11 @@ function cross(method, url, headers) {
         flush();
         return xhr;
     };
+    requests.push(xhr);
     return xhr;
 }
 function addDirect(a) {
+    if (cors_hosts.indexOf(a) >= 0) return;
     if (typeof a === 'string' || a instanceof RegExp) cors_hosts.push(a);
 }
 function notCross(domain) {
@@ -335,9 +292,34 @@ function notCross(domain) {
     }
     return false;
 }
+
+var requests = [];
+var reforms = [];
+function reform(r, info, fire, cancel, e) {
+    var fired = false;
+    return r(info, function () {
+        if (fired) return;
+        fired = true;
+        fire();
+    }, function () {
+        if (fired) return;
+        fired = true;
+        cancel(e);
+    })
+}
+function addReform(r) {
+    if (isFunction(r)) reforms.push(r);
+}
 extend(cross, {
+    requests,
+    abortAll() {
+        var rs = requests.splice(0, requests.length);
+        for (var r of rs) r.abort();
+    },
     setHost,
+    addReform,
     getCookies,
+    saveCookie,
     addCookie,
     addDirect,
     getCrossUrl

package/coms/zimoli/data.js

@@ -72,7 +72,13 @@ const formulaters = {
         return formulate(data, params);
     }
 };
-
+var seekFromSource = function (obj, base) {
+    var source = dataSourceMap;
+    if (base && base in dataSourceMap) source = source[base];
+    obj = seek(source, obj);
+    if (isObject(obj)) for (var k in obj) if (obj[k] === dataSourceMap) delete obj[k];
+    return obj;
+};
 function getErrorMessage(error = this) {
     if (!isObject(error)) return String(error);
     if (error instanceof Error) return String(error);
@@ -533,9 +539,9 @@ var privates = {
         rest.forEach(k => delete params[k]);
         return { method: realmethod, coinmethod, selector: method.slice(spliterIndex + 1), search, baseuri, uri, params };
     },
-    loadIgnoreConfig(method, url, params, api) {
+    loadIgnoreConfig(method, url, params1, api) {
         var headers = api && api.headers;
-        var { method: realmethod, uri, baseuri, coinmethod, search, selector, params } = this.prepare(method, url, params);
+        var { method: realmethod, uri, baseuri, coinmethod, search, selector, params } = this.prepare(method, url, params1);
         var id = realmethod + " " + baseuri;
         var promise = cachedLoadingPromise[id];
         var temp = JSON.stringify(params);
@@ -543,18 +549,19 @@ var privates = {
         if (!promise || currentTime - promise.time > 60 || temp !== promise.params || promise.search !== search) {
             var promise = new Promise(function (ok, oh) {
                 if (headers) {
-                    headers = seek(dataSourceMap, headers);
+                    headers = seekFromSource(headers, api.base);
                 }
                 cross(realmethod, uri, headers).send(params).done(e => {
                     ok(e.response || e.responseText);
                 }).error(xhr => {
                     try {
                         var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
-                        oh({ status: xhr.status, error: e, toString: getErrorMessage })
+                        oh({ status: xhr.status, api, params: params1, error: e, toString: getErrorMessage })
                     } catch (error) {
                         oh(error);
                     }
                 });
+                updateLoadingCount();
             });
             promise.search = search;
             promise.params = temp;
@@ -609,7 +616,6 @@ var loadInstance = function (storage, id) {
 };
 
 function responseCrash(e, data) {
-    if (data.is_loading) this.loading_count--;
     data.is_errored = true;
     data.is_loading = false;
     data.error_message = getErrorMessage(e);
@@ -619,19 +625,24 @@ function responseCrash(e, data) {
     } else {
         data.error = e;
     }
-    error_report(data.error_message, e.status < 500 ? 'warn' : 'error');
+    error_report(e, e.status < 500 ? 'warn' : 'error');
+    updateLoadingCount();
 }
 var getData = function () { return this.data };
+var updateLoadingCount = function () {
+    data.loading_count = cross.requests.length;
+};
 var data = {
     decodeStructure,
     encodeStructure,
+    abortAll: cross.abortAll,
     responseLoaded(response) {
         if (isObject(response)) {
             response.is_loaded = true;
             response.is_loading = false;
             if (response.then === LoadingArray_then) delete response.then;
         }
-        this.loading_count--;
+        updateLoadingCount();
     },
     responseCrash,
     responseLoading(response) {
@@ -640,7 +651,6 @@ var data = {
             response.is_loading = true;
             response.then = LoadingArray_then;
         }
-        this.loading_count++;
     },
     setReporter(report, checker) {
         if (report instanceof Function) {
@@ -840,19 +850,18 @@ var data = {
             if (promise1 !== instance.loading_promise) throw outdate;
             if (instance.loading) {
                 instance.loading.abort();
-                data.loading_count--;
             }
             this.responseLoading(instance);
-            var params = privates.pack(sid, params1);
-            if (!privates.validApi(api, params)) throw aborted;
+            var params2 = privates.pack(sid, params1);
+            if (!privates.validApi(api, params2)) throw aborted;
             let url = api.url;
             var base = api.base;
             if (base) url = base + api.path;
-            var { method, uri, params, selector } = privates.prepare(api.method, url, params);
+            var { method, uri, params, selector } = privates.prepare(api.method, url, params2);
             var promise = new Promise(function (ok, oh) {
                 var headers = api.headers;
                 if (headers) {
-                    headers = seek(dataSourceMap, headers);
+                    headers = seekFromSource(headers, api.base);
                 }
                 instance.loading = cross(method, uri, headers).send(params).done(xhr => {
                     if (instance.loading !== xhr) return oh(aborted);
@@ -862,11 +871,13 @@ var data = {
                     if (instance.loading !== xhr) return oh(aborted);
                     instance.loading = null;
                     try {
-                        oh(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
+                        var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
+                        oh({ status: xhr.status, error: e, api, params: params2, toString: getErrorMessage })
                     } catch (error) {
                         oh(error);
                     }
                 });
+                updateLoadingCount();
             }).then(function (response) {
                 return transpile(seekResponse(parseData(response), selector), api.transpile, api.root);
             });
@@ -884,7 +895,6 @@ var data = {
         });
         promise1.catch((e) => {
             if (e === outdate) return;
-            if (e === aborted) return data.loading_count--;
             this.responseCrash(e, instance);
         });
 

package/coms/zimoli/on.js

@@ -167,8 +167,13 @@ if (is_addEventListener_enabled) {
         var eventtypes = parseEventTypes(k);
         k = k.replace(eventtypereg, '');
         function addhandler(element, handler, firstmost) {
+            var target = this;
             handler = wrapHandler(handler);
             if (eventtypes.capture) firstmost = true;
+            if (target && element !== target) {
+                handler = handler.bind(element);
+                element = target;
+            }
             if (k === changes_key) {
                 if (!element.needchanges) element.needchanges = 0;
                 element.needchanges++;
@@ -207,11 +212,16 @@ if (is_addEventListener_enabled) {
 
         if (handlersMap[on_event_path]) return handlersMap[on_event_path];
         function addhandler(element, handler, firstmost = false) {
+            var target = this;
             handler = wrapHandler(handler);
             if (eventtypes.capture) {
                 console.warn("当前运行环境不支持事件capture");
                 firstmost = true;
             }
+            if (target && element !== target) {
+                handler = handler.bind(element);
+                element = target;
+            }
             if (k === changes_key) {
                 if (!element.needchanges) element.needchanges = 0;
                 element.needchanges++;

package/coms/zimoli/popup.js

@@ -105,9 +105,16 @@ var popup_path = function (path = "", parameters, target) {
                 element.style.opacity = 1;
             });
         }
+        callbacks.forEach(f => f(element));
     };
+    var callbacks = [];
     popup.prepare(path, fullfill);
-    return element;
+    return element || {
+        then(ok) {
+            if (element) return ok(element);
+            else callbacks.push(ok);
+        }, fullfill
+    };
 };
 
 var popup_view = function (element, target, style) {

package/coms/zimoli/select.js

@@ -42,6 +42,9 @@ function select(target, list, removeOnSelect, direction) {
         direction = removeOnSelect;
         removeOnSelect = arguments[3];
     }
+    if (direction === undefined) {
+        direction = target.getAttribute("direction") || target.direction;
+    }
     if (!target) {
         target = document.createElement("select");
     }
@@ -63,11 +66,13 @@ function select(target, list, removeOnSelect, direction) {
     var onlistchange = function () {
         if (target.multiple) {
         } else {
-            if (!savedOptions) {
-                target.innerHTML = `<option selected value="${this.value}">${this.name || this.value}</option>`
+            if (target.value !== this.value) {
+                if (!savedOptions) {
+                    target.innerHTML = `<option selected value="${this.value}">${this.name || this.value}</option>`
+                }
+                target.value = this.value;
+                dispatch(target, "change");
             }
-            target.value = this.value;
-            dispatch(target, "change");
         }
     };
     var onlistclick = function (event) {

package/coms/zimoli/view.less

@@ -52,12 +52,19 @@ body>& {
     position: relative;
     position: sticky;
     line-height: 20px;
-    white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     color: #333;
     padding: 12px 16px 10px 16px;
 
+    &:before {
+        display: block;
+        content: "";
+        width: 20px;
+        height: 20px;
+        float: right;
+    }
+
     &:not(:last-child) {
         margin: 0 0 -42px;
     }

package/package.json

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