efront 3.25.7 → 3.25.11

package/apps/_index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />
-    <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width" />
+    <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width,user-scalable=no,initial-scale=1" />
     <title>efront 项目</title>
     <script deleteoncompile efrontloader>
         // 若要在开发环境使用内置组件，请保留此script标签中的代码，在编译发布时，这里的代码会自动删除

package/coms/basic/Item.js

@@ -1,5 +1,6 @@
 var id = 0;
 class Item extends Array {
+    extended = false;
     constructor(value) {
         super();
         this.children = this;
@@ -7,10 +8,11 @@ class Item extends Array {
         this.total = 0;//子项中的节点数
         this.crack = 0;
         this.id = ++id;
-        this.extends(value);
+        this.extends(value, false);
     }
-    extends(value) {
-        if (value instanceof Item) this.value = value.value;
+    extends(value, mark) {
+        this.extended = mark !== false;
+        if (value && value.constructor === Item) this.value = value.value;
         else this.value = value;
         if (value.children instanceof Array) {
             var children = value.children.map(item => new Item(item));
@@ -33,6 +35,14 @@ class Item extends Array {
             this.tab = 1;
         }
     }
+    get disabled() {
+        if (isObject(this.value)) return this.value.disabled || this.value.enabled === false;
+
+        return false;
+    }
+    get hotkey() {
+        if (isObject(this.value)) return this.value.hotkey;
+    }
 
     valueOf() {
         return this.value;

package/coms/basic/Speed.js

@@ -1,40 +1,46 @@
 function inertia(gun) {
-    var _decreased = 0, spd = new Speed;
+    var spd = new Speed;
+    var animateIndex = 0;
+    var lastTime = 0;
     var _decrease = function () {
+        lastTime = Speed.now() - 1;
+        _decrease0();
+    }
+    var _decrease0 = function () {
         if (
             decrease instanceof Function
         ) {
-            if (!spd.length || _decreased > 0 && spd.filter(a => a !== 0).length === 0) return;
+            if (!spd.length) return;
             var id = smooth_timer;
-            var res = decrease(_decreased++, spd);
+            var now = Speed.now();
+            var res = decrease(now - lastTime, spd);
+            lastTime = now;
             if (smooth_timer !== id) return;
             if (res === false || isEmpty(res)) {
                 spd.unset();
+                animateIndex = 0;
                 return;
             }
-            smooth_timer = requestAnimationFrame(_decrease);
+            smooth_timer = requestAnimationFrame(_decrease0);
         }
     };
     var _cancel = function () {
         cancelAnimationFrame(smooth_timer);
-        _decreased = 0;
         decrease = null;
     }
     var smooth = function () {
         var args = spd.read();
-        if (decrease && args.filter(a => Math.abs(a) > 2).length === 0) {
-            _decrease();
-            return;
-        }
-        if (args.filter(a => Math.abs(a) > .5).length === 0) {
-            spd.reset();
-            return;
-        }
         var id = smooth_timer;
         var res = gun.apply(that, args);
         if (id !== smooth_timer) return;
         if (false === res) {
             spd.reset();
+            animateIndex = 2;
+            smooth_timer = requestAnimationFrame(_decrease);
+            return;
+        }
+        if (decrease && args.filter(a => Math.abs(a) > 1).length === 0) {
+            animateIndex = 2;
             smooth_timer = requestAnimationFrame(_decrease);
             return;
         }
@@ -42,6 +48,7 @@ function inertia(gun) {
     };
     var spd, smooth_timer, that, decrease;
     var train = function () {
+        animateIndex = 1;
         _cancel();
         var args = [].slice.call(arguments, 0, arguments.length);
         spd.write(args);
@@ -51,7 +58,12 @@ function inertia(gun) {
     train.smooth = function (d) {
         _cancel();
         decrease = d;
-        smooth_timer = requestAnimationFrame(smooth);
+        if (animateIndex === 1) {
+            smooth_timer = requestAnimationFrame(smooth);
+        }
+        else if (animateIndex === 2) {
+            smooth_timer = requestAnimationFrame(_decrease);
+        }
     };
     train.reset = function () {
         _cancel();
@@ -63,6 +75,7 @@ function inertia(gun) {
 class Speed extends Array {
     cache = [];
     stamp = 0;
+    deltat = 0;
     static now() {
         return performance.now ? performance.now() : Date.now();
     }
@@ -103,20 +116,26 @@ class Speed extends Array {
         if (this.stamp) ratio = now - this.stamp;
         else ratio = deltat;
         if (ratio > 160) ratio = 1e-3;
+        if (this.deltat) {
+            if (deltat > this.deltat * 10) {
+                ratio = 1e-3;
+            }
+        }
+        this.deltat = deltat;
         this.stamp = now;
         var sum = 0;
         for (var v of values) sum += v * v;
         v = Math.sqrt(sum) * ratio;
         if (v > 1) {
-            v = Math.sqrt(v * (v - 1)) / v;
+            v = Math.sqrt(v * (v - .996)) / v;
         }
         else {
-            v = 1e-7;
+            v = .9;
         }
         var r = ratio * v;
         for (var cx = 0, dx = values.length; cx < dx; cx++) {
             values[cx] *= r;
-            this[cx] *= v;
+            if (Math.abs(this[cx]) > .1) this[cx] *= v;
         }
         return values;
     }

package/coms/basic/Tree.js

@@ -6,7 +6,7 @@ class Tree extends Array {
     count = 0;
     total = 0;
     constructor(src) {
-        if (src instanceof Tree) return src;
+        if (src && src.coustructor === Tree) return src;
         if (src instanceof Array && src[0] && ('tab' in src[0] || 'deep' in src[0])) {
             return Tree.fromArray(src);
         }
@@ -20,7 +20,7 @@ class Tree extends Array {
         this.root = this;
     }
     static fromData(array) {
-        if (array instanceof Tree) return array;
+        if (array && array.coustructor === Tree) return array;
         var root = new Tree;
         root.tab = -Infinity;
         root.count = 0;
@@ -82,7 +82,7 @@ class Tree extends Array {
         return root;
     }
     static fromArray(array) {
-        if (array instanceof Tree) return array;
+        if (array && array.constructor === Tree) return array;
         var root = new Tree;
         root.tab = -Infinity;
         root.count = 0;
@@ -162,7 +162,7 @@ class Tree extends Array {
         var datas = [];
         for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
             var arg = arguments[cx];
-            if (arg instanceof Item) datas.push(arg);
+            if (arg && arg.constructor === Item) datas.push(arg);
             else if (arg instanceof Array) datas.push.apply(datas, arg);
             else datas.push(arg);
         }

package/coms/{zimoli → basic}/cancelAnimationFrame.js

@@ -1,3 +1,4 @@
+var window = this;
 var cancelAnimationFrame = window.cancelAnimationFrame || window.mozCancelAnimationFrame || window.webkitCancelAnimationFrame || window.msCancelAnimationFrame || function (id) {
     return clearTimeout(id);
 };

package/coms/basic/lazy.js

@@ -2,25 +2,35 @@
 // 2.如果time小于0，传入的函数会立即执行，并忽略-time内的连续调用，time时间后触发最后一次调用
 // 如果time传false或0 使用requestAnimationFrame代替setTimeout按第1步执行
 // 如果time传null或undefined或NaN使用requestAnimationFrame代替setTimeout按第2步执行
-function lazy(run, time) {
+
+/**
+ * @param {Function} run 主程序
+ * @param {number|undefined} time 间隔
+ * @param {any} ret 指定调用结束后返回的结果
+ */
+
+function lazy(run, time, ret) {
     var wait = +time ? setTimeout : requestAnimationFrame;
-    var ing, args, that;
+    var quit = wait === setTimeout ? clearTimeout : cancelAnimationFrame;
+    var ing, args, that, id;
     var hire = function () {
+        if (!ing) return;
         if (time >= 0) {
-            if (ing === true) ing = wait(fire, +time / 2);
-            else wait(fire, +time / 2), ing = -2;
+            if (ing === true) id = ing = wait(fire, +time / 2);
+            else id = wait(fire, +time / 2), ing = -2;
         }
         else {
-            wait(fire, -time);
+            id = wait(fire, -time);
         }
     };
     var fire = function () {
+        if (!ing) return;
         if (time >= 0) {
             if (ing === true) {
-                ing = wait(fire, +time / 2);
+                id = ing = wait(fire, +time / 2);
             }
             else if (ing > 0) {
-                wait(fire, +time / 2);
+                id = wait(fire, +time / 2);
                 ing = -1;
             }
             else if (ing === -1) {
@@ -36,27 +46,34 @@ function lazy(run, time) {
             if (ing === true) {
                 ing = run.apply(that, args);
                 if (ing instanceof Promise) ing.then(hire, hire);
-                else ing = wait(fire, -time);
+                else id = ing = wait(fire, -time);
             } else {
                 ing = false;
             }
         }
     };
-    return function () {
+    var exec = function () {
         args = arguments;
         that = this;
         if (ing) return ing = true;
         if (time >= 0) {
-            ing = wait(fire, +time);
+            id = ing = wait(fire, +time);
         }
         else if (time < 0) {
             ing = run.apply(that, args);
             if (ing instanceof Promise) ing.then(hire, hire);
-            else ing = wait(fire, -time);
+            else id = ing = wait(fire, -time);
         }
         else {
-            ing = true; wait(fire);
+            ing = true; id = wait(fire);
         }
+        return ret;
     };
+    exec.cancel = function () {
+        quit(id);
+        ing = false;
+        id = 0;
+    };
+    return exec;
 }
 module.exports = lazy;

package/coms/basic/loader.js

@@ -40,6 +40,7 @@ if (PREVENT_FRAMEWORK_MODE !== false) {
         return;
     }
 }
+var efront_time = +new Date;
 var _devicePixelRatio = devicePixelRatio;
 var request = window.request || function (url, onload, onerror, version) {
     var xhr = new (XMLHttpRequest || ActiveXObject)("Microsoft.XMLHTTP");
@@ -168,7 +169,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;
+            if (!(loadedModules[k] instanceof Array)) continue;
             args.forEach(arg => {
                 if (!penddings[arg]) {
                     penddings[arg] = [];
@@ -653,12 +654,7 @@ var removeGlobalProperty = function (property) {
 };
 
 var renderPixelRatio = !/win/i.test(navigator.platform) && devicePixelRatio > 1 && window.innerWidth > 360 && window.innerHeight > 360 ? .86 : .75;
-if (document.querySelector && devicePixelRatio > 1 && /Linux/.test(navigator.platform) && navigator.maxTouchPoints > 0) {
-    let ratio = +(1000000 / devicePixelRatio + .5 | 0) / 1000000;
-    document.querySelector("meta[name=viewport]").setAttribute("content", `width=device-width,target-densitydpi=device-dpi,user-scalable=no,initial-scale=1,maximum-scale=${ratio}`);
-    renderPixelRatio *= devicePixelRatio;
-    devicePixelRatio = 1;
-}
+
 var initPixelDecoder = function () {
     if (pixelDecoder instanceof Function) {
         modules.fromPixel = pixelDecoder;
@@ -832,8 +828,7 @@ var loadResponseTreeFromStorage = function () {
     };
 };
 var preLoad = function () { };
-
-var start_time = +new Date / 1000 | 0;
+var start_time = efront_time / 1000 | 0;
 var errored = {};
 var modules = {
     isProduction,
@@ -868,6 +863,14 @@ var hook = function (requires_count) {
     modules.Promise = Promise;
     modules.hook_time = +new Date;
     if (!efrontPath) efrontPath = document.body.getAttribute("main-path") || document.body.getAttribute("path") || document.body.getAttribute("main") || "zimoli";
+    if (modules.hook_time - efront_time < (isProduction ? 30 : 5) && document.querySelector && devicePixelRatio > 1 && /Linux/.test(navigator.platform) && navigator.maxTouchPoints > 0) {
+        let ratio = +(1000000 / devicePixelRatio + .5 | 0) / 1000000;
+        document.querySelector("meta[name=viewport]").setAttribute("content", `width=device-width,target-densitydpi=device-dpi,user-scalable=no,initial-scale=1,maximum-scale=${ratio}`);
+        renderPixelRatio *= devicePixelRatio;
+        modules.renderPixelRatio = renderPixelRatio;
+        devicePixelRatio = modules.devicePixelRatio = 1;
+    }
+
     init(efrontPath, function (zimoli) {
         if (zimoli instanceof Function) zimoli();
     });

package/coms/basic/mark.js

@@ -69,7 +69,7 @@ var power = function (source, search) {
         var pp = 0, ap = 0;
         var p = match_text.length;
         p = match_text.length;
-        if (match_start2) p += .1 / match_start2;
+        if (match_start2) p += .1 / match_start2 - .2;
         if (match_text_pre.length > 1) {
             [pp, match_text_pre] = power(match_text_pre, search);
         }

package/coms/basic/mark_test.js

@@ -0,0 +1,7 @@
+var test = function (t1, t2) {
+    var a = mark.power(t1, t2)
+    console.log(t1, t2, a);
+}
+test("11234", '1234');
+test("1234", '1234');
+

package/coms/basic/renderExpress.js

@@ -11,8 +11,8 @@ function createSeek(express) {
     return dist;
 }
 function main(express) {
-    if (!/\?\s*\.(?=[^\d])|\?$/.test(express)) return express;
-    var reg = /\\[\s\S]|\?\s*(\.(?!\d)|\s*$)|[\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\[\]\(\)'"`\s]/g;
+    if (!/\?\s*\.(?=[^\d])|\?\s*[\?\]\}\)\:\,=|%&;\>\<]|\?\s*$/.test(express)) return express;
+    var reg = /\\[\s\S]|\?\s*(\.(?!\d)|$|(?=[\?\]\}\)\:\,=|%&;\>\<\*\/]))|[\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\[\]\(\)'"`\s]/g;
     var cache = [], queue = [];
     var exp = [];
     var instr = false;
@@ -71,7 +71,7 @@ function main(express) {
         if (instr) {
             continue;
         }
-        if (/['"`\/\s]/.test(m)) {
+        if (/['"`\/]/.test(m)) {
             isstr = true;
             index++;
         }

package/coms/frame/route.js

@@ -27,14 +27,17 @@
         if (/,/.test(k)) {
             var [k, ...roles] = k.split(',');
         }
-        if (!icon && /\s+|\./.test(k)) {
+        if (!icon && /(?!\.)\.(?=[\w\-])/.test(k)) {
+            icon = k.slice(k.indexOf(/(?!\.)\.(?=[\w\-])/));
+        }
+        if (!icon && /\s+/.test(k)) {
             [icon] = k.split(/\s+/);
             k = k.slice(icon.length).trim();
         }
         if (!name) name = k;
         var item = {};
         if (icon) item.icon = icon.replace(/\./g, ' ');
-        if (name) item.name = name;
+        item.name = name;
         if (hotkey) {
             hotkey = hotkey.split(',');
             for (var k of hotkey) {
@@ -108,6 +111,8 @@
                 if (path) item.path = path;
                 if (data) item.params = parseKV(data);
                 item.closed = true;
+                if (filter) var item0 = filter(item);
+                if (item0) item = item0;
                 return item;
             });
             return items;
@@ -231,10 +236,14 @@
         result.then = then;
         return result;
     };
-    result.parse = function (items) {
+    var filter = null;
+    result.parse = function (items, f) {
+        filter = f;
         keymap = {};
         items = parseMenuList(items);
         items.keymap = keymap;
+        filter = null;
+        keymap = null;
         return items;
     };
     var then = function (ok, oh) {

package/coms/kugou/playList.less

@@ -13,6 +13,12 @@
     transition: margin .2s ease-out;
 }
 
+>list.body {
+    overflow-x: hidden;
+    overflow-y: scroll;
+    padding: 0;
+}
+
 
 list>padding {
     display: block;

package/coms/zimoli/bindAccesskey.js

@@ -1,8 +1,12 @@
 var keyMap = {};
-on("keydown")(window, function (event) {
+/**
+ * @param {KeyboardEvent} event
+ */
+var keydownhandler = function (event) {
+    if (event.defaultPrevented) return;
     var { which } = event;
     switch (event.which) {
-        case 18:
+        case 18: // alt
             event.preventDefault();
             break;
         default:
@@ -16,12 +20,15 @@ on("keydown")(window, function (event) {
             if (elem) {
                 var parent = elem.parentNode;
                 if (event.altKey || parent === document.activeElement || parent.ispop) {
-                    event.preventDefault();
-                    elem.click();
+                    if (!(event.metaKey || event.shiftKey || event.ctrlKey)) {
+                        event.preventDefault();
+                        elem.click();
+                    }
                 }
             }
     }
-});
+}
+on("keydown")(window, keydownhandler);
 var bindAccesskey = function (btn, k) {
     if (!keyMap[k]) keyMap[k] = [];
     removeFromList(keyMap[k], btn);
@@ -42,6 +49,7 @@ var getKeyFromText = function (btn) {
     return accesskey.toUpperCase();
 }
 function main(elem, key = getKeyFromText(elem)) {
+    if (!key) return;
     bindAccesskey(elem, key);
     return elem;
 }

package/coms/zimoli/button.js

@@ -1,5 +1,6 @@
 var _label = createElement("span");
 var track = createElement(div);
+var onmouseenter = on("mouseenter");
 track.className = "track";
 _label.className = "label";
 
@@ -107,7 +108,7 @@ function button(texter, type) {
     button = button || createElement(btn, tracker, _texter);
     bindAccesskey(button);
     onremove(button, resetall);
-    onmouseover(button, hover);
+    onmouseenter(button, hover);
     onmouseleave(button, mouseleave);
     onmousemove(button, mousemove);
     onmousedown(button, mousedown);

package/coms/zimoli/getGenerator.js

@@ -1,12 +1,16 @@
 
 var _slider = createElement(div);
+/**
+ * @param {Element} container
+ * @param {Element|string} tagName;
+ */
 var getGenerator = function (container, tagName = 'item') {
     if (!container) return;
     var scopes = container.$parentScopes || [];
     if (container.$scope) scopes = scopes.concat(container.$scope);
     container.$generatorScopes = scopes;
     if (container.$generator) return container.$generator;
-    var template = document.createElement(tagName);
+    var template = document.createElement(container.tagName);
     var templates = [].concat.apply([], container.childNodes).filter(a => {
         if (a.hasAttribute('insert')) {
             return false;
@@ -22,22 +26,34 @@ var getGenerator = function (container, tagName = 'item') {
         container.paddingCount = paddingCount;
     }
     appendChild(template, templates);
+    if (templates.length) container.$template = template;
     container.insertBefore = _slider.insertBefore;
     container.appendChild = _slider.appendChild;
+    /**
+     * @param {number} index;
+     * @param {Object} com;
+     * @param {Element} element;
+     */
     return container.$generator = function (index, com, element) {
         if (com === undefined) {
             if (!container.src || index >= container.src.length) return;
             com = container.src[index];
         }
         if (com === undefined) return;
-        if (!isNode(element)) {
+        var needSetAttr = isElement(tagName);
+        if (isNode(element));
+        else if (!template.childNodes.length) {
+            element = needSetAttr ? tagName.cloneNode(true) : document.createElement(tagName);
+            needSetAttr = false;
+        }
+        else {
             var template1 = template.cloneNode(true);
-            if (!template1.childNodes.length) {
-                element = template1;
-            }
-            else {
-                element = template1.childNodes[0];
-                if (template1.childNodes.length > 1) element.with = [].concat.apply([], template1.childNodes).slice(1);
+            element = template1.childNodes[0];
+            if (template1.childNodes.length > 1) element.with = [].concat.apply([], template1.childNodes).slice(1);
+        }
+        if (needSetAttr) {
+            for (var a of tagName.attributes) {
+                element.setAttribute(a.name, a.value);
             }
         }
         var scopes = container.$generatorScopes;

package/coms/zimoli/getName.js

@@ -1,4 +1,5 @@
 var hasOwnProperty = {}.hasOwnProperty;
+var keys = ["name", 'title', 'label', 'value'];
 function getName(o) {
     var name;
     if (isEmpty(o)) return '';
@@ -7,11 +8,12 @@ function getName(o) {
         name = o.toString();
         if (!isEmpty(name)) return String(name);
     }
-    if (!isEmpty(o.name)) return String(o.name);
-    if (!isEmpty(o.title)) return String(o.title);
-    if (!isEmpty(o.label)) return String(o.label);
-    if (!isEmpty(o.value)) return String(o.value);
+    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];
+    }
     if (hasOwnProperty.call(o, 'valueOf')) name = o.valueOf();
-    if (!isEmpty(name)) return String(name);
+    if (isString(name)) return name;
     return String(o);
 }

package/coms/zimoli/hexagon.js

@@ -0,0 +1,33 @@
+var hexagon = function (c = "#fff", lineWidth = devicePixelRatio) {
+    var image = document.createElement('canvas');
+    image.width = 9 * lineWidth;
+    image.height = 16 * lineWidth;
+    image.src = true;
+    var { width, height } = image;
+    var w = width;
+    var h = height;
+
+    var ctx = image.getContext("2d");
+    ctx.beginPath();
+    var cx = lineWidth / 2;
+    var cy = 0;
+    ctx.moveTo(cx, cy);
+    /* |   */ctx.lineTo(cx, cy + h / 6);
+    /*  \  */ctx.lineTo(cx + w / 2, cy + h / 3);
+    /*   | */ctx.lineTo(cx + w / 2, cy + h * 2 / 3);
+    /*  /  */ctx.lineTo(cx, cy + h * 5 / 6);
+    /* |   */ctx.lineTo(cx, cy + h);
+    ctx.moveTo(cx + w / 2, cy + h / 3);
+    /*   / */ctx.lineTo(cx + w, cy + h / 6);
+    ctx.moveTo(cx + w / 2, cy + h * 2 / 3);
+    /*   \ */ctx.lineTo(cx + w, cy + h * 5 / 6);
+    ctx.moveTo(cx, cy + h / 6);
+    ctx.lineTo(cx - w / 2, cy + h / 3);
+    ctx.moveTo(cx - w / 2, cy + h * 2 / 3);
+    ctx.lineTo(cx, cy + h * 5 / 6);
+    ctx.strokeStyle = c;
+    ctx.lineWidth = lineWidth;
+    ctx.stroke();
+    image.complete = true;
+    return image;
+}

package/coms/zimoli/innerHeight.js

@@ -1,7 +1,8 @@
 var document = this.document;
 
 function innerHeight() {
-    return document.documentElement.clientHeight || document.body && document.body.clientHeight;
+    if (isFinite(window.innerHeight)) return window.innerHeight;
+    return document.documentElement.offsetHeight || document.body && document.body.offsetHeight;
 }
 innerHeight.toString = function () {
     return this().toString();

package/coms/zimoli/innerWidth.js

@@ -1,6 +1,7 @@
 var document = this.document;
 function innerWidth() {
-    return document.documentElement.clientWidth || document.body && document.body.clientWidth;
+    if (isFinite(window.innerWidth)) return window.innerWidth;
+    return document.documentElement.offsetWidth || document.body && document.body.offsetWidth;
 }
 innerWidth.toString = function () {
     return this().toString();