efront 4.11.0 → 4.11.2

package/coms/basic/getName.js

@@ -9,11 +9,11 @@ function getName(o) {
         if (!isEmpty(name)) return String(name);
     }
     for (var k of keys) {
-        if (!hasOwnProperty.call(o, k)) continue;
-        if (!isEmpty(o[k])) return String(o[k]);
-        if (isString(o[k])) name = o[k];
+        var v = o[k];
+        if (!isEmpty(v) && hasOwnProperty.call(o, k)) return String(v);
+        if (isString(v)) name = v;
     }
-    if (hasOwnProperty.call(o, 'valueOf')) name = o.valueOf();
+    if (!name && hasOwnProperty.call(o, 'valueOf')) name = o.valueOf();
     if (isString(name)) return name;
     return String(o);
 }

package/coms/compile/Html.js

@@ -88,7 +88,7 @@ var replaceISO8859 = function (data) {
     return String(data).replace(/<\!--([\s\S]*)--\>$/g, '$1').replace(/&\w+;/g, a => iso8859[a] || a).replace(/&#(\d+);/g, (_, a) => String.fromCodePoint(a))
 };
 var parseExpress = function (data, mayberepeat) {
-    data = replaceISO8859(data);
+    data = "=" + replaceISO8859(data);
     if (mayberepeat && /\s+(in|of)\s+/.test(data)) {
         data = data.split(/\s+(in|of)\s+/).pop();
     }
@@ -132,6 +132,7 @@ Html.prototype.createScoped = function (code) {
                     else if (c.tagName === 'STYLE') {
                         styleNodes.push(c);
                         tempNodes.push(c);
+                        c.isStyle = true;
                     }
                 }
 

package/coms/compile/Html_test.js

@@ -7,6 +7,7 @@ var test = function (source, pick, value) {
     if (arguments.length === 2) source = pick;
     assert(h.createString(b), source);
     if (arguments.length === 3) {
+        b.scoped = h.createScoped(b);
         assert(seek(b, pick), value);
     }
 };
@@ -31,7 +32,9 @@ test('<div>$\\{${`<div></div>`}</div>');
 test('<div>$\\{${typeof `<div></div>`}</div>');
 test('<div>$\\{${\\a+typeof`<div></div>`}</div>', '<div>$\\{${\\a + typeof `<div></div>`}</div>');
 test('${i18n`加载中..`}<div class="loader"></div>');
-test('${a +typeof i18n`加载中..`}<div class="loader"></div>','${a + typeof i18n`加载中..`}<div class="loader"></div>');
+test('${a +typeof i18n`加载中..`}<div class="loader"></div>', '${a + typeof i18n`加载中..`}<div class="loader"></div>');
 test('${a > 1}');
-test('a>1','a > 1');
-test('a><a></a>','a > <a></a>');
+test('a>1', 'a > 1');
+test('a><a></a>', 'a > <a></a>');
+test('X', 'X');
+test('<input -class="{actived:actived===f}"/>', 'scoped.envs.actived', true);

package/coms/compile/Program.js

@@ -13,6 +13,7 @@ const {
     /*2048 */ELEMENT,
     createString,
     number_reg,
+    digit_reg,
 } = require("./common");
 var combine = require("../basic/combine");
 var sortRegster = require("../basic/sortRegister");
@@ -105,6 +106,7 @@ class Program {
     stamps = "/=+;|:?<>-!~%^&*,".split("")
     value_reg = /^(false|true|null)$/
     number_reg = number_reg;
+    digit_reg = digit_reg;
     Code = Array;
     powermap = powermap;
     transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|default|instanceof|throw|extends|import|from)$/;
@@ -183,11 +185,19 @@ class Program {
         var funcstrap_reg = this.funcstrap_reg;
         var entry_reg = this.entry_reg;
         var type_reg = this.type_reg;
+        var digit_reg = this.digit_reg;
         var comment_entry = this.comment_entry;
         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)) {
@@ -479,7 +489,7 @@ class Program {
                     save(space_reg.test(m) ? SPACE : PIECE);
                 }
             }
-            m = match[0];
+            m = match?.[0];
         }
         loop: while (index < text.length) {
 
@@ -492,6 +502,7 @@ class Program {
                     var match = reg.exec(text);
                     if (!match) {
                         index = text.length;
+                        if (queue === origin) push_piece(index);
                         break loop;
                     }
                     var m = match[0];
@@ -763,7 +774,7 @@ class Program {
                 }
                 continue;
             }
-            var isdigit = number_reg.exec(m);
+            var isdigit = digit_reg.exec(m);
             if (isdigit) {
                 var m1 = isdigit[0];
                 if (m1.length < m.length) {
@@ -900,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) {
@@ -1003,7 +1014,10 @@ class Program {
         var powers_entries = this.createRegExp(this.tags.map(t => t[0]).concat(powers), true).source;
         var entries_reg = new RegExp(`^(${powers_entries}|${quotes_entries}|${scopes})$`, this.nocase ? 'iu' : '');
         stamps = this.compile(this.stamps.filter(s => !entries_reg.test(s)).join(''));
-        this.entry_reg = new RegExp([`[${spaces}]+|${quotes_entries}|[${scopes}]|${number_reg.source.replace(/^\^|\$$/g, "")}[^${tokens}]*|${express}|${powers_entries}|[${stamps}]`], "gi" + flagUnicode);
+        var number_reg = this.number_reg;
+        var numbers = number_reg.source.replace(/^\^|\$$/g, "");
+        this.digit_reg = new RegExp(/^[+\-]?/.source + numbers, number_reg.flags);
+        this.entry_reg = new RegExp([`[${spaces}]+|${quotes_entries}|[${scopes}]|${numbers}[^${tokens}]*|${express}|${powers_entries}|[${stamps}]`], "gi" + flagUnicode);
     }
 }
 module.exports = Program;

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

@@ -1,4 +1,4 @@
-var { STAMP, PROPERTY, SCOPED, VALUE, EXPRESS, QUOTED, SPACE, COMMENT, createString: _createString, splice } = require("./common");
+var { STAMP, PROPERTY, SCOPED, VALUE, STRAP, EXPRESS, QUOTED, SPACE, COMMENT, createString: _createString, splice } = require("./common");
 var createString = function (a) {
     a.autospace = false;
     return _createString(a);
@@ -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参数异常!`);
@@ -274,25 +280,28 @@ macros.each = function (list, body) {
 };
 
 
+var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports|font-face|document|counter-style|charset|color-profile|container|font-feature-values|font-palette-values|scope|starting-style)(\s|\(|$)/i;
 class 素心 extends Program {
-    straps = ["and"];
+    straps = ["and", ...presets.source.replace(/^[\s\S]*?\(([\s\S]*?)\)[\s\S]*$/, '$1').split('|').map(a => "@" + a)];
     stamps = `;:,>+~&!/`.split("");
     quotes = rarg.quotes;
     keepspace = true;
+    control_reg = presets;
     scopes = [["{", "}"], ["(", ")"]]
 }
 
-var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports|font-face|document|counter-style|charset|color-profile|container|font-feature-values|font-palette-values)(\s|\(|$)/i;
 
 素心.prototype.setType = function (o) {
     var p = o.prev;
     if (o.type !== SCOPED) {
         if (!p || p.type === STAMP && p.text === ";" || p.type === SCOPED && p.entry === '{') {
-            o.type = PROPERTY;
+            if (o.type === EXPRESS) o.type = PROPERTY;
+            o.isprop = true;
             return;
         }
-        if (p.type === PROPERTY && o.type !== STAMP && o.type !== SCOPED) {
-            o.type = PROPERTY;
+        if (p.isprop && o.type & ~(STAMP | SCOPED)) {
+            if (o.type === EXPRESS) o.type = PROPERTY;
+            o.isprop = true;
             return;
         }
     }
@@ -303,7 +312,7 @@ var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports
         }
         while (p && (p.type !== SCOPED || p.entry !== "{") && (p.type !== STAMP || p.text !== ';')) {
             p.isprop = true;
-            if (p.type !== SCOPED) p.type = PROPERTY;
+            if (p.type === EXPRESS) p.type = PROPERTY;
             p = p.prev;
         }
     }
@@ -334,13 +343,13 @@ var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports
         for (var cx = 0, dx = code.length; cx < dx; cx++) {
             var o = code[cx];
             if (o && (o.type & (SPACE | COMMENT) || o.type === STAMP && o.text === ';')) continue;
-            if (o.type !== PROPERTY) {
+            if (!o.isprop) {
                 console.log(createString([o]), o.type, createString(code))
                 throw new Error(i18n`结构异常`);
             }
             var p = [], v = [];
             while (o && (o.type !== SCOPED || o.entry !== "{")) {
-                if (o.type === STAMP) break;
+                if (o.type === STAMP && !o.isprop) break;
                 p.push(o);
                 o = code[++cx];
             }
@@ -609,4 +618,5 @@ function 素馨(text, scopeName, compress) {
         }
         return a;
     }).filter(a => !!a).join(compress ? "" : "\r\n") + getquried();
-}
+}
+素馨.素心 = 素心;

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

@@ -70,7 +70,12 @@ assert(素馨(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `a>.abc-:not(a):not(b){
 assert(素馨(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:1;}`);
 assert(素馨(`@a:1px;@margin-x:@a+10px; a{m:-@margin-x}`), `a{m:-11px;}`);
 assert(素馨(`a{@a:1px;@margin-x:@a+10px;m:-@margin-x}`), `a{m:-11px;}`);
-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(素馨(`@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(@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");
+assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].isdigit, true);

package/coms/docs/codecolor.js

@@ -13,6 +13,7 @@ var codecolor = function (c, encode) {
     var scoped = c.scoped;
     var setdefs = function (scoped) {
         var { used } = scoped;
+        if (!isObject(used) || isArray(used)) return;
         for (var k in used) {
             var isdef = false;
             for (var o of used[k]) {
@@ -29,12 +30,12 @@ var codecolor = function (c, encode) {
         }
         scoped.forEach(setdefs);
     };
-    setdefs(scoped);
+    if (scoped) setdefs(scoped);
     var isConstValue = () => false;
     if (c.program) {
         var { strap_reg, value_reg } = c.program;
         isConstValue = a => strap_reg.test(a) || value_reg.test(a);
-    };
+    }
     var isInvoke = function (o) {
         var o = o.next;
         if (o?.type === EXPRESS && needhead_reg.test(o.text)) o = o.next;
@@ -42,9 +43,9 @@ var codecolor = function (c, encode) {
         if (o?.type === STAMP && o.needle) o = o.next;
         if (o?.type === SCOPED && o.entry === "(") return true;
         return false;
-    }
+    };
     var setExpress = function (o, label) {
-        if (!o.text) return;
+        if (!o.text || /^</.test(o.text)) return;
         var keys = o.text.split(".");
         if (isInvoke(o)) {
             if (!/^[\<\?]/.test(keys[keys.length - 1])) keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
@@ -55,21 +56,21 @@ var codecolor = function (c, encode) {
         else name = `<${label}>${name}</${label}>`;
         keys[0] = name;
         o.text = keys.map(k => /^[\<\?]/.test(k) || !k ? k : `<express>${k}</express>`).join(".");
-    }
+    };
     var setPredef = o => setExpress(o, 'predef');
     var setOutside = o => setExpress(o, 'outside');
     if (used) for (var k in envs) {
         used[k].forEach(k in predefs ? setPredef : setOutside);
     }
     if (c.program) var { space_exp: spaceReg, control_reg } = c.program;
-    var unspaceReg = new RegExp(spaceReg.source.replace(/^\[/, "[^"), spaceReg.flags + 'g');
+    if (spaceReg) var unspaceReg = new RegExp(spaceReg.source.replace(/^\[/, "[^"), spaceReg.flags + 'g');
     var wraptext = function (t, l) {
         if (unspaceReg) t = t.replace(unspaceReg, a => {
             a = encode(a);
             return `<${l}>${a}</${l}>`
         });
         return t;
-    }
+    };
     c.colored = true;
     var setcolor = function (o) {
         if (o.colored) return;
@@ -151,5 +152,5 @@ var codecolor = function (c, encode) {
         }
     };
     c.forEach(setcolor);
-
+    return c;
 }

package/coms/docs/codetext.xht

@@ -43,6 +43,10 @@
         color: #569cd6;
     }
 
+    selector {
+        color: #d7ba7d;
+    }
+
     @deep(@num, @color) {
         deep@num {
             color: @color;
@@ -141,6 +145,74 @@
             }
         }
     }
+    var 素心 = new compile$素馨.素心;
+    素心.scopes.push(['[', ']']);
+    素心.straps.push('important',
+        'after', 'backdrop', 'before',
+        'cue', 'cue-range',
+        'file-selector-button', 'first-letter', 'last-letter', 'first-line',
+        'grammer-error', 'highlight', 'marker', 'part',
+        'placeholder', 'selection', 'slotted', 'spelling-error', 'target-text',
+        'view-transition', 'view-transition-group', 'view-transition-image-pair', 'view-transition-new', 'view-transition-old',
+        'active', 'any-link', 'autofill',
+        'blank',
+        'checked', 'current',
+        'dir', 'default', 'defined', 'disabled',
+        'empty', 'enabled',
+        'first', 'first-child', 'first-of-type', 'future', 'focus', 'focus-visible', 'focus-within', 'fullscreen',
+        'has', 'host', 'host-context', 'hover',
+        'indeterminate', 'in-range', 'invalid', 'is',
+        'lang', 'last-child', 'last-of-type', 'left', 'link', 'local-link',
+        'modal',
+        'not', 'nth-child', 'nth-col', 'nth-last-child', 'nth-last-col', 'nth-last-of-type', 'nth-of-type',
+        "only-child", 'only-of-type', 'optional', 'out-of-range',
+        'past', 'picture-in-picture', 'placeholder-shown', 'paused', 'playing',
+        'read-only', 'read-write', 'required', 'right', 'root',
+        'scope', 'state',
+        'target', 'target-within',
+        'user-invalid',
+        'valid', 'visited',
+        'where'
+    );
+    素心.stamps.push("=");
+    var setless = function (c) {
+        var set = function (o) {
+            if (o.type === PROPERTY) {
+                var q = o.queue;
+                if (q.type === SCOPED && q.entry !== "{") return;
+                var next = o.next;
+                if (next && (next.type !== STAMP || !/^[\:\=]$/.test(next.text))) {
+                    o.text = `<selector>${o.text}</selector>`;
+                    return;
+                }
+                if (next && (next.type === STAMP && next.text === ':')) {
+                    while (next && next.type !== SCOPED) {
+                        if (next.type === STAMP && next.text === ';') return;
+                        next = next.next;
+                    }
+                    if (next) o.text = `<selector>${o.text}</selector>`;
+                }
+                return;
+            }
+            if (o.type === EXPRESS) {
+                var next = o.next;
+                if (next?.type === SCOPED) return;
+                if (!o.length) o.type = QUOTED;
+                return;
+            }
+            if (o.type === STRAP) {
+                if (!o.isprop) return o.type = EXPRESS;
+                var p = o.prev;
+                if (!/^@/.test(o.text) && (!p || p.type !== STAMP || !/\:$/.test(p.text))) o.type = PROPERTY;
+                return;
+            }
+
+            if (o.type === SCOPED && o.length) {
+                o.forEach(set);
+            }
+        };
+        c.forEach(set);
+    };
     var codesupports = {
         javascript(a, blink) {
             if (blink) var index = a.indexOf(blink);
@@ -165,6 +237,12 @@
             codecolor(c, encode);
             return c.toString();
         },
+        less(a) {
+            var c = compile$scanner2(a, 素心);
+            setless(c);
+            codecolor(c, encode);
+            return c.toString();
+        },
         rs(a) {
             var c = compile$scanner2(a, rust);
             codecolor(c, encode);
@@ -179,24 +257,26 @@
             var code = compile$scanner2(a, 'html');
             var scoped = code.scoped;
             backEach(scoped.richNodes, n => {
-                if (n.isScript) {
-                    var js = [];
+                if (n.isScript || n.isStyle) {
+                    var s = n.isScript ? js : 素心;
+                    var c = [];
                     compile$common.createString(n).replace(/^(\s*\<\!--)([\s\S]*)(--\!?\>\s*)$|^[\s\S]*$/, (m, p, a, f) => {
                         if (!a) {
-                            js = compile$scanner2(m);
+                            c = compile$scanner2(m, s);
                         }
                         else {
-                            js = compile$scanner2(a);
-                            js.unshift(
+                            c = compile$scanner2(a, s);
+                            c.unshift(
                                 { type: compile$common.COMMENT, text: p },
                             );
-                            js.push(
+                            c.push(
                                 { type: compile$common.COMMENT, text: f }
                             );
                         }
-                        codecolor(js, encode);
+                        if (n.isStyle) setless(c);
+                        codecolor(c, encode);
                     });
-                    n.splice(0, n.length, ...js);
+                    n.splice(0, n.length, ...c);
                 }
             })
             codecolor(code, encode);
@@ -210,10 +290,12 @@
     };
     codesupports.gl = codesupports.glsl;
     codesupports.cmd = codesupports.bat;
+    codesupports.css = codesupports.less;
     codesupports.cjs = codesupports.mjs = codesupports.jsx = codesupports.js = codesupports.javascript;
     codesupports.tsx = codesupports.ts = codesupports.typescript;
-    codesupports.jsp = codesupports.asp = codesupports.php = codesupports.xml = codesupports.html;
-    var { SCOPED, QUOTED, SPACE, STRAP, EXPRESS, PROPERTY } = compile$common;
+    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++) {
             var c = code[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;