efront 3.9.14 → 3.9.15

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/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();
             })
         })

package/coms/zimoli/bind.js

@@ -0,0 +1,14 @@
+function bind(eventName, bindTo = window) {
+    return function (target, eventListener) {
+        var off;
+        var off1 = on("append")(target, function () {
+            if (off) off();
+            off = on(eventName).call(bindTo, target, eventListener);
+        });
+        var off2 = on("remove")(target, function () {
+            if (off) off();
+            off = null;
+        });
+        return function () { off1(); off2(); };
+    }
+}

package/coms/zimoli/button.less

@@ -183,6 +183,7 @@ a&,
     color: @default-color;
     cursor: pointer;
     outline: none;
+    .clear();
 
     .clear() {
         text-shadow: none;

package/coms/zimoli/cross.js

@@ -223,8 +223,7 @@ function cross(method, url, headers) {
             onerrors.push(oh);
             flush();
         };
-        var sendtimer = setTimeout(function () {
-            digest();
+        var fire = function () {
             var isform = /^f/i.test(method);
             if (isform) {
                 if (method === 'form') method = 'post';
@@ -254,7 +253,9 @@ 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) {
@@ -266,12 +267,19 @@ function cross(method, url, headers) {
         flush();
         digest();
     };
-    var onerror = function (xhr) {
-        removeFromList(requests, 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;
@@ -329,6 +337,7 @@ function cross(method, url, headers) {
     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) {
@@ -346,6 +355,22 @@ function notCross(domain) {
 }
 
 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() {
@@ -353,6 +378,7 @@ extend(cross, {
         for (var r of rs) r.abort();
     },
     setHost,
+    addReform,
     getCookies,
     addCookie,
     addDirect,

package/coms/zimoli/data.js

@@ -539,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);
@@ -556,7 +556,7 @@ var privates = {
                 }).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);
                     }
@@ -852,12 +852,12 @@ var data = {
                 instance.loading.abort();
             }
             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) {
@@ -872,7 +872,7 @@ var data = {
                     instance.loading = null;
                     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, error: e, api, params: params2, toString: getErrorMessage })
                     } catch (error) {
                         oh(error);
                     }

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