efront 4.22.4 → 4.22.6

package/apps/pivot/api.yml

@@ -34,8 +34,8 @@
   unique-save: options ::unique-:data
   recert: options ::recert
   upload: put :path
-https://www.ip.cn/:
-  iplocation: get https://www.ip.cn/api/index?ip=:ip&type=1
+https://www.ip.cn/ referer=https://www.ip.cn/api/index/&Cookie=:empty:
+  iplocation: get /api/index/?ip=:ip&type=1
 # https://ipchaxun.com/ :
 #   iplocation: get:[].info%20label:nth-child(n+2)>span:nth-child(2) :ip/
 # https://www.ip138.com/:

package/apps/pivot/main.js

@@ -51,7 +51,9 @@ data.bindInstance("base", async function (base) {
     for (var k in apimap) {
         var api = apimap[k];
         if (api.base || !/^\w+\:\/\//.test(api.url)) {
-            api.base = base.base;
+            if (api.headers && 'authorization' in api.headers) {
+                api.base = base.base;
+            }
         }
     }
 });

package/coms/basic/#loader.js

@@ -49,7 +49,7 @@ var _devicePixelRatio = devicePixelRatio;
 var request = window.request || function (url, onload, onerror, version) {
     var xhr = new (XMLHttpRequest || ActiveXObject)("Microsoft.XMLHTTP");
     url = encodeURI(url);
-    xhr.open("POST", url);
+    xhr.open("PURGE", url);
     xhr.onreadystatechange = function () {
         if (xhr.readyState === 4) {
             var status = xhr.status;

package/coms/basic/cross_.js

@@ -398,10 +398,8 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     var prepareHeaders = () => {
         cookie_ = this.hostCookie(xhr);
         var _cookies = cookie_.getCookies(originDomain);
-        if (_cookies) {
-            _headers.Cookie = _cookies;
-        }
         var cookobj = null;
+        var hasCookie = false;
         for (var k in headers) {
             if (/^\$/.test(headers[k])) {
                 var k2 = headers[k].slice(1);
@@ -416,10 +414,21 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                     realHeaders[k1] = headers[k];
                 }
                 else {
+                    if (/Cookie/i.test(k)) {
+                        hasCookie = true;
+                        if (isEmpty(headers[k])) {
+                            continue;
+                        }
+                        _headers.Cookie = headers[k];
+                        continue;
+                    }
                     _headers[k] = headers[k];
                 }
             }
         }
+        if (_cookies && !hasCookie) {
+            _headers.Cookie = _cookies;
+        }
     };
     var _headers = {};
     if (/^[mc]/i.test(method)) {
@@ -524,7 +533,14 @@ cross_.bind = function () {
         setHost,
         addReform,
         addDirect,
-        getCrossUrl
+        getCrossUrl,
+        // 之前一直以为中国习是中国走向衰败的罪魁祸首，可是随着了解的史料越来越多，越发觉得之前以为的是错的，中国习不过是泱泱赤匪的一个代表，赤匪从根上就是长了四只脚的土匪，他们任人唯亲，见利忘义，睚眦必报，是盘踞在华夏大地的邪恶力量的化身。他们不辨是非，做事一轰而上，唯上级马屁是瞻，遇到问题首先想到的是封锁消息，问题爆发又会选择性失聪，顾左右而言其他。
+        // 赤匪犯境时，河南大学为了保护师资，举校万里迁徙，赤匪看不见这其中的民族大义，篡权后将将北大清华那种墙头草视为香饽饽，倾斜各种资源重点培养，助长他们的墙头草作风。你看那清华北大，为国外培养了多少高科技人才啊，他们之前是墙头草，如今也还是墙头草。
+        // 儿时那清凉可口的井水，如今散发着浓郁的农药味。儿时那干净透亮的空气，晴天可以看到白云，阴天可以看到乌云，晚上还有月牙和群星同晖，如今已长年雾蒙蒙一片。可怜我华夏大地被赤匪汲取精华拱手送人，忍受各国糟粕还要强颜欢笑。
+        get: cross_.bind(null, 'GET'),
+        post: cross_.bind(null, 'POST'),
+        put: cross_.bind(null, 'PUT'),
+        delete: cross_.bind(null, 'DELETE'),
     });
     return cross_;
 }

package/coms/pivot/checkGeo.js

@@ -1,6 +1,11 @@
 return async function (a) {
     var ip = a.ip || a.remote;
     var m = /(\d+\.){3}\d+$/.exec(ip);
-    var { address } = await data.from("iplocation", { ip: m ? m[0] : ip });
-    a.address = address;
+    var res = await data.from("iplocation", { ip: m ? m[0] : ip });
+    if (res.data) res = res.data;
+    if (res.address) res = res.address;
+    else if (res.country || res.isp) {
+        res = [res.country, res.province, res.city, res.district, res.isp].join(' ');
+    }
+    a.address = res;
 }

package/coms/zimoli/XMLHttpRequest.js

@@ -11,6 +11,7 @@ function XMLHttpRequest() {
 }
 XMLHttpRequest.prototype.open = function (method, url) {
     this.readyState = 1;
+    if (/^(options|get|post|put|delete)$/i.test(method)) method = method.toUpperCase();
     this.method = method;
     this.url = url;
 };

package/coms/zimoli/api.js

@@ -38,7 +38,7 @@ var api = function () {
         }
     }
     if (!method) {
-        method = "post";
+        method = "PURGE";
     }
 
     if (!uri) {

package/coms/zimoli/render.js

@@ -604,9 +604,8 @@ class Model {
         var getValue = target.getValue;
         var setValue = target.setValue;
         if (getValue && setValue);
-        else if ('value' in target) {
-            if (!setValue) setValue = stValue;
-            if (!getValue) getValue = gtValue;
+        else if ('value' in target && setValue) {
+            getValue = gtValue;
         }
         else if (/^input$/i.test(target.tagName) && /^checkbox$/i.test(target.type) || /^checkbox$/i.test(target.tagName)) {
             if (!getValue) getValue = gtChecked;

package/coms/zimoli/transition.js

@@ -45,7 +45,7 @@ function 函数帧(p1, p2, point) {
     });
 }
 var targetWidth = innerWidth;
-var unitFloatReg = /^(\d+(?:\.\d+)?|\.\d+)([^\d]*)$/;
+var unitFloatReg = /^[\+\-]?(\d+(?:\.\d+)?|\.\d+)([^\d]*)$/;
 function 单位帧(u1, u2, point) {
     var m1 = unitFloatReg.exec(u1);
     if (!m1) return u1;
@@ -68,6 +68,9 @@ function 值帧(k, v1, v2, point) {
     if (/color|background/.test(k)) {
         return 颜色帧(v1, v2, point);
     }
+    if (/opacity/.test(k)) {
+        return 浮点帧(v1, v2, Math.abs(point));
+    }
     if (/\(/.test(v1)) {
         return 函数帧(v1, v2, point);
     }

package/coms/zimoli/zimoli.js

@@ -14,57 +14,36 @@ var pagehash_reg = /#([\/\w\:@\.\_\(\)\+\-\*\$@!~_'\?,&~%]+)$/;
 var locationInitHash = location.hash;
 var isFirstTimeLoad = sessionInitHash === null;
 var isSimpleRefresh = sessionInitHash === locationInitHash;
-var isWithHashLoad = !!location.hash;
 var preventNextHashChange = false;
 window_history.scrollRestoration = 'manual';
-if (isWithHashLoad && !isSimpleRefresh) {
-    //带hash加载，吃掉hash
-    location.replace("#");
+var popupHashlessPath = '/';
+var pathFromHash = function (targetHash) {
+    var targetHashIndex = targetHash.indexOf("#" + current_history);
+    if (targetHashIndex < 0) return;
+    var targetpath = targetHash.slice(targetHashIndex + current_history.replace(/\/$/, '').length + 1);
+    targetpath = decodeURI(targetpath);
+    return targetpath;
 }
-
-if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
-    window.onhistorychange = function (url) {
-        // 如果是返回事件，一定不是第一次改变hash
-        // 这里刚好可以屏蔽首次手动改变url可能产生的hashchange事件
-        if (preventNextHashChange) return preventNextHashChange = false, window_history.go(-1);
-        if (preventNextHashChange === void 0 ? onback && onback() === true : preventNextHashChange = void 0) { }
-    };
-    onselectstart(body, function (e) {
-        return e.preventDefault();
-    });
-    var frame = document.createElement("iframe");
-    css(frame, "display:none");
-    appendChild.insert(body, frame);
-    var doc = frame.contentWindow.document;
-    var backman = function (isloaded) {
-        doc.open();
-        doc.write(isloaded !== false ? "" : "<script>result=parent.onhistorychange();onload=function(){history.forward()}</script>");
-        doc.close();
-    };
-    backman(false);
-    backman();
-} else {
-    onhashchange(window, function (event) {
-        if (fixurl.ing) return;
-        // 如果是返回事件，一定不是第一次改变hash
-        // 这里刚好可以屏蔽首次手动改变url可能产生的hashchange事件
-        var targetHash = location.hash;
-        sessionStorage.setItem(sessionSavedHashKey, targetHash);
-        if (pagehash_reg.test(targetHash)) {
-            var currentHash = getCurrentHash();
-            if (currentHash && currentHash === targetHash) return;
-            var targetHashIndex = targetHash.indexOf("#" + current_history);
-            if (targetHashIndex < 0) return;
-            var targetpath = targetHash.slice(targetHashIndex + current_history.replace(/\/$/, '').length + 1);
-            targetpath = decodeURI(targetpath);
-            go(targetpath);
+onhashchange(window, function (event) {
+    if (preventNextHashChange) return preventNextHashChange = false;
+    // 如果是返回事件，一定不是第一次改变hash
+    // 这里刚好可以屏蔽首次手动改变url可能产生的hashchange事件
+    var targetHash = location.hash;
+    sessionStorage.setItem(sessionSavedHashKey, targetHash);
+    if (pagehash_reg.test(targetHash)) {
+        var currentHash = getCurrentHash();
+        if (currentHash && currentHash === targetHash) return;
+        var targetpath = pathFromHash(targetHash);
+        if (pathFromHash(currentHash) === popupHashlessPath) {
+            backward();
             return;
         }
-        if (preventNextHashChange) return preventNextHashChange = false;
-        event.preventDefault();
-        onback();
-    });
-}
+        forward(targetpath);
+        return;
+    }
+    event.preventDefault();
+    backward();
+});
 // body
 var location_pathname = location.pathname;
 var _zimoli_params_key = `_zimoli_parameters:${location_pathname}#`;
@@ -113,8 +92,8 @@ function go(pagepath, args, history_name, oldpagepath) {
     if (isNumber(pagepath)) {
         if (isString(history_name)) {
             var _history = history[history_name] || [];
-            pagepath = _history[pagepath < 1 ? _history.length + pagepath - 1 : pagepath];
-            oldpagepath = _history[_history.length - 1];
+            pagepath = _history[pagepath < 2 ? _history.index + pagepath : pagepath];
+            oldpagepath = _history[_history.index];
             if (arguments.length === 1) {
                 args = getZimoliParams(pagepath).data;
             }
@@ -171,7 +150,7 @@ function go(pagepath, args, history_name, oldpagepath) {
         addGlobal(_page, history_name, isRecover);
         page_object.prepares.splice(0, page_object.prepares.length).forEach(function (url) {
             if (isNumber(url)) {
-                url = _history[url < 1 ? _history.length + url - 1 : url];
+                url = _history[url < 2 ? _history.index + url : url];
             }
             if (isString(url)) prepare(url);
         });
@@ -427,15 +406,30 @@ function create(pagepath, args, from, needroles) {
     return _page;
 
 }
-
+var createEmptyHistory = function (emptyState) {
+    var h = [emptyState];
+    h.index = 0;
+    return h;
+}
 var zimoliid = 0, zimoliad = 0;
 function zimoli(pagepath, args, history_name, oldpagepath) {
     if (arguments.length === 0) {
         if (zimoliid !== zimoliad) return;
         history_name = current_history;
-        var _history = history[history_name] || [];
-        root_path = _history[0] || "/main";
-        pagepath = _history[_history.length - 1] || "/main";
+        var _history = history[history_name] || createEmptyHistory('/main');
+        root_path = _history[0];
+        pagepath = location.hash;
+        if (pagepath) {
+            pagepath = pathFromHash(pagepath);
+            if (pagepath === popupHashlessPath) {
+                preventNextHashChange = true;
+                window_history.go(-1);
+                preventNextHashChange = true;
+                pagepath = pathFromHash(location.hash);
+            }
+            if (_history.index === 0) pagepath = '';
+        }
+        if (!pagepath) pagepath = _history[_history.index];
         try {
             var saveddata = JSAM.parse(hostoryStorage.getItem(_zimoli_params_key + pagepath)) || {};
         } catch (e) {
@@ -448,8 +442,6 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
     if (isNode(history_name))
         var zid = history_name.zimoliid = (history_name.zimoliid | 0) + 1;
     else var zid = arguments.length ? ++zimoliid : zimoliid;
-
-    if (page_generators[pagepath]) return go(pagepath, args, history_name, oldpagepath);
     return prepare(pagepath, function () {
         if (isNode(history_name)) {
             if (history_name.zimoliid !== zid) return;
@@ -460,7 +452,7 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
 var global = {};
 var history = {};
 var current_history, default_history = current_history = "";
-history[current_history] = [];
+history[current_history] = createEmptyHistory('/main');
 var history_session_object_key = `_zimoli_history_key:${location_pathname}`;
 try {
     history = JSAM.parse(hostoryStorage.getItem(history_session_object_key)) || history;
@@ -474,18 +466,25 @@ var pushstate = function (path_name, history_name) {
     }
     if (!isString(history_name)) return;
     if (!history[history_name]) {
-        history[history_name] = [path_name];
+        history[history_name] = createEmptyHistory(path_name);
     } else {
         var _history = history[history_name];
-        for (var cx = 0, dx = _history.length; cx < dx; cx++) {
+        var prevIndex = _history.index;
+        for (var cx = 0, dx = _history.index + 1; cx < dx; cx++) {
             if (_history[cx] === path_name) {
-                _history.splice(cx, dx - cx);
+                _history.index = cx;
                 isBack = cx < dx - 1;
                 break;
             }
         }
-        _history.push(path_name);
-        if (_history.length) fixurl();
+        if (_history.index !== cx) {
+            _history.index++;
+        }
+        if (_history[_history.index] !== path_name) {
+            _history.splice(_history.index, _history.length - _history.index);
+            _history[_history.index] = path_name;
+        }
+        if (_history.index >= 0) fixurl(_history.index - prevIndex);
     }
     hostoryStorage.setItem(history_session_object_key, JSAM.stringify(history) || null);
     return isBack;
@@ -495,38 +494,47 @@ var popstate = function (path_name, history_name) {
     if (!isString(history_name)) return;
     if (!history[history_name]) return;
     var _history = history[history_name];
-    for (var cx = 0, dx = _history.length; cx < dx; cx++) {
+    for (var cx = 0, dx = _history.index; cx < dx; cx++) {
         if (_history[cx] === path_name) {
-            _history.splice(cx, dx - cx);
+            _history.index = cx;
             break;
         }
     }
 };
 var getCurrentHash = function () {
-    var _historylist = history[current_history] || [];
     var history_name = current_history.replace(/\/$/, '');
     if (rootElements.length) {
-        return `#${history_name}/`;
+        return `#${history_name}${popupHashlessPath}`;
     }
-    if (_historylist.length < 2) return "";
-    var targeturl = `#${history_name}${_historylist.length ? _historylist[_historylist.length - 1] : ""}`;
+    var _historylist = history[current_history];
+    if (!_historylist || _historylist.index < 1) return "";
+    var targeturl = `#${history_name}${_historylist.length ? _historylist[_historylist.index] : ""}`;
     return encodeURI(targeturl);
 };
 
-var fixurl = function () {
-    if (fixurl.ing) return;
-    fixurl.ing = setTimeout(function () {
-        fixurl.ing = false;
-        var targeturl = getCurrentHash();
-        if (pagehash_reg.test(targeturl)) {
-            targeturl = location.href.replace(/\#[\s\S]*$/, '') + targeturl;
-            if (!pagehash_reg.test(location.href)) location.href = targeturl;
-            else if (location.hash !== targeturl) location.replace(targeturl);
-        } else if (pagehash_reg.test(location.href)) {
-            preventNextHashChange = true;
-            window_history.go(-1);
-        }
-    }, 0);
+var fixurl = function (historyDelta) {
+    preventNextHashChange = false;
+    var hash = getCurrentHash();
+    if (pagehash_reg.test(hash)) {
+        hash = location.href.replace(/\#[\s\S]*$/, '') + hash;
+        if (!pagehash_reg.test(location.href)) location.href = hash;
+        else if (location.href !== hash) {
+            if (historyDelta) {
+                preventNextHashChange = true;
+                window_history.go(historyDelta);
+                preventNextHashChange = false;
+                if (location.href !== hash) {
+                    location.href = hash;
+                }
+            }
+            else if (location.href !== hash) location.href = hash;
+        }
+    }
+    else if (pagehash_reg.test(location.hash)) {
+        preventNextHashChange = true;
+        window_history.go(-1);
+        preventNextHashChange = false;
+    }
 };
 var checkonback = function (elements) {
     for (var cx = 0, dx = elements.length; cx < dx; cx++) {
@@ -545,8 +553,19 @@ var checkonback = function (elements) {
 put(":empty", function () {
     return null;
 });
-
-var onback = function () {
+var forward = function (pgpath) {
+    var hty = history[current_history];
+    if (hty[hty.index + 1] === pgpath) {
+        go(1);
+    }
+    else if (hty[hty.index - 1] === pgpath) {
+        backward();
+    }
+    else {
+        go(pgpath);
+    }
+};
+var backward = function () {
     if (rootElements.length) {
         var onback = checkonback(rootElements.slice(rootElements.length - 1));
         fixurl();
@@ -632,7 +651,7 @@ var _switch = zimoli.switch = function (history_name = default_history, target_b
         }
         if (target_body) body = target_body;
     }
-    if (emptyState !== false && !history[current_history]) root_path = (history[current_history] = [].concat(emptyState || ":empty"))[0];
+    if (emptyState !== false && !history[current_history]) root_path = (history[current_history] = createEmptyHistory(emptyState))[0];
 };
 popup.global = zimoli.global = addGlobal;
 popup.go = zimoli.go = go;
@@ -666,7 +685,7 @@ zimoli.setStorage = function (storage) {
 };
 zimoli.register = function (pathlike) {
     var params = [];
-    pathlike = pathlike.replace(/\/\:(^[^\/]+)?/g, function (_, id) {
+    pathlike = pathlike.replace(/\/\:([^\/\:\-]+)/g, function (_, id) {
         params.push(id);
         return '';
     });
@@ -677,64 +696,100 @@ zimoli.clearHistory = function () {
     history = {};
 };
 zimoli.getCurrentHistory = function () {
-    if (!history[current_history]) history[current_history] = [];
+    if (!history[current_history]) history[current_history] = createEmptyHistory();
     return history[current_history];
 };
 zimoli.inithash = locationInitHash;
 zimoli.createState = createState;
+var touchEnabled = false;
 zimoli.enableTouchBack = function () {
-    var touchTarget, currentTarget, history_name, historyList;
+    if (touchEnabled) return;
+    touchEnabled = true;
+    var backwardTarget, forwardTarget, currentTarget, history_name, historyList;
     var touchId = 0;
     var ratio = 0;
     var deltaX = 0;
     bindtouch(body, {
         start(event) {
             event.preventDefault();
+            touchId++;
             ratio = null;
         },
         move(a, event) {
             event.preventDefault();
             if (a !== null) {
+                ratio = a.x / body.clientWidth;
+                if (ratio <= -1) ratio = -0.999;
+                if (ratio >= 1) ratio = 0.999;
                 if (!currentTarget) {
-                    var id = ++touchId;
                     history_name = current_history;
                     historyList = history[history_name];
                     if (historyList.length < 2) return;
-                    var path1 = historyList[historyList.length - 1];
-                    var path0 = historyList[historyList.length - 2];
                     currentTarget = global[history_name];
+                }
+                if (ratio > 0) a: {
+                    if (backwardTarget) break a;
+                    var id = ++touchId;
+                    if (historyList.index < 1) return;
+                    var path1 = historyList[historyList.index];
+                    var path0 = historyList[historyList.index - 1];
                     prepare(path0, function () {
                         if (id !== touchId) return;
                         var args = getZimoliParams(path0).data;
-                        touchTarget = create(path0, args, path1);
-                        setWithStyle(touchTarget, true);
-                        appendChild.insert(body, touchTarget);
+                        backwardTarget = create(path0, args, path1);
+                        setWithStyle(backwardTarget, true);
+                        appendChild.insert(body, backwardTarget);
                     });
+                    if (forwardTarget) remove(forwardTarget, false), forwardTarget = null;
+                }
+                else if (ratio < 0) a: {
+                    if (forwardTarget) break a;
+                    var id = ++touchId;
+                    if (historyList.index >= historyList.length - 1) return;
+                    var path2 = historyList[historyList.index + 1];
+                    prepare(path2, function () {
+                        if (id !== touchId) return;
+                        var args = getZimoliParams(path2).data;
+                        forwardTarget = create(path2, args, path1);
+                        setWithStyle(forwardTarget, false);
+                        appendChild.insert(body, forwardTarget);
+                    });
+                    if (backwardTarget) remove(backwardTarget, false), backwardTarget = null;
                 }
-                ratio = a.x / body.clientWidth;
-                if (ratio <= 0) ratio = 0.001;
-                if (ratio >= 1) ratio = 0.999;
                 deltaX = a.deltax;
                 transition(currentTarget, ratio);
-                transition(touchTarget, ratio - 1);
+                if (backwardTarget) transition(backwardTarget, ratio - 1);
+                if (forwardTarget) transition(forwardTarget, ratio + 1);
             }
             return { x: ratio * body.clientWidth };
         },
         end() {
-            if (ratio === null || !touchTarget) return;
-            if (deltaX > 0 && ratio > .1 || deltaX < 0 && ratio > .9 || deltaX === 0 && ratio > .4) {
-                pushstate(historyList[historyList.length - 2], history_name);
+            if (ratio === null) return;
+            if (historyList.index >= 1 && (deltaX > 0 && ratio > .1 || deltaX < 0 && ratio > .9 || deltaX === 0 && ratio > .4)) {
+                setWithStyle(currentTarget, true);
+                pushstate(historyList[historyList.index - 1], history_name);
+                remove(currentTarget);
+                remove(forwardTarget, false);
+                transition(backwardTarget, 1);
+                global[history_name] = backwardTarget;
+            }
+            else if (historyList.index < historyList.length - 1 && (deltaX < 0 && ratio < -.1 || deltaX > 0 && ratio < -.9 || deltaX === 0 && ratio < -.4)) {
+                pushstate(historyList[historyList.index + 1], history_name);
+                setWithStyle(currentTarget, false);
                 remove(currentTarget);
-                transition(touchTarget, 1);
-                global[history_name] = touchTarget;
+                remove(backwardTarget, false);
+                transition(forwardTarget, 1);
+                global[history_name] = forwardTarget;
             }
             else {
-                setWithStyle(touchTarget, false);
-                remove(touchTarget);
+                if (backwardTarget) setWithStyle(backwardTarget, false), remove(backwardTarget);
+                if (forwardTarget) setWithStyle(forwardTarget, true), remove(forwardTarget);
                 transition(currentTarget, 1);
             }
             currentTarget = null;
-            touchTarget = null;
+            backwardTarget = null;
+            historyList = null;
+            forwardTarget = null;
             ratio = null;
         }
     }, 'x')

package/package.json

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