efront 3.33.2 → 3.34.0

package/coms/kugou/player.js

@@ -3,8 +3,27 @@ var playState = kugou$playState;
 var playModes = kugou$playModes;
 var playModeData = data.getInstance("play-mode");
 var playList = kugou$playList();
-var getMusicInfo = function (hash) {
-    return data.from("song-info", { hash });
+var patchMusicInfo = async function (info) {
+    var res = null;
+    switch (info.type) {
+        case "kuwo":
+            res = await data.from("play-url", info);
+            info.avatar = info.pic;
+            info.singerName = info.singername;
+            info.songName = info.songname;
+            break;
+        case "kugo":
+        default:
+            res = await data.from("song-info", info);
+            if (res.fail_process === 12) res.priced = true;
+            if (res.imgUrl) {
+                res.avatar = res.imgUrl.replace(/\{size\}/ig, 200);
+            }
+            break;
+    }
+    Object.assign(info, res);
+    if (info.avatar) info.avatarUrl = `url('${info.avatar}')`;
+    return info;
 };
 var getLrc = function () {
     return `https://m.kugou.com/app/i/krc.php?cmd=100&keyword=%E9%99%88%E6%98%9F%E3%80%81%E5%BC%A0%E7%BF%94%E8%BD%A9%20-%20%E5%86%B3%E4%B8%8D%E5%9B%9E%E5%A4%B4&hash=77AFF2715498A86AA28AC2DAA29C3FEB&timelength=280000&d=0.2984004589282503`;
@@ -18,7 +37,7 @@ on("keydown")(window, function (event) {
     var { target } = event;
     if (/^(input|select|textarea)$/i.test(target.tagName)) return;
     var $scope = player.$scope;
-    if (!$scope.audio && !kugou$musicList.active_hash) return;
+    if (!$scope.audio && !kugou$musicList.getActived()) return;
     switch (event.keyCode || event.which) {
         case 32:
             if (event.repeat) break;
@@ -69,7 +88,6 @@ var filterTime = function (a, t) {
     }
     return res.map(fixTime).join(":");
 };
-
 var backer = document.createElement("back");
 onremove(backer, function () {
     $scope.page = false;
@@ -131,7 +149,8 @@ var $scope = {
             rootElements.unmount(backer);
         }
     },
-    pause() {
+    pause(inc) {
+        if (inc !== false) ++this.playid;
         $scope.playing = false;
         let _audio = $scope.audio;
         ns.disable();
@@ -181,22 +200,22 @@ var $scope = {
         }
     },
     playid: 0,
-    play(hash = musicList.active_hash) {
+    play(music = musicList.getActived()) {
+        var playid = ++this.playid;
         render.refresh();
-        var isPlayback = typeof hash === "number";
+        var isPlayback = typeof music === "number";
         if (isPlayback) {
-            if (hash < 0) {
-                hash = hash + musicList.length;
+            if (music < 0) {
+                music = music + musicList.length;
             }
             if (!musicList.length) return;
-            if (hash >= musicList.length) {
-                hash = hash % musicList.length;
+            if (music >= musicList.length) {
+                music = music % musicList.length;
             }
-            hash = musicList[hash];
-            if (!hash) return;
-            hash = hash.hash;
+            music = musicList[music];
+            if (!music) return;
         }
-        if (hash === musicList.active_hash && $scope.audio) {
+        if (musicList.isActived(music) && $scope.audio) {
             if ($scope.playing) return $scope.pause();
             $scope.playing = true;
             let _audio = $scope.audio;
@@ -206,15 +225,13 @@ var $scope = {
             }
             return;
         }
-        if (!isPlayback) for (var cx = musicList.length - 1; cx >= 0; cx--) {
-            if (musicList[cx].hash === hash) musicList.splice(cx, 1);
-        }
+        if (!isPlayback) musicList.remove(music);
 
-        $scope.pause();
+        $scope.pause(false);
 
         /**
          * ios 只能由用户创建audio，所以请在用户触发的事件中调用play方法
-         */
+        */
         $scope.playing = false;
         /**
          * @type {HTMLAudioElement}
@@ -245,17 +262,14 @@ var $scope = {
             _audio.autostart = true;
             return alert("暂不支持在您的浏览器中播放！");
         }
-        musicList.active_hash = hash;
+        musicList.setActive(music);
         $scope.playing = true;
         playState.width = 0;
-        getMusicInfo(hash).loading_promise.then((response) => {
+        patchMusicInfo(music).then((response) => {
+            if (playid !== this.playid) return;
             if (!this.playing) return;
-            if (hash !== musicList.active_hash) return;
-            if (response.imgUrl) {
-                response.avatar = response.imgUrl.replace(/\{size\}/ig, 200);
-                response.avatarUrl = `url('${response.avatar}')`;
-            }
-            var index = kugou$musicList.map(a => a.hash).indexOf(hash);
+            if (!musicList.isActived(music)) return;
+            var index = kugou$musicList.indexOf(music);
             var distlist = kugou$musicList.slice(0);
             distlist.forEach(function (info) {
                 delete info.activate;
@@ -267,9 +281,7 @@ var $scope = {
                 $scope.index = 0;
                 distlist.unshift(response);
             }
-            response.hash = hash;
             response.activate = true;
-            distlist.active_hash = hash;
             extend($scope.info, response);
             cast($scope.krcpad, response);
             _audio.onerror = e => {

package/coms/kugou/song.html

@@ -1,8 +1,13 @@
 <bg></bg>
 <png class="logo" ng-if="song.imgurl" ng-src=song.imgurl></png>
-<div class="singer" ng-if="song.singer" ng-model=song.singerMarked></div>
-<div class="song" ng-model=song.songMarked></div>
+<div class="singer" ng-if="song.singer" ng-html=song.singerMarked></div>
+<div class="song" style:="{whiteSpace:song.items?'normal':'nowrap'}">
+    <span ng-html=song.songMarked></span>
+    <span class="types" -if="song.items" refresh>
+        <i type_="s.type" ng-class="{actived:musicList.isActived(s)}" priced_="!!s.priced" @click="event.stopPropagation(),play(s)" -repeat="s in song.items"></i>
+    </span>
+</div>
 <div class="filterTime(song.timeLength)"></div>
-<div refresh class="play-state" ng-if="song.hash===musicList.active_hash" ng-class={error:playState.error}>
+<div refresh class="play-state" -if="isActived()" ng-class={error:playState.error}>
     <div ng-style="{width:playState.width}"></div>
 </div>

package/coms/kugou/song.js

@@ -1,18 +1,33 @@
+function dplay() {
+    this.firstChild.$scope.play();
+}
 function main(elem) {
     elem = elem || document.createElement("song");
-    elem.renderid = 9;
     var $scope = {
         filterTime,
         png: img,
         bg,
+        play(s) {
+            if (!s) s = this.song.items ? this.song.items[0] : this.song;
+            dispatch(elem, 'play', s);
+        },
+        isActived() {
+            if (this.song.items) {
+                for (var s of this.song.items) {
+                    if (this.musicList.isActived(s)) return true;
+                }
+                return false;
+            }
+            return this.musicList.isActived(this.song);
+        },
         playState: kugou$playState,
         song: {},
         musicList: kugou$musicList,
     };
     care(elem, function (item) {
         if (!elem.innerHTML) elem.innerHTML = song;
-        var songName = String(item.name || item.songName || item.songname_original || '');
-        var singerName = String(item.singer || item.singerName || item.singername || '');
+        var songName = String(item.songname || item.song || item.songName || item.songname_original || item.name || '');
+        var singerName = String(item.singername || item.singer || item.singerName || '');
         if (~songName.indexOf(singerName)) {
             if (/\s*\-\s*/.test(songName)) {
                 singerName = songName.replace(/^([\s\S]*?)\s*\-\s*[\s\S]*$/, '$1');
@@ -23,10 +38,18 @@ function main(elem) {
             hash: item.hash || item.hashid,
             imgurl: item.imgurl,
             singer: singerName,
+            items: item instanceof Array ? item : null,
             songMarked: mark(songName, elem.mark),
             singerMarked: mark(singerName, elem.mark)
         };
+        if ($scope.song.items) {
+            attr(elem, 'group', true);
+        }
+        else {
+            attr(elem, 'group', null);
+        }
         render(elem.children, $scope, 0);
     });
+    onclick(elem, dplay);
     return block(elem);
 }

package/coms/kugou/song.less

@@ -1,7 +1,7 @@
 & {
-    height: 52px;
+    height: auto;
     line-height: 40px;
-    padding: 10px;
+    padding: 10px 10px 0 10px;
     font-size: 16px;
     white-space: nowrap;
     overflow: hidden;
@@ -23,7 +23,7 @@
 >.logo {
     height: 40px;
     width: 40px;
-    margin: -6px -4px;
+    margin: -4px -2px;
 
     &+.singer+.song,
     &+.song {
@@ -39,16 +39,19 @@
     }
 
 }
-&.imgonly{
+
+&.imgonly {
     padding: 0;
     line-height: 0;
     font-size: 0;
     padding-bottom: 76%;
     height: auto;
-    >:not(png){
+
+    >:not(png) {
         display: none;
     }
-    >.logo{
+
+    >.logo {
         position: absolute;
         height: 100%;
         width: 100%;
@@ -56,11 +59,62 @@
     }
 }
 
+.types {
+    display: inline-block;
+    padding: 0 6px;
+    margin: 0 -6px;
+
+    >i {
+        display: inline-block;
+        width: 1em;
+        height: 1em;
+        background-size: contain;
+        background-repeat: no-repeat;
+        background-position: center;
+        margin-right: 6px;
+        z-index: 1;
+        cursor: pointer;
+        vertical-align: middle;
+        position: relative;
+        font-style: normal;
+
+        &[priced] {
+            filter: grayscale(.9);
+        }
+
+        &.actived {
+            outline-offset: 2px;
+            outline: 1px solid;
+        }
+
+    }
+
+    [type=kugo] {
+        background-image: url("icons/kugo.ico");
+    }
+
+    [type=kuwo] {
+        background-image: url("icons/kuwo.png");
+    }
+}
+
+&[group]>.song {
+    white-space: normal;
+}
+
 >.song {
-    line-height: 30px;
+    line-height: 28px;
+    padding-top: 2px;
+    padding-bottom: 12px;
     width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
+
+    >span {
+        margin-right: 6px;
+        vertical-align: top;
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
 }
 
 b {
@@ -72,8 +126,8 @@ b {
 
 >.singer {
     position: absolute;
-    left: 6px;
-    top: 4px;
+    left: 8px;
+    top: 6px;
     // right: 10px;
     text-align: center;
     line-height: 12px;
@@ -81,18 +135,20 @@ b {
     color: #fff9;
 
     &+.song {
-        padding-top: 8px;
+        padding-top: 12px;
+        padding-bottom: 6px;
     }
 }
-png{
+
+png {
     filter: brightness(.7) contrast(.9);
 }
 
 >.play-state {
     position: absolute;
-    bottom: 2px;
-    right: 4px;
-    left: 4px;
+    bottom: 0;
+    right: 2px;
+    left: 2px;
     display: block;
     background: #2c7bb522;
     height: 2px;

package/coms/reptile/colored_console.js

@@ -188,7 +188,7 @@ var format = function (arg, deep = 0) {
             return `<cyan>[循环点 *${ci + 1}]</cyan>`;
         }
         if (arg instanceof Error) {
-            if (deep === 1) return String(arg.message);
+            if (deep > 1) return String(arg.message);
             return String(arg.stack || arg.message);
         }
         if (arg instanceof Buffer || arg instanceof ArrayBuffer || arg instanceof SharedArrayBuffer) {

package/coms/reptile/cross.js

@@ -1,4 +1,4 @@
-return cross_.bind(function (callback, onerror) {
+var cross = cross_.bind(function (callback, onerror) {
     var response, responseObject, responseType = "", decoder, error;
     var xhr = {
         status: 0,
@@ -115,4 +115,8 @@ return cross_.bind(function (callback, onerror) {
         },
     };
     return xhr;
-}, null, undefined);
+}, null, undefined);
+cross.hostCookie = function (xhr) {
+    if (xhr.cookie) return xhr.cookie;
+    return xhr.cookie = cookie.new();
+};

package/coms/zimoli/Canvas.js

@@ -1,18 +1,18 @@
-var b = createElement("div");
+var b = document.createElement("div");
 css(b, "position:absolute;");
 css(b, {
     height: 1 + 'px',
     width: 1 + "px"
 });
 var Canvas = function (width, height) {
-    var canvas = createElement(div);
+    var canvas = document.createElement("div");
     css(canvas, `width:${width * renderPixelRatio}pt;height:${height * renderPixelRatio}pt;position:relative;overflow:hidden;`);
-    var _canvas = createElement(div);
+    var _canvas = document.createElement("div");
     css(_canvas, `top:50%;left:50%;margin:-${height / 2}px -${width / 2}px;height:${height}px;width:${width}px;position:absolute;overflow:hidden;-webkit-transform:scale(${renderPixelRatio / .75});`);
     var points = [], context = [];
     for (var cx = 0; cx < width; cx++) {
         for (var cy = 0; cy < height; cy++) {
-            var point = createElement(b);
+            var point = b.cloneNode();
             var style = point.style;
 
             style.left = cx + "px";
@@ -26,8 +26,8 @@ var Canvas = function (width, height) {
     appendChild(canvas, _canvas);
     return canvas;
 };
-Canvas.prototype={
-    getContext(){
-        
+Canvas.prototype = {
+    getContext() {
+
     }
 };

package/coms/zimoli/anchor.js

@@ -1,7 +1,7 @@
-var a = createElement("a");
+var a = document.createElement("a");
 attr(a, 'href', "");
 function anchor(label, href) {
-    var element = createElement(a);
+    var element = a.cloneNode();
     attr(element, "href", label);
     if (isString(label)) {
         text(element, label);

package/coms/zimoli/anniu.js

@@ -4,20 +4,20 @@
  */
 
 var userAgent = navigator.userAgent;
-var anu = createElement("input");
+var anu = document.createElement("input");
 if (!/Safari/.test(userAgent) || /Edge/.test(userAgent)) {
     anu.type = "button";
 }
 css(anu, "position:absolute;left:0;right:0;top:0;bottom:0;width:100%;height:100%;cursor:default;box-sizing:border-box;border:none;ime-mode:disabled;");
-if("ontouchstart" in window){
-    anu.disabled=true;
-    if(/android\s+[1-2]\.|MicroMessenger/i.test(userAgent)){
-        anu.style.display="none";
+if ("ontouchstart" in window) {
+    anu.disabled = true;
+    if (/android\s+[1-2]\.|MicroMessenger/i.test(userAgent)) {
+        anu.style.display = "none";
     }
 }
 setOpacity(anu, 0);
 
 function anniu() {
-    var anniu = createElement(anu);
+    var anniu = anu.cloneNode();
     return anniu;
 }

package/coms/zimoli/button.js

@@ -1,5 +1,5 @@
-var _label = createElement("span");
-var track = createElement(div);
+var _label = document.createElement("span");
+var track = document.createElement("div");
 var onmouseenter = on("mouseenter");
 track.className = "track";
 _label.className = "label";
@@ -73,7 +73,7 @@ var touchstart = function () {
     active.call(this);
 };
 function button(texter, type) {
-    var tracker = createElement(track);
+    var tracker = track.cloneNode();
     var _texter;
     if (isNode(texter)) {
         _texter = texter;
@@ -81,7 +81,7 @@ function button(texter, type) {
             var button = _texter;
             if (button.childNodes.length) {
                 if (button.childNodes.length === 1 && button.childNodes[0].nodeType !== 1) {
-                    _texter = createElement(_label);
+                    _texter = _label.cloneNode();
                     _texter.appendChild(button.childNodes[0]);
                     button.appendChild(_texter);
                 }
@@ -91,7 +91,7 @@ function button(texter, type) {
             }
         }
     } else {
-        _texter = createElement(_label);
+        _texter = _label.cloneNode();
         if (isString(texter)) {
             if (!type) {
                 texter = texter.replace(/#\w*/, function (w) {
@@ -105,7 +105,10 @@ function button(texter, type) {
             html(_texter, texter);
         }
     }
-    button = button || createElement(btn, tracker, _texter);
+    if (!button) {
+        button = btn.cloneNode();
+        appendChild(button, tracker, texter);
+    }
     bindAccesskey(button);
     onremove(button, resetall);
     onmouseenter(button, hover);

package/coms/zimoli/cloneVisible.js

@@ -1,5 +1,5 @@
-var cloneProperties = "fontWeight,fontSize,fontFamily,color,textShadow,opacity,writingMode,blockSize,wordSpacing,letterSpacing,whiteSpace".split(",");
-var cloneProperties2 = "position,backdropFilter,filter,float,clear,margin,color,verticalAlign,textAlign,textShadow,opacity,boxShadow,overflow,textOverflow,wordBreak,webkitLineClamp,webkitBoxOrient,writingMode,blockSize,wordSpacing,letterSpacing,textIndent,lineHeight,display,appearance,webkitAppearance,MozAppearance".split(",");
+var cloneProperties = "fontWeight,fontSize,fontFamily,color,textShadow,opacity,writingMode,blockSize,wordSpacing,letterSpacing,whiteSpace,lineHeight".split(",");// text-node
+var cloneProperties2 = "position,backdropFilter,filter,float,clear,margin,color,verticalAlign,textAlign,textShadow,opacity,boxShadow,overflow,textOverflow,wordBreak,webkitLineClamp,webkitBoxOrient,writingMode,blockSize,wordSpacing,letterSpacing,textIndent,lineHeight,display,appearance,webkitAppearance,MozAppearance".split(",");// element
 var pushProperty = function (key, props) {
     props.split(",").forEach(k => {
         cloneProperties2.push(key + k);
@@ -148,7 +148,6 @@ var cloneVisible = function (td) {
             var { left, top, width, height } = getScreenPosition(copy);
             var style = getComputedStyle(copy);
             copyStyle(style, copy.style, cloneProperties);
-            copy.style.lineHeight = height + "px";
             parentNode.insertBefore(td, copy);
             parentNode.removeChild(copy);
             result.appendChild(copy);

package/coms/zimoli/createElement.js

@@ -55,7 +55,7 @@ var prototype = {
         return this;
     }
 }
-
+console.error("createElement将会在未来的版本中移除！");
 function createElement(name) {
     var node = isNode(name) ? name.cloneNode() : isFunction(name) ? name() : document.createElement(name);
     if (name.className) addClass(node, name.className);

package/coms/zimoli/cross.js

@@ -56,4 +56,16 @@ cross.setHost = function (host) {
     host = (/^https/.test(location_href) ? "https://" : "http://") + host;
     cross_.setHost(host);
 };
+cross.hostCookie = function () {
+    return cookie;
+};
+cross.getCookies = function (dp) {
+    return cookie.getCookies(dp)
+};
+cross.addCookie = function (cookie_text, dp) {
+    return cookie.addCookie(cookie_text, dp);
+};
+cross.delCookies = function (dp) {
+    return cookie.delCookies(dp);
+};
 if (cross_host) cross.setHost(cross_host);

package/coms/zimoli/data.js

@@ -484,7 +484,7 @@ var privates = {
     },
     repare(api, params) {
         var { required, autotrim, prepared } = api;
-        if (!required.length && !prepared.length) return params;
+        if (!required.length && !prepared.length && !autotrim) return params;
         var params1 = {};
         required.forEach(k => {
             var v = seekResponse(params, required[k]);

package/coms/zimoli/dateslider.js

@@ -1,23 +1,23 @@
-var _outterbox = createElement(div);
+var _outterbox = document.createElement("div");
 css(_outterbox, "border-radius:2px;box-shadow:0 1px 24px -3px rgba(0,0,0,0.18);width:312px;height:210px;background-color:#fff;");
-var _slider = createElement(div);
+var _slider = document.createElement("div");
 css(_slider, "float:left;width:33.3333%;");
-var _line = createElement(div);
+var _line = document.createElement("div");
 css(_line, "height:46px;line-height:46px;text-align:center;");
-var _innerbox = createElement(div);
+var _innerbox = document.createElement("div");
 css(_innerbox, "margin:0;");
 var lineHeight = "ontouchstart" in window ? 46 : 36;
 var createLine = function (startSlice, endSlice) {
     var result = [];
     for (var cx = startSlice, dx = endSlice; cx < dx; cx++) {
-        var line = createElement(_line);
+        var line = _line.cloneNode();
         text(line, cx);
         result.push(line);
     }
     return result;
 }
 function createBox(from, to) {
-    var slider = createElement(_slider);
+    var slider = _slider.cloneNode();
     slider.Height = function () {
         return Math.abs(from - to + 1) * lineHeight;
     };
@@ -49,13 +49,13 @@ function createBox(from, to) {
         }
         return top;
     }
-    var item_box = createElement(_innerbox);
+    var item_box = _innerbox.cloneNode();
     appendChild(slider, item_box);
     vbox(slider);
     return slider;
 }
 function dateslider(from_date, to_date) {
-    var outterbox = createElement(_outterbox);
+    var outterbox = _outterbox.cloneNode();
     var now = new Date;
     var currentYear = now.getFullYear();
     var currentMonth = now.getMonth() + 1;

package/coms/zimoli/download.js

@@ -1,5 +1,5 @@
 function download(dataurl, filename, mime = "text/plain") {
-    var a = createElement("a");
+    var a = document.createElement("a");
     a.href = "data:" + mime + ";base64," + btoa(dataurl);
     a.target = '_blank';
     a.download = filename;

package/coms/zimoli/editor.js

@@ -1,4 +1,4 @@
-var _editor = div();
+var _editor = document.createElement("div");
 var template = `
 <div class=input></div>
 <textarea class=insert></textarea>
@@ -35,7 +35,7 @@ var getScrollTops = function (element) {
 }
 
 function editor() {
-    var edit = createElement(_editor);
+    var edit = _editor.cloneNode();
     browserClass && addClass(edit, browserClass);
     var focusClass = "focus";
     edit.innerHTML = template;

package/coms/zimoli/gallery.js

@@ -102,8 +102,8 @@ function main() {
     [].forEach.call(arguments, function (arg) {
         if (isNode(arg)) {
             element = arg;
-        } else if (isFinite(arg)) {
-            minWidth = arg;
+        } else if (isFinite(arg) && arg > 0) {
+            minWidth = +arg;
         }
     });
     if ("$src" in element) {

package/coms/zimoli/gallery.less

@@ -4,7 +4,7 @@
     position: relative;
     height: 100%;
 
-    >div {
+    >.list {
         vertical-align: top;
         display: inline-block;
         position: relative;