efront 3.24.2 → 3.24.7

package/apps/kugou/main.js

@@ -1,6 +1,4 @@
-init('/api',function(jsondata){
-    data.setConfig(jsondata);
-});
+data.setConfig(api);
 zimoli.switch("", null, "/home");
 css("body", "background-color:#f2f4f6;");
 zimoli();

package/coms/basic/assert.js

@@ -1,3 +1,4 @@
+var mark = require("./mark");
 var dump = function (a, msg) {
     if (a instanceof Object) console.error('对象的属性不符合'), console.log(msg ? msg + " " : "  ", a);
     else if (msg) console.error(msg + ":", a);
@@ -8,10 +9,17 @@ var assert = function (result, expect, log = dump) {
     var collect = function (k, args) {
         hasCollect = true;
         if (args) return function () {
-            errors = `Except (${args}) to be ${JSON.stringify(k)}`;
+            errors = `结果 (${args}) 应为 ${JSON.stringify(k)}`;
         }
         if (k === undefined) return function () {
-            errors = `Except ${result} to be ${expect}`;
+            var color1 = "bgred";
+            var color2 = "bgblue";
+            mark.setTag1(` </${color1}>`, `<${color1}>`);
+            mark.setTag2(` </${color2}>`, `<${color2}>`);
+            var [r, e] = mark.pair(result, expect);
+            r = String(r).trim();
+            e = String(e).trim();
+            errors = `<cyan>结果  </cyan><${color1}>${r}</${color1}>\r\n      <cyan>应为  </cyan><${color2}>${e}</${color2}>\r\n`;
         };
         return function (error) {
             if (error instanceof Object) {

package/coms/basic/extends_.js

@@ -0,0 +1,13 @@
+var __static = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function (d, b) {
+    d.__proto__ = b;
+} || extend;
+var setConstructor = Object.defineProperty ? function (a, c) {
+    Object.defineProperty(a, "constructor", { value: c });
+} : function (a, c) {
+    a.constructor = c;
+};
+// class A extends B {}
+function extends_(A, B) {
+    __static(A, B);
+    A.prototype = B === null ? Object.create(null) : new (_ = function () { setConstructor(this, A) }, _.prototype = B.prototype, _);
+}

package/coms/basic/loader.js

@@ -59,7 +59,9 @@ var request = window.request || function (url, onload, onerror, version) {
 var loadingTree = {};
 var responseTree = {};
 var versionTree = {};
-
+var isThenable = function (a) {
+    return a && a.then instanceof Function;
+};
 var keyprefix = "";
 var flushTree = function (tree, key, res) {
     var response = tree[key];
@@ -138,7 +140,7 @@ var readFile = function (names, then) {
         }
     };
     var oh = function (e) {
-        if (!isProduction) {
+        if (isProduction) {
             if (errorcount < 2) {
                 errorcount++;
                 setTimeout(tryload, 200 + 1000 * errorcount);
@@ -166,6 +168,7 @@ var killCircle = function () {
         if (k.slice(0, keyprefix.length) === keyprefix && loadedModules[k] instanceof Array) {
             var key = k.slice(keyprefix.length);
             var args = loadedModules[k].args;
+            if (loadedModules[k] instanceof Array) continue;
             args.forEach(arg => {
                 if (!penddings[arg]) {
                     penddings[arg] = [];
@@ -239,6 +242,7 @@ var loadModule = function (name, then, prebuilds = {}) {
         return;
     }
     if (loadedModules[key] instanceof Array) {
+        if (loadedModules[key].error) return then(key);
         loadedModules[key].push(then);
         return;
     }
@@ -286,16 +290,19 @@ var loadModule = function (name, then, prebuilds = {}) {
             mod.required = required;
             mod.file = name;
             args = args.concat(required);
-            var errored = 0;
-            // console.log(args);
+            var _errored = 0;
             var response = function (error) {
                 loadingCount++;
                 if (error) {
-                    errored += error;
+                    if (!errored[error]) {
+                        errored[error] = [];
+                    }
+                    errored[error].push(key);
+                    _errored++;
                 }
                 if (loadingCount === args.length) {
-                    if (errored) {
-                        loadedModules[key].error = errored;
+                    if (_errored.length) {
+                        loadedModules[key].error = true;
                     }
                     flushTree(loadedModules, key, mod);
                 }
@@ -507,10 +514,7 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
             }
             return exec.apply(_this, requires.map(a => init(a)));
         };
-        var _ok, result, created;
-        var promise = new Promise(function (ok) {
-            _ok = ok;
-        });
+        var result, created;
         if (prebuilds.init) {
             var prebuilds2 = Object.create(null);
             for (var k in prebuilds) prebuilds2[k] = prebuilds[k];
@@ -519,17 +523,16 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
             delete prebuilds.action;
             delete prebuilds.init;
         }
-        init(argName, function (res) {
+        var promise = init(argName, function (res) {
             result = res;
             created = true;
-            _ok(res);
         }, prebuilds);
         if (created) return result;
         return promise;
     });
 
     var _this = isModuleInit ? exports : window;
-    var argsPromises = argsList.filter(a => a instanceof Promise);
+    var argsPromises = argsList.filter(isThenable);
     argsList = argsList.concat(exec.strs);
     argsList.push(compiledNames || []);
     if (!argsPromises.length) {
@@ -584,13 +587,15 @@ var init = function (name, then, prebuilds) {
     };
     then = function (created) {
         if (res.resolved || res.errored) return;
-        if (Promise && created instanceof Promise) return created.then(then, crack);
+        if (isThenable(created)) return created.then(then, crack);
         res.resolved = true;
         res.result = created;
         res.fire();
     };
     var crack = function (error) {
         if (res.resolved || res.errored) return;
+        var ed = errored[name];
+        console.error(`加载${name}失败，${ed && ed.length ? `${ed.join(', ')} 等${ed.length}个模块` : "没有其他模块"}受到影响`);
         res.errored = true;
         res.error = error;
         res.fire();
@@ -627,7 +632,7 @@ var init = function (name, then, prebuilds) {
             }
         }
         var created = createModule(module, args, module.argNames, prebuilds);
-        if (created instanceof Promise) {
+        if (isThenable(created)) {
             if (saveAsModule) {
                 penddings[key] = created;
                 created.then(function (res) {
@@ -829,7 +834,7 @@ var loadResponseTreeFromStorage = function () {
 var preLoad = function () { };
 
 var start_time = +new Date / 1000 | 0;
-
+var errored = {};
 var modules = {
     isProduction,
     undefined: void 0,

package/coms/basic/mark.js

@@ -0,0 +1,155 @@
+var couple = function (source, marker) {
+    var len1 = source.length;
+    var len2 = marker.length;
+    var match = "", begin1 = len1, begin2 = len2;
+    for (var cx = -len1, dx = len2; cx < dx; cx++) {
+        var c1 = cx >= 0 ? 0 : -cx;
+        var c2 = cx >= 0 ? cx : 0;
+        var d1 = len1 - c1;
+        var d2 = len2 - c2;
+        var start = 0, end = 0;
+        for (var ct = 0, dt = d1 > d2 ? d2 : d1; ct < dt; ct++) {
+            if (source[c1 + ct] === marker[c2 + ct]) {
+                end = ct + 1;
+                if (end === dt && end - start > match.length) {
+                    match = source.slice(c1 + start, c1 + end);
+                    begin1 = c1 + start;
+                    begin2 = c2 + start;
+                }
+            } else {
+                if (end - start > match.length) {
+                    match = source.slice(c1 + start, c1 + end);
+                    begin1 = c1 + start;
+                    begin2 = c2 + start;
+                }
+                start = ct + 1;
+            }
+        }
+    }
+    return [match, begin1, begin2];
+};
+var MARK_PRE1, MARK_PRE2, _PRE1, _PRE2 = _PRE1 = "<b>";
+var MARK_AFT1, MARK_AFT2, _AFT1, _AFT2 = _AFT1 = "</b>";
+var mark = function (source, search) {
+    return power(source, search)[1];
+};
+var pair = function (source, search, t1, t2, t3, t4) {
+    switch (arguments.length) {
+        case 2:
+            break;
+        case 4:
+            setTag1(t1, t2);
+            setTag2(t1, t2);
+            break;
+        case 6:
+            setTag1(t1, t2);
+            setTag2(t3, t4);
+            break;
+    }
+    return power2(source, search);
+}
+var power = function (source, search) {
+    if (!search || !source) {
+        return [0, source];
+    }
+    var matchers = couple(source, search);
+    var match_text = matchers[0];
+    var match_start2 = matchers[1];
+    if (search.length === 1) {
+        var p = 0;
+        var res = source.replace(new RegExp(search.replace(/[\\\*\?\+\(\)\[]/g, "\\$&"), "g"), () => {
+            if (!p) p = 1;
+            return MARK_PRE1 + search + MARK_AFT1;
+        });
+        return [p, res];
+    }
+    if (match_text.length > 1) {
+        var match_text_pre = source.slice(0, match_start2);
+        var match_text_aft = source.slice(match_start2 + match_text.length);
+        var pp = 0, ap = 0;
+        var p = match_text.length;
+        if (match_text_pre.length) p += .1 / match_text_pre.length - .2;
+        if (match_text_aft.length) p += .1 / match_text_aft.length - .1;
+        if (match_text_pre.length > 1) {
+            [pp, match_text_pre] = power(match_text_pre, search);
+        }
+        if (match_text_aft.length > 1) {
+            [ap, match_text_aft] = power(match_text_aft, search);
+        }
+        p += (pp + ap) * .01;
+        return [p, match_text_pre.concat(MARK_PRE1, match_text, MARK_AFT1, match_text_aft)];
+    }
+    return [0, source];
+};
+
+
+var power2 = function (src1, src2) {
+
+    if (!src2 || !src1) {
+        return [src1, src2, 0];
+    }
+    var matchers = couple(src1, src2);
+    var [match_text, match_start1, match_start2] = matchers;
+    if (match_text.length > 0) {
+        var src1_pre = src1.slice(0, match_start1);
+        var src1_aft = src1.slice(match_start1 + match_text.length);
+        var src2_pre = src2.slice(0, match_start2);
+        var src2_aft = src2.slice(match_start2 + match_text.length);
+        var pp = 0, ap = 0;
+        var p = match_text.length;
+        if (src1_pre.length) p += .1 / src1_pre.length - .2;
+        if (src1_aft.length) p += .1 / src1_aft.length - .1;
+        if (src1_pre.length > 0 && src2_pre.length > 0) {
+            [src1_pre, src2_pre, pp] = power2(src1_pre, src2_pre);
+        }
+        if (src1_aft.length > 0 && src2_aft.length > 0) {
+            [src1_aft, src2_aft, ap] = power2(src1_aft, src2_aft);
+        }
+        p += (pp + ap) * .01;
+        return [
+            src1_pre.concat(MARK_PRE1, match_text, MARK_AFT1, src1_aft),
+            src2_pre.concat(MARK_PRE2, match_text, MARK_AFT2, src2_aft),
+            p
+        ];
+    }
+    return [src1, src2, 0];
+
+};
+
+
+var setTag1 = function (pre, aft) {
+    if (arguments.length === 1) {
+        if (pre instanceof Array) {
+            [pre, aft] = pre;
+        }
+        else {
+            pre.replace(/^<|>$/g, '');
+            pre = `<${pre}>`;
+            aft = `</${pre}>`;
+        }
+    }
+    MARK_PRE1 = pre;
+    MARK_AFT1 = aft;
+};
+var setTag2 = function (pre = _PRE2, aft = _AFT2) {
+    if (arguments.length === 1) {
+        if (pre instanceof Array) {
+            [pre, aft] = pre;
+        }
+        else {
+            pre.replace(/^<|>$/g, '');
+            pre = `<${pre}>;`
+            aft = `</${pre}>`;
+        }
+    }
+    MARK_PRE2 = pre;
+    MARK_AFT2 = aft;
+};
+setTag1(_PRE1, _AFT1);
+setTag2(_PRE2, _AFT2);
+mark.setTag1 = setTag1;
+mark.setTag2 = setTag2;
+mark.power = power;
+mark.power2 = power2;
+mark.pair = pair;
+mark.couple = couple;

package/coms/basic/queue.js

@@ -1,11 +1,11 @@
 "use strict";
 function queue(list, count = 1, context = null) {
     var f = this;
-    if (list instanceof Function) {
+    if (isFunction(list)) {
         f = list;
         list = this;
     }
-    if (count instanceof Object) {
+    if (isObject(count)) {
         let temp = count;
         count = context || temp;
         context = temp;
@@ -13,39 +13,36 @@ function queue(list, count = 1, context = null) {
     return new Promise(function (ok, oh) {
         var cx = 0;
         var result = [];
-        var loaded_count = 0;
+        var promised = false;
         var error_count = 0;
         var reject = function (e) {
             error_count++;
             oh(e);
         };
         var next = function () {
-            loaded_count++;
             run();
         };
         var run = function () {
-            if (error_count && count === 1) return;
-            if (cx >= list.length) return Promise.all(result).then(ok, oh);
+            if (error_count && count === 1) return promised = null;
+            if (cx >= list.length) return promised = null, count = 0, Promise.all(result).then(ok, oh);
             var saved_cx = cx;
             var args = list[cx];
             try {
                 result[saved_cx] = f.call(context, args, cx++, list);
             } catch (e) {
                 oh(e);
-                return;
+                return promised = null;
             }
-            Promise.resolve(result[saved_cx]).then(next, reject);
+            if (promised === false && (!result[saved_cx] || !isFunction(result[saved_cx].then))) count++;
+            else Promise.resolve(result[saved_cx]).then(next, reject), promised = true;
         };
-        if (count > list.length >> 1) {
-            count = list.length >> 1;
+        if (count > list.length) {
+            count = list.length;
         }
         if (!(count >= 1)) {
             count = 1;
         }
-        if (list.length === 0) run();
-        else while (cx < count) {
-            run();
-        }
+        while (count-- > 0) run();
     });
 }
 module.exports = queue;

package/coms/basic/rest_.js

@@ -0,0 +1,27 @@
+/**
+ * {a:b,c:d, ...z} = o;
+ * params (o , [a,c])
+ * return z
+ */
+function rest_(o, keys) {
+    var hasOwnProperty = Object.prototype.hasOwnProperty;
+    var propertyIsEnumerable = Object.prototype.propertyIsEnumerable;
+    var map = Object.create(null);
+    for (var k of keys) map[k] = true;
+    var res = Object.create(null);
+    for (var k in o) {
+        if (hasOwnProperty.call(o, k)) {
+            if (k in map) continue;
+            res[k] = o[k];
+        }
+    }
+    if (typeof Object.getOwnPropertySymbols === 'function') {
+        for (var k of Object.getOwnPropertySymbols(o)) {
+            if (propertyIsEnumerable.call(o, k)) {
+                if (k in map) continue;
+                res[k] = o[k];
+            }
+        }
+    }
+    return res;
+}

package/coms/basic/submit_.js

@@ -24,10 +24,12 @@ function submit(fields, data) {
             var tmp = /\:(\d+)?(?:\.(\d+))?$/.exec(f.type);
             if (tmp) var [, , fixed] = tmp;
             else if (/^(money|price)$/i.test(f.type)) fixed = 2;
+            else fixed = undefined;
             fixed = +fixed;
             if (fixed) {
                 var v = params[f.key];
-                if (v) {
+                if (!isEmpty(v)) {
+                    v = String(v);
                     var d = v.replace(/^[^\.]*\.?/, '').length;
                     if (d === v.length - 1) v = "0" + v;
                     if (d > 0 && d < fixed) {

package/{apps → coms}/kugou/api.js

@@ -3,6 +3,8 @@
         "song-info": "get                                 app/i/getSongInfo.php?cmd=playInfo&from=mkugou&hash",
         "slider-src": "get:[].mod-slider>.swipe-wrap>div  .#src=img!src&href=a!href",
         "songs-list": "get:[].panel-songslist%20li          .#hash=!id&.panel-songs-item-name>span!innerText",
+        "songs-list": "get:[].m_cm_item1warp:nth-child(2)>div .#=a!href\\song-mix&a:nth-child(2)>p:first-child!innerText&singer=a:nth-child(2)>p:nth-child(2)!innerText&imgurl=img!_src",
+        "song-mix;": "mget:script:nth-last-child(2)           mixsong/:hashid.html",
         "rank-list": "get:[].panel-img-list%20li            rank/list#href=a!href&=a!href\\rank-info&imgurl=img!_src&name=p|innerText",
         "rank-info": "get:[].panel-songslist%20li           rank/info/:id#src=!id&name=.panel-songs-item-name|innerText&data=.panel-songs-item-download/innerText",
         "plist-index": "get:[].panel-img-list%20li          plist/index#href=a!href&=a!href\\plist-info&imgurl=img!_src&name=.panel-img-content-first|innerText&count=.panel-img-content-sub|innerText",

package/coms/kugou/buildList.js

@@ -7,7 +7,13 @@ function main(dataid, datapath) {
         song,
         loading,
         musicList,
-        run(s) {
+        async run(s) {
+            if (!s.hash && s.hashid) {
+                await data.from("song-mix", s, function (a) {
+                    var m = a.innerText.match(/(['"`]?)hash\1\s*:\s*(["'`])(.*?)\2/);
+                    if (m) s.hash = m[3];
+                });
+            }
             if (s.hash) {
                 kugou$player.play(s.hash);
             } else {

package/coms/kugou/player.js

@@ -179,6 +179,7 @@ var $scope = {
             cast($scope.dance, buf);
         }
     },
+    playid: 0,
     play(hash = musicList.active_hash) {
         render.refresh();
         var isPlayback = typeof hash === "number";

package/coms/kugou/song.html

@@ -1,7 +1,7 @@
 <div class="bg"></div>
 <png class="logo" ng-if="song.imgurl" ng-src=song.imgurl></png>
+<div class="singer" ng-if="song.singer" ng-model=song.singerMarked></div>
 <div class="song" ng-model=song.songMarked></div>
-<div class="singer" ng-model=song.singerMarked></div>
 <div class="filterTime(song.timeLength)"></div>
 <div refresh class="play-state" ng-if="song.hash===musicList.active_hash" ng-class={error:playState.error}>
     <div ng-style="{width:playState.width}"></div>

package/coms/kugou/song.js

@@ -21,6 +21,7 @@ function main(elem) {
         $scope.song = {
             hash: item.hash,
             imgurl: item.imgurl,
+            singer: singerName,
             songMarked: mark(songName, elem.mark),
             singerMarked: mark(singerName, elem.mark)
         };

package/coms/kugou/song.less

@@ -24,16 +24,23 @@
     width: 40px;
     margin: -6px -4px;
 
+    &+.singer+.song,
     &+.song {
         margin-left: -38px;
         padding-left: 46px;
-        line-height: 30px;
         display: inline-block;
         vertical-align: top;
+
+    }
+
+    &+.singer {
+        padding-left: 46px;
     }
+
 }
 
 >.song {
+    line-height: 30px;
     width: 100%;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -56,6 +63,10 @@ b {
     line-height: 12px;
     font-size: 12px;
     color: #888;
+
+    &+.song {
+        padding-top: 8px;
+    }
 }
 
 >.play-state {

package/coms/zimoli/cloneVisible.js

@@ -88,6 +88,7 @@ var isMaybeVisible = function (node) {
     }
     if (node.offsetParent) {
         var parent = node.offsetParent;
+        if (!isMaybeVisible(parent)) return false;
         if (getComputedStyle(parent).overflow === 'visible') return true;
         return !(node.offsetLeft + node.offsetWidth - parent.scrollLeft <= parent.clientLeft ||
             node.offsetTop + node.offsetHeight - parent.scrollTop <= parent.clientTop ||

package/coms/zimoli/compile.js

@@ -1 +1,64 @@
-"use ../compile/compile.js"
+"use strict";
+var Scanner = function (dataString, syntax) {
+    this.source = dataString;
+    this.syntax = syntax.syntax;
+    this.entry = syntax.entry;
+    var Token = this.token = syntax.token;
+    var block = this.block = new Token(syntax.entry, 0);
+    block.scanner = this;
+    this.blocks = this.block.children = [];
+    this.source = dataString;
+}
+Scanner.prototype = {
+    scan(index = 0, type = this.entry, collection = this.blocks, parent = this.block) {
+        var regInfo = this.syntax[type];
+        var dataString = this.source;
+        var Block = this.token;
+        if (!regInfo) return index;
+        if (!(regInfo instanceof Array)) {
+            regInfo = [regInfo];
+        }
+        var reg = regInfo[0];
+        loop: while (index < dataString.length) {
+            reg.lastIndex = index;
+            var res = reg.exec(dataString, collection);
+            if (res) {
+                index = reg.lastIndex;
+                var inc = 0;
+                while (res[++inc] === undefined) {
+                    if (inc >= regInfo.length) break loop;
+                }
+                var matchType = regInfo[inc];
+                if (!matchType) continue;
+                var savedIndex = reg.lastIndex - res[inc].length;
+                var children = [];
+                var block = new Block(matchType, savedIndex);
+                block.parent = parent;
+                block.children = children;
+                block.root = this.block;
+                block.scanner = this;
+                index = this.scan(index, matchType, children, block);
+                if (collection && savedIndex < index) {
+                    if (collection.length) {
+                        var lastChild = collection[collection.length - 1];
+                        block.prev = lastChild;
+                        lastChild.next = block;
+                    }
+                    collection.push(block);
+                }
+                block.end = index;
+            } else if (/y/.test(reg.flags)) {
+                throw new Error(`unexcepted token ${dataString[index]}`);
+            } else {
+                index = dataString.length;
+            }
+        }
+        return index;
+    }
+}
+var scan = function (data, syntax) {
+    var scanner = new Scanner(data, syntax);
+    scanner.scan();
+    return scanner.blocks;
+};
+module.exports = scan;

package/coms/zimoli/data.js

@@ -268,8 +268,7 @@ function parseConfig(api) {
     var required = [];
     var prepared = [];
     var autotrim = false;
-
-    id = id.replace(/[\?\|\:;](.+?)$/, function (m, s) {
+    id = id.replace(/[\?\|\:;](.*?)$/, function (m, s) {
         autotrim = /^[\|;]/.test(m);
         if (/^[\|\/]/.test(s)) autotrim = true, s = s.slice(1);
         s = s.split('&');
@@ -709,6 +708,13 @@ var data = {
         data = this.parseConfig(data);
         configPormise = Promise.resolve(data);
     },
+    async addConfig(data) {
+        var p = configPormise;
+        var c = await p;
+        if (p !== configPormise) return;
+        data = this.parseConfig(data);
+        extend(c, data);
+    },
     getConfig() {
         return privates.getConfigPromise();
     },

package/coms/zimoli/input.js

@@ -67,10 +67,12 @@ var number = function (event) {
     }
 };
 var toFixed = function () {
-    if (this.value && this.fixed) var fixed = BigNumber.fix(this.value, this.fixed);
-    if (this.value !== fixed) {
-        this.value = fixed;
-        dispatch(this, 'change');
+    if (this.value && this.fixed) {
+        var fixed = BigNumber.fix(this.value, this.fixed);
+        if (this.value !== fixed) {
+            this.value = fixed;
+            dispatch(this, 'change');
+        }
     }
 };
 var positiveReg = /^\+|^positive\-?|\-?positive$|\+$/i;

package/coms/zimoli/render.js

@@ -631,7 +631,7 @@ function getFromScopes(key, scope, parentScopes) {
 
 function renderElement(element, scope = element.$scope, parentScopes = element.$parentScopes, once) {
     if (!isNode(element) && element.length) {
-        return Array.prototype.map.call(element, function (element) {
+        return Array.prototype.concat.apply([], element).map(function (element) {
             return renderElement(element, scope, parentScopes, once);
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.24.2",
+    "version": "3.24.7",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {