efront 3.27.0 → 3.28.0

package/coms/reptile/colored_console.js

@@ -0,0 +1,122 @@
+"use strict";
+var colored = Object.create(null);
+var lazy = require("../basic/lazy");
+var colors = require("./colors");
+var lastLogLength = 0;
+var getColor = function (c) {
+    switch (c) {
+        case "red":
+        case "error":
+        case "danger":
+            return colors.FgRed;
+        case "info":
+        case "tip":
+        case "blue":
+            return colors.FgBlue;
+        case "green":
+            return colors.FgGreen;
+        default:
+            if (c in colors) return colors[c];
+            c = c[0].toUpperCase() + c.slice(1).toLowerCase();
+            if (c in colors) return colors[c];
+            var k = "Fg" + c;
+            if (k in colors) {
+                return colors[k];
+            }
+            c = c.slice(0, 2) + c[2].toUpperCase() + c.slice(3);
+            if (c in colors) return colors[c];
+    }
+    return '';
+};
+var write = function (hasNewLine, str) {
+    str = String(str).replace(/<([a-z][\w]*)[^\>]*\>([\s\S]*?)<\/\1\>/ig, function (_, c, s) {
+        var color = getColor(c);
+        if (color) return color + s + colors.Reset;
+        return s;
+    });
+    process.stdout.cork();
+    var hasNextLine = /[\r\n\u2028\u2029]/.test(str);
+    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);
+            process.stdout.clearScreenDown();
+        }
+    }
+    else {
+        if (!hasNewLine && !hasNextLine) str = '';
+    }
+    hasNewLine && !hasNextLine ? process.stdout.write(str + "\r\n") : process.stdout.write("\r" + str);
+    if (hasNextLine) hasNewLine = true;
+    if (hasNewLine) {
+        lastLogLength = 0;
+    } else {
+        str = str.replace(/\x1b\[\d+m/g, '').replace(/\b/g, '');
+        lastLogLength = str.length + str.replace(/[\x20-\xff]/g, "").length;
+    }
+    process.stdout.uncork();
+};
+[
+    "pass:[ ✔ ]:FgGreen:",
+    "fail:[ ✘ ]:FgRed2:",
+    "test:[ ∞ ]:FgYellow:",
+    "info:提示:FgCyan:",
+    "warn:注意:FgYellow:",
+    "error:错误:FgRed2:"
+].forEach(function (config) {
+    var [log, info = log.toUpperCase(), fg, bg] = config.split(":");
+    var fgColor = colors[fg] || "",
+        bgColor = colors[bg] || "",
+        reset = colors.Reset;
+    var hasNewLine = /^(warn|error|pass|fail)$/.test(log);
+    var logger = function (...args) {
+        var label = fgColor + bgColor + info + reset;
+        var time_stamp = '';
+        var str = [time_stamp, label, ...args].join(" ");
+        if (queue.length > 1 && !queue[queue.length - 2] && !/[\r\n\u2028\u2029]/.test(queue[queue.length - 1])) {
+            queue.pop();
+            queue.pop();
+        }
+        write1(hasNewLine, str);
+    };
+    colored[log] = logger;
+});
+var queue = [];
+var flush = function () {
+    while (queue.length) write(queue.shift(), queue.shift());
+};
+// var write0 = lazy(flush, -60);
+var write1 = function (hasNewLine, str) {
+    writeid++;
+    // queue.push(hasNewLine, str);
+    write(hasNewLine, str);
+};
+colored.flush = flush;
+colored.type = function (...args) {
+    write1(false, args.join(' '));
+};
+var _log = console.log;
+colored.log = function () {
+    flush();
+    _log.apply(console, arguments);
+};
+colored.begin = function (c) {
+    return write1(false, getColor(c));
+};
+var writeid = 0;
+var drop = lazy(function (dropid) {
+    if (dropid === writeid) write1(false, "");
+}, 160);
+colored.drop = function () {
+    drop(++writeid);
+};
+colored.end = function () {
+    return write1(false, colors.Reset);
+};
+colored.clear = function (tag) {
+    write1(false, '');
+    if (tag) write1(true, tag);
+};
+module.exports = colored;

package/coms/reptile/colors.js

@@ -0,0 +1,54 @@
+var colors = module.exports = {
+    Reset: "\x1b[0m",
+    Bright: "\x1b[1m",
+    Dim: "\x1b[2m",
+    Underscore: "\x1b[4m",
+    Blink: "\x1b[5m",
+    Reverse: "\x1b[7m",
+    Hidden: "\x1b[8m",
+    FgBlack: "\x1b[30m",
+    FgRed: "\x1b[31m",
+    FgGreen: "\x1b[32m",
+    FgYellow: "\x1b[33m",
+    FgBlue: "\x1b[34m",
+    FgMagenta: "\x1b[35m",
+    FgCyan: "\x1b[36m",
+    FgWhite: "\x1b[37m",
+    BgBlack: "\x1b[40m",
+    BgRed: "\x1b[41m",
+    BgGreen: "\x1b[42m",
+    BgYellow: "\x1b[43m",
+    BgBlue: "\x1b[44m",
+    BgMagenta: "\x1b[45m",
+    BgCyan: "\x1b[46m",
+    BgWhite: "\x1b[47m",
+    FgGray: "\x1b[90m",
+    FgRed2: "\x1b[91m",
+    FgGreen2: "\x1b[92m",
+    FgYellow2: "\x1b[93m",
+    FgBlue2: "\x1b[94m",
+    FgPurple: "\x1b[95m",
+    FgCyan2: "\x1b[96m",
+    FgWhite2: "\x1b[97m",
+    // test: "\x1b[97m",
+    BgGray: "\x1b[100m",
+    BgRed2: "\x1b[102m",
+    BgGreen2: "\x1b[102m",
+    BgYellow2: "\x1b[103m",
+    BgBlue2: "\x1b[104m",
+    BgMagenta2: "\x1b[105m",
+    BgCyan2: "\x1b[106m",
+    BgWhite2: "\x1b[107m",
+};
+class Color {
+    constructor(name, value) {
+        this.name = name;
+        this.value = value;
+    }
+    toString() {
+        return this.value;
+    }
+}
+for (var k in colors) {
+    colors[k] = new Color(k, colors[k]);
+}

package/coms/zimoli/bindGlobalkey.js

@@ -4,7 +4,8 @@
  */
 var emitEvent = function (item, event) {
     if (event.defaultPrevented) return;
-    if (!getTargetIn(this, event.target) && !getTargetIn(event.target, this)) return;
+    var target = this.target || this;
+    if (!getTargetIn(target, event.target) && !getTargetIn(event.target, target)) return;
     event.preventDefault(true);
     if (item.disabled) return;
     active(this, item, "global", this.$src ? createItemTarget.call(this, item) : this);
@@ -31,7 +32,7 @@ function bindGlobalkey(elem, keymap, item) {
     if (!keymap) return;
     var keyoff = [];
     for (let k in keymap) {
-        keyoff.push(bindonly(elem, k, item));
+        keyoff.push(bindonly(elem, k, keymap[k]));
     }
     elem.$keyoff = keyoff;
 }

package/coms/zimoli/block.less

@@ -3,39 +3,4 @@
     position: relative;
     background: #fffc;
     border-radius: 4px 0 4px 0;
-}
-
->.bg {
-    border: 1px solid rgba(0, 0, 0, .1);
-    border-radius: inherit;
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    overflow: hidden;
-
-    &:after {
-        margin: -100px -180px;
-        width: 300px;
-        height: 200px;
-        right: 0;
-        bottom: 0;
-    }
-
-    &:before {
-        width: 60px;
-        height: 100px;
-        margin: -55px -35px;
-        left: 0;
-        top: 0;
-    }
-
-    &:after,
-    &:before {
-        content: "";
-        background-color: rgba(90, 200, 250, 0.1);
-        position: absolute;
-        border-radius: 50%;
-    }
 }

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,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 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 pushProperty = function (key, props) {
     props.split(",").forEach(k => {
         cloneProperties2.push(key + k);

package/coms/zimoli/menu.js

@@ -206,7 +206,7 @@ function main(elem, mode) {
     }
     if (!elem.hasAttribute('mode')) elem.setAttribute('mode', mode);
     if (!elem.hasAttribute(mode)) elem.setAttribute(mode, '');
-
+    elem.target = document.body;
     return elem;
 
 }

package/coms/zimoli/render.js

@@ -1,21 +1,29 @@
 var hasOwnProperty = {}.hasOwnProperty;
 var renderElements = Object.create(null);
 var presets = Object.create(null);
+var copyAttribute = function (node, copys) {
+    for (var { name, value } of copys) switch (name.toLowerCase()) {
+        case "class":
+            addClass(node, value);
+            break;
+        case "style":
+            css(node, value);
+            break;
+        case "src":
+        case "placeholder":
+            node[name] = value;
+            break;
+        default:
+            node.setAttribute(name, value);
+    }
+}
 var createTemplateNodes = function (text) {
     remove(this.with);
     if (isEmpty(text)) return;
     if (isNode(text)) {
         var node = text;
         if (isElement(node) && this.$struct.copys) {
-            for (var c of this.$struct.copys) {
-                if (c.name === 'class') {
-                    addClass(node, c.value);
-                }
-                else if (c.name === 'style') {
-                    css(node, c.value);
-                }
-                else node.setAttribute(c.name, c.value);
-            }
+            copyAttribute(node, this.$struct.copys);
         }
         this.with = [node];
         return;
@@ -779,23 +787,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
                 if (nextSibling) appendChild.before(nextSibling, replacer);
                 else if (parentNode) appendChild(parentNode, replacer);
                 if (element.parentNode === parentNode) remove(element);
-                copys.forEach(function (attr) {
-                    var { name, value } = attr;
-                    switch (name.toLowerCase()) {
-                        case "class":
-                            addClass(replacer, value);
-                            break;
-                        case "style":
-                            css(replacer, value);
-                            break;
-                        case "src":
-                        case "placeholder":
-                            replacer[name] = value;
-                            break;
-                        default:
-                            replacer.setAttribute(name, value);
-                    }
-                });
+                copyAttribute(replacer, copys);
                 if (!replacer.renderid) replacer.renderid = element.renderid;
             }
         }
@@ -899,6 +891,15 @@ function createStructure(element) {
             element.removeAttribute(name);
             continue;
         };
+        if (/^\./.test(name) && !value) {
+            // 识别为class
+            element.removeAttribute(name);
+            value = name.slice(1).replace(/\./g, ' ')
+            name = 'class';
+            copys.push({ name, value });
+            element.setAttribute(name, value);
+            continue;
+        }
         if (/^(?:class|style|src|\:|placeholder)$/i.test(name)) {
             copys.push(attr);
             continue;

package/coms/zimoli/titlebar.js

@@ -1,4 +1,4 @@
-var nav = createElement(div);
+var nav = createElement("titlebar");
 
 function btn(element) {
     var opt = button(element);

package/coms/zimoli/titlebar.less

@@ -14,7 +14,7 @@
     border          : 1px solid #18333c;
     background-color: #18333c99;
     backdrop-filter : blur(20px);
-    box-shadow      : inset 0 0 6px #51ddf6, inset 200px -160px 200px -200px #51ddf6;
+    box-shadow      : inset 0 0 6px #51ddf666, inset 200px -160px 200px -200px #51ddf633;
     cursor          : default;
 
     >label {

package/coms/zimoli/view.js

@@ -93,7 +93,7 @@ var init = function () {
 var isType = function (target, type) {
     // 记得小时候，不论是苍蝇还是蚊子，飞起来都是有声音的。最近看到的一种像蚊子一样小的飞虫，喜欢像苍蝇一样趴在食物上，飞起来却听不到声音。
     // 是我的听力下降了？还是外界太过嘈杂？还是飞虫拍打翅膀的频率超出了我的听觉范围？还是飞行可以不产生声音？
-    return target.hasAttribute(type) || hasClass(type);
+    return target.hasAttribute(type) || hasClass(target, type);
 }
 var resize2 = function () {
     var head, body, foot;

package/coms/zimoli/view.less

@@ -15,6 +15,7 @@ body>& {
     -webkit-user-select: none;
     border: 1px solid #0006;
     min-width: 160px;
+    background: #fff;
 }
 
 &[draggable] {
@@ -25,7 +26,7 @@ body>& {
 >[body] {
     padding: 6px 20px 6px 6px;
     margin-right: -20px;
-    background: #f2f4f6;
+    background: #f2f4f622;
     display: block;
     width: auto;
     height: 100%;
@@ -35,8 +36,8 @@ body>& {
     box-sizing: border-box;
     background-clip: padding-box;
 
-    border-top: 6px solid #fff;
-    border-bottom: 6px solid #fff;
+    border-top: 6px solid #fff2;
+    border-bottom: 6px solid #fff2;
 
     &:not(:nth-last-child(1)) {
         padding-bottom: 42px;
@@ -48,13 +49,12 @@ body>& {
 >[head] {
     top: 0;
     z-index: 2;
-    background: #fffc;
+    background: inherit;
     position: relative;
     position: sticky;
     line-height: 20px;
     overflow: hidden;
     text-overflow: ellipsis;
-    color: #333;
     padding: 12px 16px 10px 16px;
 
     &:before {
@@ -108,7 +108,7 @@ body>& {
     padding: 6px 16px 0 16px;
     border-top: 1px solid rgba(0, 0, 0, .16);
     backdrop-filter: blur(20px);
-    background: #fffc;
+    background: inherit;
     position: sticky;
     width: 100%;
     bottom: 0;

package/coms/zimoli/zimoli.js

@@ -323,7 +323,7 @@ function prepare(pgpath, ok) {
     };
     state.titlebar = function () {
         var realTitleBar = titlebar.apply(null, arguments);
-        state.with(realTitleBar);
+        if (!realTitleBar.parentNode) state.with(realTitleBar);
         return realTitleBar;
     };
     var roles = res || null;

package/package.json

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