efront 4.28.3 → 4.29.0

package/coms/zimoli/button.less

@@ -122,47 +122,33 @@
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.3) inset;
 }
 
+@import "pending.less";
+
 &[pending],
 &[loading] {
     @keyframes ltr {
         0% {
-            left: -30%;
-        }
-
-        30% {
-            left: -30%;
-        }
-
-        60% {
-            left: 20%;
-        }
-
-        90% {
-            left: 60%;
+            background-position-x: 0;
         }
 
         100% {
-            left: 130%;
+            background-position-x: 15px;
         }
 
     }
 
     &:before {
-        transform: rotate(-12deg);
         display: block;
         content: "";
         position: absolute;
-        left: -30%;
-        top: -10%;
-        width: 6px;
-        margin-left: -2px;
-        height: 200%;
-        background: #fff9;
-        background: inherit;
-        opacity: 0.9;
-        border-left: 1px #fff3 solid;
-        border-right: 3px #fff6 solid;
-        animation: ltr 2s linear 0s infinite;
+        width: auto;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        height: auto;
+        animation: ltr 1.2s linear 0s infinite;
+        @pending(#fff2, #0002, 50%);
     }
 
     a&,

package/coms/zimoli/cless.js

@@ -59,7 +59,7 @@ function cless(commFactory, innerCss, className) {
         } else {
             stylesheet.innerHTML = innerCss;
         }
-        if (!stylesheet.parentNode) appendChild(head, stylesheet);
+        if (stylesheet.parentNode !== head) appendChild(head, stylesheet);
     }
     return _create(commFactory, className, _create);
 }

package/coms/zimoli/marker.js

@@ -1,10 +1,11 @@
-var b = function (match) {
+var b = function (match, isFullmatch) {
     var b = document.createElement('b');
     b.innerText = match;
+    if (isFullmatch) b.setAttribute('fullmatch', '');
     return b;
 };
-var wrap = function (pre, match, aft) {
-    return [].concat(pre, b(match), aft);
+var wrap = function (pre, match, aft, search) {
+    return [].concat(pre, b(match, match.length === search.length), aft);
 };
 function marker(e) {
     if (!e) e = document.createElement("marker");

package/coms/zimoli/pending.less

@@ -0,0 +1,12 @@
+@pending(@line, @back, @sep: 80%) {
+    @hep: @sep / 2;
+    @aep: 50% + @hep;
+    background-image:
+        linear-gradient(53.13deg,
+            @back, @hep,
+            @line, @hep, @line, 50%,
+            @back, 50%, @back, @aep,
+            @line, @aep, @line );
+    background-size: 15px 20px;
+    background-repeat: repeat;
+}

package/coms/zimoli/progbar.xht

@@ -1,46 +1,116 @@
 <style>
     & {
+        outline-offset: -3px;
+        outline: 1px solid #3ae;
         display: inline-block;
         min-width: 60px;
         height: 14px;
-        color: #3ae;
-        border: 3px double;
-        background: #f2f2f2;
+        border: 1px solid;
+        background: #eee1;
         position: relative;
         border-radius: 4px;
+        overflow: hidden;
+        white-space: nowrap;
+        cursor: pointer;
     }
-    
+
     &[danger] {
-        color: #c24;
+        outline: 1px solid #c24;
+
+        >[value] {
+            color: #c243;
+            @pending(#c24, #fff);
+        }
     }
-    
+
     >div {
+        vertical-align: top;
+        display: inline-block;
         position: relative;
-        border-top: 7px solid;
+        border-top: 11px solid;
         border-bottom: 1px solid;
-        border-left: 2px solid;
-        border-right: 2px solid;
         height: 100%;
+
+        &:first-child {
+            border-radius: 4px 0 0 4px;
+        }
+    }
+
+    @import "pending.less";
+
+    >[value] {
+        @pending(#0004, #fff3);
+        background-position-x: right;
+        background-clip: border-box;
+        color: #3ae2;
+
+        &:last-child {
+            border-radius: inherit;
+        }
+    }
+
+    >[state] {
+        background-clip: content-box;
+        background-color: #6ca;
+    }
+
+    >span {
+        position: absolute;
+        display: block;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        z-index: 1;
+        text-align: center;
+        right: 0;
     }
 </style>
 <div>
-    <div -style="{width:value}"></div>
+    <span #text></span>
+    <div value -style="{width:value}"></div>
+    <div state -repeat="(s,i) in state" -style="{width:s,color:color.rotate('#f003',i)}"></div>
 </div>
 <script>
-    var { total, current } = this;
-    var calc = function () {
+    var { total, current, pending = [] } = this;
+    var calc = function (current) {
         var v = (current / total * 10000 + .5) | 0;
         if (v < 0) v = 0;
         if (v > 10000) v = 10000;
         return v / 100 + "%";
     };
-    var value = calc();
+    var calcAll = function (pending) {
+        var res = [].concat(pending);
+        var s = sum(res);
+        res = res.map(calc);
+        res.summary = calc(s);
+        return res;
+    };
+    var state = calcAll(pending);
+    var value = calc(current);
     Object.defineProperties(this, {
+        innerText: {
+            set(v) {
+                text.innerText = v;
+            },
+            get() {
+                return text.innerText;
+            },
+        },
+        pending: {
+            set(v) {
+                pending = v;
+                state = calcAll(pending);
+            },
+            get() {
+                return pending;
+            }
+        },
         total: {
             set(v) {
                 if (total === v) return;
                 total = v;
-                value = calc();
+                value = calc(current);
+                state = calcAll(pending);
             },
             get() {
                 return total;
@@ -50,7 +120,7 @@
             set(v) {
                 if (current === v) return;
                 current = v;
-                value = calc();
+                value = calc(current);
             },
             get() {
                 return current;

package/coms/zimoli/relogin.js

@@ -0,0 +1,43 @@
+function relogin(auth_login) {
+    var login_queue = [], reject_queue = [];
+    return async function ({ status, url, headers }, reform, reject) {
+        if (status === 401) {
+            var xhr = this;
+            var abort = xhr.abort;
+            xhr.abort = function () {
+                removeFromList(login_queue, reform);
+                removeFromList(reject_queue, reject);
+                if (!login_queue.length) remove(reject_queue.splice(0, 1)[0]);
+                abort.call(this);
+            };
+
+            if (login_queue.length) {
+                login_queue.push(reform);
+                reject_queue.push(reject);
+                return false;
+            }
+            var base = data.getInstance("base").base;
+            var { protocol, host } = parseURL(url);
+            var base1 = protocol + "//" + host + "/";
+            if (base !== base1) {
+                data.setSource(base1, null);
+            }
+            login_queue.push(reform);
+            var page = await popup(auth_login, base1);
+            if (!login_queue.length) return;
+            reject_queue.push(page, reject);
+            care(page, "login", function (info) {
+                data.setSource(base1, info);
+                headers.authorization = info;
+                login_queue.splice(0, login_queue.length).forEach(q => q());
+                reject_queue.splice(0, reject_queue.length);
+            });
+            on("remove")(page, function () {
+                login_queue.splice(0, login_queue.length);
+                if (reject_queue[0] === this) reject_queue.shift();
+                reject_queue.splice(0, reject_queue.length).forEach(r => r());
+            });
+            return false;
+        }
+    }
+}

package/coms/zimoli/script.js

@@ -15,7 +15,7 @@ function script(url, judger) {
         clear();
         if (!needcallback || needcallback > 1000) return;
         var res = seek(window, judger);
-        if (res !== undefined){
+        if (res !== undefined) {
             if (res && res.then instanceof Function) {
                 var proto = Object.getPrototypeOf instanceof Function ? Object.getPrototypeOf(res) : res.__proto__;
                 if (Object.setPrototypeOf instanceof Function) Object.setPrototypeOf(res, null);
@@ -24,7 +24,7 @@ function script(url, judger) {
                     var _then = res.then;
                     res.then = null;
                     if (res.then) _then = null;
-    
+
                 }
                 resolve(res.then instanceof Function ? null : res);
                 if (proto) {
@@ -36,7 +36,7 @@ function script(url, judger) {
                 resolve(res);
             }
             return ok(res);
-        } 
+        }
         requestAnimationFrame(onload);
         needcallback++;
     };
@@ -60,8 +60,8 @@ function script(url, judger) {
         if (f instanceof Function) oh = f;
         return script;
     };
-    script.then = function (f) {
-        return promise.then(f);
+    script.then = function (f1, f2) {
+        return promise.then(f1, f2);
     };
     script.catch = function (f) {
         return promise.catch(f);

package/coms/zimoli/table.less

@@ -283,4 +283,7 @@ scrollbar[x] {
     }
 
     width: 100%;
+}
+b[fullmatch]{
+    color:#824;
 }

package/coms/zimoli/zimoli.js

@@ -171,11 +171,11 @@ var getpgpath = function (pagepath) {
             for (var m of mparams) argobj[m] = params.pop();
             if (params.length) argobj[m] += "/" + params.reverse().join("/");
         }
-        pagepath = realmaped[pagepath] || pagepath;
-        return [pagepath, argobj];
+        var realpath = realmaped[pagepath] || pagepath;
+        return [realpath, argobj, pagepath];
     }
-    pagepath = realmaped[pagepath] || pagepath;
-    return [pagepath];
+    var realpath = realmaped[pagepath] || pagepath;
+    return [realpath, null, pagepath];
 };
 function createState(pgpath) {
     var [pgpath] = getpgpath(pgpath);
@@ -346,7 +346,7 @@ function create(pagepath, args, from, needroles, zimolidata) {
         if (!isHandled(needroles)) needroles = zimolidata.roles;
     }
     if (typeof pagepath === 'string') {
-        var [pgpath, args0] = getpgpath(pagepath);
+        var [pgpath, args0, bspath] = getpgpath(pagepath);
         var page_object = page_generators[pgpath];
         if (!isEmpty(args0)) page_object.state.data = args, args = args0;
     }
@@ -357,6 +357,9 @@ function create(pagepath, args, from, needroles, zimolidata) {
             throw new Error(i18n`调用create前请确保prepare执行完毕:${pgpath}`);
         }
         var { pg, "with": _with_elements, state, onback: _pageback_listener, roles } = page_object;
+        state.realpath = pgpath;
+        state.basepath = bspath;
+        state.pagepath = pagepath;
     }
     else if (isFunction(pgpath)) {
         var pg = pgpath;
@@ -379,6 +382,9 @@ function create(pagepath, args, from, needroles, zimolidata) {
         _pageback_listener = handler;
     };
     var _page = pg.call(state, args, from);
+    _page.realpath = state.realpath;
+    _page.basepath = state.basepath;
+    _page.pagepath = pagepath;
     if (undefined === args || null === args) args = {};
     if (_page) {
         var page_with = _with_elements.splice(_with_length, _with_elements.length - _with_length);
@@ -454,8 +460,9 @@ var createEmptyHistory = function (emptyState, allowForward = true) {
     h.wardable = allowForward;
     return h;
 }
-var zimoliid = 0, zimoliad = 0;
+var zimoliid = 0, zimoliad = 0, zimolicd = 0;
 function zimoli(pagepath, args, history_name, oldpagepath) {
+    zimolicd = 1;
     if (arguments.length === 0) {
         if (zimoliid !== zimoliad) return;
         history_name = current_history;
@@ -722,6 +729,7 @@ var _switch = zimoli.switch = function (history_name = default_history, target_b
     else {
         if (isString(history_name)) {
             current_history = history_name = history_name.replace(/\/$/, '') + "/";
+            if (!zimolicd) default_history = current_history;
         }
         if (target_body) body = target_body;
     }
@@ -736,7 +744,7 @@ var _switch = zimoli.switch = function (history_name = default_history, target_b
         if (!history[current_history]) root_path = (history[current_history] = createEmptyHistory(emptyState))[0];
         else {
             var _history = history[current_history];
-            if (_history.index === 0) root_path = _history[0] = emptyState;
+            if (_history.index === 0 && _history.length <= 1) root_path = _history[0] = emptyState;
         }
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.28.3",
+    "version": "4.29.0",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {