efront 4.28.4 → 4.29.0

package/coms/zimoli/progbar.xht

@@ -11,6 +11,7 @@
         border-radius: 4px;
         overflow: hidden;
         white-space: nowrap;
+        cursor: pointer;
     }
 
     &[danger] {
@@ -18,7 +19,7 @@
 
         >[value] {
             color: #c243;
-            @bgimg(#c24, #fff);
+            @pending(#c24, #fff);
         }
     }
 
@@ -35,30 +36,42 @@
         }
     }
 
-    @bgimg(@line, @back) {
-        background-image: linear-gradient(58deg, @back, 50%, @line, 50%, @line, 53%, @back, 53%, @back);
-    }
+    @import "pending.less";
 
     >[value] {
-        @bgimg(#3ae, #fff);
-        background-size: 10px 16px;
-        background-position: 0 0;
-        background-repeat: repeat;
+        @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>
+    <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, pending } = this;
+    var { total, current, pending = [] } = this;
     var calc = function (current) {
         var v = (current / total * 10000 + .5) | 0;
         if (v < 0) v = 0;
@@ -75,6 +88,14 @@
     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;

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/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.4",
+    "version": "4.29.0",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {