efront 3.9.9 → 3.9.15

package/apps/pivot/api.yml

@@ -1,4 +1,4 @@
-/ authorization: 
+/ authorization=: 
   login: options ::login-:a
   run: options :::run
   share: options ::share-:opt?:path

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 () {
@@ -23,16 +23,22 @@ function main() {
         this.$scope.pending = true;
         page.disabled = true;
         try {
-            var login = await data.getApi("login");
-            login.base = location.protocol + "//" + parseURL(this.$scope.data.host).host + "/";
-            data.setInstance("base", { base: login.base, host: parseURL(login.base).host });
-            var info = await data.from(login, {
+            var base = location.protocol + "//" + parseURL(this.$scope.data.host).host + "/";
+            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({ authorization: info });
-            user.login({})
-            go('/main')
+            data.setSource(base, info);
+            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/home/welcome.js

@@ -15,7 +15,7 @@ function main() {
             target.removeAttribute('pending');
         },
         async logout() {
-            data.setSource('authorization', null);
+            data.setSource({});
             await user.Logout();
             zimoli.switch();
             zimoli();

package/apps/pivot/main.js

@@ -1,26 +1,54 @@
 data.loadConfig("api.yml");
 user.loginPath = '/auth/login';
-var token = data.getSource('authorization');
-if (token) {
-    user.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);
+});
 data.bindInstance("base", async function (base) {
+    if (!base.base) return;
     cross.addDirect(base.base);
     var apimap = await data.getConfig();
     for (var k in apimap) {
         apimap[k].base = base.base;
     }
 });
+var base = data.getInstance('base').base;
+var token = base && data.getSource(base);
+if (token) {
+    user.login({});
+}
 setInterval(function () {
-    var auth = data.getSource('authorization');
-    if (!auth) return;
+    var base = data.getInstance("base");
+    if (!base.base) return user.token = null;
+    var auth = data.getSource(base.base);
+    if (!auth) return user.token = null;
     var auth1 = encode62.timeupdate(auth);
-    if (auth1 !== auth) data.setSource("authorization", auth1);
+    if (auth1 !== auth) data.setSource(base.base, auth1);
     user.token = auth1;
 }, 2000);
 login();
 var layer = layer$glance({
-    left: frame$left,
+    left: frame$left.bind({
+        head: await init("left-header")
+    }),
     top: frame$top
 });
 on("append")(layer, function () {

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/apps/pivot/wow/root.js

@@ -10,7 +10,7 @@ function main() {
         if (!$scope.pathlist.length) {
             return;
         }
-        $scope.pathlist.pop();
+        data.setInstance("pathlist", $scope.pathlist.slice(0, -1));
         $scope.open();
         return false;
     }
@@ -18,11 +18,11 @@ function main() {
 
     renderWithDefaults(page, {
         lattice,
-        pathlist: [],
+        pathlist: data.getInstance("pathlist"),
         active: null,
         open(p) {
             if (p) p = String(p.name || '').replace(/\/$/, '');
-            if (p) this.pathlist.push(p);
+            if (p) data.setInstance("pathlist", this.pathlist.concat(p));
             this.data = data.from("folder", { opt: 'list', path: "/" + this.pathlist.join('/') }, files => {
                 if (files) return sortname(files).map(f => {
                     return {

package/coms/basic/loader.js

@@ -503,11 +503,19 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
         var promise = new Promise(function (ok) {
             _ok = ok;
         });
+        if (prebuilds.init) {
+            var prebuilds2 = Object.create(null);
+            for (var k in prebuilds) prebuilds2[k] = prebuilds[k];
+            prebuilds = prebuilds2;
+            delete prebuilds.popup;
+            delete prebuilds.action;
+            delete prebuilds.init;
+        }
         init(argName, function (res) {
             result = res;
             created = true;
             _ok(res);
-        });
+        }, prebuilds);
         if (created) return result;
         return promise;
     });

package/coms/basic/parseURL.js

@@ -1,5 +1,5 @@
-// -------/// ---------------1-------------//////////////2---3--------//////// ----4----2/////5-----------------------6-----------------------//////////////-7--5///8----9----//10--11---10///--12-----8//
-var reg = /^([^\:\/\?#\[]+\:(?![^\:\/\?\#]*@))?(?:\/\/)?(?:(([^\:\/\?#]+)?(?:\:([^\/\?#]+))?)@)?(([^\/@\:\?\#]*(?:[^\d\@\:\/\?#]|\.)[^\/@\?\#]*?)?(?:(?:\:|^)(\d+))?)((\/[^\?#]*)?(\?([^#]*))?(#[\s\S]*)?)$/;
+// -------/// ---------------1---------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6-----------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10///--12-----8//
+var reg = /^([^\:\/\\\?#\[]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[\@\/\\\?#\.]*[^\d\@\:\/\\\?#\.]+|\.[^\/\\@\:\?\#]+?))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?(#[\s\S]*)?)$/;
 function parseURL(url) {
     if (url === undefined || url === null) url = '';
     var [__, protocol, auth, username, password, host, hostname, port, path, pathname, search, query, hash] = reg.exec(url);

package/coms/basic/parseURL_test.js

@@ -36,4 +36,10 @@ test("http://[::]/", "host", "[::]")
 test("http://[::%12]/", "host", "[::%12]")
 test("http://[::]:80/", "hostname", "[::]")
 test("[::]:80/", "hostname", "[::]")
-test("[fd64:f52:f52:f52:f52:f52:f52:97]", "hostname", "[fd64:f52:f52:f52:f52:f52:f52:97]")
+test("[fd64:f52:f52:f52:f52:f52:f52:97]", "hostname", "[fd64:f52:f52:f52:f52:f52:f52:97]")
+test("./cluster-opt.html", "pathname", "./cluster-opt.html")
+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")

package/coms/basic/seek.js

@@ -1,10 +1,11 @@
 var seek = function (object, seeker) {
-    if (seeker === null || seeker === undefined || !object) return;
+    if (seeker === null || seeker === undefined || isEmpty(object)) return;
     if (seeker instanceof Function) {
         return seeker(object);
     }
     if (typeof seeker === "string") {
         if (/^(['"`])[\s\S]*$/i.test(seeker)) return seeker.replace(/^(['"`])([\s\S*])\1?$/, "$2");
+        if (seeker === '' || seeker === ".") return object;
         seeker = seeker.split(".");
     }
     if (seeker instanceof Array) {

package/coms/basic/sortname.js

@@ -82,17 +82,17 @@ var parse干支 = function (a) {
     return (12 + g - z) % 12 / 2 * 10 + g + 1;
 };
 var compare = function (a, b) {
-    for (var cx1 = a.length - 1, cx2 = a.length - 1; cx1 >= 0 && cx2 >= 0; cx1--, cx2--) {
+    for (var cx1 = a.length - 1, cx2 = b.length - 1; cx1 >= 0 && cx2 >= 0; cx1--, cx2--) {
         while (/\s\u00a0/.test(a[cx1])) cx1--;
         while (/\s\u00a0/.test(b[cx2])) cx2--;
-        if (a[cx1] !== b[cx2] || a[cx1] in map子丑寅 || a[cx1] in map一二三 || a in power) break;
+        if (a[cx1] !== b[cx2] || a[cx1] in map子丑寅 || a[cx1] in map一二三 || a in power || /^\d$/.test(a[cx1])) break;
     }
     a = a.slice(0, cx1 + 1);
     b = b.slice(0, cx2 + 1);
-    for (var cx1 = 0, cx2 = 0, dx1 = a.length, dx2 = b.length; cx1 < dx1 && cx2 < dx2; cx1++, cx2++) {
+    for (var cx1 = 0, cx2 = 0, dx1 = b.length, dx2 = b.length; cx1 < dx1 && cx2 < dx2; cx1++, cx2++) {
         while (/[\s\u00a0]/.test(a[cx1])) cx1++;
         while (/[\s\u00a0]/.test(b[cx2])) cx2++;
-        if (a[cx1] !== b[cx2] || a[cx1] in map甲乙丙 || a[cx1] in map一二三 || a in power) break;
+        if (a[cx1] !== b[cx2] || a[cx1] in map甲乙丙 || a[cx1] in map一二三 || a in power || /^\d/.test(a[cx1])) break;
     }
     if (cx1) a = a.slice(cx1);
     if (cx2) b = b.slice(cx2);

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/left.html

@@ -1,13 +1,13 @@
-<div ng-if="!user.isLogin" class="navbar-header">
+<header ng-if="!user.isLogin" class="navbar-header">
     <!-- <avatar></avatar> -->
     <a @click="popup('#/user/login')" class="dashboard_text">请登录</a>
-</div>
-<div -else class="navbar-header">
+</header>
+<header -else class="navbar-header">
     <span class="dashboard_text" @click="go('/user/profile')">
         <avatar ng-src="user.avatar" size=30></avatar>
         <span ng-bind="user.name"></span>
         <span ng-bind="user.roles"></span>
     </span>
-</div>
+</header>
 <ylist mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(event.value)">
 </ylist>

package/coms/frame/left.js

@@ -1,18 +1,21 @@
-var page = document.createElement("都说我负天下人_可你们天下人_又何曾善待过我");
-page.innerHTML = left;
 if (!user.avatar) user.avatar = "user/avatar.png";
-render(page, {
-    ylist: menu,
-    btn: button,
-    go,
-    user,
-    avatar,
-    popup,
-    menus: frame$route,
-});
-on('append')(page, function () {
-    frame$route.open();
-});
 function main() {
+    var page = document.createElement("都说我负天下人_可你们天下人_又何曾善待过我");
+    page.innerHTML = template;
+    var { head, foot, header = head, footer = foot } = this;
+    render(page, extend({
+        ylist: menu,
+        btn: button,
+        go,
+        user,
+        avatar,
+        header,
+        footer,
+        popup,
+        menus: frame$route,
+    }, this));
+    on('append')(page, function () {
+        frame$route.open();
+    });
     return page;
 }

package/coms/frame/left.less

@@ -4,13 +4,14 @@
 }
 
 .navbar-header {
-    height: 50px;
+    min-height: 50px;
     padding: 10px 15px 10px 25px;
     font-size: 25px;
     line-height: 25px;
     text-transform: uppercase;
     color: #b8c7ce;
     margin-top: -50px;
+    display: block;
 }
 
 .dashboard_text {

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/pivot/left-header.html

@@ -0,0 +1 @@
+<select -model="host" @change="setHost(this.value)" direction=y addable><option -repeat="h in hosts" :value=h.key -text="h.name"></option></select>

package/coms/pivot/left-header.js

@@ -0,0 +1,15 @@
+function main() {
+    var a = document.createElement("菜单之上");
+    a.innerHTML = template;
+    render(a, {
+        setHost(a) {
+            data.setInstance("base", { base: location.protocol + "//" + a + "/", host: a });
+            data.abortAll();
+            zimoli();
+        },
+        host: data.getInstance("base").host,
+        select,
+        hosts: data.getInstance("hosts")
+    });
+    return a;
+}

package/coms/pivot/left-header.less

@@ -0,0 +1,11 @@
+&.navbar-header {
+    padding: 0;
+}
+
+select {
+    background: transparent;
+    color: inherit;
+    height: 50px;
+    margin: 0;
+    width: 100%;
+}

package/coms/zimoli/alert.js

@@ -35,6 +35,8 @@ function alert() {
     [].map.call(arguments, function (arg) {
         switch (typeof arg) {
             case "string":
+            case "object":
+                arg = String(arg);
                 if (!text) {
                     text = arg;
                 } else if (color_reg.test(text)) {

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/cless.js

@@ -8,7 +8,7 @@ function create(commFactory, className) {
     }
     if (isFunction(commFactory)) {
         var result = function () {
-            var commRelease = commFactory.apply(result, arguments);
+            var commRelease = commFactory.apply(this || result, arguments);
             if (commRelease) {
                 commRelease = create(commRelease, className);
             }

package/coms/zimoli/cross.js

@@ -154,13 +154,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 () {
@@ -217,8 +223,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 +253,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 +267,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 +333,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,8 +353,32 @@ 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,
     addCookie,
     addDirect,