efront 3.9.8 → 3.9.14

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

@@ -23,14 +23,13 @@ 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 + "/";
+            data.setInstance("base", { base, host: parseURL(base).host });
+            var info = await data.from("login", {
                 a: encode62.timeencode(encode62.geta(password))
             }).loading_promise;
             info = encode62.timeupdate(info);
-            data.setSource({ authorization: info });
+            data.setSource(base, info);
             user.login({})
             go('/main')
         } catch (e) {

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,38 @@
 data.loadConfig("api.yml");
 user.loginPath = '/auth/login';
-var token = data.getSource('authorization');
-if (token) {
-    user.login({});
-}
+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;
     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.html

@@ -4,8 +4,10 @@
     <close @click="remove()"></close>
 </div>
 <div body>
-    <div class="left">
+    <div class="top">
         <field -repeat="f in fields" -src="[f,data]"></field>
+    </div>
+    <div class="left">
         <pre -text="task.code"></pre>
     </div>
     <div class="right" :class="{error:error}">

package/apps/pivot/task/invoke.less

@@ -2,22 +2,34 @@
     position: absolute;
     width: 800px;
 }
-
+>[body]{
+    border-top: 50px solid transparent;
+    border-bottom: 50px solid transparent;
+}
 >[body]>div {
     display: inline-block;
-    width: 50%;
     vertical-align: top;
     overflow: auto;
     font-size: 12px;
-    border-bottom: 50px solid transparent;
-    padding: 0 10px;
+
+    &.top {
+        left: 0;
+        top: 0;
+        width: 100%;
+    }
+
+    &.left,
+    &.right {
+        height: 100%;
+        width: 50%;
+    }
 
     &.right {
         background: #000;
         color: #fff;
-        height: 100%;
     }
-    &.error{
+
+    &.error {
         color: #c26;
     }
 }

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/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/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/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,7 +223,7 @@ function cross(method, url, headers) {
             onerrors.push(oh);
             flush();
         };
-        setTimeout(function () {
+        var sendtimer = setTimeout(function () {
             digest();
             var isform = /^f/i.test(method);
             if (isform) {
@@ -252,6 +258,7 @@ function cross(method, url, headers) {
     }
     var loaded, errored;
     var onload = function (xhr) {
+        removeFromList(requests, xhr);
         if (xhr.decoder) {
             xhr = xhr.decoder(xhr);
         }
@@ -260,6 +267,7 @@ function cross(method, url, headers) {
         digest();
     };
     var onerror = function (xhr) {
+        removeFromList(requests, xhr);
         errored = xhr;
         flush();
         digest();
@@ -317,6 +325,7 @@ function cross(method, url, headers) {
         flush();
         return xhr;
     };
+    requests.push(xhr);
     return xhr;
 }
 function addDirect(a) {
@@ -335,7 +344,14 @@ function notCross(domain) {
     }
     return false;
 }
+
+var requests = [];
 extend(cross, {
+    requests,
+    abortAll() {
+        var rs = requests.splice(0, requests.length);
+        for (var r of rs) r.abort();
+    },
     setHost,
     getCookies,
     addCookie,

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);
@@ -543,7 +549,7 @@ 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);
@@ -555,6 +561,7 @@ var privates = {
                         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,7 +850,6 @@ 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);
@@ -852,7 +861,7 @@ var data = {
             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, 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/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/package.json

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