efront 3.35.6 → 3.35.8

package/apps/kugou/home.js

@@ -1,5 +1,5 @@
 var page = document.createElement("page");
-page.initialStyle = 'transform:scale(.9);opacity:0;';
+page.initialStyle = 'transform:scale(1.1);opacity:0;';
 var tags = "新歌:song/list:音乐总有新玩法,排行:rank/list:排行榜 - 酷狗音乐,歌单:plist/list:歌单 - 酷狗音乐,歌手:singer/keywords:歌手分类 - 酷狗音乐".split(",").map(function (tag, cx) {
     var [str, url, title] = tag.split(":");
     var label = {

package/apps/kugou/main.js

@@ -4,5 +4,6 @@ data.getApi("kuwo-token").then(function (api) {
     if (!token) cross("get", api.base);
 });
 zimoli.switch("", null, "/home");
+zimoli.enableTouchBack();
 css("body", "background-color:#323336;");
 zimoli();

package/apps/pivot/log/boot.js

@@ -36,6 +36,7 @@ var fields = refilm`
             if (p) p = ":" + p;
             try {
                 var ip = data.ip;
+                if (!ip) return;
                 if (/^::ffff:\d+\.\d+\.\d+\.\d+$/i.test(ip)) {
                     ip = ip.slice(7);
                 }

package/coms/basic_/Array2.js

@@ -5,6 +5,7 @@ a: if (!setPrototypeOf) {
     var getOwnPropertyNames = Object.getOwnPropertyNames;
     var defineProperty = Object.defineProperty;
     try {
+        if (!getOwnPropertyNames) throw '不支持';
         defineProperty({}, 'o', { value: 0 });
         setPrototypeOf = function (obj, proto) {
             for (var n of getOwnPropertyNames(proto)) {

package/coms/kugou/api.js

@@ -3,7 +3,7 @@
         "song-info;hash": "get                                 app/i/getSongInfo.php?cmd=playInfo&from=mkugou",
         "slider-src": "get:[].mod-slider>.swipe-wrap>div  .#src=img!src&href=a!href",
         "songs-list": "get:[].panel-songslist%20li          .#hash=!id&.panel-songs-item-name>span!innerText",
-        "songs-list": "get:[]div+.m_cm_item1warp>div .#=a!href\\song-mix&a+a>p:first-child!innerText&singer=a+a>p+p!innerText&imgurl=img!_src",
+        "songs-list": "get:[]div:first-child+.m_cm_item1warp>div .#=a!href\\song-mix&a+a>p:first-child!innerText&singer=a+a>p+p!innerText&imgurl=img!_src",
         "song-mix;": "mget:script+script           mixsong/:hashid.html",
         "rank-list": "get:[].panel-img-list%20li            rank/list#href=a!href&=a!href\\rank-info&imgurl=img!_src&name=p|innerText",
         "rank-info": "get:[].panel-songslist%20li           rank/info/:id#src=!id&name=.panel-songs-item-name|innerText&data=.panel-songs-item-download/innerText",
@@ -11,7 +11,7 @@
         "plist-index": "get:[].panel-img-list%20li          plist/index#href=a!href&=a!href\\plist-info&imgurl=img!_src&name=.panel-img-content-first|innerText&count=.panel-img-content-sub|innerText",
         "plist-info": "mget:[].panel-songslist%20li          plist/list/:id/#name=.panel-songs-item-name|innerText&data=.panel-songs-item-download/innerText",
         "search-hot": "get                                api/v3/search/hot?format=json&plat=0&count=30",
-        "singer-class": "get:[].bd%20li                   singer/class#href=a!href&=a!href\\singer-list&name=a|innerText&group=?parentNode",
+        "singer-class": "get:[].bd%20.tab                   singer/list#href=!href&=!href\\singer-list&name=|innerText&group=?parentNode",
         "singer-list": "get:[].singer-img-list>li         singer/list/:id#href=a!href&=a!href\\singer-info0&imgurl=img!_src&name=p|innerText",
         "singer-info0": "mget:[].singer-songs-list>li       singer/info/:id#hash=!id&singer=.singer-name|innerText&name=.song-name|innerText&data=em/innerText"
     },

package/coms/kugou/buildScroll.js

@@ -23,11 +23,12 @@ function Main(dataid, datapath, titleid) {
         datas: []
     });
     bindScroll(_titlebar, page);
-    var loadedId;
+    var loadedId, requested = false;
     function main(params) {
         var { _text, title = "", name = _text || title, id } = params;
-        if (loadedId !== id) {
+        if (!requested || loadedId !== id) {
             loadedId = id;
+            requested = true;
             var ranklist = data.from(dataid, {
                 id
             }, parseSongsList);

package/coms/kugou/buildScroll.less

@@ -6,6 +6,7 @@
     bottom: -60px;
     top: 0;
     height: auto;
+    background: #323336;
 }
 &+.titlebar>back{
     height: 44px;

package/coms/zimoli/container.js

@@ -14,7 +14,7 @@ var change = async function (data) {
         }
         zimoli.global(data, this);
     }
-    else zimoli.go(data, this.params, this);
+    else if (isString(data) || +data < 0) zimoli.go(data, this.params, this);
 };
 var gosrc = function () {
     var { src } = this;

package/coms/zimoli/css.js

@@ -181,4 +181,7 @@ var css = function (target, oStyle, oValue) {
         }
     }
     else if (isString(target)) cssTargetSelector(target, oStyle, oValue);
-};
+};
+css.transformCssKey = transformCssKey;
+css.transformNodeKey = transformNodeKey;
+css.transformValue = transformValue;

package/coms/zimoli/data.js

@@ -300,7 +300,6 @@ function parseConfig(api) {
         p = p.slice(1);
         if (!required[p] && p !== ':') {
             required.push(p);
-            required[p] = p;
         }
     });
     return {
@@ -502,7 +501,7 @@ var privates = {
         if (!required.length && !prepared.length && !autotrim) return params;
         var params1 = {};
         required.forEach(k => {
-            var v = seekResponse(params, required[k]);
+            var v = seekResponse(params, required[k] || k);
             params1[k] = v;
         });
         prepared.forEach(k => {
@@ -528,6 +527,7 @@ var privates = {
             var lacks = required;
             if (params) {
                 lacks = lacks.filter(k => {
+                    if (!required[k]) return false;
                     var v = seekResponse(params, required[k]);
                     if (isEmpty(v)) return true;
                 });

package/coms/zimoli/list.js

@@ -197,7 +197,8 @@ function ylist(container, generator, $Y) {
         }
         var indexed_item = getIndexedElement(index) || bottom_item;
         if (indexed_item) {
-            list.scrollTop = -getFirstElement(1).offsetTop + indexed_item.offsetTop + indexed_item.offsetHeight * ratio;
+            var firstElement = getFirstElement(1) || indexed_item;
+            list.scrollTop = -firstElement.offsetTop + indexed_item.offsetTop + indexed_item.offsetHeight * ratio;
         }
     };
     //计算当前高度
@@ -615,9 +616,13 @@ function list() {
             generator = function () { }
         }
     }
-    if (bindSrc === true) care(container, function () {
+    var savedSrc = [];
+    if (bindSrc === true) care(container, function (src, old) {
         var index = container.index();
-        container.clean();
+        if (src !== old) container.clean(), index = 0;
+        else container.clean(src, savedSrc);
+        savedSrc = src.slice();
+        if (index > 0 && index >= src.length) index = src.length - 1;
         container.go(index || 0);
     });
 
@@ -639,13 +644,14 @@ function list() {
     } else if (bindSrc === true) {
         container.go(container.index() || 0);
     }
-    list.clean = function () {
+    list.clean = function (src, old) {
         var children = (container || list).childNodes;
         children = Array.prototype.filter.call(children, c => {
             if (isFinite(c.index)) return true;
             if (c.nodeType === 1 && c.$comment && isFinite(c.$comment.index)) return true;
             return false;
         });
+        if (src && old) children = Array.prototype.filter.call(children, c => src[c.index] !== old[c.index]);
         remove(children);
     };
 

package/coms/zimoli/table.js

@@ -472,8 +472,10 @@ function table(elem) {
         if (_vbox) _vbox(), _vbox = null;
         watch(table, {
             find(text) {
-                $scope.data.searchText = text;
-                $scope.data.update();
+                if ($scope.data.constructor === Table){
+                    $scope.data.searchText = text;
+                    $scope.data.update();
+                }
             }
         })
         thead = null;

package/coms/zimoli/transition.js

@@ -1,96 +1,218 @@
-var transitionKey = 'transition';
-var bodyStyle = document.documentElement.style;
-if (!(transitionKey in bodyStyle)) {
-    if ('mozTransition' in bodyStyle) transitionKey = 'mozTransition';
-    else if ('webkitTransition' in bodyStyle) {
-        transitionKey = 'webkitTransition';
-    }
-    else if ('msTransition' in bodyStyle) {
-        transitionKey = 'msTransition';
-    } else {
-        transitionKey = '';
+function 颜色帧(c1, c2, point) {
+    c1 = color.parse(c1);
+    c2 = color.parse(c2);
+    var hsl1 = color.rgb2hsl(c1);
+    var hsl2 = color.rgb2hsl(c2);
+    var h = 浮点帧(hsl1[0], hsl2[0], point);
+    var s = 浮点帧(hsl1[1], hsl2[1], point);
+    var l = 浮点帧(hsl1[2], hsl2[2], point);
+    var rgb = color.hsl2rgb([h, s, l]);
+    if (c1.length > 3) {
+        var a = 浮点帧(c1[3], c2[3], point);
+        rgb.push(a);
     }
+    return color.stringify(rgb);
 }
-function transition(target, isLeave, _initialStyle = target.initialStyle || target.enterStyle || target.leavingStyle || target.leaveStyle) {
-    if (!target) return;
-    if (typeof isLeave === "string") {
-        isLeave = parseKV(isLeave, ';', ":");
+function 浮点帧(f1, f2, point) {
+    return f1 * point + f2 * (1 - point);
+}
+function 参数帧(a1, a2, point) {
+    return a1.map((a, i) => {
+        return 单位帧(a.trim(), (a2[i] || '0').trim(), point);
+    });
+}
+function 函数帧(p1, p2, point) {
+    var r = /([^\(\)]+?)\(([^\)]*)\)/g;
+    var o2 = Object.create(null);
+    p2.replace(r, function (_, n, p) {
+        o2[n] = p;
+    });
+    return p1.replace(r, function (_, n, p) {
+        var v = o2[n];
+        if (!v) {
+            switch (n) {
+                case 'translate':
+                    v = '0,0';
+                    break;
+                case "scale":
+                    v = '1,1';
+                    break;
+                default:
+                    v = '1,0,0,0,1,0';
+            }
+        }
+        return `${n}(${参数帧(p.split(','), v.split(','), point).join(',')})`;
+    });
+}
+var targetWidth = innerWidth;
+var unitFloatReg = /^(\d+(?:\.\d+)?|\.\d+)([^\d]*)$/;
+function 单位帧(u1, u2, point) {
+    var m1 = unitFloatReg.exec(u1);
+    if (!m1) return u1;
+    var [, v1, p1] = m1;
+    var m2 = unitFloatReg.exec(u2);
+    if (m2) {
+        if (m1[1] === m2[1]) return 浮点帧(m1[0], m2[2], point) + m1[1];
+        var [, v2, p2] = m2;
+        if (p2 === "%") {
+            v2 = targetWidth * v2;
+        }
+        if (p1 === "%") {
+            v2 = v2 / targetWidth;
+        }
     }
-    if (isObject(isLeave) && (_initialStyle === true || !_initialStyle)) {
-        var temp = _initialStyle;
-        _initialStyle = isLeave;
-        isLeave = temp;
+    else v2 = 0;
+    return 浮点帧(v1, v2, point) + p1;
+}
+function 值帧(k, v1, v2, point) {
+    if (/color|background/.test(k)) {
+        return 颜色帧(v1, v2, point);
+    }
+    if (/\(/.test(v1)) {
+        return 函数帧(v1, v2, point);
+    }
+    else {
+        v1 = v1.trim().split(/\s+/);
+        v2 = v2.trim().split(/\s+/);
+        if (v2.length < v1.length) {
+            switch (v2.length) {
+                case 1:
+                    v2[1] = v1[0];
+                case 2:
+                    v2[2] = v1[0];
+                case 3:
+                    v2[3] = v1[1];
+            }
+        }
+        return 参数帧(v1, v2, point).join(' ');
     }
-    if (isLeave) {
-        _initialStyle = target.leavingStyle || target.leaveStyle || _initialStyle;
+}
+function 帧样式(style, captureStyle, point) {
+    var newStyle = new InnerStyle;
+    for (var k in style) {
+        newStyle[k] = 值帧(k, style[k], captureStyle[k], point);
+    }
+    return newStyle;
+}
+function InnerStyle(o) {
+    for (var k in o) {
+        var v = o[k];
+        this[css.transformNodeKey(k)] = css.transformValue(v);
+    }
+}
+
+var transitionKey = css.transformNodeKey("transition");
+
+function transition(target, _isLeave, _initialStyle) {
+    if (!target) return;
+    if ((isObject(_isLeave) || typeof _isLeave === "string") && (isFinite(_initialStyle) || !_initialStyle)) {
+        var temp = _initialStyle;
+        _initialStyle = _isLeave;
+        _isLeave = temp;
     }
     if (target instanceof Array) {
         target.forEach(function (target) {
-            transition(target, isLeave, _initialStyle);
+            transition(target, _isLeave, _initialStyle);
         });
         return;
     }
     if (!target.style) return;
-    var initialStyle = _initialStyle || target.initialStyle;
-    var { recoverStyle, transitionTimerStart, transitionTimerEnd } = target;
+    var isLeave = _isLeave;
+    var point = null;
+    if (isNumber(isLeave)) {
+        point = isLeave;
+    }
+    var hasInitialStyle = !!_initialStyle;
+    if (!_initialStyle) {
+        _initialStyle = target.initialStyle || target.enterStyle || target.leavingStyle || target.leaveStyle;
+        if (isLeave) {
+            _initialStyle = target.leavingStyle || target.leaveStyle || _initialStyle;
+        }
+    }
+    var initialStyle = _initialStyle;
+    if (typeof initialStyle === "string") {
+        initialStyle = parseKV(initialStyle, ';', ":");
+    }
+    if (!(initialStyle instanceof InnerStyle)) initialStyle = new InnerStyle(initialStyle);
+    if (hasInitialStyle) _initialStyle = initialStyle;
+    var { recoverStyle, transitionTimerStart, transitionTimerEnd, captureStyle } = target;
     clearTimeout(transitionTimerStart);
     clearTimeout(transitionTimerEnd);
-    if (isString(initialStyle)) {
-        initialStyle = parseKV(initialStyle, ";", ":");
+    var transitionDuration = 100;
+    if (!initialStyle[transitionKey]) {
+        initialStyle[transitionKey] = "all .3s ease";
+        transitionDuration = 300;
     }
-    if (isObject(initialStyle)) {
-        var transitionDuration = 100;
-        if (!initialStyle.transition) {
-            initialStyle.transition = "all .3s ease";
+    String(initialStyle[transitionKey]).replace(/([\.\d]+)(m?)s/gi, function (m, d, t) {
+        if (t) transitionDuration = Math.max(+d, transitionDuration);
+        else transitionDuration = Math.max(d * 1000, transitionDuration);
+        return m;
+    });
+    transitionDuration = transitionDuration || 260;
+    if (!recoverStyle) recoverStyle = {};
+    if (!captureStyle) captureStyle = {};
+    var savedStyle = Object.create(null);
+    {
+        let originalStyle = target.style;
+        for (let k in initialStyle) {
+            savedStyle[k] = originalStyle[k];
         }
-        if (transitionKey.length > 10) initialStyle[transitionKey] = initialStyle.transition;
-        String(initialStyle.transition).replace(/([\.\d]+)(m?)s/gi, function (m, d, t) {
-            if (t) transitionDuration = Math.max(+d, transitionDuration);
-            else transitionDuration = Math.max(d * 1000, transitionDuration);
-            return m;
-        });
-        transitionDuration = transitionKey ? transitionDuration || 260 : 0;
-        if (!recoverStyle) {
-            recoverStyle = {};
-        }
-        var savedStyle = Object.create(null);
-        {
-            let originalStyle = target.style;
-            for (let k in initialStyle) {
-                savedStyle[k] = originalStyle[k];
-            }
+        let computedStyle = getComputedStyle(target);
+        for (let k in initialStyle) {
+            if (!(k in captureStyle)) captureStyle[k] = computedStyle[k];
         }
-        extendIfNeeded(recoverStyle, savedStyle);
-        if (isLeave) {
-            transitionTimerStart = setTimeout(function () {
-                extend(target.style, initialStyle);
-            });
-            transitionTimerEnd = setTimeout(function () {
-                if (transitionKey) target.style[transitionKey] = recoverStyle.transition;
-            }, transitionDuration + 2);
-        } else {
+    }
+    extendIfNeeded(recoverStyle, savedStyle);
+    if (point === 0 || point === 1) {
+        isLeave = point === 1;
+        point = null;
+        var transitionValue = initialStyle[transitionKey];
+        delete initialStyle[transitionKey];
+        initialStyle = 帧样式(initialStyle, captureStyle, point);
+        initialStyle[transitionKey] = transitionValue;
+    }
+    if (point !== null) {
+        delete initialStyle[transitionKey];
+        target.style[transitionKey] = 'none';
+        initialStyle = 帧样式(initialStyle, captureStyle, point);
+        extend(target.style, initialStyle);
+    }
+    else if (isLeave) {
+        transitionTimerStart = setTimeout(function () {
             extend(target.style, initialStyle);
-            if (transitionKey) target.style[transitionKey] = "none";
-            var waitPaint = 20;
-            transitionTimerStart = setTimeout(function () {
-                delete recoverStyle.transition;
-                if (transitionKey) target.style[transitionKey] = initialStyle.transition;
-                target.transitionTimerStart = setTimeout(function () {
-                    extend(target.style, recoverStyle);
-                }, waitPaint);
-            });
-            transitionTimerEnd = setTimeout(function (transition) {
-                return function () {
-                    if (transitionKey) target.style[transitionKey] = transition;
-                };
-            }(recoverStyle.transition || ''), transitionDuration + waitPaint);
-        }
-        target.transitionTimerStart = transitionTimerStart;
-        target.transitionTimerEnd = transitionTimerEnd;
-        target.recoverStyle = recoverStyle;
-        if (target.with) {
-            transition(target.with, isLeave, _initialStyle);
-        }
-        return transitionDuration;
+            delete target.recoverStyle;
+            delete target.captureStyle;
+        });
+        transitionTimerEnd = setTimeout(function () {
+            if (transitionKey) target.style[transitionKey] = recoverStyle[transitionKey];
+            extend(target.style, recoverStyle);
+        }, transitionDuration + 29);
+    } else {
+        extend(target.style, initialStyle);
+        if (transitionKey) target.style[transitionKey] = "none";
+        var waitPaint = 20;
+        transitionTimerStart = setTimeout(function () {
+            delete recoverStyle[transitionKey];
+            if (transitionKey) target.style[transitionKey] = initialStyle[transitionKey];
+            target.transitionTimerStart = setTimeout(function () {
+                extend(target.style, recoverStyle);
+                delete target.recoverStyle;
+                delete target.captureStyle;
+            }, waitPaint);
+        });
+        transitionTimerEnd = setTimeout(function (transition) {
+            return function () {
+                if (transitionKey) target.style[transitionKey] = transition;
+            };
+        }(recoverStyle[transitionKey] || ''), transitionDuration + waitPaint);
+    }
+    target.transitionTimerStart = transitionTimerStart;
+    target.transitionTimerEnd = transitionTimerEnd;
+    target.recoverStyle = recoverStyle;
+    target.captureStyle = captureStyle;
+    if (target.with) {
+        transition(target.with, _isLeave, _initialStyle);
     }
+    return transitionDuration;
 }
+

package/coms/zimoli/tree.js

@@ -46,7 +46,7 @@ function tree() {
     var changed_index, changed_offset;
     var saved_top, saved_offset, timer = 0, timeout = function (call, time) {
         clearTimeout(timer);
-        timer = setTimeout(call, time + 100);
+        timer = setTimeout(call, time);
     };
     var banner = list(element, function (index) {
         var coms = dom;

package/coms/zimoli/zimoli.js

@@ -620,9 +620,9 @@ function addGlobal(element, name = null, isDestroy) {
         if (isFunction(body.layer)) {
             body.layer(element, oldElement, history);
         } else {
+            if (isDestroy || !oldElement) appendChild.insert(body, element);
+            else appendChild.after(oldElement, element);
             remove(oldElement);
-            if (isDestroy) appendChild.insert(body, element);
-            else appendChild(body, element);
         }
         global[name] = element;
     } else if (isNode(name)) {
@@ -704,4 +704,61 @@ zimoli.getCurrentHistory = function () {
     return history[current_history];
 };
 zimoli.inithash = locationInitHash;
-zimoli.createState = createState;
+zimoli.createState = createState;
+zimoli.enableTouchBack = function () {
+    var touchTarget, currentTarget, history_name, historyList;
+    var touchId = 0;
+    var ratio = 0;
+    var deltaX = 0;
+    bindtouch(body, {
+        start(event) {
+            event.preventDefault();
+            ratio = null;
+        },
+        move(a, event) {
+            event.preventDefault();
+            if (a !== null) {
+                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];
+                    prepare(path0, function () {
+                        if (id !== touchId) return;
+                        var args = getZimoliParams(path0).data;
+                        touchTarget = create(path0, args, path1);
+                        setWithStyle(touchTarget, true);
+                        appendChild.insert(body, touchTarget);
+                    });
+                }
+                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);
+            }
+            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]);
+                remove(currentTarget);
+                transition(touchTarget, 1);
+                global[history_name] = touchTarget;
+            }
+            else {
+                setWithStyle(touchTarget, false);
+                remove(touchTarget);
+                transition(currentTarget, 1);
+            }
+            currentTarget = null;
+            touchTarget = null;
+            ratio = null;
+        }
+    }, 'x')
+};

package/coms/zimoli/zimoli.md

@@ -4,4 +4,5 @@
     zimoli() // 切换历史后初始化
     zimoli.clearHistory() // 清空历史
     zimoli.register(pathname) // 注册通用路由
+    zimoli.enableTouchBack() // 开启滑动后退
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.35.6",
+    "version": "3.35.8",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {
@@ -18,10 +18,7 @@
         "url": "https://github.com/yunxu1019/efront.git"
     },
     "keywords": [
-        "efront",
-        "前端",
-        "server",
-        "webpack"
+        "efront"
     ],
     "author": "yunxu1019",
     "license": "MIT"