efront 3.25.8 → 3.25.12

package/coms/basic/Item.js

@@ -1,3 +1,15 @@
+/**
+ * @param {Item} item
+ */
+function pathTo(find, item, path) {
+    path.push(item);
+    if (item === find || find === item.value) {
+        return path;
+    }
+    for (var m of item) {
+        if (pathTo(find, m, path)) return path;
+    }
+}
 var id = 0;
 class Item extends Array {
     extended = false;
@@ -60,7 +72,9 @@ class Item extends Array {
         if (isObject(this.value)) return getName(this.value);
         return String(this.value);
     }
-
+    pathTo(menu) {
+        return pathTo(menu, this, []);
+    }
     isClosed() {
         if (isObject(this.value)) return !!this.value.closed;
         return this.closed;

package/coms/basic/Matrix.js

@@ -1,7 +1,7 @@
 var notMatchLength = new Error("矩阵长度不一致");
 class Matrix extends Array {
     static create2d(theta = 0) {
-        return MatrixTransposed.matrix2d(theta);
+        return MathMatrix.matrix2d(theta);
     }
     static create3d(factor = [0, 0, 0]) {
         return MathMatrix.matrix3d(factor);
@@ -83,6 +83,10 @@ class Matrix extends Array {
     }
 }
 class MathMatrix extends Matrix {
+    toDOMString() {
+        if (this.size()[1] === 2) return `matrix(${[this[0], this[1], this[3], this[4], this[6], this[7]]})`;
+        return `matrix(${this})`;
+    }
 
     static transform(B, dots) {
         var dimention = Math.sqrt(B.length - 1) | 0;
@@ -217,6 +221,10 @@ class MathMatrix extends Matrix {
 
 }
 class MatrixTransposed extends Matrix {
+    toDOMString() {
+        if (this.size()[1] === 2) return `matrix(${[this[0], this[3], this[1], this[4], this[2], this[5]]})`;
+        return `matrix(${this.transpose()})`;
+    }
     static transform(B, dots) {
         var dimention = Math.sqrt(B.length - 1) | 0;
         if (dots.length % dimention !== 0) throw notMatchLength;

package/coms/basic/Speed.js

@@ -1,5 +1,14 @@
+var [
+    /* 静止 */静止,
+    /* 停止 */停止,
+    /* 移动 */移动,
+    /* 减速 */减速,
+    /* 回弹 */回弹,
+    /* 停靠 */停靠,
+] = new Array(6).fill(0).map((_, i) => i);
+
 function inertia(gun) {
-    var _decreased = 0, spd = new Speed;
+    var spd = new Speed;
     var lastTime = 0;
     var _decrease = function () {
         lastTime = Speed.now() - 1;
@@ -9,14 +18,15 @@ function inertia(gun) {
         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 now = Speed.now();
-            var res = decrease(now - lastTime, spd);
+            var res = decrease.call(that, now - lastTime, spd);
             lastTime = now;
             if (smooth_timer !== id) return;
             if (res === false || isEmpty(res)) {
                 spd.unset();
+                train.state = 停止;
                 return;
             }
             smooth_timer = requestAnimationFrame(_decrease0);
@@ -24,24 +34,21 @@ function inertia(gun) {
     };
     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 (!decrease && 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();
+            train.state = 回弹;
+            smooth_timer = requestAnimationFrame(_decrease);
+            return;
+        }
+        if (decrease && args.filter(a => Math.abs(a) > 1).length === 0) {
+            train.state = 回弹;
             smooth_timer = requestAnimationFrame(_decrease);
             return;
         }
@@ -52,21 +59,45 @@ function inertia(gun) {
         _cancel();
         var args = [].slice.call(arguments, 0, arguments.length);
         spd.write(args);
+        if (train.state !== 移动) train.state = 移动;
         gun.apply(this, args);
         that = this;
     };
     train.smooth = function (d) {
         _cancel();
         decrease = d;
-        smooth_timer = requestAnimationFrame(smooth);
+        if (train.state === 移动) {
+            train.state = 减速;
+            smooth_timer = requestAnimationFrame(smooth);
+        }
+        else if (train.state === 回弹 || train.state === 停靠) {
+            train.state = 停靠;
+            smooth_timer = requestAnimationFrame(_decrease);
+        }
     };
-    train.reset = function () {
+    train.state = 静止;
+    train.reset = train.start = function () {
         _cancel();
-        spd.reset();
+        spd.unset();
+        train.state = 静止;
     };
     return train;
 
 }
+
+inertia.静止 = 静止;
+inertia.停止 = 停止;
+inertia.移动 = 移动;
+inertia.减速 = 减速;
+inertia.回弹 = 回弹;
+inertia.停靠 = 停靠;
+inertia.STAND = 静止;
+inertia.STOPPING = 停止;
+inertia.MOVING = 移动;
+inertia.SLOWING_DWON = 减速;
+inertia.REBOUNDING = 回弹;
+inertia.DOCKING = 停靠;
+
 class Speed extends Array {
     cache = [];
     stamp = 0;

package/coms/basic/awaitable.js

@@ -0,0 +1,41 @@
+/**
+ * 为可能正在加载的元素添加then方法
+ * 占用onload onerror complete then 共4个属性
+ * @param {Element|Object|any} image;
+ */
+function awaitable(image) {
+    if (image.complete) return image;
+    var oks = [];
+    var ohs = [];
+    var resolved = false,
+        errored = false,
+        error = null;
+    var fire = function () {
+        if (resolved || errored) {
+            var _oks = oks.splice(0, oks.length);
+            var _ohs = ohs.splice(0, ohs.length);
+            if (errored) for (var o of _ohs) o(error);
+            delete image.then;
+            if (resolved) for (var o of _oks) o(image);
+            image.then = then;
+        }
+    };
+    var then = image.then = function (ok, oh) {
+        if (ok) oks.push(ok);
+        if (oh) ohs.push(oh);
+        fire();
+    };
+    image.onload = function () {
+        if (resolved || errored) return;
+        resolved = true;
+        if (!image.complete) image.complete = true;
+        fire();
+    };
+    image.onerror = function (e) {
+        if (resolved || errored) return;
+        errored = true;
+        error = e;
+        fire();
+    };
+    return image;
+}

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

@@ -169,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] = [];

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) {

package/coms/zimoli/attr.js

@@ -1,10 +1,16 @@
+function set(target, k, v) {
+    if (target.getAttribute(k) !== v) target.setAttribute(k, v);
+}
+function unset(target, k) {
+    if (target.hasAttribute(k)) target.removeAttribute(k);
+}
 function attr(target, key, value) {
     if (arguments.length === 3) {
-        if (value === null) target.removeAttribute(key, value);
-        else target.setAttribute(key, value);
+        if (value === null) unset(target, key);
+        else set(target, key, value);
     } else if (isObject(key)) {
         for (var k in key) {
-            target.setAttribute(k, key[k]);
+            set(target, k, key[k]);
         }
     } else if (isString(key)) {
         return target.getAttribute(key);

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,19 +20,24 @@ 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);
-    keyMap[k].push(btn);
-    once("remove")(btn, function () {
+    on("remove")(btn, function () {
         removeFromList(keyMap[k], btn);
     });
+    onmounted(btn, function () {
+        removeFromList(keyMap[k], btn);
+        keyMap[k].push(btn);
+    })
 };
 var getKeyFromText = function (btn) {
     var { innerText } = btn;
@@ -42,6 +51,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";
 
@@ -51,7 +52,7 @@ var mousedown = function () {
     });
     active.call(this);
 };
-var mouseleave = function () {
+var mouseleave = function (event) {
     removeClass(this, "hover");
 };
 var mousemove = function (event) {
@@ -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/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();