efront 4.11.1 → 4.11.2

package/coms/compile/Program.js

@@ -190,7 +190,14 @@ class Program {
         var rowsOf = m => m.replace(/[^\r\n\u2028\u2029]+/g, ';').replace(/\r\n|\r|\n|\u2028|\u2029/g, ' ').replace(/;/g, '').length;
         var setRows = m => {
             row += rowsOf(m);
-            colstart = start + m.length - m.replace(/^[\s\S]*?([^\r\n\u2028\u2029]*)$/, '$1').length - 1;
+            var reg = /[\r\n\u2028\u2029]/g;
+            reg.lastIndex = 0;
+            var index = 0;
+            do {
+                index = reg.lastIndex;
+                var match = reg.exec(m);
+            } while (match);
+            colstart = start + index;
         };
         var queue_push = (scope) => {
             if (scope.type & (SPACE | COMMENT | PIECE | QUOTED)) {
@@ -904,7 +911,7 @@ class Program {
                 if (p.tag) p.type = ELEMENT;
                 queue_push(p);
             }
-        };
+        }
         if (cache_stamp) push_stamp();
         this.lastIndex = index;
         if (queue !== origin) {

package/coms/compile//347/264/240/351/246/250.js

@@ -198,29 +198,35 @@ macros.escape = function (a) {
 macros.e = function (a) {
     return strings.decode(a);
 };
-var wrapColor = function (f) {
-    return function (c) {
+var wrapColor = function (k) {
+    var f = color[k];
+    macros[k] = function (c) {
         if (color.isColor(c)) return f(...arguments);
-        return f;
-    }
-}
+        return `${k}(${Array.apply(null, arguments).join(',')})`;
+    };
+};
+
+[
+    "saturate",
+    "desaturate",
+    "lighten",
+    "darken",
+    "fadein",
+    "fadeout",
+    "fade",
+    "spin",
+    "mix",
+    "tint",
+    "shade",
+    "grayscale",
+    "grayluma",
+    "fade"
+].forEach(wrapColor);
+
 macros[""] = function (a) {
     return a;
 };
-macros.saturate = wrapColor(color.strurate);
-macros.desaturate = wrapColor(color.desaturate);
-macros.lighten = wrapColor(color.lighten);
-macros.darken = wrapColor(color.darken);
-macros.fadein = wrapColor(color.fadein);
-macros.fadeout = wrapColor(color.fadeout);
-macros.fade = wrapColor(color.fade);
-macros.spin = wrapColor(color.spin);
-macros.mix = wrapColor(color.mix);
-macros.tint = wrapColor(color.tint);
-macros.shade = wrapColor(color.shade);
-macros.grayscale = wrapColor(color.grayscale);
-macros.grayluma = wrapColor(color.grayluma);
-macros.fade = wrapColor(color.fade);
+
 macros.each = function (list, body) {
     var match = /^(?:\s*[#\.]?\(([\s\S]*?)\))?\s*\{([\s\S]*)\}$/.exec(body);
     if (!match) throw new Error(i18n`each参数异常!`);

package/coms/compile//347/264/240/351/246/250_test.js

@@ -74,6 +74,7 @@ assert(素馨(`@media screen{&.a{b:1}}`, 'a'), `@media screen{a.a{b:1;}}`);
 assert(素馨(`@media screen and(max-width:100px){&.a{b:1}}`, 'a'), `@media screen and (max-width:100px){a.a{b:1;}}`);
 assert(素馨(`b{:not([resizing], [dragging]) {transition: padding .2s, margin .2s;}}`), `b :not([resizing], [dragging]){transition:padding .2s, margin .2s;}`);
 assert(素馨(`@a(@b){a@b{@w:@b/2;c:@w;}} @a(1); @a(2); @a(3)`), `a1{c:0.5;}\r\na2{c:1;}\r\na3{c:1.5;}`);
+assert(素馨(`a{filter:grayscale(.9)}`), `a{filter:grayscale(.9);}`);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].text, '-0.2em');
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].isdigit, true);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].text, ".3em");

package/coms/docs/codetext.xht

@@ -294,6 +294,7 @@
     codesupports.cjs = codesupports.mjs = codesupports.jsx = codesupports.js = codesupports.javascript;
     codesupports.tsx = codesupports.ts = codesupports.typescript;
     codesupports.xht = codesupports.jsp = codesupports.asp = codesupports.php = codesupports.xml = codesupports.html;
+    codesupports.vue = codesupports.xht;
     var { SCOPED, QUOTED, SPACE, STAMP, STRAP, EXPRESS, PROPERTY } = compile$common;
     var patchBlink = function (code, index, blink) {
         for (var cx = 0, dx = code.length; cx < dx; cx++) {

package/coms/frame/chat.js

@@ -182,7 +182,7 @@ function chat(title = '会话窗口') {
     var fid = 0;
     var filesMap = Object.create(null);
     renderWithDefaults(page, {
-        chat: list,
+        chat: zimoli$list,
         title,
         msglist: [],
         showList: 0,

package/coms/kugou/api.js

@@ -46,7 +46,7 @@
         "download-krc;accesskey&id": "get:content download?ver=1&client=pc&fmt=krc&charset=utf8"
     },
     "https://music.91q.com/": {// 千千静听/百度音乐
-        "search-qqjt;word": "get:data.typeTrack v1/search#songname=title&singername=artist<、>.name&avatar=pic&priced=isVip",
+        "search-qqjt?word": "get:data.typeTrack v1/search#songname=title&singername=artist<、>.name&avatar=pic&priced=isVip",
         "qqjt-url?TSID": "get:data v1/song/tracklink#url=path"
     }
 })

package/coms/kugou/player.js

@@ -67,15 +67,18 @@ on("keydown")(window, function (event) {
     if (!$scope.audio && !kugou$musicList.getActived()) return;
     switch (event.keyCode || event.which) {
         case 32:
+        case 179:
             if (event.repeat) break;
             if ($scope.playing) $scope.pause();
             else $scope.play();
             break;
         case 37:
+        case 177:
             // left
             $scope.play($scope.index - 1);
             break;
         case 39:
+        case 176:
             $scope.play($scope.index + 1);
             // right
             break;

package/coms/zimoli/addClass.js

@@ -1,25 +1,28 @@
+var classToMap = function (className) {
+    if (isString(className)) className = className.trim().split(/\s+/);
+    if (isArray(className)) {
+        var classMap = Object.create(null);
+        for (var c of className) {
+            if (isString(c)) classMap[c] = true;
+            else Object.assign(classMap, classToMap(c));
+        }
+        return classMap;
+    }
+    else if (isObject(className)) return className;
+    return Object.create(null);
+};
 function addClass(target, classNames) {
     var _className = target.className;
     var arr = String(_className || "").trim().split(/\s+/);
-    var cls = {};
+    var cls = Object.create(null);
     for (var cx = 0, dx = arr.length; cx < dx; cx++) {
         var c = arr[cx];
         if (c) cls[c] = true;
     }
-    if (isString(classNames)) {
-        var clsNames = classNames.trim().split(/\s+/);
-        for (var cx = 0, dx = clsNames.length; cx < dx; cx++) {
-            var c = clsNames[cx];
-            if (c) cls[c] = true;
-        }
-    } else {
-        merge(cls, classNames);
-    }
+    classNames = classToMap(classNames);
+    Object.assign(cls, classNames);
     var newarr = [];
-    for (var k in cls) {
-        if (k && cls[k]) {
-            newarr.push(k);
-        }
-    }
+    for (var k in cls) if (k && cls[k]) newarr.push(k);
     target.className = newarr.join(" ");
-}
+}
+addClass.classToMap = classToMap;

package/coms/zimoli/css.js

@@ -109,6 +109,16 @@ var cssTargetNode = function (targetNode, oStyle, oValue) {
         }
     }
 };
+var styleToMap = function (style) {
+    if (isString(style)) return parseKV(style, ';', ':');
+    if (isObject(style)) return style;
+    if (isArray(style)) {
+        var styleMap = Object.create(null);
+        for (var s of style) extend(styleMap, styleToMap(s));
+        return styleMap;
+    }
+    return Object.create(null);
+}
 /**
  * 将样式绑定到选择器
  * @param {string} targetSelector 
@@ -185,4 +195,5 @@ var css = function (target, oStyle, oValue) {
 };
 css.transformCssKey = transformCssKey;
 css.transformNodeKey = transformNodeKey;
-css.transformValue = transformValue;
+css.transformValue = transformValue;
+css.styleToMap = styleToMap;

package/coms/zimoli/getGenerator.js

@@ -11,18 +11,7 @@ var cloneChildNodes = function (template) {
     }
     return cNodes;
 }
-var merge = function (dst, src) {
-    if (!src) return dst;
-    if (!dst) return src;
-    if (dst instanceof Array) {
-        return dst.concat(src);
-    }
-    if (isObject(dst)) return Object.assign(dst, src);
-    return src;
-};
-var mergeStruct = function (struct1, struct2) {
-    for (var k in struct2) struct1[k] = merge(struct1[k], struct2[k]);
-}
+
 /**
  * @param {Element} container
  * @param {Element|string} tagName;
@@ -67,8 +56,7 @@ var getGenerator = function (container, tagName = 'item') {
     if (tagTemplate) {
         render.struct(tagName);
         var template0 = templates[0];
-        mergeStruct(tagName.$struct, template0.$struct);
-        template0.$struct = tagName.$struct;
+        template0.$struct = render.mergeStruct(tagName.$struct, template0.$struct);
         template0.$renderid = tagName.$renderid;
     }
     if (templates.length) container.$template = template;
@@ -94,8 +82,13 @@ var getGenerator = function (container, tagName = 'item') {
         }
         var scopes = container.$generatorScopes;
         var parsedSrc = container.$src;
+        var wraped = undefined;
+        if (com instanceof Item) {
+            wraped = com;
+            com = com.value;
+        }
         if (parsedSrc) {
-            var newScope = parsedSrc.createScope(com, index, index);
+            var newScope = parsedSrc.createScope(com, index, index, wraped);
         } else {
             var newScope = container.src[index];
             if (!isObject(newScope)) newScope = {
@@ -115,6 +108,7 @@ var getGenerator = function (container, tagName = 'item') {
                     return this.$item;
                 }
             }
+            if (wraped) newScope.$wraped = wraped;
         }
         element.$scope = newScope;
         element.$parentScopes = scopes;

package/coms/zimoli/menuList.js

@@ -123,7 +123,8 @@ function main() {
     var main = this;
     if (direction == 'y') page.ispop = true;
     var istoolbar = direction === 't';
-    function popMenu(item, target) {
+    function popMenu(target) {
+        var item = getMenu(target);
         if (page.actived) {
             clear();
             page.focus();
@@ -173,7 +174,7 @@ function main() {
         enterMenuEnabled = false;
         if (page.ispop) {
             page.setFocus(menu);
-            popMenu(menu.menu, menu);
+            popMenu(menu);
         }
     }, 60);
     on('pointerdown')(page, unblur);
@@ -181,34 +182,36 @@ function main() {
         document.activeElement.blur();
     };
     var activeMenu = function () {
-        if (this.menu.line) return;
+        const thismenu = getMenu(this);
+        if (thismenu.line) return;
         if (this.hasAttribute("disabled") || this.hasAttribute('line')) return;
-        var pop = active(this.menu.value, this);
+        var pop = active(thismenu.value, this);
         if (pop === false) return;
         var root = page.root || page;
         var istool = root.direction === 't' || root.selected
         if (root.ispop === 1) root.ispop = false;
         if (istool) {
-            var menu = this.menu;
+            var menu = thismenu;
             if (root.selected) root.selected.setActive(false);
             if (root !== page) {
                 var target = root.actived.target;
                 if (isObject(menu.value)) delete menu.value.children;
-                target.menu.extends(menu.value);
-                menu = target.menu;
+                var targetmenu = getMenu(target);
+                targetmenu.extends(menu.value);
+                menu = targetmenu;
             }
             else {
                 target = this;
             }
             menu.setActive(true);
-            root.selected = target.menu;
+            root.selected = getMenu(target);
             autoremove();
             return;
         }
         if (page.actived && page.actived.target === this) {
             if (mounted_menus.indexOf(page.actived) >= 0) while (mounted_menus.length && mounted_menus[mounted_menus.length - 1] !== page.actived) remove(mounted_menus.pop());
             if (!mounted_menus.length || page === mounted_menus[mounted_menus.length - 1]) {
-                popMenu(this.menu, this, false);
+                popMenu(this, false);
             }
             else {
                 remove(mounted_menus.pop());
@@ -218,7 +221,7 @@ function main() {
         else {
             while (mounted_menus.length && mounted_menus[mounted_menus.length - 1] !== page) remove(mounted_menus.pop());
             page.actived = null;
-            popMenu(this.menu, this, false);
+            popMenu(this, false);
             if (!page.actived) {
                 autoremove();
             }
@@ -226,7 +229,7 @@ function main() {
     };
     var pressMenu = function (event) {
         if (event.which === 3) {
-            popMenu(this.menu, this);
+            popMenu(this);
         }
         else {
             switchMenu.done = false;
@@ -241,7 +244,7 @@ function main() {
 
     var switchMenu = lazy(function (event) {
         if (onclick.preventClick) return;
-        popMenu(this.menu, this);
+        popMenu(this);
         switchMenu.done = true;
     }, 300);
     var hasIcon = function () {
@@ -255,11 +258,10 @@ function main() {
     };
     var $scope = {
         "menu-item"(e, s) {
-            if (e && s === e.$scope) s = itemName ? s[itemName] : s.menu;
+            if (e && s === e.$scope) s = itemName ? s[itemName] : s.$item.value;
             var a = button(
                 menuItem(e, s, this.hasIcon)
             );
-            a.menu = s;
             return a;
         },
         hasIcon: hasIcon(),
@@ -270,9 +272,9 @@ function main() {
     if (!page.$src) page.$src = render.parseRepeat("m in menus");
     var src = page.$src;
     var itemName = src.itemName;
-    var className = `{'has-children':${itemName}.children&&${itemName}.children.length,
-            'warn':${itemName}.warn,
-            actived:${itemName}.isActived()
+    var className = `{'has-children':$item.children&&$item.children.length,
+            warn:$item.warn,
+            actived:$item.isActived()
         }`;
     var notHidden = `!${itemName}.hidden`;
     var ItemTemplate = document.createElement('menu-item');
@@ -281,7 +283,6 @@ function main() {
     else ItemTemplate.setAttribute("on-mouseenter", `enterMenu(this)`);
     ItemTemplate.setAttribute("e-class", className);
     if (src.itemName) ItemTemplate.setAttribute("e-if", notHidden);
-    ItemTemplate.setAttribute("_menu", src.itemName);
     ItemTemplate.innerHTML = menuItem.template;
     var generator = getGenerator(page, ItemTemplate);
     page.$generatorScopes.push($scope);
@@ -299,11 +300,15 @@ function main() {
     page.$renders.unshift(function () {
         this.$scope.hasIcon = hasIcon();
     });
+    var getMenu = function (a) {
+        return a.$scope.$item;
+    }
     page.open = function (a) {
-        if (!a.menu || !a.menu.length) {
+        var amenu = getMenu(a);
+        if (!amenu || !amenu.length) {
             return;
         }
-        var m = popMenu(a.menu, a);
+        var m = popMenu(a);
         m.moveFocus("home");
     };
     page.active = function (a) {
@@ -314,8 +319,9 @@ function main() {
         if (page.selected) page.selected.setActive(false);
         var selected = null;
         for (var e of this.children) {
-            if (!e.menu) continue;
-            selected = e.menu.pathTo(event.value);
+            var emenu = getMenu(e);
+            if (!emenu) continue;
+            selected = emenu.pathTo(event.value);
             if (selected) break;
         }
         if (!selected) return;
@@ -326,7 +332,7 @@ function main() {
     });
     on("focused")(page, function () {
         var focused = page.focused;
-        if (page.ispop && !page.parent) popMenu(focused.menu, focused, false);
+        if (page.ispop && !page.parent) popMenu(focused, false);
     });
     page.openFocus = openFocus;
     page.closeFocus = closeFocus;

package/coms/zimoli/on.js

@@ -118,6 +118,14 @@ var keyCodeMap = {
     num: 144,
     numlock: 144,
     scrolllock: 145,
+    mute: 173,// 静音
+    volumedown: 174,// 音量减
+    quiet: 174,// 音量减
+    volumeup: 175,// 音量加
+    loud: 175,// 音量加
+    next: 176,// 下一首
+    prev: 177,// 上一首
+    pause: 179,// 暂停/播放
     semicolon: 186,
     ";": 186,
     ":": 186,

package/coms/zimoli/removeClass.js

@@ -6,12 +6,10 @@ function removeClass(target, classNames) {
         var c = arr[cx];
         cls[c] = true;
     }
-    if (isString(classNames)) {
-        var clsNames = classNames.trim().split(/\s+/);
-        for (var cx = 0, dx = clsNames.length; cx < dx; cx++) {
-            var c = clsNames[cx];
-            delete cls[c];
-        }
+    if (isString(classNames)) classNames = classNames.trim().split(/\s+/);
+    if (isArray(classNames)) for (var cx = 0, dx = classNames.length; cx < dx; cx++) {
+        var c = classNames[cx];
+        delete cls[c];
     }
     var newarr = [];
     for (var k in cls) {