efront 4.13.2 → 4.14.2

package/coms/kugou/player.less

@@ -1,19 +1,8 @@
-.song {
-    color: #fff;
-}
-
-.singer {
-    color: #ccc;
-}
-
-.time {
-    position: absolute;
-    right: 8px;
-    bottom: 4px;
-    text-align: right;
-}
+@avatar-left: 36px;
+@avatar-top: -12px;
+@avatar-size: 72px;
 
-@main-color: #2c7bb5;
+@main-color: #021c;
 
 &.pause .play:before {
     content: "";
@@ -26,20 +15,22 @@
     vertical-align: middle;
 }
 
+krc {
+    pointer-events: none;
+}
+
 &.play .play:before {
-    content: "";
-    display: inline-block;
+    display: none;
     border: .4em solid;
     vertical-align: middle;
 }
 
-.avatar,
-&:after {
+.avatar {
     border-radius: 50%;
-    width: 72px;
-    height: 72px;
-    top: -12px;
-    left: 8px;
+    width: @avatar-size;
+    height: @avatar-size;
+    top: @avatar-top;
+    left: @avatar-left;
     position: absolute;
     background-size: cover;
     border: 3px solid #000;
@@ -99,11 +90,25 @@
     overflow: hidden;
     z-index: -1;
 
+    &:before {
+        content: "";
+        left: @avatar-left+@border-width + 72px;
+        position: absolute;
+        min-width: 100px;
+        width: auto;
+        height: auto;
+        border-radius: 60px 0 0 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        background-color: @main-color;
+    }
+
+    @blank-size : @avatar-size;
+    @border-width : 40px;
+    @border-size: @blank-size / 2 + @border-width;
+
     &:after {
-        @size : 10000px;
-        @blank-size : 70px;
-        @margin-y: @size + 35px;
-        @margin-x: @size + 35px;
         box-sizing: content-box;
         content: "";
         display: block;
@@ -111,33 +116,35 @@
         position: absolute;
         width: @blank-size;
         height: @blank-size;
-        border: @size solid #000;
-        margin: -@margin-x -@margin-y;
-        top: 24px;
-        left: 44px;
+        border: @border-width solid #000;
+        margin: -@border-size;
+        top: 12px-@avatar-top;
+        left: @avatar-left + @blank-size/2;
     }
 
     &:after {
-        border-radius: 50%;
+        border-radius: @border-size;
     }
 }
 
 &>div.progress {
     z-index: 1;
+    pointer-events: none;
 
     >.track:after,
     >.avatar {
         border-color: @main-color;
         box-shadow: 0 0 6px -3px @main-color;
     }
-    
+
     >.track {
         opacity: .7;
         transition: height .3s, opacity .3s;
-        top: 12px;
+        top: -@avatar-top;
     }
-    
+
     >.avatar {
+        border-color: lighten(@main-color, 100%);
         opacity: 1;
         top: 0;
     }
@@ -147,7 +154,7 @@
     overflow : hidden;
     padding : 0;
     height : 72px;
-    margin-top: -12px;
+    margin-top: @avatar-top;
 }
 
 & {
@@ -158,7 +165,7 @@
     user-select: none;
     position: fixed;
     bottom: 0;
-    color: #fff;
+    color: #ccc;
     left: 0;
     right: 0;
     padding: 0 0 0 78px;
@@ -168,47 +175,80 @@
 
     >btn,
     >sbtn {
+        @btn-width: 42px;
         text-align: center;
         line-height: 60px;
-        width: 50px;
+        width: @btn-width;
         height: 60px;
         vertical-align: top;
-        position: relative;
+        position: absolute;
         background: transparent;
+        z-index: 2;
 
-        &.info,
-        &.prev,
-        &.list,
-        &.next,
         &.play {
-            z-index: 2;
+            top: @avatar-top/2;
+            pointer-events: none;
+            left: @avatar-left+16px;
+        }
+
+        &.next {
+            right: 0;
         }
+
+        &.prev {
+            top: 0;
+            left: @avatar-left - @btn-width+6px;
+        }
+
     }
 
-    >.info {
-        width: 100%;
-        margin-right: -200px;
+    .time {
+        left: 6px;
+        text-align: center;
+        top: 46px;
+        color: #fff9;
         line-height: 1;
-        text-align: left;
-        padding: 46px 5px 0 5px;
         z-index: 2;
-        position: relative;
-        font-size: 8px;
+        font-size: 12px;
+    }
 
-        .spliter {
-            .singer;
-        }
+    .total {
+        z-index: 2;
+        right: 6px;
+        top: 46px;
+        color: #fff9;
+        line-height: 1;
+        font-size: 12px;
+    }
 
+    .singer {
+        color: #fffc;
+        font-size: 8px;
+        display: block;
+        top: 46px;
+        z-index: 2;
+        left: @avatar-left+@avatar-size;
+        right: 60px;
+    }
 
-        >div {
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-        }
+
+    .song {
+        left: @avatar-left + @avatar-size + 6px;
+        line-height: 1;
+        top: 22px;
+        font-size: 16px;
+        right: 60px;
+        z-index: 2;
     }
 
+
     >div {
-        display: inline-block;
+        text-align: left;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        position: absolute;
+        pointer-events: none;
         height: 60px;
     }
 }
@@ -217,10 +257,16 @@
     height: 100%;
     z-index: 10;
     opacity: 1;
+    @ptop: -@avatar-top;
 
     >div.progress>.track {
         height: 3px;
         opacity: 1;
+        top: @ptop;
+
+        &:after {
+            top: 24px - @avatar-top - @ptop;
+        }
     }
 
     >.track {
@@ -246,7 +292,7 @@
     font-size: 8px;
     text-align: left;
     line-height: 16px;
-    padding-left: 84px;
+    padding-left: @avatar-left+@avatar-size+4px;
 
     .active,
     .active+.after {
@@ -272,10 +318,6 @@
     font-size: 16px;
 }
 
-&:not(.play):not(.page)>.background {
-    opacity: 0;
-    transition: opacity .4s ease;
-}
 
 &>.background {
     background-color: #999;
@@ -398,32 +440,35 @@
     pointer-events: none;
 
     &+.avatar {
+        pointer-events: all;
         border-color: transparent;
-        z-index: 1;
+        z-index: 2;
+    }
+}
+
+& {
+    text-align: right;
+
+    >.track {
+        height: 60px;
+        margin-top: 0;
+        border-top: 0 solid #666;
+        transition: margin-top .2s ease-out, border-top .2s ease-out, height .2s ease-out;
     }
 }
 
-// & {
-//     >.track {
-//         height: 60px;
-//         margin-top: 0;
-//         border-top: 0 solid #666;
-//         transition: margin-top .2s ease-out, border-top .2s ease-out, height .2s ease-out;
-//     }
-// }
-
-// &.effect {
-//     opacity: 1;
-
-//     >.track {
-//         height: 420px;
-//         margin-top: -360px;
-//         border-top: 360px solid #666;
-//     }
-// }
+&.effect {
+    opacity: 1;
+
+    >.track {
+        height: 420px;
+        margin-top: -360px;
+        border-top: 360px solid #666;
+    }
+}
 
 &:not(.page)>canvas {
-    top: -12px;
+    top: @avatar-top;
 }
 
 &.dragging {

package/coms/reptile/colored_console.js

@@ -1,4 +1,5 @@
 "use strict";
+var EOL = require("os").EOL;
 var colored = Object.create(null);
 var lazy = require("../basic/lazy");
 var colors = require("./colors");
@@ -40,12 +41,17 @@ var renderColor = function (obj) {
 var write = function (hasNewLine, str) {
     process.stdout.cork();
     var hasNextLine = /[\r\n\u2028\u2029]$/.test(str);
+    var width = process.stdout.columns;
     if (process.stdout.isTTY) {
         if (lastLogLength) {
-            var width = process.stdout.columns;
-            var dx = lastLogLength % width;
-            var dy = (lastLogLength - 1) / width | 0;
-            process.stdout.moveCursor(-dx, -dy);
+            var loged = lastLogLength;
+            lastLogLength = 0;
+            loged.forEach(lastLogLength => {
+                var dx = lastLogLength % width;
+                var dy = (lastLogLength - 1) / width | 0;
+                process.stdout.moveCursor(- dx, -1 - dy);
+            });
+            process.stdout.moveCursor(0, 1);
             process.stdout.clearScreenDown();
         }
     }
@@ -67,8 +73,13 @@ var write = function (hasNewLine, str) {
     if (hasNewLine) {
         lastLogLength = 0;
     } else {
-        str = String(str).replace(/\x1b\[\d+m/g, '').replace(/\b/g, '');
-        lastLogLength = str.length + str.replace(/[\x20-\xff]/g, "").length;
+        var rs = String(str).split(/\r\n|\r|\n|\u2028|\u2029/);
+        var cr = r => {
+            if (!r) return r;
+            r = r.replace(/\x1b\[\d+m/g, '').replace(/\b/g, '');
+            return r.length + r.replace(/[\x20-\xff]/g, "").length;
+        };
+        lastLogLength = rs.map(cr).reverse();
     }
     process.stdout.uncork();
 };
@@ -88,7 +99,11 @@ var write = function (hasNewLine, str) {
     var logger = function () {
         var label = logger.tip ? fgColor + bgColor + logger.tip + reset : '';
         var time_stamp = '';
-        var str = [time_stamp, label].filter(a => !!a).concat(Array.prototype.map.call(arguments, a => renderColor(a))).join(" ");
+        var mark = [time_stamp, label].filter(a => !!a)
+        var str = Array.prototype.map.call(arguments, a => renderColor(a)).join(" ").split(/\r\n|\r|\n/).map(a => {
+            if (a) return mark.concat(a).join(' ');
+            else return a;
+        }).join(EOL);
         write1(hasNewLine, str);
     };
     logger.tip = info;
@@ -121,7 +136,7 @@ var formatRows = function (arg, rows, deep, entry, leave) {
     var hasNextLine = false;
     var isArray = arg instanceof Array;
     for (var r of rows) {
-        if (/[\r\n\u2028\u2029]/.test(r)) {
+        if (/[\r\n\u2028\u2029]$/.test(r)) {
             itemcount = 1;
             hasNextLine = true;
             break;
@@ -262,10 +277,15 @@ colored.line = function () {
 };
 var _log = console.log;
 colored.log = function () {
-    if (lastLogLength > 0) write1(false, '');
+    if (lastLogLength) write1(false, '');
     if (needNextLine) needNextLine = false;
     _log.apply(console, arguments);
 };
+colored.wrap = function (c, content) {
+    var c = getColor(c);
+    if (!c) throw new Error(i18n`${c}不是有效的色彩信息`);
+    return c + content + colors.Reset;
+}
 colored.begin = function (c) {
     return write1(false, getColor(c));
 };

package/coms/reptile/window.js

@@ -7,59 +7,31 @@ else {
     var Window = function () {
     };
     var window = new Window;
-    Object.assign(window, {
-        Date,
-        Promise,
-        Function,
-        RegExp,
-        Object,
-        String,
-        Array,
-        Number,
-        Boolean,
-        Error,
-        TypeError,
-        Uint8Array,
-        Uint16Array,
-        Uint32Array,
-        Uint8ClampedArray,
-        ArrayBuffer,
-        Int8Array,
-        Int16Array,
-        Int32Array,
-        Float32Array,
-        Float64Array,
-        Map,
-        Set,
-        Proxy,
-        WeakMap,
-        Reflect,
-        console,
-        Math,
-        JSON,
-        NaN,
-        Infinity,
-        isNaN,
-        isFinite,
-        parseInt,
-        parseFloat,
-        decodeURI,
-        encodeURI,
-        decodeURIComponent,
-        encodeURIComponent,
-        document: global1.document,
-        navigator: global1.navigator,
-        process: global1.process,
-        BigInt64Array: global1.BigInt64Array,
-        Buffer: global1.Buffer,
-        Intl: global1.Intl,
-        BigInt: global1.BigInt,
-        Symbol: global1.Symbol,
-        SharedArrayBuffer: global1.SharedArrayBuffer,
-        escape: global1.escape,
-        unescape: global1.unescape,
+    [
+        'Date', 'Promise', 'Function',
+        'RegExp', 'Object', 'String',
+        'Array', 'Number', 'Boolean',
+        'Error', 'TypeError', 'Uint8Array',
+        'Uint16Array', 'Uint32Array', 'Uint8ClampedArray',
+        'ArrayBuffer', 'Int8Array', 'Int16Array',
+        'Int32Array', 'Float32Array', 'Float64Array',
+        'Map', 'Set', 'Proxy',
+        'WeakMap', 'Reflect', 'console',
+        'Math', 'JSON', 'NaN',
+        'Infinity', 'isNaN', 'isFinite',
+        'parseInt', 'parseFloat', 'decodeURI',
+        'encodeURI', 'decodeURIComponent', 'encodeURIComponent',
+        'document', 'navigator', 'process',
+        'BigInt64Array', 'Buffer', 'Intl',
+        'BigInt', 'Symbol', 'SharedArrayBuffer',
+        'escape', 'unescape', 'clearImmediate',
+        'setImmediate', 'clearInterval', 'clearTimeout',
+        'setInterval', 'setTimeout', 'queueMicrotask',
+        'structuredClone', 'atob', 'btoa',
+        'performance', 'fetch', 'crypto'
+    ].forEach(k => {
+        if (k in global1) window[k] = global1[k];
     });
     window.globalThis = window.global = window.top = window.window = window;
-    extendIfNeeded(window, global1);
     module.exports = window;
 }

package/coms/zimoli/menuList.less

@@ -2,7 +2,6 @@
     display: inline-block;
     width: auto;
     height: auto;
-    background-color: #fff;
     box-shadow: 0 0 20px -6px rgba(0, 0, 0, .1);
     border: 1px solid #0003;
     padding: 6px 0;

package/coms/zimoli/popup.js

@@ -169,6 +169,11 @@ var popup_with_mask = function (element, mask) {
 var isypop = function (target) {
     if (!target) return false;
     var { offsetParent, nextSibling, previousSibling } = target;
+    if (
+        target.offsetWidth >= (innerWidth >> 1) &&
+        target.offsetHeight < (innerHeight >> 1) ||
+        offsetParent.offsetWidth >= (innerWidth >> 1) &&
+        offsetParent.offsetHeight < (innerHeight >> 1)) return true;
     if (
         nextSibling
         && (
@@ -183,7 +188,6 @@ var isypop = function (target) {
     ) return true;
     var padding = offsetParent ? parseFloat(getComputedStyle(offsetParent).paddingTop) + parseFloat(getComputedStyle(offsetParent).paddingBottom) : 0;
     if (offsetParent && target.offsetTop / target.offsetHeight < .2 && (offsetParent.clientWidth - padding) / target.offsetWidth > 1.5) return true;
-
 };
 var isxpop = arriswise(isypop, arguments);
 var popup_as_extra = function (element, target, style) {

package/coms/zimoli/vbox.js

@@ -159,6 +159,10 @@ function ybox(generator) {
                 box = getTargetIn(e => e === _box || /^(?:auto|scroll)$/i.test(getComputedStyle(e).overflowY) && e.scrollHeight - e.scrollTop > e.clientHeight, event.target);
             }
             if (box === _box) {
+                var wheelDelta = event.wheelDelta;
+                if (wheelDelta && wheelDelta !== deltay) {
+                    deltay /= 6;
+                }
                 scrollY.call(_box, -deltay, false);
                 stop2();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.13.2",
+    "version": "4.14.2",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {