efront 3.9.14 → 3.10.4

package/apps/pivot/auth/login.js

@@ -4,17 +4,17 @@ var fields = refilm`
 服务器地址/host* select?a ${hosts}
 密码/password* password
 `;
-function main() {
+function main(host) {
     var page = view();
     page.innerHTML = login;
     drag.on(page);
+    fields[0].readonly = !!host;
     on("append")(page, function () {
         move.bindPosition(page, [.5, .5]);
     });
     renderWithDefaults(page, {
         fields, data: {
-            host: data.getInstance("base").host || location.host,
-
+            host: host ? parseURL(host).host : data.getInstance("base").host || location.host,
         }, pending: false
     });
     on("submit")(page, async function () {
@@ -24,14 +24,21 @@ function main() {
         page.disabled = true;
         try {
             var base = location.protocol + "//" + parseURL(this.$scope.data.host).host + "/";
-            data.setInstance("base", { base, host: parseURL(base).host });
-            var info = await data.from("login", {
+            if (!host) data.setInstance("base", { base, host: parseURL(base).host });
+            var api = Object.assign({}, await data.getApi("login"));
+            api.base = base;
+            var info = await data.from(api, {
                 a: encode62.timeencode(encode62.geta(password))
             }).loading_promise;
             info = encode62.timeupdate(info);
             data.setSource(base, info);
-            user.login({})
-            go('/main')
+            if (host) {
+                cast(page, 'login', info);
+                remove(page);
+            } else {
+                user.login({});
+                go('/main');
+            }
         } catch (e) {
             console.log(e);
         }

package/apps/pivot/auth/login.less

@@ -4,6 +4,9 @@
 
 [foot],
 [head] {
+    &::before{
+        display: none;
+    }
     text-align: center;
 }
 .button{

package/apps/pivot/main.js

@@ -1,10 +1,26 @@
 data.loadConfig("api.yml");
 user.loginPath = '/auth/login';
+cross.addReform(async function ({ status, url, headers }, reform, reject) {
+    if (status === 401) {
+        var base = data.getInstance("base").base;
+        var { protocol, host } = parseURL(url);
+        var base1 = protocol + "//" + host + "/";
+        if (base !== base1) {
+            data.setSource(base1, null);
+            var page = await popup("/auth/login", base1);
+            care(page, "login", function (info) {
+                data.setSource(base1, info);
+                headers.authorization = info;
+                reform();
+            });
+            on("remove")(page, reject);
+            return false;
+        }
+        location.reload();
+    }
+})
 data.setReporter(function (m, t) {
     alert(m, t);
-    var base = data.getInstance("base").base;
-    data.setSource(base, '');
-    if (m.status === 401) location.reload();
 });
 data.bindInstance("base", async function (base) {
     if (!base.base) return;

package/apps/pivot/task/invoke.js

@@ -2,6 +2,7 @@ function main(a) {
     var page = view();
     page.innerHTML = template;
     drag.on(page.firstChild, page);
+    resize.on(page);
     var fields = data.from("params", { key: a.key }, function (a) {
         return a ? JSON.parse(encode62.timedecode(a)) : [];
     });

package/apps/pivot/task/list.js

@@ -3,12 +3,21 @@ plist.bind(null, '任务管理', "task", refilm`
 *任务名/name 100
 *是否启用/status radio [不启用,启用]
 任务代码/code text
-执行/ - ${[{
+/ - ${[
+    {
         when(o) {
             return o.status === 1;
         },
         name: "执行", do(o) {
             popup("/task/invoke", o);
         }
-    }]}
-`, '/task/edit');
+    },
+    {
+        when(o) {
+            return o.status === 1;
+        },
+        name: "同步", do(o) {
+            popup("/task/rsync", o);
+        }
+    },
+]}`, '/task/edit');

package/apps/pivot/task/rsync.html

@@ -0,0 +1,16 @@
+<div head>
+    同步任务&nbsp;-&nbsp; <span -text=task.name></span>(<span -text=task.key></span>)
+    <close @click="remove()"></close>
+</div>
+<div body>
+    <padding ng-repeat="h in hosts">
+        <a @click="checked[h.key]=!checked[h.key]" disabled:="h.key===base.host" :class="{finished:finished[h.key]}">
+            <checker -model="checked[h.key]"></checker>
+            <span -text="h.name"></span>
+            <span v-if="h.key===base.host">（当前）</span>
+        </a>
+    </padding>
+</div>
+<div foot>
+    <btn @click="flush()">同步</btn>
+</div>

package/apps/pivot/task/rsync.js

@@ -0,0 +1,39 @@
+function main(task) {
+    var page = view();
+    page.innerHTML = template;
+    drag.on(page.firstChild, page);
+    resize.on(page);
+    renderWithDefaults(page, {
+        task,
+        checkbox(e) {
+            e = checkbox(e);
+            cast(e, { options: this.hosts })
+        },
+        base: data.getInstance("base"),
+        hosts: data.getInstance("hosts"),
+        finished: {},
+        checked: {},
+        async flush() {
+            var api = await data.getApi("edit");
+            api = Object.assign({}, api);
+            var finished = this.finished = {};
+            var checked = this.checked;
+            for (var h of this.hosts) {
+                if (!checked[h.key]) continue;
+                api.base = location.protocol + "//" + h.key + "/";
+                cross.addDirect(api.base);
+                await data.from(api, {
+                    type: "task",
+                    key: encode62.timeencode(task.key),
+                    value: encode62.timeencode(JSON.stringify(task))
+                });
+                finished[h.key] = true;
+            }
+            alert('同步完成！');
+        },
+        remove() {
+            remove(page);
+        },
+    });
+    return page;
+}

package/apps/pivot/task/rsync.less

@@ -0,0 +1,10 @@
+a{
+    cursor: pointer;
+    vertical-align: top;
+    >*{
+        vertical-align: middle;
+    }
+    &.finished{
+        color:#293;
+    }
+}

package/coms/basic/FormData.js

@@ -0,0 +1,14 @@
+var FormData = this.FormData;
+if (!FormData) {
+    FormData = function FormData() {
+        this.form = {};
+    }
+
+    FormData.prototype.append = function (key, value) {
+        this.form[key] = value;
+    };
+
+    FormData.prototype.toString = function () {
+        return serialize(this.form);
+    };
+}

package/coms/basic/_cross.js

@@ -0,0 +1,329 @@
+var { getCookies, addCookie } = cookie;
+var { File } = this;
+function isFile(a) {
+    if (File) {
+        return a instanceof File;
+    }
+}
+var base = null, location_href = null;
+//               /////  1   ////////// 2 /////// 3 ////    4  //
+var domainReg = /^(?:(https?)\:)?\/\/(.*?)(?:\/(.*?))?([\?#].*)?$/i;
+var setHost = function (host) {
+    base = host;
+};
+var HeadersKeys = ["Content-Type"];
+var cors_hosts = [];
+function getDomainPath(url) {
+    return url.replace(domainReg, "$2/$3");
+}
+function getRequestProtocol(url) {
+    if (/^https:/i.test(url)) {
+        return "https:";
+    }
+    return "http:";
+}
+function isChildPath(relative, path) {
+    return relative.replace(/^(.*\/)[^\/]*$/, path);
+}
+
+var getCrossUrl = function (domain, headers) {
+    if (notCross(domain)) return domain;
+    var originDomain = getDomainPath(domain);
+    var _cookies = getCookies(originDomain);
+    var _headers = {};
+    if (_cookies) {
+        _headers.Cookie = _cookies;
+    }
+    extend(_headers, headers);
+    _headers = serialize(_headers);
+    if (_headers) _headers = "," + _headers;
+    return domain
+        .replace(/^(s?)(\/\/)/i, "http$1:$2")
+        .replace(domainReg, base + `*${/^(https\:|s\/\/)/i.test(domain) ? "*" : ""}$2${_headers}/$3$4`);
+};
+function noop() { }
+function toResponse() {
+    if (this.responseType === 'json') return JSON.stringify(this.response);
+    return this.response;
+}
+function _cross(jsonp, digest = noop, method, url, headers) {
+    var originDomain = getDomainPath(url);
+    if (!originDomain) throw new Error("路径格式错误！");
+    var _cookies = getCookies(originDomain);
+    var _headers = {};
+    if (_cookies) {
+        _headers.Cookie = _cookies;
+    }
+    extend(_headers, headers);
+    if (/^[mc]/i.test(method)) {
+        _headers["User-Agent"] = /^m/i.test(method)
+            ? "Efront/1.9 (iPhone) Safari/602.1"
+            : "Efront/1.9 (Windows) Chrome/77.0.3865.90";
+        method = method.slice(1);
+    }
+    var loaded, errored;
+    var onload = function (data) {
+        removeFromList(requests, xhr);
+        if (xhr.decoder) {
+            data = xhr.decoder(data);
+        }
+        loaded = data;
+        flush();
+        digest();
+    };
+    var onerror1 = function (e) {
+        removeFromList(requests, xhr);
+        errored = e || "未知错误！";
+        flush();
+        digest();
+    };
+    var onerror = async function (e) {
+        if (e.type === 'error') {
+            e = { response: "无法访问服务器", toString: toResponse };
+        }
+        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;
+        if (loaded) onloads.splice(0, onloads.length).map(e => e instanceof Function && e(xhr));
+        if (errored) onerrors.splice(0, onerrors.length).map(e => e instanceof Function && e(errored));
+        xhr.then = then;
+    };
+    if (/^jsonp/i.test(method)) {
+        var cb = method.split('\-')[1] || 'callback';
+        setTimeout(function () {
+            if (!isEmpty(jsondata) && isEmpty(datas)) {
+                datas = serialize(jsondata);
+            }
+            if (datas) {
+                xhr.src += (/\?/.test(xhr.src) ? "&" : "?") + datas;
+            }
+        });
+        var xhr = jsonp(url, {
+            [cb](a) {
+                onload({ status: 200, response: JSON.stringify(a), toString: toResponse });
+            }
+        });
+        xhr.onerror = onerror;
+    }
+    else {
+        var nocross = notCross(url);
+        var callback = function () {
+            var exposeHeaders = xhr.getResponseHeader("access-control-expose-headers");
+            var exposeMap = {};
+            if (exposeHeaders) exposeHeaders.split(",").forEach(h => exposeMap[h.toLowerCase()] = true);
+            if (xhr.getResponseHeader) {
+                var exposekey = nocross ? "set-cookie" : "efront-cookie";
+                if (exposeMap[exposekey]) {
+                    var cookie = xhr.getResponseHeader(exposekey);
+                    addCookie(cookie, originDomain);
+                }
+            }
+            switch (xhr.status) {
+                case 0:
+                    if (!xhr.response) {
+                        onerror({ status: 0, response: "无法访问服务器", toString: toResponse });
+                        break;
+                    }
+                case 200:
+                case 201:
+                case 304:
+                    onload(xhr);
+                    break;
+                case 307:
+                case 302:
+                case 301:
+                    if (xhr.isRedirected > 2) break;
+                    var exposekey = nocross ? "location" : "efront-location";
+                    var location = exposeMap[exposekey] && xhr.getResponseHeader(exposekey);
+                    if (!domainReg.test(location)) {
+                        if (/^\//.test(location)) {
+                            location = originDomain.replace(/\/.*$/, location);
+                        } else {
+                            location = originDomain.replace(/[^\/+]$/, location);
+                        }
+                        location = getRequestProtocol(url) + "//" + location;
+                    }
+                    var crs = _cross("get", location, _headers);
+                    crs.isRedirected = (xhr.isRedirected || 0) + 1;
+                    crs.done(onload, false);
+                    crs.error(onerror, false);
+                    break;
+                default:
+                    onerror(xhr);
+            }
+        };
+        var cross = this;
+        var xhr = cross(callback, onerror);
+        var send = xhr.send;
+        xhr.toString = toResponse;
+        xhr.json = xhr.data = xhr.send = function (data, value) {
+            if (!jsondata && !(isEmpty(data) && isEmpty(value))) jsondata = data instanceof Array ? [] : {};
+            if (FormData && data instanceof FormData) {
+                datas = data;
+            } else if (isObject(data) && !isFile(data)) {
+                extend(jsondata, data);
+            } else if (!isEmpty(value)) {
+                extend(jsondata, { [data]: value });
+            } else if (isString(data) && value !== false && /^\s*\{|\=/.test(data)) {
+                var data = /^\s*\{/.test(data) ? JSON.parse(data) : parseKV(data, "&", "=");
+                extend(jsondata, data);
+            } else {
+                datas = data;
+            }
+            return xhr;
+        };
+        xhr.form = function (data) {
+            xhr.data(data);
+            if (FormData) {
+                datas = new FormData;
+                for (var k in jsondata) {
+                    datas.append(k, jsondata[k]);
+                }
+            } else {
+                realHeaders["Content-Type"] = "application/x-www-form-urlencoded";
+                datas = serialize(jsondata, "&", "=");
+            }
+        };
+
+        var fire = function () {
+            var isform = /^f/i.test(method);
+            if (isform) {
+                if (method === 'form') method = 'post';
+                else method = method.slice(1);
+            }
+            if (/^jsonp/i.test(method)) method = "get";
+            if (!isEmpty(jsondata) && isEmpty(datas)) {
+                if (/^(get|head|trace)$/i.test(method)) {
+                    url = url.replace(/#[\s\S]*/, '');
+                    datas = serialize(jsondata);
+                    if (datas) {
+                        url += (/\?/.test(url) ? "&" : "?") + datas;
+                        datas = "";
+                    }
+
+                } else if (isform) {
+                    xhr.form(jsondata);
+                } else {
+                    datas = JSON.stringify(jsondata);
+                    if (datas === "{}" || datas === "[]") {
+                        datas = '';
+                    } else {
+                        realHeaders["Content-Type"] = "application/json;charset=UTF-8";
+                    }
+                }
+            }
+            if (nocross) {
+                extend(realHeaders, _headers);
+                xhr.open(method, url);
+            } else {
+                xhr.open(method, getCrossUrl(url, _headers));
+            }
+            Object.keys(realHeaders).forEach(key => setRequestHeader.call(xhr, key, realHeaders[key]));
+            if (!isEmpty(datas)) send.call(xhr, datas);
+            else send.call(xhr);
+            digest();
+        };
+
+        setTimeout(fire, 0);
+
+    }
+    var setRequestHeader = xhr.setRequestHeader;
+    var realHeaders = Object.create(null);
+    xhr.setRequestHeader = function (key, value) {
+        realHeaders[key] = value;
+    };
+
+    var onloads = [], onerrors = [];
+    xhr.done = xhr.success = function (on, asqueue = true) {
+        if (!asqueue) onloads.splice(0, onloads.length);
+        onloads.push(on);
+        flush();
+        return xhr;
+    };
+    var datas = "";
+    var jsondata = null;
+    xhr.fail = xhr.error = function (on, asqueue = true) {
+        if (!asqueue) {
+            onerrors.splice(0, onerrors.length);
+        }
+        onerrors.push(on);
+        flush();
+        return xhr;
+    };
+    xhr.then = function (ok, oh) {
+        onloads.push(ok);
+        onerrors.push(oh);
+        flush();
+    };
+    var abort = xhr.abort;
+    xhr.abort = function () {
+        removeFromList(requests, this);
+        if (isFunction(abort)) abort.call(this);
+    };
+    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) {
+    if (!base || location_href && location_href === domain.slice(0, location_href.length) || !/^https?\:\/\/|^s?\/\//.test(domain)) return true;
+    for (var cx = 0, dx = cors_hosts.length; cx < dx; cx++) {
+        var host = cors_hosts[cx];
+        if (host instanceof RegExp) {
+            if (host.test(domain)) return true;
+        } else {
+            host = host.replace(domainReg, '$2/$3');
+            if (domain.replace(domainReg, '$2/$3').slice(0, host.length) === host) return true;
+        }
+    }
+    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);
+}
+var bind = _cross.bind;
+_cross.bind = function () {
+    var _cross = bind.apply(this, arguments);
+    extend(_cross, {
+        requests,
+        abortAll() {
+            var rs = requests.splice(0, requests.length);
+            for (var r of rs) r.abort();
+        },
+        setHost,
+        addReform,
+        getCookies,
+        addCookie,
+        addDirect,
+        getCrossUrl
+    });
+    return _cross;
+}
+_cross.setHost = setHost;
+_cross.setLocation = function (host) {
+    location_href = host;
+    if (!base) base = /^https?\:/i.test(location_href) ? '/' : "http://efront.cc/";
+};

package/coms/basic/cookie.js

@@ -0,0 +1,92 @@
+var cookiesMap = {};
+var parseCookieFromText = function (cookie) {
+    var pairs = cookie.split(/;\s*/);
+    var info = {};
+    for (var cx = 1, dx = pairs.length; cx < dx; cx++) {
+        var kvs = /^(.+?)\=(.+?)$/.exec(pairs[cx]);
+        if (!kvs) continue;
+        var [, k, v] = kvs;
+        k = k.trim().toLowerCase();
+        switch (k) {
+            case "expires":
+                v = +new Date(v);
+                break;
+            case "max-age":
+                k = "expires";
+                v = Date.now() + v * 1000;
+                break;
+        }
+        info[k] = v;
+    }
+    var pair = parseKV(pairs[0], ";");
+    return [pair, info];
+};
+
+function addCookie(cookie_text, originDomain = "") {
+    if (!cookie_text) return;
+    if (cookie_text instanceof Array) cookie_text = cookie_text.join(",");
+    var cookies = cookie_text.replace(/(^|;|,)\s*(expires)=(\w*),([^=]*)(;|$)/ig, "$1$2=$3.$4$5")
+        .split(/,\s*/).map(parseCookieFromText);
+    for (var cookie of cookies) {
+        var [pair, info] = cookie;
+        var { path, domain, expires } = info;
+        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) {
+            if (!cookiesMap[destPath]) {
+                cookiesMap[destPath] = {};
+            }
+            var map = cookiesMap[destPath];
+            for (var k in pair) {
+                var v = pair[k];
+                map[k] = [v, expires];
+            }
+        }
+    }
+}
+
+function getCookies(domainPath) {
+    var cookieObject = {};
+    var splited = domainPath.split("/");
+    var domain = splited[0];
+    var now = Date.now();
+    do {
+        var copy = splited.slice(0);
+        do {
+            domainPath = copy.join("/");
+            var cookie = cookiesMap[domainPath];
+            if (cookie) {
+                for (var k in cookie) {
+                    if (!cookieObject[k]) {
+                        var [cook, expires] = cookie[k];
+                        if (expires && expires < now) {
+                            delete cookieObject[k];
+                            continue;
+                        }
+                        cookieObject[k] = cook;
+                    }
+                }
+            }
+            copy.pop();
+        } while (copy.length);
+        domain = domain.replace(/^.*?(\.|$)/, "");
+        splited[0] = domain;
+    } while (domain.length);
+    return serialize(cookieObject, ";");
+}
+return {
+    cookiesMap,
+    addCookie,
+    getCookies,
+}

package/coms/basic/parseURL_test.js

@@ -42,4 +42,5 @@ test(":cluster-opt.html", "pathname", ":cluster-opt.html")
 test("d:/cluster-opt.html", "pathname", "d:/cluster-opt.html")
 test("d:\\cluster-opt.html", "pathname", "d:\\cluster-opt.html")
 test("ftp:\\\\cluster-opt.html", "host", "cluster-opt.html")
-test("\\\\cluster-opt.html", "host", "cluster-opt.html")
+test("\\\\cluster-opt.html", "host", "cluster-opt.html")
+test("https://a:b@測試?abc#foo", "host", "測試")

package/coms/compile/common.js

@@ -167,6 +167,9 @@ var createScoped = function (parsed) {
                 case STRAP:
                     var s = o.text;
                     switch (s) {
+                        case "return":
+                            funcbody.return = true;
+                            break;
                         case "await":
                             funcbody.async = funcbody.await = true;
                             break;

package/coms/compile/scanner2.js

@@ -374,6 +374,9 @@ class Program extends Array {
     get await() {
         return this.scoped.await;
     }
+    get return() {
+        return this.scoped.return;
+    }
     get scoped() {
         if (this._scoped) return this._scoped;
         return this._scoped = createScoped(this);

package/coms/frame/edit.js

@@ -22,6 +22,11 @@ function main(title, { submit }, { data: origin, fields, }) {
         dispatch(this, 'submited');
         remove(this);
     });
+    bind('keydown.ctrl.s')(page, async function (e) {
+        e.preventDefault();
+        await submit(item, fields);
+        dispatch(this, 'submited');
+    });
     on("append")(page, lazy(function () {
         page.querySelector("input").focus();
     }));

package/coms/frame/list.js

@@ -5,7 +5,6 @@ function main(title, { fields, options: options0, load, remove }, edit_ref) {
         zimoli.prepare(edit_ref, function () {
             var p = popup(edit_ref, { fields, data: o })
             on("submited")(p, function () {
-                console.log("submited")
                 page.$scope.load();
             })
         })