efront 3.25.8 → 3.25.11

package/coms/basic/Speed.js

@@ -1,5 +1,6 @@
 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;
@@ -9,7 +10,7 @@ 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);
@@ -17,6 +18,7 @@ function inertia(gun) {
             if (smooth_timer !== id) return;
             if (res === false || isEmpty(res)) {
                 spd.unset();
+                animateIndex = 0;
                 return;
             }
             smooth_timer = requestAnimationFrame(_decrease0);
@@ -24,24 +26,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();
+            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;
         }
@@ -49,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);
@@ -58,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();

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/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/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();

package/coms/zimoli/list.js

@@ -2,9 +2,12 @@
 function ylist(container, generator, $Y) {
     const cache_height = 2000;
     var restHeight = cache_height;
+    /**
+     * @type {HTMLElement}
+     */
     var list = container || div();
     list.autoFix = true;
-    var saved_itemIndex;
+    var saved_itemIndex = 0;
     addClass(list, 'list-' + $Y.toLowerCase());
     if (!list.renders) {
         list.renders = [];
@@ -15,7 +18,11 @@ function ylist(container, generator, $Y) {
         if (a !== void 0) scrollTo(a);
     });
     var getNodeTarget = function (node) {
-        if (node.nodeType === 8 && node.template) return node.template;
+        if (node.nodeType === 8 && node.$template) {
+            var t = node.$template;
+            if (!isFinite(t.index)) t.index = node.index;
+            return node.$template;
+        }
         return node;
     };
     //取底部元素
@@ -109,7 +116,9 @@ function ylist(container, generator, $Y) {
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var child = children[cx];
             if (isFinite(child.index) && child.index !== null) {
-                map[child.index] = child;
+                if (!map[child.index] || child.$template === map[child.index]) {
+                    map[child.index] = child;
+                }
             }
         }
         return map;
@@ -203,10 +212,12 @@ function ylist(container, generator, $Y) {
         return y;
     }, false);
     var rebuild = function () {
-        if (!/^(?:auto|scroll)$/i.test(getComputedStyle(list).overflowY)) return;
         runbuild();
     };
-    on("scroll")(list, rebuild);
+    oncemount(list, function () {
+        if (!/^(?:auto|scroll)$/i.test(getComputedStyle(list).overflowY)) return;
+        on("scroll")(list, rebuild);
+    });
     var topinsert = document.createElement('ylist-insert');
     list.insertBefore(topinsert, list.firstChild);
     //计算当前高度
@@ -228,17 +239,17 @@ function ylist(container, generator, $Y) {
         return bottom_element ? bottom_element.nextSibling : null;
     };
     var getOffsetHeight = function (element) {
+        element = getNodeTarget(element);
         var temp = element;
         do {
             var next = getNextSibling(temp);
             if (!next) return element.offsetHeight;
-            temp = next;
+            temp = getNodeTarget(next);
         } while (next.offsetTop === element.offsetTop);
         return next.offsetTop - element.offsetTop;
     };
     var patchBottom = function (deltaY = 0) {
         var cache_height = list.offsetHeight;
-
         var childrenMap = getChildrenMap();
         var last_element = getLastElement(1);
         if (!last_element || !last_element.offsetHeight) return;
@@ -271,7 +282,7 @@ function ylist(container, generator, $Y) {
         var collection = [];
         for (var k in childrenMap) {
             let item = childrenMap[k];
-            if (item.offsetTop + getOffsetHeight(item) + cache_height < scrollTop) {
+            if (getNodeTarget(item).offsetTop + getOffsetHeight(item) + cache_height < scrollTop) {
                 collection.push(item);
             }
         }
@@ -283,7 +294,7 @@ function ylist(container, generator, $Y) {
                 item = collection.pop();
             }
             var item = collection[collection.length - 1];
-            if (item) scrollTop -= item.offsetTop + getOffsetHeight(item) - collection[0].offsetTop;
+            if (item) scrollTop -= getNodeTarget(item).offsetTop + getOffsetHeight(item) - getNodeTarget(collection[0]).offsetTop;
             if (paddingCount > 0 && paddingMax > 0 && paddingCount < paddingMax) {
                 let item = collection[collection.length - 1];
                 while (paddingCount > 0) {
@@ -337,6 +348,7 @@ function ylist(container, generator, $Y) {
         var { clientHeight } = list;
         while (last_element && last_element.offsetTop > clientHeight + scrollTop + cache_height) {
             remove(last_element);
+            remove(last_element.$comment);
             last_element = getLastElement(1);
         }
         return scrollTop - list.scrollTop;
@@ -364,6 +376,9 @@ function ylist(container, generator, $Y) {
             }
         }
     };
+    bind('resize')(list, function () {
+        patchBottom(0);
+    });
     list.getLastVisibleElement = getLastVisibleElement;
     list.$stopY = function (t, spd) {
         var firstElement = getFirstVisibleElement();
@@ -387,7 +402,7 @@ function ylist(container, generator, $Y) {
             var target_by = last_y - scrolled_b * lastElement.offsetHeight;
         }
         var target_y = Math.abs(target_ty - last_y) > Math.abs(target_by - last_y) ? target_by : target_ty;
-        var delta = Math.min(calcPixel(60), list.clientHeight >> 2);
+        var delta = Math.min(calcPixel(30), list.clientHeight >> 2);
         var absy = Math.abs(target_y - last_y), y;
         if (absy >= delta) {
             return false;
@@ -410,7 +425,8 @@ function ylist(container, generator, $Y) {
     list.$Height = function () {
         var elem = getLastElement(2);
         var listRestHeight = elem ? elem.offsetHeight + elem.offsetTop - list.scrollTop : list.clientHeight;
-        return currentY() + listRestHeight + restHeight;
+        var paddingHeight = elem ? 0 : restHeight;
+        return currentY() + listRestHeight + paddingHeight;
     };
     list.$Top = function (y) {
         if (isFinite(y)) {
@@ -442,13 +458,126 @@ function ylist(container, generator, $Y) {
     list.patchBottom = patchBottom;
     list.patchTop = patchTop;
     list.scrollIfNotCover = scrollIfNotCover;
+    list.getLastElement = getLastElement;
     vbox(list, $Y);
     on("remove")(list, function () {
         saved_itemIndex = list.index();
     });
     onmounted(list, function () {
         if (isFinite(saved_itemIndex)) list.go(saved_itemIndex);
-    })
+    });
+    /**
+     * @param {Element|null} focused 
+     * @param {boolean} animate
+     */
+    list.setFocus = function (focused, animate) {
+        if (focused && (focused.hasAttribute("disabled") || focused.hasAttribute("line"))) return;
+        if (!focused) {
+            if (list.focused) {
+                removeClass(list.focused, 'focus');
+                list.focused = null;
+            }
+            return;
+        }
+        if (list.focused === focused) return;
+        if (list.focused) removeClass(list.focused, 'focus');
+        addClass(focused, "focus");
+        var scrollTop = list.scrollTop;
+        var firstElement = getFirstElement(1);
+        var sideheight = 0;
+        if (firstElement) {
+            sideheight += parseFloat(getComputedStyle(firstElement).paddingTop + firstElement.clientTop);
+            sideheight += (firstElement.offsetHeight - sideheight - sideheight) * .3;
+            sideheight += parseFloat(getComputedStyle(list).paddingTop);
+        }
+        if (focused.offsetTop + focused.offsetHeight + sideheight > list.scrollTop + list.clientHeight) {
+            scrollTop = focused.offsetTop + focused.offsetHeight + sideheight - list.clientHeight;
+        }
+        if (focused.offsetTop < list.scrollTop + sideheight) {
+            scrollTop = focused.offsetTop - sideheight;
+        }
+        if (scrollTop !== list.scrollTop) scrollBy(scrollTop - list.scrollTop, animate);
+        list.focused = focused;
+    };
+
+    /**
+     * @param {number|"up"|"down"|"home"|"end"|"pageup"|"pagedown"}delta
+     * @param {boolean} emit
+     */
+    list.moveFocus = function (delta, emit = true) {
+        var focused = list.focused;
+        var newIndex = 0, total = 0;
+        if (delta === 'up') delta = -1;
+        if (delta === 'down') delta = 1;
+        if (typeof delta === 'string') {
+            switch (delta.toLowerCase()) {
+                case "home":
+                    newIndex = 0;
+                    delta = 1;
+                    break;
+                case "end":
+                    var lastElement = getLastElement(1);
+                    if (!lastElement) return;
+                    newIndex = lastElement.index;
+                    delta = -1;
+                    break;
+                case "pageup":
+                    var firstElement = getFirstVisibleElement();
+                    if (!firstElement) return;
+                    newIndex = firstElement.index;
+                    list.scrollBy(-list.clientHeight + firstElement.offsetHeight);
+                    var lastElement = getLastVisibleElement();
+                    if (lastElement.index < newIndex) newIndex = lastElement.index;
+                    delta = -1;
+                    break;
+                case "pagedown":
+                    var lastElement = getLastVisibleElement();
+                    if (!lastElement) return;
+                    newIndex = lastElement.index;
+                    list.scrollBy(list.clientHeight - lastElement.offsetHeight);
+                    var firstElement = getFirstVisibleElement();
+                    if (firstElement.index > newIndex) newIndex = firstElement.index;
+                    delta = 1;
+                    break;
+            }
+        }
+        else if (!focused) {
+            var lastElement = getLastElement(1);
+            if (!lastElement) return;
+            total = lastElement.index + 1;
+            if (delta > 0) newIndex = 0;
+            else newIndex = total - 1;
+        }
+        else {
+            var newIndex = focused.index + delta;
+            var lastElement = getLastElement(1);
+            var total = lastElement.index + 1;
+            if (newIndex < 0) newIndex = total + newIndex;
+            if (newIndex > total - 1) newIndex = newIndex - total;
+        }
+        var savedIndex = newIndex;
+        var e = list.getIndexedElement(newIndex);
+        while (e && (e.hasAttribute("disabled") || e.hasAttribute("line"))) {
+            if (delta > 0) {
+                newIndex++;
+                if (newIndex >= total) {
+                    if (!total) return;
+                    newIndex = 0;
+                }
+            } else {
+                newIndex--;
+                if (newIndex < 0) {
+                    if (!total) return;
+                    newIndex = total - 1;
+                }
+            }
+            if (savedIndex === newIndex) return;
+            e = list.getIndexedElement(newIndex);
+        }
+        if (!e) list.setFocus(null);
+        else if (emit) list.setFocus(e, true), dispatch(list, 'focused');
+        else list.setFocus(e);
+    };
     return list;
 }
 var allArgumentsNames = arguments[arguments.length - 1];