efront 3.7.7 → 3.8.4

package/apps/kugou/api.js

@@ -12,7 +12,7 @@
         "singer-list": "get:[].singer-img-list>li         singer/list/:id#href=a!href&=a!href\\singer-info&imgurl=img!_src&name=p|innerText",
         "singer-info": "mget:[].singer-songs-list>li       singer/info/:id#hash=!id&singer=.singer-name|innerText&name=.song-name|innerText&data=em/innerText"
     },
-    "https://mobilecdn.kugou.com/": {
+    "http://mobilecdn.kugou.com/": {
         "search?keyword": "get:data.info                            api/v3/search/song?format=json&page=1&pagesize=30&showtype=1"
     }
 })

package/apps/kugou/index.html

@@ -17,6 +17,9 @@
     <script>
         cross_host = 'efront.cc';
     </script>
+    <script deleteoncompile>
+        cross_host = '';
+    </script>
     <style>
         *,
         ::before,

package/coms/basic/strings.js

@@ -25,7 +25,7 @@ function encode(str) {
     }) + "\"";
 }
 function decode(s) {
-    var r = /^(['"])([\s\S]*)\1$/.exec(s);
+    var r = /^(['"`])([\s\S]*)\1$/.exec(s);
     if (!r) return s;
     return r[2].replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\([\s\S])/ig, (a, b) => {
         if (!b) {

package/coms/compile/common.js

@@ -91,6 +91,7 @@ var skipAssignment = function (o) {
             }
             else if (o.text === "function") {
                 o = o.next;
+                if (o && o.type === STAMP) o = o.next;
                 if (o && o.type === EXPRESS) o = o.next;
                 if (o) o = o.next;
                 if (o) o = o.next;
@@ -118,6 +119,7 @@ var createScoped = function (parsed) {
             var isFunction = false;
             var isScope = false;
             var isArrow = false;
+            var isDeclare = false;
             switch (o.type) {
                 case QUOTED:
                     if (o.length) {
@@ -130,13 +132,18 @@ var createScoped = function (parsed) {
                     if (o.next) {
                         if (o.next.type !== STAMP || o.next.text !== ",") break;
                     }
+                    if (o.prev && o.prev.type === STRAP && o.prev.text === 'as') {
+                        break;
+                    }
                 case VALUE:
                     if (number_reg.test(o.text)) break;
                 case EXPRESS:
                     if (o.prev && o.prev.type === EXPRESS) {
                         if (/\.$/.test(o.prev.text)) break;
                     }
-                    var u = o.text.replace(/^([^\.\[]*)[\s\S]*$/, '$1');
+                    var u = o.text;
+                    if (/^\.\.\./.test(u)) u = u.slice(3);
+                    var u = u.replace(/^([^\.\[]*)[\s\S]*$/, '$1');
                     if (!u) break;
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
@@ -157,6 +164,9 @@ var createScoped = function (parsed) {
                 case STRAP:
                     var s = o.text;
                     switch (s) {
+                        case "as":
+                        case "from":
+                            break;
                         case "var":
                         case "import":
                             var m = vars;
@@ -176,6 +186,7 @@ var createScoped = function (parsed) {
                             continue loop;
                         case "function":
                             isFunction = true;
+                            if (o.next.type === STAMP) o = o.next;
                         case "catch":
                             isCatch = true;
                         case "class":
@@ -184,6 +195,7 @@ var createScoped = function (parsed) {
 
                                 if (o.type === EXPRESS) {
                                     vars[o.text] = true;
+                                    isDeclare = true;
                                     o.kind = isFunction ? 'function' : 'class';
                                     saveTo(used, o.text, o);
 
@@ -237,7 +249,7 @@ var createScoped = function (parsed) {
                     scoped.used = used;
                 }
                 if (isArrow);
-                else if (o.isExpress && o.type !== SCOPED) {
+                else if (o.isExpress && o.type !== SCOPED && !isDeclare) {
                     o = o.next;
                     if (o.type === EXPRESS) {
                         vars[o.text] = true;
@@ -358,10 +370,19 @@ var getDeclared = function (o, kind) {
             }
         }
         switch (o.type) {
+            case STAMP:
+                if (o.text === "*" && o.next) {
+                    if (o.next.type === STRAP && o.next.text === 'as') {
+                        o = o.next.next;
+                        continue;
+                    }
+                }
             case PROPERTY:
-                if (o.next && o.next.type === STAMP && o.next.text === ":") {
-                    o = o.next.next;
-                    continue;
+                if (o.next) {
+                    if (o.next.type === STAMP && o.next.text === ":" || o.next.type === STRAP && o.next.text === "as") {
+                        o = o.next.next;
+                        continue;
+                    }
                 }
             case STRAP:
             case VALUE:
@@ -379,7 +400,6 @@ var getDeclared = function (o, kind) {
                 Object.assign(declared, d);
                 o = o.next;
                 break;
-
             default:
                 console.log(o);
                 throw new Error("代码结构异常");

package/coms/compile/scanner2.js

@@ -26,6 +26,7 @@ var needBreak = function (prev, next) {
     if (prev.type === EXPRESS && /\.$/.test(prev.text)) return;
     if (next.type === EXPRESS && /^\./.test(next.text)) return;
     if (next.type === PROPERTY) return ";";
+    if (next.type === STAMP && next.text === "*") return ";";
     if (
         [EXPRESS, VALUE, QUOTED].indexOf(prev.type) >= 0
         || prev.type === STAMP && /^(\+\+|\-\-)$/.test(prev.text)
@@ -95,8 +96,8 @@ var compress = function (scoped, maped) {
 
 var strings = require("../basic/strings");
 
-var insertAfter = function (o,) {
-    var queue = o.queue;
+var insertAfter = function (o) {
+    var queue = o.queue || this;
     var index = queue.indexOf(o) + 1;
     var os = [].slice.call(arguments, 1);
     queue.splice.apply(queue, [index, 0].concat(os));
@@ -104,6 +105,7 @@ var insertAfter = function (o,) {
     for (var o of os) {
         prev.next = o;
         o.prev = prev;
+        Object.defineProperty(o, 'queue', { value: queue });
         prev = o;
     }
     if (next) {
@@ -111,6 +113,20 @@ var insertAfter = function (o,) {
         next.prev = o;
     }
 };
+var detourTemplate = function (raw, params) {
+    var spliter = { text: ",", type: STAMP };
+    var template = scan(`extend([],{["raw"]:[]})`);
+    var str0 = template[1].first;
+    var str1 = template[1][2][2];
+    for (var r of raw) {
+        str0.push({ text: strings.encode(strings.decode("`" + r.text + "`")), type: QUOTED }, spliter);
+        str1.push({ text: strings.encode(r.text), type: QUOTED }, spliter);
+    }
+    str0.pop();
+    str1.pop();
+    for (var p of params) template.push(spliter, p);
+    return template;
+};
 
 var detour = function (o, ie) {
     while (o) {
@@ -121,31 +137,103 @@ var detour = function (o, ie) {
             case EXPRESS:
                 if (!/^\.\.\.|\.\.\.$/.test(o.text)) {
                     var ot = o.text;
-                    o.text = o.text.replace(/\.([^\.\[]+)/g, (_, a) => !ie || program.strap_reg.test(a) ? `[${strings.encode(strings.decode(a))}]` : _);
+                    o.text = o.text.replace(/\.([^\.\[]+)/g, (_, a) => ie === undefined || program.strap_reg.test(a) ? `[${strings.encode(strings.decode(a))}]` : _);
                 }
                 break;
             case QUOTED:
                 if (o.length) {
-                    detour(o.first, ie);
+                    if (!o.prev || o.prev.type === STAMP || o.prev.type === STRAP) {
+                        o.type = SCOPED;
+                        o.entry = '[';
+                        o.leave = `]["join"]('')`;
+                        for (var cx = o.length - 1; cx >= 0; cx--) {
+                            var c = o[cx];
+                            if (c.type === PIECE) {
+                                c.type = QUOTED;
+                                c.text = strings.encode(strings.decode("`" + c.text + "`"));
+                            }
+                            else {
+                                insertAfter.call(o, c.prev, { type: STAMP, text: ',' });
+                                c.entry = "(";
+                                c.leave = ")";
+                                insertAfter.call(o, c, { type: STAMP, text: ',' });
+                                detour(c.first, ie);
+                            }
+                        }
+                    }
+                    else {
+                        var raw = [];
+                        var params = [];
+
+                        for (var c of o) {
+                            if (c.type === PIECE) {
+                                raw.push(c);
+                            } else {
+                                c.entry = '(';
+                                c.leave = ")";
+                                detour(c, ie);
+                                params.push(c.length === 1 ? c[0] : c);
+                            }
+                        }
+                        o.type = SCOPED;
+                        o.entry = "(";
+                        o.leave = ")";
+                        var temp = detourTemplate(raw, params);
+                        o.splice(0, o.length);
+                        o.push.apply(o, temp);
+                    }
                     break;
                 }
+                else if (!o.prev || o.prev.type === STAMP || o.prev.type === STRAP) {
+                    if (/^[`]/.test(o.text)) {
+                        o.text = strings.encode(strings.decode(o.text));
+                    }
+                }
+                else {
+                    if (/^`/.test(o.text)) {
+                        o.text = o.text.replace(/^`|`$/g, '');
+                        var template = detourTemplate([o], []);
+                        o.type = SCOPED;
+                        o.entry = "(";
+                        o.leave = ")";
+                        delete o.text;
+                        o.push.apply(o, template);
+                    }
+                }
                 if (!o.isprop) break;
             case PROPERTY:
                 if (/^(get|set|async|static)$/.test(o.text) && o.next && (o.next.type === PROPERTY || o.next.isprop)) break;
                 if (o.text === 'static' && o.next && o.next.type === SCOPED && o.next.entry === '{') break;
-                if (!ie || program.strap_reg.test(o.text)) {
+                if (ie === undefined || program.strap_reg.test(o.text)) {
                     if (!/^\[/.test(o.text) && o.queue.isObject) {
                         if (o.short) {
                             insertAfter(o, { text: ':', type: STAMP }, { text: o.text, type: EXPRESS, isExpress: true });
                             o.short = false;
                         }
                         var text = strings.encode(strings.decode(o.text));
-                        o.text = ie ? text : `[${text}]`;
+                        o.text = ie !== undefined ? text : `[${text}]`;
+                    }
+                    if (!/^\[/.test(o.text) && o.queue.isClass) {
+                        if (o.text === 'constructor') break;
+                        var text = strings.encode(strings.decode(o.text));
+                        if (o.prev) {
+                            var prev = o.prev;
+                            if (prev && prev.type === PROPERTY && /^(get|set|static|async)$/.test(prev.text)) {
+                                prev = prev.prev;
+                            }
+                            if (prev && prev.type === STAMP && prev.isprop) prev = prev.prev;
+                            if (prev && (prev.type !== STAMP || prev.text !== ';')) insertAfter(prev, { text: ';', type: STAMP });
+                        }
+                        o.text = `[${text}]`;
+                        if (o.next && o.next.type === SCOPED && o.next.entry === "(") { }
+                        else if (!o.next || o.next.type !== STAMP || o.next.text !== "=") {
+                            insertAfter(o, { text: "=", type: STAMP }, { text: "undefined", type: VALUE, isExpress: true });
+                        }
                     }
                 }
                 break;
         }
-        o = o.next;
+        if (o) o = o.next;
     }
 };
 
@@ -215,7 +303,7 @@ class Program extends Array {
                         break;
                     }
                 case SCOPED:
-                    if (!this.pressed && (lasttype === STRAP || lasttype === SCOPED && o.entry === "{") && o.type !== QUOTED) result.push(" ");
+                    if (!this.pressed && (lasttype === STRAP || lasttype === STAMP || lasttype === SCOPED && o.entry === "{") && o.type !== QUOTED) result.push(" ");
                     result.push(o.entry);
                     if (o.length > 0) {
                         if (o.entry === "{" && result[0].type !== SPACE) {
@@ -229,7 +317,7 @@ class Program extends Array {
                             if (!o.prev || o.prev.text !== 'for') result.pop();
                         }
                         if (o.leave === "}" && (!o.next || o.next.type !== PIECE) && o[o.length - 1].type !== SPACE) {
-                            result.push(" ");
+                            if (!this.pressed) result.push(" ");
                         }
                     }
                     result.push(o.leave);
@@ -253,7 +341,7 @@ class Program extends Array {
                                 ) result.push(";");
                             }
                             else if (!/^(\+\+|\-\-)$/.test(o.text)) {
-                                if (!this.pressed) result.push(" ");
+                                if (!this.pressed && lasttype !== SPACE) result.push(" ");
                             }
                         }
                         result.push(o.text);
@@ -290,8 +378,8 @@ class Program extends Array {
         return this;
     }
     // 绕开低版本ie的异常属性
-    detour() {
-        detour(this.first, true);
+    detour(ie) {
+        detour(this.first, !!ie);
         return this;
     }
     // 压缩
@@ -319,7 +407,7 @@ class Javascript {
         ["{", "}"],
     ]
     stamps = "/=+;|:?<>-!~@#%^&*,".split("")
-    value_reg = /^(false|true|null|Infinity|NaN|undefined|arguments|this|eval)$/
+    value_reg = /^(false|true|null|Infinity|NaN|undefined|arguments|this|eval|super)$/
     number_reg = number_reg;
     transive = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|export|default|instanceof|throw|extends|import|from)$/
     straps = `if,in,do,as,of
@@ -360,19 +448,24 @@ class Javascript {
         var origin = queue;
         var queue_push = function (scope) {
             var last = queue.lastUncomment;
-            if (~[VALUE, QUOTED].indexOf(scope.type)) {
-                scope.isprop = isProperty();
-            }
-            else if (scope.type === SCOPED && scope.entry === '[') {
-                if (queue.isObject) {
-                    scope.isprop = !last || last.type === STAMP && last.text === ','
+            if (queue.isObject || queue.isClass) {
+                if (~[VALUE, QUOTED].indexOf(scope.type)) {
+                    scope.isprop = isProperty();
+                }
+                else if (scope.type === SCOPED && scope.entry === '[') {
+                    if (queue.isObject) scope.isprop = isProperty();
+                    if (queue.isClass) scope.isprop = !last || last.isprop || last.type === STAMP && last.text === ';';
                 }
-                else if (queue.isClass) {
-                    scope.isprop = !last || last.type === STAMP && /^(\+\+|\-\-|;)$/.test(last.text)
+                else if (scope.type === STAMP) {
+                    scope.isprop = scope.text === "*" && isProperty();
+                }
+                else if (scope.type === PROPERTY) {
+                    scope.isprop = true;
                 }
             }
             if (scope.type !== COMMENT && scope.type !== SPACE) {
-                if (scope.type === PROPERTY || scope.isprop) scope.queue = queue;
+                Object.defineProperty(scope, 'queue', { value: queue });
+                if (scope.type === PROPERTY || scope.isprop);
                 else if (scope.type === STRAP && /^(get|set|static)$/.test(scope.text)) {
                     scope.type = EXPRESS;
                 }
@@ -395,8 +488,11 @@ class Javascript {
             else {
                 scope.prev = last;
             }
+            scope.row = row;
+            scope.col = scope.start - colstart;
             queue.push(scope);
         };
+        var row = 1, colstart = -1;
         var save = (type) => {
             if (lasttype === STAMP && type === STAMP && !/[,;\:\?]/.test(m)) {
                 var scope = queue[queue.length - 1];
@@ -437,19 +533,26 @@ class Javascript {
                     }
                     else if (isProperty()) type = PROPERTY;
                     else if (m === 'from') {
-                        if (!last || last.type === STRAP && last.text !== 'import') {
+                        if (!last || last.type === STRAP && !/^(im|ex)port$/.test(last.text)) {
                             type = EXPRESS;
                             break;
                         }
                         var temp = last;
-                        while (temp.type === EXPRESS || temp.type === VALUE || temp.type === SCOPED) {
-                            var prev = last.prev;
+                        while (temp.type === STAMP && temp.text === "*" || temp.type === EXPRESS || temp.type === VALUE || temp.type === SCOPED) {
+                            var prev = temp.prev;
                             if (!prev) break;
-                            if (prev.type !== STAMP || prev.text !== ',') break;
+                            if (prev.type === STRAP && prev.text === "as") {
+                                temp = prev.prev;
+                                continue;
+                            }
+                            if (prev.type !== STAMP || prev.text !== ',' && (prev.text !== "*" || !prev.prev || !~[STRAP, STAMP].indexOf(prev.prev.type))) {
+                                temp = prev;
+                                break;
+                            }
                             temp = prev.prev;
                             if (!temp) break;
                         }
-                        if (temp.type !== STRAP || temp.text !== 'import') {
+                        if (!temp || temp.type !== STRAP || !/^(im|ex)port$/.test(temp.text)) {
                             type = EXPRESS;
                         }
                     }
@@ -458,9 +561,9 @@ class Javascript {
                             type = EXPRESS;
                             break;
                         }
-                        if (~[EXPRESS, VALUE].indexOf(last.type)) {
-                            last.type = PROPERTY;
-                            last.queue = queue;
+                        if (~[PROPERTY, EXPRESS, VALUE].indexOf(last.type)
+                            || last.type === STAMP && last.text === "*" && last.prev && ~[STRAP, STAMP].indexOf(last.prev.type)) {
+                            Object.defineProperty(last, 'queue', { value: queue });
                         } else {
                             type = EXPRESS;
                         }
@@ -559,10 +662,14 @@ class Javascript {
             var prev = queue.lastUncomment;
             if (queue.isObject) {
                 if (!prev || prev.type === STAMP && prev.text === ",") return true;
+                if (prev.type === STAMP && prev.isprop) return true;
             }
             if (queue.isClass) {
                 if (!prev) return true;
-                if (prev.type === STAMP) return /^(\+\+|\-\-|;)$/.test(prev.text);
+                if (prev.type === STAMP) {
+                    if (prev.isprop) return true;
+                    return /^(\+\+|\-\-|;)$/.test(prev.text);
+                }
                 if (prev.type === EXPRESS && !/\.$/.test(prev.text)) return true;
                 if (~[SCOPED, VALUE, QUOTED, PROPERTY].indexOf(prev.type)) return true;
             }
@@ -570,6 +677,9 @@ class Javascript {
             if (prev.type === PROPERTY && /^(get|set|async|static)$/.test(prev.text)) {
                 return true;
             }
+            if (queue.prev && queue.prev.type === STRAP && queue.prev.text === 'export') {
+                if (prev.type === STRAP && prev.text === "as") return true;
+            }
             return false;
         };
 
@@ -671,7 +781,9 @@ class Javascript {
             }
             if (this.space_reg.test(m)) {
                 if (/[\r\n\u2028\u2029]/.test(m)) {
-                    m = m.replace(/^[^\r\n\u2028\u2029]+/, '').replace(/\r\n|\r|\n/g, "\r\n");
+                    colstart = match.index + 1;
+                    m = m.replace(/^[^\r\n\u2028\u2029]+/, '').replace(/\r\n|\r|\n|\u2028|\u2029/g, "\r\n");
+                    row += m.replace(/[^\r\n]+/, '').length >> 1;
                     save(SPACE);
                 }
                 lasttype = SPACE;
@@ -689,7 +801,36 @@ class Javascript {
                         queue.inExpress = false;
                     }
                 }
-                save(STRAP);
+                if (m === 'yield') {
+                    var temp = queue;
+                    var type = STRAP;
+                    while (temp) {
+                        if (temp.entry != "{" || !temp.prev || temp.prev.type !== SCOPED || temp.prev.entry !== '(') {
+                            temp = temp.queue;
+                            continue;
+                        }
+                        var pp = temp.prev.prev;
+                        var isprop = pp.isprop;
+                        if (pp && pp.type === EXPRESS || pp.isprop) pp = pp.prev;
+                        if (!pp || pp.type === STRAP && !/^function$/.test(pp.text)) {
+                            temp = temp.queue;
+                            continue;
+                        }
+                        if (pp.type === STAMP && pp.text === "*" && (pp.isprop || pp.prev && pp.prev.type === STRAP && pp.prev.text === "function")) {
+                            type = STRAP;
+                            break;
+                        }
+                        if (isprop || pp.type === STRAP && pp.text === "function") {
+                            type = EXPRESS;
+                            break;
+                        }
+                        temp = temp.queue;
+                    }
+                    save(type);
+                }
+                else {
+                    save(STRAP);
+                }
                 continue;
             }
             if (this.value_reg.test(m) || this.number_reg.test(m)) {
@@ -727,7 +868,8 @@ class Javascript {
                         else scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(last.text);
                     }
                     else if (last.type === STRAP) {
-                        if (queue[queue.length - 1].type === SPACE && last.text === 'return');
+                        if (queue[queue.length - 1].type === SPACE && /^(return|yield)$/.test(last.text));
+                        else if (/^export$/.test(last.text));
                         else scope.isObject = queue.inExpress;
                     }
                 }

package/coms/kugou/buildScroll.less

@@ -7,6 +7,9 @@
     top: 0;
     height: auto;
 }
+&+.titlebar>back{
+    height: 44px;
+}
 
 >png {
     width: 100%;

package/coms/zimoli/bggrid-func.less

@@ -0,0 +1,16 @@
+.grid() {
+    @mask-color1 : rgba(255, 255, 255, .6);
+    @mask-color2 : rgba(0, 0, 0, 0);
+    @mask-color3 : rgba(0, 0, 0, .1);
+    background-image:
+        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
+        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
+        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3),
+        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3);
+    background-size: 20px 20px;
+    background-position: 0 0, 10px 10px, 10px 0, 0 10px;
+    background-repeat: repeat;
+    background-clip: border-box;
+    background-color: #fff;
+
+}

package/coms/zimoli/color.js

@@ -215,14 +215,24 @@ function hsl2rgb([h, s, l]) {
 	var b = h - 1 / 3;
 	return [r, g, b].map(t => t2rgb(t, p, q));
 }
+function percent(a) {
+	if (/%$/.test(a)) {
+		a = a.replace(/%$/, '') / 100;
+	}
+	return +a;
+}
 function parse(color) {
 	if (hslReg.test(color)) {
 		var [_, H, S, L, a] = hslReg.exec(color);
+		H = parseFloat(H);
+		S = percent(S);
+		L = percent(L);
+		a = percent(a);
 		[R, G, B] = hsl2rgb([H, S, L]);
 		return [R, G, B, a || 1];
 	} else if (rgbReg.test(color)) {
 		var [_, R, G, B, a] = rgbReg.exec(color);
-		return [R > 255 ? 255 : R, G > 255 ? 255 : G, B > 255 ? 255 : B, a || 1];
+		return [R > 255 ? 255 : +R, G > 255 ? 255 : +G, B > 255 ? 255 : +B, a ? +a : 1];
 	} else if (rgbHex.test(color)) {
 		var [_, R, G, B, A] = rgbHex.exec(color).map(a => parseInt(a + a, 16));
 		return [R, G, B, A >= 0 ? A / 0xff : 1];
@@ -234,6 +244,10 @@ function parse(color) {
 function stringify(color) {
 	var [R, G, B, a] = color;
 	if (a >= 0 && a < 1) {
+		R = R.toFixed();
+		G = G.toFixed();
+		B = B.toFixed();
+		a = +a.toFixed(3);
 		return `rgba(${R},${G},${B},${a})`;
 	} else {
 		return "#" + [R, G, B].map(hex256).join("");
@@ -291,12 +305,12 @@ function equal(c1, c2) {
 	var [r2, g2, b2, a2] = parse(c2);
 	return abs(r1 - r2) < 1 && abs(g1 - g2) < 1 && abs(b1 - b2) < 1 && abs(a1 - a2) < .01;
 }
-var hslReg = /^hsla?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)(?:,\s*([\d\.]+))?\)$/i;
-var rgbReg = /^rgba?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)(?:,\s*([\d\.]+))?\)$/i;
+var hslReg = /^hsla?\s*\(\s*([\d\.]+(?:deg)?)\s*[,\s]\s*([\d\.]+%?)\s*[,\s]\s*([\d\.]+%?)(?:[,\/\s]\s*([\d\.]+%?))?\)$/i;
+var rgbReg = /^rgba?\s*\(\s*([\d\.]+)\s*[,\s]\s*([\d\.]+)\s*[,\s]\s*([\d\.]+)(?:[,\s]\s*([\d\.]+))?\)$/i;
 var rgbHex = /^#([\da-f])([\da-f])([\da-f])([\da-f])?$/i;
 var rgbHex2 = /^#([\da-f]{2})([\da-f]{2})([\da-f]{2})([\da-f]{2})?$/i;
 var rotated_base_color = "#d16969";
-var colorReg = /rgba?\s*\([\,\.\d]+\)|#[\da-f]{3,8}/ig;
+var colorReg = /(?:rgb|hsl)a?\s*\([\,\.\d\s%]+\)|#[\da-f]{3,8}/ig;
 function isColor(text) {
 	return rgbReg.test(text) || rgbHex.test(text) || rgbHex2.test(text) || hslReg.test(text);
 }

package/coms/zimoli/colorlabel.js

@@ -1,6 +1,7 @@
 function main(elem = div()) {
-    care(elem, function (color) {
-        css(this, 'background', color);
+    care(elem, function (c) {
+        css(this, 'background-color', c);
+        css(this, 'color', color.pair(c));
     });
     return elem;
 }

package/coms/zimoli/colorlabel.less

@@ -1,7 +1,28 @@
 & {
-    width: 40px;
+    width: 180px;
     height: 20px;
-    background: #ccc;
     display: inline-block;
+    text-align: center;
+    font-size: 10px;
+    line-height: 20px;
+    position: relative;
+    .grid();
+    background-color: transparent;
 
-}
+    >option {
+        position: relative;
+    }
+
+    &:before {
+        position: absolute;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        content: "";
+        display: block;
+        background-color: inherit;
+    }
+}
+
+@import "./bggrid-func.less";

package/coms/zimoli/colorpad.html

@@ -7,6 +7,10 @@
     <canvas></canvas>
     <pointer tabindex="-1"></pointer>
 </div>
+<div class="opa">
+    <canvas></canvas>
+    <pointer tabindex="-1"></pointer>
+</div>
 <div class="val">
     <input class="hex" />
     <input class="rgb" />