efront 3.25.11 → 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,6 +1,14 @@
+var [
+    /* 静止 */静止,
+    /* 停止 */停止,
+    /* 移动 */移动,
+    /* 减速 */减速,
+    /* 回弹 */回弹,
+    /* 停靠 */停靠,
+] = new Array(6).fill(0).map((_, i) => i);
+
 function inertia(gun) {
     var spd = new Speed;
-    var animateIndex = 0;
     var lastTime = 0;
     var _decrease = function () {
         lastTime = Speed.now() - 1;
@@ -13,12 +21,12 @@ function inertia(gun) {
             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();
-                animateIndex = 0;
+                train.state = 停止;
                 return;
             }
             smooth_timer = requestAnimationFrame(_decrease0);
@@ -35,12 +43,12 @@ function inertia(gun) {
         if (id !== smooth_timer) return;
         if (false === res) {
             spd.reset();
-            animateIndex = 2;
+            train.state = 回弹;
             smooth_timer = requestAnimationFrame(_decrease);
             return;
         }
         if (decrease && args.filter(a => Math.abs(a) > 1).length === 0) {
-            animateIndex = 2;
+            train.state = 回弹;
             smooth_timer = requestAnimationFrame(_decrease);
             return;
         }
@@ -48,30 +56,48 @@ 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);
+        if (train.state !== 移动) train.state = 移动;
         gun.apply(this, args);
         that = this;
     };
     train.smooth = function (d) {
         _cancel();
         decrease = d;
-        if (animateIndex === 1) {
+        if (train.state === 移动) {
+            train.state = 减速;
             smooth_timer = requestAnimationFrame(smooth);
         }
-        else if (animateIndex === 2) {
+        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/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

@@ -31,11 +31,13 @@ var keydownhandler = function (event) {
 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;

package/coms/zimoli/button.js

@@ -52,7 +52,7 @@ var mousedown = function () {
     });
     active.call(this);
 };
-var mouseleave = function () {
+var mouseleave = function (event) {
     removeClass(this, "hover");
 };
 var mousemove = function (event) {

package/coms/zimoli/menu.js

@@ -97,7 +97,7 @@ var emitEvent = function (item, event) {
     if (event.defaultPrevented) return;
     event.preventDefault(true);
     if (item.disabled) return;
-    active(this, item, item, this.$src ? createItemTarget.call(this, item) : this);
+    active(this, item, "global", this.$src ? createItemTarget.call(this, item) : this);
 }
 function bindGlobalkey(elem, keymap, emit) {
     if (elem.keyoff) {

package/coms/zimoli/menuList.js

@@ -286,7 +286,7 @@ function main() {
     };
     var clickMenu = function (event) {
         switchMenu.cancel();
-        if (!switchMenu.done) activeMenu.call(this);
+        if (!switchMenu.done) page.setFocus(this), activeMenu.call(this);
     };
 
 
@@ -360,6 +360,21 @@ function main() {
     page.active = function (a) {
         activeMenu.call(a);
     };
+    if (istoolbar) on("active")(page, function (event) {
+        if (event.item !== 'global') return;
+        if (page.selected) page.selected.setActive(false);
+        var selected = null;
+        for (var e of this.children) {
+            if (!e.menu) continue;
+            selected = e.menu.pathTo(event.value);
+            if (selected) break;
+        }
+        if (!selected) return;
+        var menu = selected.pop();
+        page.selected = menu;
+        if (selected[0]) selected[0].extends(menu.value);
+        menu.setActive(true);
+    });
     on("focused")(page, function () {
         var focused = page.focused;
         if (page.ispop && page === root_menu) popMenu(focused.menu, focused, false);

package/coms/zimoli/on.js

@@ -482,7 +482,13 @@ var invoke = function (event, type, pointerType) {
     });
     if (window.addEventListener) {
         window.addEventListener("touchmove", clickcancel, true);
-        window.addEventListener("touchstart", clickstart, true);
+        window.addEventListener("touchstart", function (event) {
+            if (event.touches.length > 1) {
+                clickcancel();
+                return;
+            }
+            clickstart.call(this, event);
+        }, true);
         window.addEventListener("touchend", function (event) {
             if (event.touches.length > 1) return;
             if (onclick.preventClick) return;

package/coms/zimoli/onmouseleave.js

@@ -1 +1 @@
-var onmouseleave=on("mouseout");
+var onmouseleave=on("mouseleave");

package/coms/zimoli/picture_.js

@@ -354,7 +354,8 @@ function picture_(image = document.createElement("div")) {
 
     image.rotateTo = function (deg) {
         rotated = deg;
-        this.update();
+        updatexy();
+        shape();
     };
     image.rotateBy = function (deg) {
         var r = rotated;
@@ -381,7 +382,8 @@ function picture_(image = document.createElement("div")) {
             r += deg;
         }
         rotated = r;
-        this.update(deg === 90 || deg === -90);
+        updatexy();
+        shape();
     };
     on('remove')(image, move.reset);
     on("contextmenu")(image, function (e) {

package/coms/zimoli/popup.js

@@ -8,6 +8,7 @@ on("keydown.esc.only")(document, function (e) {
         if (r) {
             r.blur();
             remove(r);
+            e.preventDefault();
         }
     }
 });

package/coms/zimoli/slider.js

@@ -245,8 +245,9 @@ function slider(autoplay, circle = true) {
         if (!event.deltaX) return;
         if (event._target && event._target !== this) return;
         event._target = outter;
+        cancelAnimationFrame(timer_animate);
         clearTimeout(stop_wheel_timer);
-        stop_wheel_timer = setTimeout(park, 60);
+        stop_wheel_timer = setTimeout(park, 160);
         var deltax = -event.deltaX;
         moveDeltaX(deltax, event);
     });

package/coms/zimoli/table.js

@@ -203,6 +203,7 @@ function enrichField(f) {
     }
     else switch (f.type) {
         case "text":
+        case "html":
             width = 200;
             break;
         case "input":

package/coms/zimoli/vbox.js

@@ -19,13 +19,11 @@ function ybox(generator) {
         return _box.scrollHeight;
     };
     // currentTop
-    var _scrolledTop = _box.scrollTop;
     if (!isFunction(_box_Top)) _box_Top = function (top) {
         if (isNumber(top)) {
             if (_box.scrollTop !== top) {
                 _box.scrollTop = top;
             }
-            _scrolledTop = top;
         }
         return _box.scrollTop;
     };
@@ -40,7 +38,7 @@ function ybox(generator) {
         var r = true;
         if (top < 0) {
             if (useIncrease && _Top <= 0) {
-                r = increase(top);
+                r = increase_half(top, increaser_t.height);
             }
             _box.$Top(0);
         } else if (top + height >= scrollHeight) {
@@ -48,7 +46,7 @@ function ybox(generator) {
                 top = increase_height + scrollHeight - height;
             }
             if (useIncrease && top + height >= scrollHeight) {
-                r = increase(top + height - scrollHeight);
+                r = increase_half(top + height - scrollHeight, increaser_b.height);
             }
             _box.$Top(top);
         } else {
@@ -102,6 +100,13 @@ function ybox(generator) {
         }
         return true;
     };
+    var increase_half = function (deltaY, targetHeight) {
+        if (scrollY.state !== inertia.MOVING) {
+            deltaY *= (increase_height - targetHeight) / increase_height;
+            if (Math.abs(deltaY) < 1) return false;
+        }
+        return increase(deltaY);
+    }
     var increase = function (deltaY, minusOnly) {
         var t_height = increaser_t.height;
         var b_height = increaser_b.height;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.25.11",
+    "version": "3.25.12",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {