efront 3.25.8 → 3.25.12

package/coms/zimoli/on.js

@@ -1,9 +1,28 @@
 // "use strict";
 if (document.efronton) return document.efronton;
 var is_addEventListener_enabled = "addEventListener" in window;
+// Edg 禁用passive原因：无滚动条的元素上纵向滚动时触发整个页面回弹
+// Chrome 禁用passive原因：无滚动条的元素上横向滚动触发浏览器导航
+var supportPassive = false, preventPassive = /Edg|Chrome/.test(navigator.userAgent);
+if (is_addEventListener_enabled) try {
+    window.addEventListener('test', null, { get passive() { return supportPassive = true } });
+} catch { }
+
+var listenerOptions = [];
+/**
+ * @param {EventNeed} eventtype
+ */
+var getListenerOption = function (eventtype, k) {
+    if (!supportPassive || preventPassive && /wheel$/.test(k)) return eventtype.capture;
+    var index = +eventtype.capture | +eventtype.passive << 1;
+    if (!listenerOptions[index]) listenerOptions[index] = { capture: eventtype.capture, passive: eventtype.passive };
+    return listenerOptions[index];
+};
+
 if ('attachEvent' in document) {
     is_addEventListener_enabled = false;
 }
+
 if (!is_addEventListener_enabled) var __call = function (target, context, handler, firstmost) {
     // use strict 无效的情况
     if (isEmpty(target)) {
@@ -16,7 +35,7 @@ if (!is_addEventListener_enabled) var __call = function (target, context, handle
 
 var handlersMap = {};
 var changes_key = 'changes';
-var eventtypereg = /(?:\.once|\.prevent|\.stop|\.capture|\.self|\.passive|\.[a-z0-9]+)+\.?$/i;
+var eventtypereg = /(?:\.once|\.prevent|\.stop|\.capture|\.self|\.passive|\.only|\.[!-~←↑→↓⇄↵⨉]+)+\.?$/i;
 var keyCodeMap = {
     backspace: 8,
     tab: 9,
@@ -134,24 +153,25 @@ var keyCodeMap = {
     "\"": 222,
     bright: 255,
 };
+class EventNeed {
+    once = false;
+    stop = false;
+    capture = false;
+    self = false;
+    prevent = false;
+    passive = false;
+    keyNeed = [];
+    keyCode = 0
+};
 var parseEventTypes = function (eventtypes) {
-    var types = {
-        once: false,
-        stop: false,
-        capture: false,
-        self: false,
-        prevent: false,
-        passive: false,
-        keyNeed: [],
-        keyCode: 0,
-    };
+    var types = new EventNeed;
     var keyneed = types.keyNeed;
     eventtypes = eventtypereg.exec(eventtypes);
     if (eventtypes) eventtypes = eventtypes[0].slice(1);
     if (eventtypes) {
         var etypes = eventtypes.split(".");
         etypes.forEach(t => {
-            if (t.length === 1) {
+            if (t.length === 1 && /^[0-9a-zA-Z]$/.test(t)) {
                 types.keyCode = t.toUpperCase().charCodeAt(0);
                 return;
             }
@@ -166,7 +186,9 @@ var parseEventTypes = function (eventtypes) {
                     keyneed.push(t);
                     break;
                 case "":
+                case "only":
                     if (!types.keyCode) types.keyCode = true;
+                    types.only = true;
                     break;
                 default:
                     if (isFinite(t)) {
@@ -175,6 +197,9 @@ var parseEventTypes = function (eventtypes) {
                     else if (keyCodeMap[t]) {
                         types.keyCode = keyCodeMap[t];
                     }
+                    else {
+                        throw new Error(`绑定事件参数无效${t}`);
+                    }
 
             }
 
@@ -182,14 +207,25 @@ var parseEventTypes = function (eventtypes) {
     }
     return types;
 }
+/**
+ * @param {EventNeed} eventtypes
+ * @param {Event} e;
+ */
 function checkKeyNeed(eventtypes, e) {
     var keyneed = eventtypes.keyNeed;
+    var keykeep = {}
     if (eventtypes.keyNeed) {
         for (var cx = 0, dx = keyneed.length; cx < dx; cx++) {
             var key = keyneed[cx];
+            keykeep[key] = true;
             if (!e[key + "Key"]) return false;
         }
     }
+    if (eventtypes.only) {
+        for (var key of ["meta", 'shift', 'ctrl', 'alt']) {
+            if (!keykeep[key] && e[key + "Key"]) return false;
+        }
+    }
     if (eventtypes.keyCode === true) {
         for (var cx = 0, dx = keyneed.length; cx < dx; cx++) {
             var key = keyneed[cx];
@@ -232,7 +268,7 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
         if (!hs.length && hs.h) {
             element[hk] = null;
             if (is_addEventListener_enabled) {
-                element.removeEventListener(k, hs.h, /1$/.test(hk));
+                element.removeEventListener(k, hs.h, getListenerOption(eventtypes, k));
             } else {
                 if (element["on" + k] === hs.h) element["on" + k] = null;
             }
@@ -242,6 +278,7 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
 var broadcast = function (k, hk, event) {
     var element = this;
     var handlers = element[hk];
+    if (!handlers) console.log(handlers, hk, event, element)
     if (handlers.length > 1) handlers = handlers.slice();
     if (event.which === 1 && event.buttons === 0) {
         // firefox 无按键
@@ -259,7 +296,7 @@ var broadcast = function (k, hk, event) {
         if (eventtypes.self && event.target !== element) continue;
         if (!checkKeyNeed(eventtypes, event)) continue;
         if (eventtypes.stop) event.stopPropagation();
-        if (eventtypes.passive) event.preventDefault = function () { };
+        if (eventtypes.passive && !preventPassive) event.preventDefault = function () { };
         if (eventtypes.prevent) event.preventDefault();
         if (handler instanceof Array) {
             for (var h of handler) {
@@ -305,6 +342,7 @@ var on = document.efronton = function (k) {
     k = k.replace(eventtypereg, '');
     var handler_path = k + "handlers";
     var hk = handler_path + +!!eventtypes.capture;
+    if (supportPassive) hk += +!!eventtypes.passive;
     if (is_addEventListener_enabled) var addhandler = function (context, handler, firstmost = false) {
         var target = this || context;
         target = checkroot(target, k);
@@ -313,7 +351,7 @@ var on = document.efronton = function (k) {
             var h = broadcast.bind(target, k, hk);
             target[hk] = [];
             target[hk].h = h;
-            target.addEventListener(k, h, eventtypes.capture);
+            target.addEventListener(k, h, getListenerOption(eventtypes, k));
         }
         var listener = [eventtypes, handler, context];
         append.call(target, k, hk, listener, firstmost);
@@ -444,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;
@@ -459,7 +503,7 @@ var invoke = function (event, type, pointerType) {
             isClickWithPointer = false;
             var saved_time = lasttime_click;
             lasttime_click = event.timeStamp;
-            if (!need || lasttime_click - saved_time < 60 || onclick.preventClick || touchendFired && !event.touchend) {
+            if (!need || lasttime_click - saved_time < 120 || onclick.preventClick || touchendFired && !event.touchend) {
                 // 阻止非人为点击，防止误操作
                 event.preventDefault();
                 event.stopPropagation();

package/coms/zimoli/onmouseleave.js

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

package/coms/zimoli/onmousewheel.js

@@ -1,4 +1,4 @@
-var _onmousewheel = "onmousewheel" in window || "onmousewheel" in document ? on("mousewheel") : on("DOMMouseScroll");
+var _onmousewheel = "onmousewheel" in window || "onmousewheel" in document ? on("mousewheel.passive") : on("DOMMouseScroll.passive");
 var addDeltaY = function (event) {
     if (isNumber(event.deltaY)) return;
     if (isNumber(event.wheelDeltaY)) {

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

@@ -1,12 +1,14 @@
 /**
  * 弹出层
  */
-onkeydown(document, function (e) {
-    if (e.which === 27 && rootElements.length) {
+on("keydown.esc.only")(document, function (e) {
+    if (e.defaultPrevented) return;
+    if (rootElements.length) {
         var r = rootElements.pop();
         if (r) {
             r.blur();
             remove(r);
+            e.preventDefault();
         }
     }
 });
@@ -235,19 +237,16 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
     var zindex = zIndex(0) + 1;
     css(element, `position:absolute;z-index:${zindex}`);
     css(_rhomb, { zIndex: zindex });
-    var release1 = onremove(target, function () {
-        remove(element);
-    });
-    var release2 = onremove(element, function () {
-        release1();
-        release2();
-        remove(_rhomb);
-        if (document.removeEventListener) {
-            document.removeEventListener("scroll", reshape, true);
-            window.removeEventListener("resize", reshape);
-        }
+    onmounted(element, function () {
+        var release1 = onremove(target, function () {
+            remove(element);
+        });
+        var release2 = onremove(element, function () {
+            release1();
+            release2();
+            remove(_rhomb);
+        });
     });
-    global(element, false);
     var reshape = function () {
         extend(element.style, element.origin);
         var position = getScreenPosition(target);
@@ -290,7 +289,6 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
         }
         var side;
         if (aimedWidth !== originWidth) {
-            console.log(originWidth,aimedWidth)
             css(element, { width: fromOffset(aimedWidth) });
         }
         if (position.top + element.offsetHeight + position.height > innerHeight) {
@@ -333,13 +331,11 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
         } else if (_rhomb && !_rhomb.parentNode) {
             appendChild.before(element, _rhomb)
         }
-    }
-    if (document.addEventListener) {
-        document.addEventListener("scroll", reshape, true);
-        window.addEventListener("resize", reshape);
-    }
-    reshape();
-    lazy(reshape)();
+    };
+    bind("resize")(element, reshape);
+    bind("scroll.capture.passive", document)(element, reshape);
+    onmounted(element, reshape);
+    global(element, false);
 };
 var _as_xextra = arriswise(_as_yextra, arguments);
 var popup_as_single = function (element) {

package/coms/zimoli/render.js

@@ -97,7 +97,8 @@ var createComment = function (renders, type, expression) {
         appendChild.after(this, comment);
         if (!/^if|^else/i.test(type)) remove(this);
     }
-    comment.template = this;
+    comment.$template = this;
+    this.$comment = comment;
     return comment;
 };
 
@@ -247,15 +248,16 @@ var createIf = function (search, id = 0) {
         for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
             var c = elements[cx];
             if (cx === shouldMount) {
-                var e = c.template;
+                var e = c.$template;
                 appendChild.after(c, e);
                 if (e.renderid < 0) {
                     e.renderid = id;
-                    c.template = render(e, this.$scope, this.$parentScopes);
+                    e = c.$template = render(e, this.$scope, this.$parentScopes);
+                    e.$comment = c;
                 }
             }
             else {
-                remove(c.template);
+                remove(c.$template);
             }
         }
 

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);
     });
@@ -286,8 +287,10 @@ function slider(autoplay, circle = true) {
         css(_imageMain, "z-index:0;transform:scale(.92);opacity:0;transition:none");
         setTimeout(() => css(_imageMain, "transform:scale(1);opacity:1;transition:.2s transform ease-out,.4s opacity"), 0);
         if (player.ing) play();
-        return outter;
-    }, 20);
+    }, 20, outter);
+    onmounted(outter, function () {
+        reshape(current_index);
+    });
     outter.play = function (schedule = player.schedule, _isMiss) {
         if (isDefined(_isMiss)) {
             isMiss = _isMiss;

package/coms/zimoli/slider_test.js

@@ -10,7 +10,7 @@ render(page, {
             return ele;
         });
         var _slider = slider(images, 0 !== +element.getAttribute("circle"));
-        _slider.go(0).play();
+        _slider.play();
         window.Slider = _slider;
         return _slider;
     }

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 {
@@ -60,9 +58,11 @@ function ybox(generator) {
     var increaser_t = document.createElement("insert");
     addClass(increaser_t, 'y-insert');
     var increaser_b = increaser_t.cloneNode();
+    increaser_b.height = 0;
+    increaser_t.height = 0;
     var increase_height = calcPixel(100);
     var _decrease = function (increaser, t) {
-        var height = parseInt(increaser.height);
+        var height = increaser.height;
         if (height > 1) {
             var scrollTop = _box.$Top();
             if (scrollTop > 0 && increaser_t === increaser) {
@@ -100,9 +100,16 @@ 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 || 0;
-        var b_height = increaser_b.height || 0;
+        var t_height = increaser_t.height;
+        var b_height = increaser_b.height;
         t_height -= deltaY;
         b_height += deltaY;
         if (!minusOnly && deltaY < 0 && t_height > 0) {

package/docs/main.js

@@ -11,4 +11,7 @@ contextmenu(document, function (event) {
             }
         }
     ]);
+})
+on("beforeunload")(window, function () {
+    zimoli.clearHistory();
 })

package/package.json

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